FSF address change.

[vlc] / modules / gui / macosx / open.h

diff --git a/modules/gui/macosx/open.h b/modules/gui/macosx/open.h
index dfe69f76e4530f9d3960b31bb4332dbee66af8e4..09794603f1ae9ae898b2e034fea0581de44d9854 100644 (file)
--- a/modules/gui/macosx/open.h
+++ b/modules/gui/macosx/open.h
@@ -1,8 +1,8 @@
 /*****************************************************************************
- * open.h: MacOS X plugin for vlc
+ * open.h: MacOS X module for vlc
  *****************************************************************************
- * Copyright (C) 2002-2003 VideoLAN
- * $Id: open.h,v 1.12 2003/03/06 11:43:07 hartman Exp $
+ * Copyright (C) 2002-2005 the VideoLAN team
+ * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -20,15 +20,11 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 NSArray *GetEjectableMediaOfClass( const char *psz_class );
 
-#define OPEN_PANEL_FULL_HEIGHT 498
-#define OPEN_PANEL_SHORT_HEIGHT 329
-#define WINDOW_TITLE_HEIGHT 21
-
 /*****************************************************************************
  * Intf_Open interface
  *****************************************************************************/
@@ -44,14 +40,10 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
 
     IBOutlet id o_btn_ok;
     IBOutlet id o_btn_cancel;
-    IBOutlet id o_ckbox_enqueue;
 
     IBOutlet id o_file_path;
     IBOutlet id o_file_btn_browse;
     IBOutlet id o_file_stream;
-    IBOutlet id o_file_sub_path;
-    IBOutlet id o_file_sub_btn_browse;
-    IBOutlet id o_file_sub_ckbox;
 
     IBOutlet id o_disc_type;
     IBOutlet id o_disc_device;
@@ -77,52 +69,68 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
     IBOutlet id o_net_udpm_port_stp;
     IBOutlet id o_net_http_url;
     IBOutlet id o_net_http_url_lbl;
+    IBOutlet id o_net_timeshift_ckbox;
 
-    IBOutlet id o_sout_cbox;
-    IBOutlet id o_sout_mrl_lbl;
-    IBOutlet id o_sout_mrl;
-    IBOutlet id o_sout_access;
-    IBOutlet id o_sout_file_path;
-    IBOutlet id o_sout_file_btn_browse;
-    IBOutlet id o_sout_udp_addr;
-    IBOutlet id o_sout_udp_addr_lbl;
-    IBOutlet id o_sout_udp_port;
-    IBOutlet id o_sout_udp_port_lbl;
-    IBOutlet id o_sout_udp_port_stp;
-    IBOutlet id o_sout_mux;
+    IBOutlet id o_file_sub_ckbox;
+    IBOutlet id o_file_sub_btn_settings;
+    IBOutlet id o_file_sub_sheet;
+    IBOutlet id o_file_sub_path;
+    IBOutlet id o_file_sub_btn_browse;
+    IBOutlet id o_file_sub_override;
+    IBOutlet id o_file_sub_delay;
+    IBOutlet id o_file_sub_delay_lbl;
+    IBOutlet id o_file_sub_delay_stp;
+    IBOutlet id o_file_sub_fps;
+    IBOutlet id o_file_sub_fps_lbl;
+    IBOutlet id o_file_sub_fps_stp;
+    IBOutlet id o_file_sub_encoding_pop;
+    IBOutlet id o_file_sub_encoding_lbl;
+    IBOutlet id o_file_sub_size_pop;
+    IBOutlet id o_file_sub_size_lbl;
+    IBOutlet id o_file_sub_align_pop;
+    IBOutlet id o_file_sub_align_lbl;
+    IBOutlet id o_file_sub_ok_btn;
+    IBOutlet id o_file_sub_font_box;
+    IBOutlet id o_file_sub_file_box;
+
+    IBOutlet id o_output_ckbox;
+    IBOutlet id o_sout_options;
 }
 
++ (VLCOpen *)sharedInstance;
+
+- (void)setSubPanel;
 - (void)openTarget:(int)i_type;
 - (void)tabView:(NSTabView *)o_tv didSelectTabViewItem:(NSTabViewItem *)o_tvi;
 
-- (IBAction)openFileGeneric:(id)sender;
+- (void)openFileGeneric;
 - (void)openFilePathChanged:(NSNotification *)o_notification;
 - (IBAction)openFileBrowse:(id)sender;
+- (void) pathChosenInPanel: (NSOpenPanel *) sheet withReturn:(int)returnCode contextInfo:(void  *)contextInfo;
 - (IBAction)openFileStreamChanged:(id)sender;
-- (IBAction)loadSubsChanged:(id)sender;
-- (IBAction)openSubBrowse:(id)sender;
 
-- (IBAction)openDisc:(id)sender;
+- (void)openDisc;
 - (IBAction)openDiscTypeChanged:(id)sender;
 - (IBAction)openDiscStepperChanged:(id)sender;
 - (void)openDiscInfoChanged:(NSNotification *)o_notification;
 - (IBAction)openDiscMenusChanged:(id)sender;
 - (IBAction)openVTSBrowse:(id)sender;
 
-- (IBAction)openNet:(id)sender;
+- (void)openNet;
 - (IBAction)openNetModeChanged:(id)sender;
 - (IBAction)openNetStepperChanged:(id)sender;
 - (void)openNetInfoChanged:(NSNotification *)o_notification;
 
-- (IBAction)soutChanged:(id)sender;
-- (IBAction)soutFileBrowse:(id)sender;
-- (void)soutModeChanged:(NSNotification *)o_notification;
-- (void)soutInfoChanged:(NSNotification *)o_notification;
-- (IBAction)soutStepperChanged:(id)sender;
+- (IBAction)subsChanged:(id)sender;
+- (IBAction)subSettings:(id)sender;
+- (IBAction)subFileBrowse:(id)sender;
+- (IBAction)subOverride:(id)sender;
+- (IBAction)subDelayStepperChanged:(id)sender;
+- (IBAction)subFpsStepperChanged:(id)sender;
+- (IBAction)subCloseSheet:(id)sender;
 
 - (IBAction)panelCancel:(id)sender;
 - (IBAction)panelOk:(id)sender;
 
-- (IBAction)openFile:(id)sender;
-
+- (void)openFile;
 @end