MacGui: Video Filter and Picture Settings

- Changed picture settings and video filter display in the main window to three text fields (removed 24 outlets and text fields). Its a hoky layout right now, but I have a feeling the video tab will be changing.
- Show actual cropping values in the main window as well as Auto/Custom
- Show custom filter settings if used.
- Removed redundant anamorphic calculation code. Its now accessed from each controller that needs it from preview controller
- Fixed an issue where decomb from a previous preset would linger in a preset that did not have decomb specified.
- Updated the queue display to show custom filter info if present.

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

1 files changed, 3 insertions, 12 deletions

diff --git a/macosx/PictureController.h b/macosx/PictureController.h
index 277fbfc25..01dd7eebb 100644
--- a/macosx/PictureController.h
+++ b/macosx/PictureController.h
@@ -47,7 +47,7 @@
     IBOutlet NSStepper       * fCropRightStepper;
 
 	IBOutlet NSPopUpButton   * fAnamorphicPopUp;
-    IBOutlet NSTextField     * fInfoField;
+    IBOutlet NSTextField     * fSizeInfoField;
 	
     IBOutlet NSButton        * fPreviewOpenButton;
     IBOutlet NSButton        * fPictureFiltersOpenButton;
@@ -64,17 +64,7 @@
     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     deinterlace;
-        int     decomb;
-        int     denoise;
-        int     deblock;
-    } fPictureFilterSettings;
-
-
+    BOOL    keepAspectRatioPreviousState;
 }
 - (id)init;
 
@@ -89,6 +79,7 @@
 
 - (IBAction) SettingsChanged: (id) sender;
 
+- (NSString*) getPictureSizeInfoString;
 - (void)reloadStillPreview;
 
 - (BOOL) autoCrop;