[vlc-commits] macosx: introduce constants for volume default and maximum internal to the module

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <felix at feepk.net> | Wed May 29 19:07:52 2019 +0200| [5738d7a0b65bc692185a63c3caa1bcd9542c4f45] | committer: Felix Paul Kühne

macosx: introduce constants for volume default and maximum internal to the module

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5738d7a0b65bc692185a63c3caa1bcd9542c4f45
---

 modules/gui/macosx/playlist/VLCPlayerController.h                | 3 +++
 modules/gui/macosx/playlist/VLCPlayerController.m                | 3 +++
 modules/gui/macosx/windows/mainwindow/VLCMainWindowControlsBar.m | 3 ---
 modules/gui/macosx/windows/video/VLCFSPanelController.m          | 6 ++----
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/modules/gui/macosx/playlist/VLCPlayerController.h b/modules/gui/macosx/playlist/VLCPlayerController.h
index 7a83bba9ce..1909beac13 100644
--- a/modules/gui/macosx/playlist/VLCPlayerController.h
+++ b/modules/gui/macosx/playlist/VLCPlayerController.h
@@ -227,6 +227,9 @@ extern NSString *VLCPlayerVolumeChanged;
  */
 extern NSString *VLCPlayerMuteChanged;
 
+extern const CGFloat VLCVolumeMaximum;
+extern const CGFloat VLCVolumeDefault;
+
 @interface VLCPlayerController : NSObject
 
 - (instancetype)initWithPlayer:(vlc_player_t *)player;
diff --git a/modules/gui/macosx/playlist/VLCPlayerController.m b/modules/gui/macosx/playlist/VLCPlayerController.m
index fc97049fd3..268eecf250 100644
--- a/modules/gui/macosx/playlist/VLCPlayerController.m
+++ b/modules/gui/macosx/playlist/VLCPlayerController.m
@@ -71,6 +71,9 @@ NSString *VLCPlayerListOfVideoOutputThreadsChanged = @"VLCPlayerListOfVideoOutpu
 NSString *VLCPlayerVolumeChanged = @"VLCPlayerVolumeChanged";
 NSString *VLCPlayerMuteChanged = @"VLCPlayerMuteChanged";
 
+const CGFloat VLCVolumeMaximum = 2.;
+const CGFloat VLCVolumeDefault = 1.;
+
 @interface VLCPlayerController ()
 {
     vlc_player_t *_p_player;
diff --git a/modules/gui/macosx/windows/mainwindow/VLCMainWindowControlsBar.m b/modules/gui/macosx/windows/mainwindow/VLCMainWindowControlsBar.m
index e7a113e729..f66d1ca27b 100644
--- a/modules/gui/macosx/windows/mainwindow/VLCMainWindowControlsBar.m
+++ b/modules/gui/macosx/windows/mainwindow/VLCMainWindowControlsBar.m
@@ -29,9 +29,6 @@
 #import "playlist/VLCPlaylistController.h"
 #import "playlist/VLCPlayerController.h"
 
-CGFloat VLCVolumeMaximum = 2.;
-CGFloat VLCVolumeDefault = 1.;
-
 /*****************************************************************************
  * VLCMainWindowControlsBar
  *
diff --git a/modules/gui/macosx/windows/video/VLCFSPanelController.m b/modules/gui/macosx/windows/video/VLCFSPanelController.m
index fb4eb160a9..9e4e7e038f 100644
--- a/modules/gui/macosx/windows/video/VLCFSPanelController.m
+++ b/modules/gui/macosx/windows/video/VLCFSPanelController.m
@@ -25,8 +25,6 @@
 
 #import "VLCFSPanelController.h"
 
-#import <vlc_aout.h>
-
 #import "extensions/NSString+Helpers.h"
 #import "main/VLCMain.h"
 #import "playlist/VLCPlaylistController.h"
@@ -150,9 +148,9 @@ static NSString *kAssociatedFullscreenRect = @"VLCFullscreenAssociatedWindowRect
                 _NS("Adjust the current playback position"));
 
     /* Setup other controls */
-    [_volumeSlider setMaxValue:2.0];
+    [_volumeSlider setMaxValue:VLCVolumeMaximum];
     [_volumeSlider setFloatValue:_playerController.volume];
-    [_volumeSlider setDefaultValue:1.0];
+    [_volumeSlider setDefaultValue:VLCVolumeDefault];
 
     /* Identifier to store the state of the remaining or total time label,
      * this is the same identifier as used for the window playback cotrols