Mac OS X interface :

* fixed a bug in the chapter handling ;
* more keystrokes ;

diff --git a/plugins/macosx/intf_vlc_wrapper.m b/plugins/macosx/intf_vlc_wrapper.m
index 2c43aea405512dc70bd2d8e7264db366b3a90065..5ab9c531820ee6fc7833fbf7bb13b3b547c5270a 100644 (file)
--- a/plugins/macosx/intf_vlc_wrapper.m
+++ b/plugins/macosx/intf_vlc_wrapper.m
@@ -2,7 +2,7 @@
  * intf_vlc_wrapper.c: MacOS X plugin for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: intf_vlc_wrapper.m,v 1.8 2002/06/01 12:32:00 sam Exp $
+ * $Id: intf_vlc_wrapper.m,v 1.9 2002/06/01 23:42:04 massiot Exp $
  *
  * Authors: Florian G. Pflug <fgp@phlo.org>
  *          Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -812,7 +812,7 @@ static Intf_VLCWrapper *o_intf = nil;
     
                 o_item = [o_chapter addItemWithTitle: o_menu_title
                         action: pf_toggle_chapter keyEquivalent: @""];
-                [o_item setTag: i];
+                [o_item setTag: i + 1];
                 [o_item setTarget: self];
                 if( ( p_input->stream.p_selected_area->i_part == i + 1 ) )
                 {
@@ -874,9 +874,10 @@ static Intf_VLCWrapper *o_intf = nil;
                 }
     
                 o_item = [o_language addItemWithTitle: o_menu_title
-                        action: pf_toggle_language keyEquivalent: @""];
+                          action: pf_toggle_language keyEquivalent: @""];
                 [o_item setTag: i];
                 [o_item setTarget: self];
+                [o_item setEnabled: 1];
                 if( p_es->p_decoder_fifo != NULL )
                 {
                     [o_item setState: 1];
@@ -902,9 +903,10 @@ static Intf_VLCWrapper *o_intf = nil;
                 }
     
                 o_item = [o_subtitle addItemWithTitle: o_menu_title
-                        action: pf_toggle_subtitle keyEquivalent: @""];
+                          action: pf_toggle_subtitle keyEquivalent: @""];
                 [o_item setTag: i];
                 [o_item setTarget: self];
+                [o_item setEnabled: 1];
                 if( p_es->p_decoder_fifo != NULL )
                 {
                     [o_item setState: 1];

diff --git a/plugins/macosx/vout_vlc_wrapper.m b/plugins/macosx/vout_vlc_wrapper.m
index 9d93e8d4fdee84a0a8b59e6307b34f0c7d65a5c0..fdc4a7e5cec76d0e2f330b59ac0c1a9bd57c59a7 100644 (file)
--- a/plugins/macosx/vout_vlc_wrapper.m
+++ b/plugins/macosx/vout_vlc_wrapper.m
@@ -2,7 +2,7 @@
  * vout_vlc_wrapper.c: MacOS X plugin for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: vout_vlc_wrapper.m,v 1.3 2002/06/01 12:32:00 sam Exp $
+ * $Id: vout_vlc_wrapper.m,v 1.4 2002/06/01 23:42:04 massiot Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net> 
  *
@@ -32,6 +32,9 @@
 #include <vlc/intf.h>
 #include <vlc/vout.h>
 
+#include "stream_control.h"
+#include "input_ext-intf.h"
+
 #include "macosx.h"
 #include "vout_vlc_wrapper.h"
 
@@ -111,10 +114,28 @@ static Vout_VLCWrapper *o_vout = nil;
             p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
             break;
 
+        case (unichar)0x1b: /* escape */
+            if ( p_vout->b_fullscreen )
+            {
+                p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
+            }
+            break;
+
         case 'q': case 'Q':
             p_vout->p_vlc->b_die = 1;
             break;
 
+        case ' ':
+            if ( p_input_bank->pp_input[0] != NULL )
+            {
+                input_SetStatus( p_input_bank->pp_input[0], INPUT_STATUS_PAUSE );
+
+                vlc_mutex_lock( &p_main->p_playlist->change_lock );
+                p_main->p_playlist->b_stopped = 0;
+                vlc_mutex_unlock( &p_main->p_playlist->change_lock );
+            }
+            break;
+
         default:
             return( NO );
             break;