X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=macosx%2FController.h;h=f9634abe901bbb999b1217008b1f76341fea89a7;hb=4b72a63eb61a01275493c4bfb51ba02152d1c5e1;hp=b4a94f29546343d5fdbffe26a4033f41579f5a0c;hpb=a422ff9c496e2dad791cdd641c20b7011e8d2484;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/macosx/Controller.h b/macosx/Controller.h
index b4a94f29..f9634abe 100644
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -17,6 +17,12 @@
 #import "HBAdvancedController.h"
 #import "HBPreferencesController.h"
 #import "HBPresets.h"
+#import "HBAudioController.h"
+
+extern NSString *HBContainerChangedNotification;
+extern NSString *keyContainerTag;
+extern NSString *HBTitleChangedNotification;
+extern NSString *keyTitleTag;
 
 @class HBOutputPanelController;
 
@@ -154,61 +160,9 @@ BOOL                        fIsDragging;
 	HBSubtitles                  * fSubtitlesDelegate;
     IBOutlet NSButton            * fBrowseSrtFileButton;
     
-	
-    /* Audio box */
-    /* Track Labels */
-    IBOutlet NSTextField         * fAudSourceLabel;
-    IBOutlet NSTextField         * fAudCodecLabel;
-    IBOutlet NSTextField         * fAudMixdownLabel;
-    IBOutlet NSTextField         * fAudSamplerateLabel;
-    IBOutlet NSTextField         * fAudBitrateLabel;
-    IBOutlet NSTextField         * fAudDrcLabel;
-    
-    IBOutlet NSTextField         * fAudTrack1Label;
-    IBOutlet NSTextField         * fAudTrack2Label;
-    IBOutlet NSTextField         * fAudTrack3Label;
-    IBOutlet NSTextField         * fAudTrack4Label;
-    
-    /* Source Audio PopUps */
-    IBOutlet NSPopUpButton       * fAudLang1PopUp;
-    IBOutlet NSPopUpButton       * fAudLang2PopUp;
-    IBOutlet NSPopUpButton       * fAudLang3PopUp;
-    IBOutlet NSPopUpButton       * fAudLang4PopUp;
-    
-    /* Codec Popups */
-    IBOutlet NSPopUpButton       * fAudTrack1CodecPopUp;
-    IBOutlet NSPopUpButton       * fAudTrack2CodecPopUp;
-    IBOutlet NSPopUpButton       * fAudTrack3CodecPopUp;
-    IBOutlet NSPopUpButton       * fAudTrack4CodecPopUp;
-    
-	/* Mixdown PopUps */
-	IBOutlet NSPopUpButton       * fAudTrack1MixPopUp;
-    IBOutlet NSPopUpButton       * fAudTrack2MixPopUp;
-    IBOutlet NSPopUpButton       * fAudTrack3MixPopUp;
-    IBOutlet NSPopUpButton       * fAudTrack4MixPopUp;
-	
-    /* Samplerate PopUps */
-	IBOutlet NSPopUpButton       * fAudTrack1RatePopUp;
-    IBOutlet NSPopUpButton       * fAudTrack2RatePopUp;
-    IBOutlet NSPopUpButton       * fAudTrack3RatePopUp;
-    IBOutlet NSPopUpButton       * fAudTrack4RatePopUp;
-    
-    /* Bitrate PopUps */
-    IBOutlet NSPopUpButton       * fAudTrack1BitratePopUp;
-    IBOutlet NSPopUpButton       * fAudTrack2BitratePopUp;
-    IBOutlet NSPopUpButton       * fAudTrack3BitratePopUp;
-    IBOutlet NSPopUpButton       * fAudTrack4BitratePopUp;
-    
-    /* Dynamic Range Compression */
-    IBOutlet NSSlider            * fAudTrack1DrcSlider;
-    IBOutlet NSTextField         * fAudTrack1DrcField;
-    IBOutlet NSSlider            * fAudTrack2DrcSlider;
-    IBOutlet NSTextField         * fAudTrack2DrcField;
-    IBOutlet NSSlider            * fAudTrack3DrcSlider;
-    IBOutlet NSTextField         * fAudTrack3DrcField;
-    IBOutlet NSSlider            * fAudTrack4DrcSlider;
-    IBOutlet NSTextField         * fAudTrack4DrcField;
-    
+	/* New Audio box */
+	IBOutlet HBAudioController   * fAudioDelegate;
+	    
     /* Chapters box */
     IBOutlet NSButton            * fCreateChapterMarkers;
     IBOutlet NSTableView         * fChapterTable;
@@ -233,6 +187,10 @@ BOOL                        fIsDragging;
 	IBOutlet NSTextField         * fPresetNewName;
 	IBOutlet NSTextField         * fPresetNewDesc;
 	IBOutlet NSPopUpButton       * fPresetNewPicSettingsPopUp;
