X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fwizard.h;h=1ea98226a1e0aab31e7193adc977af24ddb22d9e;hb=96b4ee1ee2da310e9ea951a29672a7609dbf831e;hp=55b1656ee7526a3421a06e28df7b928a835a3f0b;hpb=16cb39fcabeea09ca122e5e2a0f8bb80c73a8706;p=vlc

diff --git a/modules/gui/macosx/wizard.h b/modules/gui/macosx/wizard.h
index 55b1656ee7..1ea98226a1 100644
--- a/modules/gui/macosx/wizard.h
+++ b/modules/gui/macosx/wizard.h
@@ -1,16 +1,16 @@
 /*****************************************************************************
  * wizard.h: MacOS X Streaming Wizard
  *****************************************************************************
- * Copyright (C) 2005 the VideoLAN team
+ * Copyright (C) 2005-2007 the VideoLAN team
  * $Id$
  *
- * Authors: Felix Kühne <fkuehne@users.sf.net> 
+ * Authors: Felix Kühne <fkuehne@users.sf.net>
  *
  * 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
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -22,13 +22,13 @@
  *****************************************************************************/
 
 /*****************************************************************************
- * VLCWizard 
+ * VLCWizard
  *****************************************************************************/
- 
+
 #import <Cocoa/Cocoa.h>
 
 @interface VLCWizard : NSObject
-{    
+{
     /* general items */
     IBOutlet id o_btn_backward;
     IBOutlet id o_btn_cancel;
@@ -36,7 +36,7 @@
     IBOutlet id o_tab_pageHolder;
     IBOutlet id o_wizard_window;
     IBOutlet id o_playlist_wizard;
-    
+
     /* page one ("Hello") */
     IBOutlet id o_t1_btn_mrInfo_strmg;
     IBOutlet id o_t1_btn_mrInfo_trnscd;
@@ -44,7 +44,7 @@
     IBOutlet id o_t1_txt_notice;
     IBOutlet id o_t1_txt_text;
     IBOutlet id o_t1_txt_title;
-    
+
     /* page two ("Input") */
     IBOutlet id o_t2_box_prtExtrct;
     IBOutlet id o_t2_ckb_enblPartExtrct;
@@ -58,7 +58,7 @@
     IBOutlet id o_t2_title;
     IBOutlet id o_t2_txt_prtExtrctFrom;
     IBOutlet id o_t2_txt_prtExtrctTo;
-    
+
     /* page one ("Streaming 1") */
     IBOutlet id o_t3_box_dest;
     IBOutlet id o_t3_box_strmgMthd;
@@ -68,7 +68,7 @@
     IBOutlet id o_t3_txt_text;
     IBOutlet id o_t3_txt_title;
     IBOutlet id o_t3_txt_strgMthdInfo;
-    
+
     /* page four ("Transcode 1") */
     IBOutlet id o_t4_box_audio;
     IBOutlet id o_t4_box_video;
@@ -86,12 +86,12 @@
     IBOutlet id o_t4_txt_videoCodec;
     IBOutlet id o_t4_txt_hintAudio;
     IBOutlet id o_t4_txt_hintVideo;
-    
+
     /* page five ("Encap") */
     IBOutlet id o_t5_matrix_encap;
     IBOutlet id o_t5_text;
     IBOutlet id o_t5_title;
-    
+
     /* page six ("Streaming 2") */
     IBOutlet id o_t6_ckb_sap;
     IBOutlet id o_t6_fld_sap;
@@ -102,8 +102,9 @@
     IBOutlet id o_t6_btn_mrInfo_ttl;
     IBOutlet id o_t6_btn_mrInfo_sap;
     IBOutlet id o_t6_btn_mrInfo_local;
+    IBOutlet id o_t6_ckb_soverlay;
     IBOutlet id o_t6_ckb_local;
-    
+
     /* page seven ("Transcode 2") */
     IBOutlet id o_t7_btn_chooseFile;
     IBOutlet id o_t7_fld_filePath;
@@ -111,8 +112,9 @@
     IBOutlet id o_t7_title;
     IBOutlet id o_t7_txt_saveFileTo;
     IBOutlet id o_t7_btn_mrInfo_local;
+    IBOutlet id o_t7_ckb_soverlay;
     IBOutlet id o_t7_ckb_local;
-    
+
     /* page eight ("Summary") */
     IBOutlet id o_t8_fld_destination;
     IBOutlet id o_t8_fld_encapFormat;
@@ -123,6 +125,7 @@
     IBOutlet id o_t8_fld_strmgMthd;
     IBOutlet id o_t8_fld_trnscdAudio;
     IBOutlet id o_t8_fld_trnscdVideo;
+    IBOutlet id o_t8_fld_soverlay;
     IBOutlet id o_t8_fld_ttl;
     IBOutlet id o_t8_fld_mrl;
     IBOutlet id o_t8_fld_local;
@@ -137,18 +140,17 @@
     IBOutlet id o_t8_txt_title;
     IBOutlet id o_t8_txt_trnscdAudio;
     IBOutlet id o_t8_txt_trnscdVideo;
+    IBOutlet id o_t8_txt_soverlay;
     IBOutlet id o_t8_txt_ttl;
     IBOutlet id o_t8_txt_mrl;
     IBOutlet id o_t8_txt_local;
-    
+
     NSMutableDictionary * o_userSelections;
     NSArray * o_videoCodecs;
     NSArray * o_audioCodecs;
     NSArray * o_encapFormats;
     NSArray * o_strmgMthds;
     NSString * o_opts;
-    
-    BOOL * keepSettingsOrNot;
 }
 - (IBAction)cancelRun:(id)sender;
 - (IBAction)nextTab:(id)sender;
@@ -177,7 +179,6 @@
 - (void)createOpts;
 - (void)rebuildCodecMenus;
 - (id)getPlaylistWizard;
-- (void)initWithExtractValuesFrom: (NSString *)from to: (NSString *)to \
-    ofItem: (NSString *)item;
+- (void)initWithExtractValuesFrom: (NSString *)from to: (NSString *)to ofItem: (NSString *)item;
 
 @end