summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorritsuka <[email protected]>2014-11-23 13:11:18 +0000
committerritsuka <[email protected]>2014-11-23 13:11:18 +0000
commit9d2ad873db7a930fc9d9655e296d6670d9b5d600 (patch)
tree620ac59de96c5bf95853f8c6d490304146fdd4e6
parent2c27a6e782858a611d0faba6c440b69b899d0dbf (diff)
MacGui: removed 4 unneeded AutoCrop* ivars.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6541 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--macosx/Controller.h6
-rw-r--r--macosx/Controller.m24
2 files changed, 8 insertions, 22 deletions
diff --git a/macosx/Controller.h b/macosx/Controller.h
index 1dc56759d..9797cd35d 100644
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -128,12 +128,6 @@ extern NSString *keyTitleTag;
// Creates iPod compatible mp4's (add ipod uuid atom)
IBOutlet NSButton * fDstMp4iPodFileCheck;
- /* Picture variables */
- int AutoCropTop;
- int AutoCropBottom;
- int AutoCropLeft;
- int AutoCropRight;
-
/* Bottom */
IBOutlet NSTextField * fStatusField;
IBOutlet NSProgressIndicator * fRipIndicator;
diff --git a/macosx/Controller.m b/macosx/Controller.m
index f22dfdee5..fb9888796 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -2889,10 +2889,10 @@ fWorkingCount = 0;
{
[fPictureController setAutoCrop:YES];
/* Here we use the auto crop values determined right after scan */
- job->crop[0] = AutoCropTop;
- job->crop[1] = AutoCropBottom;
- job->crop[2] = AutoCropLeft;
- job->crop[3] = AutoCropRight;
+ job->crop[0] = fTitle->crop[0];
+ job->crop[1] = fTitle->crop[1];
+ job->crop[2] = fTitle->crop[2];
+ job->crop[3] = fTitle->crop[3];
}
@@ -4339,13 +4339,6 @@ fWorkingCount = 0;
/* Set Auto Crop to on upon selecting a new title */
[fPictureController setAutoCrop:YES];
-
- /* We get the originial output picture width and height and put them
- in variables for use with some presets later on */
- AutoCropTop = title->crop[0];
- AutoCropBottom = title->crop[1];
- AutoCropLeft = title->crop[2];
- AutoCropRight = title->crop[3];
/* Update the others views */
[[NSNotificationCenter defaultCenter] postNotification:
@@ -4812,11 +4805,10 @@ the user is using "Custom" settings by determining the sender*/
{
[fPictureController setAutoCrop:YES];
/* Here we use the auto crop values determined right after scan */
- job->crop[0] = AutoCropTop;
- job->crop[1] = AutoCropBottom;
- job->crop[2] = AutoCropLeft;
- job->crop[3] = AutoCropRight;
-
+ job->crop[0] = fTitle->crop[0];
+ job->crop[1] = fTitle->crop[1];
+ job->crop[2] = fTitle->crop[2];
+ job->crop[3] = fTitle->crop[3];
}
/* crop may have changed, reset maxWidth/maxHeight */