macosx: backport [b20a12f3], updated news

NEWS

@@ -5,8 +5,16 @@ Decoders:
  * Fix issues in subtitles, especially SSA ones
  * Various fixes on theora and ogg
 
-Mac OS:
- * Fix a crash when updating VLC
+Mac OS X Interface:
+ * Fixed a crash when updating VLC
+ * Added the ability to play 2nd media in sync to the primary item (input-slave)
+ * Added the "Quit after Playback" feature
+
+Mac OS X Port:
+ * Full 64bit runtime compatibility on both Mac OS X 10.5 and 10.6
+   - no support for Goom and SDL
+   - limited text rendering support
+   - This port is still considered as EXPERIMENTAL despite its binary release.
 
 
 Changes between 1.0.0 and 1.0.1:

extras/package/macosx/Resources/English.lproj/Open.nib/info.nib

@@ -2,31 +2,22 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>IBDocumentLocation</key>
-	<string>129 203 356 240 0 0 1280 778 </string>
-	<key>IBEditorPositions</key>
-	<dict>
-		<key>2297</key>
-		<string>366 401 548 264 0 0 1280 778 </string>
-		<key>2346</key>
-		<string>366 401 548 264 0 0 1280 778 </string>
-		<key>2837</key>
-		<string>353 528 573 94 0 0 1280 778 </string>
-	</dict>
 	<key>IBFramework Version</key>
-	<string>489.0</string>
+	<string>677</string>
+	<key>IBLastKnownRelativeProjectPath</key>
+	<string>../../vlc.xcodeproj</string>
 	<key>IBOldestOS</key>
 	<integer>5</integer>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>2792</integer>
-		<integer>636</integer>
-		<integer>2297</integer>
 		<integer>2837</integer>
+		<integer>636</integer>
 		<integer>2346</integer>
+		<integer>2297</integer>
+		<integer>2792</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>9G55</string>
+	<string>9L30</string>
 	<key>targetFramework</key>
 	<string>IBCocoaFramework</string>
 </dict>

modules/gui/macosx/open.h

@@ -44,6 +44,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
     IBOutlet id o_btn_ok;
     IBOutlet id o_btn_cancel;
 
+    /* bottom-line items */
     IBOutlet id o_output_ckbox;
     IBOutlet id o_sout_options;
 
@@ -51,6 +52,9 @@ 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_slave_ckbox;
+    IBOutlet id o_file_slave_select_btn;
+    IBOutlet id o_file_slave_filename_txt;
 
     /* open disc */
     IBOutlet id o_disc_type;
@@ -157,6 +161,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
 
     BOOL b_autoplay;
     id o_currentCaptureView;
+    NSString *o_file_slave_path;
     intf_thread_t * p_intf;
 }
 
@@ -167,6 +172,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
 - (void)tabView:(NSTabView *)o_tv didSelectTabViewItem:(NSTabViewItem *)o_tvi;
 - (void)textFieldWasClicked:(NSNotification *)o_notification;
 - (IBAction)expandMRLfieldAction:(id)sender;
+- (IBAction)inputSlaveAction:(id)sender;
 
 - (void)openFileGeneric;
 - (void)openFilePathChanged:(NSNotification *)o_notification;

modules/gui/macosx/open.m

@@ -160,6 +160,13 @@ static VLCOpen *_o_sharedMainInstance = nil;
     return _o_sharedMainInstance;
 }
 
+- (void)dealloc
+{
+    if( o_file_slave_path )
+        [o_file_slave_path release];
+    [super dealloc];
+}
+
 - (void)awakeFromNib
 {
     [o_panel setTitle: _NS("Open Source")];
@@ -175,6 +182,9 @@ static VLCOpen *_o_sharedMainInstance = nil;
 
     [o_file_btn_browse setTitle: _NS("Browse...")];
     [o_file_stream setTitle: _NS("Treat as a pipe rather than as a file")];
+    [o_file_slave_ckbox setTitle: _NS("Play another media synchronously")];
+    [o_file_slave_select_btn setTitle: _NS("Choose...")];
+    [o_file_slave_filename_txt setStringValue: @""];
 
     [o_disc_device_lbl setStringValue: _NS("Device name")];
     [o_disc_title_lbl setStringValue: _NS("Title")];
@@ -409,6 +419,8 @@ static VLCOpen *_o_sharedMainInstance = nil;
                       [[(VLCOutput *)o_sout_options mrl] objectAtIndex: i]]];
             }
         }
+        if( [o_file_slave_ckbox state] && o_file_slave_path )
+            [o_options addObject: [NSString stringWithFormat: @"input-slave=%@", o_file_slave_path]];
         if( [[[o_tabview selectedTabViewItem] label] isEqualToString: _NS("Capture")] )
         {
             if( [[[o_capture_mode_pop selectedItem] title] isEqualToString: _NS("Screen")] )
@@ -486,6 +498,35 @@ static VLCOpen *_o_sharedMainInstance = nil;
     [o_panel displayIfNeeded];
 }
 
+- (IBAction)inputSlaveAction:(id)sender
+{
+    if( sender == o_file_slave_ckbox )
+        [o_file_slave_select_btn setEnabled: [o_file_slave_ckbox state]];
+    else
+    {
+        NSOpenPanel *o_open_panel;
+        o_open_panel = [NSOpenPanel openPanel];
+        [o_open_panel setCanChooseFiles: YES];
+        [o_open_panel setCanChooseDirectories: NO];
+        if( [o_open_panel runModalForDirectory: nil file: nil types: nil] == NSOKButton )
+            {
+                if( o_file_slave_path )
+                        [o_file_slave_path release];
+                o_file_slave_path = [[o_open_panel filenames] objectAtIndex: 0];
+                [o_file_slave_path retain];
+            }
+        else
+            [o_file_slave_filename_txt setStringValue: @""];
+    }
+    if( o_file_slave_path )
+    {
+        NSFileWrapper *o_file_wrapper;
+        o_file_wrapper = [[NSFileWrapper alloc] initWithPath: o_file_slave_path];
+        [o_file_slave_filename_txt setStringValue: [NSString stringWithFormat: @"\"%@\"", [o_file_wrapper preferredFilename]]];
+        [o_file_wrapper release];
+    }
+}
+
 - (void)openFileGeneric
 {
     [self openFilePathChanged: nil];