Cancel

[vlc] / modules / gui / macosx / controls.m

diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m
index 06018f682498d178d78761e530e09dea6544cee9..8cea69c58ebbb443e428221b98efedf42207f9de 100644 (file)
--- a/modules/gui/macosx/controls.m
+++ b/modules/gui/macosx/controls.m
@@ -1,12 +1,12 @@
 /*****************************************************************************
- * controls.m: MacOS X interface plugin
+ * controls.m: MacOS X interface module
  *****************************************************************************
  * Copyright (C) 2002-2003 VideoLAN
- * $Id: controls.m,v 1.59 2003/12/15 19:25:56 bigben Exp $
+ * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
- *          Derk-Jan Hartman <thedj@users.sourceforge.net>
+ *          Derk-Jan Hartman <hartman at videolan dot org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -56,7 +56,7 @@
     }
     if( p_input && val.i_int != PAUSE_S )
     {
-        vout_OSDMessage( VLC_OBJECT(p_intf), _( "Pause" ) );
+        vout_OSDMessage( p_intf, _( "Pause" ) );
         val.i_int = PAUSE_S;
         var_Set( p_input, "state", val );
     }
@@ -70,7 +70,7 @@
             if( p_playlist->i_size )
             {
                 vlc_mutex_unlock( &p_playlist->object_lock );
-                vout_OSDMessage( VLC_OBJECT(p_intf), _( "Play" ) );
+                vout_OSDMessage( p_intf, _( "Play" ) );
                 playlist_Play( p_playlist );
                 vlc_object_release( p_playlist );
             }
@@ -92,7 +92,7 @@
                                                        FIND_ANYWHERE );
     if( p_playlist != NULL )
     {
-        vout_OSDMessage( (vlc_object_t *)p_intf, _( "Stop" ) );
+        vout_OSDMessage( p_intf, _( "Stop" ) );
         playlist_Stop( p_playlist );
         vlc_object_release( p_playlist );
     }
@@ -108,7 +108,7 @@
         vlc_value_t val; val.b_bool = VLC_TRUE;
 
         var_Set( p_input, "rate-faster", val );
-        vout_OSDMessage( (vlc_object_t *)p_intf, _( "Faster" ) );
+        vout_OSDMessage( p_intf, _( "Faster" ) );
         vlc_object_release( p_input );
     }
 }
@@ -123,7 +123,7 @@
         vlc_value_t val; val.b_bool = VLC_TRUE;
 
         var_Set( p_input, "rate-slower", val );
-        vout_OSDMessage( (vlc_object_t *)p_intf, _( "Slower" ) );
+        vout_OSDMessage( p_intf, _( "Slower" ) );
         vlc_object_release( p_input );
     }
 }
@@ -137,7 +137,7 @@
     {
         playlist_Prev( p_playlist );
         vlc_object_release( p_playlist );
-        vout_OSDMessage( (vlc_object_t *)p_intf, _( "Previous" ) );
+        vout_OSDMessage( p_intf, _( "Previous" ) );
     }
 }
 
@@ -150,7 +150,7 @@
     {
         playlist_Next( p_playlist );
         vlc_object_release( p_playlist );
-        vout_OSDMessage( (vlc_object_t *)p_intf, _( "Next" ) );
+        vout_OSDMessage( p_intf, _( "Next" ) );
     }
 }
 
@@ -170,11 +170,11 @@
     var_Set( p_playlist, "random", val );
     if( val.b_bool )
     {
-        vout_OSDMessage( (vlc_object_t *)p_intf, _( "Shuffle On" ) );
+        vout_OSDMessage( p_intf, _( "Random On" ) );
     }
     else
     {
-        vout_OSDMessage( (vlc_object_t *)p_intf, _( "Shuffle Off" ) );
+        vout_OSDMessage( p_intf, _( "Random Off" ) );
     }    
 
     p_intf->p_sys->b_playlist_update = VLC_TRUE;
@@ -194,15 +194,19 @@
     }
 
     var_Get( p_playlist, "repeat", &val );
+    if (!val.b_bool)
+    {   
+        var_Set( p_playlist, "loop", val );
+    } 
     val.b_bool = !val.b_bool;
     var_Set( p_playlist, "repeat", val );
     if( val.b_bool )
     {
-        vout_OSDMessage( (vlc_object_t *)p_intf, _( "Repeat On" ) );
+        vout_OSDMessage( p_intf, _( "Repeat All" ) );
     }
     else
     {
-        vout_OSDMessage( (vlc_object_t *)p_intf, _( "Repeat Off" ) );
+        vout_OSDMessage( p_intf, _( "Repeat Off" ) );
     }
 
     p_intf->p_sys->b_playlist_update = VLC_TRUE;    
@@ -222,15 +226,19 @@
     }
 
     var_Get( p_playlist, "loop", &val );
+    if (!val.b_bool)
+    {
+        var_Set( p_playlist, "repeat", val );
+    }
     val.b_bool = !val.b_bool;
     var_Set( p_playlist, "loop", val );
     if( val.b_bool )
     {
-        vout_OSDMessage( (vlc_object_t *)p_intf, _( "Loop On" ) );
+        vout_OSDMessage( p_intf, _( "Repeat One" ) );
     }
     else
     {
-        vout_OSDMessage( (vlc_object_t *)p_intf, _( "Loop Off" ) );
+        vout_OSDMessage( p_intf, _( "Repeat Off" ) );
     }    
 
     p_intf->p_sys->b_playlist_update = VLC_TRUE;
@@ -248,6 +256,7 @@
         vlc_value_t time;
         time.i_time = 10 * 1000000;
         var_Set( p_input, "time-offset", time );
+        vout_OSDMessage( p_intf, _( "Jump +10 Seconds" ) );
         vlc_object_release( p_input );
     }
 }
@@ -262,6 +271,7 @@
         vlc_value_t time;
         time.i_time = -10 * 1000000;
         var_Set( p_input, "time-offset", time );
+        vout_OSDMessage( p_intf, _( "Jump -10 Seconds" ) );
         vlc_object_release( p_input );
     }
 }
@@ -317,14 +327,12 @@
 {
     intf_thread_t * p_intf = [NSApp getIntf];
     audio_volume_t i_volume;
-    char string[9];
 
     aout_VolumeGet( p_intf, &i_volume );
 
     [o_volumeslider setFloatValue: (float)(i_volume / AOUT_VOLUME_STEP)];
 
-    sprintf( string, "Vol %d%%", i_volume*100/AOUT_VOLUME_MAX );
-    vout_OSDMessage( (vlc_object_t *)p_intf, string );
+    vout_OSDMessage( p_intf, "Vol %d%%", i_volume*100/AOUT_VOLUME_MAX );
 }
 
 - (IBAction)windowAction:(id)sender
@@ -348,9 +356,9 @@
                     [o_window scaleWindowWithFactor: 1.0];
                 else if( [o_title isEqualToString: _NS("Double Size") ] )
                     [o_window scaleWindowWithFactor: 2.0];
-                else if( [o_title isEqualToString: _NS("Float On Top") ] )
+                else if( [o_title isEqualToString: _NS("Float on Top") ] )
                     [o_window toggleFloatOnTop];
-                else if( [o_title isEqualToString: _NS("Fit To Screen") ] )
+                else if( [o_title isEqualToString: _NS("Fit to Screen") ] )
                 {
                     if( ![o_window isZoomed] )
                         [o_window performZoom:self];
@@ -662,21 +670,21 @@
             }
         }
     }
-    else if( [[o_mi title] isEqualToString: _NS("Shuffle")] )
+    else if( [[o_mi title] isEqualToString: _NS("Random")] )
     {
         int i_state;
         var_Get( p_playlist, "random", &val );
         i_state = val.b_bool ? NSOnState : NSOffState;
         [o_mi setState: i_state];
     }
-    else if( [[o_mi title] isEqualToString: _NS("Repeat Item")] )
+    else if( [[o_mi title] isEqualToString: _NS("Repeat One")] )
     {
         int i_state;
         var_Get( p_playlist, "repeat", &val );
         i_state = val.b_bool ? NSOnState : NSOffState;
         [o_mi setState: i_state];
     }
-    else if( [[o_mi title] isEqualToString: _NS("Repeat Playlist")] )
+    else if( [[o_mi title] isEqualToString: _NS("Repeat All")] )
     {
         int i_state;
         var_Get( p_playlist, "loop", &val );
@@ -705,15 +713,15 @@
                 [[o_mi title] isEqualToString: _NS("Half Size")] ||
                 [[o_mi title] isEqualToString: _NS("Normal Size")] ||
                 [[o_mi title] isEqualToString: _NS("Double Size")] ||
-                [[o_mi title] isEqualToString: _NS("Fit To Screen")] ||
-                [[o_mi title] isEqualToString: _NS("Float On Top")] )
+                [[o_mi title] isEqualToString: _NS("Fit to Screen")] ||
+                [[o_mi title] isEqualToString: _NS("Float on Top")] )
     {
         id o_window;
         NSArray *o_windows = [NSApp orderedWindows];
         NSEnumerator *o_enumerator = [o_windows objectEnumerator];
         bEnabled = FALSE;
         
-        if ( [[o_mi title] isEqualToString: _NS("Float On Top")] )
+        if ( [[o_mi title] isEqualToString: _NS("Float on Top")] )
         {
             int i_state = config_GetInt( p_playlist, "video-on-top" ) ?
                       NSOnState : NSOffState;