]> git.sesse.net Git - vlc/blobdiff - modules/gui/macosx/intf.m
projects / vlc / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
* src/interface/interface.c
[vlc] / modules / gui / macosx / intf.m
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 0a0d0394643931a4b951b3c0fdea17651a45f42b..3e901f8f73fdd6245fb2137e1bc5094e84bf4c89 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -1,8 +1,8 @@
 /*****************************************************************************
- * intf.m: MacOS X interface plugin
+ * intf.m: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2003 VideoLAN
- * $Id: intf.m,v 1.111 2004/01/04 21:44:44 kuehne Exp $
+ * Copyright (C) 2002-2004 VideoLAN
+ * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -286,8 +286,8 @@ int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable,
                      vlc_value_t old_val, vlc_value_t new_val, void *param )
 {
     intf_thread_t * p_intf = [NSApp getIntf];
-    p_intf->p_sys->b_playlist_update = VLC_TRUE;
-    p_intf->p_sys->b_intf_update = VLC_TRUE;
+    p_intf->p_sys->b_playlist_update = TRUE;
+    p_intf->p_sys->b_intf_update = TRUE;
     return VLC_SUCCESS;
 }
 
@@ -411,6 +411,18 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
     i_key = config_GetInt( p_intf, "key-jump-10sec" );
     [o_mi_bwd setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
     [o_mi_bwd setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+    i_key = config_GetInt( p_intf, "key-jump+1min" );
+    [o_mi_fwd1m setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+    [o_mi_fwd1m setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+    i_key = config_GetInt( p_intf, "key-jump-1min" );
+    [o_mi_bwd1m setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+    [o_mi_bwd1m setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+    i_key = config_GetInt( p_intf, "key-jump+5min" );
+    [o_mi_fwd5m setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+    [o_mi_fwd5m setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+    i_key = config_GetInt( p_intf, "key-jump-5min" );
+    [o_mi_bwd5m setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+    [o_mi_bwd5m setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
     i_key = config_GetInt( p_intf, "key-vol-up" );
     [o_mi_vol_up setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
     [o_mi_vol_up setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
@@ -435,10 +447,10 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
 
 }
 
-    - (void)initStrings
+- (void)initStrings
 {
     [o_window setTitle: _NS("VLC - Controller")];
-    [o_scrollfield setStringValue: _NS("VLC Media Player")];
+    [o_scrollfield setStringValue: _NS("VLC media player")];
 
     /* button controls */
     [o_btn_prev setToolTip: _NS("Previous")];
@@ -458,6 +470,8 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
     /* main menu */
     [o_mi_about setTitle: _NS("About VLC media player")];
     [o_mi_prefs setTitle: _NS("Preferences...")];
+    [o_mi_add_intf setTitle: _NS("Add Interface")];
+    [o_mu_add_intf setTitle: _NS("Add Interface")];
     [o_mi_hide setTitle: _NS("Hide VLC")];
     [o_mi_hide_others setTitle: _NS("Hide Others")];
     [o_mi_show_all setTitle: _NS("Show All")];
@@ -485,11 +499,16 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
     [o_mi_slower setTitle: _NS("Slower")];
     [o_mi_previous setTitle: _NS("Previous")];
     [o_mi_next setTitle: _NS("Next")];
-    [o_mi_random setTitle: _NS("Shuffle")];
-    [o_mi_repeat setTitle: _NS("Repeat Item")];
-    [o_mi_loop setTitle: _NS("Repeat Playlist")];
-    [o_mi_fwd setTitle: _NS("Step Forward")];
-    [o_mi_bwd setTitle: _NS("Step Backward")];
+    [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_program setTitle: _NS("Program")];
     [o_mu_program setTitle: _NS("Program")];
     [o_mi_title setTitle: _NS("Title")];
@@ -501,12 +520,12 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
     [o_mi_vol_up setTitle: _NS("Volume Up")];
     [o_mi_vol_down setTitle: _NS("Volume Down")];
     [o_mi_mute setTitle: _NS("Mute")];
-    [o_mi_audiotrack setTitle: _NS("Audio track")];
-    [o_mu_audiotrack setTitle: _NS("Audio track")];
-    [o_mi_channels setTitle: _NS("Audio channels")];
-    [o_mu_channels setTitle: _NS("Audio channels")];
-    [o_mi_device setTitle: _NS("Audio device")];
-    [o_mu_device setTitle: _NS("Audio device")];
+    [o_mi_audiotrack setTitle: _NS("Audio Track")];
+    [o_mu_audiotrack setTitle: _NS("Audio Track")];
+    [o_mi_channels setTitle: _NS("Audio Channels")];
+    [o_mu_channels setTitle: _NS("Audio Channels")];
+    [o_mi_device setTitle: _NS("Audio Device")];
+    [o_mu_device setTitle: _NS("Audio Device")];
     [o_mi_visual setTitle: _NS("Visualizations")];
     [o_mu_visual setTitle: _NS("Visualizations")];
     
