macosx: set max volume as configuable

no new strings.

close #8628

diff --git a/modules/gui/macosx/CoreInteraction.h b/modules/gui/macosx/CoreInteraction.h
index ff67327e06f079506c9efc31205596e1d84aa231..f6a8dc4fa1f0988e23a940832f7f7d8267ec0c82 100644 (file)
--- a/modules/gui/macosx/CoreInteraction.h
+++ b/modules/gui/macosx/CoreInteraction.h
@@ -28,6 +28,8 @@
 @interface VLCCoreInteraction : NSObject {
     int i_currentPlaybackRate;
     mtime_t timeA, timeB;
+
+    float f_maxVolume;
 }
 + (VLCCoreInteraction *)sharedInstance;
 @property (readwrite) int volume;

diff --git a/modules/gui/macosx/CoreInteraction.m b/modules/gui/macosx/CoreInteraction.m
index e1e2aaee5f2e3f20116c43e32188a0711facc321..7ec78a5ec264722e413809881506d4c3f1d9262a 100644 (file)
--- a/modules/gui/macosx/CoreInteraction.m
+++ b/modules/gui/macosx/CoreInteraction.m
@@ -558,7 +558,11 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
 
 - (float)maxVolume
 {
-    return 1.2 * AOUT_VOLUME_DEFAULT;
+    if (f_maxVolume == 0.) {
+        f_maxVolume = (float)var_InheritInteger(VLCIntf, "macosx-max-volume") / 100. * AOUT_VOLUME_DEFAULT;
+    }
+
+    return f_maxVolume;
 }
 
 #pragma mark -

diff --git a/modules/gui/macosx/macosx.m b/modules/gui/macosx/macosx.m
index 4837bdd792a3a53888972190e06bdbf147bd0f7b..bc40bc1a820d82c44fd96d821dc5e9f396913c4d 100644 (file)
--- a/modules/gui/macosx/macosx.m
+++ b/modules/gui/macosx/macosx.m
@@ -128,6 +128,9 @@ static const char *const itunes_list_text[] = {
     N_("Do nothing"), N_("Pause iTunes"), N_("Pause and resume iTunes")
 };
 
+#define VOLUME_MAX_TEXT N_("Maximum Volume displayed")
+
+
 vlc_module_begin()
     set_description(N_("Mac OS X interface"))
     set_capability("interface", 200)
@@ -144,6 +147,7 @@ vlc_module_begin()
         add_bool("macosx-show-playmode-buttons", false, PLAYMODEBUTTONS_TEXT, PLAYMODEBUTTONS_LONGTEXT, false)
         add_bool("macosx-show-effects-button", false, EFFECTSBUTTON_TEXT, EFFECTSBUTTON_LONGTEXT, false)
         add_bool("macosx-show-sidebar", true, SIDEBAR_TEXT, SIDEBAR_LONGTEXT, false)
+        add_integer_with_range("macosx-max-volume", 125, 60, 200, VOLUME_MAX_TEXT, VOLUME_MAX_TEXT, true)
 
     set_section(N_("Behavior"), 0)
         add_bool("macosx-autoplay", true, AUTOPLAY_OSX_TEST, AUTOPLAY_OSX_LONGTEXT, false)