X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=macosx%2FPictureController.h;h=01dd7eebb936c2d34202ad6bb745885a5512c30b;hb=55be7e43ae5f0f29592a0d178856a3f597814c44;hp=edff8d2cf4305c5a0207c79d7db136b01244aa66;hpb=e27fb1a19129ca0ec31571e0f6c9db8c79ce20e2;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/macosx/PictureController.h b/macosx/PictureController.h
index edff8d2c..01dd7eeb 100644
--- a/macosx/PictureController.h
+++ b/macosx/PictureController.h
@@ -4,22 +4,33 @@
    Homepage: <http://handbrake.fr/>.
    It may be used under the terms of the GNU General Public License. */
 
-#include <Cocoa/Cocoa.h>
+#import <Cocoa/Cocoa.h>
 
-#include "hb.h"
+#include "hb.h" 
 
-#define HB_NUM_HBLIB_PICTURES      10   // hbilb generates 10 preview pictures
+@class HBController;
+@class PreviewController;
+@class PictureFilterController;
+
+
+//#define HB_NUM_HBLIB_PICTURES      20   // # of preview pictures libhb should generate
 
 @interface PictureController : NSWindowController
 {
     hb_handle_t              * fHandle;
     hb_title_t               * fTitle;
 
+    HBController             *fHBController;
+    PreviewController        *fPreviewController;        // reference to HBController
+    PictureFilterController  *fPictureFilterController;
+    
+    IBOutlet NSWindow        * fPictureWindow;
     NSMutableDictionary      * fPicturePreviews;        // NSImages, one for each preview libhb creates, created lazily
     int                        fPicture;
 
-    IBOutlet NSImageView     * fPictureView;
-    IBOutlet NSBox           * fPictureViewArea;
+
+    IBOutlet NSBox           * fPictureSizeBox;
+    IBOutlet NSBox           * fPictureCropBox;
     IBOutlet NSTextField     * fWidthField;
     IBOutlet NSStepper       * fWidthStepper;
     IBOutlet NSTextField     * fHeightField;
@@ -34,51 +45,42 @@
     IBOutlet NSStepper       * fCropLeftStepper;
     IBOutlet NSTextField     * fCropRightField;
     IBOutlet NSStepper       * fCropRightStepper;
-    IBOutlet NSPopUpButton   * fDeinterlacePopUp;
-    IBOutlet NSPopUpButton   * fDecombPopUp;
-	IBOutlet NSButton        * fDetelecineCheck;
-    IBOutlet NSButton        * fVFRCheck;
-    IBOutlet NSButton        * fDeblockCheck;
-	IBOutlet NSPopUpButton   * fDenoisePopUp;
+
 	IBOutlet NSPopUpButton   * fAnamorphicPopUp;
-    IBOutlet NSButton        * fPrevButton;
-    IBOutlet NSButton        * fNextButton;
-    IBOutlet NSTextField     * fInfoField;
+    IBOutlet NSTextField     * fSizeInfoField;
 	
+    IBOutlet NSButton        * fPreviewOpenButton;
+    IBOutlet NSButton        * fPictureFiltersOpenButton;
+        
     int     MaxOutputWidth;
     int     MaxOutputHeight;
     BOOL    autoCrop;
     BOOL    allowLooseAnamorphic;
+    
     int output_width, output_height, output_par_width, output_par_height;
     int display_width;
+    
     /* used to track the previous state of the keep aspect
     ratio checkbox when turning anamorphic on, so it can be
     returned to the previous state when anamorphic is turned
     off */
-    BOOL    keepAspectRatioPreviousState; 
-    
-    struct {
-        int     detelecine;
-        int     vfr;
-        int     deinterlace;
-        int     decomb;
-        int     denoise;
-        int     deblock;
-    } fPictureFilterSettings;
-
-    id delegate;
+    BOOL    keepAspectRatioPreviousState;
 }
-- (id)initWithDelegate:(id)del;
+- (id)init;
 
 - (void) SetHandle: (hb_handle_t *) handle;
 - (void) SetTitle:  (hb_title_t *)  title;
-- (void) setInitialPictureFilters;
-- (void) displayPreview;
+- (void)setHBController: (HBController *)controller;
+- (IBAction) showPictureWindow: (id)sender;
+- (IBAction) showPreviewWindow: (id)sender;
+- (IBAction) showFilterWindow: (id)sender;
+
+
 
 - (IBAction) SettingsChanged: (id) sender;
-- (IBAction) PreviousPicture: (id) sender;
-- (IBAction) NextPicture: (id) sender;
-- (IBAction) ClosePanel: (id) sender;
+
+- (NSString*) getPictureSizeInfoString;
+- (void)reloadStillPreview;
 
 - (BOOL) autoCrop;
 - (void) setAutoCrop: (BOOL) setting;
@@ -86,29 +88,12 @@
 - (BOOL) allowLooseAnamorphic;
 - (void) setAllowLooseAnamorphic: (BOOL) setting;
 
-- (int) detelecine;
-- (void) setDetelecine: (int) setting;
-- (int) vfr;
-- (void) setVFR: (int) setting;
-- (int) deinterlace;
-- (void) setDeinterlace: (int) setting;
-- (int) decomb;
-- (void) setDecomb: (int) setting;
-- (int) denoise;
-- (void) setDenoise: (int) setting;
-- (int) deblock;
-- (void) setDeblock: (int) setting;
-
-- (void)showPanelInWindow: (NSWindow *)fWindow forTitle: (hb_title_t *)title;
-
-+ (NSImage *) makeImageForPicture: (int)pictureIndex
-                libhb:(hb_handle_t*)handle
-                title:(hb_title_t*)title
-                removeBorders:(BOOL)removeBorders;
-- (NSImage *) imageForPicture: (int) pictureIndex;
-- (void) purgeImageCache;
-@end
+- (IBAction)showPreviewPanel: (id)sender forTitle: (hb_title_t *)title;
+
+
+- (void) setToFullScreenMode;
+- (void) setToWindowedMode;
+
 
-@interface NSObject (PictureControllertDelegateMethod)
-- (void)pictureSettingsDidChange;
 @end
+