aaru-dps/RedBookPlayer
1
0
Fork 0
mirror of https://github.com/aaru-dps/RedBookPlayer.git synced 2025-12-16 11:14:39 +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

8
RedBookPlayer.GUI/ViewModels/PlayerViewModel.cs
View File

@@ -656,6 +656,7 @@ namespace RedBookPlayer.GUI.ViewModels
PlayerOptions playerOptions = new PlayerOptions
{
DataPlayback = App.Settings.DataPlayback,
DiscHandling = App.Settings.DiscHandling,
LoadHiddenTracks = App.Settings.PlayHiddenTracks,
RepeatMode = App.Settings.RepeatMode,
SessionHandling = App.Settings.SessionHandling,
@@ -684,6 +685,7 @@ namespace RedBookPlayer.GUI.ViewModels
public void RefreshFromSettings()
{
SetDataPlayback(App.Settings.DataPlayback);
SetDiscHandling(App.Settings.DiscHandling);
SetLoadHiddenTracks(App.Settings.PlayHiddenTracks);
SetRepeatMode(App.Settings.RepeatMode);
SetSessionHandling(App.Settings.SessionHandling);
@@ -727,6 +729,12 @@ namespace RedBookPlayer.GUI.ViewModels
/// <param name="dataPlayback">New playback value</param>
public void SetDataPlayback(DataPlayback dataPlayback) => _player?.SetDataPlayback(dataPlayback);
/// <summary>
/// Set disc handling method
/// </summary>
/// <param name="discHandling">New playback value</param>
public void SetDiscHandling(DiscHandling discHandling) => _player?.SetDiscHandling(discHandling);
/// <summary>
/// Set the value for loading hidden tracks [CompactDisc only]
/// </summary>

18
RedBookPlayer.GUI/ViewModels/SettingsViewModel.cs
View File

@@ -21,6 +21,12 @@ namespace RedBookPlayer.GUI.ViewModels
[JsonIgnore]
public List<DataPlayback> DataPlaybackValues => GenerateDataPlaybackList();
/// <summary>
/// List of all disc handling values
/// </summary>
[JsonIgnore]
public List<DiscHandling> DiscHandlingValues => GenerateDiscHandlingList();
/// <summary>
/// List of all repeat mode values
/// </summary>
@@ -49,6 +55,11 @@ namespace RedBookPlayer.GUI.ViewModels
/// </summary>
public int NumberOfDiscs { get; set; } = 1;
/// <summary>
/// Indicates how to deal with multiple discs
/// </summary>
public DiscHandling DiscHandling { get; set; } = DiscHandling.SingleDisc;
/// <summary>
/// Indicates if an index change can trigger a track change
/// </summary>
@@ -77,7 +88,7 @@ namespace RedBookPlayer.GUI.ViewModels
/// <summary>
/// Indicates how to repeat tracks
/// </summary>
public RepeatMode RepeatMode { get; set; } = RepeatMode.AllSingleDisc;
public RepeatMode RepeatMode { get; set; } = RepeatMode.All;
/// <summary>
/// Indicates how to handle tracks on different sessions
@@ -290,6 +301,11 @@ namespace RedBookPlayer.GUI.ViewModels
/// </summary>
private List<DataPlayback> GenerateDataPlaybackList() => Enum.GetValues(typeof(DataPlayback)).Cast<DataPlayback>().ToList();
/// <summary>
/// Generate the list of DiscHandling values
/// </summary>
private List<DiscHandling> GenerateDiscHandlingList() => Enum.GetValues(typeof(DiscHandling)).Cast<DiscHandling>().ToList();
/// <summary>
/// Generate the list of Key values
/// </summary>

5
RedBookPlayer.GUI/Views/SettingsWindow.xaml
View File

@@ -45,6 +45,11 @@
<NumericUpDown Name="NumberOfDiscs" Margin="8,0,0,0" Width="120"
Value="{Binding NumberOfDiscs, Mode=TwoWay}" Minimum="1" Maximum="100" />
</WrapPanel>
<WrapPanel Margin="0,0,0,16">
<TextBlock Width="120">Disc Handling</TextBlock>
<ComboBox Name="DiscHandling" Margin="8,0,0,0" Width="120"
Items="{Binding DiscHandlingValues}" SelectedItem="{Binding DiscHandling, Mode=TwoWay}" />
</WrapPanel>
<WrapPanel Margin="0,0,0,16">
<CheckBox IsChecked="{Binding GenerateMissingTOC}" Margin="0,0,8,0"/>
<TextBlock VerticalAlignment="Center">Generate a TOC if the disc is missing one</TextBlock>

26
RedBookPlayer.Models/Enums.cs
View File

@@ -21,6 +21,23 @@ namespace RedBookPlayer.Models
Play = 2,
}
/// <summary>
/// Determine how to handle multiple discs
/// </summary>
/// <remarks>Used with both repeat and shuffle</remarks>
public enum DiscHandling
{
/// <summary>
/// Only deal with tracks on the current disc
/// </summary>
SingleDisc = 0,
/// <summary>
/// Deal with tracks on all loaded discs
/// </summary>
MultiDisc = 1,
}
/// <summary>
/// Current player state
/// </summary>
@@ -63,14 +80,9 @@ namespace RedBookPlayer.Models
Single,
/// <summary>
/// Repeat all tracks on a single disc
/// Repeat all tracks
/// </summary>
AllSingleDisc,
/// <summary>
/// Repeat all tracks on a multiple discs
/// </summary>
AllMultiDisc,
All,
}
/// <summary>

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();

5
RedBookPlayer.Models/Hardware/PlayerOptions.cs
View File

@@ -7,6 +7,11 @@ namespace RedBookPlayer.Models.Discs
/// </summary>
public DataPlayback DataPlayback { get; set; } = DataPlayback.Skip;
/// <summary>
/// Indicates how to deal with multiple discs
/// </summary>
public DiscHandling DiscHandling { get; set; } = DiscHandling.SingleDisc;
/// <summary>
/// Indicate if hidden tracks should be loaded
/// </summary>