Commit e541f7f3 authored by Felix Paul Kühne's avatar Felix Paul Kühne

Added complete l10n to the Capture interface and a useful error messages to the input module

parent 5863629c
......@@ -365,6 +365,7 @@
"o_panel" = id;
"o_playlist" = id;
"o_screen_fps_fld" = id;
"o_screen_fps_lbl" = id;
"o_screen_fps_stp" = id;
"o_screen_lbl" = id;
"o_screen_long_lbl" = id;
......
......@@ -7,13 +7,13 @@
<key>IBEditorPositions</key>
<dict>
<key>2297</key>
<string>366 463 548 183 0 0 1280 778 </string>
<string>366 462 548 183 0 0 1280 778 </string>
<key>2301</key>
<string>646 594 548 183 0 0 1280 778 </string>
<string>366 462 548 183 0 0 1280 778 </string>
<key>2304</key>
<string>427 454 547 183 0 0 1280 778 </string>
<string>366 462 547 183 0 0 1280 778 </string>
<key>2346</key>
<string>366 464 548 183 0 0 1280 778 </string>
<string>366 462 548 183 0 0 1280 778 </string>
</dict>
<key>IBFramework Version</key>
<string>489.0</string>
......@@ -24,13 +24,6 @@
<integer>2206</integer>
<integer>2199</integer>
</array>
<key>IBOpenObjects</key>
<array>
<integer>2301</integer>
<integer>2297</integer>
<integer>636</integer>
<integer>2346</integer>
</array>
<key>IBSystem Version</key>
<string>9D34</string>
</dict>
......
......@@ -35,6 +35,7 @@
#include <vlc_input.h>
#include <vlc_vout.h>
#include <vlc_demux.h>
#include <vlc_interface.h>
#import <QTKit/QTKit.h>
......@@ -214,7 +215,11 @@ static int Open( vlc_object_t *p_this )
p_sys->device = [QTCaptureDevice defaultInputDeviceWithMediaType: QTMediaTypeVideo];
if( !p_sys->device )
{
intf_UserFatal( p_demux, true, _("No Input device found"),
_("Your Mac does not seem to be equipped with a suitable input device. "
"Please check your connectors and drivers.") );
msg_Err( p_demux, "Can't find any Video device" );
goto error;
}
......
......@@ -126,6 +126,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
IBOutlet id o_screen_lbl;
IBOutlet id o_screen_long_lbl;
IBOutlet id o_screen_fps_stp;
IBOutlet id o_screen_fps_lbl;
BOOL b_autoplay;
id o_currentCaptureView;
......
......@@ -198,20 +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 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: @"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];
[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:)
......@@ -854,7 +860,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
[self showCaptureView: o_eyetv_notLaunched_view];
[o_mrl setStringValue: @""];
}
else if( [[[o_capture_mode_pop selectedItem] title] isEqualToString: @"Screen"] )
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]]];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment