/*****************************************************************************
- * open.m: MacOS X plugin for vlc
+ * open.m: MacOS X module for vlc
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: open.m,v 1.3 2002/10/05 00:10:17 jlj Exp $
+ * Copyright (C) 2002-2003 VideoLAN
+ * $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
+ * Christophe Massiot <massiot@via.ecp.fr>
+ * Derk-Jan Hartman <thedj@users.sourceforge.net>
*
* 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
#include <IOKit/storage/IOCDMedia.h>
#include <IOKit/storage/IODVDMedia.h>
-#import <Cocoa/Cocoa.h>
-
-#include <vlc/vlc.h>
-#include <vlc/intf.h>
-
-#include "netutils.h"
-
-#import "intf.h"
-#import "playlist.h"
-#import "open.h"
+#include "intf.h"
+#include "playlist.h"
+#include "open.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
{
- [o_panel setTitle: _NS("Open Target")];
+ intf_thread_t * p_intf = [NSApp getIntf];
+
+ [o_panel setTitle: _NS("Open Source")];
+ [o_mrl_lbl setTitle: _NS("Media Resource Locator (MRL)")];
[o_btn_ok setTitle: _NS("OK")];
[o_btn_cancel setTitle: _NS("Cancel")];
[[o_tabview tabViewItemAtIndex: 2] setLabel: _NS("Network")];
[o_file_btn_browse setTitle: _NS("Browse...")];
+ [o_file_stream setTitle: _NS("Treat as a pipe rather than as a file")];
- [o_disc_type_lbl setStringValue: _NS("Disc type")];
[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")];
+
+ [[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("HTTP/FTP/MMS")];
+
+ [o_net_udp_port setIntValue: config_GetInt( p_intf, "server-port" )];
+ [o_net_udp_port_stp setIntValue: config_GetInt( p_intf, "server-port" )];
+
+ [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(openDiscInfoChanged:)
name: NSControlTextDidChangeNotification
object: o_disc_chapter];
+ [[NSNotificationCenter defaultCenter] addObserver: self
+ selector: @selector(openDiscInfoChanged:)
+ name: NSControlTextDidChangeNotification
+ object: o_disc_videots_folder];
[[NSNotificationCenter defaultCenter] addObserver: self
selector: @selector(openNetInfoChanged:)
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
int i_result;
[o_tabview selectTabViewItemAtIndex: i_type];
-
+ [o_file_sub_ckbox setState: NSOffState];
+
i_result = [NSApp runModalForWindow: o_panel];
[o_panel close];
if( i_result )
{
- NSString *o_source = [o_mrl stringValue];
-
- [o_playlist appendArray:
- [NSArray arrayWithObject: o_source] atPos: -1];
+ 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 )
+ {
+ [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]]];
+ }
+ }
+ 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];
}
}
}
}
-- (IBAction)openFile:(id)sender
+- (IBAction)openFileGeneric:(id)sender
{
[self openFilePathChanged: nil];
[self openTarget: 0];
{
NSString *o_mrl_string;
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];
- o_mrl_string = [NSString stringWithFormat: @"file://%@", o_filename];
+ 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_mrl_string = o_filename;
+ }
+ else
+ {
+ o_mrl_string = [NSString stringWithFormat: @"%s://%@",
+ b_stream ? "stream" : "file",
+ o_filename];
+ }
[o_mrl setStringValue: o_mrl_string];
}
+- (IBAction)openFileBrowse:(id)sender
+{
+ 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")];
+
+ [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 = [[sheet filenames] objectAtIndex: 0];
+ [o_file_path setStringValue: o_filename];
+ [self openFilePathChanged: nil];
+ }
+}
+
+- (IBAction)openFileStreamChanged:(id)sender
+{
+ [self openFilePathChanged: nil];
+}
+
- (IBAction)openDiscTypeChanged:(id)sender
{
NSString *o_type;
- NSArray *o_devices;
- const char *psz_class = NULL;
+ vlc_bool_t b_device, b_menus, b_title_chapter;
[o_disc_device removeAllItems];
+ b_title_chapter = ![o_disc_dvd_menus state];
o_type = [[o_disc_type selectedCell] title];
- if( [o_type isEqualToString: @"DVD"] )
+ if ( [o_type isEqualToString: _NS("VIDEO_TS folder")] )
{
- psz_class = kIODVDMediaClass;
+ b_device = 0; b_menus = 1;
}
else
{
- psz_class = kIOCDMediaClass;
- }
+ NSArray *o_devices;
+ NSString *o_disc;
+ const char *psz_class = NULL;
+ b_device = 1;
+
+ if ( [o_type isEqualToString: _NS("VCD")] )
+ {
+ psz_class = kIOCDMediaClass;
+ o_disc = 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_disc = o_type;
+ b_menus = 1;
+ }
- o_devices = GetEjectableMediaOfClass( psz_class );
- if( o_devices != nil )
- {
- int i_devices = [o_devices count];
-
- if( i_devices )
+ o_devices = GetEjectableMediaOfClass( psz_class );
+ if ( o_devices != nil )
{
- int i;
+ int i_devices = [o_devices count];
- for( i = 0; i < i_devices; i++ )
+ if ( i_devices )
{
- [o_disc_device
- addItemWithObjectValue: [o_devices objectAtIndex: i]];
+ int i;
+
+ for( i = 0; i < i_devices; i++ )
+ {
+ [o_disc_device
+ addItemWithObjectValue: [o_devices objectAtIndex: i]];
+ }
+
+ [o_disc_device selectItemAtIndex: 0];
+ }
+ else
+ {
+ [o_disc_device setStringValue:
+ [NSString stringWithFormat: _NS("No %@s found"), o_disc]];
}
-
- [o_disc_device selectItemAtIndex: 0];
- }
- else
- {
- [o_disc_device setStringValue:
- [NSString stringWithFormat: @"No %@s found", o_type]];
}
}
+ [o_disc_device setEnabled: b_device];
+ [o_disc_title setEnabled: b_title_chapter];
+ [o_disc_title_stp setEnabled: b_title_chapter];
+ [o_disc_chapter setEnabled: b_title_chapter];
+ [o_disc_chapter_stp setEnabled: b_title_chapter];
+ [o_disc_videots_folder setEnabled: !b_device];
+ [o_disc_videots_btn_browse setEnabled: !b_device];
+ [o_disc_dvd_menus setEnabled: b_menus];
+
[self openDiscInfoChanged: nil];
}
{
NSString *o_type;
NSString *o_device;
+ NSString *o_videots;
NSString *o_mrl_string;
int i_title, i_chapter;
+ vlc_bool_t b_menus;
o_type = [[o_disc_type selectedCell] title];
o_device = [o_disc_device stringValue];
i_title = [o_disc_title intValue];
i_chapter = [o_disc_chapter intValue];
-
- o_mrl_string = [NSString stringWithFormat: @"%@://%@@%i,%i",
- [o_type lowercaseString], o_device, i_title, i_chapter];
+ o_videots = [o_disc_videots_folder stringValue];
+ b_menus = [o_disc_dvd_menus state];
+
+ if ( [o_type isEqualToString: _NS("VCD")] )
+ {
+ if ( [o_device isEqualToString:
+ [NSString stringWithFormat: _NS("No %@s found"), o_type]] )
+ o_device = @"";
+ 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_device];
+ else
+ o_mrl_string = [NSString stringWithFormat: @"dvdold://%@@%i,%i",
+ o_device, i_title, i_chapter];
+ }
+ else /* VIDEO_TS folder */
+ {
+ if ( b_menus )
+ o_mrl_string = [NSString stringWithFormat: @"dvdplay://%@",
+ o_videots];
+ else
+ o_mrl_string = [NSString stringWithFormat: @"dvdread://%@@%i,%i",
+ o_videots, i_title, i_chapter];
+ }
[o_mrl setStringValue: o_mrl_string];
}
+- (IBAction)openDiscMenusChanged:(id)sender
+{
+ [self openDiscInfoChanged: nil];
+ [self openDiscTypeChanged: nil];
+}
+
+- (IBAction)openVTSBrowse:(id)sender
+{
+ NSOpenPanel *o_open_panel = [NSOpenPanel openPanel];
+
+ [o_open_panel setAllowsMultipleSelection: NO];
+ [o_open_panel setCanChooseFiles: NO];
+ [o_open_panel setCanChooseDirectories: YES];
+ [o_open_panel setTitle: _NS("Open VIDEO_TS Directory")];
+ [o_open_panel setPrompt: _NS("Open")];
+
+ if( [o_open_panel runModalForDirectory: nil
+ file: nil types: nil] == NSOKButton )
+ {
+ NSString *o_dirname = [[o_open_panel filenames] objectAtIndex: 0];
+ [o_disc_videots_folder setStringValue: o_dirname];
+ [self openDiscInfoChanged: nil];
+ }
+}
+
- (IBAction)openNetModeChanged:(id)sender
{
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: @"UDP"] ) b_udp = TRUE;
- else if( [o_mode isEqualToString: @"UDP Multicast"] ) b_udpm = TRUE;
- else if( [o_mode isEqualToString: @"Channel server"] ) b_cs = TRUE;
- else if( [o_mode isEqualToString: @"HTTP"] ) b_http = TRUE;
+ 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("HTTP/FTP/MMS")] ) 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];
{
[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];
}
- (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];
o_mode = [[o_net_mode selectedCell] title];
- b_channel = (vlc_bool_t)[o_mode isEqualToString: @"Channel server"];
- config_PutInt( p_intf, "network-channel", b_channel );
-
- if( [o_mode isEqualToString: @"UDP"] )
+ if( [o_mode isEqualToString: _NS("UDP/RTP")] )
{
int i_port = [o_net_udp_port intValue];
o_mrl_string = [NSString stringWithString: @"udp://"];
- if( i_port != 1234 )
+ if( i_port != config_GetInt( p_intf, "server-port" ) )
{
o_mrl_string =
[o_mrl_string stringByAppendingFormat: @"@:%i", i_port];
}
}
- else if( [o_mode isEqualToString: @"UDP Multicast"] )
+ else if( [o_mode isEqualToString: _NS("UDP/RTP Multicast")] )
{
NSString *o_addr = [o_net_udpm_addr stringValue];
int i_port = [o_net_udpm_port intValue];
o_mrl_string = [NSString stringWithFormat: @"udp://@%@", o_addr];
- if( i_port != 1234 )
+ if( i_port != config_GetInt( p_intf, "server-port" ) )
{
o_mrl_string =
[o_mrl_string stringByAppendingFormat: @":%i", i_port];
}
}
- else if( [o_mode isEqualToString: @"Channel server"] )
+ else if( [o_mode isEqualToString: _NS("HTTP/FTP/MMS")] )
{
- NSString *o_addr = [o_net_cs_addr stringValue];
- int i_port = [o_net_cs_port intValue];
+ NSString *o_url = [o_net_http_url stringValue];
- if( p_intf->p_vlc->p_channel == NULL )
- {
- network_ChannelCreate( p_intf );
- }
+ if ( ![o_url hasPrefix:@"http:"] && ![o_url hasPrefix:@"ftp:"]
+ && ![o_url hasPrefix:@"mms"] )
+ o_mrl_string = [NSString stringWithFormat: @"http://%@", o_url];
+ else
+ o_mrl_string = o_url;
+ }
- config_PutPsz( p_intf, "channel-server", [o_addr lossyCString] );
- if( i_port < 65536 )
+ [o_mrl setStringValue: o_mrl_string];
+}
+
+- (IBAction)openFile:(id)sender
+{
+ 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 )
+ {
+ NSArray *o_array = [NSArray array];
+ NSArray *o_values = [[o_open_panel filenames]
+ sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
+
+ for( i = 0; i < (int)[o_values count]; i++)
{
- config_PutInt( p_intf, "channel-port", i_port );
+ 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];
+ }
+}
- /* FIXME: we should use a playlist server instead */
- o_mrl_string = [NSString stringWithString: @"udp://"];
+- (IBAction)subsChanged:(id)sender
+{
+ if ([o_file_sub_ckbox state] == NSOnState)
+ {
+ [o_file_sub_btn_settings setEnabled:YES];
}
- else if( [o_mode isEqualToString: @"HTTP"] )
+ else
{
- NSString *o_url = [o_net_http_url stringValue];
-
- o_mrl_string = [NSString stringWithFormat: @"http://%@", o_url];
+ [o_file_sub_btn_settings setEnabled:NO];
}
+}
- [o_mrl setStringValue: o_mrl_string];
+- (IBAction)subSettings:(id)sender
+{
+ [NSApp beginSheet: o_file_sub_sheet
+ modalForWindow: [sender window]
+ modalDelegate: self
+ didEndSelector: NULL
+ contextInfo: nil];
}
-- (IBAction)openFileBrowse:(id)sender
+- (IBAction)subFileBrowse:(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_path setStringValue: o_filename];
- [self openFilePathChanged: nil];
+ [o_file_sub_path setStringValue: o_filename];
}
}
+- (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)subDelayStepperChanged:(id)sender
+{
+ [o_file_sub_delay setIntValue: [o_file_sub_delay_stp intValue]];
+}
+
+- (IBAction)subFpsStepperChanged:(id)sender;
+{
+ [o_file_sub_fps setFloatValue: [o_file_sub_fps_stp floatValue]];
+}
+
+- (IBAction)subCloseSheet:(id)sender
+{
+ [o_file_sub_sheet orderOut:sender];
+ [NSApp endSheet: o_file_sub_sheet];
+}
+
- (IBAction)panelCancel:(id)sender
{
[NSApp stopModalWithCode: 0];
projects / vlc / blobdiff