* backport of [11397] and [11396]

diff --git a/THANKS b/THANKS
index 1eb77b94e25d5bda4af43c6f3d6973529fa70bca..1a81433b68cad7418d2286cc676f6166c3944f41 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -24,8 +24,9 @@ Brieuc Jeunhomme <bbp at via.ecp.fr> - bug fixes
 Bruno Vella <allevb at tin.it> - Italian localization
 Carlo Calabrò <murray at via.ecp.fr> - Italian localization
 Carsten Gottbehüt <gottbehuet at active-elements dot de> - v4l hotplug fix
+Chris Clepper - OpenGL fix
 Christof Baumgaertner - dbox web intf
-Christophe Mutricy <xtophe at nxtelevision dot com>- many fixes (preferences, M3U, ...)
+Christophe Mutricy <xtophe at nxtelevision dot com> - many fixes (preferences, M3U, ...)
 Christopher Johnson <cjohnson at mint.net> - Qt fix in vlc.spec
 Colin Simmonds <colin_simmonds at Mac.lover.org> - compile fix for Mac OS X
 Damian Ivereigh <damian at cisco.com> - ac3dec uninitialized data structure fix

diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m
index f4af6f47b1a997b2b5be820973fbc75a8eb145f5..8a4865df12ef6058d5ec7d769626518a04306749 100644 (file)
--- a/modules/gui/macosx/controls.m
+++ b/modules/gui/macosx/controls.m
@@ -155,7 +155,7 @@
     var_Set( p_playlist, "repeat", val );
     if( val.b_bool )
     {
-        vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat All" ) );
+        vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat One" ) );
     }
     else
     {
@@ -187,7 +187,7 @@
     var_Set( p_playlist, "loop", val );
     if( val.b_bool )
     {
-        vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat One" ) );
+        vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat All" ) );
     }
     else
     {

diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index fca91a13baa72288dddcdd952a2618099f07e98a..1a7fc3c6732620e6f09700a7b3ae26134ad14449 100644 (file)
--- a/modules/gui/macosx/intf.h
+++ b/modules/gui/macosx/intf.h
@@ -70,6 +70,7 @@ struct intf_sys_t
     vlc_bool_t b_playmode_update;
     vlc_bool_t b_current_title_update;
     vlc_bool_t b_fullscreen_update;
+    vlc_bool_t b_volume_update;
 
     /* menus handlers */
     vlc_bool_t b_input_update;

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index ed0a5c4b9b29dd5208f690f0b07f0f3fb9378011..3a7cbc480ac9fdfb4f60861c3617d6e4c81ffce6 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -817,6 +817,9 @@ static VLCMain *_o_sharedMainInstance = nil;
         }
 #undef p_input
 
+        /* Manage volume status */
+        [self manageVolumeSlider];
+
         vlc_mutex_unlock( &p_intf->change_lock );
 
         o_sleep_date = [NSDate dateWithTimeIntervalSinceNow: .1];
@@ -972,6 +975,19 @@ static VLCMain *_o_sharedMainInstance = nil;
                             (int) (i_seconds % 60)];
             [o_timefield setStringValue: o_time];
         }
+        
+        if( p_intf->p_sys->b_volume_update )
+        {
+            NSString *o_text;
+            o_text = [NSString stringWithFormat: _NS("Volume: %d"), i_lastShownVolume * 200 / AOUT_VOLUME_MAX];
+            if( i_lastShownVolume != -1 )
+            [self setScrollField:o_text stopAfter:1000000];
+
+            [o_volumeslider setFloatValue: (float)i_lastShownVolume / AOUT_VOLUME_STEP];
+            [o_volumeslider setEnabled: TRUE];
+            p_intf->p_sys->b_mute = ( i_lastShownVolume == 0 );
+            p_intf->p_sys->b_volume_update = FALSE;
+        }
 
         /* Manage Playing status */
         var_Get( p_input, "state", &val );
@@ -996,8 +1012,6 @@ static VLCMain *_o_sharedMainInstance = nil;
     if( (i_end_scroll != -1) && (mdate() > i_end_scroll) )
         [self resetScrollField];
 
-    /* Manage volume status */
-    [self manageVolumeSlider];
 
     [NSTimer scheduledTimerWithTimeInterval: 0.3
         target: self selector: @selector(manageIntf:)
@@ -1233,17 +1247,9 @@ static VLCMain *_o_sharedMainInstance = nil;
 
     if( i_volume != i_lastShownVolume )
     {
-        NSString *o_text;
-        o_text = [NSString stringWithFormat: _NS("Volume: %d"), i_volume * 200 / AOUT_VOLUME_MAX];
-        if( i_lastShownVolume != -1 )
-            [self setScrollField:o_text stopAfter:1000000];
-    
-        [o_volumeslider setFloatValue: (float)i_volume / AOUT_VOLUME_STEP];
-        [o_volumeslider setEnabled: TRUE];
         i_lastShownVolume = i_volume;
+        p_intf->p_sys->b_volume_update = TRUE;
     }
-
-    p_intf->p_sys->b_mute = ( i_volume == 0 );
 }
 
 - (IBAction)timesliderUpdate:(id)sender

diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index aa5d2159e56a57b4098c388c41db3c3490c1e400..851a0601ff012c35307a0d7bb65436c1fc43d9e4 100644 (file)
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -243,6 +243,7 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
 #if 0
     [o_search_button setTitle: _NS("Search")];
 #endif
+    [o_search_field setToolTip: _NS("Search in Playlist")];
     [[o_loop_popup itemAtIndex:0] setTitle: _NS("Standard Play")];
     [[o_loop_popup itemAtIndex:1] setTitle: _NS("Repeat One")];
     [[o_loop_popup itemAtIndex:2] setTitle: _NS("Repeat All")];

diff --git a/src/libvlc.h b/src/libvlc.h
index 763fa4d9bf9f5a8f3c82e9305d7acc7577a1287b..56f23d820af9ab50107ee60093520f963f25813c 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -1340,7 +1340,7 @@ vlc_module_begin();
 #   define KEY_QUIT               KEY_MODIFIER_COMMAND|'q'
 #   define KEY_VOL_UP             KEY_MODIFIER_COMMAND|KEY_UP
 #   define KEY_VOL_DOWN           KEY_MODIFIER_COMMAND|KEY_DOWN
-#   define KEY_VOL_MUTE           KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'m'
+#   define KEY_VOL_MUTE           KEY_MODIFIER_COMMAND|KEY_MODIFIER_ALT|KEY_DOWN
 #   define KEY_SUBDELAY_UP        'j'
 #   define KEY_SUBDELAY_DOWN      'h'
 #   define KEY_AUDIODELAY_UP      'g'