* Minor changes to the open panel, added AVI stream output option,

* modules/gui/macosx/open.m: "Open File" is back,
* modules/codec/mpeg_video/synchro.c: Fixed a counting bug.

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
index c36abf826c0f7414deeec18f0c7b4922c1c4e00c..7232619aa127b599e2fd9ccb640661b84065db46 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
+++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
@@ -3,15 +3,15 @@
 <plist version="1.0">
 <dict>
        <key>IBDocumentLocation</key>
-       <string>642 60 365 441 0 0 1280 1002 </string>
+       <string>282 82 365 441 0 0 1152 746 </string>
        <key>IBEditorPositions</key>
        <dict>
                <key>29</key>
-               <string>16 822 374 44 0 0 1280 1002 </string>
+               <string>14 602 374 44 0 0 1152 746 </string>
                <key>303</key>
                <string>60 509 104 66 0 0 1280 1002 </string>
                <key>909</key>
-               <string>425 600 430 172 0 0 1280 1002 </string>
+               <string>72 297 430 172 0 0 1152 746 </string>
                <key>915</key>
                <string>439 657 93 96 0 0 1280 1002 </string>
        </dict>
@@ -23,8 +23,7 @@
        </array>
        <key>IBOpenObjects</key>
        <array>
-               <integer>21</integer>
-               <integer>909</integer>
+               <integer>636</integer>
        </array>
        <key>IBSystem Version</key>
        <string>6G30</string>

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib
index e69505a4e1fbe1897969b925b7525b88a1249ee3..7d2945ea62e7f2bd95864586e860325195c59ebe 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/codec/mpeg_video/synchro.c b/modules/codec/mpeg_video/synchro.c
index 0f9da7210c40ea4b88b2e9d0d29140f201d083db..22ef0f3a601742da5ec64bb5e661597901a3fa08 100644 (file)
--- a/modules/codec/mpeg_video/synchro.c
+++ b/modules/codec/mpeg_video/synchro.c
@@ -2,7 +2,7 @@
  * vpar_synchro.c : frame dropping routines
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: synchro.c,v 1.6 2002/12/31 01:59:46 massiot Exp $
+ * $Id: synchro.c,v 1.7 2003/01/23 21:47:59 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Samuel Hocevar <sam@via.ecp.fr>
@@ -408,8 +408,7 @@ void vpar_SynchroNewPicture( vpar_thread_t * p_vpar, int i_coding_type,
             {
                 msg_Dbg( p_vpar->p_fifo, "decoded %d/%d pictures",
                          p_vpar->synchro.i_pic
-                           - p_vpar->synchro.i_trashed_pic
-                           - p_vpar->synchro.i_not_chosen_pic,
+                           - p_vpar->synchro.i_trashed_pic,
                          p_vpar->synchro.i_pic );
                 p_vpar->synchro.i_trashed_pic = p_vpar->synchro.i_not_chosen_pic
                     = p_vpar->synchro.i_pic = 0;

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 9dc811f4a160bddc566ecb696093fe2ecfc4506e..4b15f728a7eaa66736116c398493ab290f29aac6 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -2,7 +2,7 @@
  * intf.m: MacOS X interface plugin
  *****************************************************************************
  * Copyright (C) 2002-2003 VideoLAN
- * $Id: intf.m,v 1.30 2003/01/22 02:39:33 hartman Exp $
+ * $Id: intf.m,v 1.31 2003/01/23 21:47:59 massiot Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -425,6 +425,7 @@ static void Run( intf_thread_t *p_intf )
 
         if( p_intf->p_sys->p_sub->i_start != i_stop )
         {
+#if 0
             NSColor *o_white = [NSColor whiteColor];
             NSColor *o_red = [NSColor redColor];
             NSColor *o_yellow = [NSColor yellowColor];
@@ -439,16 +440,20 @@ static void Run( intf_thread_t *p_intf )
             [o_messages setEditable: YES];
             [o_messages setSelectedRange: NSMakeRange( ui_length, 0 )];
             [o_messages scrollRangeToVisible: NSMakeRange( ui_length, 0 )];
+#endif
 
             for( i_start = p_intf->p_sys->p_sub->i_start;
                  i_start != i_stop;
                  i_start = (i_start+1) % VLC_MSG_QSIZE )
             {
+#if 0
                 NSString *o_msg;
                 NSDictionary *o_attr;
                 NSAttributedString *o_msg_color;
+#endif
                 int i_type = p_intf->p_sys->p_sub->p_msg[i_start].i_type;
 
+#if 0
                 o_attr = [NSDictionary dictionaryWithObject: o_gray
                     forKey: NSForegroundColorAttributeName];
                 o_msg = [NSString stringWithFormat: @"%s%s",
@@ -467,6 +472,7 @@ static void Run( intf_thread_t *p_intf )
                 [o_messages insertText: o_msg_color];
 
                 [o_messages insertText: @"\n"];
+#endif
 
                 if ( i_type == 1 )
                 {
@@ -486,7 +492,9 @@ static void Run( intf_thread_t *p_intf )
                 }
             }
 
+#if 0
             [o_messages setEditable: NO];
+#endif
 
             vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock );
             p_intf->p_sys->p_sub->i_start = i_start;

diff --git a/modules/gui/macosx/open.h b/modules/gui/macosx/open.h
index a4d1747993690c238bf7649c5b36d20b928af34f..dd4f9e020537159694f6d99ffb8205f50ab35a72 100644 (file)
--- a/modules/gui/macosx/open.h
+++ b/modules/gui/macosx/open.h
@@ -2,7 +2,7 @@
  * open.h: MacOS X plugin for vlc
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: open.h,v 1.7 2003/01/20 03:45:06 hartman Exp $
+ * $Id: open.h,v 1.8 2003/01/23 21:47:59 massiot Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net> 
  *
@@ -23,8 +23,8 @@
 
 NSArray *GetEjectableMediaOfClass( const char *psz_class );
 
-#define OPEN_PANEL_FULL_HEIGHT 494
-#define OPEN_PANEL_SHORT_HEIGHT 325
+#define OPEN_PANEL_FULL_HEIGHT 498
+#define OPEN_PANEL_SHORT_HEIGHT 329
 #define WINDOW_TITLE_HEIGHT 21
 
 /*****************************************************************************

diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m
index 636b9fad9b38fab39b07cdbd3d22c014edf357a4..62aa9da025e5e892f97137268ce5a51f41767fd0 100644 (file)
--- a/modules/gui/macosx/open.m
+++ b/modules/gui/macosx/open.m
@@ -2,7 +2,7 @@
  * open.m: MacOS X plugin for vlc
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: open.m,v 1.12 2003/01/23 11:48:18 massiot Exp $
+ * $Id: open.m,v 1.13 2003/01/23 21:47:59 massiot Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net> 
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -187,7 +187,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
     [o_disc_title_lbl setStringValue: _NS("Title")];
     [o_disc_chapter_lbl setStringValue: _NS("Chapter")];
     [o_disc_videots_btn_browse setStringValue: _NS("Browse...")];
-    [o_disc_dvd_menus setTitle: _NS("Use DVD menus")];
+    [o_disc_dvd_menus setTitle: _NS("Use DVD menus (EXPERIMENTAL)")];
 
     [[o_disc_type cellAtRow:0 column:0] setTitle: _NS("VIDEO_TS folder")];
     [[o_disc_type cellAtRow:1 column:0] setTitle: _NS("DVD")];
@@ -220,8 +220,9 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
     [o_sout_udp_addr_lbl setStringValue: _NS("Address")];
     [o_sout_udp_port_lbl setStringValue: _NS("Port")];
 
-    [[o_sout_mux cellAtRow:0 column:0] setTitle: _NS("PS")];
-    [[o_sout_mux cellAtRow:0 column:1] setTitle: _NS("TS")];
+    [[o_sout_mux cellAtRow:0 column:0] setTitle: _NS("AVI")];
+    [[o_sout_mux cellAtRow:0 column:1] setTitle: _NS("PS")];
+    [[o_sout_mux cellAtRow:0 column:2] setTitle: _NS("TS")];
 
     [[NSNotificationCenter defaultCenter] addObserver: self
         selector: @selector(openFilePathChanged:)
@@ -787,10 +788,11 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
     [o_sout_udp_port setEnabled: b_net];
     [o_sout_udp_port_stp setEnabled: b_net];
     [[o_sout_mux cellAtRow:0 column: 0] setEnabled: !b_net];
+    [[o_sout_mux cellAtRow:0 column: 1] setEnabled: !b_net];
 
     if ( b_net )
     {
-        [[o_sout_mux cellAtRow: 0 column:1] setState: YES];
+        [[o_sout_mux cellAtRow: 0 column:2] setState: YES];
     }
 
     [self soutInfoChanged: nil];
@@ -806,7 +808,8 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
     o_mode = [[o_sout_access selectedCell] title];
     o_mux = [[o_sout_mux selectedCell] title];
 
-    if ( [o_mux isEqualToString: _NS("PS")] ) o_mux_string = @"ps";
+    if ( [o_mux isEqualToString: _NS("AVI")] ) o_mux_string = @"avi";
+    else if ( [o_mux isEqualToString: _NS("PS")] ) o_mux_string = @"ps";
     else o_mux_string = @"ts";
 
     if ( [o_mode isEqualToString: _NS("File")] )
@@ -840,8 +843,19 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
 
 - (IBAction)openFile:(id)sender
 {
-    [self openFilePathChanged: nil];
-    [self openTarget: 0];
+    NSOpenPanel *o_open_panel = [NSOpenPanel openPanel];
+
+    [o_open_panel setAllowsMultipleSelection: NO];
+    [o_open_panel setTitle: _NS("Open File")];
+    [o_open_panel setPrompt: _NS("Open")];
+
+    if( [o_open_panel runModalForDirectory: nil
+            file: nil types: nil] == NSOKButton )
+    {
+        intf_thread_t * p_intf = [NSApp getIntf];
+        config_PutPsz( p_intf, "sout", NULL );
+        [o_playlist appendArray: [o_open_panel filenames] atPos: -1 enqueue: 0];
+    }
 }
 
 - (IBAction)panelCancel:(id)sender