* modules/gui/macosx/output.m: fixed the stream/transcode dialog. test1
authorDerk-Jan Hartman <hartman@videolan.org>
Wed, 21 May 2003 21:30:30 +0000 (21:30 +0000)
committerDerk-Jan Hartman <hartman@videolan.org>
Wed, 21 May 2003 21:30:30 +0000 (21:30 +0000)
  version was broken.
* extras/MacOSX/vlc.pbproj/project.pbxproj: darn, absolute paths.

doc/fortunes.txt
extras/MacOSX/vlc.pbproj/project.pbxproj
modules/gui/macosx/output.m

index c007abe..3269b2e 100644 (file)
@@ -480,4 +480,8 @@ the Boston strangler is to the woman home alone.
 
   -- #videolan
 %
 
   -- #videolan
 %
+00:12 < thedj> i don't trust ffmpeg's make process ;)
+00:13 < gibalou> their make mess you mean ?
 
 
+  -- #videolan
+%
index 6d8944b..ba07503 100644 (file)
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        name = output.h;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        name = output.h;
-                       path = /Volumes/Users/pjotr/Development/vlc/modules/gui/macosx/output.h;
-                       refType = 0;
+                       path = ../../modules/gui/macosx/output.h;
+                       refType = 2;
                };
                8E55FB800459B0FD00FB3317 = {
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        name = output.m;
                };
                8E55FB800459B0FD00FB3317 = {
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        name = output.m;
-                       path = /Volumes/Users/pjotr/Development/vlc/modules/gui/macosx/output.m;
-                       refType = 0;
+                       path = ../../modules/gui/macosx/output.m;
+                       refType = 2;
                };
                8E6BC6F6041643860059A3A7 = {
                        fileEncoding = 4;
                };
                8E6BC6F6041643860059A3A7 = {
                        fileEncoding = 4;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        name = coreaudio.c;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        name = coreaudio.c;
-                       path = /Volumes/Users/pjotr/Development/vlc/modules/audio_output/coreaudio.c;
-                       refType = 0;
+                       path = ../../modules/audio_output/coreaudio.c;
+                       refType = 2;
                };
                8ED6C27B03E2EB1C0059A3A7 = {
                        fileEncoding = 30;
                };
                8ED6C27B03E2EB1C0059A3A7 = {
                        fileEncoding = 30;
index 05856b5..74f974d 100644 (file)
@@ -2,7 +2,7 @@
  * output.m: MacOS X Output Dialog
  *****************************************************************************
  * Copyright (C) 2002-2003 VideoLAN
  * output.m: MacOS X Output Dialog
  *****************************************************************************
  * Copyright (C) 2002-2003 VideoLAN
- * $Id: output.m,v 1.2 2003/05/10 10:32:29 hartman Exp $
+ * $Id: output.m,v 1.3 2003/05/21 21:30:30 hartman Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net> 
  *          Christophe Massiot <massiot@via.ecp.fr>
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net> 
  *          Christophe Massiot <massiot@via.ecp.fr>
 - (IBAction)outputCloseSheet:(id)sender
 {
     intf_thread_t * p_intf = [NSApp getIntf];
 - (IBAction)outputCloseSheet:(id)sender
 {
     intf_thread_t * p_intf = [NSApp getIntf];
-    config_PutPsz( p_intf, "sout", [o_mrl lossyCString] );
+    config_PutPsz( p_intf, "sout", [o_mrl UTF8String] );
     
     [o_output_sheet orderOut:sender];
     [NSApp endSheet: o_output_sheet];
     
     [o_output_sheet orderOut:sender];
     [NSApp endSheet: o_output_sheet];
     NSString *o_mode, *o_mux, *o_mux_string;
     NSMutableString *o_mrl_string = [NSMutableString stringWithString:@"#"];
 
     NSString *o_mode, *o_mux, *o_mux_string;
     NSMutableString *o_mrl_string = [NSMutableString stringWithString:@"#"];
 
+    [o_mrl_string appendString: o_transcode];
     if( [o_display state] == NSOnState )
     {
     if( [o_display state] == NSOnState )
     {
-        [o_mrl_string appendString: @"display:"];
+        [o_mrl_string appendString: @"duplicate{dst=display,dst="];
     }
     }
-    [o_mrl_string appendString: o_transcode];
 
     o_mode = [[o_method selectedCell] title];
     o_mux = [o_mux_selector titleOfSelectedItem];
 
     o_mode = [[o_method selectedCell] title];
     o_mux = [o_mux_selector titleOfSelectedItem];
     if( [o_mode isEqualToString: _NS("File")] )
     {
         [o_mrl_string appendFormat:
     if( [o_mode isEqualToString: _NS("File")] )
     {
         [o_mrl_string appendFormat:
-                        @"dst=std{access=file,mux=%@,url=\"%@\"},",
+                        @"std{access=file,mux=%@,url=\"%@\"}",
                         o_mux_string, [o_file_field stringValue]];
     }
     else if( [o_mode isEqualToString: _NS("Stream")] )
                         o_mux_string, [o_file_field stringValue]];
     }
     else if( [o_mode isEqualToString: _NS("Stream")] )
             o_mode = @"rtp";
             
         [o_mrl_string appendFormat:
             o_mode = @"rtp";
             
         [o_mrl_string appendFormat:
-                        @"dst=std{access=%@,mux=%@,url=\"%@:%@\"},",
+                        @"std{access=%@,mux=%@,url=\"%@:%@\"}",
                         o_mode, o_mux_string, [o_stream_address stringValue],
                         [o_stream_port stringValue]];
     }
                         o_mode, o_mux_string, [o_stream_address stringValue],
                         [o_stream_port stringValue]];
     }
-    [o_mrl_string appendString: @"}:"];
+    if( [o_display state] == NSOnState )
+    {
+        [o_mrl_string appendString: @"}"];
+    }
     [self setMRL:o_mrl_string];
     [self setMRL:o_mrl_string];
+    NSLog( o_mrl_string );
 }
 
 - (void)TTLChanged:(NSNotification *)o_notification
 }
 
 - (void)TTLChanged:(NSNotification *)o_notification
                 [o_transcode_audio_selector titleOfSelectedItem],
                 [o_transcode_audio_bitrate stringValue]];
         }
                 [o_transcode_audio_selector titleOfSelectedItem],
                 [o_transcode_audio_bitrate stringValue]];
         }
+        [o_transcode_string appendString:@"}:"];
     }
     else
     {
     }
     else
     {
-        o_transcode_string = [NSString stringWithString:@"duplicate{"];
+        o_transcode_string = [NSString stringWithString:@""];
     }
     [self setTranscode: o_transcode_string];
     [self outputInfoChanged:nil];
     }
     [self setTranscode: o_transcode_string];
     [self outputInfoChanged:nil];