watsonb8/aurora-sharp-desktop
Archived
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

First pass at syncing worked with some bug fixes

Browse Source
This commit is contained in:
watsonb8 2019-11-12 20:09:45 -05:00
parent 1acc383e90
commit 3398d145ac
8 changed files with 128 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Aurora/Design/Views/Party/PartyViewModel.cs
View File

@ -225,7 +225,7 @@ namespace Aurora.Design.Views.Party
{
SetState(PartyState.Connecting);
_client.Start(Hostname, SettingsService.Instance.DefaultPort.ToString());
await JoinParty();
await JoinParty(false);
//TODO add cancellation token
try
@ -252,7 +252,7 @@ namespace Aurora.Design.Views.Party
string localHost = ServerService.GetLocalIPAddress();
_client.IsHost = true;
_client.Start(localHost, SettingsService.Instance.DefaultPort.ToString());
await JoinParty();
await JoinParty(true);
//TODO add cancellation token
@ -341,7 +341,7 @@ namespace Aurora.Design.Views.Party
/// Join the remote party.
/// </summary>
/// <returns></returns>
private async Task JoinParty()
private async Task JoinParty(bool asHost)
{
try
{
@ -383,6 +383,7 @@ namespace Aurora.Design.Views.Party
meta.Duration = data.Duration;
RemoteAudio remote = new RemoteAudio(data.Id,
asHost,
meta,
_client.RemotePlaybackClient,
_client.RemoteSyncClient);

20
Aurora/Models/Media/BaseMedia.cs
View File

@ -6,35 +6,39 @@ namespace Aurora.Models.Media
{
public abstract class BaseMedia
{
private bool _loaded;
private Stream _stream;
public BaseMedia()
{
_loaded = false;
Id = Guid.NewGuid().ToString();
}
#region Properties
public string Id { get; protected set; }
public abstract MediaTypeEnum MediaType { get; }
public abstract BaseMetadata Metadata { get; protected set; }
public bool IsLoaded
{
get
{
return DataStream != null;
}
}
#endregion Properties
public virtual Task Load()
{
_loaded = true;
return Task.FromResult(default(object));
}
public virtual void Unload()
{
_loaded = false;
}
public abstract MediaTypeEnum MediaType { get; }
public abstract BaseMetadata Metadata { get; protected set; }
/// <summary>
/// Gets or sets the data stream that holds the song.

6
Aurora/Models/Media/LocalAudio.cs
View File

@ -12,6 +12,12 @@ namespace Aurora.Models.Media
LoadMetadata();
}
public LocalAudio(LocalAudio copy)
{
File = copy.File;
LoadMetadata();
}
#region Properties
public FileInfo File { get; private set; }

14
Aurora/Models/Media/RemoteAudio.cs
View File

@ -15,7 +15,9 @@ namespace Aurora.Models.Media
private CancellationTokenSource _cancellationTokenSource;
#region Constructor
public RemoteAudio(string id, AudioMetadata metadata,
public RemoteAudio(string id,
bool fromHost,
AudioMetadata metadata,
RemotePlaybackService.RemotePlaybackServiceClient playbackClient,
RemoteSyncService.RemoteSyncServiceClient syncClient)
{
@ -23,6 +25,7 @@ namespace Aurora.Models.Media
this._remotePlaybackClient = playbackClient;
this._remoteSyncClient = syncClient;
this.Metadata = metadata;
this.FromHost = fromHost;
_cancellationTokenSource = new CancellationTokenSource();
}
@ -46,6 +49,7 @@ namespace Aurora.Models.Media
}
}
public bool FromHost { get; private set; }
#endregion Properties
/// <summary>
@ -55,6 +59,8 @@ namespace Aurora.Models.Media
{
this.DataStream = new MemoryStream();
using (var call = _remotePlaybackClient.GetSongStream(new SongRequest() { Id = this.Id }))
{
try
{
while (await call.ResponseStream.MoveNext(_cancellationTokenSource.Token))
{
@ -64,7 +70,11 @@ namespace Aurora.Models.Media
await this.DataStream.WriteAsync(buffer, 0, buffer.Length);
}
Console.WriteLine("Done receiving stream");
}
catch (Exception ex)
{
Console.WriteLine("Exception caught while loading remote audio:" + ex.Message);
}
}
await base.Load();
}

25
Aurora/RemoteImpl/RemotePlaybackImpl.cs
View File

@ -15,19 +15,38 @@ namespace Aurora.RemoteImpl
Grpc.Core.IServerStreamWriter<Chunk> responseStream,
Grpc.Core.ServerCallContext context)
{
BaseMedia song = LibraryService.Instance.GetSong(request.Id);
await song.Load();
BaseMedia originalSong = LibraryService.Instance.GetSong(request.Id);
if (!(originalSong is LocalAudio))
{
return;
}
//Copy media object to not interfere with other threads
LocalAudio songCopy = new LocalAudio((LocalAudio)originalSong);
try
{
//Load only if not already loaded. (Multiple clients may be requesting media)
if (!songCopy.IsLoaded)
{
await songCopy.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)
while ((bytesRead = songCopy.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");
}
catch (Exception ex)
{
Console.WriteLine("Exception caught while sending audio file: " + ex.Message);
}
}
}
}

19
Aurora/RemoteImpl/RemoteSyncImpl.cs
View File

@ -19,18 +19,22 @@ namespace Aurora.RemoteImpl
Grpc.Core.IServerStreamWriter<Sync> responseStream,
Grpc.Core.ServerCallContext context)
{
bool songIsPlaying = true;
PlaybackStateChangedEventHandler playbackStateChanged = (sender, e) =>
bool continueSync = true;
string currentId = PlayerService.Instance.CurrentMedia.Id;
MediaChangedEventHandler mediaChanged = (sender, e) =>
{
songIsPlaying = false;
if (e.NewId != currentId)
{
continueSync = false;
}
};
PlayerService.Instance.PlaybackStateChanged += playbackStateChanged;
PlayerService.Instance.MediaChanged += mediaChanged;
while (songIsPlaying)
while (continueSync)
{
DateTime time = Utils.TimeUtils.GetNetworkTime();
float position = PlayerService.Instance.CurrentMediaTime;
float position = PlayerService.Instance.CurrentMediaPosition;
float length = PlayerService.Instance.CurrentMediaLength;
float trackTime = length * position;
@ -41,7 +45,8 @@ namespace Aurora.RemoteImpl
ServerTime = time.Ticks
};
await responseStream.WriteAsync(sync);
await Task.Delay(10000);
Console.WriteLine("Sent Sync");
await Task.Delay(5000);
}
}
}

