From a537edd657bc9251f613563c8c827459a499ade9 Mon Sep 17 00:00:00 2001
From: watsonb8 <watsonb8133@gmail.com>
Date: Sun, 3 Nov 2019 23:17:34 -0500
Subject: [PATCH] Remote playback almost working

---
 Aurora/Aurora.csproj                          | 118 ++++++++++++------
 Aurora/Design/Components/Queue/Queue.xaml     |   4 +
 Aurora/Design/Components/Queue/Queue.xaml.cs  |  57 +++++++--
 Aurora/Design/Views/Party/PartyView.xaml      |   4 +-
 Aurora/Design/Views/Party/PartyViewModel.cs   |  38 +++++-
 Aurora/Models/Media/BaseMedia.cs              |   2 +-
 Aurora/Models/Media/RemoteAudio.cs            |  83 ++++++++++++
 Aurora/Proto/party.proto                      |  14 ++-
 Aurora/Proto/playback.proto                   |  21 ----
 Aurora/RemoteImpl/RemotePartyImpl.cs          |  26 +++-
 Aurora/RemoteImpl/RemotePlaybackImpl.cs       |  39 ------
 .../Services/ClientService/ClientService.cs   |  15 +--
 Aurora/Services/LibraryService.cs             |   6 +
 Aurora/Services/ServerService.cs              |   5 -
 14 files changed, 296 insertions(+), 136 deletions(-)
 create mode 100644 Aurora/Models/Media/RemoteAudio.cs
 delete mode 100644 Aurora/Proto/playback.proto
 delete mode 100644 Aurora/RemoteImpl/RemotePlaybackImpl.cs

diff --git a/Aurora/Aurora.csproj b/Aurora/Aurora.csproj
index e067622..bea94d1 100644
--- a/Aurora/Aurora.csproj
+++ b/Aurora/Aurora.csproj
@@ -1,54 +1,100 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project
+     Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
         <ProduceAssemblyReference>true</ProduceAssemblyReference>
     </PropertyGroup>
-    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <PropertyGroup
+         Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
         <DebugType>pdbonly</DebugType>
         <DebugSymbols>true</DebugSymbols>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="Xamarin.Forms" Version="3.6.0.264807" />
-        <PackageReference Include="Xamarin.Essentials" Version="1.0.1" />
-        <PackageReference Include="Xamarin.Forms.DataGrid" Version="3.1.0" />
-        <PackageReference Include="taglib-sharp-netstandard2.0" Version="2.1.0" />
-        <PackageReference Include="LibVLCSharp.Forms" Version="3.0.0" />
-        <PackageReference Include="VideoLAN.LibVLC.Mac" Version="3.1.3" />
-        <PackageReference Include="Grpc" Version="1.21.0" />
-        <PackageReference Include="Grpc.Tools" Version="1.21.0" PrivateAssests="All" />
-        <PackageReference Include="Google.Protobuf" Version="3.8.0" />
-        <PackageReference Include="Xam.Plugins.Settings" Version="3.1.1" />
-        <PackageReference Include="Sharpnado.Forms.HorizontalListView" Version="1.2.0" />
+        <PackageReference
+             Include="Xamarin.Forms"
+             Version="3.6.0.264807"/>
+        <PackageReference
+             Include="Xamarin.Essentials"
+             Version="1.0.1"/>
+        <PackageReference
+             Include="Xamarin.Forms.DataGrid"
+             Version="3.1.0"/>
+        <PackageReference
+             Include="taglib-sharp-netstandard2.0"
+             Version="2.1.0"/>
+        <PackageReference
+             Include="LibVLCSharp.Forms"
+             Version="3.0.0"/>
+        <PackageReference
+             Include="VideoLAN.LibVLC.Mac"
+             Version="3.1.3"/>
+        <PackageReference
+             Include="Grpc"
+             Version="1.21.0"/>
+        <PackageReference
+             Include="Grpc.Tools"
+             Version="1.21.0"
+             PrivateAssests="All"/>
+        <PackageReference
+             Include="Google.Protobuf"
+             Version="3.8.0"/>
+        <PackageReference
+             Include="Xam.Plugins.Settings"
+             Version="3.1.1"/>
+        <PackageReference
+             Include="Sharpnado.Forms.HorizontalListView"
+             Version="1.2.0"/>
     </ItemGroup>
     <ItemGroup>
