/*****************************************************************************
- * open.m: MacOS X plugin for vlc
+ * open.m: MacOS X module for vlc
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
- * $Id: open.m,v 1.25 2003/03/24 15:20:26 hartman Exp $
+ * $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
#include "intf.h"
#include "playlist.h"
#include "open.h"
-
-#include "netutils.h"
+#include "output.h"
/*****************************************************************************
* GetEjectableMediaOfClass
return( nil );
}
- CFDictionarySetValue( classes_to_match, CFSTR( kIOMediaEjectable ),
+ CFDictionarySetValue( classes_to_match, CFSTR( kIOMediaEjectableKey ),
kCFBooleanTrue );
kern_result = IOServiceGetMatchingServices( master_port, classes_to_match,
do
{
str_bsd_path = IORegistryEntryCreateCFProperty( next_media,
- CFSTR( kIOBSDName ),
+ CFSTR( kIOBSDNameKey ),
kCFAllocatorDefault,
0 );
if( str_bsd_path == NULL )
- (void)awakeFromNib
{
intf_thread_t * p_intf = [NSApp getIntf];
- char * psz_sout = config_GetPsz( p_intf, "sout" );
-
- 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];
-
- NSPoint s_point;
- s_point.x = 0;
- s_point.y = 0;
- [[o_panel contentView] setBoundsOrigin: s_point];
- }
- 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];
-
- 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);
[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")];
[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 file:")];
-
[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_udp_port setIntValue: config_GetInt( p_intf, "server-port" )];
[o_net_udp_port_stp setIntValue: config_GetInt( p_intf, "server-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")];
-
- [[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")];
-
+ [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_ok_btn setStringValue: _NS("OK")];
+
[[NSNotificationCenter defaultCenter] addObserver: self
selector: @selector(openFilePathChanged:)
name: NSControlTextDidChangeNotification
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)openTarget:(int)i_type
int i_result;
[o_tabview selectTabViewItemAtIndex: i_type];
- [o_ckbox_enqueue setState: NSOnState];
- [o_file_sub_path setStringValue: @""];
[o_file_sub_ckbox setState: NSOffState];
- [o_file_sub_path setEnabled: NO];
- [o_file_sub_btn_browse setEnabled: NO];
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];
+ NSMutableDictionary *o_dic;
+ NSMutableArray *o_options = [NSMutableArray array];
+ o_dic = [NSMutableDictionary dictionaryWithObject: [o_mrl stringValue] forKey: @"ITEM_URL"];
- if ( [o_sout_cbox state] )
+ if( [o_file_sub_ckbox state] == NSOnState )
{
- config_PutPsz( p_intf, "sout", [o_sout lossyCString] );
+ [o_options addObject: [NSString stringWithFormat: @"sub-file=%s", [[o_file_sub_path stringValue] UTF8String]]];
+ 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]]];
+ }
}
-
- 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] ) );
+ if( [o_output_ckbox state] == NSOnState )
+ {
+ [o_options addObject: [NSString stringWithString: [(VLCOutput *)o_sout_options getMRL]]];
+ }
+ [o_dic setObject: (NSArray *)[o_options copy] forKey: @"ITEM_OPTIONS"];
+ [o_playlist appendArray: [NSArray arrayWithObject: o_dic] atPos: -1 enqueue:NO];
}
-
- [self soutModeChanged: nil];
}
- (void)tabView:(NSTabView *)o_tv didSelectTabViewItem:(NSTabViewItem *)o_tvi
[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];
}
[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;
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;
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:
[o_mrl setStringValue: o_mrl_string];
}
-- (IBAction)soutChanged:(id)sender;
+- (IBAction)openFile:(id)sender
{
- [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 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 )
- {
- 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
projects / vlc / blobdiff