X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=macosx%2FPictureController.h;h=f8742f8f3652ef9d07006635812a8ee38543f834;hb=07cc0ebf6a7141a76fd9b6e2da6cf510def1ebc7;hp=787283efd277c9eb8fe4313337089942694db917;hpb=0019d232363aaf8dbdad11261d734198d3f9eafb;p=handbrake-jp%2Fhandbrake-jp-git.git
diff --git a/macosx/PictureController.h b/macosx/PictureController.h
index 787283ef..f8742f8f 100644
--- a/macosx/PictureController.h
+++ b/macosx/PictureController.h
@@ -4,13 +4,13 @@
Homepage: .
It may be used under the terms of the GNU General Public License. */
-#include
+#import
#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,6 +35,7 @@
IBOutlet NSTextField * fCropRightField;
IBOutlet NSStepper * fCropRightStepper;
IBOutlet NSPopUpButton * fDeinterlacePopUp;
+ IBOutlet NSPopUpButton * fDecombPopUp;
IBOutlet NSButton * fDetelecineCheck;
IBOutlet NSButton * fVFRCheck;
IBOutlet NSButton * fDeblockCheck;
@@ -62,6 +61,7 @@
int detelecine;
int vfr;
int deinterlace;
+ int decomb;
int denoise;
int deblock;
} fPictureFilterSettings;
@@ -92,13 +92,14 @@
- (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