Changeset ac121d997285ab4a36ad1c88941d9a191c9a2275

Show
Ignore:
Timestamp:
05/21/03 23:30:30 (5 years ago)
Author:
Derk-Jan Hartman <hartman@videolan.org>
git-committer:
Derk-Jan Hartman <hartman@videolan.org> 1053552630 +0000
git-parent:

[1c3f5cd3270d26b1ef49834c4a0daa260ced4a75]

git-author:
Derk-Jan Hartman <hartman@videolan.org> 1053552630 +0000
Message:

* modules/gui/macosx/output.m: fixed the stream/transcode dialog. test1

version was broken.

* extras/MacOSX/vlc.pbproj/project.pbxproj: darn, absolute paths.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • doc/fortunes.txt

    r8c59018 rac121d9  
    480480  -- #videolan 
    481481% 
    482  
     48200:12 < thedj> i don't trust ffmpeg's make process ;) 
     48300:13 < gibalou> their make mess you mean ? 
     484 
     485  -- #videolan 
     486% 

  • extras/MacOSX/vlc.pbproj/project.pbxproj

    r467f7bc rac121d9  
    997997            isa = PBXFileReference; 
    998998            name = output.h; 
    999             path = /Volumes/Users/pjotr/Development/vlc/modules/gui/macosx/output.h; 
    1000             refType = 0; 
     999            path = ../../modules/gui/macosx/output.h; 
     1000            refType = 2; 
    10011001        }; 
    10021002        8E55FB800459B0FD00FB3317 = { 
    …… 
    10041004            isa = PBXFileReference; 
    10051005            name = output.m; 
    1006             path = /Volumes/Users/pjotr/Development/vlc/modules/gui/macosx/output.m; 
    1007             refType = 0; 
     1006            path = ../../modules/gui/macosx/output.m; 
     1007            refType = 2; 
    10081008        }; 
    10091009        8E6BC6F6041643860059A3A7 = { 
    …… 
    10891089            isa = PBXFileReference; 
    10901090            name = coreaudio.c; 
    1091             path = /Volumes/Users/pjotr/Development/vlc/modules/audio_output/coreaudio.c; 
    1092             refType = 0; 
     1091            path = ../../modules/audio_output/coreaudio.c; 
     1092            refType = 2; 
    10931093        }; 
    10941094        8ED6C27B03E2EB1C0059A3A7 = { 

  • modules/gui/macosx/output.m

    rac265bc rac121d9  
    33 ***************************************************************************** 
    44 * Copyright (C) 2002-2003 VideoLAN 
    5  * $Id: output.m,v 1.2 2003/05/10 10:32:29 hartman Exp $ 
     5 * $Id: output.m,v 1.3 2003/05/21 21:30:30 hartman Exp $ 
    66 * 
    77 * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>  
    …… 
    180180{ 
    181181    intf_thread_t * p_intf = [NSApp getIntf]; 
    182     config_PutPsz( p_intf, "sout", [o_mrl lossyCString] ); 
     182    config_PutPsz( p_intf, "sout", [o_mrl UTF8String] ); 
    183183     
    184184    [o_output_sheet orderOut:sender]; 
    …… 
    262262    NSMutableString *o_mrl_string = [NSMutableString stringWithString:@"#"]; 
    263263 
     264    [o_mrl_string appendString: o_transcode]; 
    264265    if( [o_display state] == NSOnState ) 
    265266    { 
    266         [o_mrl_string appendString: @"display:"]; 
    267     } 
    268     [o_mrl_string appendString: o_transcode]; 
     267        [o_mrl_string appendString: @"duplicate{dst=display,dst="]; 
     268    } 
    269269 
    270270    o_mode = [[o_method selectedCell] title]; 
    …… 
    280280    { 
    281281        [o_mrl_string appendFormat: 
    282                         @"dst=std{access=file,mux=%@,url=\"%@\"},", 
     282                        @"std{access=file,mux=%@,url=\"%@\"}", 
    283283                        o_mux_string, [o_file_field stringValue]]; 
    284284    } 
    …… 
    294294             
    295295        [o_mrl_string appendFormat: 
    296                         @"dst=std{access=%@,mux=%@,url=\"%@:%@\"},", 
     296                        @"std{access=%@,mux=%@,url=\"%@:%@\"}", 
    297297                        o_mode, o_mux_string, [o_stream_address stringValue], 
    298298                        [o_stream_port stringValue]]; 
    299299    } 
    300     [o_mrl_string appendString: @"}:"]; 
     300    if( [o_display state] == NSOnState ) 
     301    { 
     302        [o_mrl_string appendString: @"}"]; 
     303    } 
    301304    [self setMRL:o_mrl_string]; 
     305    NSLog( o_mrl_string ); 
    302306} 
    303307 
    …… 
    396400                [o_transcode_audio_bitrate stringValue]]; 
    397401        } 
    398     } 
    399     else 
    400     { 
    401         o_transcode_string = [NSString stringWithString:@"duplicate{"]; 
     402        [o_transcode_string appendString:@"}:"]; 
     403    } 
     404    else 
     405    { 
     406        o_transcode_string = [NSString stringWithString:@""]; 
    402407    } 
    403408    [self setTranscode: o_transcode_string];