summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libhb/platform/macosx/encca_aac.c1
-rw-r--r--macosx/HBOutputPanelController.m5
-rw-r--r--macosx/HBPicture.m4
-rw-r--r--macosx/HBQueueItem.m4
-rw-r--r--macosx/HBRange.m6
-rw-r--r--macosx/HBTitle.m3
-rw-r--r--macosx/HBVideo.m8
-rw-r--r--macosx/HandBrake.xcodeproj/project.pbxproj6
-rw-r--r--macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug-Sandbox.xcscheme10
-rw-r--r--macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug.xcscheme24
-rw-r--r--macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Distribution.xcscheme10
-rw-r--r--macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release-Sandbox.xcscheme24
-rw-r--r--macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release.xcscheme24
13 files changed, 56 insertions, 73 deletions
diff --git a/libhb/platform/macosx/encca_aac.c b/libhb/platform/macosx/encca_aac.c
index 5c108cba4..e29d12d17 100644
--- a/libhb/platform/macosx/encca_aac.c
+++ b/libhb/platform/macosx/encca_aac.c
@@ -9,6 +9,7 @@
#include "handbrake/handbrake.h"
#include "handbrake/audio_remap.h"
+#include "handbrake/hbffmpeg.h"
#include <AudioToolbox/AudioToolbox.h>
#include <CoreAudio/CoreAudio.h>
diff --git a/macosx/HBOutputPanelController.m b/macosx/HBOutputPanelController.m
index 3cfec6caa..7d9b8c66c 100644
--- a/macosx/HBOutputPanelController.m
+++ b/macosx/HBOutputPanelController.m
@@ -87,9 +87,11 @@
[super showWindow:sender];
}
+/**
+ Write the HandBrake version number to the log
+ */
- (void)writeHeader
{
- // Lets report the HandBrake version number here to the activity log and text log file
NSDictionary *infoDict = NSBundle.mainBundle.infoDictionary;
NSString *versionStringFull = [NSString stringWithFormat:@"Handbrake Version: %@ (%@)", infoDict[@"CFBundleShortVersionString"], infoDict[@"CFBundleVersion"]];
[HBUtilities writeToActivityLog:"%s", versionStringFull.UTF8String];
@@ -140,7 +142,6 @@
*/
- (IBAction)openActivityLogFile:(id)sender
{
- // Opens the activity window log file in the users default text editor
[NSWorkspace.sharedWorkspace openURL:self.outputFile.url];
}
diff --git a/macosx/HBPicture.m b/macosx/HBPicture.m
index a623d9600..113a77142 100644
--- a/macosx/HBPicture.m
+++ b/macosx/HBPicture.m
@@ -571,7 +571,7 @@ NSString * const HBPictureChangedNotification = @"HBPictureChangedNotification";
encodeInt(_height);
encodeBool(_keepDisplayAspect);
- encodeInt(_anamorphicMode);
+ encodeInteger(_anamorphicMode);
encodeInt(_modulus);
encodeInt(_displayWidth);
@@ -603,7 +603,7 @@ NSString * const HBPictureChangedNotification = @"HBPictureChangedNotification";
decodeInt(_height); if (_height < 0) { goto fail; }
decodeBool(_keepDisplayAspect);
- decodeInt(_anamorphicMode);
+ decodeInteger(_anamorphicMode);
if (_anamorphicMode < HBPictureAnarmophicModeNone || _anamorphicMode > HBPictureAnarmophicModeAuto)
{
goto fail;
diff --git a/macosx/HBQueueItem.m b/macosx/HBQueueItem.m
index b8feb4b0e..6915d61dd 100644
--- a/macosx/HBQueueItem.m
+++ b/macosx/HBQueueItem.m
@@ -230,7 +230,7 @@ static NSString *versionKey = @"HBQueueItemVersion";
- (void)encodeWithCoder:(nonnull NSCoder *)coder
{
[coder encodeInt:1 forKey:versionKey];
- encodeInt(_state);
+ encodeInteger(_state);
encodeObject(_job);
encodeObject(_uuid);
@@ -251,7 +251,7 @@ static NSString *versionKey = @"HBQueueItemVersion";
if (version == 1 && (self = [super init]))
{
- decodeInt(_state); if (_state < HBQueueItemStateReady || _state > HBQueueItemStateFailed) { goto fail; }
+ decodeInteger(_state); if (_state < HBQueueItemStateReady || _state > HBQueueItemStateFailed) { goto fail; }
decodeObjectOrFail(_job, HBJob);
decodeObjectOrFail(_uuid, NSString);
diff --git a/macosx/HBRange.m b/macosx/HBRange.m
index 5a8d9d27a..26b354395 100644
--- a/macosx/HBRange.m
+++ b/macosx/HBRange.m
@@ -12,8 +12,6 @@ NSString *HBRangeChangedNotification = @"HBRangeChangedNotification";
@implementation HBRange
-#pragma mark - NSCoding
-
- (instancetype)initWithTitle:(HBTitle *)title
{
self = [super init];
@@ -193,7 +191,7 @@ NSString *HBRangeChangedNotification = @"HBRangeChangedNotification";
{
[coder encodeInt:1 forKey:@"HBRangeVersion"];
- encodeInt(_type);
+ encodeInteger(_type);
encodeInt(_chapterStart);
encodeInt(_chapterStop);
@@ -209,7 +207,7 @@ NSString *HBRangeChangedNotification = @"HBRangeChangedNotification";
{
self = [super init];
- decodeInt(_type); if (_type < HBRangeTypeChapters || _type > HBRangePreviewIndex) { goto fail; }
+ decodeInteger(_type); if (_type < HBRangeTypeChapters || _type > HBRangePreviewIndex) { goto fail; }
decodeInt(_chapterStart); if (_chapterStart < 0) { goto fail; }
decodeInt(_chapterStop); if (_chapterStop < _chapterStart) { goto fail; }
diff --git a/macosx/HBTitle.m b/macosx/HBTitle.m
index 895ef6fe8..653b63b4c 100644
--- a/macosx/HBTitle.m
+++ b/macosx/HBTitle.m
@@ -128,9 +128,8 @@ fail:
if (self)
{
_displayName = [displayName copy];
- _title = @"";
_type = type;
- _isoLanguageCode = @"";
+ _isoLanguageCode = @"und";
_fileURL = fileURL;
}
return self;
diff --git a/macosx/HBVideo.m b/macosx/HBVideo.m
index c062759e0..cb4cca3b9 100644
--- a/macosx/HBVideo.m
+++ b/macosx/HBVideo.m
@@ -499,7 +499,7 @@ NSString * const HBVideoChangedNotification = @"HBVideoChangedNotification";
encodeInt(_encoder);
- encodeInt(_qualityType);
+ encodeInteger(_qualityType);
encodeInt(_avgBitrate);
encodeDouble(_quality);
@@ -507,7 +507,7 @@ NSString * const HBVideoChangedNotification = @"HBVideoChangedNotification";
encodeDouble(_qualityMaxValue);
encodeInt(_frameRate);
- encodeInt(_frameRateMode);
+ encodeInteger(_frameRateMode);
encodeBool(_twoPass);
encodeBool(_turboTwoPass);
@@ -528,7 +528,7 @@ NSString * const HBVideoChangedNotification = @"HBVideoChangedNotification";
decodeInt(_encoder);
- decodeInt(_qualityType); if (_qualityType < HBVideoQualityTypeAvgBitrate || _qualityType > HBVideoQualityTypeConstantQuality) { goto fail; }
+ decodeInteger(_qualityType); if (_qualityType < HBVideoQualityTypeAvgBitrate || _qualityType > HBVideoQualityTypeConstantQuality) { goto fail; }
decodeInt(_avgBitrate); if (_avgBitrate < 0) { goto fail; }
decodeDouble(_quality);
@@ -536,7 +536,7 @@ NSString * const HBVideoChangedNotification = @"HBVideoChangedNotification";
decodeDouble(_qualityMaxValue);
decodeInt(_frameRate); if (_frameRate < 0) { goto fail; }
- decodeInt(_frameRateMode); if (_frameRateMode < HBVideoFrameRateModeVFR_PFR || _frameRateMode > HBVideoFrameRateModeCFR) { goto fail; }
+ decodeInteger(_frameRateMode); if (_frameRateMode < HBVideoFrameRateModeVFR_PFR || _frameRateMode > HBVideoFrameRateModeCFR) { goto fail; }
decodeBool(_twoPass);
decodeBool(_turboTwoPass);
diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj
index 2b30ed702..a09bf0a66 100644
--- a/macosx/HandBrake.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -1710,7 +1710,7 @@
273F1FE014AD9DA40021BE6D /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 1010;
+ LastUpgradeCheck = 1100;
TargetAttributes = {
273F203814ADBC200021BE6D = {
SystemCapabilities = {
@@ -2655,6 +2655,7 @@
"\"$(EXTERNAL_BUILD)/libhb\"",
"\"$(EXTERNAL_BUILD)/contrib/lib\"",
);
+ PRODUCT_BUNDLE_IDENTIFIER = fr.handbrake.HandBrake;
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;
};
@@ -2687,6 +2688,7 @@
"\"$(EXTERNAL_BUILD)/libhb\"",
"\"$(EXTERNAL_BUILD)/contrib/lib\"",
);
+ PRODUCT_BUNDLE_IDENTIFIER = fr.handbrake.HandBrake;
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;
};
@@ -3473,6 +3475,7 @@
"\"$(EXTERNAL_BUILD)/libhb\"",
"\"$(EXTERNAL_BUILD)/contrib/lib\"",
);
+ PRODUCT_BUNDLE_IDENTIFIER = fr.handbrake.HandBrake;
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;
};
@@ -3723,6 +3726,7 @@
"\"$(EXTERNAL_BUILD)/libhb\"",
"\"$(EXTERNAL_BUILD)/contrib/lib\"",
);
+ PRODUCT_BUNDLE_IDENTIFIER = fr.handbrake.HandBrake;
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;
};
diff --git a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug-Sandbox.xcscheme b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug-Sandbox.xcscheme
index de32f3600..162a366ea 100644
--- a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug-Sandbox.xcscheme
+++ b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug-Sandbox.xcscheme
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
- LastUpgradeVersion = "1010"
+ LastUpgradeVersion = "1100"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@@ -55,8 +55,6 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
- <Testables>
- </Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
@@ -66,8 +64,8 @@
ReferencedContainer = "container:HandBrake.xcodeproj">
</BuildableReference>
</MacroExpansion>
- <AdditionalOptions>
- </AdditionalOptions>
+ <Testables>
+ </Testables>
</TestAction>
<LaunchAction
buildConfiguration = "debug-sandbox"
@@ -89,8 +87,6 @@
ReferencedContainer = "container:HandBrake.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
- <AdditionalOptions>
- </AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "debug-sandbox"
diff --git a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug.xcscheme b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug.xcscheme
index 712b607df..197050866 100644
--- a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug.xcscheme
+++ b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug.xcscheme
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
- LastUpgradeVersion = "1010"
+ LastUpgradeVersion = "1100"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@@ -41,6 +41,15 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
+ <MacroExpansion>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "273F203814ADBC200021BE6D"
+ BuildableName = "HandBrake.app"
+ BlueprintName = "HandBrake"
+ ReferencedContainer = "container:HandBrake.xcodeproj">
+ </BuildableReference>
+ </MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
@@ -53,17 +62,6 @@
</BuildableReference>
</TestableReference>
</Testables>
- <MacroExpansion>
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "273F203814ADBC200021BE6D"
- BuildableName = "HandBrake.app"
- BlueprintName = "HandBrake"
- ReferencedContainer = "container:HandBrake.xcodeproj">
- </BuildableReference>
- </MacroExpansion>
- <AdditionalOptions>
- </AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "debug"
@@ -85,8 +83,6 @@
ReferencedContainer = "container:HandBrake.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
- <AdditionalOptions>
- </AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "debug"
diff --git a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Distribution.xcscheme b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Distribution.xcscheme
index 4d31568c7..d2c005c91 100644
--- a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Distribution.xcscheme
+++ b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Distribution.xcscheme
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
- LastUpgradeVersion = "1010"
+ LastUpgradeVersion = "1100"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@@ -27,8 +27,6 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
- <Testables>
- </Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
ReferencedContainer = "container:HandBrake.xcodeproj">
</BuildableReference>
</MacroExpansion>
- <AdditionalOptions>
- </AdditionalOptions>
+ <Testables>
+ </Testables>
</TestAction>
<LaunchAction
buildConfiguration = "release"
@@ -61,8 +59,6 @@
ReferencedContainer = "container:HandBrake.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
- <AdditionalOptions>
- </AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "release"
diff --git a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release-Sandbox.xcscheme b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release-Sandbox.xcscheme
index 1e04e9b67..cd943e093 100644
--- a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release-Sandbox.xcscheme
+++ b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release-Sandbox.xcscheme
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
- LastUpgradeVersion = "1010"
+ LastUpgradeVersion = "1100"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@@ -55,6 +55,15 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
+ <MacroExpansion>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "273F1FFE14ADAE950021BE6D"
+ BuildableName = "HandBrakeCLI"
+ BlueprintName = "HandBrakeCLI"
+ ReferencedContainer = "container:HandBrake.xcodeproj">
+ </BuildableReference>
+ </MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
@@ -67,17 +76,6 @@
</BuildableReference>
</TestableReference>
</Testables>
- <MacroExpansion>
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "273F1FFE14ADAE950021BE6D"
- BuildableName = "HandBrakeCLI"
- BlueprintName = "HandBrakeCLI"
- ReferencedContainer = "container:HandBrake.xcodeproj">
- </BuildableReference>
- </MacroExpansion>
- <AdditionalOptions>
- </AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "release-sandbox"
@@ -100,8 +98,6 @@
ReferencedContainer = "container:HandBrake.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
- <AdditionalOptions>
- </AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "release-sandbox"
diff --git a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release.xcscheme b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release.xcscheme
index 907022fea..ce3bfef8e 100644
--- a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release.xcscheme
+++ b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release.xcscheme
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
- LastUpgradeVersion = "1010"
+ LastUpgradeVersion = "1100"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@@ -55,6 +55,15 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
+ <MacroExpansion>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "273F203814ADBC200021BE6D"
+ BuildableName = "HandBrake.app"
+ BlueprintName = "HandBrake"
+ ReferencedContainer = "container:HandBrake.xcodeproj">
+ </BuildableReference>
+ </MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
@@ -67,17 +76,6 @@
</BuildableReference>
</TestableReference>
</Testables>
- <MacroExpansion>
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "273F203814ADBC200021BE6D"
- BuildableName = "HandBrake.app"
- BlueprintName = "HandBrake"
- ReferencedContainer = "container:HandBrake.xcodeproj">
- </BuildableReference>
- </MacroExpansion>
- <AdditionalOptions>
- </AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "release"
@@ -100,8 +98,6 @@
ReferencedContainer = "container:HandBrake.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
- <AdditionalOptions>
- </AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "release"
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 01:15:09 +0000