aaru-dps/RedBookPlayer
1
0
Fork 0
mirror of https://github.com/aaru-dps/RedBookPlayer.git synced 2025-12-16 19:24:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Separate out disc handling

Browse Source
This commit is contained in:
Matt Nadareski
2021-10-05 22:52:12 -07:00
parent 0b63ebf18b
commit 05875b919c
6 changed files with 130 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
RedBookPlayer.Models/Hardware/Player.cs
View File

@@ -22,6 +22,8 @@ namespace RedBookPlayer.Models.Hardware
private set => this.RaiseAndSetIfChanged(ref _initialized, value);
}
#region Playback Passthrough
/// <summary>
/// Currently selected disc
/// </summary>
@@ -40,6 +42,60 @@ namespace RedBookPlayer.Models.Hardware
}
}
/// <summary>
/// Indicates how to deal with multiple discs
/// </summary>
public DiscHandling DiscHandling
{
get => _discHandling;
private set => this.RaiseAndSetIfChanged(ref _discHandling, value);
}
/// <summary>
/// Indicates how to handle playback of data tracks
/// </summary>
public DataPlayback DataPlayback
{
get => _dataPlayback;
private set => this.RaiseAndSetIfChanged(ref _dataPlayback, value);
}
/// <summary>
/// Indicate if hidden tracks should be loaded
/// </summary>
public bool LoadHiddenTracks
{
get => _loadHiddenTracks;
private set => this.RaiseAndSetIfChanged(ref _loadHiddenTracks, value);
}
/// <summary>
/// Indicates the repeat mode
/// </summary>
public RepeatMode RepeatMode
{
get => _repeatMode;
private set => this.RaiseAndSetIfChanged(ref _repeatMode, value);
}
/// <summary>
/// Indicates how tracks on different session should be handled
/// </summary>
public SessionHandling SessionHandling
{
get => _sessionHandling;
private set => this.RaiseAndSetIfChanged(ref _sessionHandling, value);
}
/// <summary>
/// Indicates if de-emphasis should be applied
/// </summary>
public bool ApplyDeEmphasis
{
get => _applyDeEmphasis;
private set => this.RaiseAndSetIfChanged(ref _applyDeEmphasis, value);
}
/// <summary>
/// Should invoke playback mode changes
/// </summary>
@@ -52,8 +108,16 @@ namespace RedBookPlayer.Models.Hardware
private bool _initialized;
private int _numberOfDiscs;
private int _currentDisc;
private DiscHandling _discHandling;
private bool _loadHiddenTracks;
private DataPlayback _dataPlayback;
private RepeatMode _repeatMode;
private SessionHandling _sessionHandling;
private bool _applyDeEmphasis;
private bool _shouldInvokePlaybackModes;
#endregion
#region OpticalDisc Passthrough
/// <summary>
@@ -206,51 +270,6 @@ namespace RedBookPlayer.Models.Hardware
private set => this.RaiseAndSetIfChanged(ref _playerState, value);
}
/// <summary>
/// Indicates how to handle playback of data tracks
/// </summary>
public DataPlayback DataPlayback
{
get => _dataPlayback;
private set => this.RaiseAndSetIfChanged(ref _dataPlayback, value);
}
/// <summary>
/// Indicate if hidden tracks should be loaded
/// </summary>
public bool LoadHiddenTracks
{
get => _loadHiddenTracks;
private set => this.RaiseAndSetIfChanged(ref _loadHiddenTracks, value);
}
/// <summary>
/// Indicates the repeat mode
/// </summary>
public RepeatMode RepeatMode
{
get => _repeatMode;
private set => this.RaiseAndSetIfChanged(ref _repeatMode, value);
}
/// <summary>
/// Indicates how tracks on different session should be handled
/// </summary>
public SessionHandling SessionHandling
{
get => _sessionHandling;
private set => this.RaiseAndSetIfChanged(ref _sessionHandling, value);
}
/// <summary>
/// Indicates if de-emphasis should be applied
/// </summary>
public bool ApplyDeEmphasis
{
get => _applyDeEmphasis;
private set => this.RaiseAndSetIfChanged(ref _applyDeEmphasis, value);
}
/// <summary>
/// Current playback volume
/// </summary>
@@ -261,11 +280,6 @@ namespace RedBookPlayer.Models.Hardware
}
private PlayerState _playerState;
private DataPlayback _dataPlayback;
private bool _loadHiddenTracks;
private RepeatMode _repeatMode;
private SessionHandling _sessionHandling;
private bool _applyDeEmphasis;
private int _volume;
#endregion
@@ -340,6 +354,7 @@ namespace RedBookPlayer.Models.Hardware
// Set player options
DataPlayback = playerOptions.DataPlayback;
DiscHandling = playerOptions.DiscHandling;
LoadHiddenTracks = playerOptions.LoadHiddenTracks;
RepeatMode = playerOptions.RepeatMode;
SessionHandling = playerOptions.SessionHandling;
@@ -710,7 +725,7 @@ namespace RedBookPlayer.Models.Hardware
int cachedTrackNumber;
// Take care of disc switching first
if(RepeatMode == RepeatMode.AllMultiDisc)
if(DiscHandling == DiscHandling.MultiDisc)
{
if(trackNumber > (int)compactDisc.Tracks.Max(t => t.TrackSequence))
{
@@ -800,7 +815,7 @@ namespace RedBookPlayer.Models.Hardware
{
if(trackNumber >= _opticalDiscs[CurrentDisc].TotalTracks)
{
if(RepeatMode == RepeatMode.AllMultiDisc)
if(DiscHandling == DiscHandling.MultiDisc)
{
do
{
@@ -813,7 +828,7 @@ namespace RedBookPlayer.Models.Hardware
}
else if(trackNumber < 1)
{
if(RepeatMode == RepeatMode.AllMultiDisc)
if(DiscHandling == DiscHandling.MultiDisc)
{
do
{
@@ -1043,6 +1058,12 @@ namespace RedBookPlayer.Models.Hardware
/// <param name="dataPlayback">New playback value</param>
public void SetDataPlayback(DataPlayback dataPlayback) => DataPlayback = dataPlayback;
/// <summary>
/// Set disc handling method
/// </summary>
/// <param name="discHandling">New playback value</param>
public void SetDiscHandling(DiscHandling discHandling) => DiscHandling = discHandling;
/// <summary>
/// Set the value for loading hidden tracks [CompactDisc only]
/// </summary>
@@ -1085,10 +1106,10 @@ namespace RedBookPlayer.Models.Hardware
case RepeatMode.Single:
_opticalDiscs[CurrentDisc].LoadTrack(CurrentTrackNumber);
break;
case RepeatMode.AllSingleDisc:
case RepeatMode.All when DiscHandling == DiscHandling.SingleDisc:
SelectTrack(1);
break;
case RepeatMode.AllMultiDisc:
case RepeatMode.All when DiscHandling == DiscHandling.MultiDisc:
do
{
NextDisc();