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 232551b..dd985a7 100644 (file)
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -4,17 +4,17 @@
    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 "HBQueueController.h"
+#import "ChapterTitles.h"
+#import "PictureController.h"
+#import "HBQueueController.h"
 #import "MVMenuButton.h"
 #import "HBAdvancedController.h"
+#import "HBPreferencesController.h"
 
 @class HBOutputPanelController;
 
@@ -22,28 +22,23 @@
 
 {
     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 */
     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;
@@ -90,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;
@@ -190,12 +179,8 @@
        int                            currentSuccessfulScanCount;
     int                            SuccessfulScan;
        NSString                      * currentSource;
-       HBOutputPanelController       *outputPanel;
-    HBAdvancedController          *fAdvancedOptions;
        
     hb_job_t                     * fLastKnownCurrentJob;
-       
-    NSToolbar                    *toolbar;
 }
 
 - (void)     TranslateStrings;
@@ -252,8 +237,6 @@
 - (IBAction) Pause: (id) sender;
 
 - (IBAction) calculateBitrate: (id) sender;
-- (void) controlTextDidBeginEditing: (NSNotification *) notification;
-- (void) controlTextDidEndEditing: (NSNotification *) notification;
 - (void) controlTextDidChange: (NSNotification *) notification;
 
 - (IBAction) openHomepage: (id) sender;