/*****************************************************************************
* 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 <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>
+ * Felix KΓΌhne <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
#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
*****************************************************************************/
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;
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 );
[[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")];
[o_net_udp_port_stp setIntValue: config_GetInt( p_intf, "server-port" )];
[o_eyetv_chn_bgbar setUsesThreadedAnimation: YES];
- /* FIXME: implement EyeTV l10n here */
-
+
+ /* FIXME: implement Capturing l10n here completely */
+ [o_capture_mode_pop removeAllItems];
+ if( MACOS_VERSION > 10.4f )
+ [o_capture_mode_pop addItemWithTitle: _NS("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.")];
+
[self setSubPanel];
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];
- }
-
+ [[NSNotificationCenter defaultCenter] addObserver: self
+ selector: @selector(screenFPSChanged:)
+ name: NSControlTextDidChangeNotification
+ object: o_screen_fps_fld];
+
[[NSDistributedNotificationCenter defaultCenter] addObserver: self
selector: @selector(eyetvChanged:)
name: NULL
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" );
{
[self openNetInfoChanged: nil];
}
+ else if( [o_label isEqualToString: _NS("Capture")] )
+ {
+ [self openCaptureModeChanged: nil];
+ }
}
- (void)openFileGeneric
[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];
}
}
+- (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: @"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)openCaptureStepperChanged:(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]]];
+}
+
- (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" );
}
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"] )
/* 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] );
[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: @""] setTag:x++];
+ [[[o_eyetv_channels_pop menu] addItemWithTitle: _NS("S-Video input")
action: nil
- keyEquivalent: @""];
- x += 1;
+ 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 */
projects / vlc / blobdiff