X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fopen.m;h=36fac3802ee4bb78b325bd078ee46e64499d64e2;hb=38f0f82f4b88eb45ba8a7b16e1828978563a5466;hp=ae8027b1171e1e4e33ec2211b00b6e49a0653b53;hpb=6ee1e193fd896ab9a4729fde14f009d9ce629815;p=vlc diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m index ae8027b117..36fac3802e 100644 --- a/modules/gui/macosx/open.m +++ b/modules/gui/macosx/open.m @@ -1,14 +1,14 @@ /***************************************************************************** * open.m: MacOS X module for vlc ***************************************************************************** - * Copyright (C) 2002-2007 the VideoLAN team + * Copyright (C) 2002-2008 the VideoLAN team * $Id$ * * Authors: Jon Lech Johansen * Christophe Massiot * Derk-Jan Hartman * Benjamin Pracht - * Felix KŸhne + * Felix Kühne * * 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 @@ -45,6 +45,14 @@ #import "output.h" #import "eyetv.h" +#define setEyeTVUnconnected \ +[o_capture_lbl setStringValue: _NS("No device connected")]; \ +[o_capture_long_lbl setStringValue: _NS("VLC could not detect any EyeTV compatible device.\n\nCheck the device's connection, make sure that the latest EyeTV software is installed and try again.")]; \ +[o_capture_lbl displayIfNeeded]; \ +[o_capture_long_lbl displayIfNeeded]; \ +[self showCaptureView: o_capture_label_view] + + /***************************************************************************** * GetEjectableMediaOfClass *****************************************************************************/ @@ -83,7 +91,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) p_list = [NSMutableArray arrayWithCapacity: 1]; next_media = IOIteratorNext( media_iterator ); - if( next_media != nil ) + if( next_media ) { char psz_buf[0x32]; size_t dev_path_length; @@ -109,14 +117,14 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) sizeof(psz_buf) - dev_path_length, kCFStringEncodingASCII ) ) { - [p_list addObject: [NSString stringWithCString: psz_buf]]; + [p_list addObject: [NSString stringWithUTF8String: psz_buf]]; } CFRelease( str_bsd_path ); IOObjectRelease( next_media ); - } while( ( next_media = IOIteratorNext( media_iterator ) ) != nil ); + } while( ( next_media = IOIteratorNext( media_iterator ) ) ); } IOObjectRelease( media_iterator ); @@ -162,6 +170,7 @@ static VLCOpen *_o_sharedMainInstance = nil; [[o_tabview tabViewItemAtIndex: 0] setLabel: _NS("File")]; [[o_tabview tabViewItemAtIndex: 1] setLabel: _NS("Disc")]; [[o_tabview tabViewItemAtIndex: 2] setLabel: _NS("Network")]; + [[o_tabview tabViewItemAtIndex: 3] setLabel: _NS("Capture")]; [o_file_btn_browse setTitle: _NS("Browse...")]; [o_file_stream setTitle: _NS("Treat as a pipe rather than as a file")]; @@ -170,7 +179,7 @@ static VLCOpen *_o_sharedMainInstance = nil; [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_dvd_menus setTitle: _NS("No DVD menus")]; [[o_disc_type cellAtRow:0 column:0] setTitle: _NS("VIDEO_TS directory")]; [[o_disc_type cellAtRow:1 column:0] setTitle: _NS("DVD")]; @@ -189,12 +198,26 @@ static VLCOpen *_o_sharedMainInstance = nil; [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]; + [o_capture_mode_pop removeAllItems]; + if( MACOS_VERSION > 10.4f ) + [o_capture_mode_pop addItemWithTitle: @"iSight"]; + [o_capture_mode_pop addItemWithTitle: _NS("Screen")]; + [o_capture_mode_pop addItemWithTitle: @"EyeTV"]; + [o_screen_lbl setStringValue: _NS("Screen Capture Input")]; + [o_screen_long_lbl setStringValue: _NS("This facility allows you to process your screen's output.")]; + [o_screen_fps_lbl setStringValue: _NS("Frames per Second:")]; + [o_eyetv_currentChannel_lbl setStringValue: _NS("Current channel:")]; + [o_eyetv_previousProgram_btn setTitle: _NS("Previous Channel")]; + [o_eyetv_nextProgram_btn setTitle: _NS("Next Channel")]; + [o_eyetv_chn_status_txt setStringValue: _NS("Retrieving Channel Info...")]; + [o_eyetv_noInstance_lbl setStringValue: _NS("EyeTV is not launched")]; + [o_eyetv_noInstanceLong_lbl setStringValue: _NS("VLC could not connect to EyeTV.\nMake sure that you installed VLC's EyeTV plugin.")]; + [o_eyetv_launchEyeTV_btn setTitle: _NS("Launch EyeTV now")]; + + [self setSubPanel]; [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(openFilePathChanged:) @@ -235,21 +258,17 @@ static VLCOpen *_o_sharedMainInstance = nil; 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]; - + + [[NSNotificationCenter defaultCenter] addObserver: self + selector: @selector(screenFPSfieldChanged:) + name: NSControlTextDidChangeNotification + object: o_screen_fps_fld]; + /* register clicks on text fields */ [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(textFieldWasClicked:) @@ -289,12 +308,10 @@ static VLCOpen *_o_sharedMainInstance = nil; i_index++ ) { [o_file_sub_encoding_pop addItemWithTitle: - [NSString stringWithCString: - p_item->ppsz_list[i_index]]]; + [NSString stringWithUTF8String: p_item->ppsz_list[i_index]]]; } [o_file_sub_encoding_pop selectItemWithTitle: - [NSString stringWithCString: - p_item->value.psz]]; + [NSString stringWithUTF8String: p_item->value.psz]]; } p_item = config_FindConfig( VLC_OBJECT(p_intf), "subsdec-align" ); @@ -411,6 +428,10 @@ static VLCOpen *_o_sharedMainInstance = nil; { [self openNetInfoChanged: nil]; } + else if( [o_label isEqualToString: _NS("Capture")] ) + { + [self openCaptureModeChanged: nil]; + } } - (void)openFileGeneric @@ -431,12 +452,19 @@ static VLCOpen *_o_sharedMainInstance = nil; [self openTarget: 2]; } +- (void)openCapture +{ + [self openCaptureModeChanged: nil]; + [self showCaptureView: o_capture_label_view]; + [self openTarget: 3]; +} + - (void)openFilePathChanged:(NSNotification *)o_notification { 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_stream = [o_file_stream state]; BOOL b_dir = NO; [[NSFileManager defaultManager] fileExistsAtPath:o_filename isDirectory:&b_dir]; @@ -499,7 +527,7 @@ static VLCOpen *_o_sharedMainInstance = nil; - (IBAction)openDiscTypeChanged:(id)sender { NSString *o_type; - vlc_bool_t b_device, b_menus, b_title_chapter; + BOOL b_device, b_no_menus, b_title_chapter; [o_disc_device removeAllItems]; b_title_chapter = ![o_disc_dvd_menus state]; @@ -508,34 +536,32 @@ static VLCOpen *_o_sharedMainInstance = nil; if ( [o_type isEqualToString: _NS("VIDEO_TS directory")] ) { - b_device = 0; b_menus = 1; + b_device = NO; b_no_menus = YES; } else { NSArray *o_devices; NSString *o_disc; const char *psz_class = NULL; - b_device = 1; + b_device = YES; 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]; - } + b_no_menus = NO; b_title_chapter = YES; + } 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]; + b_no_menus = NO; b_title_chapter = NO; } else { psz_class = kIODVDMediaClass; o_disc = o_type; - b_menus = 1; + b_no_menus = YES; } o_devices = GetEjectableMediaOfClass( psz_class ); @@ -545,9 +571,7 @@ static VLCOpen *_o_sharedMainInstance = nil; if ( i_devices ) { - int i; - - for( i = 0; i < i_devices; i++ ) + for( int i = 0; i < i_devices; i++ ) { [o_disc_device addItemWithObjectValue: [o_devices objectAtIndex: i]]; @@ -570,7 +594,7 @@ static VLCOpen *_o_sharedMainInstance = nil; [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]; + [o_disc_dvd_menus setEnabled: b_no_menus]; [self openDiscInfoChanged: nil]; } @@ -598,14 +622,14 @@ static VLCOpen *_o_sharedMainInstance = nil; NSString *o_videots; NSString *o_mrl_string; int i_title, i_chapter; - vlc_bool_t b_menus; + BOOL b_no_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_videots = [o_disc_videots_folder stringValue]; - b_menus = [o_disc_dvd_menus state]; + b_no_menus = [o_disc_dvd_menus state]; if ( [o_type isEqualToString: _NS("VCD")] ) { @@ -628,21 +652,22 @@ static VLCOpen *_o_sharedMainInstance = nil; if ( [o_device isEqualToString: [NSString stringWithFormat: _NS("No %@s found"), o_type]] ) o_device = @""; - if ( b_menus ) - o_mrl_string = [NSString stringWithFormat: @"dvdnav://%@", - o_device]; - else + if ( b_no_menus ) o_mrl_string = [NSString stringWithFormat: @"dvdread://%@@%i:%i-", o_device, i_title, i_chapter]; + else + o_mrl_string = [NSString stringWithFormat: @"dvdnav://%@", + o_device]; + } else /* VIDEO_TS folder */ { - if ( b_menus ) - o_mrl_string = [NSString stringWithFormat: @"dvdnav://%@", - o_videots]; - else + if ( b_no_menus ) o_mrl_string = [NSString stringWithFormat: @"dvdread://%@@%i:%i", o_videots, i_title, i_chapter]; + else + o_mrl_string = [NSString stringWithFormat: @"dvdnav://%@", + o_videots]; } [o_mrl setStringValue: o_mrl_string]; @@ -797,15 +822,96 @@ static VLCOpen *_o_sharedMainInstance = nil; } } +- (void)showCaptureView: theView +{ + NSRect o_view_rect; + o_view_rect = [theView frame]; + if( o_currentCaptureView ) + { + [o_currentCaptureView removeFromSuperviewWithoutNeedingDisplay]; + [o_currentCaptureView release]; + } + [theView setFrame: NSMakeRect( 0, 10, o_view_rect.size.width, o_view_rect.size.height)]; + [theView setNeedsDisplay: YES]; + [theView setAutoresizesSubviews: YES]; + [[[o_tabview tabViewItemAtIndex: 3] view] addSubview: theView]; + [theView displayIfNeeded]; + o_currentCaptureView = theView; + [o_currentCaptureView retain]; +} + +- (IBAction)openCaptureModeChanged:(id)sender +{ + if( [[[o_capture_mode_pop selectedItem] title] isEqualToString: @"EyeTV"] ) + { + if( [[[VLCMain sharedInstance] getEyeTVController] isEyeTVrunning] == YES ) + { + if( [[[VLCMain sharedInstance] getEyeTVController] isDeviceConnected] == YES ) + { + [self showCaptureView: o_eyetv_running_view]; + [self setupChannelInfo]; + } + else + { + setEyeTVUnconnected; + } + } + else + [self showCaptureView: o_eyetv_notLaunched_view]; + [o_mrl setStringValue: @""]; + } + else if( [[[o_capture_mode_pop selectedItem] title] isEqualToString: _NS("Screen")] ) + { + [self showCaptureView: o_screen_view]; + [o_mrl setStringValue: [NSString stringWithFormat:@"screen:// :screen-fps=%@", [o_screen_fps_fld stringValue]]]; + } + else if( [[[o_capture_mode_pop selectedItem] title] isEqualToString: @"iSight"] ) + { + [o_capture_lbl setStringValue: _NS("iSight Capture Input")]; + [o_capture_long_lbl setStringValue: _NS("This facility allows you to process your iSight's input signal.\n\nNo settings are available in this version, so you will be provided a 640px*480px raw video stream.\n\nLive Audio input is not supported.")]; + [o_capture_lbl displayIfNeeded]; + [o_capture_long_lbl displayIfNeeded]; + + [self showCaptureView: o_capture_label_view]; + [o_mrl setStringValue: @"qtcapture://"]; + } +} + +- (IBAction)screenStepperChanged:(id)sender +{ + [o_screen_fps_fld setIntValue: [o_screen_fps_stp intValue]]; + [o_panel makeFirstResponder: o_screen_fps_fld]; + [o_mrl setStringValue: [NSString stringWithFormat:@"screen:// :screen-fps=%@", [o_screen_fps_fld stringValue]]]; +} + +- (void)screenFPSfieldChanged:(NSNotification *)o_notification +{ + [o_screen_fps_stp setIntValue: [o_screen_fps_fld intValue]]; + if( [[o_screen_fps_fld stringValue] isEqualToString: @""] ) + [o_screen_fps_fld setIntValue: 1]; + [o_mrl setStringValue: [NSString stringWithFormat:@"screen:// :screen-fps=%i", [o_screen_fps_fld intValue]]]; +} + - (IBAction)eyetvSwitchChannel:(id)sender { if( sender == o_eyetv_nextProgram_btn ) - [[[VLCMain sharedInstance] getEyeTVController] switchChannelUp: YES]; + { + int chanNum = [[[VLCMain sharedInstance] getEyeTVController] switchChannelUp: YES]; + [o_eyetv_channels_pop selectItemWithTag:chanNum]; + [o_mrl setStringValue: [NSString stringWithFormat:@"eyetv:// :eyetv-channel=%d", chanNum]]; + } else if( sender == o_eyetv_previousProgram_btn ) - [[[VLCMain sharedInstance] getEyeTVController] switchChannelUp: NO]; + { + int chanNum = [[[VLCMain sharedInstance] getEyeTVController] switchChannelUp: NO]; + [o_eyetv_channels_pop selectItemWithTag:chanNum]; + [o_mrl setStringValue: [NSString stringWithFormat:@"eyetv:// :eyetv-channel=%d", chanNum]]; + } else if( sender == o_eyetv_channels_pop ) - [[[VLCMain sharedInstance] getEyeTVController] selectChannel: - [sender indexOfSelectedItem]]; + { + int chanNum = [[sender selectedItem] tag]; + [[[VLCMain sharedInstance] getEyeTVController] selectChannel:chanNum]; + [o_mrl setStringValue: [NSString stringWithFormat:@"eyetv:// :eyetv-channel=%d", chanNum]]; + } else msg_Err( VLCIntf, "eyetvSwitchChannel sent by unknown object" ); } @@ -820,7 +926,7 @@ static VLCOpen *_o_sharedMainInstance = nil; if( [[o_notification name] isEqualToString: @"DeviceAdded"] ) { msg_Dbg( VLCIntf, "eyetv device was added" ); - [o_eyetv_tabView selectTabViewItemWithIdentifier:@"eyetvup"]; + [self showCaptureView: o_eyetv_running_view]; [self setupChannelInfo]; } else if( [[o_notification name] isEqualToString: @"DeviceRemoved"] ) @@ -828,23 +934,23 @@ static VLCOpen *_o_sharedMainInstance = nil; /* leave the channel selection like that, * switch to our "no device" tab */ msg_Dbg( VLCIntf, "eyetv device was removed" ); - [o_eyetv_tabView selectTabViewItemWithIdentifier:@"nodevice"]; + setEyeTVUnconnected; } else if( [[o_notification name] isEqualToString: @"PluginQuit"] ) { /* switch to the "launch eyetv" tab */ msg_Dbg( VLCIntf, "eyetv was terminated" ); - [o_eyetv_tabView selectTabViewItemWithIdentifier:@"noeyetv"]; + [self showCaptureView: o_eyetv_notLaunched_view]; } 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"]; + setEyeTVUnconnected; } 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 @@ -857,16 +963,28 @@ static VLCOpen *_o_sharedMainInstance = nil; [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] + NSEnumerator *channels = [[[VLCMain sharedInstance] getEyeTVController] allChannels]; + int x = -2; + [[[o_eyetv_channels_pop menu] addItemWithTitle: _NS("Composite input") action: nil - keyEquivalent: @""]; - x += 1; + keyEquivalent: @""] setTag:x++]; + [[[o_eyetv_channels_pop menu] addItemWithTitle: _NS("S-Video input") + action: nil + keyEquivalent: @""] setTag:x++]; + if( channels ) + { + NSString *channel; + [[o_eyetv_channels_pop menu] addItem: [NSMenuItem separatorItem]]; + while( channel = [channels nextObject] ) + { + /* we have to add items this way, because we accept duplicates + * additionally, we save a bit of time */ + [[[o_eyetv_channels_pop menu] addItemWithTitle: channel + action: nil + keyEquivalent: @""] setTag:++x]; + } + /* make Tuner the default */ + [o_eyetv_channels_pop selectItemWithTag:[[[VLCMain sharedInstance] getEyeTVController] currentChannel]]; } /* clean up GUI */