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

* modules/gui/macosx/open.?
  - updated the open dialog (now with sheets !!!)
  - added ogg file stream out
  - added http file stream out
  - added file subtitle support for the delay and fps options
* extras/MacOSX/vlc.pbproj/project.pbxproj
  - added the .ts file-extension to the application

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

@@ -153,7 +153,6 @@
         }, 
         {
             ACTIONS = {
-                loadSubsChanged = id; 
                 openDisc = id; 
                 openDiscMenusChanged = id; 
                 openDiscStepperChanged = id; 
@@ -165,14 +164,22 @@
                 openNet = id; 
                 openNetModeChanged = id; 
                 openNetStepperChanged = id; 
-                openSubBrowse = id; 
                 openVTSBrowse = id; 
                 panelCancel = id; 
                 panelOk = id; 
                 soutChanged = id; 
+                soutCloseSheet = id; 
                 soutFileBrowse = id; 
                 soutModeChanged = id; 
+                soutSettings = id; 
                 soutStepperChanged = id; 
+                subCloseSheet = id; 
+                subDelayStepperChanged = id; 
+                subFileBrowse = id; 
+                subFpsStepperChanged = id; 
+                subOverride = id; 
+                subSettings = id; 
+                subsChanged = id; 
             }; 
             CLASS = VLCOpen; 
             LANGUAGE = ObjC; 
@@ -196,8 +203,18 @@
                 "o_file_path" = id; 
                 "o_file_stream" = id; 
                 "o_file_sub_btn_browse" = id; 
+                "o_file_sub_btn_settings" = id; 
                 "o_file_sub_ckbox" = id; 
+                "o_file_sub_delay" = id; 
+                "o_file_sub_delay_lbl" = id; 
+                "o_file_sub_delay_stp" = id; 
+                "o_file_sub_fps" = id; 
+                "o_file_sub_fps_lbl" = id; 
+                "o_file_sub_fps_stp" = id; 
+                "o_file_sub_ok_btn" = id; 
+                "o_file_sub_override" = id; 
                 "o_file_sub_path" = id; 
+                "o_file_sub_sheet" = id; 
                 "o_mrl" = id; 
                 "o_mrl_lbl" = id; 
                 "o_net_http_url" = id; 
@@ -214,12 +231,17 @@
                 "o_panel" = id; 
                 "o_playlist" = id; 
                 "o_sout_access" = id; 
+                "o_sout_access_lbl" = id; 
+                "o_sout_btn_ok" = id; 
                 "o_sout_cbox" = id; 
                 "o_sout_file_btn_browse" = id; 
                 "o_sout_file_path" = id; 
                 "o_sout_mrl" = id; 
                 "o_sout_mrl_lbl" = id; 
                 "o_sout_mux" = id; 
+                "o_sout_mux_lbl" = id; 
+                "o_sout_settings" = id; 
+                "o_sout_sheet" = id; 
                 "o_sout_udp_addr" = id; 
                 "o_sout_udp_addr_lbl" = id; 
                 "o_sout_udp_port" = id; 

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

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>417 347 365 441 0 0 1600 1178 </string>
+	<string>38 65 365 441 0 0 1280 1002 </string>
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>29</key>
@@ -21,12 +21,6 @@
 	<array>
 		<integer>977</integer>
 	</array>
-	<key>IBOpenObjects</key>
-	<array>
-		<integer>1194</integer>
-		<integer>21</integer>
-		<integer>29</integer>
-	</array>
 	<key>IBSystem Version</key>
 	<string>6I32</string>
 </dict>

extras/MacOSX/vlc.pbproj/project.pbxproj

@@ -306,6 +306,7 @@
 			<array>
 				<string>mpg</string>
 				<string>mpeg</string>
+				<string>ts</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
 			<string>mpeg.icns</string>

modules/gui/macosx/open.h

@@ -2,7 +2,7 @@
  * open.h: MacOS X plugin for vlc
  *****************************************************************************
  * Copyright (C) 2002-2003 VideoLAN
- * $Id: open.h,v 1.12 2003/03/06 11:43:07 hartman Exp $
+ * $Id: open.h,v 1.13 2003/03/26 03:13:30 hartman Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -25,10 +25,6 @@
 
 NSArray *GetEjectableMediaOfClass( const char *psz_class );
 
-#define OPEN_PANEL_FULL_HEIGHT 498
-#define OPEN_PANEL_SHORT_HEIGHT 329
-#define WINDOW_TITLE_HEIGHT 21
-
 /*****************************************************************************
  * Intf_Open interface
  *****************************************************************************/
@@ -49,9 +45,6 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
     IBOutlet id o_file_path;
     IBOutlet id o_file_btn_browse;
     IBOutlet id o_file_stream;
-    IBOutlet id o_file_sub_path;
-    IBOutlet id o_file_sub_btn_browse;
-    IBOutlet id o_file_sub_ckbox;
 
     IBOutlet id o_disc_type;
     IBOutlet id o_disc_device;
@@ -79,9 +72,12 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
     IBOutlet id o_net_http_url_lbl;
 
     IBOutlet id o_sout_cbox;
+    IBOutlet id o_sout_settings;
+    IBOutlet id o_sout_sheet;
     IBOutlet id o_sout_mrl_lbl;
     IBOutlet id o_sout_mrl;
     IBOutlet id o_sout_access;
+    IBOutlet id o_sout_access_lbl;
     IBOutlet id o_sout_file_path;
     IBOutlet id o_sout_file_btn_browse;
     IBOutlet id o_sout_udp_addr;
@@ -90,6 +86,22 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
     IBOutlet id o_sout_udp_port_lbl;
     IBOutlet id o_sout_udp_port_stp;
     IBOutlet id o_sout_mux;
+    IBOutlet id o_sout_mux_lbl;
+    IBOutlet id o_sout_btn_ok;
+    
+    IBOutlet id o_file_sub_ckbox;
+    IBOutlet id o_file_sub_btn_settings;
+    IBOutlet id o_file_sub_sheet;
+    IBOutlet id o_file_sub_path;
+    IBOutlet id o_file_sub_btn_browse;
+    IBOutlet id o_file_sub_override;
+    IBOutlet id o_file_sub_delay;
+    IBOutlet id o_file_sub_delay_lbl;
+    IBOutlet id o_file_sub_delay_stp;
+    IBOutlet id o_file_sub_fps;
+    IBOutlet id o_file_sub_fps_lbl;
+    IBOutlet id o_file_sub_fps_stp;
+    IBOutlet id o_file_sub_ok_btn;
 }
 
 - (void)openTarget:(int)i_type;
