Factories and base class renames

This commit is contained in:
Matt Nadareski
2021-07-12 10:52:50 -07:00
parent 788d10ecd8
commit 29205c953b
7 changed files with 67 additions and 64 deletions

View File

@@ -3,6 +3,7 @@ using System.ComponentModel;
using Aaru.CommonTypes.Enums;
using ReactiveUI;
using RedBookPlayer.Common.Discs;
using RedBookPlayer.Common.Factories;
namespace RedBookPlayer.Common.Hardware
{
@@ -179,7 +180,7 @@ namespace RedBookPlayer.Common.Hardware
/// <summary>
/// OpticalDisc object
/// </summary>
private readonly OpticalDisc _opticalDisc;
private readonly OpticalDiscBase _opticalDisc;
/// <summary>
/// Last volume for mute toggling

View File

@@ -68,7 +68,7 @@ namespace RedBookPlayer.Common.Hardware
/// <remarks>
/// TODO: Can we remove the need for a local reference to OpticalDisc?
/// </remarks>
private OpticalDisc _opticalDisc;
private OpticalDiscBase _opticalDisc;
/// <summary>
/// Data provider for sound output
@@ -108,7 +108,7 @@ namespace RedBookPlayer.Common.Hardware
/// <param name="opticalDisc">OpticalDisc to load from</param>
/// <param name="autoPlay">True if playback should begin immediately, false otherwise</param>
/// <param name="defaultVolume">Default volume between 0 and 100 to use when starting playback</param>
public void Init(OpticalDisc opticalDisc, bool autoPlay = false, int defaultVolume = 100)
public void Init(OpticalDiscBase opticalDisc, bool autoPlay = false, int defaultVolume = 100)
{
// If we have an unusable disc, just return
if(opticalDisc == null || !opticalDisc.Initialized)