diff --git a/HandBrakeBatch.xcodeproj/project.pbxproj b/HandBrakeBatch.xcodeproj/project.pbxproj index 5221227..2c476b7 100644 --- a/HandBrakeBatch.xcodeproj/project.pbxproj +++ b/HandBrakeBatch.xcodeproj/project.pbxproj @@ -265,7 +265,7 @@ ORGANIZATIONNAME = ""; TargetAttributes = { 0EEC803A1369B4EA00D05124 = { - DevelopmentTeam = WEY78UNE2S; + DevelopmentTeam = 3SX6WAM729; }; }; }; @@ -274,6 +274,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, ); mainGroup = 0EEC80301369B4EA00D05124; @@ -425,9 +426,10 @@ ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ENABLE_OBJC_ARC = YES; CLANG_WARN_OBJC_RECEIVER_WEAK = NO; - CODE_SIGN_IDENTITY = "Mac Developer"; + CODE_SIGN_IDENTITY = "Apple Development"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; + DEVELOPMENT_TEAM = 3SX6WAM729; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)\"", @@ -450,10 +452,11 @@ ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ENABLE_OBJC_ARC = YES; CLANG_WARN_OBJC_RECEIVER_WEAK = NO; - CODE_SIGN_IDENTITY = "Mac Developer"; + CODE_SIGN_IDENTITY = "Apple Development"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEVELOPMENT_TEAM = 3SX6WAM729; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)\"", diff --git a/HandBrakeBatch.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/HandBrakeBatch.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/HandBrakeBatch.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/HandBrakeBatch/HBBPresets.m b/HandBrakeBatch/HBBPresets.m index f2961e2..156464c 100644 --- a/HandBrakeBatch/HBBPresets.m +++ b/HandBrakeBatch/HBBPresets.m @@ -103,7 +103,7 @@ - (void)initPresets { // If no presets, use the default ones if ( [tempDict count] == 0 ) { for (NSString *currentPreset in defaultPresets) { - tempDict[currentPreset] = [NSString stringWithFormat:@"--preset %@", currentPreset]; + tempDict[currentPreset] = [NSString stringWithFormat:@"--preset\a%@", currentPreset]; NSLog(@"Loading default preset '%@'", currentPreset); } } diff --git a/HandBrakeBatch/HBBProgressController.m b/HandBrakeBatch/HBBProgressController.m index daf1de2..f9c6cb3 100644 --- a/HandBrakeBatch/HBBProgressController.m +++ b/HandBrakeBatch/HBBProgressController.m @@ -366,7 +366,7 @@ - (void)processQueue { BOOL ignoreFollowing = NO; - for (NSString *currentArg in [self.preset componentsSeparatedByCharactersInSet :[NSCharacterSet whitespaceCharacterSet]]) { + for (NSString *currentArg in [self.preset componentsSeparatedByString :@"\a"]) { // We filter out the -a x,y,z argument: added later depending on the audio language preferences if (!ignoreFollowing) { diff --git a/HandBrakeBatch/HBBProgressWindow.xib b/HandBrakeBatch/HBBProgressWindow.xib index ca97f00..ab4aa50 100644 --- a/HandBrakeBatch/HBBProgressWindow.xib +++ b/HandBrakeBatch/HBBProgressWindow.xib @@ -1,896 +1,178 @@ - - - 1080 - 12C60 - 2843 - 1187.34 - 625.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 2843 - - - NSButton - NSButtonCell - NSCustomObject - NSMenu - NSMenuItem - NSPopUpButton - NSPopUpButtonCell - NSProgressIndicator - NSTextField - NSTextFieldCell - NSUserDefaultsController - NSView - NSWindowTemplate - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - HBBProgressController - - - FirstResponder - - - NSApplication - - - 5 - 2 - {{196, 240}, {511, 209}} - 1618478080 - HandBrakeBatch Progress - NSWindow - - - - - 256 - - - - 1290 - {{18, 70}, {473, 20}} - - - 16392 - 100 - - - - 1290 - {{18, 144}, {473, 20}} - - - 16392 - 100 - - - - 268 - {{17, 172}, {86, 17}} - - - YES - - 68157504 - 272630784 - Converting: - - LucidaGrande-Bold - 13 - 16 - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - NO - - - - 268 - {{17, 98}, {116, 17}} - - - YES - - 68157504 - 272630784 - Overall Progress - - - - - - NO - - - - 268 - {{401, 13}, {96, 32}} - - - YES - - 67108864 - 134217728 - Cancel - - LucidaGrande - 13 - 1044 - - - -2038284288 - 129 - - Gw - 200 - 25 - - NO - - - - 268 - {{101, 172}, {391, 17}} - - - YES - - 68157504 - 272630784 - FileName - - LucidaGrande - 13 - 16 - - - - - - NO - - - - 1292 - {{20, 23}, {16, 16}} - - - 20746 - 100 - - - - 268 - {{17, 49}, {89, 17}} - - - YES - - 68157504 - 272630784 - Elapsed time: - - - - - 6 - System - headerTextColor - - - - NO - - - - 268 - {{113, 49}, {66, 17}} - - - YES - - 68157504 - 71304192 - --:--:-- - - - - - - NO - - - - 268 - {{390, 123}, {38, 17}} - - - YES - - 68157504 - 272630784 - ETA: - - - - - - NO - - - - 268 - {{421, 123}, {71, 17}} - - - YES - - 68157504 - 71304192 - --:--:-- - - - - - - NO - - - - 268 - {{262, 13}, {141, 32}} - - - _NS:687 - YES - - 67108864 - 134217728 - Pause / Resume - - _NS:687 - - -2038284288 - 129 - - - 200 - 25 - - NO - - - - -2147483380 - {{42, 23}, {49, 17}} - - - _NS:3944 - YES - - 68157504 - 272630784 - Paused - - _NS:3944 - - - 6 - System - textBackgroundColor - - 3 - MQA - - - - 1 - MSAwIDAAA - - - NO - - - - 268 - {{331, 49}, {161, 17}} - - - _NS:1505 - YES - - 68157504 - 71304192 - Processing --/-- - - _NS:1505 - - - - - NO - - - - 290 - {{126, 17}, {135, 26}} - - - _NS:9 - YES - - -2076180416 - 2048 - - _NS:9 - - 109199360 - 129 - - - 400 - 75 - - - Do nothing - - 1048576 - 2147483647 - 1 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - _popUpItemAction: - - - YES - - OtherViews - - - - - Quit HBB - - 1048576 - 2147483647 - - - _popUpItemAction: - - - - - Put Mac to sleep - - 1048576 - 2147483647 - - - _popUpItemAction: - - - - - Shut down this Mac - - 1048576 - 2147483647 - - - _popUpItemAction: - - - - - - 1 - YES - YES - 2 - - NO - - - {511, 209} - - - - {{0, 0}, {2560, 1418}} - {10000000000000, 10000000000000} - HBBProgressWindow - YES - - - YES - - - - - - - taskProgressBar - - - - 16 - - - - overallProgressBar - - - - 17 - - - - messageField - - - - 18 - - - - window - - - - 19 - - - - progressWheel - - - - 21 - - - - currentETA - - - - 34 - - - - elapsed - - - - 36 - - - - cancelButtonAction: - - - - 40 - - - - pauseButtonAction: - - - - 41 - - - - pausedLabel - - - - 48 - - - - processingLabel - - - - 51 - - - - selectedIndex: values.HBBAfterConversion - - - - - - selectedIndex: values.HBBAfterConversion - selectedIndex - values.HBBAfterConversion - 2 - - - 65 - - - - selectedIndex: values.HBBAfterConversion - - - - - - selectedIndex: values.HBBAfterConversion - selectedIndex - values.HBBAfterConversion - 2 - - - 63 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 1 - - - - - - - - 2 - - - - - - - - - - - - - - - - - - - - - - 3 - - - - - 4 - - - - - - - - 5 - - - - - 6 - - - - - - - - 7 - - - - - 11 - - - - - - - - 12 - - - - - 13 - - - - - 14 - - - - - - - - 15 - - - - - 20 - - - - - 22 - - - - - - - - 23 - - - - - 24 - - - - - - - - 25 - - - - - 26 - - - - - - - - 27 - - - - - 28 - - - - - - - - 29 - - - - - 37 - - - - - - - - 38 - - - - - 44 - - - - - - - - 45 - - - - - 49 - - - - - - - - 50 - - - - - 53 - - - - - - - - 54 - - - - - - - - 55 - - - - - - - - - - - 56 - - - - - 57 - - - - - 58 - - - - - 59 - - - - - 61 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - {{357, 418}, {480, 270}} - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - 65 - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - 3 - - {11, 11} - {10, 3} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HandBrakeBatch/HandBrakeBatch-Info.plist b/HandBrakeBatch/HandBrakeBatch-Info.plist index 68b1302..61006c2 100644 --- a/HandBrakeBatch/HandBrakeBatch-Info.plist +++ b/HandBrakeBatch/HandBrakeBatch-Info.plist @@ -1115,19 +1115,19 @@ 2.25 HandBrakePresets - Universal - iPod - iPhone & iPod Touch - iPhone4 - iPad - AppleTV - AppleTV 2 - Normal - High Profile - Classic - AppleTV Legacy - iPhone Legacy - iPod Legacy + HQ 1080p30 Surround + Fast 1080p30 + Super HQ 1080p30 Surround + Very Fast 1080p30 + Discord Tiny 5 Minutes 240p30 + Discord Small 2 Minutes 360p30 + H.265 MF 1080p + Production Proxy 540p + Production Max + VP9 MKV 2160p60 + H.265 MKV 2160p60 + Apple 2160p60 4K HEVC Surround + Apple 1080p60 Surround LSApplicationCategoryType public.app-category.video diff --git a/HandBrakeBatch/HandBrakeCLI b/HandBrakeBatch/HandBrakeCLI index a3ed927..30ec759 100755 Binary files a/HandBrakeBatch/HandBrakeCLI and b/HandBrakeBatch/HandBrakeCLI differ diff --git a/HandBrakeBatch/Preferences.xib b/HandBrakeBatch/Preferences.xib index 17a69c4..e0fbc6e 100644 --- a/HandBrakeBatch/Preferences.xib +++ b/HandBrakeBatch/Preferences.xib @@ -1,9 +1,9 @@ - - + + - - - + + + @@ -19,17 +19,17 @@ - + - + - + @@ -39,7 +39,7 @@ - - + @@ -67,7 +67,7 @@ - + @@ -76,7 +76,7 @@ - - - + - - - - + @@ -133,22 +130,19 @@ - + - - + + - - + + - - - - - + + @@ -156,8 +150,8 @@ - - + + @@ -165,8 +159,8 @@ - - + + @@ -191,8 +185,8 @@ - - + + @@ -205,8 +199,8 @@ - - + + @@ -214,8 +208,8 @@ - - + + @@ -244,8 +238,8 @@ - - + + @@ -258,8 +252,8 @@ - - + + @@ -267,8 +261,8 @@ - - - -