summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
Diffstat (limited to 'macosx')
-rw-r--r--macosx/HBAudio.m2
-rw-r--r--macosx/HBAudioDefaults.m4
-rw-r--r--macosx/HBAudioTrack.m2
-rw-r--r--macosx/HBAudioTrackPreset.m2
-rw-r--r--macosx/HBAudioTransformers.m2
-rw-r--r--macosx/HBFilters+UIAdditions.m2
-rw-r--r--macosx/HBFilters.m2
-rw-r--r--macosx/HBImageUtilities.m2
-rw-r--r--macosx/HBJob+HBAdditions.m2
-rw-r--r--macosx/HBJob+HBJobConversion.h2
-rw-r--r--macosx/HBJob+UIAdditions.m2
-rw-r--r--macosx/HBJob.m2
-rw-r--r--macosx/HBLanguagesSelection.m2
-rw-r--r--macosx/HBPicture+UIAdditions.m2
-rw-r--r--macosx/HBPicture.m2
-rw-r--r--macosx/HBPreset.m2
-rw-r--r--macosx/HBPresetsManager.m2
-rw-r--r--macosx/HBStateFormatter+Private.h2
-rw-r--r--macosx/HBStateFormatter.m2
-rw-r--r--macosx/HBSubtitles.m2
-rw-r--r--macosx/HBSubtitlesTrack.m4
-rw-r--r--macosx/HBTitle+Private.h2
-rw-r--r--macosx/HBTitle.m2
-rw-r--r--macosx/HBUtilities.m2
-rw-r--r--macosx/HBVideo+UIAdditions.m2
-rw-r--r--macosx/HBVideo.m2
-rw-r--r--macosx/HandBrake.xcodeproj/project.pbxproj4
-rw-r--r--macosx/NSDictionary+HBAdditions.h2
28 files changed, 31 insertions, 31 deletions
diff --git a/macosx/HBAudio.m b/macosx/HBAudio.m
index 0d825ddf6..046d9a8e7 100644
--- a/macosx/HBAudio.m
+++ b/macosx/HBAudio.m
@@ -17,7 +17,7 @@
#import "HBLocalizationUtilities.h"
#import "HBJob+Private.h"
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
#define NONE_TRACK_INDEX 0
diff --git a/macosx/HBAudioDefaults.m b/macosx/HBAudioDefaults.m
index ac05c2b25..a59b55cef 100644
--- a/macosx/HBAudioDefaults.m
+++ b/macosx/HBAudioDefaults.m
@@ -9,8 +9,8 @@
#import "HBCodingUtilities.h"
#import "HBMutablePreset.h"
-#import "handbrake.h"
-#import "lang.h"
+#import "handbrake/handbrake.h"
+#import "handbrake/lang.h"
@interface HBAudioDefaults ()
diff --git a/macosx/HBAudioTrack.m b/macosx/HBAudioTrack.m
index 0ac7f619d..1f4b8b034 100644
--- a/macosx/HBAudioTrack.m
+++ b/macosx/HBAudioTrack.m
@@ -9,7 +9,7 @@
#import "HBJob.h"
#import "HBCodingUtilities.h"
#import "HBTitle.h"
-#import "handbrake.h"
+#import "handbrake/handbrake.h"
#define DEFAULT_SAMPLERATE 48000
diff --git a/macosx/HBAudioTrackPreset.m b/macosx/HBAudioTrackPreset.m
index ea286c3f4..94542de7e 100644
--- a/macosx/HBAudioTrackPreset.m
+++ b/macosx/HBAudioTrackPreset.m
@@ -6,7 +6,7 @@
#import "HBAudioTrackPreset.h"
#import "HBCodingUtilities.h"
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
#define DEFAULT_SAMPLERATE 48000
diff --git a/macosx/HBAudioTransformers.m b/macosx/HBAudioTransformers.m
index 95cd66116..07a95001b 100644
--- a/macosx/HBAudioTransformers.m
+++ b/macosx/HBAudioTransformers.m
@@ -6,7 +6,7 @@
#import "HBAudioTransformers.h"
#import "HBLocalizationUtilities.h"
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
#pragma mark - Value Transformers
diff --git a/macosx/HBFilters+UIAdditions.m b/macosx/HBFilters+UIAdditions.m
index d76f25feb..443d0f884 100644
--- a/macosx/HBFilters+UIAdditions.m
+++ b/macosx/HBFilters+UIAdditions.m
@@ -7,7 +7,7 @@
#import "HBFilters+UIAdditions.h"
#import "HBLocalizationUtilities.h"
-#import "handbrake.h"
+#import "handbrake/handbrake.h"
/**
* Converts a hb_filter_param_t * array to a NSArray of NSString.
diff --git a/macosx/HBFilters.m b/macosx/HBFilters.m
index d969d82ab..077c85e8d 100644
--- a/macosx/HBFilters.m
+++ b/macosx/HBFilters.m
@@ -10,7 +10,7 @@
#import "NSDictionary+HBAdditions.h"
#import "HBMutablePreset.h"
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
NSString * const HBFiltersChangedNotification = @"HBFiltersChangedNotification";
diff --git a/macosx/HBImageUtilities.m b/macosx/HBImageUtilities.m
index 61d1fcfae..f0c296a78 100644
--- a/macosx/HBImageUtilities.m
+++ b/macosx/HBImageUtilities.m
@@ -6,7 +6,7 @@
#import "HBImageUtilities.h"
#import <Cocoa/Cocoa.h>
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
CGImageRef CreateScaledCGImageFromCGImage(CGImageRef image, CGFloat thumbnailHeight)
{
diff --git a/macosx/HBJob+HBAdditions.m b/macosx/HBJob+HBAdditions.m
index 552b8570e..3d8a211bc 100644
--- a/macosx/HBJob+HBAdditions.m
+++ b/macosx/HBJob+HBAdditions.m
@@ -6,7 +6,7 @@
#import "HBJob+HBAdditions.h"
#import "HBPreferencesKeys.h"
-#import "handbrake.h"
+#import "handbrake/handbrake.h"
static NSDateFormatter *_timeFormatter = nil;
static NSDateFormatter *_dateFormatter = nil;
diff --git a/macosx/HBJob+HBJobConversion.h b/macosx/HBJob+HBJobConversion.h
index fdbca64e4..44fe60d60 100644
--- a/macosx/HBJob+HBJobConversion.h
+++ b/macosx/HBJob+HBJobConversion.h
@@ -6,7 +6,7 @@
#import <Foundation/Foundation.h>
#import "HBJob.h"
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
@interface HBJob (HBJobConversion)
diff --git a/macosx/HBJob+UIAdditions.m b/macosx/HBJob+UIAdditions.m
index 3ce379eed..85118083e 100644
--- a/macosx/HBJob+UIAdditions.m
+++ b/macosx/HBJob+UIAdditions.m
@@ -20,7 +20,7 @@
#import "HBLocalizationUtilities.h"
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
// Text Styles
static NSDictionary *detailAttr;
diff --git a/macosx/HBJob.m b/macosx/HBJob.m
index 5960ee51b..8fe439212 100644
--- a/macosx/HBJob.m
+++ b/macosx/HBJob.m
@@ -17,7 +17,7 @@
#import "HBUtilities.h"
#import "HBSecurityAccessToken.h"
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
NSString *HBContainerChangedNotification = @"HBContainerChangedNotification";
NSString *HBChaptersChangedNotification = @"HBChaptersChangedNotification";
diff --git a/macosx/HBLanguagesSelection.m b/macosx/HBLanguagesSelection.m
index 3fedddd6d..018c84875 100644
--- a/macosx/HBLanguagesSelection.m
+++ b/macosx/HBLanguagesSelection.m
@@ -5,7 +5,7 @@
It may be used under the terms of the GNU General Public License. */
#import "HBLanguagesSelection.h"
-#include "lang.h"
+#include "handbrake/lang.h"
@implementation HBLang
diff --git a/macosx/HBPicture+UIAdditions.m b/macosx/HBPicture+UIAdditions.m
index 9250d0211..41b40425e 100644
--- a/macosx/HBPicture+UIAdditions.m
+++ b/macosx/HBPicture+UIAdditions.m
@@ -8,7 +8,7 @@
#import "HBTitle.h"
#import "HBLocalizationUtilities.h"
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
@implementation HBPicture (UIAdditions)
diff --git a/macosx/HBPicture.m b/macosx/HBPicture.m
index 6048714d1..a623d9600 100644
--- a/macosx/HBPicture.m
+++ b/macosx/HBPicture.m
@@ -10,7 +10,7 @@
#import "HBCodingUtilities.h"
#import "HBMutablePreset.h"
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
NSString * const HBPictureChangedNotification = @"HBPictureChangedNotification";
diff --git a/macosx/HBPreset.m b/macosx/HBPreset.m
index 917657c74..81b0b51b2 100644
--- a/macosx/HBPreset.m
+++ b/macosx/HBPreset.m
@@ -7,7 +7,7 @@
#import "HBPreset.h"
#import "HBMutablePreset.h"
-#include "preset.h"
+#include "handbrake/preset.h"
#import "NSJSONSerialization+HBAdditions.h"
#import "HBLocalizationUtilities.h"
diff --git a/macosx/HBPresetsManager.m b/macosx/HBPresetsManager.m
index e5b3b3173..ac2ea95c1 100644
--- a/macosx/HBPresetsManager.m
+++ b/macosx/HBPresetsManager.m
@@ -10,7 +10,7 @@
#import "HBUtilities.h"
#import "NSJSONSerialization+HBAdditions.h"
-#include "preset.h"
+#include "handbrake/preset.h"
NSString *HBPresetsChangedNotification = @"HBPresetsChangedNotification";
diff --git a/macosx/HBStateFormatter+Private.h b/macosx/HBStateFormatter+Private.h
index e7d2e3624..2f4f261a8 100644
--- a/macosx/HBStateFormatter+Private.h
+++ b/macosx/HBStateFormatter+Private.h
@@ -8,7 +8,7 @@
#import <Foundation/Foundation.h>
#import "HBStateFormatter.h"
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/macosx/HBStateFormatter.m b/macosx/HBStateFormatter.m
index 39b69a6b2..6d7ca5e16 100644
--- a/macosx/HBStateFormatter.m
+++ b/macosx/HBStateFormatter.m
@@ -6,7 +6,7 @@
#import "HBStateFormatter.h"
#import "HBLocalizationUtilities.h"
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
@implementation HBStateFormatter
diff --git a/macosx/HBSubtitles.m b/macosx/HBSubtitles.m
index 8119813ea..9d2833df4 100644
--- a/macosx/HBSubtitles.m
+++ b/macosx/HBSubtitles.m
@@ -18,7 +18,7 @@
#import "HBJob+Private.h"
#import "HBSecurityAccessToken.h"
-#include "common.h"
+#include "handbrake/common.h"
#define NONE_TRACK_INDEX 0
#define FOREIGN_TRACK_INDEX 1
diff --git a/macosx/HBSubtitlesTrack.m b/macosx/HBSubtitlesTrack.m
index 019c89cf9..457410a27 100644
--- a/macosx/HBSubtitlesTrack.m
+++ b/macosx/HBSubtitlesTrack.m
@@ -8,8 +8,8 @@
#import "HBCodingUtilities.h"
#import "HBTitle.h"
-#include "common.h"
-#include "lang.h"
+#include "handbrake/common.h"
+#include "handbrake/lang.h"
#define CHAR_CODE_DEFAULT_INDEX 28
diff --git a/macosx/HBTitle+Private.h b/macosx/HBTitle+Private.h
index 7afb7defc..57e4cb9e6 100644
--- a/macosx/HBTitle+Private.h
+++ b/macosx/HBTitle+Private.h
@@ -7,7 +7,7 @@
#import <Foundation/Foundation.h>
#import "HBTitle.h"
#import "HBPreset.h"
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
@interface HBTitle (Private)
diff --git a/macosx/HBTitle.m b/macosx/HBTitle.m
index dbb52a080..895ef6fe8 100644
--- a/macosx/HBTitle.m
+++ b/macosx/HBTitle.m
@@ -14,7 +14,7 @@
#import "HBSecurityAccessToken.h"
#import "HBUtilities.h"
-#include "lang.h"
+#include "handbrake/lang.h"
@interface HBMetadata ()
diff --git a/macosx/HBUtilities.m b/macosx/HBUtilities.m
index 1f2810a52..4015dd916 100644
--- a/macosx/HBUtilities.m
+++ b/macosx/HBUtilities.m
@@ -7,7 +7,7 @@
#import "HBUtilities.h"
#import <Cocoa/Cocoa.h>
-#include "lang.h"
+#include "handbrake/lang.h"
static BOOL hb_resolveBookmarks = YES;
diff --git a/macosx/HBVideo+UIAdditions.m b/macosx/HBVideo+UIAdditions.m
index a2c1b4d39..cd9823698 100644
--- a/macosx/HBVideo+UIAdditions.m
+++ b/macosx/HBVideo+UIAdditions.m
@@ -8,7 +8,7 @@
#import "HBJob+Private.h"
#import "HBLocalizationUtilities.h"
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
@implementation HBVideo (UIAdditions)
diff --git a/macosx/HBVideo.m b/macosx/HBVideo.m
index 815292157..c062759e0 100644
--- a/macosx/HBVideo.m
+++ b/macosx/HBVideo.m
@@ -9,7 +9,7 @@
#import "HBCodingUtilities.h"
#import "HBMutablePreset.h"
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
NSString * const HBVideoChangedNotification = @"HBVideoChangedNotification";
diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj
index f96e2958f..2b30ed702 100644
--- a/macosx/HandBrake.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -1860,8 +1860,8 @@
outputFileListPaths = (
);
outputPaths = (
- "$(EXTERNAL_BUILD)/libhb/hb_dict.h",
- "$(EXTERNAL_BUILD)/libhb/handbrake.h",
+ "$(EXTERNAL_BUILD)/libhb/handbrake/hb_dict.h",
+ "$(EXTERNAL_BUILD)/libhb/handbrake/handbrake.h",
"$(EXTERNAL_BUILD)/macosx/Info.plist",
);
runOnlyForDeploymentPostprocessing = 0;
diff --git a/macosx/NSDictionary+HBAdditions.h b/macosx/NSDictionary+HBAdditions.h
index b653d1b59..42fc79a54 100644
--- a/macosx/NSDictionary+HBAdditions.h
+++ b/macosx/NSDictionary+HBAdditions.h
@@ -5,7 +5,7 @@
It may be used under the terms of the GNU General Public License. */
#import <Foundation/Foundation.h>
-#include "hb_dict.h"
+#include "handbrake/hb_dict.h"
NS_ASSUME_NONNULL_BEGIN