/*****************************************************************************
- * open.m: MacOS X plugin for vlc
+ * open.m: MacOS X module for vlc
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
- * $Id: open.m,v 1.30 2003/04/30 23:58:56 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];
+ 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")];
[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")];
if( i_result )
{
- intf_thread_t * p_intf = [NSApp getIntf];
-
- 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];
+ NSMutableDictionary *o_dic;
+ NSMutableArray *o_options = [NSMutableArray array];
+ o_dic = [NSMutableDictionary dictionaryWithObject: [o_mrl stringValue] forKey: @"ITEM_URL"];
- if (([o_file_sub_ckbox state] == NSOnState) && !([subPath isEqualTo: @""]))
+ if( [o_file_sub_ckbox state] == NSOnState )
{
- config_PutPsz( p_intf, "sub-file", strdup( [subPath cString] ) );
- if ( [o_file_sub_override state] )
+ [o_options addObject: [NSString stringWithFormat: @"sub-file=%s", [[o_file_sub_path stringValue] UTF8String]]];
+ if( [o_file_sub_override state] == NSOnState )
{
- config_PutInt( p_intf, "sub-delay", (int)( [o_file_sub_delay intValue] * 10 ) );
- config_PutFloat( p_intf, "sub-fps", [o_file_sub_fps floatValue] );
+ [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]]];
}
}
- else
+ if( [o_output_ckbox state] == NSOnState )
{
- config_PutPsz( p_intf, "sub-file", "" );
- config_PutInt( p_intf, "sub-delay", 0 );
- config_PutFloat( p_intf, "sub-fps", 0.0 );
+ [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];
}
}
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:
[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",
{
NSString *o_mode;
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];
- (IBAction)openFile:(id)sender
{
NSOpenPanel *o_open_panel = [NSOpenPanel openPanel];
+ int i;
[o_open_panel setAllowsMultipleSelection: YES];
[o_open_panel setCanChooseDirectories: YES];
if( [o_open_panel runModalForDirectory: nil
file: nil types: nil] == NSOKButton )
{
- intf_thread_t * p_intf = [NSApp getIntf];
- config_PutPsz( p_intf, "sout", NULL );
-
+ NSArray *o_array = [NSArray array];
NSArray *o_values = [[o_open_panel filenames]
sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
-
- [o_playlist appendArray: o_values atPos: -1 enqueue:NO];
- config_PutPsz( p_intf, "sub-file", "" );
- config_PutInt( p_intf, "sub-delay", 0 );
- config_PutFloat( p_intf, "sub-fps", 0.0 );
- config_PutPsz( p_intf, "sout", "" );
+
+ 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];
}
}