macosx: implemented the Video category of the SimplePrefs panel. vout module...

macosx: implemented the Video category of the SimplePrefs panel. vout module and display device selectors are left as an exercise for the reader.

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

@@ -3,15 +3,15 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>-145 -8 505 518 0 0 1280 778 </string>
+	<string>113 117 505 518 0 0 1280 778 </string>
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>2311</key>
-		<string>345 417 590 241 0 0 1280 778 </string>
+		<string>345 406 590 264 0 0 1280 778 </string>
 		<key>2330</key>
-		<string>345 266 590 502 0 0 1280 778 </string>
+		<string>450 263 590 502 0 0 1280 778 </string>
 		<key>2440</key>
-		<string>179 151 586 376 0 0 1280 778 </string>
+		<string>345 343 590 389 0 0 1280 778 </string>
 	</dict>
 	<key>IBFramework Version</key>
 	<string>446.1</string>
@@ -34,9 +34,10 @@
 	</array>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>2330</integer>
-		<integer>2265</integer>
 		<integer>2311</integer>
+		<integer>2440</integer>
+		<integer>2265</integer>
+		<integer>2330</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>8S2167</string>

modules/gui/macosx/prefs.m

@@ -393,6 +393,7 @@ static VLCTreeItem *o_root_item = nil;
                 p_item = module_GetConfig( p_module, &confsize );
 
                 if( !p_item ) continue;
+                if( !p_item->i_type ) break;
                 int i_category = -1;
                 int i_subcategory = -1;
                 int i_options = 0;

modules/gui/macosx/simple_prefs.h

@@ -50,14 +50,17 @@
     IBOutlet id o_audio_vol_fld;
     IBOutlet id o_audio_vol_sld;
     IBOutlet id o_audio_vol_txt;
+
     IBOutlet id o_intf_art_pop;
     IBOutlet id o_intf_art_txt;
+    IBOutlet id o_intf_embedded_ckb;
     IBOutlet id o_intf_fspanel_ckb;
     IBOutlet id o_intf_lang_pop;
     IBOutlet id o_intf_lang_txt;
     IBOutlet id o_intf_meta_ckb;
     IBOutlet id o_intf_network_box;
     IBOutlet id o_intf_view;
+
     IBOutlet id o_sprefs_basic_box;
     IBOutlet id o_sprefs_basicFull_matrix;
     IBOutlet id o_sprefs_cancel_btn;
@@ -66,16 +69,40 @@
     IBOutlet id o_sprefs_save_btn;
     IBOutlet id o_sprefs_win;
 
+    IBOutlet id o_video_black_ckb;
+    IBOutlet id o_video_device_pop;
+    IBOutlet id o_video_device_txt;
+    IBOutlet id o_video_display_box;
+    IBOutlet id o_video_enable_ckb;
+    IBOutlet id o_video_fullscreen_ckb;
+    IBOutlet id o_video_onTop_ckb;
+    IBOutlet id o_video_output_pop;
+    IBOutlet id o_video_output_txt;
+    IBOutlet id o_video_skipFrames_ckb;
+    IBOutlet id o_video_snap_box;
+    IBOutlet id o_video_snap_folder_btn;
+    IBOutlet id o_video_snap_folder_fld;
+    IBOutlet id o_video_snap_folder_txt;
+    IBOutlet id o_video_snap_format_pop;
+    IBOutlet id o_video_snap_format_txt;
+    IBOutlet id o_video_snap_prefix_fld;
+    IBOutlet id o_video_snap_prefix_txt;
+    IBOutlet id o_video_snap_seqnum_ckb;
+    IBOutlet id o_video_view;
+
     BOOL b_audioSettingChanged;
     BOOL b_intfSettingChanged;
+    BOOL b_videoSettingChanged;
     id o_currentlyShownCategoryView;
     
     NSToolbar *o_sprefs_toolbar;
+    NSOpenPanel *o_selectFolderPanel;
     
     intf_thread_t *p_intf;
 }
 + (VLCSimplePrefs *)sharedInstance;
 
+/* toolbar */
 - (NSToolbarItem *) toolbar: (NSToolbar *)o_toolbar 
       itemForItemIdentifier: (NSString *)o_itemIdent 
   willBeInsertedIntoToolbar: (BOOL)b_willBeInserted;
@@ -102,6 +129,8 @@
 - (void)showAudioSettings;
 
 /* video */
+- (IBAction)videoSettingChanged:(id)sender;
+- (void)showVideoSettings;
 
 /* subtitles */