Added buffer management and changed fifo sizes. Changed job->subtitle_scan to job...

[handbrake-jp/handbrake-jp-git.git] / macosx / Controller.h

diff --git a/macosx/Controller.h b/macosx/Controller.h
index 2ef1144..dd985a7 100644 (file)
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -4,51 +4,45 @@
    Homepage: <http://handbrake.m0k.org/>.
    It may be used under the terms of the GNU General Public License. */
 
-#include <Cocoa/Cocoa.h>
-#include <Growl/Growl.h>
+#import <Cocoa/Cocoa.h>
+#import <Growl/Growl.h>
 
 #include "hb.h"
 
-
-#include "ChapterTitles.h"
-#include "PictureController.h"
-#include "QueueController.h"
+#import "ChapterTitles.h"
+#import "PictureController.h"
+#import "HBQueueController.h"
 #import "MVMenuButton.h"
+#import "HBAdvancedController.h"
+#import "HBPreferencesController.h"
+
 @class HBOutputPanelController;
 
 @interface HBController : NSObject <GrowlApplicationBridgeDelegate>
 
 {
     IBOutlet NSWindow            * fWindow;
-       
+    NSToolbar                    * toolbar;
+    
     /* Picture panel */
-    IBOutlet PictureController   * fPictureController;
-    IBOutlet NSPanel             * fPicturePanel;
-       
+    PictureController            * fPictureController;
+    
+    /* Advanced options tab */
+    HBAdvancedController         * fAdvancedOptions;
+       IBOutlet NSBox               * fAdvancedView;
+
+    HBPreferencesController      * fPreferencesController;
+    
     /* Queue panel */
-    IBOutlet QueueController     * fQueueController;
-    IBOutlet NSPanel             * fQueuePanel;
+    HBQueueController            * fQueueController;
     IBOutlet NSTextField         * fQueueStatus;
-       
-       /* Menu Items */
-       /* File Menu */
-       IBOutlet NSMenu * fMenuBarFileMenu;
-       IBOutlet NSMenuItem * fMenuOpenSource;
-       IBOutlet NSMenuItem * fMenuAddToQueue;
-       IBOutlet NSMenuItem * fMenuStartEncode;
-       IBOutlet NSMenuItem * fMenuPauseEncode;
-       /* Window Menu */
-       IBOutlet NSMenu * fMenuBarWindowMenu;
-       IBOutlet NSMenuItem * fMenuPresetsDrawerToggle;
-       IBOutlet NSMenuItem * fMenuQueuePanelShow;
-       IBOutlet NSMenuItem * fMenuPicturePanelShow;
-       IBOutlet NSMenuItem * fMenuActivityWindowShow;
+    
+    /* Output panel */
+    HBOutputPanelController       *outputPanel;
        
     /* Source box */
        IBOutlet NSProgressIndicator * fScanIndicator;
        NSString                     * sourceDisplayName;
-       IBOutlet NSTextField         * fScanStatus;
-    IBOutlet NSTextField         * fSrcDVD1Field;
     IBOutlet NSTextField         * fSrcDVD2Field;
     IBOutlet NSTextField         * fSrcTitleField;
     IBOutlet NSPopUpButton       * fSrcTitlePopUp;
@@ -91,31 +85,25 @@
        IBOutlet NSTextField         * fPicLabelSrc;
        IBOutlet NSTextField         * fPicLabelOutp;
        IBOutlet NSTextField         * fPicLabelAr;
-       IBOutlet NSTextField         * fPicLabelDeinter;
        IBOutlet NSTextField         * fPicLabelSrcX;
        IBOutlet NSTextField         * fPicLabelOutputX;
+       IBOutlet NSTextField         * fPicLabelAutoCrop;
+    IBOutlet NSTextField         * fPicLabelDetelecine;
+       IBOutlet NSTextField         * fPicLabelDeinterlace;
+    IBOutlet NSTextField         * fPicLabelDenoise;
        
        IBOutlet NSTextField         * fPicSrcWidth;
        IBOutlet NSTextField         * fPicSrcHeight;
        IBOutlet NSTextField         * fPicSettingWidth;
        IBOutlet NSTextField         * fPicSettingHeight;
+       IBOutlet NSTextField         * fPicSettingDeinterlace;
        IBOutlet NSTextField         * fPicSettingARkeep;
        IBOutlet NSTextField         * fPicSettingPAR;
-       IBOutlet NSTextField         * fPicSettingDeinterlace;
-       IBOutlet NSTextField         * fPicSettingDeinterlaceDsply;
-       IBOutlet NSTextField         * fPicSettingARkeepDsply;
-       IBOutlet NSTextField         * fPicSettingPARDsply;
-       IBOutlet NSTextField         * fPicSettingAutoCropLabel;
        IBOutlet NSTextField         * fPicSettingAutoCrop;
-       IBOutlet NSTextField         * fPicSettingAutoCropDsply;
        IBOutlet NSTextField         * fPicSettingDetelecine;
-       IBOutlet NSTextField         * fPicSettingDetelecineLabel;
        IBOutlet NSTextField         * fPicSettingDenoise;
-       IBOutlet NSTextField         * fPicSettingDenoiseDsply;
-       IBOutlet NSTextField         * fPicSettingDenoiseLabel;
 
        IBOutlet NSTextField         * fPicLabelAnamorphic;
-       IBOutlet NSTextField         * fPicLabelPAROutp;
        IBOutlet NSTextField         * fPicLabelPAROutputX;
        IBOutlet NSTextField         * fPicSettingPARWidth;
        IBOutlet NSTextField         * fPicSettingPARHeight;
@@ -156,53 +144,7 @@
     IBOutlet NSButton            * fPictureButton;
     IBOutlet NSTextField         * fStatusField;
     IBOutlet NSProgressIndicator * fRipIndicator;
-    IBOutlet NSButton            * fShowQuButton;
-    IBOutlet NSButton            * fAddToQuButton;
-    IBOutlet NSButton            * fPauseButton;
-    IBOutlet NSButton            * fRipButton;
-       
-       /* Advanced Tab for opts fX264optView*/
-       IBOutlet NSView              * fX264optView;
-       IBOutlet NSTextField         * fX264optViewTitleLabel;
-       IBOutlet NSTextField         * fDisplayX264OptionsLabel;
-       IBOutlet NSTextField         * fDisplayX264Options;
-       IBOutlet NSTextField         * fX264optBframesLabel;
-       IBOutlet NSPopUpButton       * fX264optBframesPopUp;
-       IBOutlet NSTextField         * fX264optRefLabel;
-       IBOutlet NSPopUpButton       * fX264optRefPopUp;
-       IBOutlet NSTextField         * fX264optNfpskipLabel;
-       IBOutlet NSButton            * fX264optNfpskipSwitch;
-       IBOutlet NSTextField         * fX264optNodctdcmtLabel;
-       IBOutlet NSButton            * fX264optNodctdcmtSwitch;
-       IBOutlet NSTextField         * fX264optSubmeLabel;
-       IBOutlet NSPopUpButton       * fX264optSubmePopUp;
-       IBOutlet NSTextField         * fX264optTrellisLabel;
-       IBOutlet NSPopUpButton       * fX264optTrellisPopUp;
-    IBOutlet NSTextField         * fX264optMixedRefsLabel;
-    IBOutlet NSButton            * fX264optMixedRefsSwitch;
-    IBOutlet NSTextField         * fX264optMotionEstLabel;
-    IBOutlet NSPopUpButton       * fX264optMotionEstPopUp;
-    IBOutlet NSTextField         * fX264optMERangeLabel;
-    IBOutlet NSPopUpButton       * fX264optMERangePopUp;
-    IBOutlet NSTextField         * fX264optWeightBLabel;
-    IBOutlet NSButton            * fX264optWeightBSwitch;
-    IBOutlet NSTextField         * fX264optBRDOLabel;
-    IBOutlet NSButton            * fX264optBRDOSwitch;
-    IBOutlet NSTextField         * fX264optBPyramidLabel;
-    IBOutlet NSButton            * fX264optBPyramidSwitch;
-    IBOutlet NSTextField         * fX264optBiMELabel;
-    IBOutlet NSButton            * fX264optBiMESwitch;
-    IBOutlet NSTextField         * fX264optDirectPredLabel;
-    IBOutlet NSPopUpButton       * fX264optDirectPredPopUp;
-    IBOutlet NSTextField         * fX264optDeblockLabel;
-    IBOutlet NSPopUpButton       * fX264optAlphaDeblockPopUp;
-    IBOutlet NSPopUpButton       * fX264optBetaDeblockPopUp;
-    IBOutlet NSTextField         * fX264optAnalyseLabel;
-    IBOutlet NSPopUpButton       * fX264optAnalysePopUp;
-    IBOutlet NSTextField         * fX264opt8x8dctLabel;
-    IBOutlet NSButton            * fX264opt8x8dctSwitch;
-    IBOutlet NSTextField         * fX264optCabacLabel;
-    IBOutlet NSButton            * fX264optCabacSwitch;
+       BOOL                           fRipIndicatorShown;
     
        /* User Preset variables here */
        
@@ -235,14 +177,10 @@
     int                            fEncodeState;
        int                            currentScanCount;
        int                            currentSuccessfulScanCount;
+    int                            SuccessfulScan;
        NSString                      * currentSource;
-       HBOutputPanelController       *outputPanel;
        
-       BOOL                         startButtonEnabled;
-    BOOL                         pauseButtonEnabled;
-    BOOL                         addToQueueButtonEnabled;
-       BOOL                         stopOrStart;
-       BOOL                         resumeOrPause;
+    hb_job_t                     * fLastKnownCurrentJob;
 }
 
 - (void)     TranslateStrings;