-        <Folder Include="Design\" />
-        <Folder Include="Design\Components\" />
-        <Folder Include="Design\Views\" />
-        <Folder Include="Design\Views\Songs\" />
-        <Folder Include="Design\Views\MainView\" />
-        <Folder Include="Design\Behaviors\" />
-        <Folder Include="Design\Components\NavigationMenu\" />
-        <Folder Include="Design\Views\Albums\" />
-        <Folder Include="Design\Views\Artists\" />
-        <Folder Include="Design\Views\Stations\" />
-        <Folder Include="Utils\" />
-        <Folder Include="Models\" />
-        <Folder Include="Services\" />
-        <Folder Include="Design\Views\Party\" />
-        <Folder Include="Design\Components\HostSelector\" />
-        <Folder Include="Design\Components\MemberList\" />
-        <Folder Include="Design\Components\Queue\" />
-        <Folder Include="Design\Views\Profile\" />
+        <Folder
+             Include="Design\"/>
+        <Folder
+             Include="Design\Components\"/>
+        <Folder
+             Include="Design\Views\"/>
+        <Folder
+             Include="Design\Views\Songs\"/>
+        <Folder
+             Include="Design\Views\MainView\"/>
+        <Folder
+             Include="Design\Behaviors\"/>
+        <Folder
+             Include="Design\Components\NavigationMenu\"/>
+        <Folder
+             Include="Design\Views\Albums\"/>
+        <Folder
+             Include="Design\Views\Artists\"/>
+        <Folder
+             Include="Design\Views\Stations\"/>
+        <Folder
+             Include="Utils\"/>
+        <Folder
+             Include="Models\"/>
+        <Folder
+             Include="Services\"/>
+        <Folder
+             Include="Design\Views\Party\"/>
+        <Folder
+             Include="Design\Components\HostSelector\"/>
+        <Folder
+             Include="Design\Components\MemberList\"/>
+        <Folder
+             Include="Design\Components\Queue\"/>
+        <Folder
+             Include="Design\Views\Profile\"/>
     </ItemGroup>
     <ItemGroup>
-        <Compile Update="Design\Components\MusicPlayer\Player.xaml.cs">
+        <Compile
+             Update="Design\Components\MusicPlayer\Player.xaml.cs">
             <DependentUpon>Player.xaml</DependentUpon>
         </Compile>
     </ItemGroup>
     <ItemGroup>
-        <Protobuf Include="Proto\general.proto" />
-        <Protobuf Include="Proto\party.proto" />
-        <Protobuf Include="Proto\playback.proto" />
-        <Protobuf Include="Proto\events.proto" />
+        <Protobuf
+             Include="Proto\general.proto"/>
+        <Protobuf
+             Include="Proto\party.proto"/>
+        <Protobuf
+             Include="Proto\events.proto"/>
     </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Aurora/Design/Components/Queue/Queue.xaml b/Aurora/Design/Components/Queue/Queue.xaml
index 0849ed7..bfa5dad 100644
--- a/Aurora/Design/Components/Queue/Queue.xaml
+++ b/Aurora/Design/Components/Queue/Queue.xaml
@@ -12,6 +12,10 @@
              HeaderHeight="40"
              BorderColor="#CCCCCC"
              HeaderBackground="#E0E6F8">
+            <dg:DataGrid.GestureRecognizers>
+                <TapGestureRecognizer
+                     NumberOfTapsRequired="2"/>
+            </dg:DataGrid.GestureRecognizers>
             <dg:DataGrid.HeaderFontSize>
                 <OnIdiom
                      x:TypeArguments="x:Double">
diff --git a/Aurora/Design/Components/Queue/Queue.xaml.cs b/Aurora/Design/Components/Queue/Queue.xaml.cs
index 83d0e6d..16b2f8c 100644
--- a/Aurora/Design/Components/Queue/Queue.xaml.cs
+++ b/Aurora/Design/Components/Queue/Queue.xaml.cs
@@ -12,6 +12,10 @@ namespace Aurora.Design.Components.Queue
         public Queue()
         {
             InitializeComponent();
+            this.QueueDataGrid.ItemSelected += (sender, e) =>
+            {
+                this.SelectedItem = e.SelectedItem;
+            };
         }
 
         #region ItemsSource Property
