Reverses previous patch, which added 1min/5min forward / backward functions,...

Reverses previous patch, which added 1min/5min forward / backward functions, as it made the interface too unclear. We need to find another way to use hotkeys on the main interface...

extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib

@@ -22,12 +22,8 @@
         {
             ACTIONS = {
                 backward = id; 
-                backward1Min = id; 
-                backward5Min = id; 
                 faster = id; 
                 forward = id; 
-                forward1Min = id; 
-                forward5Min = id; 
                 loop = id; 
                 mute = id; 
                 next = id; 

extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib

@@ -7,9 +7,9 @@
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>1617</key>
-		<string>693 686 104 149 0 0 1280 1002 </string>
+		<string>542 480 104 149 0 0 1024 746 </string>
 		<key>29</key>
-		<string>25 789 419 44 0 0 1280 1002 </string>
+		<string>544 598 419 44 0 0 1024 746 </string>
 		<key>915</key>
 		<string>160 353 103 130 0 0 800 578 </string>
 	</dict>

modules/gui/macosx/controls.h

@@ -48,10 +48,6 @@
 
 - (IBAction)forward:(id)sender;
 - (IBAction)backward:(id)sender;
-- (IBAction)forward1Min:(id)sender;
-- (IBAction)backward1Min:(id)sender;
-- (IBAction)forward5Min:(id)sender;
-- (IBAction)backward5Min:(id)sender;
 
 - (IBAction)volumeUp:(id)sender;
 - (IBAction)volumeDown:(id)sender;

modules/gui/macosx/controls.m

@@ -261,36 +261,6 @@
     }
 }
 
-- (IBAction)forward1Min:(id)sender
-{
-    intf_thread_t * p_intf = [NSApp getIntf];
-    input_thread_t * p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT,
-                                                       FIND_ANYWHERE );
-    if( p_input != NULL )
-    {
-        vlc_value_t time;
-        time.i_time = 60 * 1000000;
-        var_Set( p_input, "time-offset", time );
-        vout_OSDMessage( p_intf, _( "Jump +1 Minute" ) );
-        vlc_object_release( p_input );
-    }
-}
-
-- (IBAction)forward5Min:(id)sender
-{
-    intf_thread_t * p_intf = [NSApp getIntf];
-    input_thread_t * p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT,
-                                                       FIND_ANYWHERE );
-    if( p_input != NULL )
-    {
-        vlc_value_t time;
-        time.i_time = 300 * 1000000;
-        var_Set( p_input, "time-offset", time );
-        vout_OSDMessage( p_intf, _( "Jump +5 Minutes" ) );
-        vlc_object_release( p_input );
-    }
-}
-
 - (IBAction)backward:(id)sender
 {
     intf_thread_t * p_intf = [NSApp getIntf];
@@ -306,36 +276,6 @@
     }
 }
 
-- (IBAction)backward1Min:(id)sender
-{
-    intf_thread_t * p_intf = [NSApp getIntf];
-    input_thread_t * p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT,
-                                                       FIND_ANYWHERE );
-    if( p_input != NULL )
-    {
-        vlc_value_t time;
-        time.i_time = -60 * 1000000;
-        var_Set( p_input, "time-offset", time );
-        vout_OSDMessage( p_intf, _( "Jump -1 Minute" ) );
-        vlc_object_release( p_input );
-    }
-}
-
-- (IBAction)backward5Min:(id)sender
-{
-    intf_thread_t * p_intf = [NSApp getIntf];
-    input_thread_t * p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT,
-                                                       FIND_ANYWHERE );
-    if( p_input != NULL )
-    {
-        vlc_value_t time;
-        time.i_time = -300 * 1000000;
-        var_Set( p_input, "time-offset", time );
-        vout_OSDMessage( p_intf, _( "Jump -5 Minutes" ) );
-        vlc_object_release( p_input );
-    }
-}
-
 - (IBAction)volumeUp:(id)sender
 {
     intf_thread_t * p_intf = [NSApp getIntf];

modules/gui/macosx/intf.m

@@ -502,12 +502,8 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
     [o_mi_random setTitle: _NS("Random")];
     [o_mi_repeat setTitle: _NS("Repeat One")];
     [o_mi_loop setTitle: _NS("Repeat All")];
-    [o_mi_fwd setTitle: _NS("Forward 10 Seconds")];
-    [o_mi_bwd setTitle: _NS("Backward 10 Seconds")];
-    [o_mi_fwd1m setTitle: _NS("Forward 1 Minute")];
-    [o_mi_bwd1m setTitle: _NS("Backward 1 Minute")];
-    [o_mi_fwd5m setTitle: _NS("Forward 5 Minutes")];
-    [o_mi_bwd5m setTitle: _NS("Backward 5 Minutes")];
+    [o_mi_fwd setTitle: _NS("Step Forward")];
+    [o_mi_bwd setTitle: _NS("Step Backward")];
 
     [o_mi_program setTitle: _NS("Program")];
     [o_mu_program setTitle: _NS("Program")];