x264 bump to r1338-19977e9

[handbrake-jp/handbrake-jp-git.git] / macosx / InstantHandBrake / ExpressController.h

diff --git a/macosx/InstantHandBrake/ExpressController.h b/macosx/InstantHandBrake/ExpressController.h
index d8027ec..4bdcfa6 100644 (file)
--- a/macosx/InstantHandBrake/ExpressController.h
+++ b/macosx/InstantHandBrake/ExpressController.h
@@ -1,16 +1,23 @@
-/* ExpressController */
+/* ExpressController
+
+   This file is part of the HandBrake source code.
+   Homepage: <http://handbrake.fr/>.
+   It may be used under the terms of the GNU General Public License. */
 
 #import <Cocoa/Cocoa.h>
+#import <Growl/Growl.h>
+
 #import "DriveDetector.h"
+#import "DeviceController.h"
 #import "HBCore.h"
 #import "hb.h"
 
-@interface ExpressController : NSObject
+@interface ExpressController : NSObject <GrowlApplicationBridgeDelegate>
 
 {
     hb_handle_t                  * fHandle;
     hb_list_t                    * fList;
-    hb_state_t                   * fState;
+    const hb_state_t                   * fState;
 
     IBOutlet NSWindow            * fWindow;
     IBOutlet NSView              * fEmptyView;
@@ -36,13 +43,12 @@
     IBOutlet NSPopUpButton       * fConvertSubtitlePopUp;
     IBOutlet NSTextField         * fConvertInfoString;
     IBOutlet NSProgressIndicator * fConvertIndicator;
-    IBOutlet NSButton            * fConvertOpenButton;
-    IBOutlet NSButton            * fConvertGoButton;
     NSMutableArray               * fConvertCheckArray;
     NSString                     * fConvertFolderString;
 
     DriveDetector                * fDriveDetector;
     HBCore                       * fCore;
+    DeviceController             * fDevice;
     NSDictionary                 * fDrives;
 }
 
@@ -51,6 +57,7 @@
 - (void) openBrowse: (id) sender;
 - (void) openGo: (id) sender;
 
+- (void) selectFolderSheetShow: (id) sender;
 - (void) convertGo: (id) sender;
 - (void) convertCancel: (id) sender;