/*****************************************************************************
- * open.m: MacOS X plugin for vlc
+ * open.m: MacOS X module for vlc
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: open.m,v 1.6 2003/01/05 02:39:48 massiot Exp $
+ * Copyright (C) 2002-2007 the VideoLAN team
+ * $Id$
*
- * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
+ * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
+ * Derk-Jan Hartman <thedj@users.sourceforge.net>
+ * Benjamin Pracht <bigben at videolan dot org>
+ * Felix K\9fhne <fkuehne at videolan dot org>
*
* 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
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
#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"
+#import "output.h"
+#import "eyetv.h"
/*****************************************************************************
- * GetEjectableMediaOfClass
+ * GetEjectableMediaOfClass
*****************************************************************************/
NSArray *GetEjectableMediaOfClass( const char *psz_class )
{
{
return( nil );
}
-
+
classes_to_match = IOServiceMatching( psz_class );
if( classes_to_match == NULL )
{
return( nil );
}
-
- CFDictionarySetValue( classes_to_match, CFSTR( kIOMediaEjectable ),
+
+ CFDictionarySetValue( classes_to_match, CFSTR( kIOMediaEjectableKey ),
kCFBooleanTrue );
-
- kern_result = IOServiceGetMatchingServices( master_port, classes_to_match,
+
+ kern_result = IOServiceGetMatchingServices( master_port, classes_to_match,
&media_iterator );
if( kern_result != KERN_SUCCESS )
{
}
p_list = [NSMutableArray arrayWithCapacity: 1];
-
+
next_media = IOIteratorNext( media_iterator );
- if( next_media != NULL )
+ if( next_media != nil )
{
char psz_buf[0x32];
size_t dev_path_length;
CFTypeRef str_bsd_path;
-
+
do
{
str_bsd_path = IORegistryEntryCreateCFProperty( next_media,
- CFSTR( kIOBSDName ),
+ CFSTR( kIOBSDNameKey ),
kCFAllocatorDefault,
0 );
if( str_bsd_path == NULL )
IOObjectRelease( next_media );
continue;
}
-
+
snprintf( psz_buf, sizeof(psz_buf), "%s%c", _PATH_DEV, 'r' );
dev_path_length = strlen( psz_buf );
-
+
if( CFStringGetCString( str_bsd_path,
(char*)&psz_buf + dev_path_length,
sizeof(psz_buf) - dev_path_length,
{
[p_list addObject: [NSString stringWithCString: psz_buf]];
}
-
+
CFRelease( str_bsd_path );
-
+
IOObjectRelease( next_media );
-
- } while( ( next_media = IOIteratorNext( media_iterator ) ) != NULL );
+
+ } while( ( next_media = IOIteratorNext( media_iterator ) ) != nil );
}
-
+
IOObjectRelease( media_iterator );
o_devices = [NSArray arrayWithArray: p_list];
}
/*****************************************************************************
- * VLCOpen implementation
+ * VLCOpen implementation
*****************************************************************************/
@implementation VLCOpen
+static VLCOpen *_o_sharedMainInstance = nil;
+
++ (VLCOpen *)sharedInstance
+{
+ return _o_sharedMainInstance ? _o_sharedMainInstance : [[self alloc] init];
+}
+
+- (id)init
+{
+ if( _o_sharedMainInstance) {
+ [self dealloc];
+ } else {
+ _o_sharedMainInstance = [super init];
+ }
+
+ return _o_sharedMainInstance;
+}
+
- (void)awakeFromNib
{
- intf_thread_t * p_intf = [NSApp getIntf];
+ intf_thread_t * p_intf = VLCIntf;
- [o_panel setTitle: _NS("Open Target")];
+ [o_panel setTitle: _NS("Open Source")];
[o_mrl_lbl setTitle: _NS("Media Resource Locator (MRL)")];
[o_btn_ok setTitle: _NS("OK")];
[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 setStringValue: _NS("Browse...")];
+ [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:0 column:0] setTitle: _NS("VIDEO_TS directory")];
[[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_timeshift_ckbox setTitle: _NS("Allow timeshifting")];
[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_eyetv_chn_bgbar setUsesThreadedAnimation: YES];
+ /* FIXME: implement EyeTV l10n here */
+
+ [self setSubPanel];
+
[[NSNotificationCenter defaultCenter] addObserver: self
selector: @selector(openFilePathChanged:)
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];
+
+ /* wake up with the correct GUI */
+ if( [[[VLCMain sharedInstance] getEyeTVController] isEyeTVrunning] == YES )
+ [o_eyetv_tabView selectTabViewItemWithIdentifier:@"nodevice"];
+ if( [[[VLCMain sharedInstance] getEyeTVController] isDeviceConnected] == YES )
+ {
+ [o_eyetv_tabView selectTabViewItemWithIdentifier:@"eyetvup"];
+ [self setupChannelInfo];
+ }
+
+ [[NSDistributedNotificationCenter defaultCenter] addObserver: self
+ selector: @selector(eyetvChanged:)
+ name: NULL
+ object: @"VLCEyeTVSupport"
+ suspensionBehavior: NSNotificationSuspensionBehaviorDeliverImmediately];
+
+ /* register clicks on text fields */
+ [[NSNotificationCenter defaultCenter] addObserver: self
+ selector: @selector(textFieldWasClicked:)
+ name: @"VLCOpenTextFieldWasClicked"
+ object: nil];
+}
+
+- (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 parametters")];
+ [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 alignment")];
+ [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->value.psz]];
+ }
+
+ 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->value.i];
+ }
+
+ 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->value.i == p_item->pi_list[i_index] )
+ {
+ [o_file_sub_size_pop selectItemAtIndex: i_index];
+ }
+ }
+ }
}
- (void)openTarget:(int)i_type
{
int i_result;
+ intf_thread_t * p_intf = VLCIntf;
- [o_tabview selectTabViewItemAtIndex: i_type];
+ b_autoplay = config_GetInt( VLCIntf, "macosx-autoplay" );
+ [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];
+ 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 )
+ {
+ module_config_t * p_item;
- [o_playlist appendArray:
- [NSArray arrayWithObject: o_source] atPos: -1];
+ [o_options addObject: [NSString stringWithFormat: @"sub-file=%@", [o_file_sub_path stringValue]]];
+ 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" );
+
+ 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]]];
+ }
+ }
+ if( [o_net_timeshift_ckbox state] == NSOnState )
+ {
+ [o_options addObject: [NSString stringWithString:
+ @"access-filter=timeshift"]];
+ }
+ [o_dic setObject: (NSArray *)[o_options copy] forKey: @"ITEM_OPTIONS"];
+ if( b_autoplay )
+ [o_playlist appendArray: [NSArray arrayWithObject: o_dic] atPos: -1 enqueue:NO];
+ else
+ [o_playlist appendArray: [NSArray arrayWithObject: o_dic] atPos: -1 enqueue:YES];
}
}
}
else if( [o_label isEqualToString: _NS("Network")] )
{
- [self openNetModeChanged: nil];
- }
+ [self openNetInfoChanged: nil];
+ }
}
-- (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 openNetInfoChanged: nil];
[self openTarget: 2];
}
{
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: @"%s://%@",
- b_stream ? "stream" : "file",
- o_filename];
- [o_mrl setStringValue: o_mrl_string];
+ 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
{
NSString *o_type;
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: _NS("VIDEO_TS folder")] )
+ if ( [o_type isEqualToString: _NS("VIDEO_TS directory")] )
{
b_device = 0; b_menus = 1;
}
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 )
{
int i;
-
+
for( i = 0; i < i_devices; i++ )
{
- [o_disc_device
+ [o_disc_device
addItemWithObjectValue: [o_devices objectAtIndex: i]];
}
}
else
{
- [o_disc_device setStringValue:
+ [o_disc_device setStringValue:
[NSString stringWithFormat: _NS("No %@s found"), o_disc]];
}
}
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];
+ 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")] )
{
[NSString stringWithFormat: _NS("No %@s found"), o_type]] )
o_device = @"";
if ( b_menus )
- o_mrl_string = [NSString stringWithFormat: @"dvdplay://%@",
- o_device];
+ o_mrl_string = [NSString stringWithFormat: @"dvdnav://%@",
+ o_device];
else
- o_mrl_string = [NSString stringWithFormat: @"dvdold://%@@%i,%i",
- o_device, i_title, i_chapter];
+ 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_videots];
+ o_mrl_string = [NSString stringWithFormat: @"dvdnav://%@",
+ o_videots];
else
- o_mrl_string = [NSString stringWithFormat: @"dvdread://%@@%i,%i",
- o_videots, i_title, i_chapter];
+ o_mrl_string = [NSString stringWithFormat: @"dvdread://%@@%i:%i",
+ o_videots, i_title, i_chapter];
}
- [o_mrl setStringValue: o_mrl_string];
+ [o_mrl setStringValue: o_mrl_string];
}
- (IBAction)openDiscMenusChanged:(id)sender
[self openDiscTypeChanged: nil];
}
-- (IBAction)openNetModeChanged:(id)sender
+- (IBAction)openVTSBrowse:(id)sender
{
- NSString *o_mode;
- BOOL b_udp = FALSE;
- BOOL b_udpm = FALSE;
- BOOL b_cs = FALSE;
- BOOL b_http = FALSE;
+ NSOpenPanel *o_open_panel = [NSOpenPanel openPanel];
- o_mode = [[o_net_mode selectedCell] title];
+ [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];
+ }
+}
- if( [o_mode isEqualToString: @"UDP/RTP"] ) b_udp = TRUE;
- else if( [o_mode isEqualToString: @"UDP/RTP Multicast"] ) b_udpm = TRUE;
- else if( [o_mode isEqualToString: @"Channel server"] ) b_cs = TRUE;
- else if( [o_mode isEqualToString: @"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];
+- (void)textFieldWasClicked:(NSNotification *)o_notification
+{
+ if( [o_notification object] == o_net_udp_port )
+ [o_net_mode selectCellAtRow: 0 column: 0];
+ else if( [o_notification object] == o_net_udpm_addr ||
+ [o_notification object] == o_net_udpm_port )
+ [o_net_mode selectCellAtRow: 1 column: 0];
+ else
+ [o_net_mode selectCellAtRow: 2 column: 0];
+
+ [self openNetInfoChanged: nil];
+}
+
+- (IBAction)openNetModeChanged:(id)sender
+{
+ if( [[sender selectedCell] tag] == 0 )
+ [o_panel makeFirstResponder: o_net_udp_port];
+ else if ( [[sender selectedCell] tag] == 1 )
+ [o_panel makeFirstResponder: o_net_udpm_addr];
+ else
+ [o_panel makeFirstResponder: o_net_http_url];
[self openNetInfoChanged: nil];
}
if( i_tag == 0 )
{
[o_net_udp_port setIntValue: [o_net_udp_port_stp intValue]];
+ [[NSNotificationCenter defaultCenter] postNotificationName: @"VLCOpenTextFieldWasClicked"
+ object: o_net_udp_port];
+ [o_panel makeFirstResponder: o_net_udp_port];
}
else if( i_tag == 1 )
{
[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]];
+ [[NSNotificationCenter defaultCenter] postNotificationName: @"VLCOpenTextFieldWasClicked"
+ object: o_net_udpm_port];
+ [o_panel makeFirstResponder: o_net_udpm_port];
}
[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];
+ 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];
- o_mrl_string = [NSString stringWithString: @"udp://"];
+ o_mrl_string = [NSString stringWithString: @"udp://"];
if( i_port != config_GetInt( p_intf, "server-port" ) )
{
- o_mrl_string =
- [o_mrl_string stringByAppendingFormat: @"@:%i", i_port];
- }
+ o_mrl_string =
+ [o_mrl_string stringByAppendingFormat: @"@:%i", i_port];
+ }
}
- else if( [o_mode isEqualToString: _NS("UDP/RTP 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];
+ o_mrl_string = [NSString stringWithFormat: @"udp://@%@", o_addr];
if( i_port != config_GetInt( p_intf, "server-port" ) )
{
- o_mrl_string =
- [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 );
+ o_mrl_string =
+ [o_mrl_string stringByAppendingFormat: @":%i", 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;
}
-
[o_mrl setStringValue: o_mrl_string];
}
-- (IBAction)openFileBrowse:(id)sender
+- (void)openFile
{
NSOpenPanel *o_open_panel = [NSOpenPanel openPanel];
-
- [o_open_panel setAllowsMultipleSelection: NO];
+ int i;
+ b_autoplay = config_GetInt( VLCIntf, "macosx-autoplay" );
+
+ [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
+
+ 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];
+ NSArray *o_array = [NSArray array];
+ NSArray *o_values = [[o_open_panel filenames]
+ sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
+
+ 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];
+ }
+ if( b_autoplay )
+ [o_playlist appendArray: o_array atPos: -1 enqueue:NO];
+ else
+ [o_playlist appendArray: o_array atPos: -1 enqueue:YES];
}
}
-- (IBAction)openVTSBrowse:(id)sender
+- (IBAction)eyetvSwitchChannel:(id)sender
{
- NSOpenPanel *o_open_panel = [NSOpenPanel openPanel];
+ if( sender == o_eyetv_nextProgram_btn )
+ [[[VLCMain sharedInstance] getEyeTVController] switchChannelUp: YES];
+ else if( sender == o_eyetv_previousProgram_btn )
+ [[[VLCMain sharedInstance] getEyeTVController] switchChannelUp: NO];
+ else if( sender == o_eyetv_channels_pop )
+ [[[VLCMain sharedInstance] getEyeTVController] selectChannel:
+ [sender indexOfSelectedItem]];
+ else
+ msg_Err( VLCIntf, "eyetvSwitchChannel sent by unknown object" );
+}
- [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")];
+- (IBAction)eyetvLaunch:(id)sender
+{
+ [[[VLCMain sharedInstance] getEyeTVController] launchEyeTV];
+}
- if( [o_open_panel runModalForDirectory: nil
- file: nil types: nil] == NSOKButton )
+- (void)eyetvChanged:(NSNotification *)o_notification
+{
+ if( [[o_notification name] isEqualToString: @"DeviceAdded"] )
{
- NSString *o_dirname = [[o_open_panel filenames] objectAtIndex: 0];
- [o_disc_videots_folder setStringValue: o_dirname];
- [self openDiscInfoChanged: nil];
+ msg_Dbg( VLCIntf, "eyetv device was added" );
+ [o_eyetv_tabView selectTabViewItemWithIdentifier:@"eyetvup"];
+ [self setupChannelInfo];
+ }
+ else if( [[o_notification name] isEqualToString: @"DeviceRemoved"] )
+ {
+ /* leave the channel selection like that,
+ * switch to our "no device" tab */
+ msg_Dbg( VLCIntf, "eyetv device was removed" );
+ [o_eyetv_tabView selectTabViewItemWithIdentifier:@"nodevice"];
+ }
+ else if( [[o_notification name] isEqualToString: @"PluginQuit"] )
+ {
+ /* switch to the "launch eyetv" tab */
+ msg_Dbg( VLCIntf, "eyetv was terminated" );
+ [o_eyetv_tabView selectTabViewItemWithIdentifier:@"noeyetv"];
}
+ else if( [[o_notification name] isEqualToString: @"PluginInit"] )
+ {
+ /* we got no device yet */
+ msg_Dbg( VLCIntf, "eyetv was launched, no device yet" );
+ [o_eyetv_tabView selectTabViewItemWithIdentifier:@"nodevice"];
+ }
+ else
+ msg_Warn( VLCIntf, "unknown external notify '%s' received", [[o_notification name] UTF8String] );
}
-- (IBAction)openFile:(id)sender
+/* little helper method, since this code needs to be run by multiple objects */
+- (void)setupChannelInfo
{
- NSOpenPanel *o_open_panel = [NSOpenPanel openPanel];
+ /* set up channel selection */
+ [o_eyetv_channels_pop removeAllItems];
+ [o_eyetv_chn_bgbar setHidden: NO];
+ [o_eyetv_chn_bgbar animate: self];
+ [o_eyetv_chn_status_txt setStringValue: _NS("Retrieving Channel Info...")];
+ [o_eyetv_chn_status_txt setHidden: NO];
+
+ /* retrieve info */
+ int x = 0;
+ int channelCount = ( [[[VLCMain sharedInstance] getEyeTVController] getNumberOfChannels] + 1 );
+ while( x != channelCount )
+ {
+ /* we have to add items this way, because we accept duplicates
+ * additionally, we save a bit of time */
+ [[o_eyetv_channels_pop menu] addItemWithTitle: [[[VLCMain sharedInstance] getEyeTVController] getNameOfChannel: x]
+ action: nil
+ keyEquivalent: @""];
+ x += 1;
+ }
+
+ /* clean up GUI */
+ [o_eyetv_chn_bgbar setHidden: YES];
+ [o_eyetv_chn_status_txt setHidden: YES];
+}
+- (IBAction)subsChanged:(id)sender
+{
+ if ([o_file_sub_ckbox state] == NSOnState)
+ {
+ [o_file_sub_btn_settings setEnabled:YES];
+ }
+ else
+ {
+ [o_file_sub_btn_settings setEnabled:NO];
+ }
+}
+
+- (IBAction)subSettings:(id)sender
+{
+ [NSApp beginSheet: o_file_sub_sheet
+ modalForWindow: [sender window]
+ modalDelegate: self
+ didEndSelector: NULL
+ contextInfo: nil];
+}
+
+- (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 )
{
- [o_playlist appendArray: [o_open_panel filenames] atPos: -1];
+ NSString *o_filename = [[o_open_panel filenames] objectAtIndex: 0];
+ [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];
}
@end
+
+@implementation VLCOpenTextField
+
+- (void)mouseDown:(NSEvent *)theEvent
+{
+ [[NSNotificationCenter defaultCenter] postNotificationName: @"VLCOpenTextFieldWasClicked"
+ object: self];
+ [super mouseDown: theEvent];
+}
+
+@end