/* $Id: Controller.mm,v 1.79 2005/11/04 19:41:32 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 "Controller.h"
#include "dvdread/dvd_reader.h"
#include "HBPresets.h"
-#define _(a) NSLocalizedString(a,NULL)
-
-static int FormatSettings[4][10] =
- { { HB_MUX_MP4 | HB_VCODEC_FFMPEG | HB_ACODEC_FAAC,
- HB_MUX_MP4 | HB_VCODEC_X264 | HB_ACODEC_FAAC,
- HB_MUX_MP4 | HB_VCODEC_X264 | HB_ACODEC_FAAC,
- HB_MUX_MP4 | HB_VCODEC_X264 | HB_ACODEC_AC3,
- 0,
- 0 },
- { HB_MUX_MKV | HB_VCODEC_FFMPEG | HB_ACODEC_FAAC,
- HB_MUX_MKV | HB_VCODEC_FFMPEG | HB_ACODEC_AC3,
- HB_MUX_MKV | HB_VCODEC_FFMPEG | HB_ACODEC_LAME,
- HB_MUX_MKV | HB_VCODEC_FFMPEG | HB_ACODEC_VORBIS,
- HB_MUX_MKV | HB_VCODEC_X264 | HB_ACODEC_FAAC,
- HB_MUX_MKV | HB_VCODEC_X264 | HB_ACODEC_AC3,
- HB_MUX_MKV | HB_VCODEC_X264 | HB_ACODEC_LAME,
- HB_MUX_MKV | HB_VCODEC_X264 | HB_ACODEC_VORBIS,
- 0,
- 0 },
- { HB_MUX_AVI | HB_VCODEC_FFMPEG | HB_ACODEC_LAME,
- HB_MUX_AVI | HB_VCODEC_FFMPEG | HB_ACODEC_AC3,
- HB_MUX_AVI | HB_VCODEC_X264 | HB_ACODEC_LAME,
- HB_MUX_AVI | HB_VCODEC_X264 | HB_ACODEC_AC3},
- { HB_MUX_OGM | HB_VCODEC_FFMPEG | HB_ACODEC_VORBIS,
- HB_MUX_OGM | HB_VCODEC_FFMPEG | HB_ACODEC_LAME,
- 0,
- 0 } };
+#define DragDropSimplePboardType @"MyCustomOutlineViewPboardType"
/* We setup the toolbar values here */
static NSString * ToggleDrawerIdentifier = @"Toggle Drawer Item Identifier";
*******************************/
@implementation HBController
-- init
+- (id)init
{
self = [super init];
+ if( !self )
+ {
+ return nil;
+ }
+
[HBPreferencesController registerUserDefaults];
fHandle = NULL;
+
/* Check for check for the app support directory here as
- * outputPanel needs it right away, as may other future methods
- */
- /* We declare the default NSFileManager into fileManager */
- NSFileManager * fileManager = [NSFileManager defaultManager];
- /* we set the files and support paths here */
- AppSupportDirectory = @"~/Library/Application Support/HandBrake";
- AppSupportDirectory = [AppSupportDirectory stringByExpandingTildeInPath];
- /* We check for the app support directory for handbrake */
- if ([fileManager fileExistsAtPath:AppSupportDirectory] == 0)
- {
- // If it doesnt exist yet, we create it here
- [fileManager createDirectoryAtPath:AppSupportDirectory attributes:nil];
- }
-
+ * outputPanel needs it right away, as may other future methods
+ */
+ NSString *libraryDir = [NSSearchPathForDirectoriesInDomains( NSLibraryDirectory,
+ NSUserDomainMask,
+ YES ) objectAtIndex:0];
+ AppSupportDirectory = [[libraryDir stringByAppendingPathComponent:@"Application Support"]
+ stringByAppendingPathComponent:@"HandBrake"];
+ if( ![[NSFileManager defaultManager] fileExistsAtPath:AppSupportDirectory] )
+ {
+ [[NSFileManager defaultManager] createDirectoryAtPath:AppSupportDirectory
+ attributes:nil];
+ }
+
outputPanel = [[HBOutputPanelController alloc] init];
fPictureController = [[PictureController alloc] initWithDelegate:self];
fQueueController = [[HBQueueController alloc] init];
*/
fPresetsBuiltin = [[HBPresets alloc] init];
fPreferencesController = [[HBPreferencesController alloc] init];
+ /* Lets report the HandBrake version number here to the activity log and text log file */
+ NSString *versionStringFull = [[NSString stringWithFormat: @"Handbrake Version: %@", [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleGetInfoString"]] stringByAppendingString: [NSString stringWithFormat: @" (%@)", [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]]];
+ [self writeToActivityLog: "%s", [versionStringFull UTF8String]];
+
return self;
}
- (void) applicationDidFinishLaunching: (NSNotification *) notification
{
- /* Variables from legacy update system, leave but commented out until Sparkle is compeletely vetted */
- //int build;
- //char * version;
-
- // Init libhb
- /* Old update method using hb_init, commented out but code left for a few revs til new sparkle updater is vetted */
- //fHandle = hb_init(debugLevel, [[NSUserDefaults standardUserDefaults] boolForKey:@"CheckForUpdates"]);
- /* New Init libhb with check for updates libhb style set to "0" so its ignored and lets sparkle take care of it */
+ /* Init libhb with check for updates libhb style set to "0" so its ignored and lets sparkle take care of it */
fHandle = hb_init(HB_DEBUG_ALL, 0);
// Set the Growl Delegate
fChapterTitlesDelegate = [[ChapterTitles alloc] init];
[fChapterTable setDataSource:fChapterTitlesDelegate];
+ [fChapterTable setDelegate:fChapterTitlesDelegate];
/* Call UpdateUI every 1/2 sec */
[[NSRunLoop currentRunLoop] addTimer: [NSTimer
[fWindow setExcludedFromWindowsMenu:YES];
[fAdvancedOptions setView:fAdvancedView];
+ /* lets setup our presets drawer for drag and drop here */
+ [fPresetsOutlineView registerForDraggedTypes: [NSArray arrayWithObject:DragDropSimplePboardType] ];
+ [fPresetsOutlineView setDraggingSourceOperationMask:NSDragOperationEvery forLocal:YES];
+ [fPresetsOutlineView setVerticalMotionCanBeginDrag: YES];
+
/* Initialize currentScanCount so HB can use it to
evaluate successive scans */
currentScanCount = 0;
}
+
/* Destination box*/
+ NSMenuItem *menuItem;
[fDstFormatPopUp removeAllItems];
- [fDstFormatPopUp addItemWithTitle: _( @"MP4 file" )];
- [fDstFormatPopUp addItemWithTitle: _( @"MKV file" )];
- [fDstFormatPopUp addItemWithTitle: _( @"AVI file" )];
- [fDstFormatPopUp addItemWithTitle: _( @"OGM file" )];
+ // MP4 file
+ menuItem = [[fDstFormatPopUp menu] addItemWithTitle:@"MP4 file" action: NULL keyEquivalent: @""];
+ [menuItem setTag: HB_MUX_MP4];
+ // MKV file
+ menuItem = [[fDstFormatPopUp menu] addItemWithTitle:@"MKV file" action: NULL keyEquivalent: @""];
+ [menuItem setTag: HB_MUX_MKV];
+ // AVI file
+ menuItem = [[fDstFormatPopUp menu] addItemWithTitle:@"AVI file" action: NULL keyEquivalent: @""];
+ [menuItem setTag: HB_MUX_AVI];
+ // OGM file
+ menuItem = [[fDstFormatPopUp menu] addItemWithTitle:@"OGM file" action: NULL keyEquivalent: @""];
+ [menuItem setTag: HB_MUX_OGM];
[fDstFormatPopUp selectItemAtIndex: 0];
[self formatPopUpChanged: NULL];
/* Video framerate */
[fVidRatePopUp removeAllItems];
- [fVidRatePopUp addItemWithTitle: _( @"Same as source" )];
+ [fVidRatePopUp addItemWithTitle: NSLocalizedString( @"Same as source", @"" )];
for( int i = 0; i < hb_video_rates_count; i++ )
{
if ([[NSString stringWithCString: hb_video_rates[i].string] isEqualToString: [NSString stringWithFormat: @"%.3f",23.976]])
[fPictureController setAutoCrop:YES];
/* Audio bitrate */
- [fAudBitratePopUp removeAllItems];
+ [fAudTrack1BitratePopUp removeAllItems];
for( int i = 0; i < hb_audio_bitrates_count; i++ )
{
- [fAudBitratePopUp addItemWithTitle:
+ [fAudTrack1BitratePopUp addItemWithTitle:
[NSString stringWithCString: hb_audio_bitrates[i].string]];
}
- [fAudBitratePopUp selectItemAtIndex: hb_audio_bitrates_default];
+ [fAudTrack1BitratePopUp selectItemAtIndex: hb_audio_bitrates_default];
/* Audio samplerate */
- [fAudRatePopUp removeAllItems];
+ [fAudTrack1RatePopUp removeAllItems];
for( int i = 0; i < hb_audio_rates_count; i++ )
{
- [fAudRatePopUp addItemWithTitle:
+ [fAudTrack1RatePopUp addItemWithTitle:
[NSString stringWithCString: hb_audio_rates[i].string]];
}
- [fAudRatePopUp selectItemAtIndex: hb_audio_rates_default];
+ [fAudTrack1RatePopUp selectItemAtIndex: hb_audio_rates_default];
/* Bottom */
[fStatusField setStringValue: @""];
}
-- (void) TranslateStrings
-{
- [fSrcTitleField setStringValue: _( @"Title:" )];
- [fSrcChapterField setStringValue: _( @"Chapters:" )];
- [fSrcChapterToField setStringValue: _( @"to" )];
- [fSrcDuration1Field setStringValue: _( @"Duration:" )];
-
- [fDstFormatField setStringValue: _( @"Format:" )];
- [fDstCodecsField setStringValue: _( @"Codecs:" )];
- [fDstFile1Field setStringValue: _( @"File:" )];
- [fDstBrowseButton setTitle: _( @"Browse" )];
-
- [fVidRateField setStringValue: _( @"Framerate (fps):" )];
- [fVidEncoderField setStringValue: _( @"Encoder:" )];
- [fVidQualityField setStringValue: _( @"Quality:" )];
-}
-
-
- (void) enableUI: (bool) b
{
NSControl * controls[] =
{ fSrcTitleField, fSrcTitlePopUp,
fSrcChapterField, fSrcChapterStartPopUp, fSrcChapterToField,
fSrcChapterEndPopUp, fSrcDuration1Field, fSrcDuration2Field,
- fDstFormatField, fDstFormatPopUp, fDstCodecsField,
- fDstCodecsPopUp, fDstFile1Field, fDstFile2Field,
+ fDstFormatField, fDstFormatPopUp, fDstFile1Field, fDstFile2Field,
fDstBrowseButton, fVidRateField, fVidRatePopUp,
fVidEncoderField, fVidEncoderPopUp, fVidQualityField,
fVidQualityMatrix, fVidGrayscaleCheck, fSubField, fSubPopUp,
- fAudLang1Field, fAudLang1PopUp, fAudLang2Field, fAudLang2PopUp,
- fAudTrack1MixLabel, fAudTrack1MixPopUp, fAudTrack2MixLabel, fAudTrack2MixPopUp,
- fAudRateField, fAudRatePopUp, fAudBitrateField,
- fAudBitratePopUp, fPictureButton,fQueueStatus,fPicSettingARkeep,
- fPicSettingDeinterlace,fPicLabelSettings,fPicLabelSrc,fPicLabelOutp,fPicSettingsSrc,fPicSettingsOutp,fPicSettingsAnamorphic,
+ fAudSourceLabel, fAudCodecLabel, fAudMixdownLabel, fAudSamplerateLabel, fAudBitrateLabel,
+ fAudTrack1Label, fAudTrack2Label, fAudTrack3Label, fAudTrack4Label,
+ fAudLang1PopUp, fAudLang2PopUp, fAudLang3PopUp, fAudLang4PopUp,
+ fAudTrack1CodecPopUp, fAudTrack2CodecPopUp, fAudTrack3CodecPopUp, fAudTrack4CodecPopUp,
+ fAudTrack1MixPopUp, fAudTrack2MixPopUp, fAudTrack3MixPopUp, fAudTrack4MixPopUp,
+ fAudTrack1RatePopUp, fAudTrack2RatePopUp, fAudTrack3RatePopUp, fAudTrack4RatePopUp,
+ fAudTrack1BitratePopUp, fAudTrack2BitratePopUp, fAudTrack3BitratePopUp, fAudTrack4BitratePopUp,
+ fAudDrcLabel, fAudTrack1DrcSlider, fAudTrack1DrcField, fAudTrack2DrcSlider,
+ fAudTrack2DrcField, fAudTrack3DrcSlider, fAudTrack3DrcField, fAudTrack4DrcSlider,fAudTrack4DrcField,
+ fPictureButton,fQueueStatus,fPicSettingARkeep, fPicSettingDeinterlace,fPicLabelSettings,fPicLabelSrc,
+ fPicLabelOutp,fPicSettingsSrc,fPicSettingsOutp,fPicSettingsAnamorphic,
fPicLabelAr,fPicLabelDeinterlace,fPicSettingPAR,fPicLabelAnamorphic,fPresetsAdd,fPresetsDelete,
fCreateChapterMarkers,fVidTurboPassCheck,fDstMp4LargeFileCheck,fPicLabelAutoCrop,
fPicSettingAutoCrop,fPicSettingDetelecine,fPicLabelDetelecine,fPicLabelDenoise,fPicSettingDenoise,
- fSubForcedCheck,fPicSettingDeblock,fPicLabelDeblock,fPresetsOutlineView,fAudDrcSlider,
- fAudDrcField,fAudDrcLabel,fDstMp4HttpOptFileCheck,fAudDrcDescLabel1,fAudDrcDescLabel2,fAudDrcDescLabel3,
- fAudDrcDescLabel4,fDstMp4iPodFileCheck};
+ fSubForcedCheck,fPicSettingDeblock,fPicLabelDeblock,fPicLabelDecomb,fPicSettingDecomb,fPresetsOutlineView,
+ fAudDrcLabel,fDstMp4HttpOptFileCheck,fDstMp4iPodFileCheck};
for( unsigned i = 0;
i < sizeof( controls ) / sizeof( NSControl * ); i++ )
case HB_STATE_SCANNING:
{
[fSrcDVD2Field setStringValue: [NSString stringWithFormat:
- _( @"Scanning title %d of %d..." ),
+ NSLocalizedString( @"Scanning title %d of %d...", @"" ),
p.title_cur, p.title_count]];
[fScanIndicator setHidden: NO];
[fScanIndicator setDoubleValue: 100.0 * ( p.title_cur - 1 ) / p.title_count];
break;
}
#undef p
-
+
#define p s.param.scandone
case HB_STATE_SCANDONE:
{
[fScanIndicator setDoubleValue: 0.0];
[fScanIndicator setHidden: YES];
[self showNewScan: NULL];
- [toolbar validateVisibleItems];
+ [[fWindow toolbar] validateVisibleItems];
break;
}
#undef p
-
+
#define p s.param.working
case HB_STATE_WORKING:
{
jobs during encoding, if they cannot be fixed in libhb, will implement a
nasty but working cocoa solution */
/* Update text field */
- string = [NSMutableString stringWithFormat: _( @"Encoding: task %d of %d, %.2f %%" ), p.job_cur, p.job_count, 100.0 * p.progress];
+ string = [NSMutableString stringWithFormat: NSLocalizedString( @"Encoding: task %d of %d, %.2f %%", @"" ), p.job_cur, p.job_count, 100.0 * p.progress];
if( p.seconds > -1 )
{
[string appendFormat:
- _( @" (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)" ),
+ NSLocalizedString( @" (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)", @"" ),
p.rate_cur, p.rate_avg, p.hours, p.minutes, p.seconds];
}
[fStatusField setStringValue: string];
/* Update text field */
string = [NSMutableString stringWithFormat:
- _( @"Muxing..." )];
+ NSLocalizedString( @"Muxing...", @"" )];
[fStatusField setStringValue: string];
/* Update slider */
#undef p
case HB_STATE_PAUSED:
- [fStatusField setStringValue: _( @"Paused" )];
+ [fStatusField setStringValue: NSLocalizedString( @"Paused", @"" )];
// Pass along the info to HBQueueController
[fQueueController libhbStateChanged: s];
// HB_STATE_WORKDONE happpens as a result of libhb finishing all its jobs
// or someone calling hb_stop. In the latter case, hb_stop does not clear
// out the remaining passes/jobs in the queue. We'll do that here.
-
+
// Delete all remaining jobs of this encode.
hb_job_t * job;
while( ( job = hb_job( fHandle, 0 ) ) && ( !IsFirstPass(job->sequence_id) ) )
hb_rem( fHandle, job );
- [fStatusField setStringValue: _( @"Done." )];
+ [fStatusField setStringValue: NSLocalizedString( @"Done.", @"" )];
[fRipIndicator setIndeterminate: NO];
[fRipIndicator setDoubleValue: 0.0];
- [toolbar validateVisibleItems];
+ [[fWindow toolbar] validateVisibleItems];
/* Restore dock icon */
[self UpdateDockIcon: -1.0];
/* Check to see if the encode state has not been cancelled
to determine if we should check for encode done notifications */
if (fEncodeState != 2) {
- /* If Growl Notification or Window and Growl has been selected */
- if ([[[NSUserDefaults standardUserDefaults] stringForKey:@"AlertWhenDone"] isEqualToString: @"Growl Notification"] ||
- [[[NSUserDefaults standardUserDefaults] stringForKey:@"AlertWhenDone"] isEqualToString: @"Alert Window And Growl"])
- {
- /*Growl Notification*/
- [self showGrowlDoneNotification: NULL];
- }
- /* If Alert Window or Window and Growl has been selected */
+ /* If Alert Window or Window and Growl has been selected */
if ([[[NSUserDefaults standardUserDefaults] stringForKey:@"AlertWhenDone"] isEqualToString: @"Alert Window"] ||
[[[NSUserDefaults standardUserDefaults] stringForKey:@"AlertWhenDone"] isEqualToString: @"Alert Window And Growl"])
{
[self enableUI: YES];
}
- // MetaX insertion via AppleScript
- if([[NSUserDefaults standardUserDefaults] boolForKey: @"sendToMetaX"] == YES)
- {
- NSAppleScript *myScript = [[NSAppleScript alloc] initWithSource: [NSString stringWithFormat: @"%@%@%@", @"tell application \"MetaX\" to open (POSIX file \"", [fDstFile2Field stringValue], @"\")"]];
- [myScript executeAndReturnError: nil];
- [myScript release];
- }
-
-
- }
+ }
else
{
[self enableUI: YES];
/* Lets show the queue status here in the main window */
int queue_count = [fQueueController pendingCount];
if( queue_count == 1)
- [fQueueStatus setStringValue: _( @"1 encode queued") ];
+ [fQueueStatus setStringValue: NSLocalizedString( @"1 encode queued", @"" ) ];
else if (queue_count > 1)
- [fQueueStatus setStringValue: [NSString stringWithFormat: _( @"%d encodes queued" ), queue_count]];
+ [fQueueStatus setStringValue: [NSString stringWithFormat: NSLocalizedString( @"%d encodes queued", @"" ), queue_count]];
else
[fQueueStatus setStringValue: @""];
}
// ============================================================
- (void) setupToolbar {
- toolbar = [[[NSToolbar alloc] initWithIdentifier: @"HandBrake Toolbar"] autorelease];
-
+ NSToolbar *toolbar = [[[NSToolbar alloc] initWithIdentifier: @"HandBrake Toolbar"] autorelease];
+
[toolbar setAllowsUserCustomization: YES];
[toolbar setAutosavesConfiguration: YES];
[toolbar setDisplayMode: NSToolbarDisplayModeIconAndLabel];
-
+
[toolbar setDelegate: self];
-
+
[fWindow setToolbar: toolbar];
}
- (NSToolbarItem *) toolbar: (NSToolbar *)toolbar itemForItemIdentifier:
(NSString *) itemIdent willBeInsertedIntoToolbar:(BOOL) willBeInserted {
- NSToolbarItem * item = [[NSToolbarItem alloc] initWithItemIdentifier: itemIdent];
-
+ NSToolbarItem * item = [[[NSToolbarItem alloc] initWithItemIdentifier: itemIdent] autorelease];
+
if ([itemIdent isEqualToString: ToggleDrawerIdentifier])
{
[item setLabel: @"Toggle Presets"];
}
else
{
- [item release];
return nil;
}
}
#pragma mark -
-#pragma mark Growl
+#pragma mark Encode Done Actions
// register a test notification and make
// it enabled by default
#define SERVICE_NAME @"Encode Done"
return registrationDictionary;
}
--(IBAction)showGrowlDoneNotification:(id)sender
+-(void)showGrowlDoneNotification:(NSString *) filePath
+{
+ /* This is called from HBQueueController as jobs roll off of the queue in currentJobChanged */
+ NSString * finishedEncode = filePath;
+ /* strip off the path to just show the file name */
+ finishedEncode = [finishedEncode lastPathComponent];
+ if ([[[NSUserDefaults standardUserDefaults] stringForKey:@"AlertWhenDone"] isEqualToString: @"Growl Notification"] ||
+ [[[NSUserDefaults standardUserDefaults] stringForKey:@"AlertWhenDone"] isEqualToString: @"Alert Window And Growl"])
+ {
+ NSString * growlMssg = [NSString stringWithFormat: @"your HandBrake encode %@ is done!",finishedEncode];
+ [GrowlApplicationBridge
+ notifyWithTitle:@"Put down that cocktail..."
+ description:growlMssg
+ notificationName:SERVICE_NAME
+ iconData:nil
+ priority:0
+ isSticky:1
+ clickContext:nil];
+ }
+
+}
+-(void)sendToMetaX:(NSString *) filePath
{
- [GrowlApplicationBridge
- notifyWithTitle:@"Put down that cocktail..."
- description:@"your HandBrake encode is done!"
- notificationName:SERVICE_NAME
- iconData:nil
- priority:0
- isSticky:1
- clickContext:nil];
+ /* This is called from HBQueueController as jobs roll off of the queue in currentJobChanged */
+ if([[NSUserDefaults standardUserDefaults] boolForKey: @"sendToMetaX"] == YES)
+ {
+ NSAppleScript *myScript = [[NSAppleScript alloc] initWithSource: [NSString stringWithFormat: @"%@%@%@", @"tell application \"MetaX\" to open (POSIX file \"", filePath, @"\")"]];
+ [myScript executeAndReturnError: nil];
+ [myScript release];
+ }
}
-
#pragma mark -
#pragma mark Get New Source
- (void) browseSourcesDone: (NSOpenPanel *) sheet
returnCode: (int) returnCode contextInfo: (void *) contextInfo
{
- [browsedSourceDisplayName release];
-
/* we convert the sender content of contextInfo back into a variable called sender
* mostly just for consistency for evaluation later
*/
/* User selected a file to open */
if( returnCode == NSOKButton )
{
+ /* Free display name allocated previously by this code */
+ [browsedSourceDisplayName release];
NSString *scanPath = [[sheet filenames] objectAtIndex: 0];
/* we set the last searched source directory in the prefs here */
{
[self writeToActivityLog:"trying to open video_ts folder (parent directory chosen)"];
/* if not the VIDEO_TS Folder, we can assume the chosen folder is the source name */
+ /* make sure we remove any path extension as this can also be an '.mpg' file */
browsedSourceDisplayName = [[NSString stringWithFormat:@"%@",[path lastPathComponent]] retain];
}
[self performScan:path scanTitleNum:0];
/* Here we actually tell hb_scan to perform the source scan, using the path to source and title number*/
- (void) performScan:(NSString *) scanPath scanTitleNum: (int) scanTitleNum
{
+ /* use a bool to determine whether or not we can decrypt using vlc */
+ BOOL cancelScanDecrypt = 0;
NSString *path = scanPath;
HBDVDDetector *detector = [HBDVDDetector detectorForPath:path];
if( [detector isVideoDVD] )
// device path instead.
path = [detector devicePath];
[self writeToActivityLog: "trying to open a physical dvd at: %s", [scanPath UTF8String]];
+
+ /* lets check for vlc here to make sure we have a dylib available to use for decrypting */
+ NSString *vlcPath = @"/Applications/VLC.app";
+ NSFileManager * fileManager = [NSFileManager defaultManager];
+ if ([fileManager fileExistsAtPath:vlcPath] == 0)
+ {
+ /*vlc not found in /Applications so we set the bool to cancel scanning to 1 */
+ cancelScanDecrypt = 1;
+ [self writeToActivityLog: "VLC app not found for decrypting physical dvd"];
+ int status;
+ status = NSRunAlertPanel(@"HandBrake could not find VLC.",@"Please download and install VLC media player in your /Applications folder if you wish to read encrypted DVDs.", @"Get VLC", @"Cancel Scan", @"Attempt Scan Anyway");
+ [NSApp requestUserAttention:NSCriticalRequest];
+
+ if (status == NSAlertDefaultReturn)
+ {
+ /* User chose to go download vlc (as they rightfully should) so we send them to the vlc site */
+ [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://www.videolan.org/"]];
+ }
+ else if (status == NSAlertAlternateReturn)
+ {
+ /* User chose to cancel the scan */
+ [self writeToActivityLog: "cannot open physical dvd , scan cancelled"];
+ }
+ else
+ {
+ /* User chose to override our warning and scan the physical dvd anyway, at their own peril. on an encrypted dvd this produces massive log files and fails */
+ cancelScanDecrypt = 0;
+ [self writeToActivityLog: "user overrode vlc warning -trying to open physical dvd without decryption"];
+ }
+
+ }
+ else
+ {
+ /* VLC was found in /Applications so all is well, we can carry on using vlc's libdvdcss.dylib for decrypting if needed */
+ [self writeToActivityLog: "VLC app found for decrypting physical dvd"];
+ }
+
}
- /* If there is no title number passed to scan, we use "0"
- * which causes the default behavior of a full source scan
- */
- if (!scanTitleNum)
+
+
+
+ if (cancelScanDecrypt == 0)
{
- scanTitleNum = 0;
+
+ /* we actually pass the scan off to libhb here */
+ /* If there is no title number passed to scan, we use "0"
+ * which causes the default behavior of a full source scan
+ */
+ if (!scanTitleNum)
+ {
+ scanTitleNum = 0;
+ }
+ if (scanTitleNum > 0)
+ {
+ [self writeToActivityLog: "scanning specifically for title: %d", scanTitleNum];
+ }
+ hb_scan( fHandle, [path UTF8String], scanTitleNum );
+ [fSrcDVD2Field setStringValue: [NSString stringWithFormat: @"Scanning new source ..."]];
}
- if (scanTitleNum > 0)
+ else
{
- [self writeToActivityLog: "scanning specifically for title: %d", scanTitleNum];
+ /* if we have a title loaded up */
+ if ([[fSrcDVD2Field stringValue] length] > 0)
+ {
+ [self enableUI: YES];
+ }
}
- [fSrcDVD2Field setStringValue: [NSString stringWithFormat: @"Scanning new source ..."]];
- /* we actually pass the scan off to libhb here */
- hb_scan( fHandle, [path UTF8String], scanTitleNum );
+
}
which we use at the end of this function to tell the gui
if this is the first successful scan since launch and whether
or not we should set all settings to the defaults */
-
+
currentSuccessfulScanCount++;
-
- [toolbar validateVisibleItems];
-
+
+ [[fWindow toolbar] validateVisibleItems];
+
[fSrcTitlePopUp removeAllItems];
for( int i = 0; i < hb_list_count( list ); i++ )
{
/* Use the dvd name in the default output field here
May want to add code to remove blank spaces for some dvd names*/
/* Check to see if the last destination has been set,use if so, if not, use Desktop */
- if ([[NSUserDefaults standardUserDefaults] stringForKey:@"LastDestinationDirectory"])
+ if ([[NSUserDefaults standardUserDefaults] stringForKey:@"LastDestinationDirectory"])
{
[fDstFile2Field setStringValue: [NSString stringWithFormat:
- @"%@/%@.mp4", [[NSUserDefaults standardUserDefaults] stringForKey:@"LastDestinationDirectory"],browsedSourceDisplayName]];
+ @"%@/%@.mp4", [[NSUserDefaults standardUserDefaults] stringForKey:@"LastDestinationDirectory"],[browsedSourceDisplayName stringByDeletingPathExtension]]];
}
else
{
[fDstFile2Field setStringValue: [NSString stringWithFormat:
- @"%@/Desktop/%@.mp4", NSHomeDirectory(),browsedSourceDisplayName]];
+ @"%@/Desktop/%@.mp4", NSHomeDirectory(),[browsedSourceDisplayName stringByDeletingPathExtension]]];
}
if (longuestpri < title->hours*60*60 + title->minutes *60 + title->seconds)
longuestpri=title->hours*60*60 + title->minutes *60 + title->seconds;
indxpri=i;
}
-
- [self formatPopUpChanged:NULL];
+ /* Leave this here for now for reference. Keep it commented out or the macgui will crash in a
+ * fiery wreck if you change sources.
+ */
+ //[self formatPopUpChanged:NULL];
[fSrcTitlePopUp addItemWithTitle: [NSString
stringWithFormat: @"%d - %02dh%02dm%02ds",
hb_title_t * title = (hb_title_t *) hb_list_item( list,
[fSrcTitlePopUp indexOfSelectedItem] );
hb_job_t * job = title->job;
- //int i;
+ hb_audio_config_t * audio;
/* Chapter selection */
job->chapter_start = [fSrcChapterStartPopUp indexOfSelectedItem] + 1;
job->chapter_end = [fSrcChapterEndPopUp indexOfSelectedItem] + 1;
- /* Format and codecs */
- int format = [fDstFormatPopUp indexOfSelectedItem];
- int codecs = [fDstCodecsPopUp indexOfSelectedItem];
- job->mux = FormatSettings[format][codecs] & HB_MUX_MASK;
- job->vcodec = FormatSettings[format][codecs] & HB_VCODEC_MASK;
- job->acodec = FormatSettings[format][codecs] & HB_ACODEC_MASK;
+ /* Format (Muxer) and Video Encoder */
+ job->mux = [[fDstFormatPopUp selectedItem] tag];
+ job->vcodec = [[fVidEncoderPopUp selectedItem] tag];
+
+
/* If mpeg-4, then set mpeg-4 specific options like chapters and > 4gb file sizes */
if ([fDstFormatPopUp indexOfSelectedItem] == 0)
{
/* We set the largeFileSize (64 bit formatting) variable here to allow for > 4gb files based on the format being
mpeg4 and the checkbox being checked
*Note: this will break compatibility with some target devices like iPod, etc.!!!!*/
- if ([[NSUserDefaults standardUserDefaults] boolForKey:@"AllowLargeFiles"] > 0 && [fDstMp4LargeFileCheck state] == NSOnState)
+ if ([fDstMp4LargeFileCheck state] == NSOnState)
{
job->largeFileSize = 1;
}
job->mp4_optimize = 0;
}
}
- if ([fDstFormatPopUp indexOfSelectedItem] == 0 || [fDstFormatPopUp indexOfSelectedItem] == 3)
+ if ([fDstFormatPopUp indexOfSelectedItem] == 0 || [fDstFormatPopUp indexOfSelectedItem] == 1)
{
/* We set the chapter marker extraction here based on the format being
mpeg4 or mkv and the checkbox being checked */
job->chapter_markers = 0;
}
}
- if( ( job->vcodec & HB_VCODEC_FFMPEG ) &&
- [fVidEncoderPopUp indexOfSelectedItem] > 0 )
- {
- job->vcodec = HB_VCODEC_XVID;
- }
+
if( job->vcodec & HB_VCODEC_X264 )
{
if ([fDstMp4iPodFileCheck state] == NSOnState)
job->subtitle = [fSubPopUp indexOfSelectedItem] - 2;
/* Audio tracks and mixdowns */
- /* check for the condition where track 2 has an audio selected, but track 1 does not */
- /* we will use track 2 as track 1 in this scenario */
- if ([fAudLang1PopUp indexOfSelectedItem] > 0)
- {
- job->audios[0] = [fAudLang1PopUp indexOfSelectedItem] - 1;
- job->audios[1] = [fAudLang2PopUp indexOfSelectedItem] - 1; /* will be -1 if "none" is selected */
- job->audios[2] = -1;
- job->audio_mixdowns[0] = [[fAudTrack1MixPopUp selectedItem] tag];
- job->audio_mixdowns[1] = [[fAudTrack2MixPopUp selectedItem] tag];
- }
- else if ([fAudLang2PopUp indexOfSelectedItem] > 0)
+ /* Lets make sure there arent any erroneous audio tracks in the job list, so lets make sure its empty*/
+ int audiotrack_count = hb_list_count(job->list_audio);
+ for( int i = 0; i < audiotrack_count;i++)
{
- job->audios[0] = [fAudLang2PopUp indexOfSelectedItem] - 1;
- job->audio_mixdowns[0] = [[fAudTrack2MixPopUp selectedItem] tag];
- job->audios[1] = -1;
+ hb_audio_t * temp_audio = (hb_audio_t*) hb_list_item( job->list_audio, 0 );
+ hb_list_rem(job->list_audio, temp_audio);
}
- else
+ /* Now lets add our new tracks to the audio list here */
+ if ([fAudLang1PopUp indexOfSelectedItem] > 0)
{
- job->audios[0] = -1;
- }
-
- /*
- * Where one or more of the audio tracks has a mixdown of DPLII+AC3 we need to create an extra
- * track for each.
- */
- if (job->audio_mixdowns[0] == HB_AMIXDOWN_DOLBYPLII_AC3)
+ audio = (hb_audio_config_t *) calloc(1, sizeof(*audio));
+ hb_audio_config_init(audio);
+ audio->in.track = [fAudLang1PopUp indexOfSelectedItem] - 1;
+ /* We go ahead and assign values to our audio->out.<properties> */
+ audio->out.track = [fAudLang1PopUp indexOfSelectedItem] - 1;
+ audio->out.codec = [[fAudTrack1CodecPopUp selectedItem] tag];
+ audio->out.mixdown = [[fAudTrack1MixPopUp selectedItem] tag];
+ audio->out.bitrate = [[fAudTrack1BitratePopUp selectedItem] tag];
+ audio->out.samplerate = [[fAudTrack1RatePopUp selectedItem] tag];
+ audio->out.dynamic_range_compression = [fAudTrack1DrcField floatValue];
+
+ hb_audio_add( job, audio );
+ free(audio);
+ }
+ if ([fAudLang2PopUp indexOfSelectedItem] > 0)
{
- /*
- * Make space for the AC3 track by moving 1 to 2
- */
- job->audios[2] = job->audios[1];
- job->audio_mixdowns[2] = job->audio_mixdowns[1];
- job->audios[1] = job->audios[0];
- job->audio_mixdowns[0] = HB_AMIXDOWN_DOLBYPLII;
- job->audio_mixdowns[1] = HB_AMIXDOWN_AC3;
+ audio = (hb_audio_config_t *) calloc(1, sizeof(*audio));
+ hb_audio_config_init(audio);
+ audio->in.track = [fAudLang2PopUp indexOfSelectedItem] - 1;
+ /* We go ahead and assign values to our audio->out.<properties> */
+ audio->out.track = [fAudLang2PopUp indexOfSelectedItem] - 1;
+ audio->out.codec = [[fAudTrack2CodecPopUp selectedItem] tag];
+ audio->out.mixdown = [[fAudTrack2MixPopUp selectedItem] tag];
+ audio->out.bitrate = [[fAudTrack2BitratePopUp selectedItem] tag];
+ audio->out.samplerate = [[fAudTrack2RatePopUp selectedItem] tag];
+ audio->out.dynamic_range_compression = [fAudTrack2DrcField floatValue];
+
+ hb_audio_add( job, audio );
+ free(audio);
+
}
-
- if (job->audio_mixdowns[1] == HB_AMIXDOWN_DOLBYPLII_AC3)
+
+ if ([fAudLang3PopUp indexOfSelectedItem] > 0)
{
- job->audios[2] = job->audios[1];
- job->audio_mixdowns[1] = HB_AMIXDOWN_DOLBYPLII;
- job->audio_mixdowns[2] = HB_AMIXDOWN_AC3;
- job->audios[3] = -1;
+ audio = (hb_audio_config_t *) calloc(1, sizeof(*audio));
+ hb_audio_config_init(audio);
+ audio->in.track = [fAudLang3PopUp indexOfSelectedItem] - 1;
+ /* We go ahead and assign values to our audio->out.<properties> */
+ audio->out.track = [fAudLang3PopUp indexOfSelectedItem] - 1;
+ audio->out.codec = [[fAudTrack3CodecPopUp selectedItem] tag];
+ audio->out.mixdown = [[fAudTrack3MixPopUp selectedItem] tag];
+ audio->out.bitrate = [[fAudTrack3BitratePopUp selectedItem] tag];
+ audio->out.samplerate = [[fAudTrack3RatePopUp selectedItem] tag];
+ audio->out.dynamic_range_compression = [fAudTrack3DrcField floatValue];
+
+ hb_audio_add( job, audio );
+ free(audio);
+
}
- if (job->audio_mixdowns[2] == HB_AMIXDOWN_DOLBYPLII_AC3)
+ if ([fAudLang4PopUp indexOfSelectedItem] > 0)
{
- job->audios[3] = job->audios[2];
- job->audio_mixdowns[2] = HB_AMIXDOWN_DOLBYPLII;
- job->audio_mixdowns[3] = HB_AMIXDOWN_AC3;
- job->audios[4] = -1;
+ audio = (hb_audio_config_t *) calloc(1, sizeof(*audio));
+ hb_audio_config_init(audio);
+ audio->in.track = [fAudLang4PopUp indexOfSelectedItem] - 1;
+ /* We go ahead and assign values to our audio->out.<properties> */
+ audio->out.track = [fAudLang4PopUp indexOfSelectedItem] - 1;
+ audio->out.codec = [[fAudTrack4CodecPopUp selectedItem] tag];
+ audio->out.mixdown = [[fAudTrack4MixPopUp selectedItem] tag];
+ audio->out.bitrate = [[fAudTrack4BitratePopUp selectedItem] tag];
+ audio->out.samplerate = [[fAudTrack4RatePopUp selectedItem] tag];
+ audio->out.dynamic_range_compression = [fAudTrack4DrcField floatValue];
+
+ hb_audio_add( job, audio );
+ free(audio);
+
}
- /* Audio settings */
- job->arate = hb_audio_rates[[fAudRatePopUp
- indexOfSelectedItem]].rate;
- job->abitrate = [[fAudBitratePopUp selectedItem] tag];
-
- /* Dynamic Range Compression */
- job->dynamic_range_compression = [fAudDrcField floatValue];
-
/* set vfr according to the Picture Window */
if ([fPictureController vfr])
{
- job->vfr = 1;
+ job->vfr = 1;
}
else
{
- job->vfr = 0;
+ job->vfr = 0;
}
/* Filters */
job->filters = hb_list_init();
-
+
+ /* Now lets call the filters if applicable.
+ * The order of the filters is critical
+ */
+
/* Detelecine */
if ([fPictureController detelecine])
{
hb_list_add( job->filters, &hb_filter_detelecine );
}
-
+
+ /* Decomb */
+ if ([fPictureController decomb] > 0)
+ {
+ /* Run old deinterlacer fd by default */
+ //fPicSettingDecomb
+ hb_filter_decomb.settings = (char *) [[fPicSettingDecomb stringValue] UTF8String];
+ //hb_filter_decomb.settings = "4:10:15:9:10:35:9"; // <-- jbrjakes recommended parameters as of 5/23/08
+ hb_list_add( job->filters, &hb_filter_decomb );
+ }
+
+
/* Deinterlace */
if ([fPictureController deinterlace] == 1)
{
hb_list_add( job->filters, &hb_filter_deinterlace );
}
- /* Denoise */
-
+ /* Denoise */
if ([fPictureController denoise] == 1) // Weak in popup
{
hb_filter_denoise.settings = "2:1:2:3";
if( [[NSFileManager defaultManager] fileExistsAtPath:
[fDstFile2Field stringValue]] )
{
- NSBeginCriticalAlertSheet( _( @"File already exists" ),
- _( @"Cancel" ), _( @"Overwrite" ), NULL, fWindow, self,
+ NSBeginCriticalAlertSheet( NSLocalizedString( @"File already exists", @"" ),
+ NSLocalizedString( @"Cancel", @"" ), NSLocalizedString( @"Overwrite", @"" ), NULL, fWindow, self,
@selector( overwriteAddToQueueAlertDone:returnCode:contextInfo: ),
NULL, NULL, [NSString stringWithFormat:
- _( @"Do you want to overwrite %@?" ),
+ NSLocalizedString( @"Do you want to overwrite %@?", @"" ),
[fDstFile2Field stringValue]] );
// overwriteAddToQueueAlertDone: will be called when the alert is dismissed.
}
else if ( ([fQueueController pendingJobGroupWithDestinationPath:[fDstFile2Field stringValue]] != nil)
|| ([[[fQueueController currentJobGroup] destinationPath] isEqualToString: [fDstFile2Field stringValue]]) )
{
- NSBeginCriticalAlertSheet( _( @"Another queued encode has specified the same destination." ),
- _( @"Cancel" ), _( @"Overwrite" ), NULL, fWindow, self,
+ NSBeginCriticalAlertSheet( NSLocalizedString( @"Another queued encode has specified the same destination.", @"" ),
+ NSLocalizedString( @"Cancel", @"" ), NSLocalizedString( @"Overwrite", @"" ), NULL, fWindow, self,
@selector( overwriteAddToQueueAlertDone:returnCode:contextInfo: ),
NULL, NULL, [NSString stringWithFormat:
- _( @"Do you want to overwrite %@?" ),
+ NSLocalizedString( @"Do you want to overwrite %@?", @"" ),
[fDstFile2Field stringValue]] );
// overwriteAddToQueueAlertDone: will be called when the alert is dismissed.
}
// Create a Queue Controller job group. Each job that we submit to libhb will also
// get added to the job group so that the queue can track the jobs.
- HBJobGroup * jobGroup = [HBJobGroup jobGroup];
+ HBJobGroup * jobGroup = [HBJobGroup jobGroup];
// The job group can maintain meta data that libhb can not...
- [jobGroup setPresetName: [fPresetSelectedDisplay stringValue]];
+ [jobGroup setPresetName: [fPresetSelectedDisplay stringValue]];
// Job groups require that each job within the group be assigned a unique id so
// that the queue can xref between itself and the private jobs that libhb
// maintains. The ID is composed a group id number and a "sequence" number. libhb
// does not use this id.
- static int jobGroupID = 0;
- jobGroupID++;
+ static int jobGroupID = 0;
+ jobGroupID++;
// A sequence number, starting at zero, is used to identifiy to each pass. This is
// used by the queue UI to determine if a pass if the first pass of an encode.
/* We check for duplicate name here */
if( [[NSFileManager defaultManager] fileExistsAtPath:[fDstFile2Field stringValue]] )
{
- NSBeginCriticalAlertSheet( _( @"File already exists" ),
- _( @"Cancel" ), _( @"Overwrite" ), NULL, fWindow, self,
+ NSBeginCriticalAlertSheet( NSLocalizedString( @"File already exists", @"" ),
+ NSLocalizedString( @"Cancel", "" ), NSLocalizedString( @"Overwrite", @"" ), NULL, fWindow, self,
@selector( overWriteAlertDone:returnCode:contextInfo: ),
NULL, NULL, [NSString stringWithFormat:
- _( @"Do you want to overwrite %@?" ),
+ NSLocalizedString( @"Do you want to overwrite %@?", @"" ),
[fDstFile2Field stringValue]] );
// overWriteAlertDone: will be called when the alert is dismissed. It will call doRip.
/* Update chapter table */
[fChapterTitlesDelegate resetWithTitle:title];
[fChapterTable reloadData];
-
+
+ /* Lets make sure there arent any erroneous audio tracks in the job list, so lets make sure its empty*/
+ int audiotrack_count = hb_list_count(job->list_audio);
+ for( int i = 0; i < audiotrack_count;i++)
+ {
+ hb_audio_t * temp_audio = (hb_audio_t*) hb_list_item( job->list_audio, 0 );
+ hb_list_rem(job->list_audio, temp_audio);
+ }
+
/* Update audio popups */
[self addAllAudioTracksToPopUp: fAudLang1PopUp];
[self addAllAudioTracksToPopUp: fAudLang2PopUp];
+ [self addAllAudioTracksToPopUp: fAudLang3PopUp];
+ [self addAllAudioTracksToPopUp: fAudLang4PopUp];
/* search for the first instance of our prefs default language for track 1, and set track 2 to "none" */
NSString * audioSearchPrefix = [[NSUserDefaults standardUserDefaults] stringForKey:@"DefaultLanguage"];
[self selectAudioTrackInPopUp: fAudLang1PopUp searchPrefixString: audioSearchPrefix selectIndexIfNotFound: 1];
[self selectAudioTrackInPopUp: fAudLang2PopUp searchPrefixString: NULL selectIndexIfNotFound: 0];
+ [self selectAudioTrackInPopUp: fAudLang3PopUp searchPrefixString: NULL selectIndexIfNotFound: 0];
+ [self selectAudioTrackInPopUp: fAudLang4PopUp searchPrefixString: NULL selectIndexIfNotFound: 0];
/* changing the title may have changed the audio channels on offer, */
/* so call audioTrackPopUpChanged for both audio tracks to update the mixdown popups */
[self audioTrackPopUpChanged: fAudLang1PopUp];
[self audioTrackPopUpChanged: fAudLang2PopUp];
+ [self audioTrackPopUpChanged: fAudLang3PopUp];
+ [self audioTrackPopUpChanged: fAudLang4PopUp];
/* We repopulate the Video Framerate popup and show the detected framerate along with "Same as Source"*/
[fVidRatePopUp removeAllItems];
- (IBAction) formatPopUpChanged: (id) sender
{
NSString * string = [fDstFile2Field stringValue];
- NSString * selectedCodecs = [fDstCodecsPopUp titleOfSelectedItem];
int format = [fDstFormatPopUp indexOfSelectedItem];
char * ext = NULL;
/* Initially set the large file (64 bit formatting) output checkbox to hidden */
[fDstMp4HttpOptFileCheck setHidden: YES];
[fDstMp4iPodFileCheck setHidden: YES];
- /* Update the codecs popup */
- [fDstCodecsPopUp removeAllItems];
+ /* Update the Video Codec PopUp */
+ /* Note: we now store the video encoder int values from common.c in the tags of each popup for easy retrieval later */
+ [fVidEncoderPopUp removeAllItems];
+ NSMenuItem *menuItem;
+ /* These video encoders are available to all of our current muxers, so lets list them once here */
+ menuItem = [[fVidEncoderPopUp menu] addItemWithTitle:@"MPEG-4 (FFmpeg)" action: NULL keyEquivalent: @""];
+ [menuItem setTag: HB_VCODEC_FFMPEG];
+
+ menuItem = [[fVidEncoderPopUp menu] addItemWithTitle:@"MPEG-4 (XviD)" action: NULL keyEquivalent: @""];
+ [menuItem setTag: HB_VCODEC_XVID];
switch( format )
{
case 0:
{
ext = "mp4";
}
-
- [fDstCodecsPopUp addItemWithTitle:_( @"MPEG-4 Video / AAC Audio" )];
- [fDstCodecsPopUp addItemWithTitle:_( @"AVC/H.264 Video / AAC Audio" )];
- /* We add a new codecs entry which will allow the new aac/ ac3 hybrid */
- [fDstCodecsPopUp addItemWithTitle:_( @"AVC/H.264 Video / AAC + AC3 Audio" )];
- [fDstCodecsPopUp addItemWithTitle:_( @"AVC/H.264 Video / AC3 Audio" )];
- /* We enable the create chapters checkbox here since we are .mp4*/
- [fCreateChapterMarkers setEnabled: YES];
- /* We show the Large File (64 bit formatting) checkbox since we are .mp4
- if we have enabled the option in the global preferences*/
- if ([[NSUserDefaults standardUserDefaults] boolForKey:@"AllowLargeFiles"] > 0)
- {
- [fDstMp4LargeFileCheck setHidden: NO];
- }
- else
- {
- /* if not enable in global preferences, we additionaly sanity check that the
- hidden checkbox is set to off. */
- [fDstMp4LargeFileCheck setState: NSOffState];
- }
- /* We show the HTTP Optimized checkbox here since we are mp4 */
- [fDstMp4HttpOptFileCheck setHidden: NO];
+ /* Add additional video encoders here */
+ menuItem = [[fVidEncoderPopUp menu] addItemWithTitle:@"H.264 (x264)" action: NULL keyEquivalent: @""];
+ [menuItem setTag: HB_VCODEC_X264];
+ /* We show the mp4 option checkboxes here since we are mp4 */
+ [fCreateChapterMarkers setEnabled: YES];
+ [fDstMp4LargeFileCheck setHidden: NO];
+ [fDstMp4HttpOptFileCheck setHidden: NO];
[fDstMp4iPodFileCheck setHidden: NO];
break;
- case 1:
+ case 1:
ext = "mkv";
- [fDstCodecsPopUp addItemWithTitle:_( @"MPEG-4 Video / AAC Audio" )];
- [fDstCodecsPopUp addItemWithTitle:_( @"MPEG-4 Video / AC-3 Audio" )];
- [fDstCodecsPopUp addItemWithTitle:_( @"MPEG-4 Video / MP3 Audio" )];
- [fDstCodecsPopUp addItemWithTitle:_( @"MPEG-4 Video / Vorbis Audio" )];
-
- [fDstCodecsPopUp addItemWithTitle:_( @"AVC/H.264 Video / AAC Audio" )];
- [fDstCodecsPopUp addItemWithTitle:_( @"AVC/H.264 Video / AC-3 Audio" )];
- [fDstCodecsPopUp addItemWithTitle:_( @"AVC/H.264 Video / MP3 Audio" )];
- [fDstCodecsPopUp addItemWithTitle:_( @"AVC/H.264 Video / Vorbis Audio" )];
+ /* Add additional video encoders here */
+ menuItem = [[fVidEncoderPopUp menu] addItemWithTitle:@"H.264 (x264)" action: NULL keyEquivalent: @""];
+ [menuItem setTag: HB_VCODEC_X264];
+ menuItem = [[fVidEncoderPopUp menu] addItemWithTitle:@"VP3 (Theora)" action: NULL keyEquivalent: @""];
+ [menuItem setTag: HB_VCODEC_THEORA];
/* We enable the create chapters checkbox here */
[fCreateChapterMarkers setEnabled: YES];
break;
- case 2:
+ case 2:
ext = "avi";
- [fDstCodecsPopUp addItemWithTitle:_( @"MPEG-4 Video / MP3 Audio" )];
- [fDstCodecsPopUp addItemWithTitle:_( @"MPEG-4 Video / AC-3 Audio" )];
- [fDstCodecsPopUp addItemWithTitle:_( @"AVC/H.264 Video / MP3 Audio" )];
- [fDstCodecsPopUp addItemWithTitle:_( @"AVC/H.264 Video / AC-3 Audio" )];
- /* We disable the create chapters checkbox here and make sure it is unchecked*/
+ /* Add additional video encoders here */
+ menuItem = [[fVidEncoderPopUp menu] addItemWithTitle:@"H.264 (x264)" action: NULL keyEquivalent: @""];
+ [menuItem setTag: HB_VCODEC_X264];
+ /* We disable the create chapters checkbox here and make sure it is unchecked*/
[fCreateChapterMarkers setEnabled: NO];
[fCreateChapterMarkers setState: NSOffState];
break;
- case 3:
+ case 3:
ext = "ogm";
- [fDstCodecsPopUp addItemWithTitle:_( @"MPEG-4 Video / Vorbis Audio" )];
- [fDstCodecsPopUp addItemWithTitle:_( @"MPEG-4 Video / MP3 Audio" )];
+ /* Add additional video encoders here */
+ menuItem = [[fVidEncoderPopUp menu] addItemWithTitle:@"VP3 (Theora)" action: NULL keyEquivalent: @""];
+ [menuItem setTag: HB_VCODEC_THEORA];
/* We disable the create chapters checkbox here and make sure it is unchecked*/
[fCreateChapterMarkers setEnabled: NO];
[fCreateChapterMarkers setState: NSOffState];
break;
}
+ [fVidEncoderPopUp selectItemAtIndex: 0];
- if ( SuccessfulScan ) {
- [fDstCodecsPopUp selectItemWithTitle:selectedCodecs];
-
- /* Add/replace to the correct extension */
- if( [string characterAtIndex: [string length] - 4] == '.' )
+ [self audioAddAudioTrackCodecs: fAudTrack1CodecPopUp];
+ [self audioAddAudioTrackCodecs: fAudTrack2CodecPopUp];
+ [self audioAddAudioTrackCodecs: fAudTrack3CodecPopUp];
+ [self audioAddAudioTrackCodecs: fAudTrack4CodecPopUp];
+
+ /* FIX ME: we need to restore changing the file extension as pwer */
+
+ if( [string characterAtIndex: [string length] - 4] == '.' )
{
[fDstFile2Field setStringValue: [NSString stringWithFormat:
- @"%@.%s", [string substringToIndex: [string length] - 4],
- ext]];
+ @"%@.%s", [string substringToIndex: [string length] - 4],
+ ext]];
}
else
{
[fDstFile2Field setStringValue: [NSString stringWithFormat:
- @"%@.%s", string, ext]];
+ @"%@.%s", string, ext]];
}
- if ( [fDstCodecsPopUp selectedItem] == NULL )
+ if ( SuccessfulScan )
+ {
+ /* Add/replace to the correct extension */
+ [self audioTrackPopUpChanged: fAudLang1PopUp];
+ [self audioTrackPopUpChanged: fAudLang2PopUp];
+ [self audioTrackPopUpChanged: fAudLang3PopUp];
+ [self audioTrackPopUpChanged: fAudLang4PopUp];
+
+ if ( [fVidEncoderPopUp selectedItem] == NULL )
{
- [fDstCodecsPopUp selectItemAtIndex:0];
- [self codecsPopUpChanged: NULL];
+
+ [fVidEncoderPopUp selectItemAtIndex:0];
+ [self videoEncoderPopUpChanged: NULL];
/* changing the format may mean that we can / can't offer mono or 6ch, */
/* so call audioTrackPopUpChanged for both audio tracks to update the mixdown popups */
- [self audioTrackPopUpChanged: fAudLang1PopUp];
- [self audioTrackPopUpChanged: fAudLang2PopUp];
+
+
+
/* We call the method to properly enable/disable turbo 2 pass */
[self twoPassCheckboxChanged: sender];
/* We call method method to change UI to reflect whether a preset is used or not*/
}
}
+ /* Lets check to see if we want to auto set the .m4v extension for mp4 */
+ [self autoSetM4vExtension: sender];
[self customSettingUsed: sender];
}
-- (IBAction) codecsPopUpChanged: (id) sender
-{
- int format = [fDstFormatPopUp indexOfSelectedItem];
- int codecs = [fDstCodecsPopUp indexOfSelectedItem];
-
- [fAdvancedOptions setHidden:YES];
- /* Update the encoder popup*/
- if( ( FormatSettings[format][codecs] & HB_VCODEC_X264 ) )
- {
- /* MPEG-4 -> H.264 */
- [fVidEncoderPopUp removeAllItems];
- [fVidEncoderPopUp addItemWithTitle: @"x264"];
- [fVidEncoderPopUp selectItemAtIndex: 0];
- [fAdvancedOptions setHidden:NO];
- /* if MP4 format and [fDstCodecsPopUp indexOfSelectedItem] > 1 we know that the audio is going to be
+
+ /* if MP4 format and [fDstCodecsPopUp indexOfSelectedItem] > 1 we know that the audio is going to be
* either aac + ac3 passthru, or just ac3 passthru so we need to make sure the output file extension is m4v
* otherwise Quicktime will not play it at all */
+- (IBAction) autoSetM4vExtension: (id) sender
+{
+ /*FIX ME: for this to work, we will now have to iterate through the audio list to see if ac3 in an mp4 is chosen
+ * for now just comment it out.
+ */
+ /*
if ([fDstFormatPopUp indexOfSelectedItem] == 0 && [fDstCodecsPopUp indexOfSelectedItem] > 1)
{
NSString *newpath = [[[fDstFile2Field stringValue] stringByDeletingPathExtension] stringByAppendingPathExtension: @"m4v"];
[fDstFile2Field setStringValue: [NSString stringWithFormat:
@"%@", newpath]];
}
- }
-
- else if( ( FormatSettings[format][codecs] & HB_VCODEC_FFMPEG ) )
- {
- /* H.264 -> MPEG-4 */
- [fVidEncoderPopUp removeAllItems];
- [fVidEncoderPopUp addItemWithTitle: @"FFmpeg"];
- [fVidEncoderPopUp addItemWithTitle: @"XviD"];
- [fVidEncoderPopUp selectItemAtIndex: 0];
-
- }
-
- if( FormatSettings[format][codecs] & HB_ACODEC_AC3 )
- {
- /* AC-3 pass-through: disable samplerate and bitrate */
- [fAudRatePopUp setEnabled: NO];
- [fAudBitratePopUp setEnabled: NO];
- }
- else
- {
- [fAudRatePopUp setEnabled: YES];
- [fAudBitratePopUp setEnabled: YES];
- }
- /* changing the codecs on offer may mean that we can / can't offer mono or 6ch, */
- /* so call audioTrackPopUpChanged for both audio tracks to update the mixdown popups */
- [self audioTrackPopUpChanged: fAudLang1PopUp];
- [self audioTrackPopUpChanged: fAudLang2PopUp];
- [self encoderPopUpChanged: sender];
+ */
+}
+/* Method to determine if we should change the UI
+To reflect whether or not a Preset is being used or if
+the user is using "Custom" settings by determining the sender*/
+- (IBAction) customSettingUsed: (id) sender
+{
+ if ([sender stringValue] != NULL)
+ {
+ /* Deselect the currently selected Preset if there is one*/
+ [fPresetsOutlineView deselectRow:[fPresetsOutlineView selectedRow]];
+ [[fPresetsActionMenu itemAtIndex:0] setEnabled: NO];
+ /* Change UI to show "Custom" settings are being used */
+ [fPresetSelectedDisplay setStringValue: @"Custom"];
+
+ curUserPresetChosenNum = nil;
+ }
}
-- (IBAction) encoderPopUpChanged: (id) sender
+
+#pragma mark -
+#pragma mark - Video
+
+- (IBAction) videoEncoderPopUpChanged: (id) sender
{
hb_job_t * job = fTitle->job;
+ int videoEncoder = [[fVidEncoderPopUp selectedItem] tag];
+
+ [fAdvancedOptions setHidden:YES];
+ /* If we are using x264 then show the x264 advanced panel*/
+ if (videoEncoder == HB_VCODEC_X264)
+ {
+ [fAdvancedOptions setHidden:NO];
+ [self autoSetM4vExtension: sender];
+ }
/* We need to set loose anamorphic as available depending on whether or not the ffmpeg encoder
is being used as it borks up loose anamorphic .
For convenience lets use the titleOfSelected index. Probably should revisit whether or not we want
to use the index itself but this is easier */
- if ([fVidEncoderPopUp titleOfSelectedItem] == @"FFmpeg")
+ if (videoEncoder == HB_VCODEC_FFMPEG)
{
if (job->pixel_ratio == 2)
{
[self twoPassCheckboxChanged: sender];
}
-/* Method to determine if we should change the UI
-To reflect whether or not a Preset is being used or if
-the user is using "Custom" settings by determining the sender*/
-- (IBAction) customSettingUsed: (id) sender
-{
- if ([sender stringValue] != NULL)
- {
- /* Deselect the currently selected Preset if there is one*/
- [fPresetsOutlineView deselectRow:[fPresetsOutlineView selectedRow]];
- [[fPresetsActionMenu itemAtIndex:0] setEnabled: NO];
- /* Change UI to show "Custom" settings are being used */
- [fPresetSelectedDisplay setStringValue: @"Custom"];
-
- curUserPresetChosenNum = nil;
- }
-
-}
-
-
-#pragma mark -
-#pragma mark - Video
- (IBAction) twoPassCheckboxChanged: (id) sender
{
/* check to see if x264 is chosen */
- int format = [fDstFormatPopUp indexOfSelectedItem];
- int codecs = [fDstCodecsPopUp indexOfSelectedItem];
- if( ( FormatSettings[format][codecs] & HB_VCODEC_X264 ) )
+ if([[fVidEncoderPopUp selectedItem] tag] == HB_VCODEC_X264)
{
if( [fVidTwoPassCheck state] == NSOnState)
{
- (IBAction) qualitySliderChanged: (id) sender
{
[fVidConstantCell setTitle: [NSString stringWithFormat:
- _( @"Constant quality: %.0f %%" ), 100.0 *
+ NSLocalizedString( @"Constant quality: %.0f %%", @"" ), 100.0 *
[fVidQualitySlider floatValue]]];
[self customSettingUsed: sender];
}
{
[fPicSettingARkeep setStringValue: @"Off"];
}
+
/* Detelecine */
if ([fPictureController detelecine]) {
[fPicSettingDetelecine setStringValue: @"Yes"];
[fPicSettingDetelecine setStringValue: @"No"];
}
+ /* Decomb */
+ if ([fPictureController decomb] == 0)
+ {
+ [fPicSettingDecomb setStringValue: @"Off"];
+ }
+ else if ([fPictureController decomb] == 1)
+ {
+ [fPicSettingDecomb setStringValue: @"4:10:15:9:10:35:9"];
+ }
+ else if ([fPictureController decomb] == 2)
+ {
+ [fPicSettingDecomb setStringValue: [[NSUserDefaults standardUserDefaults] valueForKey:@"DecombCustomString"]];
+ ///[[NSUserDefaults standardUserDefaults] valueForKey:@"DecombCustomString"]
+ }
+
/* VFR (Variable Frame Rate) */
if ([fPictureController vfr]) {
/* We change the string of the fps popup to warn that vfr is on Framerate (FPS): */
- [fVidRateField setStringValue: @"Framerate (VFR On):"];
+ [fVidRateField setStringValue: @"Framerate (VFR On):"];
+ /* for VFR we select same as source (or title framerate) and disable the popup.
+ * We know its index 0 as that is determined in titlePopUpChanged */
+ [fVidRatePopUp selectItemAtIndex: 0];
+ [fVidRatePopUp setEnabled: NO];
}
else {
/* make sure the label for framerate is set to its default */
[fVidRateField setStringValue: @"Framerate (FPS):"];
+ [fVidRatePopUp setEnabled: YES];
}
/* Deinterlace */
{
[fPicSettingDeinterlace setStringValue: @"Slower"];
}
- /* Denoise */
+
+ /* Denoise */
if ([fPictureController denoise] == 0)
{
[fPicSettingDenoise setStringValue: @"Off"];
{
[fPicSettingPAR setStringValue: @"Off"];
}
- /* Set the display field for crop as per boolean */
+
+ /* Set the display field for crop as per boolean */
if (![fPictureController autoCrop])
{
[fPicSettingAutoCrop setStringValue: @"Custom"];
#pragma mark -
#pragma mark - Audio and Subtitles
-
-- (IBAction) setEnabledStateOfAudioMixdownControls: (id) sender
+- (IBAction) audioCodecsPopUpChanged: (id) sender
{
-
- /* enable/disable the mixdown text and popupbutton for audio track 1 */
- [fAudTrack1MixPopUp setEnabled: ([fAudLang1PopUp indexOfSelectedItem] == 0) ? NO : YES];
- [fAudTrack1MixLabel setTextColor: ([fAudLang1PopUp indexOfSelectedItem] == 0) ?
- [NSColor disabledControlTextColor] : [NSColor controlTextColor]];
-
- /* enable/disable the mixdown text and popupbutton for audio track 2 */
- [fAudTrack2MixPopUp setEnabled: ([fAudLang2PopUp indexOfSelectedItem] == 0) ? NO : YES];
- [fAudTrack2MixLabel setTextColor: ([fAudLang2PopUp indexOfSelectedItem] == 0) ?
- [NSColor disabledControlTextColor] : [NSColor controlTextColor]];
-
-}
-
+
+ NSPopUpButton * audiotrackPopUp;
+ NSPopUpButton * sampleratePopUp;
+ NSPopUpButton * bitratePopUp;
+ NSPopUpButton * audiocodecPopUp;
+ if (sender == fAudTrack1CodecPopUp)
+ {
+ audiotrackPopUp = fAudLang1PopUp;
+ audiocodecPopUp = fAudTrack1CodecPopUp;
+ sampleratePopUp = fAudTrack1RatePopUp;
+ bitratePopUp = fAudTrack1BitratePopUp;
+ }
+ else if (sender == fAudTrack2CodecPopUp)
+ {
+ audiotrackPopUp = fAudLang2PopUp;
+ audiocodecPopUp = fAudTrack2CodecPopUp;
+ sampleratePopUp = fAudTrack2RatePopUp;
+ bitratePopUp = fAudTrack2BitratePopUp;
+ }
+ else if (sender == fAudTrack3CodecPopUp)
+ {
+ audiotrackPopUp = fAudLang3PopUp;
+ audiocodecPopUp = fAudTrack3CodecPopUp;
+ sampleratePopUp = fAudTrack3RatePopUp;
+ bitratePopUp = fAudTrack3BitratePopUp;
+ }
+ else
+ {
+ audiotrackPopUp = fAudLang4PopUp;
+ audiocodecPopUp = fAudTrack4CodecPopUp;
+ sampleratePopUp = fAudTrack4RatePopUp;
+ bitratePopUp = fAudTrack4BitratePopUp;
+ }
+
+ /* changing the codecs on offer may mean that we can / can't offer mono or 6ch, */
+ /* so call audioTrackPopUpChanged for both audio tracks to update the mixdown popups */
+ [self audioTrackPopUpChanged: audiotrackPopUp];
+
+}
+
+- (IBAction) setEnabledStateOfAudioMixdownControls: (id) sender
+{
+ /* We will be setting the enabled/disabled state of each tracks audio controls based on
+ * the settings of the source audio for that track. We leave the samplerate and bitrate
+ * to audiotrackMixdownChanged
+ */
+
+ /* We will first verify that a lower track number has been selected before enabling each track
+ * for example, make sure a track is selected for track 1 before enabling track 2, etc.
+ */
+ if ([fAudLang1PopUp indexOfSelectedItem] == 0)
+ {
+ [fAudLang2PopUp setEnabled: NO];
+ [fAudLang2PopUp selectItemAtIndex: 0];
+ }
+ else
+ {
+ [fAudLang2PopUp setEnabled: YES];
+ }
+
+ if ([fAudLang2PopUp indexOfSelectedItem] == 0)
+ {
+ [fAudLang3PopUp setEnabled: NO];
+ [fAudLang3PopUp selectItemAtIndex: 0];
+ }
+ else
+ {
+ [fAudLang3PopUp setEnabled: YES];
+ }
+ if ([fAudLang3PopUp indexOfSelectedItem] == 0)
+ {
+ [fAudLang4PopUp setEnabled: NO];
+ [fAudLang4PopUp selectItemAtIndex: 0];
+ }
+ else
+ {
+ [fAudLang4PopUp setEnabled: YES];
+ }
+ /* enable/disable the mixdown text and popupbutton for audio track 1 */
+ [fAudTrack1CodecPopUp setEnabled: ([fAudLang1PopUp indexOfSelectedItem] == 0) ? NO : YES];
+ [fAudTrack1MixPopUp setEnabled: ([fAudLang1PopUp indexOfSelectedItem] == 0) ? NO : YES];
+ [fAudTrack1RatePopUp setEnabled: ([fAudLang1PopUp indexOfSelectedItem] == 0) ? NO : YES];
+ [fAudTrack1BitratePopUp setEnabled: ([fAudLang1PopUp indexOfSelectedItem] == 0) ? NO : YES];
+ [fAudTrack1DrcSlider setEnabled: ([fAudLang1PopUp indexOfSelectedItem] == 0) ? NO : YES];
+ [fAudTrack1DrcField setEnabled: ([fAudLang1PopUp indexOfSelectedItem] == 0) ? NO : YES];
+ if ([fAudLang1PopUp indexOfSelectedItem] == 0)
+ {
+ [fAudTrack1CodecPopUp removeAllItems];
+ [fAudTrack1MixPopUp removeAllItems];
+ [fAudTrack1RatePopUp removeAllItems];
+ [fAudTrack1BitratePopUp removeAllItems];
+ [fAudTrack1DrcSlider setFloatValue: 1.00];
+ [self audioDRCSliderChanged: fAudTrack1DrcSlider];
+ }
+ else if ([[fAudTrack1MixPopUp selectedItem] tag] == HB_ACODEC_AC3)
+ {
+ [fAudTrack1RatePopUp setEnabled: NO];
+ [fAudTrack1BitratePopUp setEnabled: NO];
+ [fAudTrack1DrcSlider setEnabled: NO];
+ [fAudTrack1DrcField setEnabled: NO];
+ }
+
+ /* enable/disable the mixdown text and popupbutton for audio track 2 */
+ [fAudTrack2CodecPopUp setEnabled: ([fAudLang2PopUp indexOfSelectedItem] == 0) ? NO : YES];
+ [fAudTrack2MixPopUp setEnabled: ([fAudLang2PopUp indexOfSelectedItem] == 0) ? NO : YES];
+ [fAudTrack2RatePopUp setEnabled: ([fAudLang2PopUp indexOfSelectedItem] == 0) ? NO : YES];
+ [fAudTrack2BitratePopUp setEnabled: ([fAudLang2PopUp indexOfSelectedItem] == 0) ? NO : YES];
+ [fAudTrack2DrcSlider setEnabled: ([fAudLang2PopUp indexOfSelectedItem] == 0) ? NO : YES];
+ [fAudTrack2DrcField setEnabled: ([fAudLang2PopUp indexOfSelectedItem] == 0) ? NO : YES];
+ if ([fAudLang2PopUp indexOfSelectedItem] == 0)
+ {
+ [fAudTrack2CodecPopUp removeAllItems];
+ [fAudTrack2MixPopUp removeAllItems];
+ [fAudTrack2RatePopUp removeAllItems];
+ [fAudTrack2BitratePopUp removeAllItems];
+ [fAudTrack2DrcSlider setFloatValue: 1.00];
+ [self audioDRCSliderChanged: fAudTrack2DrcSlider];
+ }
+ else if ([[fAudTrack2MixPopUp selectedItem] tag] == HB_ACODEC_AC3)
+ {
+ [fAudTrack2RatePopUp setEnabled: NO];
+ [fAudTrack2BitratePopUp setEnabled: NO];
+ [fAudTrack2DrcSlider setEnabled: NO];
+ [fAudTrack2DrcField setEnabled: NO];
+ }
+
+ /* enable/disable the mixdown text and popupbutton for audio track 3 */
+ [fAudTrack3CodecPopUp setEnabled: ([fAudLang3PopUp indexOfSelectedItem] == 0) ? NO : YES];
+ [fAudTrack3MixPopUp setEnabled: ([fAudLang3PopUp indexOfSelectedItem] == 0) ? NO : YES];
+ [fAudTrack3RatePopUp setEnabled: ([fAudLang3PopUp indexOfSelectedItem] == 0) ? NO : YES];
+ [fAudTrack3BitratePopUp setEnabled: ([fAudLang3PopUp indexOfSelectedItem] == 0) ? NO : YES];
+ [fAudTrack3DrcSlider setEnabled: ([fAudLang3PopUp indexOfSelectedItem] == 0) ? NO : YES];
+ [fAudTrack3DrcField setEnabled: ([fAudLang3PopUp indexOfSelectedItem] == 0) ? NO : YES];
+ if ([fAudLang3PopUp indexOfSelectedItem] == 0)
+ {
+ [fAudTrack3CodecPopUp removeAllItems];
+ [fAudTrack3MixPopUp removeAllItems];
+ [fAudTrack3RatePopUp removeAllItems];
+ [fAudTrack3BitratePopUp removeAllItems];
+ [fAudTrack3DrcSlider setFloatValue: 1.00];
+ [self audioDRCSliderChanged: fAudTrack3DrcSlider];
+ }
+ else if ([[fAudTrack3MixPopUp selectedItem] tag] == HB_ACODEC_AC3)
+ {
+ [fAudTrack3RatePopUp setEnabled: NO];
+ [fAudTrack3BitratePopUp setEnabled: NO];
+ [fAudTrack3DrcSlider setEnabled: NO];
+ [fAudTrack3DrcField setEnabled: NO];
+ }
+
+ /* enable/disable the mixdown text and popupbutton for audio track 4 */
+ [fAudTrack4CodecPopUp setEnabled: ([fAudLang4PopUp indexOfSelectedItem] == 0) ? NO : YES];
+ [fAudTrack4MixPopUp setEnabled: ([fAudLang4PopUp indexOfSelectedItem] == 0) ? NO : YES];
+ [fAudTrack4RatePopUp setEnabled: ([fAudLang4PopUp indexOfSelectedItem] == 0) ? NO : YES];
+ [fAudTrack4BitratePopUp setEnabled: ([fAudLang4PopUp indexOfSelectedItem] == 0) ? NO : YES];
+ [fAudTrack4DrcSlider setEnabled: ([fAudLang4PopUp indexOfSelectedItem] == 0) ? NO : YES];
+ [fAudTrack4DrcField setEnabled: ([fAudLang4PopUp indexOfSelectedItem] == 0) ? NO : YES];
+ if ([fAudLang4PopUp indexOfSelectedItem] == 0)
+ {
+ [fAudTrack4CodecPopUp removeAllItems];
+ [fAudTrack4MixPopUp removeAllItems];
+ [fAudTrack4RatePopUp removeAllItems];
+ [fAudTrack4BitratePopUp removeAllItems];
+ [fAudTrack4DrcSlider setFloatValue: 1.00];
+ [self audioDRCSliderChanged: fAudTrack4DrcSlider];
+ }
+ else if ([[fAudTrack4MixPopUp selectedItem] tag] == HB_ACODEC_AC3)
+ {
+ [fAudTrack4RatePopUp setEnabled: NO];
+ [fAudTrack4BitratePopUp setEnabled: NO];
+ [fAudTrack4DrcSlider setEnabled: NO];
+ [fAudTrack4DrcField setEnabled: NO];
+ }
+
+}
+
- (IBAction) addAllAudioTracksToPopUp: (id) sender
{
hb_title_t * title = (hb_title_t*)
hb_list_item( list, [fSrcTitlePopUp indexOfSelectedItem] );
- hb_audio_t * audio;
+ hb_audio_config_t * audio;
[sender removeAllItems];
- [sender addItemWithTitle: _( @"None" )];
+ [sender addItemWithTitle: NSLocalizedString( @"None", @"" )];
for( int i = 0; i < hb_list_count( title->list_audio ); i++ )
{
- audio = (hb_audio_t *) hb_list_item( title->list_audio, i );
+ audio = (hb_audio_config_t *) hb_list_audio_config_item( title->list_audio, i );
[[sender menu] addItemWithTitle:
- [NSString stringWithCString: audio->lang]
+ [NSString stringWithCString: audio->lang.description]
action: NULL keyEquivalent: @""];
}
[sender selectItemAtIndex: 0];
}
}
+- (IBAction) audioAddAudioTrackCodecs: (id)sender
+{
+ int format = [fDstFormatPopUp indexOfSelectedItem];
+
+ /* setup pointers to the appropriate popups for the correct track */
+ NSPopUpButton * audiocodecPopUp;
+ NSPopUpButton * audiotrackPopUp;
+ if (sender == fAudTrack1CodecPopUp)
+ {
+ audiotrackPopUp = fAudLang1PopUp;
+ audiocodecPopUp = fAudTrack1CodecPopUp;
+ }
+ else if (sender == fAudTrack2CodecPopUp)
+ {
+ audiotrackPopUp = fAudLang2PopUp;
+ audiocodecPopUp = fAudTrack2CodecPopUp;
+ }
+ else if (sender == fAudTrack3CodecPopUp)
+ {
+ audiotrackPopUp = fAudLang3PopUp;
+ audiocodecPopUp = fAudTrack3CodecPopUp;
+ }
+ else
+ {
+ audiotrackPopUp = fAudLang4PopUp;
+ audiocodecPopUp = fAudTrack4CodecPopUp;
+ }
+
+ [audiocodecPopUp removeAllItems];
+ /* Make sure "None" isnt selected in the source track */
+ if ([audiotrackPopUp indexOfSelectedItem] > 0)
+ {
+ [audiocodecPopUp setEnabled:YES];
+ NSMenuItem *menuItem;
+ /* We setup our appropriate popups for codecs and put the int value in the popup tag for easy retrieval */
+ switch( format )
+ {
+ case 0:
+ /* MP4 */
+ // AAC
+ menuItem = [[audiocodecPopUp menu] addItemWithTitle:@"AAC (faac)" action: NULL keyEquivalent: @""];
+ [menuItem setTag: HB_ACODEC_FAAC];
+
+ // AC3 Passthru
+ menuItem = [[audiocodecPopUp menu] addItemWithTitle:@"AC3 Passthru" action: NULL keyEquivalent: @""];
+ [menuItem setTag: HB_ACODEC_AC3];
+ break;
+
+ case 1:
+ /* MKV */
+ // AAC
+ menuItem = [[audiocodecPopUp menu] addItemWithTitle:@"AAC (faac)" action: NULL keyEquivalent: @""];
+ [menuItem setTag: HB_ACODEC_FAAC];
+ // AC3 Passthru
+ menuItem = [[audiocodecPopUp menu] addItemWithTitle:@"AC3 Passthru" action: NULL keyEquivalent: @""];
+ [menuItem setTag: HB_ACODEC_AC3];
+ // MP3
+ menuItem = [[audiocodecPopUp menu] addItemWithTitle:@"MP3 (lame)" action: NULL keyEquivalent: @""];
+ [menuItem setTag: HB_ACODEC_LAME];
+ // Vorbis
+ menuItem = [[audiocodecPopUp menu] addItemWithTitle:@"Vorbis (vorbis)" action: NULL keyEquivalent: @""];
+ [menuItem setTag: HB_ACODEC_VORBIS];
+ break;
+
+ case 2:
+ /* AVI */
+ // MP3
+ menuItem = [[audiocodecPopUp menu] addItemWithTitle:@"MP3 (lame)" action: NULL keyEquivalent: @""];
+ [menuItem setTag: HB_ACODEC_LAME];
+ // AC3 Passthru
+ menuItem = [[audiocodecPopUp menu] addItemWithTitle:@"AC3 Passthru" action: NULL keyEquivalent: @""];
+ [menuItem setTag: HB_ACODEC_AC3];
+ break;
+
+ case 3:
+ /* OGM */
+ // Vorbis
+ menuItem = [[audiocodecPopUp menu] addItemWithTitle:@"Vorbis (vorbis)" action: NULL keyEquivalent: @""];
+ [menuItem setTag: HB_ACODEC_VORBIS];
+ // MP3
+ menuItem = [[audiocodecPopUp menu] addItemWithTitle:@"MP3 (lame)" action: NULL keyEquivalent: @""];
+ [menuItem setTag: HB_ACODEC_LAME];
+ break;
+ }
+ [audiocodecPopUp selectItemAtIndex:0];
+ }
+ else
+ {
+ [audiocodecPopUp setEnabled:NO];
+ }
+}
- (IBAction) audioTrackPopUpChanged: (id) sender
{
- (IBAction) audioTrackPopUpChanged: (id) sender mixdownToUse: (int) mixdownToUse
{
-
+
/* make sure we have a selected title before continuing */
if (fTitle == NULL) return;
-
- /* find out if audio track 1 or 2 was changed - this is passed to us in the tag of the sender */
- /* the sender will have been either fAudLang1PopUp (tag = 0) or fAudLang2PopUp (tag = 1) */
- int thisAudio = [sender tag];
-
- /* get the index of the selected audio */
- int thisAudioIndex = [sender indexOfSelectedItem] - 1;
-
-#if 0
- /* Handbrake can't currently cope with ripping the same source track twice */
- /* So, if this audio is also selected in the other audio track popup, set that popup's selection to "none" */
- /* get a reference to the two audio track popups */
- NSPopUpButton * thisAudioPopUp = (thisAudio == 1 ? fAudLang2PopUp : fAudLang1PopUp);
- NSPopUpButton * otherAudioPopUp = (thisAudio == 1 ? fAudLang1PopUp : fAudLang2PopUp);
- /* if the same track is selected in the other audio popup, then select "none" in that popup */
- /* unless, of course, both are selected as "none!" */
- if ([thisAudioPopUp indexOfSelectedItem] != 0 && [thisAudioPopUp indexOfSelectedItem] == [otherAudioPopUp indexOfSelectedItem]) {
- [otherAudioPopUp selectItemAtIndex: 0];
- [self audioTrackPopUpChanged: otherAudioPopUp];
+ /* if the sender is the lanaguage popup and there is nothing in the codec popup, lets call
+ * audioAddAudioTrackCodecs on the codec popup to populate it properly before moving on
+ */
+ if (sender == fAudLang1PopUp && [[fAudTrack1CodecPopUp menu] numberOfItems] == 0)
+ {
+ [self audioAddAudioTrackCodecs: fAudTrack1CodecPopUp];
+ }
+ if (sender == fAudLang2PopUp && [[fAudTrack2CodecPopUp menu] numberOfItems] == 0)
+ {
+ [self audioAddAudioTrackCodecs: fAudTrack2CodecPopUp];
+ }
+ if (sender == fAudLang3PopUp && [[fAudTrack3CodecPopUp menu] numberOfItems] == 0)
+ {
+ [self audioAddAudioTrackCodecs: fAudTrack3CodecPopUp];
+ }
+ if (sender == fAudLang4PopUp && [[fAudTrack4CodecPopUp menu] numberOfItems] == 0)
+ {
+ [self audioAddAudioTrackCodecs: fAudTrack4CodecPopUp];
}
-#endif
-
- /* pointer for the hb_audio_s struct we will use later on */
- hb_audio_t * audio;
-
- /* find out what the currently-selected output audio codec is */
- int format = [fDstFormatPopUp indexOfSelectedItem];
- int codecs = [fDstCodecsPopUp indexOfSelectedItem];
- int acodec = FormatSettings[format][codecs] & HB_ACODEC_MASK;
- /*HACK: Lets setup a convenience variable to decide whether or not to allow aac hybrid (aac + ac3 passthru )*/
- bool mp4AacAc3;
- if (format == 0 && codecs == 2) // if mp4 and aac + ac3
+ /* Now lets make the sender the appropriate Audio Track popup from this point on */
+ if (sender == fAudTrack1CodecPopUp || sender == fAudTrack1MixPopUp)
{
- mp4AacAc3 = 1;
+ sender = fAudLang1PopUp;
}
- else
+ if (sender == fAudTrack2CodecPopUp || sender == fAudTrack2MixPopUp)
{
- mp4AacAc3 = 0;
+ sender = fAudLang2PopUp;
}
-
- /* pointer to this track's mixdown NSPopUpButton */
- NSTextField * mixdownTextField;
+ if (sender == fAudTrack3CodecPopUp || sender == fAudTrack3MixPopUp)
+ {
+ sender = fAudLang3PopUp;
+ }
+ if (sender == fAudTrack4CodecPopUp || sender == fAudTrack4MixPopUp)
+ {
+ sender = fAudLang4PopUp;
+ }
+
+ /* pointer to this track's mixdown, codec, sample rate and bitrate NSPopUpButton's */
NSPopUpButton * mixdownPopUp;
-
- /* find our mixdown NSTextField and NSPopUpButton */
- if (thisAudio == 0)
+ NSPopUpButton * audiocodecPopUp;
+ NSPopUpButton * sampleratePopUp;
+ NSPopUpButton * bitratePopUp;
+ if (sender == fAudLang1PopUp)
{
- mixdownTextField = fAudTrack1MixLabel;
mixdownPopUp = fAudTrack1MixPopUp;
+ audiocodecPopUp = fAudTrack1CodecPopUp;
+ sampleratePopUp = fAudTrack1RatePopUp;
+ bitratePopUp = fAudTrack1BitratePopUp;
}
- else
+ else if (sender == fAudLang2PopUp)
{
- mixdownTextField = fAudTrack2MixLabel;
mixdownPopUp = fAudTrack2MixPopUp;
+ audiocodecPopUp = fAudTrack2CodecPopUp;
+ sampleratePopUp = fAudTrack2RatePopUp;
+ bitratePopUp = fAudTrack2BitratePopUp;
}
-
- /* delete the previous audio mixdown options */
- [mixdownPopUp removeAllItems];
-
+ else if (sender == fAudLang3PopUp)
+ {
+ mixdownPopUp = fAudTrack3MixPopUp;
+ audiocodecPopUp = fAudTrack3CodecPopUp;
+ sampleratePopUp = fAudTrack3RatePopUp;
+ bitratePopUp = fAudTrack3BitratePopUp;
+ }
+ else
+ {
+ mixdownPopUp = fAudTrack4MixPopUp;
+ audiocodecPopUp = fAudTrack4CodecPopUp;
+ sampleratePopUp = fAudTrack4RatePopUp;
+ bitratePopUp = fAudTrack4BitratePopUp;
+ }
+
+ /* get the index of the selected audio Track*/
+ int thisAudioIndex = [sender indexOfSelectedItem] - 1;
+
+ /* pointer for the hb_audio_s struct we will use later on */
+ hb_audio_config_t * audio;
+
+ int acodec;
/* check if the audio mixdown controls need their enabled state changing */
[self setEnabledStateOfAudioMixdownControls: NULL];
-
+
if (thisAudioIndex != -1)
{
-
+
/* get the audio */
- audio = (hb_audio_t *) hb_list_item( fTitle->list_audio, thisAudioIndex );
+ audio = (hb_audio_config_t *) hb_list_audio_config_item( fTitle->list_audio, thisAudioIndex );// Should "fTitle" be title and be setup ?
+
+ /* actually manipulate the proper mixdowns here */
+ /* delete the previous audio mixdown options */
+ [mixdownPopUp removeAllItems];
+
+ acodec = [[audiocodecPopUp selectedItem] tag];
+
if (audio != NULL)
{
-
+
/* find out if our selected output audio codec supports mono and / or 6ch */
/* we also check for an input codec of AC3 or DCA,
- as they are the only libraries able to do the mixdown to mono / conversion to 6-ch */
+ as they are the only libraries able to do the mixdown to mono / conversion to 6-ch */
/* audioCodecsSupportMono and audioCodecsSupport6Ch are the same for now,
- but this may change in the future, so they are separated for flexibility */
- int audioCodecsSupportMono = ((audio->codec == HB_ACODEC_AC3 ||
- audio->codec == HB_ACODEC_DCA) && acodec == HB_ACODEC_FAAC);
- int audioCodecsSupport6Ch = ((audio->codec == HB_ACODEC_AC3 ||
- audio->codec == HB_ACODEC_DCA) && (acodec == HB_ACODEC_FAAC ||
- acodec == HB_ACODEC_VORBIS));
-
+ but this may change in the future, so they are separated for flexibility */
+ int audioCodecsSupportMono =
+ (audio->in.codec & (HB_ACODEC_AC3|HB_ACODEC_DCA)) &&
+ (acodec != HB_ACODEC_LAME);
+ int audioCodecsSupport6Ch =
+ (audio->in.codec & (HB_ACODEC_AC3|HB_ACODEC_DCA)) &&
+ (acodec != HB_ACODEC_LAME);
+
/* check for AC-3 passthru */
- if (audio->codec == HB_ACODEC_AC3 && acodec == HB_ACODEC_AC3)
+ if (audio->in.codec == HB_ACODEC_AC3 && acodec == HB_ACODEC_AC3)
{
-
- [[mixdownPopUp menu] addItemWithTitle:
- [NSString stringWithCString: "AC3 Passthru"]
- action: NULL keyEquivalent: @""];
+
+ NSMenuItem *menuItem = [[mixdownPopUp menu] addItemWithTitle:
+ [NSString stringWithCString: "AC3 Passthru"]
+ action: NULL keyEquivalent: @""];
+ [menuItem setTag: HB_ACODEC_AC3];
}
else
{
-
+
/* add the appropriate audio mixdown menuitems to the popupbutton */
/* in each case, we set the new menuitem's tag to be the amixdown value for that mixdown,
- so that we can reference the mixdown later */
-
+ so that we can reference the mixdown later */
+
/* keep a track of the min and max mixdowns we used, so we can select the best match later */
int minMixdownUsed = 0;
int maxMixdownUsed = 0;
/* get the input channel layout without any lfe channels */
- int layout = audio->input_channel_layout & HB_INPUT_CH_LAYOUT_DISCRETE_NO_LFE_MASK;
-
+ int layout = audio->in.channel_layout & HB_INPUT_CH_LAYOUT_DISCRETE_NO_LFE_MASK;
+
/* do we want to add a mono option? */
- if (!mp4AacAc3 && audioCodecsSupportMono == 1) {
+ if (audioCodecsSupportMono == 1)
+ {
NSMenuItem *menuItem = [[mixdownPopUp menu] addItemWithTitle:
- [NSString stringWithCString: hb_audio_mixdowns[0].human_readable_name]
- action: NULL keyEquivalent: @""];
+ [NSString stringWithCString: hb_audio_mixdowns[0].human_readable_name]
+ action: NULL keyEquivalent: @""];
[menuItem setTag: hb_audio_mixdowns[0].amixdown];
if (minMixdownUsed == 0) minMixdownUsed = hb_audio_mixdowns[0].amixdown;
maxMixdownUsed = MAX(maxMixdownUsed, hb_audio_mixdowns[0].amixdown);
}
-
+
/* do we want to add a stereo option? */
/* offer stereo if we have a mono source and non-mono-supporting codecs, as otherwise we won't have a mixdown at all */
/* also offer stereo if we have a stereo-or-better source */
- if (((!mp4AacAc3 || audio->codec == HB_ACODEC_MPGA || audio->codec == HB_ACODEC_LPCM || audio->codec == HB_ACODEC_DCA) && ((layout == HB_INPUT_CH_LAYOUT_MONO && audioCodecsSupportMono == 0) || layout >= HB_INPUT_CH_LAYOUT_STEREO))) {
+ if ((layout == HB_INPUT_CH_LAYOUT_MONO && audioCodecsSupportMono == 0) || layout >= HB_INPUT_CH_LAYOUT_STEREO)
+ {
NSMenuItem *menuItem = [[mixdownPopUp menu] addItemWithTitle:
- [NSString stringWithCString: hb_audio_mixdowns[1].human_readable_name]
- action: NULL keyEquivalent: @""];
+ [NSString stringWithCString: hb_audio_mixdowns[1].human_readable_name]
+ action: NULL keyEquivalent: @""];
[menuItem setTag: hb_audio_mixdowns[1].amixdown];
if (minMixdownUsed == 0) minMixdownUsed = hb_audio_mixdowns[1].amixdown;
maxMixdownUsed = MAX(maxMixdownUsed, hb_audio_mixdowns[1].amixdown);
}
-
+
/* do we want to add a dolby surround (DPL1) option? */
- if (!mp4AacAc3 && (layout == HB_INPUT_CH_LAYOUT_3F1R || layout == HB_INPUT_CH_LAYOUT_3F2R || layout == HB_INPUT_CH_LAYOUT_DOLBY)) {
+ if (layout == HB_INPUT_CH_LAYOUT_3F1R || layout == HB_INPUT_CH_LAYOUT_3F2R || layout == HB_INPUT_CH_LAYOUT_DOLBY)
+ {
NSMenuItem *menuItem = [[mixdownPopUp menu] addItemWithTitle:
- [NSString stringWithCString: hb_audio_mixdowns[2].human_readable_name]
- action: NULL keyEquivalent: @""];
+ [NSString stringWithCString: hb_audio_mixdowns[2].human_readable_name]
+ action: NULL keyEquivalent: @""];
[menuItem setTag: hb_audio_mixdowns[2].amixdown];
if (minMixdownUsed == 0) minMixdownUsed = hb_audio_mixdowns[2].amixdown;
maxMixdownUsed = MAX(maxMixdownUsed, hb_audio_mixdowns[2].amixdown);
}
-
+
/* do we want to add a dolby pro logic 2 (DPL2) option? */
- if ((!mp4AacAc3 || audio->codec == HB_ACODEC_DCA) && layout == HB_INPUT_CH_LAYOUT_3F2R) {
+ if (layout == HB_INPUT_CH_LAYOUT_3F2R)
+ {
NSMenuItem *menuItem = [[mixdownPopUp menu] addItemWithTitle:
- [NSString stringWithCString: hb_audio_mixdowns[3].human_readable_name]
- action: NULL keyEquivalent: @""];
+ [NSString stringWithCString: hb_audio_mixdowns[3].human_readable_name]
+ action: NULL keyEquivalent: @""];
[menuItem setTag: hb_audio_mixdowns[3].amixdown];
if (minMixdownUsed == 0) minMixdownUsed = hb_audio_mixdowns[3].amixdown;
maxMixdownUsed = MAX(maxMixdownUsed, hb_audio_mixdowns[3].amixdown);
}
-
+
/* do we want to add a 6-channel discrete option? */
- if (!mp4AacAc3 && (audioCodecsSupport6Ch == 1 && layout == HB_INPUT_CH_LAYOUT_3F2R && (audio->input_channel_layout & HB_INPUT_CH_LAYOUT_HAS_LFE))) {
+ if (audioCodecsSupport6Ch == 1 && layout == HB_INPUT_CH_LAYOUT_3F2R && (audio->in.channel_layout & HB_INPUT_CH_LAYOUT_HAS_LFE))
+ {
NSMenuItem *menuItem = [[mixdownPopUp menu] addItemWithTitle:
- [NSString stringWithCString: hb_audio_mixdowns[4].human_readable_name]
- action: NULL keyEquivalent: @""];
+ [NSString stringWithCString: hb_audio_mixdowns[4].human_readable_name]
+ action: NULL keyEquivalent: @""];
[menuItem setTag: hb_audio_mixdowns[4].amixdown];
if (minMixdownUsed == 0) minMixdownUsed = hb_audio_mixdowns[4].amixdown;
maxMixdownUsed = MAX(maxMixdownUsed, hb_audio_mixdowns[4].amixdown);
}
-
+
/* do we want to add an AC-3 passthrough option? */
- if (audio->codec == HB_ACODEC_AC3 && acodec == HB_ACODEC_AC3) {
+ if (audio->in.codec == HB_ACODEC_AC3 && acodec == HB_ACODEC_AC3)
+ {
NSMenuItem *menuItem = [[mixdownPopUp menu] addItemWithTitle:
- [NSString stringWithCString: hb_audio_mixdowns[5].human_readable_name]
- action: NULL keyEquivalent: @""];
- [menuItem setTag: hb_audio_mixdowns[5].amixdown];
+ [NSString stringWithCString: hb_audio_mixdowns[5].human_readable_name]
+ action: NULL keyEquivalent: @""];
+ [menuItem setTag: HB_ACODEC_AC3];
if (minMixdownUsed == 0) minMixdownUsed = hb_audio_mixdowns[5].amixdown;
maxMixdownUsed = MAX(maxMixdownUsed, hb_audio_mixdowns[5].amixdown);
}
-
- /* do we want to add the DPLII+AC3 passthrough option? */
- if (mp4AacAc3 && audio->codec == HB_ACODEC_AC3) {
- NSMenuItem *menuItem = [[mixdownPopUp menu] addItemWithTitle:
- [NSString stringWithCString: hb_audio_mixdowns[6].human_readable_name]
- action: NULL keyEquivalent: @""];
- [menuItem setTag: hb_audio_mixdowns[6].amixdown];
- if (minMixdownUsed == 0) minMixdownUsed = hb_audio_mixdowns[6].amixdown;
- maxMixdownUsed = MAX(maxMixdownUsed, hb_audio_mixdowns[6].amixdown);
- }
+
/* auto-select the best mixdown based on our saved mixdown preference */
/* for now, this is hard-coded to a "best" mixdown of HB_AMIXDOWN_DOLBYPLII */
}
/* if useMixdown > maxMixdownUsed, then use maxMixdownUsed */
- if (useMixdown > maxMixdownUsed) useMixdown = maxMixdownUsed;
-
+ if (useMixdown > maxMixdownUsed)
+ {
+ useMixdown = maxMixdownUsed;
+ }
+
/* if useMixdown < minMixdownUsed, then use minMixdownUsed */
- if (useMixdown < minMixdownUsed) useMixdown = minMixdownUsed;
-
+ if (useMixdown < minMixdownUsed)
+ {
+ useMixdown = minMixdownUsed;
+ }
+
/* select the (possibly-amended) preferred mixdown */
[mixdownPopUp selectItemWithTag: useMixdown];
-
- /* lets call the audioTrackMixdownChanged method here to determine appropriate bitrates, etc. */
- [self audioTrackMixdownChanged: NULL];
- }
+ }
+ /* In the case of a source track that is not AC3 and the user tries to use AC3 Passthru (which does not work)
+ * we force the Audio Codec choice back to a workable codec. We use MP3 for avi and aac for all
+ * other containers.
+ */
+ if (audio->in.codec != HB_ACODEC_AC3 && [[audiocodecPopUp selectedItem] tag] == HB_ACODEC_AC3)
+ {
+ /* If we are using the avi container, we select MP3 as there is no aac available*/
+ if ([[fDstFormatPopUp selectedItem] tag] == HB_MUX_AVI)
+ {
+ [audiocodecPopUp selectItemWithTag: HB_ACODEC_LAME];
+ }
+ else
+ {
+ [audiocodecPopUp selectItemWithTag: HB_ACODEC_FAAC];
+ }
+ }
+ /* Setup our samplerate and bitrate popups we will need based on mixdown */
+ [self audioTrackMixdownChanged: mixdownPopUp];
}
-
+
}
- /* see if the new audio track choice will change the bitrate we need */
- [self calculateBitrate: sender];
-
}
- (IBAction) audioTrackMixdownChanged: (id) sender
{
-
- /* find out what the currently-selected output audio codec is */
- int format = [fDstFormatPopUp indexOfSelectedItem];
- int codecs = [fDstCodecsPopUp indexOfSelectedItem];
- int acodec = FormatSettings[format][codecs] & HB_ACODEC_MASK;
+ int acodec;
+ /* setup pointers to all of the other audio track controls
+ * we will need later
+ */
+ NSPopUpButton * mixdownPopUp;
+ NSPopUpButton * sampleratePopUp;
+ NSPopUpButton * bitratePopUp;
+ NSPopUpButton * audiocodecPopUp;
+ NSPopUpButton * audiotrackPopUp;
+ NSSlider * drcSlider;
+ NSTextField * drcField;
+ if (sender == fAudTrack1MixPopUp)
+ {
+ audiotrackPopUp = fAudLang1PopUp;
+ audiocodecPopUp = fAudTrack1CodecPopUp;
+ mixdownPopUp = fAudTrack1MixPopUp;
+ sampleratePopUp = fAudTrack1RatePopUp;
+ bitratePopUp = fAudTrack1BitratePopUp;
+ drcSlider = fAudTrack1DrcSlider;
+ drcField = fAudTrack1DrcField;
+ }
+ else if (sender == fAudTrack2MixPopUp)
+ {
+ audiotrackPopUp = fAudLang2PopUp;
+ audiocodecPopUp = fAudTrack2CodecPopUp;
+ mixdownPopUp = fAudTrack2MixPopUp;
+ sampleratePopUp = fAudTrack2RatePopUp;
+ bitratePopUp = fAudTrack2BitratePopUp;
+ drcSlider = fAudTrack2DrcSlider;
+ drcField = fAudTrack2DrcField;
+ }
+ else if (sender == fAudTrack3MixPopUp)
+ {
+ audiotrackPopUp = fAudLang3PopUp;
+ audiocodecPopUp = fAudTrack3CodecPopUp;
+ mixdownPopUp = fAudTrack3MixPopUp;
+ sampleratePopUp = fAudTrack3RatePopUp;
+ bitratePopUp = fAudTrack3BitratePopUp;
+ drcSlider = fAudTrack3DrcSlider;
+ drcField = fAudTrack3DrcField;
+ }
+ else
+ {
+ audiotrackPopUp = fAudLang4PopUp;
+ audiocodecPopUp = fAudTrack4CodecPopUp;
+ mixdownPopUp = fAudTrack4MixPopUp;
+ sampleratePopUp = fAudTrack4RatePopUp;
+ bitratePopUp = fAudTrack4BitratePopUp;
+ drcSlider = fAudTrack4DrcSlider;
+ drcField = fAudTrack4DrcField;
+ }
+ acodec = [[audiocodecPopUp selectedItem] tag];
/* storage variable for the min and max bitrate allowed for this codec */
int minbitrate;
int maxbitrate;
{
case HB_ACODEC_FAAC:
/* check if we have a 6ch discrete conversion in either audio track */
- if ([[fAudTrack1MixPopUp selectedItem] tag] == HB_AMIXDOWN_6CH ||
- [[fAudTrack2MixPopUp selectedItem] tag] == HB_AMIXDOWN_6CH ||
- [[fAudTrack1MixPopUp selectedItem] tag] == HB_AMIXDOWN_AC3 ||
- [[fAudTrack2MixPopUp selectedItem] tag] == HB_AMIXDOWN_AC3)
+ if ([[mixdownPopUp selectedItem] tag] == HB_AMIXDOWN_6CH)
{
/* FAAC is happy using our min bitrate of 32 kbps, even for 6ch */
minbitrate = 32;
maxbitrate = 160;
break;
}
-
- case HB_ACODEC_LAME:
+
+ case HB_ACODEC_LAME:
/* Lame is happy using our min bitrate of 32 kbps */
minbitrate = 32;
/* Lame won't encode if the bitrate is higher than 320 kbps */
maxbitrate = 320;
break;
-
- case HB_ACODEC_VORBIS:
- if ([[fAudTrack1MixPopUp selectedItem] tag] == HB_AMIXDOWN_6CH || [[fAudTrack2MixPopUp selectedItem] tag] == HB_AMIXDOWN_6CH)
+
+ case HB_ACODEC_VORBIS:
+ if ([[mixdownPopUp selectedItem] tag] == HB_AMIXDOWN_6CH)
{
/* Vorbis causes a crash if we use a bitrate below 192 kbps with 6 channel */
minbitrate = 192;
}
else
{
- /* Vorbis causes a crash if we use a bitrate below 48 kbps */
- minbitrate = 48;
- /* Vorbis can cope with 384 kbps quite happily, even for stereo */
- maxbitrate = 384;
- break;
+ /* Vorbis causes a crash if we use a bitrate below 48 kbps */
+ minbitrate = 48;
+ /* Vorbis can cope with 384 kbps quite happily, even for stereo */
+ maxbitrate = 384;
+ break;
}
-
- default:
+
+ default:
/* AC3 passthru disables the bitrate dropdown anyway, so we might as well just use the min and max bitrate */
minbitrate = 32;
maxbitrate = 384;
-
+
}
-
- [fAudBitratePopUp removeAllItems];
-
- for( int i = 0; i < hb_audio_bitrates_count; i++ )
+
+ /* make sure we have a selected title before continuing */
+ if (fTitle == NULL) return;
+ /* get the audio so we can find out what input rates are*/
+ hb_audio_config_t * audio;
+ audio = (hb_audio_config_t *) hb_list_audio_config_item( fTitle->list_audio, [audiotrackPopUp indexOfSelectedItem] - 1 );
+ int inputbitrate = audio->in.bitrate / 1000;
+ int inputsamplerate = audio->in.samplerate;
+
+ if ([[mixdownPopUp selectedItem] tag] != HB_ACODEC_AC3)
{
- if (hb_audio_bitrates[i].rate >= minbitrate && hb_audio_bitrates[i].rate <= maxbitrate)
+ [bitratePopUp removeAllItems];
+
+ for( int i = 0; i < hb_audio_bitrates_count; i++ )
+ {
+ if (hb_audio_bitrates[i].rate >= minbitrate && hb_audio_bitrates[i].rate <= maxbitrate)
+ {
+ /* add a new menuitem for this bitrate */
+ NSMenuItem *menuItem = [[bitratePopUp menu] addItemWithTitle:
+ [NSString stringWithCString: hb_audio_bitrates[i].string]
+ action: NULL keyEquivalent: @""];
+ /* set its tag to be the actual bitrate as an integer, so we can retrieve it later */
+ [menuItem setTag: hb_audio_bitrates[i].rate];
+ }
+ }
+
+ /* select the default bitrate (but use 384 for 6-ch AAC) */
+ if ([[mixdownPopUp selectedItem] tag] == HB_AMIXDOWN_6CH)
+ {
+ [bitratePopUp selectItemWithTag: 384];
+ }
+ else
{
- /* add a new menuitem for this bitrate */
- NSMenuItem *menuItem = [[fAudBitratePopUp menu] addItemWithTitle:
- [NSString stringWithCString: hb_audio_bitrates[i].string]
- action: NULL keyEquivalent: @""];
- /* set its tag to be the actual bitrate as an integer, so we can retrieve it later */
- [menuItem setTag: hb_audio_bitrates[i].rate];
+ [bitratePopUp selectItemWithTag: hb_audio_bitrates[hb_audio_bitrates_default].rate];
}
}
-
- /* select the default bitrate (but use 384 for 6-ch AAC) */
- if ([[fAudTrack1MixPopUp selectedItem] tag] == HB_AMIXDOWN_6CH ||
- [[fAudTrack2MixPopUp selectedItem] tag] == HB_AMIXDOWN_6CH ||
- [[fAudTrack1MixPopUp selectedItem] tag] == HB_AMIXDOWN_AC3 ||
- [[fAudTrack2MixPopUp selectedItem] tag] == HB_AMIXDOWN_AC3)
+ /* populate and set the sample rate popup */
+ /* Audio samplerate */
+ [sampleratePopUp removeAllItems];
+ /* we create a same as source selection (Auto) so that we can choose to use the input sample rate */
+ NSMenuItem *menuItem = [[sampleratePopUp menu] addItemWithTitle: @"Auto" action: NULL keyEquivalent: @""];
+ [menuItem setTag: inputsamplerate];
+
+ for( int i = 0; i < hb_audio_rates_count; i++ )
{
- [fAudBitratePopUp selectItemWithTag: 384];
+ NSMenuItem *menuItem = [[sampleratePopUp menu] addItemWithTitle:
+ [NSString stringWithCString: hb_audio_rates[i].string]
+ action: NULL keyEquivalent: @""];
+ [menuItem setTag: hb_audio_rates[i].rate];
+ }
+ /* We use the input sample rate as the default sample rate as downsampling just makes audio worse
+ * and there is no compelling reason to use anything else as default, though the users default
+ * preset will likely override any setting chosen here.
+ */
+ [sampleratePopUp selectItemWithTag: inputsamplerate];
+
+
+ /* Since AC3 Pass Thru uses the input ac3 bitrate and sample rate, we get the input tracks
+ * bitrate and dispay it in the bitrate popup even though libhb happily ignores any bitrate input from
+ * the gui. We do this for better user feedback in the audio tab as well as the queue for the most part
+ */
+ if ([[mixdownPopUp selectedItem] tag] == HB_ACODEC_AC3)
+ {
+
+ /* lets also set the bitrate popup to the input bitrate as thats what passthru will use */
+ [bitratePopUp removeAllItems];
+ NSMenuItem *menuItem = [[bitratePopUp menu] addItemWithTitle:
+ [NSString stringWithFormat:@"%d", inputbitrate]
+ action: NULL keyEquivalent: @""];
+ [menuItem setTag: inputbitrate];
+ /* For ac3 passthru we disable the sample rate and bitrate popups as well as the drc slider*/
+ [bitratePopUp setEnabled: NO];
+ [sampleratePopUp setEnabled: NO];
+
+ [drcSlider setFloatValue: 1.00];
+ [self audioDRCSliderChanged: drcSlider];
+ [drcSlider setEnabled: NO];
+ [drcField setEnabled: NO];
}
else
{
- [fAudBitratePopUp selectItemWithTag: hb_audio_bitrates[hb_audio_bitrates_default].rate];
+ [sampleratePopUp setEnabled: YES];
+ [bitratePopUp setEnabled: YES];
+ [drcSlider setEnabled: YES];
+ [drcField setEnabled: YES];
}
-
+
}
- (IBAction) audioDRCSliderChanged: (id) sender
{
- [fAudDrcField setStringValue: [NSString stringWithFormat: @"%.2f", [fAudDrcSlider floatValue]]];
- [self customSettingUsed: sender];
+ NSSlider * drcSlider;
+ NSTextField * drcField;
+ if (sender == fAudTrack1DrcSlider)
+ {
+ drcSlider = fAudTrack1DrcSlider;
+ drcField = fAudTrack1DrcField;
+ }
+ else if (sender == fAudTrack2DrcSlider)
+ {
+ drcSlider = fAudTrack2DrcSlider;
+ drcField = fAudTrack2DrcField;
+ }
+ else if (sender == fAudTrack3DrcSlider)
+ {
+ drcSlider = fAudTrack3DrcSlider;
+ drcField = fAudTrack3DrcField;
+ }
+ else
+ {
+ drcSlider = fAudTrack4DrcSlider;
+ drcField = fAudTrack4DrcField;
+ }
+ [drcField setStringValue: [NSString stringWithFormat: @"%.2f", [drcSlider floatValue]]];
+ /* For now, do not call this until we have an intelligent way to determine audio track selections
+ * compared to presets
+ */
+ //[self customSettingUsed: sender];
}
- (IBAction) subtitleSelectionChanged: (id) sender
- (IBAction) openHomepage: (id) sender
{
[[NSWorkspace sharedWorkspace] openURL: [NSURL
- URLWithString:@"http://handbrake.m0k.org/"]];
+ URLWithString:@"http://handbrake.fr/"]];
}
- (IBAction) openForums: (id) sender
{
[[NSWorkspace sharedWorkspace] openURL: [NSURL
- URLWithString:@"http://handbrake.m0k.org/forum/"]];
+ URLWithString:@"http://handbrake.fr/forum/"]];
}
- (IBAction) openUserGuide: (id) sender
{
[[NSWorkspace sharedWorkspace] openURL: [NSURL
- URLWithString:@"http://handbrake.m0k.org/trac/wiki/HandBrakeGuide"]];
+ URLWithString:@"http://handbrake.fr/trac/wiki/HandBrakeGuide"]];
}
/**
if ([fPresetsOutlineView selectedRow] == [fPresetsOutlineView rowForItem:item])
{
- fontColor = [NSColor whiteColor];
+ fontColor = [NSColor blackColor];
shadowColor = [NSColor colorWithDeviceRed:(127.0/255.0) green:(140.0/255.0) blue:(160.0/255.0) alpha:1.0];
}
else
}
/* We use this to edit the name field in the outline view */
-- (void)outlineView:(NSOutlineView *)fPresetsOutlineView setObjectValue:(id)object forTableColumn:(NSTableColumn *)tableColumn byItem:(id)item
+- (void)outlineView:(NSOutlineView *)outlineView setObjectValue:(id)object forTableColumn:(NSTableColumn *)tableColumn byItem:(id)item
{
if ([[tableColumn identifier] isEqualToString:@"PresetName"])
{
theRecord = item;
[theRecord setObject:object forKey:@"PresetName"];
- /* We Sort the Presets By Factory or Custom */
- NSSortDescriptor * presetTypeDescriptor=[[[NSSortDescriptor alloc] initWithKey:@"Type"
- ascending:YES] autorelease];
- /* We Sort the Presets Alphabetically by name */
- NSSortDescriptor * presetNameDescriptor=[[[NSSortDescriptor alloc] initWithKey:@"PresetName"
- ascending:YES selector:@selector(caseInsensitiveCompare:)] autorelease];
- NSArray *sortDescriptors=[NSArray arrayWithObjects:presetTypeDescriptor,presetNameDescriptor,nil];
- NSArray *sortedArray=[UserPresets sortedArrayUsingDescriptors:sortDescriptors];
- [UserPresets setArray:sortedArray];
- /* We Reload the New Table data for presets */
- //[fPresetsOutlineView reloadData];
+
+ [self sortPresets];
+
+ [fPresetsOutlineView reloadData];
/* We save all of the preset data here */
[self savePreset];
}
//}
}
+#pragma mark -
+#pragma mark Preset Outline View Methods (dragging related)
+
+
+- (BOOL)outlineView:(NSOutlineView *)outlineView writeItems:(NSArray *)items toPasteboard:(NSPasteboard *)pboard
+{
+ // Dragging is only allowed for custom presets.
+ if ([[[UserPresets objectAtIndex:[fPresetsOutlineView selectedRow]] objectForKey:@"Type"] intValue] == 0) // 0 is built in preset
+ {
+ return NO;
+ }
+ // Don't retain since this is just holding temporaral drag information, and it is
+ //only used during a drag! We could put this in the pboard actually.
+ fDraggedNodes = items;
+ // Provide data for our custom type, and simple NSStrings.
+ [pboard declareTypes:[NSArray arrayWithObjects: DragDropSimplePboardType, nil] owner:self];
+
+ // the actual data doesn't matter since DragDropSimplePboardType drags aren't recognized by anyone but us!.
+ [pboard setData:[NSData data] forType:DragDropSimplePboardType];
+
+ return YES;
+}
+
+- (NSDragOperation)outlineView:(NSOutlineView *)outlineView validateDrop:(id <NSDraggingInfo>)info proposedItem:(id)item proposedChildIndex:(int)index
+{
+ // Don't allow dropping ONTO an item since they can't really contain any children.
+
+ BOOL isOnDropTypeProposal = index == NSOutlineViewDropOnItemIndex;
+ if (isOnDropTypeProposal)
+ return NSDragOperationNone;
+
+
+ // Don't allow dropping INTO an item since they can't really contain any children as of yet.
+
+ if (item != nil)
+ {
+ index = [fPresetsOutlineView rowForItem: item] + 1;
+ item = nil;
+ }
+
+ // Don't allow dropping into the Built In Presets.
+ if (index < presetCurrentBuiltInCount)
+ {
+ return NSDragOperationNone;
+ index = MAX (index, presetCurrentBuiltInCount);
+ }
+
+ [outlineView setDropItem:item dropChildIndex:index];
+ return NSDragOperationGeneric;
+}
+
+
+
+- (BOOL)outlineView:(NSOutlineView *)outlineView acceptDrop:(id <NSDraggingInfo>)info item:(id)item childIndex:(int)index
+{
+ NSMutableIndexSet *moveItems = [NSMutableIndexSet indexSet];
+
+ id obj;
+ NSEnumerator *enumerator = [fDraggedNodes objectEnumerator];
+ while (obj = [enumerator nextObject])
+ {
+ [moveItems addIndex:[UserPresets indexOfObject:obj]];
+ }
+ // Successful drop, lets rearrange the view and save it all
+ [self moveObjectsInPresetsArray:UserPresets fromIndexes:moveItems toIndex: index];
+ [fPresetsOutlineView reloadData];
+ [self savePreset];
+ return YES;
+}
+
+- (void)moveObjectsInPresetsArray:(NSMutableArray *)array fromIndexes:(NSIndexSet *)indexSet toIndex:(unsigned)insertIndex
+{
+ unsigned index = [indexSet lastIndex];
+ unsigned aboveInsertIndexCount = 0;
+
+ while (index != NSNotFound)
+ {
+ unsigned removeIndex;
+
+ if (index >= insertIndex)
+ {
+ removeIndex = index + aboveInsertIndexCount;
+ aboveInsertIndexCount++;
+ }
+ else
+ {
+ removeIndex = index;
+ insertIndex--;
+ }
+
+ id object = [[array objectAtIndex:removeIndex] retain];
+ [array removeObjectAtIndex:removeIndex];
+ [array insertObject:object atIndex:insertIndex];
+ [object release];
+
+ index = [indexSet indexLessThanIndex:index];
+ }
+}
+
+
#pragma mark - Functional Preset NSOutlineView Methods
[fDstMp4LargeFileCheck setState:[[chosenPreset objectForKey:@"Mp4LargeFile"] intValue]];
/* Mux mp4 with http optimization */
[fDstMp4HttpOptFileCheck setState:[[chosenPreset objectForKey:@"Mp4HttpOptimize"] intValue]];
- /* Set the state of ipod compatible with Mp4iPodCompatible */
- [fDstMp4iPodFileCheck setState:[[chosenPreset objectForKey:@"Mp4iPodCompatible"] intValue]];
- /* Codecs */
- [fDstCodecsPopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"FileCodecs"]]];
- [self codecsPopUpChanged: NULL];
/* Video encoder */
/* We set the advanced opt string here if applicable*/
[fAdvancedOptions setOptions: [NSString stringWithFormat:[chosenPreset valueForKey:@"x264Option"]]];
/* We use a conditional to account for the new x264 encoder dropdown as well as presets made using legacy x264 settings*/
- if ([[NSString stringWithFormat:[chosenPreset valueForKey:@"VideoEncoder"]] isEqualToString: @"x264 (h.264 Main)"] || [[NSString stringWithFormat:[chosenPreset valueForKey:@"VideoEncoder"]] isEqualToString: @"x264 (h.264 iPod)"])
+ if ([[NSString stringWithFormat:[chosenPreset valueForKey:@"VideoEncoder"]] isEqualToString: @"x264 (h.264 Main)"] ||
+ [[NSString stringWithFormat:[chosenPreset valueForKey:@"VideoEncoder"]] isEqualToString: @"x264 (h.264 iPod)"] ||
+ [[NSString stringWithFormat:[chosenPreset valueForKey:@"VideoEncoder"]] isEqualToString: @"x264"])
{
- [fVidEncoderPopUp selectItemWithTitle: [NSString stringWithFormat:@"x264"]];
+ [fVidEncoderPopUp selectItemWithTitle: [NSString stringWithFormat:@"H.264 (x264)"]];
/* special case for legacy preset to check the new fDstMp4HttpOptFileCheck checkbox to set the ipod atom */
if ([[NSString stringWithFormat:[chosenPreset valueForKey:@"VideoEncoder"]] isEqualToString: @"x264 (h.264 iPod)"])
{
[fDstMp4iPodFileCheck setState:NSOffState];
}
}
+ else if ([[NSString stringWithFormat:[chosenPreset valueForKey:@"VideoEncoder"]] isEqualToString: @"FFmpeg"])
+ {
+ [fVidEncoderPopUp selectItemWithTitle: [NSString stringWithFormat:@"MPEG-4 (FFmpeg)"]];
+ }
+ else if ([[NSString stringWithFormat:[chosenPreset valueForKey:@"VideoEncoder"]] isEqualToString: @"XviD"])
+ {
+ [fVidEncoderPopUp selectItemWithTitle: [NSString stringWithFormat:@"MPEG-4 (XviD)"]];
+ }
else
{
[fVidEncoderPopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"VideoEncoder"]]];
}
/* Lets run through the following functions to get variables set there */
- [self encoderPopUpChanged: NULL];
-
+ [self videoEncoderPopUpChanged: NULL];
+ /* Set the state of ipod compatible with Mp4iPodCompatible. Only for x264*/
+ [fDstMp4iPodFileCheck setState:[[chosenPreset objectForKey:@"Mp4iPodCompatible"] intValue]];
[self calculateBitrate: NULL];
/* Video quality */
[fVidTurboPassCheck setState:[[chosenPreset objectForKey:@"VideoTurboTwoPass"] intValue]];
/*Audio*/
+ if ([chosenPreset valueForKey:@"FileCodecs"])
+ {
+ /* We need to handle the audio codec popup by determining what was chosen from the deprecated Codecs PopUp for past presets*/
+ if ([[NSString stringWithFormat:[chosenPreset valueForKey:@"FileCodecs"]] isEqualToString: @"AVC/H.264 Video / AAC + AC3 Audio"])
+ {
+ /* We need to address setting languages etc. here in the new multi track audio panel */
+ /* Track One set here */
+ /*for track one though a track should be selected but lets check here anyway and use track one if its not.*/
+ if ([fAudLang1PopUp indexOfSelectedItem] == 0)
+ {
+ [fAudLang1PopUp selectItemAtIndex: 1];
+ [self audioTrackPopUpChanged: fAudLang1PopUp];
+ }
+ [fAudTrack1CodecPopUp selectItemWithTitle: @"AAC (faac)"];
+ [self audioTrackPopUpChanged: fAudTrack1CodecPopUp];
+ /* Track Two, set source same as track one */
+ [fAudLang2PopUp selectItemAtIndex: [fAudLang1PopUp indexOfSelectedItem]];
+ [self audioTrackPopUpChanged: fAudLang2PopUp];
+ [fAudTrack2CodecPopUp selectItemWithTitle: @"AC3 Passthru"];
+ [self audioTrackPopUpChanged: fAudTrack2CodecPopUp];
+ }
+ else if ([[NSString stringWithFormat:[chosenPreset valueForKey:@"FileCodecs"]] isEqualToString: @"MPEG-4 Video / AAC Audio"] ||
+ [[NSString stringWithFormat:[chosenPreset valueForKey:@"FileCodecs"]] isEqualToString: @"AVC/H.264 Video / AAC Audio"])
+ {
+ if ([fAudLang1PopUp indexOfSelectedItem] > 0)
+ {
+ [fAudTrack1CodecPopUp selectItemWithTitle: @"AAC (faac)"];
+ [self audioTrackPopUpChanged: fAudTrack1CodecPopUp];
+ }
+ if ([fAudLang2PopUp indexOfSelectedItem] > 0)
+ {
+ [fAudTrack2CodecPopUp selectItemWithTitle: @"AAC (faac)"];
+ [self audioTrackPopUpChanged: fAudTrack2CodecPopUp];
+ }
+ if ([fAudLang3PopUp indexOfSelectedItem] > 0)
+ {
+ [fAudTrack3CodecPopUp selectItemWithTitle: @"AAC (faac)"];
+ [self audioTrackPopUpChanged: fAudTrack3CodecPopUp];
+ }
+ if ([fAudLang4PopUp indexOfSelectedItem] > 0)
+ {
+ [fAudTrack4CodecPopUp selectItemWithTitle: @"AAC (faac)"];
+ [self audioTrackPopUpChanged: fAudTrack4CodecPopUp];
+ }
+ }
+ else if ([[NSString stringWithFormat:[chosenPreset valueForKey:@"FileCodecs"]] isEqualToString: @"MPEG-4 Video / AC-3 Audio"] ||
+ [[NSString stringWithFormat:[chosenPreset valueForKey:@"FileCodecs"]] isEqualToString: @"AVC/H.264 Video / AC-3 Audio"])
+ {
+ if ([fAudLang1PopUp indexOfSelectedItem] > 0)
+ {
+ [fAudTrack1CodecPopUp selectItemWithTitle: @"AC3 Passthru"];
+ [self audioTrackPopUpChanged: fAudTrack1CodecPopUp];
+ }
+ if ([fAudLang2PopUp indexOfSelectedItem] > 0)
+ {
+ [fAudTrack2CodecPopUp selectItemWithTitle: @"AC3 Passthru"];
+ [self audioTrackPopUpChanged: fAudTrack2CodecPopUp];
+ }
+ if ([fAudLang3PopUp indexOfSelectedItem] > 0)
+ {
+ [fAudTrack3CodecPopUp selectItemWithTitle: @"AC3 Passthru"];
+ [self audioTrackPopUpChanged: fAudTrack3CodecPopUp];
+ }
+ if ([fAudLang4PopUp indexOfSelectedItem] > 0)
+ {
+ [fAudTrack4CodecPopUp selectItemWithTitle: @"AC3 Passthru"];
+ [self audioTrackPopUpChanged: fAudTrack4CodecPopUp];
+ }
+ }
+ else if ([[NSString stringWithFormat:[chosenPreset valueForKey:@"FileCodecs"]] isEqualToString: @"MPEG-4 Video / MP3 Audio"] ||
+ [[NSString stringWithFormat:[chosenPreset valueForKey:@"FileCodecs"]] isEqualToString: @"AVC/H.264 Video / MP3 Audio"])
+ {
+ if ([fAudLang1PopUp indexOfSelectedItem] > 0)
+ {
+ [fAudTrack1CodecPopUp selectItemWithTitle: @"MP3 (lame)"];
+ [self audioTrackPopUpChanged: fAudTrack1CodecPopUp];
+ }
+ if ([fAudLang2PopUp indexOfSelectedItem] > 0)
+ {
+ [fAudTrack2CodecPopUp selectItemWithTitle: @"MP3 (lame)"];
+ [self audioTrackPopUpChanged: fAudTrack2CodecPopUp];
+ }
+ if ([fAudLang3PopUp indexOfSelectedItem] > 0)
+ {
+ [fAudTrack3CodecPopUp selectItemWithTitle: @"MP3 (lame)"];
+ [self audioTrackPopUpChanged: fAudTrack3CodecPopUp];
+ }
+ if ([fAudLang4PopUp indexOfSelectedItem] > 0)
+ {
+ [fAudTrack4CodecPopUp selectItemWithTitle: @"MP3 (lame)"];
+ [self audioTrackPopUpChanged: fAudTrack4CodecPopUp];
+ }
+ }
+ else if ([[NSString stringWithFormat:[chosenPreset valueForKey:@"FileCodecs"]] isEqualToString: @"MPEG-4 Video / Vorbis Audio"])
+ {
+ if ([fAudLang1PopUp indexOfSelectedItem] > 0)
+ {
+ [fAudTrack1CodecPopUp selectItemWithTitle: @"Vorbis (vorbis)"];
+ [self audioTrackPopUpChanged: fAudTrack1CodecPopUp];
+ }
+ if ([fAudLang2PopUp indexOfSelectedItem] > 0)
+ {
+ [fAudTrack2CodecPopUp selectItemWithTitle: @"Vorbis (vorbis)"];
+ [self audioTrackPopUpChanged: fAudTrack2CodecPopUp];
+ }
+ if ([fAudLang3PopUp indexOfSelectedItem] > 0)
+ {
+ [fAudTrack3CodecPopUp selectItemWithTitle: @"Vorbis (vorbis)"];
+ [self audioTrackPopUpChanged: fAudTrack3CodecPopUp];
+ }
+ if ([fAudLang4PopUp indexOfSelectedItem] > 0)
+ {
+ [fAudTrack4CodecPopUp selectItemWithTitle: @"Vorbis (vorbis)"];
+ [self audioTrackPopUpChanged: fAudTrack4CodecPopUp];
+ }
+ }
+ /* We detect here if we have the old audio sample rate and if so we apply samplerate and bitrate to the existing four tracks if chosen
+ * UNLESS the CodecPopUp is AC3 in which case the preset values are ignored in favor of rates set in audioTrackMixdownChanged*/
+ if ([chosenPreset valueForKey:@"AudioSampleRate"])
+ {
+ if ([fAudLang1PopUp indexOfSelectedItem] > 0 && [fAudTrack1CodecPopUp titleOfSelectedItem] != @"AC3 Passthru")
+ {
+ [fAudTrack1RatePopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"AudioSampleRate"]]];
+ [fAudTrack1BitratePopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"AudioBitRate"]]];
+ }
+ if ([fAudLang2PopUp indexOfSelectedItem] > 0 && [fAudTrack2CodecPopUp titleOfSelectedItem] != @"AC3 Passthru")
+ {
+ [fAudTrack2RatePopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"AudioSampleRate"]]];
+ [fAudTrack2BitratePopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"AudioBitRate"]]];
+ }
+ if ([fAudLang3PopUp indexOfSelectedItem] > 0 && [fAudTrack3CodecPopUp titleOfSelectedItem] != @"AC3 Passthru")
+ {
+ [fAudTrack3RatePopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"AudioSampleRate"]]];
+ [fAudTrack3BitratePopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"AudioBitRate"]]];
+ }
+ if ([fAudLang4PopUp indexOfSelectedItem] > 0 && [fAudTrack4CodecPopUp titleOfSelectedItem] != @"AC3 Passthru")
+ {
+ [fAudTrack4RatePopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"AudioSampleRate"]]];
+ [fAudTrack4BitratePopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"AudioBitRate"]]];
+ }
+ }
+ /* We detect here if we have the old DRC Slider and if so we apply it to the existing four tracks if chosen */
+ if ([chosenPreset valueForKey:@"AudioDRCSlider"])
+ {
+ if ([fAudLang1PopUp indexOfSelectedItem] > 0)
+ {
+ [fAudTrack1DrcSlider setFloatValue: [[chosenPreset valueForKey:@"AudioDRCSlider"] floatValue]];
+ [self audioDRCSliderChanged: fAudTrack1DrcSlider];
+ }
+ if ([fAudLang2PopUp indexOfSelectedItem] > 0)
+ {
+ [fAudTrack2DrcSlider setFloatValue: [[chosenPreset valueForKey:@"AudioDRCSlider"] floatValue]];
+ [self audioDRCSliderChanged: fAudTrack2DrcSlider];
+ }
+ if ([fAudLang3PopUp indexOfSelectedItem] > 0)
+ {
+ [fAudTrack3DrcSlider setFloatValue: [[chosenPreset valueForKey:@"AudioDRCSlider"] floatValue]];
+ [self audioDRCSliderChanged: fAudTrack3DrcSlider];
+ }
+ if ([fAudLang4PopUp indexOfSelectedItem] > 0)
+ {
+ [fAudTrack4DrcSlider setFloatValue: [[chosenPreset valueForKey:@"AudioDRCSlider"] floatValue]];
+ [self audioDRCSliderChanged: fAudTrack4DrcSlider];
+ }
+ }
+ }
+ else // since there was no codecs key in the preset we know we can use new multi-audio track presets
+ {
+ if ([chosenPreset valueForKey:@"Audio1Track"] > 0)
+ {
+ if ([fAudLang1PopUp indexOfSelectedItem] == 0)
+ {
+ [fAudLang1PopUp selectItemAtIndex: 1];
+ [self audioTrackPopUpChanged: fAudLang1PopUp];
+ }
+ [fAudTrack1CodecPopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"Audio1Encoder"]]];
+ [self audioTrackPopUpChanged: fAudTrack1CodecPopUp];
+ [fAudTrack1MixPopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"Audio1Mixdown"]]];
+ [fAudTrack1RatePopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"Audio1Samplerate"]]];
+ [fAudTrack1BitratePopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"Audio1Bitrate"]]];
+ [fAudTrack1DrcSlider setFloatValue: [[chosenPreset valueForKey:@"Audio1TrackDRCSlider"] floatValue]];
+ [self audioDRCSliderChanged: fAudTrack1DrcSlider];
+ }
+ if ([chosenPreset valueForKey:@"Audio2Track"] > 0)
+ {
+ if ([fAudLang2PopUp indexOfSelectedItem] == 0)
+ {
+ [fAudLang2PopUp selectItemAtIndex: 1];
+ [self audioTrackPopUpChanged: fAudLang2PopUp];
+ }
+ [fAudTrack2CodecPopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"Audio2Encoder"]]];
+ [self audioTrackPopUpChanged: fAudTrack2CodecPopUp];
+ [fAudTrack2MixPopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"Audio2Mixdown"]]];
+ [fAudTrack2RatePopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"Audio2Samplerate"]]];
+ [fAudTrack2BitratePopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"Audio2Bitrate"]]];
+ [fAudTrack2DrcSlider setFloatValue: [[chosenPreset valueForKey:@"Audio2TrackDRCSlider"] floatValue]];
+ [self audioDRCSliderChanged: fAudTrack2DrcSlider];
+ }
+ if ([chosenPreset valueForKey:@"Audio3Track"] > 0)
+ {
+ if ([fAudLang3PopUp indexOfSelectedItem] == 0)
+ {
+ [fAudLang3PopUp selectItemAtIndex: 1];
+ [self audioTrackPopUpChanged: fAudLang3PopUp];
+ }
+ [fAudTrack3CodecPopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"Audio3Encoder"]]];
+ [self audioTrackPopUpChanged: fAudTrack3CodecPopUp];
+ [fAudTrack3MixPopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"Audio3Mixdown"]]];
+ [fAudTrack3RatePopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"Audio3Samplerate"]]];
+ [fAudTrack3BitratePopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"Audio3Bitrate"]]];
+ [fAudTrack3DrcSlider setFloatValue: [[chosenPreset valueForKey:@"Audio3TrackDRCSlider"] floatValue]];
+ [self audioDRCSliderChanged: fAudTrack3DrcSlider];
+ }
+ if ([chosenPreset valueForKey:@"Audio4Track"] > 0)
+ {
+ if ([fAudLang4PopUp indexOfSelectedItem] == 0)
+ {
+ [fAudLang4PopUp selectItemAtIndex: 1];
+ [self audioTrackPopUpChanged: fAudLang4PopUp];
+ }
+ [fAudTrack4CodecPopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"Audio4Encoder"]]];
+ [self audioTrackPopUpChanged: fAudTrack4CodecPopUp];
+ [fAudTrack4MixPopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"Audio4Mixdown"]]];
+ [fAudTrack4RatePopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"Audio4Samplerate"]]];
+ [fAudTrack4BitratePopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"Audio4Bitrate"]]];
+ [fAudTrack4DrcSlider setFloatValue: [[chosenPreset valueForKey:@"Audio4TrackDRCSlider"] floatValue]];
+ [self audioDRCSliderChanged: fAudTrack4DrcSlider];
+ }
+
+
+ }
- /* Audio Sample Rate*/
- [fAudRatePopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"AudioSampleRate"]]];
- /* Audio Bitrate Rate*/
- [fAudBitratePopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"AudioBitRate"]]];
/*Subtitles*/
[fSubPopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"Subtitles"]]];
/* Forced Subtitles */
[fSubForcedCheck setState:[[chosenPreset objectForKey:@"SubtitlesForced"] intValue]];
- /* Dynamic Range Control Slider */
- [fAudDrcSlider setFloatValue: [[chosenPreset valueForKey:@"AudioDRCSlider"] floatValue]];
- [self audioDRCSliderChanged: NULL];
-
/* Picture Settings */
/* Note: objectForKey:@"UsesPictureSettings" now refers to picture size, this encompasses:
* height, width, keep ar, anamorphic and crop settings.
if ([chosenPreset objectForKey:@"PictureDeinterlace"])
{
/* We check to see if the preset used the past fourth "Slowest" deinterlaceing and set that to "Slower
- * since we no longer have a fourth "Slowest" deinterlacing due to the mcdeint bug */
+ * since we no longer have a fourth "Slowest" deinterlacing due to the mcdeint bug */
if ([[chosenPreset objectForKey:@"PictureDeinterlace"] intValue] == 4)
{
[fPictureController setDeinterlace:3];
}
else
{
-
+
[fPictureController setDeinterlace:[[chosenPreset objectForKey:@"PictureDeinterlace"] intValue]];
}
}
else
{
[fPictureController setDeblock:0];
- }
+ }
+
[self calculatePictureSizing: NULL];
}
else
{
[fPictureController setDeblock:0];
+ }
+ /* Decomb */
+ /* Even though we currently allow for a custom setting for decomb, ultimately it will only have Off and
+ * Default so we just pay attention to anything greater than 0 as 1 (Default). 0 is Off. */
+ if ([[chosenPreset objectForKey:@"PictureDecomb"] intValue] > 0)
+ {
+ [fPictureController setDecomb:1];
+ }
+ else
+ {
+ [fPictureController setDecomb:0];
}
}
[self calculatePictureSizing: NULL];
{
+ /* We Reload the New Table data for presets */
+ [fPresetsOutlineView reloadData];
+ /* We save all of the preset data here */
+ [self savePreset];
+}
+
+- (void)sortPresets
+{
+
+
/* We Sort the Presets By Factory or Custom */
NSSortDescriptor * presetTypeDescriptor=[[[NSSortDescriptor alloc] initWithKey:@"Type"
ascending:YES] autorelease];
- /* We Sort the Presets Alphabetically by name */
- NSSortDescriptor * presetNameDescriptor=[[[NSSortDescriptor alloc] initWithKey:@"PresetName"
+ /* We Sort the Presets Alphabetically by name We do not use this now as we have drag and drop*/
+ /*
+ NSSortDescriptor * presetNameDescriptor=[[[NSSortDescriptor alloc] initWithKey:@"PresetName"
ascending:YES selector:@selector(caseInsensitiveCompare:)] autorelease];
- NSArray *sortDescriptors=[NSArray arrayWithObjects:presetTypeDescriptor,presetNameDescriptor,nil];
+ //NSArray *sortDescriptors=[NSArray arrayWithObjects:presetTypeDescriptor,presetNameDescriptor,nil];
+
+ */
+ /* Since we can drag and drop our custom presets, lets just sort by type and not name */
+ NSArray *sortDescriptors=[NSArray arrayWithObjects:presetTypeDescriptor,nil];
NSArray *sortedArray=[UserPresets sortedArrayUsingDescriptors:sortDescriptors];
[UserPresets setArray:sortedArray];
-
- /* We Reload the New Table data for presets */
- [fPresetsOutlineView reloadData];
- /* We save all of the preset data here */
- [self savePreset];
+
}
- (IBAction)insertPreset:(id)sender
[preset setObject:[NSNumber numberWithInt:[fDstMp4iPodFileCheck state]] forKey:@"Mp4iPodCompatible"];
/* Codecs */
- [preset setObject:[fDstCodecsPopUp titleOfSelectedItem] forKey:@"FileCodecs"];
/* Video encoder */
[preset setObject:[fVidEncoderPopUp titleOfSelectedItem] forKey:@"VideoEncoder"];
/* x264 Option String */
[preset setObject:[NSNumber numberWithInt:[fPictureController detelecine]] forKey:@"PictureDetelecine"];
[preset setObject:[NSNumber numberWithInt:[fPictureController vfr]] forKey:@"VFR"];
[preset setObject:[NSNumber numberWithInt:[fPictureController denoise]] forKey:@"PictureDenoise"];
- [preset setObject:[NSNumber numberWithInt:[fPictureController deblock]] forKey:@"PictureDeblock"];
+ [preset setObject:[NSNumber numberWithInt:[fPictureController deblock]] forKey:@"PictureDeblock"];
+ [preset setObject:[NSNumber numberWithInt:[fPictureController decomb]] forKey:@"PictureDecomb"];
+
+
+ /*Audio*/
+ if ([fAudLang1PopUp indexOfSelectedItem] > 0)
+ {
+ [preset setObject:[NSNumber numberWithInt:[fAudLang1PopUp indexOfSelectedItem]] forKey:@"Audio1Track"];
+ [preset setObject:[fAudLang1PopUp titleOfSelectedItem] forKey:@"Audio1TrackDescription"];
+ [preset setObject:[fAudTrack1CodecPopUp titleOfSelectedItem] forKey:@"Audio1Encoder"];
+ [preset setObject:[fAudTrack1MixPopUp titleOfSelectedItem] forKey:@"Audio1Mixdown"];
+ [preset setObject:[fAudTrack1RatePopUp titleOfSelectedItem] forKey:@"Audio1Samplerate"];
+ [preset setObject:[fAudTrack1BitratePopUp titleOfSelectedItem] forKey:@"Audio1Bitrate"];
+ [preset setObject:[NSNumber numberWithFloat:[fAudTrack1DrcSlider floatValue]] forKey:@"Audio1TrackDRCSlider"];
+ }
+ if ([fAudLang2PopUp indexOfSelectedItem] > 0)
+ {
+ [preset setObject:[NSNumber numberWithInt:[fAudLang2PopUp indexOfSelectedItem]] forKey:@"Audio2Track"];
+ [preset setObject:[fAudLang2PopUp titleOfSelectedItem] forKey:@"Audio2TrackDescription"];
+ [preset setObject:[fAudTrack2CodecPopUp titleOfSelectedItem] forKey:@"Audio2Encoder"];
+ [preset setObject:[fAudTrack2MixPopUp titleOfSelectedItem] forKey:@"Audio2Mixdown"];
+ [preset setObject:[fAudTrack2RatePopUp titleOfSelectedItem] forKey:@"Audio2Samplerate"];
+ [preset setObject:[fAudTrack2BitratePopUp titleOfSelectedItem] forKey:@"Audio2Bitrate"];
+ [preset setObject:[NSNumber numberWithFloat:[fAudTrack2DrcSlider floatValue]] forKey:@"Audio2TrackDRCSlider"];
+ }
+ if ([fAudLang3PopUp indexOfSelectedItem] > 0)
+ {
+ [preset setObject:[NSNumber numberWithInt:[fAudLang3PopUp indexOfSelectedItem]] forKey:@"Audio3Track"];
+ [preset setObject:[fAudLang3PopUp titleOfSelectedItem] forKey:@"Audio3TrackDescription"];
+ [preset setObject:[fAudTrack3CodecPopUp titleOfSelectedItem] forKey:@"Audio3Encoder"];
+ [preset setObject:[fAudTrack3MixPopUp titleOfSelectedItem] forKey:@"Audio3Mixdown"];
+ [preset setObject:[fAudTrack3RatePopUp titleOfSelectedItem] forKey:@"Audio3Samplerate"];
+ [preset setObject:[fAudTrack3BitratePopUp titleOfSelectedItem] forKey:@"Audio3Bitrate"];
+ [preset setObject:[NSNumber numberWithFloat:[fAudTrack3DrcSlider floatValue]] forKey:@"Audio3TrackDRCSlider"];
+ }
+ if ([fAudLang4PopUp indexOfSelectedItem] > 0)
+ {
+ [preset setObject:[NSNumber numberWithInt:[fAudLang4PopUp indexOfSelectedItem]] forKey:@"Audio4Track"];
+ [preset setObject:[fAudLang4PopUp titleOfSelectedItem] forKey:@"Audio4TrackDescription"];
+ [preset setObject:[fAudTrack4CodecPopUp titleOfSelectedItem] forKey:@"Audio4Encoder"];
+ [preset setObject:[fAudTrack4MixPopUp titleOfSelectedItem] forKey:@"Audio4Mixdown"];
+ [preset setObject:[fAudTrack4RatePopUp titleOfSelectedItem] forKey:@"Audio4Samplerate"];
+ [preset setObject:[fAudTrack4BitratePopUp titleOfSelectedItem] forKey:@"Audio4Bitrate"];
+ [preset setObject:[NSNumber numberWithFloat:[fAudTrack4DrcSlider floatValue]] forKey:@"Audio4TrackDRCSlider"];
+ }
-
-
- /*Audio*/
- /* Audio Sample Rate*/
- [preset setObject:[fAudRatePopUp titleOfSelectedItem] forKey:@"AudioSampleRate"];
- /* Audio Bitrate Rate*/
- [preset setObject:[fAudBitratePopUp titleOfSelectedItem] forKey:@"AudioBitRate"];
/* Subtitles*/
[preset setObject:[fSubPopUp titleOfSelectedItem] forKey:@"Subtitles"];
/* Forced Subtitles */
[preset setObject:[NSNumber numberWithInt:[fSubForcedCheck state]] forKey:@"SubtitlesForced"];
- /* Dynamic Range Control Slider */
- [preset setObject:[NSNumber numberWithFloat:[fAudDrcSlider floatValue]] forKey:@"AudioDRCSlider"];
-
-
+
[preset autorelease];
return preset;
- (IBAction)getDefaultPresets:(id)sender
{
int i = 0;
+ presetCurrentBuiltInCount = 0;
NSEnumerator *enumerator = [UserPresets objectEnumerator];
id tempObject;
while (tempObject = [enumerator nextObject])
{
presetUserDefault = i;
}
+ if ([[thisPresetDict objectForKey:@"Type"] intValue] == 0) // Type 0 is a built in preset
+ {
+ presetCurrentBuiltInCount++; // <--increment the current number of built in presets
+ }
i++;
}
}
/* Then we generate new built in presets programmatically with fPresetsBuiltin
* which is all setup in HBPresets.h and HBPresets.m*/
[fPresetsBuiltin generateBuiltinPresets:UserPresets];
-
+ [self sortPresets];
[self addPreset];
+
}
+@end
+/*******************************
+ * Subclass of the HBPresetsOutlineView *
+ *******************************/
+@implementation HBPresetsOutlineView
+- (NSImage *)dragImageForRowsWithIndexes:(NSIndexSet *)dragRows tableColumns:(NSArray *)tableColumns event:(NSEvent*)dragEvent offset:(NSPointPointer)dragImageOffset
+{
+ fIsDragging = YES;
+ // By default, NSTableView only drags an image of the first column. Change this to
+ // drag an image of the queue's icon and PresetName columns.
+ NSArray * cols = [NSArray arrayWithObjects: [self tableColumnWithIdentifier:@"icon"], [self tableColumnWithIdentifier:@"PresetName"], nil];
+ return [super dragImageForRowsWithIndexes:dragRows tableColumns:cols event:dragEvent offset:dragImageOffset];
+}
+
+
+
+- (void) mouseDown:(NSEvent *)theEvent
+{
+ [super mouseDown:theEvent];
+ fIsDragging = NO;
+}
+
+
+
+- (BOOL) isDragging;
+{
+ return fIsDragging;
+}
@end
+
+
+
OSDN Git Service
