macosx: fix wrong size of playlist when using podcast and minimal view

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

diff --git a/modules/gui/macosx/ConvertAndSave.h b/modules/gui/macosx/ConvertAndSave.h
index f80bd4c1df890c893b0e6005b2189a51496338df..9e8a8a92c514640dfa6a57bc394d6a6d2092faac 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;
@@ -38,11 +38,19 @@
     IBOutlet id _profile_pop;
     IBOutlet id _profile_btn;
 
+    IBOutlet id _destination_box;
     IBOutlet id _destination_lbl;
-    IBOutlet id _destination_btn;
+    IBOutlet id _destination_browse_btn;
     IBOutlet id _destination_icon_view;
     IBOutlet id _destination_filename_lbl;
     IBOutlet id _destination_filename_stub_lbl;
+    IBOutlet id _destination_stream_btn;
+    IBOutlet id _destination_stream_lbl;
+    IBOutlet id _destination_itwantafile_btn;
+    IBOutlet id _destination_itwantastream_btn;
+    IBOutlet id _destination_itwantafile_view;
+    IBOutlet id _destination_itwantastream_view;
+    IBOutlet id _destination_cancel_btn;
 
     IBOutlet id _dropin_view;
     IBOutlet id _dropin_icon_view;
@@ -51,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;
@@ -68,7 +79,9 @@
     IBOutlet id _customize_vid_height_lbl;
     IBOutlet id _customize_vid_height_fld;
     IBOutlet id _customize_vid_scale_lbl;
-    IBOutlet id _customize_vid_scale_fld;
+    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;
@@ -79,39 +92,82 @@
     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_cancel_btn;
+    IBOutlet id _stream_ok_btn;
+    IBOutlet id _stream_destination_lbl;
+    IBOutlet id _stream_announcement_lbl;
+    IBOutlet id _stream_type_lbl;
+    IBOutlet id _stream_type_pop;
+    IBOutlet id _stream_address_lbl;
+    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_channel_fld;
+    IBOutlet id _stream_sdp_matrix;
+    IBOutlet id _stream_sdp_fld;
+    IBOutlet id _stream_sdp_browsefile_btn;
+
     NSString * _MRL;
     NSString * _outputDestination;
+    NSArray * _profileNames;
+    NSArray * _profileValueList;
+    NSArray * _videoCodecs;
+    NSArray * _audioCodecs;
+    NSArray * _subsCodecs;
+    NSMutableArray * _currentProfile;
+
+    BOOL b_streaming;
 }
 @property (readwrite, nonatomic, retain) NSString * MRL;
 @property (readwrite, nonatomic, retain) NSString * outputDestination;
+@property (readwrite, retain) NSArray * profileNames;
+@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)windowButtonAction:(id)sender;
+- (IBAction)finalizePanel:(id)sender;
 - (IBAction)openMedia:(id)sender;
-- (IBAction)profileSelection:(id)sender;
+- (IBAction)switchProfile:(id)sender;
 - (IBAction)customizeProfile:(id)sender;
 - (IBAction)closeCustomizationSheet:(id)sender;
-- (IBAction)chooseDestination:(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;
 
 @end
-
-@interface VLCDropEnabledBox : NSBox
-
-@end
-
-@interface VLCDropEnabledImageView : NSImageView
-
-@end
-
-@interface VLCDropEnabledButton : NSButton
-
-@end