* demuxdump is working again

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
index 5d05a09a88b11b97f027451ac0dbd2023c7f0051..aa1edc1096e53aee3bf2864e85beed6fb986f665 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
+++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
@@ -3,13 +3,13 @@
 <plist version="1.0">
 <dict>
        <key>IBDocumentLocation</key>
-       <string>793 27 505 517 0 0 1280 1002 </string>
+       <string>614 71 505 517 0 0 1024 746 </string>
        <key>IBEditorPositions</key>
        <dict>
                <key>1617</key>
-               <string>693 686 104 149 0 0 1280 1002 </string>
+               <string>542 480 104 149 0 0 1024 746 </string>
                <key>29</key>
-               <string>521 894 419 44 0 0 1280 1002 </string>
+               <string>366 655 419 44 0 0 1024 746 </string>
                <key>915</key>
                <string>54 452 185 199 0 0 1024 746 </string>
        </dict>
@@ -21,11 +21,8 @@
        </array>
        <key>IBOpenObjects</key>
        <array>
-               <integer>1617</integer>
-               <integer>21</integer>
-               <integer>1647</integer>
                <integer>29</integer>
-               <integer>2029</integer>
+               <integer>21</integer>
        </array>
        <key>IBSystem Version</key>
        <string>7H63</string>

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib
index 9876059e3d870869655e98e138fd62f2bc76aa7b..74ce9b8deabd55cea013bdab9006c006c4ce8777 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/gui/macosx/open.m b/modules/gui/macosx/open.m
index 95f7e394d4fb0b07d3a8313ed90a71ab860ae499..46a9e12959fbbade13e4a73c52f45746eb13226e 100644 (file)
--- a/modules/gui/macosx/open.m
+++ b/modules/gui/macosx/open.m
@@ -232,8 +232,9 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
     {
         NSMutableDictionary *o_dic;
         NSMutableArray *o_options = [NSMutableArray array];
+        unsigned int i;
+
         o_dic = [NSMutableDictionary dictionaryWithObject: [o_mrl stringValue] forKey: @"ITEM_URL"];
-        
         if( [o_file_sub_ckbox state] == NSOnState )
         {
             [o_options addObject: [NSString stringWithFormat: @"sub-file=%s", [[o_file_sub_path stringValue] UTF8String]]];
@@ -245,7 +246,11 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
         }
         if( [o_output_ckbox state] == NSOnState )
         {
-            [o_options addObject: [NSString stringWithString: [(VLCOutput *)o_sout_options getMRL]]];
+            for (i = 0 ; i < [[o_sout_options getMRL] count] ; i++)
+            {
+                [o_options addObject: [NSString stringWithString:
+                      [[(VLCOutput *)o_sout_options getMRL] objectAtIndex: i]]];
+            }
         }
         [o_dic setObject: (NSArray *)[o_options copy] forKey: @"ITEM_OPTIONS"];
         [o_playlist appendArray: [NSArray arrayWithObject: o_dic] atPos: -1 enqueue:NO];

diff --git a/modules/gui/macosx/output.h b/modules/gui/macosx/output.h
index 888693ecb4e4c042d7007bf4952d972c86bf739c..3d08b306b9b50e2bcc94df1aa6f31aed8a4a8326 100644 (file)
--- a/modules/gui/macosx/output.h
+++ b/modules/gui/macosx/output.h
@@ -80,12 +80,12 @@
     IBOutlet id o_http_chkbox;
     IBOutlet id o_file_chkbox;
 
-    NSString *o_mrl;
+    NSArray *o_mrl;
     NSString *o_transcode;
 }
 
-- (void)setMRL:(NSString *)o_mrl_string;
-- (NSString *)getMRL;
+- (void)setMRL:(NSArray *)o_mrl_string;
+- (NSArray *)getMRL;
 - (void)setTranscode:(NSString *)o_transcode_string;
 
 - (void)initStrings;

diff --git a/modules/gui/macosx/output.m b/modules/gui/macosx/output.m
index 80f467a25637da821a9883332587b5da1eeb0024..b03a8a979f64800d1fbc9dba15667d980022580a 100644 (file)
--- a/modules/gui/macosx/output.m
+++ b/modules/gui/macosx/output.m
@@ -41,7 +41,7 @@
 - (id)init
 {
     self = [super init];
-    o_mrl = [[NSString alloc] init];
+    o_mrl = [[NSArray alloc] init];
     o_transcode = [[NSString alloc] init];
     return self;
 }
@@ -53,13 +53,13 @@
     [super dealloc];
 }
 
-- (void)setMRL:(NSString *)o_mrl_string
+- (void)setMRL:(NSArray *)o_mrl_array
 {
     [o_mrl autorelease];
-    o_mrl = [o_mrl_string copy];
+    o_mrl = [o_mrl_array copy];
 }
 
-- (NSString *)getMRL
+- (NSArray *)getMRL
 {
     return [o_mrl copy];
 }
@@ -349,6 +349,7 @@
     NSString *o_mode, *o_mux, *o_mux_string;
     NSMutableString *o_announce = [NSMutableString stringWithString:@""];
     NSMutableString *o_mrl_string = [NSMutableString stringWithString:@":sout=#"];
+    NSArray *o_sout_options;
 
     [o_mrl_string appendString: o_transcode];
     if( [o_display state] == NSOnState )
@@ -373,10 +374,15 @@
     {
         if( [o_dump_chkbox state] == NSOnState )
         {
-            o_mrl_string = [NSMutableString stringWithFormat:
-                            @":demux=demuxdump :demuxdump-file=\"%@\"",
-                            [o_file_field stringValue]];
-            [self setMRL:o_mrl_string];
+            NSMutableArray * o_sout_options;
+            o_sout_options = [NSArray arrayWithObjects:
+                                    [NSString stringWithString:
+                                    @":demux=dump"],
+                                    [NSString stringWithFormat:
+                                    @":demuxdump-file=%@",
+                                    [o_file_field stringValue]],
+                                    nil];
+            [self setMRL:o_sout_options];
             return;
         }
         else
@@ -466,7 +472,8 @@
     {
         [o_mrl_string appendString: @"}"];
     }
-    [self setMRL:o_mrl_string];
+    o_sout_options = [NSArray arrayWithObjects: o_mrl_string,nil];
+    [self setMRL:o_sout_options];
 }
 
 - (void)TTLChanged:(NSNotification *)o_notification