Add subscreen/follow mouse options in open dialog.

Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

extras/package/macosx/Resources/English.lproj/Open.nib/info.nib

@@ -2,36 +2,18 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>IBDocumentLocation</key>
-	<string>-8 61 505 517 0 0 800 578 </string>
-	<key>IBEditorPositions</key>
-	<dict>
-		<key>2297</key>
-		<string>366 460 548 183 0 0 1280 778 </string>
-		<key>2301</key>
-		<string>366 460 548 183 0 0 1280 778 </string>
-		<key>2304</key>
-		<string>366 460 547 183 0 0 1280 778 </string>
-		<key>2346</key>
-		<string>366 460 548 183 0 0 1280 778 </string>
-	</dict>
 	<key>IBFramework Version</key>
-	<string>489.0</string>
-	<key>IBLockedObjects</key>
-	<array>
-		<integer>2203</integer>
-		<integer>2208</integer>
-		<integer>2206</integer>
-		<integer>2199</integer>
-	</array>
+	<string>677</string>
+	<key>IBOldestOS</key>
+	<integer>5</integer>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>2304</integer>
-		<integer>2297</integer>
-		<integer>636</integer>
-		<integer>2301</integer>
+		<integer>678</integer>
+		<integer>2346</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>9E17</string>
+	<string>9G55</string>
+	<key>targetFramework</key>
+	<string>IBCocoaFramework</string>
 </dict>
 </plist>

modules/access/screen/mac.c

@@ -106,11 +106,9 @@ int screen_InitCapture( demux_t *p_demux )
     p_data->left = p_sys->i_left;
     p_data->top = p_sys->i_top;
     p_data->src_width = var_CreateGetInteger( p_demux, "screen-width" );
-    if (p_data->src_width <= 0) {
-      p_data->src_width = p_data->screen_width;
-    }
     p_data->src_height = var_CreateGetInteger( p_demux, "screen-height" );
-    if (p_data->src_height <= 0) {
+    if (p_data->src_width <= 0 || p_data->src_height <= 0) {
+      p_data->src_width = p_data->screen_width;
       p_data->src_height = p_data->screen_height;
     }
     p_data->dest_width = p_data->src_width;

modules/gui/macosx/open.h

@@ -128,6 +128,15 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
     IBOutlet id o_screen_long_lbl;
     IBOutlet id o_screen_fps_stp;
     IBOutlet id o_screen_fps_lbl;
+    IBOutlet id o_screen_left_fld;
+    IBOutlet id o_screen_left_lbl;
+    IBOutlet id o_screen_top_fld;
+    IBOutlet id o_screen_top_lbl;
+    IBOutlet id o_screen_width_fld;
+    IBOutlet id o_screen_width_lbl;
+    IBOutlet id o_screen_height_fld;
+    IBOutlet id o_screen_height_lbl;
+    IBOutlet id o_screen_follow_mouse_btn;
 
     BOOL b_autoplay;
     id o_currentCaptureView;

modules/gui/macosx/open.m

@@ -209,6 +209,10 @@ static VLCOpen *_o_sharedMainInstance = nil;
     [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_screen_left_lbl setStringValue: _NS("Subscreen left:")];
+    [o_screen_top_lbl setStringValue: _NS("Subscreen top:")];
+    [o_screen_width_lbl setStringValue: _NS("Subscreen width:")];
+    [o_screen_height_lbl setStringValue: _NS("Subscreen height:")];
     [o_eyetv_currentChannel_lbl setStringValue: _NS("Current channel:")];
     [o_eyetv_previousProgram_btn setTitle: _NS("Previous Channel")];
     [o_eyetv_nextProgram_btn setTitle: _NS("Next Channel")];
@@ -409,6 +413,13 @@ static VLCOpen *_o_sharedMainInstance = nil;
         {
             if( [[[o_capture_mode_pop selectedItem] title] isEqualToString: _NS("Screen")] )
                 [o_options addObject: [NSString stringWithFormat: @"screen-fps=%i", [o_screen_fps_fld intValue]]];
+                [o_options addObject: [NSString stringWithFormat: @"screen-left=%i", [o_screen_left_fld intValue]]];
+                [o_options addObject: [NSString stringWithFormat: @"screen-top=%i", [o_screen_top_fld intValue]]];
+                [o_options addObject: [NSString stringWithFormat: @"screen-width=%i", [o_screen_width_fld intValue]]];
+                [o_options addObject: [NSString stringWithFormat: @"screen-height=%i", [o_screen_height_fld intValue]]];
+                if ([o_screen_follow_mouse_btn state]) {
+                  [o_options addObject: @"screen-follow-mouse"];
+                }
         }
 
         /* apply the options to our item(s) */