Removes trailing spaces. Removes tabs.

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

diff --git a/modules/gui/macosx/output.h b/modules/gui/macosx/output.h
index 357e47313b8abe8d09214e72e4c1bae884e12eb2..1ff0bda9588b71d9c6af7b3b8367033ee5b93cc9 100644 (file)
--- a/modules/gui/macosx/output.h
+++ b/modules/gui/macosx/output.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * output.h: MacOS X Output Dialog
  *****************************************************************************
- * Copyright (C) 2002-2003 VideoLAN
+ * Copyright (C) 2002-2006 the VideoLAN team
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -12,7 +12,7 @@
  * 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
@@ -20,7 +20,7 @@
  *
  * 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.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -33,7 +33,7 @@
     IBOutlet id o_output_settings;
     IBOutlet id o_output_sheet;
     IBOutlet id o_btn_ok;
-        
+
     IBOutlet id o_options_lbl;
     IBOutlet id o_display;
     IBOutlet id o_method;
@@ -50,10 +50,10 @@
     IBOutlet id o_stream_ttl_lbl;
     IBOutlet id o_stream_type;
     IBOutlet id o_stream_type_lbl;
-    
+
     IBOutlet id o_mux_lbl;
     IBOutlet id o_mux_selector;
-    
+
     IBOutlet id o_transcode_audio_bitrate;
     IBOutlet id o_transcode_audio_bitrate_lbl;
     IBOutlet id o_transcode_audio_channels;
@@ -63,21 +63,28 @@
     IBOutlet id o_transcode_lbl;
     IBOutlet id o_transcode_video_bitrate;
     IBOutlet id o_transcode_video_bitrate_lbl;
+    IBOutlet id o_transcode_video_scale;
+    IBOutlet id o_transcode_video_scale_lbl;
     IBOutlet id o_transcode_video_chkbox;
     IBOutlet id o_transcode_video_selector;
-    
+
     IBOutlet id o_misc_lbl;
     IBOutlet id o_sap_chkbox;
-    IBOutlet id o_slp_chkbox;
     IBOutlet id o_channel_name;
     IBOutlet id o_channel_name_lbl;
-    
-    NSString *o_mrl;
+
+    IBOutlet id o_sdp_url;
+    IBOutlet id o_sdp_url_lbl;
+    IBOutlet id o_rtsp_chkbox;
+    IBOutlet id o_http_chkbox;
+    IBOutlet id o_file_chkbox;
+
+    NSArray *o_mrl;
     NSString *o_transcode;
 }
 
-- (void)setMRL:(NSString *)o_mrl_string;
-- (NSString *)getMRL;
+- (void)setMRL:(NSArray *)o_mrl_string;
+- (NSArray *)getMRL;
 - (void)setTranscode:(NSString *)o_transcode_string;
 
 - (void)initStrings;