/*****************************************************************************
* open.m: MacOS X module for vlc
*****************************************************************************
- * Copyright (C) 2002-2006 the VideoLAN team
+ * 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>
* 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
#include <IOKit/storage/IOCDMedia.h>
#include <IOKit/storage/IODVDMedia.h>
-#include "intf.h"
-#include "playlist.h"
-#include "open.h"
-#include "output.h"
-#import <vlc/intf.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( kIOMediaEjectableKey ),
+
+ 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 != nil )
{
char psz_buf[0x32];
size_t dev_path_length;
CFTypeRef str_bsd_path;
-
+
do
{
str_bsd_path = IORegistryEntryCreateCFProperty( next_media,
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 ) ) != nil );
}
-
+
IOObjectRelease( media_iterator );
o_devices = [NSArray arrayWithArray: p_list];
}
/*****************************************************************************
- * VLCOpen implementation
+ * VLCOpen implementation
*****************************************************************************/
@implementation VLCOpen
} else {
_o_sharedMainInstance = [super init];
}
-
+
return _o_sharedMainInstance;
}
[o_net_udp_port setIntValue: config_GetInt( p_intf, "server-port" )];
[o_net_udp_port_stp setIntValue: config_GetInt( p_intf, "server-port" )];
-
+
+ [o_eyetv_chn_bgbar setUsesThreadedAnimation: YES];
+ /* FIXME: implement EyeTV l10n here */
+
[self setSubPanel];
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
}
[o_file_sub_encoding_pop selectItemWithTitle:
[NSString stringWithCString:
- p_item->psz_value]];
+ p_item->value.psz]];
}
p_item = config_FindConfig( VLC_OBJECT(p_intf), "subsdec-align" );
[NSString stringWithUTF8String:
p_item->ppsz_list_text[i_index]]];
}
- [o_file_sub_align_pop selectItemAtIndex: p_item->i_value];
+ [o_file_sub_align_pop selectItemAtIndex: p_item->value.i];
}
p_item = config_FindConfig( VLC_OBJECT(p_intf), "freetype-rel-fontsize" );
[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] )
+ if ( p_item->value.i == p_item->pi_list[i_index] )
{
[o_file_sub_size_pop selectItemAtIndex: i_index];
}
int i_result;
intf_thread_t * p_intf = VLCIntf;
- b_autoplay = (BOOL *)config_GetInt( VLCIntf, "macosx-autoplay" );
+ 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];
}
else if( [o_label isEqualToString: _NS("Network")] )
{
- [self openNetModeChanged: nil];
- }
+ [self openNetInfoChanged: nil];
+ }
}
- (void)openFileGeneric
- (void)openNet
{
- [self openNetModeChanged: nil];
+ [self openNetInfoChanged: nil];
[self openTarget: 2];
}
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( b_dir )
b_stream ? "stream" : "file",
o_filename];
}
- [o_mrl setStringValue: o_mrl_string];
+ [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")];
types:nil
modalForWindow:[sender window]
modalDelegate: self
- didEndSelector: @selector(pathChosenInPanel:
+ didEndSelector: @selector(pathChosenInPanel:
withReturn:
contextInfo:)
contextInfo: nil];
{
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 directory")] )
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]];
}
}
[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_device, i_title, i_chapter];
}
else if ( [o_type isEqualToString: _NS("Audio CD")] )
{
[NSString stringWithFormat: _NS("No %@s found"), o_type]] )
o_device = @"";
o_mrl_string = [NSString stringWithFormat: @"cdda://%@",
- o_device];
+ o_device];
}
else if ( [o_type isEqualToString: _NS("DVD")] )
{
o_device = @"";
if ( b_menus )
o_mrl_string = [NSString stringWithFormat: @"dvdnav://%@",
- o_device];
+ o_device];
else
o_mrl_string = [NSString stringWithFormat: @"dvdread://%@@%i:%i-",
- o_device, i_title, i_chapter];
+ o_device, i_title, i_chapter];
}
else /* VIDEO_TS folder */
{
if ( b_menus )
o_mrl_string = [NSString stringWithFormat: @"dvdnav://%@",
- o_videots];
+ o_videots];
else
o_mrl_string = [NSString stringWithFormat: @"dvdread://%@@%i:%i",
- o_videots, i_title, i_chapter];
+ o_videots, i_title, i_chapter];
}
- [o_mrl setStringValue: o_mrl_string];
+ [o_mrl setStringValue: o_mrl_string];
}
- (IBAction)openDiscMenusChanged:(id)sender
}
}
-- (IBAction)openNetModeChanged:(id)sender
+- (void)textFieldWasClicked:(NSNotification *)o_notification
{
- NSString *o_mode;
- BOOL b_udp = FALSE;
- BOOL b_udpm = FALSE;
- BOOL b_http = FALSE;
-
- o_mode = [[o_net_mode selectedCell] title];
+ 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];
- 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/RTSP")] ) b_http = TRUE;
+ [self openNetInfoChanged: nil];
+}
- [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_http_url setEnabled: b_http];
+- (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]];
+ [[NSNotificationCenter defaultCenter] postNotificationName: @"VLCOpenTextFieldWasClicked"
+ object: o_net_udpm_port];
+ [o_panel makeFirstResponder: o_net_udpm_port];
}
[self openNetInfoChanged: nil];
{
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];
- }
+ o_mrl_string =
+ [o_mrl_string stringByAppendingFormat: @":%i", i_port];
+ }
}
else if( [o_mode isEqualToString: _NS("HTTP/FTP/MMS/RTSP")] )
{
{
NSOpenPanel *o_open_panel = [NSOpenPanel openPanel];
int i;
- b_autoplay = (BOOL *)config_GetInt( VLCIntf, "macosx-autoplay" );
-
+ 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
file: nil types: nil] == NSOKButton )
{
}
}
+- (IBAction)eyetvSwitchChannel:(id)sender
+{
+ 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" );
+}
+
+- (IBAction)eyetvLaunch:(id)sender
+{
+ [[[VLCMain sharedInstance] getEyeTVController] launchEyeTV];
+}
+
+- (void)eyetvChanged:(NSNotification *)o_notification
+{
+ if( [[o_notification name] isEqualToString: @"DeviceAdded"] )
+ {
+ 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] );
+}
+
+/* little helper method, since this code needs to be run by multiple objects */
+- (void)setupChannelInfo
+{
+ /* 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)
- (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
+ if( [o_open_panel runModalForDirectory: nil
file: nil types: nil] == NSOKButton )
{
NSString *o_filename = [[o_open_panel filenames] objectAtIndex: 0];
}
@end
+
+@implementation VLCOpenTextField
+
+- (void)mouseDown:(NSEvent *)theEvent
+{
+ [[NSNotificationCenter defaultCenter] postNotificationName: @"VLCOpenTextFieldWasClicked"
+ object: self];
+ [super mouseDown: theEvent];
+}
+
+@end
projects / vlc / blobdiff