X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=macosx%2FHBPreviewController.h;h=cbfd04c9cb8ef19ccc21a26c46ec60de2527be55;hb=38411ed3d2e33bd434f7f255279924eba7c55e46;hp=21e262bc21b0e5d08547804bd89618fe81d19b82;hpb=87231290a295343954239a46abcb52b9674bac85;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/macosx/HBPreviewController.h b/macosx/HBPreviewController.h
index 21e262bc..cbfd04c9 100644
--- a/macosx/HBPreviewController.h
+++ b/macosx/HBPreviewController.h
@@ -23,7 +23,7 @@
     
     IBOutlet NSWindow        * fPreviewWindow;
     NSWindow                 * fFullScreenWindow; // Full Screen window
-    NSMutableDictionary      * fPicturePreviews;        // NSImages, one for each preview libhb creates, created lazily
+    NSMutableDictionary      * fPicturePreviews;  // NSImages, one for each preview libhb creates, created lazily
     int                        fPicture;
 
     IBOutlet NSImageView     * fPictureView;
@@ -33,20 +33,25 @@
 
     IBOutlet NSSlider        * fPictureSlider;
     IBOutlet NSTextField     * fInfoField;
+    IBOutlet NSTextField     * fscaleInfoField;
     
     BOOL                     isEncoding;
 
 	
-    int     MaxOutputWidth;
-    int     MaxOutputHeight;
+    int                      MaxOutputWidth;
+    int                      MaxOutputHeight;
 
     int output_width, output_height, output_par_width, output_par_height;
     int display_width;
-
+    
+    /* Hud Control Overlay */
+    NSTimer                         * fHudTimer;
+    int                               hudTimerSeconds;
+    
     /* Full Screen Mode Toggle */
-    IBOutlet NSButton               * fFullScreenToggleButton;
+    IBOutlet NSButton               * fScaleToScreenToggleButton;
     IBOutlet NSButton               * fPictureSettingsToggleButton;
-    BOOL                              isFullScreen;
+    BOOL                              scaleToScreen;
     /* Movie Previews */
     IBOutlet NSButton               * fCreatePreviewMovieButton;
     IBOutlet NSButton               * fCancelPreviewMovieButton;
@@ -55,8 +60,7 @@
     IBOutlet NSProgressIndicator    * fMovieCreationProgressIndicator;
     hb_handle_t                     * fPreviewLibhb;           // private libhb for creating previews
     NSTimer                         * fLibhbTimer;             // timer for retrieving state from libhb
-    IBOutlet NSTextField            * fPreviewMovieStatusField;
-    BOOL                              play_movie; // flag used to determine whether or not to automatically play the movie when done.   
+    IBOutlet NSTextField            * fPreviewMovieStatusField; 
     IBOutlet QTMovieView            * fMovieView;
     IBOutlet NSPopUpButton          * fPreviewMovieLengthPopUp; // popup of choices for length of preview in seconds
 }
@@ -68,21 +72,25 @@
 - (IBAction) showPreviewWindow: (id)sender;
 - (BOOL)acceptsMouseMovedEvents;
 - (void) displayPreview;
-- (void) showHideHudControls;
+
 - (IBAction) SettingsChanged: (id) sender;
 - (IBAction) pictureSliderChanged: (id) sender;
 - (IBAction)showPictureSettings:(id)sender;
-/* Full Screen */
-- (IBAction)toggleScreenMode:(id)sender;
-- (IBAction)goFullScreen:(id)sender;
+- (NSString*) pictureSizeInfoString;
+
+- (IBAction)toggleScaleToScreen:(id)sender;
 - (IBAction)goWindowedScreen:(id)sender;
 
+/* HUD overlay */
+- (void) startHudTimer;
+- (void) stopHudTimer;
+
 /* Movie Previews */
 - (void) startReceivingLibhbNotifications;
 - (void) stopReceivingLibhbNotifications;
 
 - (IBAction) createMoviePreview: (id) sender;
-- (void) libhbStateChanged: (hb_state_t &) state;
+- (void) libhbStateChanged: (hb_state_t ) state;
 - (IBAction) showMoviePreview: (NSString *) path;
 - (IBAction) previewDurationPopUpChanged: (id) sender;
 
@@ -91,8 +99,7 @@
 
 + (NSImage *) makeImageForPicture: (int)pictureIndex
                 libhb:(hb_handle_t*)handle
-                title:(hb_title_t*)title
-                removeBorders:(BOOL)removeBorders;
+                title:(hb_title_t*)title;
 - (NSImage *) imageForPicture: (int) pictureIndex;
 - (void) purgeImageCache;
 @end