+    IBOutlet NSTextField         * fPresetNewPicWidth;
+    IBOutlet NSTextField         * fPresetNewPicHeight;
+    IBOutlet NSBox               * fPresetNewPicWidthHeightBox;
+    
     IBOutlet NSButton            * fPresetNewPicFiltersCheck;
     IBOutlet NSButton            * fPresetNewFolderCheck;
 	IBOutlet NSTextField         * fPresetSelectedDisplay;
@@ -261,7 +219,8 @@ BOOL                        fIsDragging;
     hb_handle_t                  * fHandle;
     
     /* Queue variables */
-    hb_handle_t              * fQueueEncodeLibhb;           // libhb for HB Encoding
+    int                          hbInstanceNum; //stores the number of HandBrake instances currently running
+    hb_handle_t                  * fQueueEncodeLibhb;           // libhb for HB Encoding
 	hb_title_t                   * fTitle;
     hb_title_t                   * fQueueEncodeTitle;
     int                          fEncodingQueueItem;     // corresponds to the index of fJobGroups encoding item
@@ -271,7 +230,8 @@ BOOL                        fIsDragging;
     int                          fWorkingCount;
     
     int                          fqueueEditRescanItemNum; // queue array item to be reloaded into the main window
-    
+    int                          pidNum; // The pid number for this instance
+    NSString                     * currentQueueEncodeNameString;
     
     /* integer to set to determine the previous state
 		of encode 0==idle, 1==encoding, 2==cancelled*/
@@ -281,11 +241,12 @@ BOOL                        fIsDragging;
     BOOL                           SuccessfulScan;
     BOOL                           applyQueueToScan;
 	NSString                      * currentSource;
-    NSString                     * browsedSourceDisplayName;
+    NSString                      * browsedSourceDisplayName;
     
     double                         dockIconProgress;
+	BOOL                           hasValidPresetSelected;
 }
-
+- (int) getPidnum;
 - (IBAction) showAboutPanel:(id)sender;
 
 - (void) writeToActivityLog:(const char *) format, ...;
@@ -314,14 +275,6 @@ BOOL                        fIsDragging;
 - (IBAction) autoSetM4vExtension: (id) sender;
 - (IBAction) twoPassCheckboxChanged: (id) sender;
 - (IBAction) videoFrameRateChanged: (id) sender;
-- (IBAction) audioAddAudioTrackCodecs: (id)sender;
-- (IBAction) audioCodecsPopUpChanged: (id) sender;
-- (IBAction) setEnabledStateOfAudioMixdownControls: (id) sender;
-- (IBAction) addAllAudioTracksToPopUp: (id) sender;
-- (IBAction) selectAudioTrackInPopUp: (id) sender searchPrefixString: (NSString *) searchPrefixString selectIndexIfNotFound: (int) selectIndexIfNotFound;
-- (IBAction) audioTrackPopUpChanged: (id) sender;
-- (IBAction) audioTrackPopUpChanged: (id) sender mixdownToUse: (int) mixdownToUse;
-- (IBAction) audioTrackMixdownChanged: (id) sender;
 - (void) prepareJob;
 - (IBAction) browseFile: (id) sender;
 - (void)     browseFileDone: (NSSavePanel *) sheet
@@ -332,7 +285,6 @@ BOOL                        fIsDragging;
 - (IBAction) qualitySliderChanged: (id) sender;
 - (void) setupQualitySlider;
 
-- (IBAction) audioDRCSliderChanged: (id) sender;
 - (IBAction) browseImportSrtFile: (id) sender;
 - (void) browseImportSrtFileDone: (NSSavePanel *) sheet
                      returnCode: (int) returnCode contextInfo: (void *) contextInfo;
@@ -423,6 +375,7 @@ BOOL                        fIsDragging;
 - (void) loadPresets;
 - (IBAction) customSettingUsed: (id) sender;
 - (IBAction) showAddPresetPanel: (id) sender;
+- (IBAction) addPresetPicDropdownChanged: (id) sender;
 - (IBAction) closeAddPresetPanel: (id) sender;
 - (NSDictionary *)createPreset;
 
@@ -463,5 +416,9 @@ BOOL                        fIsDragging;
 - (void)     browseForChapterFileSaveDone: (NSSavePanel *) sheet
                  returnCode: (int) returnCode contextInfo: (void *) contextInfo;
 
++ (unsigned int) maximumNumberOfAllowedAudioTracks;
+@property (nonatomic, assign) BOOL hasValidPresetSelected; 
+- (IBAction) addAllAudioTracks: (id) sender;
+
 @end