From: dynaflash Date: Mon, 8 Nov 2010 22:00:51 +0000 (+0000) Subject: MacGui: Fix queue and auto m4v ... X-Git-Url: http://git.osdn.jp/view?a=commitdiff_plain;h=11d900703e445333421ec2e9aab3cba0bda6e7e1;p=handbrake-jp%2Fhandbrake-jp-git.git MacGui: Fix queue and auto m4v ... - patch (as previous) by circleone - Fix it so that the queue does not attempt to process an extra queue item when the output file already exists. - Using AC3 Passthru as the codec will trigger the output file to have the .m4v extension when using mp4. git-svn-id: svn://localhost/HandBrake/trunk@3664 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- diff --git a/macosx/Controller.m b/macosx/Controller.m index 3cac7cc4..898bcfa4 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -4009,8 +4009,9 @@ bool one_burned = FALSE; NSString *destinationDirectory = [[fDstFile2Field stringValue] stringByDeletingLastPathComponent]; [[NSUserDefaults standardUserDefaults] setObject:destinationDirectory forKey:@"LastDestinationDirectory"]; + currentQueueEncodeIndex = [self getNextPendingQueueIndex]; [self performNewQueueScan:[[QueueFileArray objectAtIndex:currentQueueEncodeIndex] objectForKey:@"SourcePath"] scanTitleNum:[[[QueueFileArray objectAtIndex:currentQueueEncodeIndex] objectForKey:@"TitleNumber"]intValue]]; - + } } @@ -4552,7 +4553,7 @@ bool one_burned = FALSE; NSString * extension = @"mp4"; - BOOL anyCodecAC3 = [fAudioDelegate anyCodecMatches: HB_ACODEC_AC3]; + BOOL anyCodecAC3 = [fAudioDelegate anyCodecMatches: HB_ACODEC_AC3] || [fAudioDelegate anyCodecMatches: HB_ACODEC_AC3_PASS]; if (YES == anyCodecAC3 || [fCreateChapterMarkers state] == NSOnState || [[NSUserDefaults standardUserDefaults] boolForKey:@"DefaultMpegName"] > 0 )