macosx: fix issue which caused automatic video resizing even if disabled

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

diff --git a/modules/gui/macosx/ConvertAndSave.h b/modules/gui/macosx/ConvertAndSave.h
index 6c3d0545ddee54750171b5cc55b449d55b393341..09007d8b07b325c96a586ab2b899e14cc93c3fe5 100644 (file)
--- a/modules/gui/macosx/ConvertAndSave.h
+++ b/modules/gui/macosx/ConvertAndSave.h
@@ -22,11 +22,11 @@
  *****************************************************************************/
 
 #import <Cocoa/Cocoa.h>
+#import "SharedDialogs.h"
 
 @interface VLCConvertAndSave : NSObject
 {
     IBOutlet id _window;
-    IBOutlet id _cancel_btn;
     IBOutlet id _ok_btn;
 
     IBOutlet id _drop_lbl;
@@ -59,8 +59,11 @@
     IBOutlet id _customize_panel;
     IBOutlet id _customize_ok_btn;
     IBOutlet id _customize_cancel_btn;
+    IBOutlet id _customize_newProfile_btn;
     IBOutlet id _customize_tabview;
     IBOutlet id _customize_encap_matrix;
+
+    IBOutlet id _customize_vid_settings_box;
     IBOutlet id _customize_vid_ckb;
     IBOutlet id _customize_vid_keep_ckb;
     IBOutlet id _customize_vid_codec_lbl;
@@ -77,6 +80,8 @@
     IBOutlet id _customize_vid_height_fld;
     IBOutlet id _customize_vid_scale_lbl;
     IBOutlet id _customize_vid_scale_pop;
+
+    IBOutlet id _customize_aud_settings_box;
     IBOutlet id _customize_aud_ckb;
     IBOutlet id _customize_aud_keep_ckb;
     IBOutlet id _customize_aud_codec_lbl;
@@ -87,13 +92,14 @@
     IBOutlet id _customize_aud_channels_fld;
     IBOutlet id _customize_aud_samplerate_lbl;
     IBOutlet id _customize_aud_samplerate_pop;
+
     IBOutlet id _customize_subs_ckb;
     IBOutlet id _customize_subs_pop;
     IBOutlet id _customize_subs_overlay_ckb;
 
     IBOutlet id _stream_panel;
-    IBOutlet id _stream_ok_btn;
     IBOutlet id _stream_cancel_btn;
+    IBOutlet id _stream_ok_btn;
     IBOutlet id _stream_destination_lbl;
     IBOutlet id _stream_announcement_lbl;
     IBOutlet id _stream_type_lbl;
@@ -102,14 +108,14 @@
     IBOutlet id _stream_address_fld;
     IBOutlet id _stream_ttl_lbl;
     IBOutlet id _stream_ttl_fld;
+    IBOutlet id _stream_ttl_stepper;
     IBOutlet id _stream_port_lbl;
     IBOutlet id _stream_port_fld;
     IBOutlet id _stream_sap_ckb;
-    IBOutlet id _stream_http_ckb;
-    IBOutlet id _stream_rtsp_ckb;
-    IBOutlet id _stream_sdp_ckb;
     IBOutlet id _stream_channel_fld;
+    IBOutlet id _stream_sdp_matrix;
     IBOutlet id _stream_sdp_fld;
+    IBOutlet id _stream_sdp_browsefile_btn;
 
     NSString * _MRL;
     NSString * _outputDestination;
@@ -119,6 +125,8 @@
     NSArray * _audioCodecs;
     NSArray * _subsCodecs;
     NSMutableArray * _currentProfile;
+
+    BOOL b_streaming;
 }
 @property (readwrite, nonatomic, retain) NSString * MRL;
 @property (readwrite, nonatomic, retain) NSString * outputDestination;
@@ -126,21 +134,39 @@
 @property (readwrite, retain) NSArray * profileValueList;
 @property (readwrite, retain) NSMutableArray * currentProfile;
 
+/* Bindings for field / stepper combis */
+@property (nonatomic) int vidBitrate;
+@property (nonatomic) int vidFramerate;
+@property (nonatomic) int audBitrate;
+@property (nonatomic) int audChannels;
+
+
 + (VLCConvertAndSave *)sharedInstance;
 
 - (IBAction)toggleWindow;
 
-- (IBAction)saveFile:(id)sender;
+- (IBAction)finalizePanel:(id)sender;
 - (IBAction)openMedia:(id)sender;
 - (IBAction)switchProfile:(id)sender;
 - (IBAction)customizeProfile:(id)sender;
 - (IBAction)closeCustomizationSheet:(id)sender;
+- (IBAction)newProfileAction:(id)sender;
 - (IBAction)iWantAFile:(id)sender;
 - (IBAction)iWantAStream:(id)sender;
 - (IBAction)cancelDestination:(id)sender;
 - (IBAction)browseFileDestination:(id)sender;
 - (IBAction)showStreamPanel:(id)sender;
 - (IBAction)closeStreamPanel:(id)sender;
+- (IBAction)streamTypeToggle:(id)sender;
+- (IBAction)streamAnnouncementToggle:(id)sender;
+- (IBAction)sdpFileLocationSelector:(id)sender;
+
+- (void)panel:(VLCEnterTextPanel *)panel returnValue:(NSUInteger)value text:(NSString *)text;
+- (void)panel:(VLCSelectItemInPopupPanel *)panel returnValue:(NSUInteger)value item:(NSUInteger)item;
+
+- (IBAction)videoSettingsChanged:(id)sender;
+- (IBAction)audioSettingsChanged:(id)sender;
+- (IBAction)subSettingsChanged:(id)sender;
 
 - (void)updateDropView;