@@ -98,9 +110,8 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
 - (IBAction)openFileGeneric:(id)sender;
 - (void)openFilePathChanged:(NSNotification *)o_notification;
 - (IBAction)openFileBrowse:(id)sender;
+- (void) pathChosenInPanel: (NSOpenPanel *) sheet withReturn:(int)returnCode contextInfo:(void  *)contextInfo;
 - (IBAction)openFileStreamChanged:(id)sender;
-- (IBAction)loadSubsChanged:(id)sender;
-- (IBAction)openSubBrowse:(id)sender;
 
 - (IBAction)openDisc:(id)sender;
 - (IBAction)openDiscTypeChanged:(id)sender;
@@ -115,10 +126,20 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
 - (void)openNetInfoChanged:(NSNotification *)o_notification;
 
 - (IBAction)soutChanged:(id)sender;
+- (IBAction)soutSettings:(id)sender;
 - (IBAction)soutFileBrowse:(id)sender;
 - (void)soutModeChanged:(NSNotification *)o_notification;
 - (void)soutInfoChanged:(NSNotification *)o_notification;
 - (IBAction)soutStepperChanged:(id)sender;
+- (IBAction)soutCloseSheet:(id)sender;
+
+- (IBAction)subsChanged:(id)sender;
+- (IBAction)subSettings:(id)sender;
+- (IBAction)subFileBrowse:(id)sender;
+- (IBAction)subOverride:(id)sender;
+- (IBAction)subDelayStepperChanged:(id)sender;
+- (IBAction)subFpsStepperChanged:(id)sender;
+- (IBAction)subCloseSheet:(id)sender;
 
 - (IBAction)panelCancel:(id)sender;
 - (IBAction)panelOk:(id)sender;