4
Aurora/Services/PlayerService/MediaChangedEvent.cs
View File

@ -8,10 +8,12 @@ namespace Aurora.Services.PlayerService
public class MediaChangedEventArgs : EventArgs
{
public BaseMetadata NewMetadata { get; private set; }
public string NewId { get; private set; }
public MediaChangedEventArgs(BaseMetadata metadata)
public MediaChangedEventArgs(string id, BaseMetadata metadata)
{
NewMetadata = metadata;
NewId = id;
}
}
}

25
Aurora/Services/PlayerService/PlayerService.cs
View File

@ -41,7 +41,7 @@ namespace Aurora.Services.PlayerService
{
get
{
return this._currentMedia == null;
return this._currentMedia != null;
}
}
@ -50,7 +50,12 @@ namespace Aurora.Services.PlayerService
return _currentMedia == media;
}
public float CurrentMediaTime
public BaseMedia CurrentMedia
{
get { return _currentMedia; }
}
public float CurrentMediaPosition
{
get
{
@ -85,7 +90,7 @@ namespace Aurora.Services.PlayerService
if (MediaChanged != null)
{
MediaChanged.Invoke(this, new MediaChangedEventArgs(_currentMedia.Metadata));
MediaChanged.Invoke(this, new MediaChangedEventArgs(_currentMedia.Id, _currentMedia.Metadata));
}
}
@ -103,6 +108,8 @@ namespace Aurora.Services.PlayerService
if (_currentMedia is RemoteAudio)
{
RemoteAudio media = _currentMedia as RemoteAudio;
if (!media.FromHost)
{
RemoteSyncService.RemoteSyncServiceClient _remoteSyncClient = media.RemoteSyncClient;
//Sync playback in a separate task
@ -126,9 +133,16 @@ namespace Aurora.Services.PlayerService
float offset = ((localTime.Ticks - sync.ServerTime) * 100) / (1000 * 1000);
float length = CurrentMediaLength;
float position = (sync.TrackTime + offset) / length;
float newPosition = (sync.TrackTime + offset) / length;
_mediaPlayer.Position = position;
//Adjust position if greater than 10 percent difference
float oldPosition = _mediaPlayer.Position;
if (newPosition - oldPosition > 0.001 ||
newPosition - oldPosition < -0.001)
{
_mediaPlayer.Position = newPosition;
Console.WriteLine("Audio synced");
}
}
}
}
@ -141,6 +155,7 @@ namespace Aurora.Services.PlayerService
syncTask.Start();
}
}
if (PlaybackStateChanged != null)
{