macosx: split output from open panel

Makefile.am

@@ -155,6 +155,7 @@ EXTRA_DIST += \
 	extras/package/macosx/Resources/English.lproj/ResumeDialog.xib \
 	extras/package/macosx/Resources/English.lproj/SharedDialogs.xib \
 	extras/package/macosx/Resources/English.lproj/SimplePreferences.xib \
+	extras/package/macosx/Resources/English.lproj/StreamOutput.xib \
 	extras/package/macosx/Resources/English.lproj/SyncTracks.xib \
 	extras/package/macosx/Resources/English.lproj/VideoEffects.xib \
 	extras/package/macosx/Resources/fspanel/fs_background.png \

extras/package/macosx/vlc.xcodeproj/project.pbxproj

@@ -464,6 +464,7 @@
 		7D8BB0C01830393300FAE9B7 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D8BB0BE1830393300FAE9B7 /* MainWindow.xib */; };
 		7DB65D5618ABD6490053B874 /* AddonManager.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DB65D5418ABD6490053B874 /* AddonManager.xib */; };
 		7DD6EC101B58136D0047CF5C /* SimplePreferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DD6EC0E1B58136D0047CF5C /* SimplePreferences.xib */; };
+		7DE78AC61B5D0A360019454C /* StreamOutput.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DE78AC41B5D0A360019454C /* StreamOutput.xib */; };
 		7DE88F2A1831396A00CD9DA2 /* PlaylistAccessoryView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DE88F281831396A00CD9DA2 /* PlaylistAccessoryView.xib */; };
 		7DFFA16C16124F38001AF89F /* effects-one-button-pressed-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 7DFFA16A16124F38001AF89F /* effects-one-button-pressed-dark.png */; };
 		7DFFA16D16124F38001AF89F /* effects-one-button-pressed-dark@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7DFFA16B16124F38001AF89F /* effects-one-button-pressed-dark@2x.png */; };
@@ -1248,6 +1249,7 @@
 		7DB65D5318ABD6380053B874 /* AddonsWindowController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = AddonsWindowController.m; path = ../../../modules/gui/macosx/AddonsWindowController.m; sourceTree = SOURCE_ROOT; };
 		7DB65D5518ABD6490053B874 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/AddonManager.xib; sourceTree = "<group>"; };
 		7DD6EC0F1B58136D0047CF5C /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/SimplePreferences.xib; sourceTree = "<group>"; };
+		7DE78AC51B5D0A360019454C /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/StreamOutput.xib; sourceTree = "<group>"; };
 		7DE88F291831396A00CD9DA2 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/PlaylistAccessoryView.xib; sourceTree = "<group>"; };
 		7DF0435E1972E26A0022B534 /* AddonListDataSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AddonListDataSource.h; path = ../../../modules/gui/macosx/AddonListDataSource.h; sourceTree = SOURCE_ROOT; };
 		7DF0435F1972E26A0022B534 /* AddonListDataSource.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = AddonListDataSource.m; path = ../../../modules/gui/macosx/AddonListDataSource.m; sourceTree = SOURCE_ROOT; };
@@ -2898,6 +2900,7 @@
 				7DE88F281831396A00CD9DA2 /* PlaylistAccessoryView.xib */,
 				7D3F6523188051F2005776C4 /* BWQuincyMain.xib */,
 				7DB65D5418ABD6490053B874 /* AddonManager.xib */,
+				7DE78AC41B5D0A360019454C /* StreamOutput.xib */,
 			);
 			name = xibs;
 			sourceTree = "<group>";
@@ -3671,6 +3674,7 @@
 				1C88BBED19DC7C8100645190 /* ys-bottom-background_dark.png in Resources */,
 				1C88BB6719DC7C7800645190 /* ys-stop-pressed@2x.png in Resources */,
 				CC91919D159B547C00E634A7 /* dropzone@2x.png in Resources */,
+				7DE78AC61B5D0A360019454C /* StreamOutput.xib in Resources */,
 				CC973B9C15F0D02F00D5F650 /* forward-3btns-dark-pressed.png in Resources */,
 				CC973B9D15F0D02F00D5F650 /* forward-3btns-dark-pressed@2x.png in Resources */,
 				CC973B9E15F0D02F00D5F650 /* forward-3btns-dark.png in Resources */,
@@ -4000,6 +4004,14 @@
 			name = SimplePreferences.xib;
 			sourceTree = "<group>";
 		};
