macosx: implement simpler and generic drop view for all drag / drop operations

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

diff --git a/modules/gui/macosx/ConvertAndSave.h b/modules/gui/macosx/ConvertAndSave.h
index 0ab2c0fd24c269ab6794fa045714f3b74640db22..9e8a8a92c514640dfa6a57bc394d6a6d2092faac 100644 (file)
--- a/modules/gui/macosx/ConvertAndSave.h
+++ b/modules/gui/macosx/ConvertAndSave.h
@@ -22,6 +22,7 @@
  *****************************************************************************/
 
 #import <Cocoa/Cocoa.h>
+#import "SharedDialogs.h"
 
 @interface VLCConvertAndSave : NSObject
 {
@@ -58,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;
@@ -76,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;
@@ -86,11 +92,13 @@
     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;
@@ -104,11 +112,10 @@
     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;
@@ -127,6 +134,13 @@
 @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;
@@ -136,6 +150,7 @@
 - (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;
@@ -144,22 +159,15 @@
 - (IBAction)closeStreamPanel:(id)sender;
 - (IBAction)streamTypeToggle:(id)sender;
 - (IBAction)streamAnnouncementToggle:(id)sender;
+- (IBAction)sdpFileLocationSelector:(id)sender;
 
-- (void)updateDropView;
-
-@end
-
-@interface VLCDropEnabledBox : NSBox
-{
-    BOOL b_activeDragAndDrop;
-}
-
-@end
-
-@interface VLCDropEnabledImageView : NSImageView
+- (void)panel:(VLCEnterTextPanel *)panel returnValue:(NSUInteger)value text:(NSString *)text;
+- (void)panel:(VLCSelectItemInPopupPanel *)panel returnValue:(NSUInteger)value item:(NSUInteger)item;
 
-@end
+- (IBAction)videoSettingsChanged:(id)sender;
+- (IBAction)audioSettingsChanged:(id)sender;
+- (IBAction)subSettingsChanged:(id)sender;
 
-@interface VLCDropEnabledButton : NSButton
+- (void)updateDropView;
 
 @end