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

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
index bdcf9eb56b1804abb93f957eb949ef7fdaf87696..e78f2c26e24bab52a713dad872a183ac575afd70 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
+++ b/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; 

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
index aff8af46837787b63a24ddc11e7401752bcccb97..6b8f526d4ca96702ddc69293dbfcc6a43a236c89 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
+++ b/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>

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib
index 50c3f45c1a44bc4fe4e4376e31619eee3f277564..5ce227acbf17da7f69be4fd09926053aa125e50c 100644 (file)
Binary files a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib and b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib differ

diff --git a/modules/gui/macosx/controls.h b/modules/gui/macosx/controls.h
index 18fe288c679dc0ae982beab0b804ecca66509baf..aea4624d7c9e0aa69c520bd88d8d846f05b29e0b 100644 (file)
--- a/modules/gui/macosx/controls.h
+++ b/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;

diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m
index 72efa55505f08d669de0b73e4b8940a97922d024..8cea69c58ebbb443e428221b98efedf42207f9de 100644 (file)
--- a/modules/gui/macosx/controls.m
+++ b/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];

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 3e901f8f73fdd6245fb2137e1bc5094e84bf4c89..ef3252d11a86770742ec385dc5ae37d9f659fc4e 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/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")];