@@ -69,8 +73,7 @@ namespace Aurora.Design.Components.Queue
             BindableProperty.Create(propertyName: "SelectedItem",
             returnType: typeof(object),
             declaringType: typeof(Queue),
-            defaultBindingMode: BindingMode.TwoWay,
-            propertyChanged: OnSelectedItemChanged);
+            defaultBindingMode: BindingMode.TwoWay);
 
         /// <summary>
         /// Backing property for the SelectedItem property.
@@ -88,22 +91,58 @@ namespace Aurora.Design.Components.Queue
             }
         }
 
+
         /// <summary>
-        /// Handles selection change events.
+        /// Bindable property for the item double clicked command
         /// </summary>
-        /// <param name="bindable">The bindable object.</param>
+        /// <param name=""SelectedItem""></param>
+        /// <param name="typeof(BaseMetadata"></param>
+        /// <returns></returns>
+        public static readonly BindableProperty ItemDoubleClickedProperty =
+            BindableProperty.Create(propertyName: "ItemDoubleClicked",
+            returnType: typeof(Command),
+            declaringType: typeof(Queue),
+            propertyChanged: OnDoubleClickPropertyChanged);
+
+        /// <summary>
+        /// Public backing property
+        /// </summary>
+        /// <value></value>
+        public Command ItemDoubleClicked
+        {
+            get
+            {
+                return (Command)GetValue(ItemDoubleClickedProperty);
+            }
+            set
+            {
+                SetValue(ItemDoubleClickedProperty, value);
+            }
+        }
+
+        /// <summary>
+        /// Event handler for double click property. Adds command execute handler.
+        /// </summary>
+        /// <param name="bindable"></param>
         /// <param name="newValue"></param>
         /// <param name="oldValue"></param>
-        private static void OnSelectedItemChanged(BindableObject bindable, object newValue, object oldValue)
+        private static void OnDoubleClickPropertyChanged(BindableObject bindable, object newValue, object oldValue)
         {
             Queue control = bindable as Queue;
             var queueDataGrid = control.FindByName("QueueDataGrid") as DataGrid;
-            IEnumerable<object> source = (IEnumerable<object>)queueDataGrid.ItemsSource;
-            if (source.Contains(newValue))
+            if (queueDataGrid.GestureRecognizers.Count > 0)
             {
-                queueDataGrid.SelectedItem = newValue;
-            }
+                var gestureRecognizer = queueDataGrid.GestureRecognizers.First();
 
+                if (gestureRecognizer is TapGestureRecognizer)
+                {
+                    TapGestureRecognizer tap = gestureRecognizer as TapGestureRecognizer;
+                    tap.Tapped += (sender, e) =>
+                    {
+                        control.ItemDoubleClicked.Execute(null);
+                    };
+                }
+            }
         }
     }
 }
diff --git a/Aurora/Design/Views/Party/PartyView.xaml b/Aurora/Design/Views/Party/PartyView.xaml
index 799ce28..4dbad0c 100644
--- a/Aurora/Design/Views/Party/PartyView.xaml
+++ b/Aurora/Design/Views/Party/PartyView.xaml
@@ -24,7 +24,9 @@
                 <Label
                      Text="Queue"/>
                 <qu:Queue
-                     ItemsSource="{Binding Queue}"/>
+                     ItemsSource="{Binding Queue}"
+                     SelectedItem="{Binding SelectedSong}"
+                     ItemDoubleClicked="{Binding PlayCommand}"/>
             </StackLayout>
             <hs:HostSelector
                  Grid.Row="0"
diff --git a/Aurora/Design/Views/Party/PartyViewModel.cs b/Aurora/Design/Views/Party/PartyViewModel.cs
index 38ef8a7..c640c0c 100644
--- a/Aurora/Design/Views/Party/PartyViewModel.cs
+++ b/Aurora/Design/Views/Party/PartyViewModel.cs
@@ -8,6 +8,7 @@ using Aurora.Proto.General;
 using Aurora.Proto.Party;
 using Aurora.Proto.Events;
 using Aurora.Services.ClientService;
