X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fopen.m;h=df1c64c4d85247a2cd764df2e923c44627536e6c;hb=7ecdbca34be4d6fa4db005d3febe7d7a51ee07c1;hp=5c47159b4fdd5cb7bfa233663bef6209a410f9ac;hpb=0e925ba035109b649742a72110e102860473a0b9;p=vlc diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m index 5c47159b4f..df1c64c4d8 100644 --- a/modules/gui/macosx/open.m +++ b/modules/gui/macosx/open.m @@ -1,12 +1,13 @@ /***************************************************************************** - * open.m: MacOS X plugin for vlc + * open.m: MacOS X module for vlc ***************************************************************************** - * Copyright (C) 2002 VideoLAN - * $Id: open.m,v 1.20 2003/02/05 14:58:15 hartman Exp $ + * Copyright (C) 2002-2005 VideoLAN + * $Id$ * * Authors: Jon Lech Johansen * Christophe Massiot * Derk-Jan Hartman + * Benjamin Pracht * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -40,8 +41,7 @@ #include "intf.h" #include "playlist.h" #include "open.h" - -#include "netutils.h" +#include "output.h" /***************************************************************************** * GetEjectableMediaOfClass @@ -68,7 +68,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) return( nil ); } - CFDictionarySetValue( classes_to_match, CFSTR( kIOMediaEjectable ), + CFDictionarySetValue( classes_to_match, CFSTR( kIOMediaEjectableKey ), kCFBooleanTrue ); kern_result = IOServiceGetMatchingServices( master_port, classes_to_match, @@ -90,7 +90,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) do { str_bsd_path = IORegistryEntryCreateCFProperty( next_media, - CFSTR( kIOBSDName ), + CFSTR( kIOBSDNameKey ), kCFAllocatorDefault, 0 ); if( str_bsd_path == NULL ) @@ -129,42 +129,30 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) *****************************************************************************/ @implementation VLCOpen -- (void)awakeFromNib -{ - intf_thread_t * p_intf = [NSApp getIntf]; - char * psz_sout = config_GetPsz( p_intf, "sout" ); +static VLCOpen *_o_sharedMainInstance = nil; - if ( psz_sout != NULL && *psz_sout ) - { - [o_sout_cbox setState: YES]; - - NSRect s_rect = [o_panel frame]; - s_rect.size.height = OPEN_PANEL_FULL_HEIGHT + WINDOW_TITLE_HEIGHT; - [o_panel setFrame: s_rect display: NO]; ++ (VLCOpen *)sharedInstance +{ + return _o_sharedMainInstance ? _o_sharedMainInstance : [[self alloc] init]; +} - NSPoint s_point; - s_point.x = 0; - s_point.y = 0; - [[o_panel contentView] setBoundsOrigin: s_point]; +- (id)init +{ + if( _o_sharedMainInstance) { + [self dealloc]; + } else { + _o_sharedMainInstance = [super init]; } - else - { - [o_sout_cbox setState: NO]; - - NSRect s_rect = [o_panel frame]; - s_rect.size.height = OPEN_PANEL_SHORT_HEIGHT + WINDOW_TITLE_HEIGHT; - [o_panel setFrame: s_rect display: NO]; + + return _o_sharedMainInstance; +} - NSPoint s_point; - s_point.x = 0; - s_point.y = OPEN_PANEL_FULL_HEIGHT - OPEN_PANEL_SHORT_HEIGHT; - [[o_panel contentView] setBoundsOrigin: s_point]; - } - free(psz_sout); +- (void)awakeFromNib +{ + intf_thread_t * p_intf = VLCIntf; [o_panel setTitle: _NS("Open Source")]; [o_mrl_lbl setTitle: _NS("Media Resource Locator (MRL)")]; - [o_ckbox_enqueue setTitle: _NS("Only enqueue in playlist. Do not play.")]; [o_btn_ok setTitle: _NS("OK")]; [o_btn_cancel setTitle: _NS("Cancel")]; @@ -176,49 +164,31 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) [o_file_btn_browse setTitle: _NS("Browse...")]; [o_file_stream setTitle: _NS("Treat as a pipe rather than as a file")]; - [o_file_sub_btn_browse setTitle: _NS("Browse...")]; - [o_file_sub_ckbox setTitle: _NS("Load subtitles")]; - [o_disc_device_lbl setStringValue: _NS("Device name")]; [o_disc_title_lbl setStringValue: _NS("Title")]; [o_disc_chapter_lbl setStringValue: _NS("Chapter")]; [o_disc_videots_btn_browse setTitle: _NS("Browse...")]; - [o_disc_dvd_menus setTitle: _NS("Use DVD menus (EXPERIMENTAL)")]; + [o_disc_dvd_menus setTitle: _NS("Use DVD menus")]; [[o_disc_type cellAtRow:0 column:0] setTitle: _NS("VIDEO_TS folder")]; [[o_disc_type cellAtRow:1 column:0] setTitle: _NS("DVD")]; [[o_disc_type cellAtRow:2 column:0] setTitle: _NS("VCD")]; + [[o_disc_type cellAtRow:3 column:0] setTitle: _NS("Audio CD")]; [o_net_udp_port_lbl setStringValue: _NS("Port")]; [o_net_udpm_addr_lbl setStringValue: _NS("Address")]; [o_net_udpm_port_lbl setStringValue: _NS("Port")]; - [o_net_cs_addr_lbl setStringValue: _NS("Address")]; - [o_net_cs_port_lbl setStringValue: _NS("Port")]; [o_net_http_url_lbl setStringValue: _NS("URL")]; [[o_net_mode cellAtRow:0 column:0] setTitle: _NS("UDP/RTP")]; [[o_net_mode cellAtRow:1 column:0] setTitle: _NS("UDP/RTP Multicast")]; - [[o_net_mode cellAtRow:2 column:0] setTitle: _NS("Channel server")]; - [[o_net_mode cellAtRow:3 column:0] setTitle: _NS("HTTP/FTP/MMS")]; + [[o_net_mode cellAtRow:2 column:0] setTitle: _NS("HTTP/FTP/MMS/RTSP")]; [o_net_udp_port setIntValue: config_GetInt( p_intf, "server-port" )]; [o_net_udp_port_stp setIntValue: config_GetInt( p_intf, "server-port" )]; - [o_net_cs_port setIntValue: config_GetInt( p_intf, "channel-port" )]; - [o_net_cs_port_stp setIntValue: config_GetInt( p_intf, "channel-port" )]; - - [o_sout_cbox setTitle: _NS("Stream output")]; - [o_sout_mrl_lbl setTitle: _NS("Stream output MRL")]; - [[o_sout_access cellAtRow:0 column:0] setTitle: _NS("File")]; - [[o_sout_access cellAtRow:1 column:0] setTitle: _NS("UDP")]; - [[o_sout_access cellAtRow:2 column:0] setTitle: _NS("RTP")]; - [o_sout_file_btn_browse setTitle: _NS("Browse...")]; - [o_sout_udp_addr_lbl setStringValue: _NS("Address")]; - [o_sout_udp_port_lbl setStringValue: _NS("Port")]; + [self setSubPanel]; - [[o_sout_mux cellAtRow:0 column:0] setTitle: _NS("AVI")]; - [[o_sout_mux cellAtRow:0 column:1] setTitle: _NS("PS")]; - [[o_sout_mux cellAtRow:0 column:2] setTitle: _NS("TS")]; [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(openFilePathChanged:) @@ -254,31 +224,80 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) selector: @selector(openNetInfoChanged:) name: NSControlTextDidChangeNotification object: o_net_udpm_port]; - [[NSNotificationCenter defaultCenter] addObserver: self - selector: @selector(openNetInfoChanged:) - name: NSControlTextDidChangeNotification - object: o_net_cs_addr]; - [[NSNotificationCenter defaultCenter] addObserver: self - selector: @selector(openNetInfoChanged:) - name: NSControlTextDidChangeNotification - object: o_net_cs_port]; [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(openNetInfoChanged:) name: NSControlTextDidChangeNotification object: o_net_http_url]; +} - [[NSNotificationCenter defaultCenter] addObserver: self - selector: @selector(soutInfoChanged:) - name: NSControlTextDidChangeNotification - object: o_sout_file_path]; - [[NSNotificationCenter defaultCenter] addObserver: self - selector: @selector(soutInfoChanged:) - name: NSControlTextDidChangeNotification - object: o_sout_udp_addr]; - [[NSNotificationCenter defaultCenter] addObserver: self - selector: @selector(soutInfoChanged:) - name: NSControlTextDidChangeNotification - object: o_sout_udp_port]; +- (void)setSubPanel +{ + intf_thread_t * p_intf = VLCIntf; + int i_index; + module_config_t * p_item; + + [o_file_sub_ckbox setTitle: _NS("Load subtitles file:")]; + [o_file_sub_btn_settings setTitle: _NS("Settings...")]; + [o_file_sub_btn_browse setTitle: _NS("Browse...")]; + [o_file_sub_override setTitle: _NS("Override")]; + [o_file_sub_delay_lbl setStringValue: _NS("delay")]; + [o_file_sub_delay_stp setEnabled: NO]; + [o_file_sub_fps_lbl setStringValue: _NS("fps")]; + [o_file_sub_fps_stp setEnabled: NO]; + [o_file_sub_encoding_lbl setStringValue: _NS("Subtitles encoding")]; + [o_file_sub_encoding_pop removeAllItems]; + [o_file_sub_size_lbl setStringValue: _NS("Font size")]; + [o_file_sub_size_pop removeAllItems]; + [o_file_sub_align_lbl setStringValue: _NS("Subtitles justification")]; + [o_file_sub_align_pop removeAllItems]; + [o_file_sub_ok_btn setStringValue: _NS("OK")]; + [o_file_sub_font_box setTitle: _NS("Font Properties")]; + [o_file_sub_file_box setTitle: _NS("Subtitle File")]; + + p_item = config_FindConfig( VLC_OBJECT(p_intf), "subsdec-encoding" ); + + if( p_item ) + { + for( i_index = 0; p_item->ppsz_list && p_item->ppsz_list[i_index]; + i_index++ ) + { + [o_file_sub_encoding_pop addItemWithTitle: + [NSString stringWithCString: + p_item->ppsz_list[i_index]]]; + } + [o_file_sub_encoding_pop selectItemWithTitle: + [NSString stringWithCString: + p_item->psz_value]]; + } + + p_item = config_FindConfig( VLC_OBJECT(p_intf), "subsdec-align" ); + + if ( p_item ) + { + for ( i_index = 0; i_index < p_item->i_list; i_index++ ) + { + [o_file_sub_align_pop addItemWithTitle: + [NSString stringWithUTF8String: + p_item->ppsz_list_text[i_index]]]; + } + [o_file_sub_align_pop selectItemAtIndex: p_item->i_value]; + } + + p_item = config_FindConfig( VLC_OBJECT(p_intf), "freetype-rel-fontsize" ); + + if ( p_item ) + { + for ( i_index = 0; i_index < p_item->i_list; i_index++ ) + { + [o_file_sub_size_pop addItemWithTitle: + [NSString stringWithUTF8String: + p_item->ppsz_list_text[i_index]]]; + if ( p_item->i_value == p_item->pi_list[i_index] ) + { + [o_file_sub_size_pop selectItemAtIndex: i_index]; + } + } + } } - (void)openTarget:(int)i_type @@ -286,37 +305,57 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) int i_result; [o_tabview selectTabViewItemAtIndex: i_type]; - [o_ckbox_enqueue setState: NSOffState]; - [o_file_sub_path setStringValue: @""]; - [o_file_sub_ckbox setState: NSOnState]; - [o_file_sub_path setEnabled: NO]; - [o_file_sub_btn_browse setEnabled: NO]; + [o_file_sub_ckbox setState: NSOffState]; i_result = [NSApp runModalForWindow: o_panel]; [o_panel close]; if( i_result ) { - NSString *o_sout = [o_sout_mrl stringValue]; - intf_thread_t * p_intf = [NSApp getIntf]; - - if ( [o_sout_cbox state] ) + 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 ) { - config_PutPsz( p_intf, "sout", [o_sout lossyCString] ); - } + intf_thread_t * p_intf = VLCIntf; + module_config_t * p_item; - NSString *o_source = [o_mrl stringValue]; - BOOL b_enq = [o_ckbox_enqueue state] == NSOnState ? YES : NO; - NSString *subPath = [o_file_sub_path stringValue]; - - [o_playlist appendArray: - [NSArray arrayWithObject: o_source] atPos: -1 enqueue:b_enq]; - - if (([o_file_sub_ckbox state] == NSOnState) && !([subPath isEqualTo: @""])) - config_PutPsz( p_intf, "sub-file", strdup( [subPath cString] ) ); - } + [o_options addObject: [NSString stringWithFormat: @"sub-file=%s", [[o_file_sub_path stringValue] fileSystemRepresentation]]]; + if( [o_file_sub_override state] == NSOnState ) + { + [o_options addObject: [NSString stringWithFormat: @"sub-delay=%i", (int)( [o_file_sub_delay intValue] * 10 )]]; + [o_options addObject: [NSString stringWithFormat: @"sub-fps=%f", [o_file_sub_fps floatValue]]]; + } + [o_options addObject: [NSString stringWithFormat: + @"subsdec-encoding=%@", + [o_file_sub_encoding_pop titleOfSelectedItem]]]; + [o_options addObject: [NSString stringWithFormat: + @"subsdec-align=%i", + [o_file_sub_align_pop indexOfSelectedItem]]]; + + p_item = config_FindConfig( VLC_OBJECT(p_intf), + "freetype-rel-fontsize" ); - [self soutModeChanged: nil]; + if ( p_item ) + { + [o_options addObject: [NSString stringWithFormat: + @"freetype-rel-fontsize=%i", + p_item->pi_list[[o_file_sub_size_pop indexOfSelectedItem]]]]; + } + } + if( [o_output_ckbox state] == NSOnState ) + { + 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]; + } } - (void)tabView:(NSTabView *)o_tv didSelectTabViewItem:(NSTabViewItem *)o_tvi @@ -337,19 +376,19 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) } } -- (IBAction)openFileGeneric:(id)sender +- (void)openFileGeneric { [self openFilePathChanged: nil]; [self openTarget: 0]; } -- (IBAction)openDisc:(id)sender +- (void)openDisc { [self openDiscTypeChanged: nil]; [self openTarget: 1]; } -- (IBAction)openNet:(id)sender +- (void)openNet { [self openNetModeChanged: nil]; [self openTarget: 2]; @@ -361,11 +400,18 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) NSString *o_filename = [o_file_path stringValue]; NSString *o_ext = [o_filename pathExtension]; vlc_bool_t b_stream = [o_file_stream state]; + BOOL b_dir = NO; + + [[NSFileManager defaultManager] fileExistsAtPath:o_filename isDirectory:&b_dir]; - if ([o_ext isEqualToString: @"bin"] || + if( b_dir ) + { + o_mrl_string = [NSString stringWithFormat: @"dir:%@", o_filename]; + } + else if( [o_ext isEqualToString: @"bin"] || [o_ext isEqualToString: @"cue"] || [o_ext isEqualToString: @"vob"] || - [o_ext isEqualToString: @"iso"]) + [o_ext isEqualToString: @"iso"] ) { o_mrl_string = o_filename; } @@ -383,13 +429,26 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) NSOpenPanel *o_open_panel = [NSOpenPanel openPanel]; [o_open_panel setAllowsMultipleSelection: NO]; + [o_open_panel setCanChooseDirectories: YES]; [o_open_panel setTitle: _NS("Open File")]; [o_open_panel setPrompt: _NS("Open")]; - if( [o_open_panel runModalForDirectory: nil - file: nil types: nil] == NSOKButton ) + [o_open_panel beginSheetForDirectory:nil + file:nil + types:nil + modalForWindow:[sender window] + modalDelegate: self + didEndSelector: @selector(pathChosenInPanel: + withReturn: + contextInfo:) + contextInfo: nil]; +} + +- (void)pathChosenInPanel: (NSOpenPanel *) sheet withReturn:(int)returnCode contextInfo:(void *)contextInfo +{ + if (returnCode == NSFileHandlingPanelOKButton) { - NSString *o_filename = [[o_open_panel filenames] objectAtIndex: 0]; + NSString *o_filename = [[sheet filenames] objectAtIndex: 0]; [o_file_path setStringValue: o_filename]; [self openFilePathChanged: nil]; } @@ -400,36 +459,6 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) [self openFilePathChanged: nil]; } -- (IBAction)loadSubsChanged:(id)sender -{ - if ([o_file_sub_ckbox state] == NSOnState) - { - [o_file_sub_path setEnabled:YES]; - [o_file_sub_btn_browse setEnabled:YES]; - } - else - { - [o_file_sub_path setEnabled:NO]; - [o_file_sub_btn_browse setEnabled:NO]; - } -} - -- (IBAction)openSubBrowse:(id)sender -{ - NSOpenPanel *o_open_panel = [NSOpenPanel openPanel]; - - [o_open_panel setAllowsMultipleSelection: NO]; - [o_open_panel setTitle: _NS("Open File")]; - [o_open_panel setPrompt: _NS("Open")]; - - if( [o_open_panel runModalForDirectory: nil - file: nil types: nil] == NSOKButton ) - { - NSString *o_filename = [[o_open_panel filenames] objectAtIndex: 0]; - [o_file_sub_path setStringValue: o_filename]; - } -} - - (IBAction)openDiscTypeChanged:(id)sender { NSString *o_type; @@ -458,6 +487,13 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) b_menus = 0; b_title_chapter = 1; [o_disc_dvd_menus setState: FALSE]; } + else if ( [o_type isEqualToString: _NS("Audio CD")]) + { + psz_class = kIOCDMediaClass; + o_disc = o_type; + b_menus = 0; b_title_chapter = 0; + [o_disc_dvd_menus setState: FALSE]; + } else { psz_class = kIODVDMediaClass; @@ -539,28 +575,36 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) if ( [o_device isEqualToString: [NSString stringWithFormat: _NS("No %@s found"), o_type]] ) o_device = @""; - o_mrl_string = [NSString stringWithFormat: @"vcd://%@@%i,%i", + o_mrl_string = [NSString stringWithFormat: @"vcd://%@@%i:%i", o_device, i_title, i_chapter]; } + else if ( [o_type isEqualToString: _NS("Audio CD")] ) + { + if ( [o_device isEqualToString: + [NSString stringWithFormat: _NS("No %@s found"), o_type]] ) + o_device = @""; + o_mrl_string = [NSString stringWithFormat: @"cdda://%@", + o_device]; + } else if ( [o_type isEqualToString: _NS("DVD")] ) { if ( [o_device isEqualToString: [NSString stringWithFormat: _NS("No %@s found"), o_type]] ) o_device = @""; if ( b_menus ) - o_mrl_string = [NSString stringWithFormat: @"dvdplay://%@", + o_mrl_string = [NSString stringWithFormat: @"dvdnav://%@", o_device]; else - o_mrl_string = [NSString stringWithFormat: @"dvdold://%@@%i,%i", + o_mrl_string = [NSString stringWithFormat: @"dvdread://%@@%i:%i", o_device, i_title, i_chapter]; } else /* VIDEO_TS folder */ { if ( b_menus ) - o_mrl_string = [NSString stringWithFormat: @"dvdplay://%@", + o_mrl_string = [NSString stringWithFormat: @"dvdnav://%@", o_videots]; else - o_mrl_string = [NSString stringWithFormat: @"dvdread://%@@%i,%i", + o_mrl_string = [NSString stringWithFormat: @"dvdread://%@@%i:%i", o_videots, i_title, i_chapter]; } @@ -597,24 +641,19 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) NSString *o_mode; BOOL b_udp = FALSE; BOOL b_udpm = FALSE; - BOOL b_cs = FALSE; BOOL b_http = FALSE; o_mode = [[o_net_mode selectedCell] title]; if( [o_mode isEqualToString: _NS("UDP/RTP")] ) b_udp = TRUE; else if( [o_mode isEqualToString: _NS("UDP/RTP Multicast")] ) b_udpm = TRUE; - else if( [o_mode isEqualToString: _NS("Channel server")] ) b_cs = TRUE; - else if( [o_mode isEqualToString: _NS("HTTP/FTP/MMS")] ) b_http = TRUE; + else if( [o_mode isEqualToString: _NS("HTTP/FTP/MMS/RTSP")] ) b_http = TRUE; [o_net_udp_port setEnabled: b_udp]; [o_net_udp_port_stp setEnabled: b_udp]; [o_net_udpm_addr setEnabled: b_udpm]; [o_net_udpm_port setEnabled: b_udpm]; [o_net_udpm_port_stp setEnabled: b_udpm]; - [o_net_cs_addr setEnabled: b_cs]; - [o_net_cs_port setEnabled: b_cs]; - [o_net_cs_port_stp setEnabled: b_cs]; [o_net_http_url setEnabled: b_http]; [self openNetInfoChanged: nil]; @@ -632,10 +671,6 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) { [o_net_udpm_port setIntValue: [o_net_udpm_port_stp intValue]]; } - else if( i_tag == 2 ) - { - [o_net_cs_port setIntValue: [o_net_cs_port_stp intValue]]; - } [self openNetInfoChanged: nil]; } @@ -643,15 +678,11 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) - (void)openNetInfoChanged:(NSNotification *)o_notification { NSString *o_mode; - vlc_bool_t b_channel; NSString *o_mrl_string = [NSString string]; - intf_thread_t * p_intf = [NSApp getIntf]; + intf_thread_t * p_intf = VLCIntf; o_mode = [[o_net_mode selectedCell] title]; - b_channel = (vlc_bool_t)[o_mode isEqualToString: _NS("Channel server")]; - config_PutInt( p_intf, "network-channel", b_channel ); - if( [o_mode isEqualToString: _NS("UDP/RTP")] ) { int i_port = [o_net_udp_port intValue]; @@ -677,31 +708,12 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) [o_mrl_string stringByAppendingFormat: @":%i", i_port]; } } - else if( [o_mode isEqualToString: _NS("Channel server")] ) - { - NSString *o_addr = [o_net_cs_addr stringValue]; - int i_port = [o_net_cs_port intValue]; - - if( p_intf->p_vlc->p_channel == NULL ) - { - network_ChannelCreate( p_intf ); - } - - config_PutPsz( p_intf, "channel-server", [o_addr lossyCString] ); - if( i_port < 65536 ) - { - config_PutInt( p_intf, "channel-port", i_port ); - } - - /* FIXME: we should use a playlist server instead */ - o_mrl_string = [NSString stringWithString: @"udp://"]; - } - else if( [o_mode isEqualToString: _NS("HTTP/FTP/MMS")] ) + else if( [o_mode isEqualToString: _NS("HTTP/FTP/MMS/RTSP")] ) { NSString *o_url = [o_net_http_url stringValue]; if ( ![o_url hasPrefix:@"http:"] && ![o_url hasPrefix:@"ftp:"] - && ![o_url hasPrefix:@"mms"] ) + && ![o_url hasPrefix:@"mms"] && ![o_url hasPrefix:@"rtsp"] ) o_mrl_string = [NSString stringWithFormat: @"http://%@", o_url]; else o_mrl_string = o_url; @@ -710,148 +722,93 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) [o_mrl setStringValue: o_mrl_string]; } -- (IBAction)soutChanged:(id)sender; +- (void)openFile { - [self soutModeChanged: nil]; - - if ( [o_sout_cbox state] ) - { - NSPoint s_point; - s_point.x = 0; - s_point.y = 0; - [[o_panel contentView] setBoundsOrigin: s_point]; - [[o_panel contentView] setNeedsDisplay: YES]; - - NSRect s_rect = [o_panel frame]; - s_rect.size.height = OPEN_PANEL_FULL_HEIGHT + WINDOW_TITLE_HEIGHT; - s_rect.origin.y -= OPEN_PANEL_FULL_HEIGHT - OPEN_PANEL_SHORT_HEIGHT; - [o_panel setFrame: s_rect display: YES animate: NO]; - } - else + NSOpenPanel *o_open_panel = [NSOpenPanel openPanel]; + int i; + + [o_open_panel setAllowsMultipleSelection: YES]; + [o_open_panel setCanChooseDirectories: YES]; + [o_open_panel setTitle: _NS("Open File")]; + [o_open_panel setPrompt: _NS("Open")]; + + if( [o_open_panel runModalForDirectory: nil + file: nil types: nil] == NSOKButton ) { - NSPoint s_point; - s_point.x = 0; - s_point.y = OPEN_PANEL_FULL_HEIGHT - OPEN_PANEL_SHORT_HEIGHT; - [[o_panel contentView] setBoundsOrigin: s_point]; - [[o_panel contentView] setNeedsDisplay: YES]; + NSArray *o_array = [NSArray array]; + NSArray *o_values = [[o_open_panel filenames] + sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)]; - NSRect s_rect = [o_panel frame]; - s_rect.size.height = OPEN_PANEL_SHORT_HEIGHT + WINDOW_TITLE_HEIGHT; - s_rect.origin.y += OPEN_PANEL_FULL_HEIGHT - OPEN_PANEL_SHORT_HEIGHT; - [o_panel setFrame: s_rect display: YES animate:NO]; + for( i = 0; i < (int)[o_values count]; i++) + { + NSDictionary *o_dic; + o_dic = [NSDictionary dictionaryWithObject:[o_values objectAtIndex:i] forKey:@"ITEM_URL"]; + o_array = [o_array arrayByAddingObject: o_dic]; + } + [o_playlist appendArray: o_array atPos: -1 enqueue:NO]; } } -- (IBAction)soutFileBrowse:(id)sender +- (IBAction)subsChanged:(id)sender { - NSSavePanel *o_save_panel = [NSSavePanel savePanel]; - NSString *o_mux_string; - if ( [[[o_sout_mux selectedCell] title] isEqualToString: _NS("PS")] ) - o_mux_string = @"vob"; + if ([o_file_sub_ckbox state] == NSOnState) + { + [o_file_sub_btn_settings setEnabled:YES]; + } else - o_mux_string = @"ts"; - - NSString * o_name = [NSString stringWithFormat: @"vlc-output.%@", - o_mux_string]; - - [o_save_panel setTitle: _NS("Save File")]; - [o_save_panel setPrompt: _NS("Save")]; - - if( [o_save_panel runModalForDirectory: nil - file: o_name] == NSOKButton ) { - NSString *o_filename = [o_save_panel filename]; - [o_sout_file_path setStringValue: o_filename]; - [self soutInfoChanged: nil]; + [o_file_sub_btn_settings setEnabled:NO]; } } -- (void)soutModeChanged:(NSNotification *)o_notification +- (IBAction)subSettings:(id)sender { - NSString *o_mode; - BOOL b_file = FALSE; - BOOL b_net = FALSE; - - o_mode = [[o_sout_access selectedCell] title]; - - if( [o_mode isEqualToString: _NS("File")] ) b_file = TRUE; - else if( [o_mode isEqualToString: _NS("UDP")] ) b_net = TRUE; - else if( [o_mode isEqualToString: _NS("RTP")] ) b_net = TRUE; - - [o_sout_file_path setEnabled: b_file]; - [o_sout_file_btn_browse setEnabled: b_file]; - [o_sout_udp_addr setEnabled: b_net]; - [o_sout_udp_port setEnabled: b_net]; - [o_sout_udp_port_stp setEnabled: b_net]; - [[o_sout_mux cellAtRow:0 column: 0] setEnabled: !b_net]; - [[o_sout_mux cellAtRow:0 column: 1] setEnabled: !b_net]; - - if ( b_net ) - { - [[o_sout_mux cellAtRow: 0 column:2] setState: YES]; - } - - [self soutInfoChanged: nil]; + [NSApp beginSheet: o_file_sub_sheet + modalForWindow: [sender window] + modalDelegate: self + didEndSelector: NULL + contextInfo: nil]; } -- (void)soutInfoChanged:(NSNotification *)o_notification +- (IBAction)subFileBrowse:(id)sender { - NSString *o_mode; - NSString *o_mux; - NSString *o_mrl_string; - NSString *o_mux_string; - - o_mode = [[o_sout_access selectedCell] title]; - o_mux = [[o_sout_mux selectedCell] title]; - - if ( [o_mux isEqualToString: _NS("AVI")] ) o_mux_string = @"avi"; - else if ( [o_mux isEqualToString: _NS("PS")] ) o_mux_string = @"ps"; - else o_mux_string = @"ts"; + NSOpenPanel *o_open_panel = [NSOpenPanel openPanel]; + + [o_open_panel setAllowsMultipleSelection: NO]; + [o_open_panel setTitle: _NS("Open File")]; + [o_open_panel setPrompt: _NS("Open")]; - if ( [o_mode isEqualToString: _NS("File")] ) - { - o_mrl_string = [NSString stringWithFormat: @"file/%@://%@", - o_mux_string, [o_sout_file_path stringValue]]; - } - else if ( [o_mode isEqualToString: _NS("UDP")] ) - { - o_mrl_string = [NSString stringWithFormat: @"udp/%@://%@:%i", - o_mux_string, [o_sout_udp_addr stringValue], - [o_sout_udp_port intValue]]; - } - else + if( [o_open_panel runModalForDirectory: nil + file: nil types: nil] == NSOKButton ) { - o_mrl_string = [NSString stringWithFormat: @"rtp/%@://%@:%i", - o_mux_string, [o_sout_udp_addr stringValue], - [o_sout_udp_port intValue]]; + NSString *o_filename = [[o_open_panel filenames] objectAtIndex: 0]; + [o_file_sub_path setStringValue: o_filename]; } +} - - [o_sout_mrl setStringValue: o_mrl_string]; +- (IBAction)subOverride:(id)sender +{ + BOOL b_state = [o_file_sub_override state]; + [o_file_sub_delay setEnabled: b_state]; + [o_file_sub_delay_stp setEnabled: b_state]; + [o_file_sub_fps setEnabled: b_state]; + [o_file_sub_fps_stp setEnabled: b_state]; } -- (IBAction)soutStepperChanged:(id)sender +- (IBAction)subDelayStepperChanged:(id)sender { - [o_sout_udp_port setIntValue: [o_net_udp_port_stp intValue]]; + [o_file_sub_delay setIntValue: [o_file_sub_delay_stp intValue]]; +} - [self soutInfoChanged: nil]; +- (IBAction)subFpsStepperChanged:(id)sender; +{ + [o_file_sub_fps setFloatValue: [o_file_sub_fps_stp floatValue]]; } -- (IBAction)openFile:(id)sender +- (IBAction)subCloseSheet:(id)sender { - NSOpenPanel *o_open_panel = [NSOpenPanel openPanel]; - - [o_open_panel setAllowsMultipleSelection: YES]; - [o_open_panel setTitle: _NS("Open File")]; - [o_open_panel setPrompt: _NS("Open")]; - - if( [o_open_panel runModalForDirectory: nil - file: nil types: nil] == NSOKButton ) - { - intf_thread_t * p_intf = [NSApp getIntf]; - config_PutPsz( p_intf, "sout", NULL ); - [o_playlist appendArray: [o_open_panel filenames] atPos: -1 enqueue:NO]; - } + [o_file_sub_sheet orderOut:sender]; + [NSApp endSheet: o_file_sub_sheet]; } - (IBAction)panelCancel:(id)sender @@ -872,45 +829,3 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) } @end - -@implementation VLGetURLScriptCommand - -- (id)performDefaultImplementation { - NSString *o_command = [[self commandDescription] commandName]; - NSString *o_urlString = [self directParameter]; - - NSLog(@"test1"); - if ( [o_command isEqualToString:@"GetURL"] || [o_command isEqualToString:@"OpenURL"] ) - { - intf_thread_t * p_intf = [NSApp getIntf]; - NSLog( o_command ); - playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( p_playlist == NULL ) - { - return nil; - } - - if ( o_urlString ) - { - NSURL * o_url; - - int i_mode = PLAYLIST_INSERT | PLAYLIST_GO; - - playlist_Add( p_playlist, [o_urlString fileSystemRepresentation], - i_mode, PLAYLIST_END ); - NSLog( o_urlString ); - o_url = [NSURL fileURLWithPath: o_urlString]; - if( o_url != nil ) - { - [[NSDocumentController sharedDocumentController] - noteNewRecentDocumentURL: o_url]; - } - } - vlc_object_release( p_playlist ); - } - return nil; -} - -@end -