Fix potential crash in libbluray

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

diff --git a/macosx/HBPreviewController.h b/macosx/HBPreviewController.h
index 21e262b..1394a97 100644 (file)
--- a/macosx/HBPreviewController.h
+++ b/macosx/HBPreviewController.h
@@ -23,31 +23,52 @@
     
     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;
     IBOutlet NSBox           * fPictureViewArea;
     IBOutlet NSBox           * fPictureControlBox;
     IBOutlet NSBox           * fEncodingControlBox;
+    IBOutlet NSBox           * fMoviePlaybackControlBox;
 
     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 */
+    QTMovie                         * aMovie;
+    IBOutlet QTMovieView            * fMovieView;
+    /* Playback Panel Controls */
+    IBOutlet NSButton               * fPlayPauseButton;
+    IBOutlet NSButton               * fGoToBeginningButton;
+    IBOutlet NSButton               * fGoToEndButton;
+    IBOutlet NSButton               * fGoForwardOneFrameButton;
+    IBOutlet NSButton               * fGoBackwardOneFrameButton;
+    IBOutlet NSSlider               * fMovieScrubberSlider;
+    IBOutlet NSButton               * fGoToStillPreviewButton;
+    IBOutlet NSTextField            * fMovieInfoField;
+    NSTimer                         * fMovieTimer;
+    
+    
     IBOutlet NSButton               * fCreatePreviewMovieButton;
     IBOutlet NSButton               * fCancelPreviewMovieButton;
     IBOutlet NSButton               * fShowPreviewMovieButton;
@@ -55,9 +76,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 QTMovieView            * fMovieView;
+    IBOutlet NSTextField            * fPreviewMovieStatusField; 
     IBOutlet NSPopUpButton          * fPreviewMovieLengthPopUp; // popup of choices for length of preview in seconds
 }
 - (id)init;
@@ -68,22 +87,49 @@
 - (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) enableHudControls;
+- (void) disableHudControls;
+
+- (void) startHudTimer;
+- (void) stopHudTimer;
+
 /* Movie Previews */
 - (void) startReceivingLibhbNotifications;
 - (void) stopReceivingLibhbNotifications;
 
+- (void) installMovieCallbacks;
+- (void)removeMovieCallbacks;
+
+- (IBAction) cancelCreateMoviePreview: (id) sender;
 - (IBAction) createMoviePreview: (id) sender;
-- (void) libhbStateChanged: (hb_state_t &) state;
+- (void) libhbStateChanged: (hb_state_t ) state;
 - (IBAction) showMoviePreview: (NSString *) path;
+- (IBAction) toggleMoviePreviewPlayPause: (id) sender;
+- (IBAction) moviePlaybackGoToBeginning: (id) sender;
+- (IBAction) moviePlaybackGoToEnd: (id) sender;
+- (IBAction) moviePlaybackGoBackwardOneFrame: (id) sender;
+- (IBAction) moviePlaybackGoForwardOneFrame: (id) sender;
+
+-(void) initPreviewScrubberForMovie;
+-(void) adjustPreviewScrubberForCurrentMovieTime;
+- (IBAction) previewScrubberChanged: (id) sender;
+-(void)setTime:(int)timeValue;
+-(void)timeToQTTime:(long)timeValue resultTime:(QTTime *)aQTTime;
+- (void) startMovieTimer;
+- (void) stopMovieTimer;
+- (NSString*) calculatePlaybackSMTPETimecodeForDisplay;
+
+
 - (IBAction) previewDurationPopUpChanged: (id) sender;
 
 
@@ -91,8 +137,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