+using Aurora.Services.PlayerService;
 using Aurora.Models.Media;
 
 namespace Aurora.Design.Views.Party
@@ -24,8 +25,8 @@ namespace Aurora.Design.Views.Party
         private PartyState _state;
         private string _hostname;
         private ObservableCollection<PartyMember> _members;
-
-        private ObservableCollection<RemoteMediaData> _queue;
+        private ObservableCollection<BaseMedia> _queue;
+        private BaseMedia _selectedSong;
 
         public PartyViewModel()
         {
@@ -33,10 +34,12 @@ namespace Aurora.Design.Views.Party
             this.HostCommand = new Command(OnHostExecute, CanHostExecute);
 
             _members = new ObservableCollection<PartyMember>();
-            _queue = new ObservableCollection<RemoteMediaData>();
+            _queue = new ObservableCollection<BaseMedia>();
 
             SetState(PartyState.SelectingHost);
 
+            PlayCommand = new Command(PlayExecute);
+
             //Hook up event handler
             ClientService.Instance.EventReceived += this.OnEventReceived;
         }
@@ -70,7 +73,7 @@ namespace Aurora.Design.Views.Party
             get { return _state != PartyState.SelectingHost; }
         }
 
-        public ObservableCollection<RemoteMediaData> Queue
+        public ObservableCollection<BaseMedia> Queue
         {
             get
             {
@@ -94,6 +97,14 @@ namespace Aurora.Design.Views.Party
             set { SetProperty(ref _hostname, value); }
         }
 
+        public BaseMedia SelectedSong
+        {
+            get { return _selectedSong; }
+            set { SetProperty(ref _selectedSong, value); }
+        }
+
+        public Command PlayCommand { get; private set; }
+
         #endregion Properties
 
         #region Events
@@ -209,9 +220,21 @@ namespace Aurora.Design.Views.Party
                 QueueResponse queueResponse = ClientService.Instance.RemotePartyClient.GetQueue(new Empty());
 
                 Queue.Clear();
+                //Convert received data to remote audio models
                 foreach (RemoteMediaData data in queueResponse.MediaList)
                 {
-                    Queue.Add(data);
+                    //Assign received metadata (since this can't be aquired from a file)
+                    AudioMetadata meta = new AudioMetadata();
+                    meta.Title = data.Title;
+                    meta.Album = data.Album;
+                    meta.Artist = data.Artist;
+                    meta.Duration = data.Duration;
+
+                    RemoteAudio remote = new RemoteAudio(data.Id,
+                        meta,
+                        ClientService.Instance.RemotePartyClient);
+
+                    Queue.Add(remote);
                 }
             }
             catch (Exception ex)
@@ -245,6 +268,11 @@ namespace Aurora.Design.Views.Party
             Members.Add(member);
         }
 
+        public void PlayExecute()
+        {
+            PlayerService.Instance.LoadMedia(_selectedSong);
+            PlayerService.Instance.Play();
+        }
         #endregion Private Methods
     }
 }
\ No newline at end of file
diff --git a/Aurora/Models/Media/BaseMedia.cs b/Aurora/Models/Media/BaseMedia.cs
index 4527a79..ae71cf8 100644
--- a/Aurora/Models/Media/BaseMedia.cs
+++ b/Aurora/Models/Media/BaseMedia.cs
@@ -15,7 +15,7 @@ namespace Aurora.Models.Media
         }
 
         #region Properties
-        public string Id { get; private set; }
+        public string Id { get; protected set; }
 
         #endregion Properties
 
