From d2e489e63c093b927c0a9fec650f91dd16d9b7bc Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Thu, 1 Jul 2021 23:04:20 -0700 Subject: [PATCH] Add volume to the view model for access --- RedBookPlayer/GUI/PlayerViewModel.cs | 7 +++++++ RedBookPlayer/Hardware/Player.cs | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/RedBookPlayer/GUI/PlayerViewModel.cs b/RedBookPlayer/GUI/PlayerViewModel.cs index 5090377..6910ecd 100644 --- a/RedBookPlayer/GUI/PlayerViewModel.cs +++ b/RedBookPlayer/GUI/PlayerViewModel.cs @@ -4,6 +4,13 @@ namespace RedBookPlayer.GUI { public class PlayerViewModel : ReactiveObject { + private int _volume; + public int Volume + { + get => _volume; + set => this.RaiseAndSetIfChanged(ref _volume, value); + } + private bool _applyDeEmphasis; public bool ApplyDeEmphasis { diff --git a/RedBookPlayer/Hardware/Player.cs b/RedBookPlayer/Hardware/Player.cs index 362e7df..edfb8ad 100644 --- a/RedBookPlayer/Hardware/Player.cs +++ b/RedBookPlayer/Hardware/Player.cs @@ -274,8 +274,9 @@ namespace RedBookPlayer.Hardware if(!Initialized || dataContext == null) return; - dataContext.HiddenTrack = _opticalDisc.TimeOffset > 150; + dataContext.Volume = App.Settings.Volume; dataContext.ApplyDeEmphasis = _soundOutput.ApplyDeEmphasis; + dataContext.HiddenTrack = _opticalDisc.TimeOffset > 150; if(_opticalDisc is CompactDisc compactDisc) {