MacGui: Added Deblock to filters in Picture Preview Window

- Currently uses a checkbox that enables pp7 (default settings)

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1046 b64f7644-9d1e-0410-96f1-a4d463321fa5

11 files changed, 42 insertions, 7 deletions

diff --git a/macosx/Controller.h b/macosx/Controller.h
index 68c8f672e..a44e15678 100644
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -91,6 +91,7 @@
     IBOutlet NSTextField         * fPicLabelDetelecine;
 	IBOutlet NSTextField         * fPicLabelDeinterlace;
     IBOutlet NSTextField         * fPicLabelDenoise;
+    IBOutlet NSTextField         * fPicLabelDeblock;
 	
 	IBOutlet NSTextField         * fPicSrcWidth;
 	IBOutlet NSTextField         * fPicSrcHeight;
@@ -102,6 +103,7 @@
 	IBOutlet NSTextField         * fPicSettingAutoCrop;
 	IBOutlet NSTextField         * fPicSettingDetelecine;
 	IBOutlet NSTextField         * fPicSettingDenoise;
+    IBOutlet NSTextField         * fPicSettingDeblock;
 
 	IBOutlet NSTextField         * fPicLabelAnamorphic;
 	IBOutlet NSTextField         * fPicLabelPAROutputX;
diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 29d197019..1ae602f30 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -362,7 +362,8 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
 		fPicLabelPAROutputX,fPicSettingPARWidth,fPicSettingPARHeight,
 		fPicSettingPAR,fPicLabelAnamorphic,tableView,fPresetsAdd,fPresetsDelete,
 		fCreateChapterMarkers,fVidTurboPassCheck,fDstMpgLargeFileCheck,fPicLabelAutoCrop,
-		fPicSettingAutoCrop,fPicSettingDetelecine,fPicLabelDetelecine,fPicLabelDenoise,fPicSettingDenoise,fSubForcedCheck,};
+		fPicSettingAutoCrop,fPicSettingDetelecine,fPicLabelDetelecine,fPicLabelDenoise,fPicSettingDenoise,
+        fSubForcedCheck,fPicSettingDeblock,fPicLabelDeblock,};
 
     for( unsigned i = 0;
          i < sizeof( controls ) / sizeof( NSControl * ); i++ )
@@ -1403,7 +1404,8 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
     job->arate = hb_audio_rates[[fAudRatePopUp
                      indexOfSelectedItem]].rate;
     job->abitrate = [[fAudBitratePopUp selectedItem] tag];
-    
+   
+    /* Filters */ 
     job->filters = hb_list_init();
    
 	/* Detelecine */
@@ -1455,6 +1457,12 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
 		hb_filter_denoise.settings = "7:7:5:5"; 
         hb_list_add( job->filters, &hb_filter_denoise );	
 	}
+    
+    /* Deblock  (uses pp7 default) */
+    if ([fPictureController deblock])
+    {
+        hb_list_add( job->filters, &hb_filter_deblock );
+    }
 
 }
 
@@ -2460,6 +2468,14 @@ the user is using "Custom" settings by determining the sender*/
 	{
 		[fPicSettingDenoise setStringValue: @"Strong"];
 	}
