Changeset 09161bc3bde473a5f72f77742f4c991565371eab

Timestamp:

18/08/05 18:41:10 (3 years ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1124383270 +0000

git-parent:

[04f2f137a97e0063e49f301021236f7b93343771]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1124383270 +0000

Message:

Added --volume-step to override AOUT_VOLUME_DEFAULT. This will give an OSD menu (or skins2) designer to freedom to decide how many steps he wants for turning up the volume from 0 to 1024. It is an advanced option so most users will never see it. Can someone check the MacOSX changes for this? I made them but cannot compiler and test it (I don't have a Mac).

Files:

• modules/control/rc.c (modified) (6 diffs)
• modules/gui/macosx/controls.m (modified) (1 diff)
• modules/gui/macosx/intf.m (modified) (1 diff)
• src/audio_output/intf.c (modified) (2 diffs)
• src/libvlc.h (modified) (2 diffs)
• src/osd/osd.c (modified) (7 diffs)

modules/control/rc.c

@@ -757 +757 @@
-                    }
-                    vlc_mutex_unlock( &p_playlist->object_lock );
-                
+
-            }
-        }
@@ -861 +861 @@
-        p_playlist = NULL;
-    }
-
+
-    var_DelCallback( p_intf->p_vlc, "volume", VolumeChanged, p_intf );
-}
@@ -972 +972 @@
-{
-    intf_thread_t *p_intf = (intf_thread_t*)p_data;
-
+
-    vlc_mutex_lock( &p_intf->p_sys->status_lock );
-    msg_rc( STATUS_CHANGE "( audio volume: %d )", newval.i_int );
@@ -985 +985 @@
-    playlist_t    *p_playlist = NULL;
-    input_thread_t *p_input = NULL;
-
+
-    vlc_mutex_lock( &p_intf->p_sys->status_lock );
-    p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT, FIND_ANYWHERE );
@@ -1248 +1248 @@
-        {
-            vlc_value_t val;
-           
+
-            var_Get( p_playlist->p_input, "rate", &val );
-            if( val.i_int != INPUT_RATE_DEFAULT )
@@ -1719 +1719 @@
-    int i_nb_steps = atoi(newval.psz_string);
-    int i_error = VLC_SUCCESS;
-
-
+
+
+
+
-    {
-        i_nb_steps = 1;

modules/gui/macosx/controls.m

@@ -251 +251 @@
-    intf_thread_t * p_intf = VLCIntf;
-    audio_volume_t i_volume = (audio_volume_t)[sender intValue];
-
+
+
+
-    /* Manage volume status */
-    [o_main manageVolumeSlider];

modules/gui/macosx/intf.m

@@ -1019 +1019 @@
-        {
-            NSString *o_text;
+            int i_volume_step = 0;
-            o_text = [NSString stringWithFormat: _NS("Volume: %d%%"), i_lastShownVolume * 400 / AOUT_VOLUME_MAX];
-            if( i_lastShownVolume != -1 )
-            [self setScrollField:o_text stopAfter:1000000];
-
-AOUT_VOLUME_STEP
+
+i_volume_step
-            [o_volumeslider setEnabled: TRUE];
-            p_intf->p_sys->b_mute = ( i_lastShownVolume == 0 );

src/audio_output/intf.c

@@ -148 +148 @@
-    aout_instance_t * p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT,
-                                                FIND_ANYWHERE );
-
-
+
+
+
-    i_volume = config_GetInt( p_object, "volume" );
-AOUT_VOLUME_STEP
+i_volume_step
-    if ( i_volume > AOUT_VOLUME_MAX )
-    {
@@ -185 +186 @@
-    aout_instance_t * p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT,
-                                                FIND_ANYWHERE );
-
-
+
+
+
-    i_volume = config_GetInt( p_object, "volume" );
-AOUT_VOLUME_STEP
+i_volume_step
-    if ( i_volume < AOUT_VOLUME_MIN )
-    {

src/libvlc.h

@@ -124 +124 @@
-#define VOLUME_SAVE_LONGTEXT N_( \
-    "This saves the audio output volume when you select mute.")
+
+#define VOLUME_STEP_TEXT N_("Audio output volume step")
+#define VOLUME_STEP_LONGTEXT N_( \
+    "The step size of the volume is adjustable using this option, " \
+    "in a range from 0 to 1024." )
-
-#define AOUT_RATE_TEXT N_("Audio output frequency (Hz)")
@@ -943 +948 @@
-                            AOUT_VOLUME_MAX, NULL, VOLUME_TEXT,
-                            VOLUME_LONGTEXT, VLC_FALSE );
+    add_integer_with_range( "volume-step", AOUT_VOLUME_STEP, AOUT_VOLUME_MIN,
+                            AOUT_VOLUME_MAX, NULL, VOLUME_STEP_TEXT,
+                            VOLUME_STEP_LONGTEXT, VLC_TRUE );
-    add_integer( "aout-rate", -1, NULL, AOUT_RATE_TEXT,
-                 AOUT_RATE_LONGTEXT, VLC_TRUE );

src/osd/osd.c

@@ -34 +34 @@
-#undef OSD_MENU_DEBUG
-
-/* 3 is a magic number for 32 volume decrease steps */
-#define OSD_VOLUME_STEPS(i_volume,i_n) (i_volume/AOUT_VOLUME_STEP) / (AOUT_VOLUME_STEP/(i_n-1))
-
-/*****************************************************************************
- * Local prototypes
@@ -43 +40 @@
-static void osd_UpdateState( osd_menu_state_t *, int, int, int, int, picture_t * );
-static inline osd_state_t *osd_VolumeStateChange( osd_state_t *, int );
-
+
+
+
+
+
-osd_menu_t *__osd_MenuCreate( vlc_object_t *p_this, const char *psz_file )
-{
@@ -81 +82 @@
-        /* Update the volume state images to match the current volume */
-        i_volume = config_GetInt( p_this, "volume" );
-OSD_VOLUME_STEPS(
+osd_VolumeStep( p_this,
-        p_osd->p_state->p_volume->p_current_state = osd_VolumeStateChange( p_osd->p_state->p_volume->p_states, i_steps );
-
@@ -527 +528 @@
-}
-
+static int osd_VolumeStep( vlc_object_t *p_this, int i_volume, int i_steps )
+{
+    int i_volume_step = 0;
+
+    i_volume_step = config_GetInt( p_this->p_vlc, "volume-step" );
+    return (i_volume/i_volume_step);
+}
+
-/**
- * Display current audio volume bitmap
@@ -540 +549 @@
-    int i_volume = 0;
-    int i_steps = 0;
-
+
-    if( ( p_osd = vlc_object_find( p_this, VLC_OBJECT_OSDMENU, FIND_ANYWHERE ) ) == NULL )
-    {
@@ -546 +555 @@
-        return;
-    }
-
+
-    var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
-    vlc_mutex_lock( lockval.p_address );
@@ -557 +566 @@
-        /* Update the volume state images to match the current volume */
-        i_volume = config_GetInt( p_this, "volume" );
-
+
+
-        p_button->p_current_state = osd_VolumeStateChange( p_button->p_states, i_steps );
-