diff --git a/Aurora/Models/Media/RemoteAudio.cs b/Aurora/Models/Media/RemoteAudio.cs
new file mode 100644
index 0000000..bc4a515
--- /dev/null
+++ b/Aurora/Models/Media/RemoteAudio.cs
@@ -0,0 +1,83 @@
+using System;
+using System.IO;
+using System.Threading;
+using Aurora.Proto.Party;
+using Aurora.Proto.General;
+
+namespace Aurora.Models.Media
+{
+    public class RemoteAudio : BaseMedia
+    {
+        private RemotePartyService.RemotePartyServiceClient _client;
+        private CancellationTokenSource _cancellationTokenSource;
+
+        #region Constructor
+        public RemoteAudio(string id, RemotePartyService.RemotePartyServiceClient client)
+        {
+            this.Id = id;
+            this._client = client;
+
+            _cancellationTokenSource = new CancellationTokenSource();
+        }
+
+        public RemoteAudio(string id, AudioMetadata metadata, RemotePartyService.RemotePartyServiceClient client)
+        {
+            this.Id = id;
+            this._client = client;
+            this.Metadata = metadata;
+
+            _cancellationTokenSource = new CancellationTokenSource();
+        }
+
+        #endregion Constructor
+
+        #region Properties
+
+        public override BaseMetadata Metadata { get; protected set; }
+
+        public override MediaTypeEnum MediaType
+        {
+            get { return MediaTypeEnum.Audio; }
+        }
+
+        #endregion Properties
+
+        /// <summary>
+        /// Override load method.
+        /// </summary>
+        public override async void Load()
+        {
+            this.DataStream = new MemoryStream();
+
+            using (var call = _client.GetSongStream(new SongRequest() { Id = this.Id }))
+            {
+                while (await call.ResponseStream.MoveNext(_cancellationTokenSource.Token))
+                {
+                    Chunk chunk = call.ResponseStream.Current;
+                    byte[] buffer = chunk.Content.ToByteArray();
+
+                    await this.DataStream.WriteAsync(buffer, 0, buffer.Length, _cancellationTokenSource.Token);
+                    Console.WriteLine(string.Format("Wrote byte chunk of size {0} to output stream", buffer.Length));
+                }
+                Console.WriteLine("Done receiving stream");
+
+            }
+            base.Load();
+        }
+
+        /// <summary>
+        /// Override unload method
+        /// </summary>
+        public override void Unload()
+        {
+            if (!_cancellationTokenSource.IsCancellationRequested)
+            {
+                _cancellationTokenSource.Cancel();
+
+                //Wait for cancellation
+                WaitHandle.WaitAny(new[] { _cancellationTokenSource.Token.WaitHandle });
+            }
+            base.Unload();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Aurora/Proto/party.proto b/Aurora/Proto/party.proto
index ed0669c..924aec5 100644
--- a/Aurora/Proto/party.proto
+++ b/Aurora/Proto/party.proto
@@ -10,6 +10,7 @@ service RemotePartyService {
     rpc LeaveParty(LeavePartyRequest) returns (LeavePartyResponse);
     rpc GetPartyMembers(Aurora.Proto.General.Empty) returns (MembersResponse);
     rpc GetQueue(Aurora.Proto.General.Empty) returns (QueueResponse);
+    rpc GetSongStream(SongRequest) returns (stream Aurora.Proto.General.Chunk) {};
 }
 
 message JoinPartyRequest {
@@ -49,8 +50,13 @@ message QueueResponse{
 }
 
 message RemoteMediaData {
-    string title = 1;
-    string artist = 2;
-    string album = 3;
-    string duration = 4;
+    string id = 1;
+    string title = 2;
+    string artist = 3;
+    string album = 4;
+    string duration = 5;
+}
+
+message SongRequest {
+    string id = 1;
 }
diff --git a/Aurora/Proto/playback.proto b/Aurora/Proto/playback.proto
deleted file mode 100644
index 64dad2e..0000000
--- a/Aurora/Proto/playback.proto
+++ /dev/null
@@ -1,21 +0,0 @@
-syntax = "proto3";
-
-package Aurora.Proto.Playback;
-
-import "Proto/general.proto";
-
-service RemotePlaybackService {
-    //Playback Service
-    rpc GetPartyStream(Aurora.Proto.General.Empty) returns (stream Aurora.Proto.General.Chunk) {};
-}
-
-enum TransferStatusCode {
-    Unknown = 0;
-    Ok = 1;
-    Failed = 2;
-}
-
-message TransferStatus {
-    string Message = 1;
-    TransferStatusCode Code = 2;
-}
\ No newline at end of file
diff --git a/Aurora/RemoteImpl/RemotePartyImpl.cs b/Aurora/RemoteImpl/RemotePartyImpl.cs
index efe1974..93ebf30 100644
--- a/Aurora/RemoteImpl/RemotePartyImpl.cs
+++ b/Aurora/RemoteImpl/RemotePartyImpl.cs
@@ -4,6 +4,7 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Aurora.Proto.Party;
 using Aurora.Proto.Events;
+using Aurora.Proto.General;
 using Aurora.Services.EventManager;
 using Aurora.Services;
 using Aurora.Models.Media;
@@ -104,7 +105,11 @@ namespace Aurora.RemoteImpl
                         metadata = media.Metadata as AudioMetadata;
 
                         RemoteMediaData data = new RemoteMediaData();
-                        data.Title = metadata.Title == null ? metadata.Title : "";
+                        data.Id = media.Id;
+                        if (metadata.Title != null)
+                        {
+                            data.Title = metadata.Title;
+                        }
                         if (metadata.Artist != null)
                         {
                             data.Artist = metadata.Artist;
@@ -130,5 +135,24 @@ namespace Aurora.RemoteImpl
             return Task.FromResult(mediaList);
 
         }
+
+        public override async Task GetSongStream(SongRequest request,
+            Grpc.Core.IServerStreamWriter<Chunk> responseStream,
+            Grpc.Core.ServerCallContext context)
+        {
+            BaseMedia song = LibraryService.Instance.GetSong(request.Id);
+            song.Load();
+
+            //Send stream
+            Console.WriteLine("Begin sending file");
+            byte[] buffer = new byte[2048]; // read in chunks of 2KB
+            int bytesRead;
+            while ((bytesRead = song.DataStream.Read(buffer, 0, buffer.Length)) > 0)
+            {
+                Google.Protobuf.ByteString bufferByteString = Google.Protobuf.ByteString.CopyFrom(buffer);
+                await responseStream.WriteAsync(new Chunk { Content = bufferByteString });
+            }
+            Console.WriteLine("Done sending file");
+        }
     }
 }
\ No newline at end of file
diff --git a/Aurora/RemoteImpl/RemotePlaybackImpl.cs b/Aurora/RemoteImpl/RemotePlaybackImpl.cs
deleted file mode 100644
index 47b8d12..0000000
--- a/Aurora/RemoteImpl/RemotePlaybackImpl.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using System.IO;
-using Aurora.Proto.Playback;
-using Aurora.Proto.General;
-using Aurora.Models;
-
-namespace Aurora.RemoteImpl
-{
-    public class RemotePlaybackServiceImpl : RemotePlaybackService.RemotePlaybackServiceBase
-    {
-
-        public RemotePlaybackServiceImpl()
-        {
-
-        }
-
-        public override Task GetPartyStream(Empty empty,
-            Grpc.Core.IServerStreamWriter<Chunk> responseStream,
-            Grpc.Core.ServerCallContext context)
-        {
-            throw new NotImplementedException("Working on it");
-            // //Send stream
-            // string cwd = Directory.GetCurrentDirectory();
-            // using (FileStream fs = System.IO.File.OpenRead(Path.Combine(cwd, request.FileName)))
-            // {
-            //     Console.WriteLine("Begin sending file");
-            //     byte[] buffer = new byte[2048]; // read in chunks of 2KB
-            //     int bytesRead;
-            //     while ((bytesRead = fs.Read(buffer, 0, buffer.Length)) > 0)
-            //     {
-            //         Google.Protobuf.ByteString bufferByteString = Google.Protobuf.ByteString.CopyFrom(buffer);
-            //         await responseStream.WriteAsync(new Chunk { Content = bufferByteString });
-            //     }
-            //     Console.WriteLine("Done sending file");
-            // };
-        }
-    }
-}
\ No newline at end of file
diff --git a/Aurora/Services/ClientService/ClientService.cs b/Aurora/Services/ClientService/ClientService.cs
index bbd29a5..c17ca9e 100644
--- a/Aurora/Services/ClientService/ClientService.cs
+++ b/Aurora/Services/ClientService/ClientService.cs
@@ -4,7 +4,6 @@ using System.Threading;
 using Grpc.Core;
 using Aurora.Proto.Events;
 using Aurora.Proto.Party;
-using Aurora.Proto.Playback;
 using Aurora.Services.ClientService;
 
 namespace Aurora.Services.ClientService
@@ -12,7 +11,6 @@ namespace Aurora.Services.ClientService
     public class ClientService : BaseService<ClientService>
     {
         private RemotePartyService.RemotePartyServiceClient _remotePartyClient;
-        private RemotePlaybackService.RemotePlaybackServiceClient _remotePlaybackClient;
         private RemoteEventService.RemoteEventServiceClient _remoteEventsClient;
         private Channel _channel;
         CancellationTokenSource _eventCancellationTokenSource;
@@ -32,14 +30,6 @@ namespace Aurora.Services.ClientService
             }
         }
 
-        public RemotePlaybackService.RemotePlaybackServiceClient RemotePlaybackServiceClient
-        {
-            get
-            {
-                return _remotePlaybackClient;
-            }
-        }
-
         public RemoteEventService.RemoteEventServiceClient RemoteEventClient
         {
             get { return _remoteEventsClient; }
@@ -50,8 +40,7 @@ namespace Aurora.Services.ClientService
             get
             {
                 return _remoteEventsClient != null &&
-                    _remotePartyClient != null &&
-                    _remotePlaybackClient != null;
+                    _remotePartyClient != null;
             }
         }
 
@@ -60,7 +49,6 @@ namespace Aurora.Services.ClientService
             _channel = new Channel(string.Format("{0}:{1}", hostname, port), ChannelCredentials.Insecure);
 
             _remotePartyClient = new RemotePartyService.RemotePartyServiceClient(_channel);
-            _remotePlaybackClient = new RemotePlaybackService.RemotePlaybackServiceClient(_channel);
             _remoteEventsClient = new RemoteEventService.RemoteEventServiceClient(_channel);
 
             //Assign but don't start task
@@ -73,7 +61,6 @@ namespace Aurora.Services.ClientService
             await _channel.ShutdownAsync();
 
             _remotePartyClient = null;
-            _remotePlaybackClient = null;
             _remoteEventsClient = null;
         }
 