+
+    /* Deblock */
+    if ([fPictureController deblock]) {
+        [fPicSettingDeblock setStringValue: @"Yes"];
+    }
+    else {
+        [fPicSettingDeblock setStringValue: @"No"];
+    }
 	
 	if (fTitle->job->pixel_ratio > 0)
 	{
diff --git a/macosx/English.lproj/MainMenu.nib/classes.nib b/macosx/English.lproj/MainMenu.nib/classes.nib
index 4e2cb1f13..0bbfcb881 100644
--- a/macosx/English.lproj/MainMenu.nib/classes.nib
+++ b/macosx/English.lproj/MainMenu.nib/classes.nib
@@ -133,6 +133,7 @@
                 fPicLabelAnamorphic = NSTextField; 
                 fPicLabelAr = NSTextField; 
                 fPicLabelAutoCrop = NSTextField; 
+                fPicLabelDeblock = NSTextField; 
                 fPicLabelDeinterlace = NSTextField; 
                 fPicLabelDenoise = NSTextField; 
                 fPicLabelDetelecine = NSTextField; 
@@ -144,6 +145,7 @@
                 fPicLabelSrcX = NSTextField; 
                 fPicSettingARkeep = NSTextField; 
                 fPicSettingAutoCrop = NSTextField; 
+                fPicSettingDeblock = NSTextField; 
                 fPicSettingDeinterlace = NSTextField; 
                 fPicSettingDenoise = NSTextField; 
                 fPicSettingDetelecine = NSTextField; 
diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib
index 843e90af9..f94a50806 100644
--- a/macosx/English.lproj/MainMenu.nib/info.nib
+++ b/macosx/English.lproj/MainMenu.nib/info.nib
@@ -7,7 +7,7 @@
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>1843</key>
-		<string>640 320 200 530 0 0 1440 878 </string>
+		<string>620 338 200 530 0 0 1440 878 </string>
 		<key>2436</key>
 		<string>307 361 192 68 0 0 1440 878 </string>
 		<key>29</key>
@@ -27,9 +27,8 @@
 	<integer>4</integer>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>1843</integer>
-		<integer>21</integer>
 		<integer>29</integer>
+		<integer>21</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>8R2218</string>
diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
index 12c88cb09..5327c4cda 100644
--- a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
+++ b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
diff --git a/macosx/English.lproj/PictureSettings.nib/classes.nib b/macosx/English.lproj/PictureSettings.nib/classes.nib
index bf6661763..7f70da0e6 100644
--- a/macosx/English.lproj/PictureSettings.nib/classes.nib
+++ b/macosx/English.lproj/PictureSettings.nib/classes.nib
@@ -23,6 +23,7 @@
                 fCropRightStepper = NSStepper; 
                 fCropTopField = NSTextField; 
                 fCropTopStepper = NSStepper; 
+                fDeblockCheck = NSButton; 
                 fDeinterlacePopUp = NSPopUpButton; 
                 fDenoisePopUp = NSPopUpButton; 
                 fDetelecineCheck = NSButton; 
diff --git a/macosx/English.lproj/PictureSettings.nib/info.nib b/macosx/English.lproj/PictureSettings.nib/info.nib
index df5713deb..332e5df0a 100644
--- a/macosx/English.lproj/PictureSettings.nib/info.nib
+++ b/macosx/English.lproj/PictureSettings.nib/info.nib
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>715 90 356 240 0 0 1920 1178 </string>
+	<string>496 129 356 240 0 0 1440 878 </string>
 	<key>IBFramework Version</key>
 	<string>446.1</string>
 	<key>IBOpenObjects</key>
diff --git a/macosx/English.lproj/PictureSettings.nib/keyedobjects.nib b/macosx/English.lproj/PictureSettings.nib/keyedobjects.nib
index 619172b48..f8570e07f 100644
--- a/macosx/English.lproj/PictureSettings.nib/keyedobjects.nib
+++ b/macosx/English.lproj/PictureSettings.nib/keyedobjects.nib
diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj
index 1e8847894..bf4545047 100644
--- a/macosx/HandBrake.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -215,7 +215,7 @@
 /* Begin PBXFileReference section */
 		089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		0D096DFF0B707D1200A845D4 /* libhb.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libhb.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
-		0D6E35760B6BD4F0005AABB3 /* HandBrake.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = HandBrake.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		0D6E35760B6BD4F0005AABB3 /* HandBrake.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HandBrake.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		0DF377970B7BF99A00115CB0 /* fakexcode.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = fakexcode.cpp; path = ../test/fakexcode.cpp; sourceTree = SOURCE_ROOT; };
 		0DFA5C7A0B8DD1E90020BC09 /* HandBrake.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = HandBrake.icns; sourceTree = "<group>"; };
 		0DFA5C7E0B8DD3B60020BC09 /* declpcm.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = declpcm.c; path = ../libhb/declpcm.c; sourceTree = SOURCE_ROOT; };
diff --git a/macosx/PictureController.h b/macosx/PictureController.h
index 4c13a06fc..62e78af4a 100644
--- a/macosx/PictureController.h
+++ b/macosx/PictureController.h
@@ -41,6 +41,7 @@
     IBOutlet NSStepper       * fCropRightStepper;
     IBOutlet NSPopUpButton   * fDeinterlacePopUp;
 	IBOutlet NSButton        * fDetelecineCheck;
+    IBOutlet NSButton        * fDeblockCheck;
 	IBOutlet NSPopUpButton   * fDenoisePopUp;
 	IBOutlet NSButton        * fPARCheck;
     IBOutlet NSButton        * fEffectsCheck;
@@ -62,6 +63,7 @@
         int    detelecine;
         int     deinterlace;
         int     denoise;
+        int     deblock;
     } fPictureFilterSettings;
 
     id delegate;
@@ -86,6 +88,8 @@
 - (void) setDeinterlace: (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;
diff --git a/macosx/PictureController.mm b/macosx/PictureController.mm
index 865f1c202..640479b65 100644
--- a/macosx/PictureController.mm
+++ b/macosx/PictureController.mm
@@ -306,6 +306,7 @@ static int GetAlignedSize( int size )
     }
     fPictureFilterSettings.denoise     = [fDenoisePopUp indexOfSelectedItem];
     fPictureFilterSettings.detelecine  = [fDetelecineCheck state];
+    fPictureFilterSettings.deblock  = [fDeblockCheck state];
 	job->pixel_ratio = ( [fPARCheck state] == NSOnState );
 
     autoCrop = ( [fCropMatrix selectedRow] == 0 );
@@ -438,6 +439,16 @@ static int GetAlignedSize( int size )
     fPictureFilterSettings.denoise = setting;
 }
 
+- (int) deblock
+{
+    return fPictureFilterSettings.deblock;
+}
+
+- (void) setDeblock: (int) setting
+{
+    fPictureFilterSettings.deblock = setting;
+}
+
 - (void)showPanelInWindow: (NSWindow *)fWindow forTitle: (hb_title_t *)title
 {
     [self SetTitle:title];