X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=macosx%2FPictureController.h;h=24631c386a280f889ba463cfca4634e8391d91e8;hb=533776bbad20db93fe964bc69975f108b2a30888;hp=c9d5d500eb14c4d2c3975e8a64f556c5ecd01fe2;hpb=61a02ac98b881cd697824b4fed0d7b122469a6aa;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/macosx/PictureController.h b/macosx/PictureController.h
index c9d5d500..24631c38 100644
--- a/macosx/PictureController.h
+++ b/macosx/PictureController.h
@@ -1,16 +1,16 @@
 /* $Id: PictureController.h,v 1.6 2005/04/14 20:40:05 titer Exp $
 
    This file is part of the HandBrake source code.
-   Homepage: <http://handbrake.m0k.org/>.
+   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"
 
 #define HB_NUM_HBLIB_PICTURES      10   // hbilb generates 10 preview pictures
 
-@interface PictureController : NSObject
+@interface PictureController : NSWindowController
 {
     hb_handle_t              * fHandle;
     hb_title_t               * fTitle;
@@ -18,8 +18,6 @@
     NSMutableDictionary      * fPicturePreviews;        // NSImages, one for each preview libhb creates, created lazily
     int                        fPicture;
 
-    IBOutlet NSPanel         * fPicturePanel;
-
     IBOutlet NSImageView     * fPictureView;
     IBOutlet NSBox           * fPictureViewArea;
     IBOutlet NSTextField     * fWidthField;
@@ -37,9 +35,11 @@
     IBOutlet NSTextField     * fCropRightField;
     IBOutlet NSStepper       * fCropRightStepper;
     IBOutlet NSPopUpButton   * fDeinterlacePopUp;
+    IBOutlet NSPopUpButton   * fDecombPopUp;
 	IBOutlet NSButton        * fDetelecineCheck;
-    IBOutlet NSButton        * fVFRCheck;
     IBOutlet NSButton        * fDeblockCheck;
+    IBOutlet NSTextField     * fDeblockField;
+    IBOutlet NSSlider        * fDeblockSlider;
 	IBOutlet NSPopUpButton   * fDenoisePopUp;
 	IBOutlet NSPopUpButton   * fAnamorphicPopUp;
     IBOutlet NSButton        * fPrevButton;
@@ -60,8 +60,8 @@
     
     struct {
         int     detelecine;
-        int     vfr;
         int     deinterlace;
+        int     decomb;
         int     denoise;
         int     deblock;
     } fPictureFilterSettings;
@@ -85,20 +85,19 @@
 
 - (BOOL) allowLooseAnamorphic;
 - (void) setAllowLooseAnamorphic: (BOOL) setting;
-
+- (IBAction) deblockSliderChanged: (id) sender;
 - (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;
-- (BOOL) loadMyNibFile;
 
 + (NSImage *) makeImageForPicture: (int)pictureIndex
                 libhb:(hb_handle_t*)handle