diff --git a/Aurora/Services/LibraryService.cs b/Aurora/Services/LibraryService.cs
index 1771c82..fb8dfcf 100644
--- a/Aurora/Services/LibraryService.cs
+++ b/Aurora/Services/LibraryService.cs
@@ -37,6 +37,12 @@ namespace Aurora.Services
             return collection;
         }
 
+        public BaseMedia GetSong(string Id)
+        {
+            _library.TryGetValue(Id, out BaseMedia song);
+            return song;
+        }
+
         /// <summary>
         /// Loads library from files.
         /// </summary>
diff --git a/Aurora/Services/ServerService.cs b/Aurora/Services/ServerService.cs
index 3862600..6cee1e8 100644
--- a/Aurora/Services/ServerService.cs
+++ b/Aurora/Services/ServerService.cs
@@ -6,7 +6,6 @@ using Grpc.Core;
 using Aurora.RemoteImpl;
 using Aurora.Proto.Events;
 using Aurora.Proto.Party;
-using Aurora.Proto.Playback;
 
 
 namespace Aurora.Services
@@ -19,7 +18,6 @@ namespace Aurora.Services
 
         //Implementation class declarations
         RemotePartyServiceImpl _remotePartyServiceImpl;
-        RemotePlaybackServiceImpl _remotePlaybackImpl;
         RemoteEventServiceImpl _remoteEventImpl;
 
         /// <summary>
@@ -58,7 +56,6 @@ namespace Aurora.Services
             {
                 return (_remoteEventImpl != null &&
                     _remotePartyServiceImpl != null &&
-                    _remotePlaybackImpl != null &&
                     _server != null);
             }
         }
@@ -78,12 +75,10 @@ namespace Aurora.Services
                 {
                     //Construct implementations
                     _remotePartyServiceImpl = new RemotePartyServiceImpl();
-                    _remotePlaybackImpl = new RemotePlaybackServiceImpl();
                     _remoteEventImpl = new RemoteEventServiceImpl();
 
                     // Register grpc RemoteService with singleton server service
                     RegisterService(RemotePartyService.BindService(_remotePartyServiceImpl));
-                    RegisterService(RemotePlaybackService.BindService(_remotePlaybackImpl));
                     RegisterService(RemoteEventService.BindService(_remoteEventImpl));
                 }
                 _server.Start();