+		7DE78AC41B5D0A360019454C /* StreamOutput.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				7DE78AC51B5D0A360019454C /* English */,
+			);
+			name = StreamOutput.xib;
+			sourceTree = "<group>";
+		};
 		7DE88F281831396A00CD9DA2 /* PlaylistAccessoryView.xib */ = {
 			isa = PBXVariantGroup;
 			children = (

modules/gui/macosx/output.h

 /*****************************************************************************
  * output.h: MacOS X Output Dialog
  *****************************************************************************
- * Copyright (C) 2002-2007 VLC authors and VideoLAN
+ * Copyright (C) 2002-2015 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
  *          Derk-Jan Hartman <thedj@users.sourceforge.net>
+ *          Felix Paul Kühne <fkuehne # videolan org>
  *
  * 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
@@ -23,72 +24,61 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-/*****************************************************************************
- * VLCOutput interface
- *****************************************************************************/
 @interface VLCOutput : NSObject
-{
-    IBOutlet id o_open_panel;
-    IBOutlet id o_output_ckbox;
-    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;
-    IBOutlet id o_file_field;
-    IBOutlet id o_dump_chkbox;
-    IBOutlet id o_btn_browse;
-    IBOutlet id o_stream_address;
-    IBOutlet id o_stream_address_lbl;
-    IBOutlet id o_stream_port;
-    IBOutlet id o_stream_port_stp;
-    IBOutlet id o_stream_port_lbl;
-    IBOutlet id o_stream_ttl;
-    IBOutlet id o_stream_ttl_stp;
-    IBOutlet id o_stream_ttl_lbl;
-    IBOutlet id o_stream_type;
-    IBOutlet id o_stream_type_lbl;
+@property (readwrite, weak) IBOutlet NSPanel *outputSheet;
+@property (readwrite, weak) IBOutlet NSButton *okButton;
 
-    IBOutlet id o_mux_lbl;
-    IBOutlet NSPopUpButton *o_mux_selector;
+@property (readwrite, weak) IBOutlet NSBox *optionsBox;
+@property (readwrite, weak) IBOutlet NSButton *displayOnLocalScreenCheckbox;
+@property (readwrite, weak) IBOutlet NSMatrix *outputMethodMatrix;
+@property (readwrite, weak) IBOutlet NSTextField *fileTextField;
+@property (readwrite, weak) IBOutlet NSButton *dumpCheckbox;
+@property (readwrite, weak) IBOutlet NSButton *browseButton;
+@property (readwrite, weak) IBOutlet NSTextField *streamAddressTextField;
+@property (readwrite, weak) IBOutlet NSTextField *streamAddressLabel;
+@property (readwrite, weak) IBOutlet NSTextField *streamPortTextField;
+@property (readwrite, weak) IBOutlet NSStepper *streamPortStepper;
+@property (readwrite, weak) IBOutlet NSTextField *streamPortLabel;
+@property (readwrite, weak) IBOutlet NSTextField *streamTTLTextField;
+@property (readwrite, weak) IBOutlet NSStepper *streamTTLStepper;
+@property (readwrite, weak) IBOutlet NSTextField *streamTTLLabel;
+@property (readwrite, weak) IBOutlet NSPopUpButton *streamTypePopup;
+@property (readwrite, weak) IBOutlet NSTextField *streamTypeLabel;
 
-    IBOutlet id o_transcode_audio_bitrate;
-    IBOutlet id o_transcode_audio_bitrate_lbl;
-    IBOutlet id o_transcode_audio_channels;
-    IBOutlet id o_transcode_audio_channels_lbl;
-    IBOutlet id o_transcode_audio_chkbox;
-    IBOutlet id o_transcode_audio_selector;
-    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;
+@property (readwrite, weak) IBOutlet NSTextField *muxLabel;
+@property (readwrite, weak) IBOutlet NSPopUpButton *muxSelectorPopup;
 
-    IBOutlet id o_misc_lbl;
-    IBOutlet id o_sap_chkbox;
-    IBOutlet id o_channel_name;
-    IBOutlet id o_channel_name_lbl;
+@property (readwrite, weak) IBOutlet NSBox *transcodeBox;
+@property (readwrite, weak) IBOutlet NSComboBox *transcodeAudioBitrateComboBox;
+@property (readwrite, weak) IBOutlet NSTextField *transcodeAudioBitrateLabel;
+@property (readwrite, weak) IBOutlet NSComboBox *transcodeAudioChannelsComboBox;
+@property (readwrite, weak) IBOutlet NSTextField *transcodeAudioChannelsLabel;
+@property (readwrite, weak) IBOutlet NSButton *transcodeAudioCheckbox;
+@property (readwrite, weak) IBOutlet NSPopUpButton *transcodeAudioSelectorPopup;
+@property (readwrite, weak) IBOutlet NSComboBox *transcodeVideoBitrateComboBox;
+@property (readwrite, weak) IBOutlet NSTextField *transcodeVideoBitrateLabel;
+@property (readwrite, weak) IBOutlet NSComboBox *transcodeVideoScaleComboBox;
+@property (readwrite, weak) IBOutlet NSTextField *transcodeVideoScaleLabel;
+@property (readwrite, weak) IBOutlet NSButton *transcodeVideoCheckbox;
+@property (readwrite, weak) IBOutlet NSPopUpButton *transcodeVideoSelectorPopup;
 
-    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;
-}
-@property (readwrite, retain) NSArray *soutMRL;
+@property (readwrite, weak) IBOutlet NSBox *miscBox;
+@property (readwrite, weak) IBOutlet NSButton *sapCheckbox;
+@property (readwrite, weak) IBOutlet NSTextField *channelNameTextField;
+@property (readwrite, weak) IBOutlet NSTextField *channelNameLabel;
 
-- (void)initStrings;
+@property (readwrite, weak) IBOutlet NSTextField *sdpURLTextField;
+@property (readwrite, weak) IBOutlet NSTextField *sdpURLLabel;
+@property (readwrite, weak) IBOutlet NSButton *rtspCheckbox;
+@property (readwrite, weak) IBOutlet NSButton *httpCheckbox;
+@property (readwrite, weak) IBOutlet NSButton *fileCheckbox;
+
+@property (readonly) NSArray *soutMRL;
 
-- (IBAction)outputChanged:(id)sender;
-- (IBAction)outputSettings:(id)sender;
 - (IBAction)outputCloseSheet:(id)sender;
 - (IBAction)outputMethodChanged:(id)sender;
 - (IBAction)outputInfoChanged:(id)object;
-- (void)TTLChanged:(NSNotification *)o_notification;
 - (IBAction)outputFileBrowse:(id)sender;
 - (IBAction)streamPortStepperChanged:(id)sender;
 - (IBAction)streamTTLStepperChanged:(id)sender;
@@ -97,4 +87,5 @@
 - (IBAction)announceChanged:(id)sender;
 
 - (IBAction)streamTTLStepperChanged:(id)sender;
+
 @end