@@ -514,15 +533,15 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
     [o_mi_half_window setTitle: _NS("Half Size")];
     [o_mi_normal_window setTitle: _NS("Normal Size")];
     [o_mi_double_window setTitle: _NS("Double Size")];
-    [o_mi_fittoscreen setTitle: _NS("Fit To Screen")];
+    [o_mi_fittoscreen setTitle: _NS("Fit to Screen")];
     [o_mi_fullscreen setTitle: _NS("Fullscreen")];
-    [o_mi_floatontop setTitle: _NS("Float On Top")];
-    [o_mi_videotrack setTitle: _NS("Video track")];
-    [o_mu_videotrack setTitle: _NS("Video track")];
-    [o_mi_screen setTitle: _NS("Video device")];
-    [o_mu_screen setTitle: _NS("Video device")];
-    [o_mi_subtitle setTitle: _NS("Subtitles track")];
-    [o_mu_subtitle setTitle: _NS("Subtitles track")];
+    [o_mi_floatontop setTitle: _NS("Float on Top")];
+    [o_mi_videotrack setTitle: _NS("Video Track")];
+    [o_mu_videotrack setTitle: _NS("Video Track")];
+    [o_mi_screen setTitle: _NS("Video Device")];
+    [o_mu_screen setTitle: _NS("Video Device")];
+    [o_mi_subtitle setTitle: _NS("Subtitles Track")];
+    [o_mu_subtitle setTitle: _NS("Subtitles Track")];
     [o_mi_deinterlace setTitle: _NS("Deinterlace")];
     [o_mu_deinterlace setTitle: _NS("Deinterlace")];
 
@@ -556,6 +575,7 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
     [o_err_bug_lbl setStringValue: _NS("If you believe that it is a bug, please follow the instructions at:")]; 
     [o_err_btn_msgs setTitle: _NS("Open Messages Window")];
     [o_err_btn_dismiss setTitle: _NS("Dismiss")];
+    [o_err_ckbk_surpress setTitle: _NS("Surpress further errors")];
 
     [o_info_window setTitle: _NS("Info")];
 }
@@ -583,6 +603,9 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
 
     [NSThread detachNewThreadSelector: @selector(manage)
         toTarget: self withObject: nil];
+        
+    [o_controls setupVarMenuItem: o_mi_add_intf target: (vlc_object_t *)p_intf
+        var: "intf-add" selector: @selector(toggleVar:)];
 
     vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW );
 }
@@ -634,6 +657,9 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
         if( p_playlist != NULL )
         {
             var_AddCallback( p_playlist, "intf-change", PlaylistChanged, self );
+            var_AddCallback( p_playlist, "item-change", PlaylistChanged, self );
+            var_AddCallback( p_playlist, "playlist-current", PlaylistChanged, self );
+
 #define p_input p_playlist->p_input
         
             if( p_input )
@@ -938,6 +964,7 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
 {
     int i_start, i_stop;
     intf_thread_t * p_intf = [NSApp getIntf];
+    vlc_value_t quiet;
 
     vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock );
     i_stop = *p_intf->p_sys->p_sub->pi_stop;
@@ -992,7 +1019,9 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
 
             [o_msg_lock unlock];
 
-            if( i_type == 1 )
+            var_Get( p_intf->p_vlc, "verbose", &quiet );
+
+            if( i_type == 1 && quiet.i_int > -1 )
             {
                 NSString *o_my_msg = [NSString stringWithFormat: @"%s: %s\n",
                     p_intf->p_sys->p_sub->p_msg[i_start].psz_module,
@@ -1210,6 +1239,14 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
 
 - (IBAction)closeError:(id)sender
 {
+    vlc_value_t val;
+    intf_thread_t * p_intf = [NSApp getIntf];
+    
+    if( [o_err_ckbk_surpress state] == NSOnState )
+    {
+        val.i_int = -1;
+        var_Set( p_intf->p_vlc, "verbose", val );
+    }
     [o_err_msg setString: @""];
     [o_error performClose: self];
 }
Unnamed repository; edit this file 'description' to name the repository.