@@ -283,7 +221,9 @@
 - (IBAction) openMainWindow: (id) sender;
 
 - (IBAction) addToQueue: (id) sender;
-- (IBAction) showQueuePanel: (id) sender;
+- (IBAction) showQueueWindow:(id)sender;
+
+- (IBAction)showPreferencesWindow:(id)sender;
 
 - (IBAction) Rip: (id) sender;
 - (void)     overWriteAlertDone: (NSWindow *) sheet
@@ -297,21 +237,12 @@
 - (IBAction) Pause: (id) sender;
 
 - (IBAction) calculateBitrate: (id) sender;
-- (void) controlTextDidBeginEditing: (NSNotification *) notification;
-- (void) controlTextDidEndEditing: (NSNotification *) notification;
 - (void) controlTextDidChange: (NSNotification *) notification;
 
 - (IBAction) openHomepage: (id) sender;
 - (IBAction) openForums:   (id) sender;
 - (IBAction) openUserGuide:   (id) sender;
 
-// x264 Advanced Panel Methods
-- (IBAction) X264AdvancedOptionsSet: (id) sender;
-- (IBAction) X264AdvancedOptionsStandardizeOptString: (id) sender;
-- (IBAction) X264AdvancedOptionsSetCurrentSettings: (id) sender;
-- (NSString *)  X264AdvancedOptionsStandardizeOptNames:(NSString *) cleanOptNameString;
-- (IBAction) X264AdvancedOptionsChanged: (id) sender;
-
 // Preset Methods Here
 - (void) loadPresets;
 - (IBAction) customSettingUsed: (id) sender;