11 files changed, 47 insertions, 45 deletions
diff --git a/macosx/Controller.h b/macosx/Controller.h
index c8292fcda..faf45553c 100644
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -7,19 +7,18 @@
 #import <Cocoa/Cocoa.h>
 #import <Growl/Growl.h>
 
-#import "HBPictureController.h"
-#import "HBPreviewController.h"
+@class HBQueueController;
 
-#import "HBQueueController.h"
+@class HBVideoController;
+@class HBAudioController;
+@class HBSubtitlesController;
+@class HBAdvancedController;
+@class HBChapterTitlesController;
 
-#import "HBVideoController.h"
-#import "HBAudioController.h"
-#import "HBSubtitlesController.h"
-#import "HBAdvancedController.h"
-#import "HBChapterTitlesController.h"
-
-#import "HBPreferencesController.h"
+@class HBPictureController;
+@class HBPreviewController;
 
+@class HBPreferencesController;
 @class HBOutputPanelController;
 @class HBPresetsViewController;
 @class HBPresetsManager;
diff --git a/macosx/Controller.m b/macosx/Controller.m
index a31a522a1..947d9fca3 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -5,14 +5,25 @@
    It may be used under the terms of the GNU General Public License. */
 
 #import "Controller.h"
+
+#import "HBQueueController.h"
+
 #import "HBOutputPanelController.h"
 #import "HBPreferencesController.h"
 #import "HBPresetsManager.h"
 #import "HBPreset.h"
-#import "HBPreviewController.h"
 #import "HBDockTile.h"
 #import "HBUtilities.h"
 
+#import "HBVideoController.h"
+#import "HBAudioController.h"
+#import "HBSubtitlesController.h"
+#import "HBAdvancedController.h"
+#import "HBChapterTitlesController.h"
+
+#import "HBPictureController.h"
+#import "HBPreviewController.h"
+
 #import "HBPresetsViewController.h"
 #import "HBAddPresetController.h"
 
diff --git a/macosx/HBAudioController.h b/macosx/HBAudioController.h
index 775c6f32b..83dba5c29 100644
--- a/macosx/HBAudioController.h
+++ b/macosx/HBAudioController.h
@@ -7,16 +7,6 @@
 
 #import <Cocoa/Cocoa.h>
 
-extern NSString *keyAudioTrackIndex;
-extern NSString *keyAudioTrackName;
-extern NSString *keyAudioInputBitrate;
-extern NSString *keyAudioInputSampleRate;
-extern NSString *keyAudioInputCodec;
-extern NSString *keyAudioInputCodecParam;
-extern NSString *keyAudioInputChannelLayout;
-
-extern NSString *HBMixdownChangedNotification;
-
 @class HBJob;
 @class HBAudio;
 
diff --git a/macosx/HBAudioController.m b/macosx/HBAudioController.m
index d657e773f..093efaa45 100644
--- a/macosx/HBAudioController.m
+++ b/macosx/HBAudioController.m
@@ -6,29 +6,14 @@
 //
 
 #import "HBAudioController.h"
-#import "Controller.h"
 #import "HBAudio.h"
-#import "HBAudioDefaults.h"
 #import "HBAudioDefaultsController.h"
-#import "HBAudioTrackPreset.h"
 
 #import "HBJob.h"
 
 #import "hb.h"
 #include "lang.h"
 
-NSString *keyAudioTrackIndex = @"keyAudioTrackIndex";
-NSString *keyAudioTrackName = @"keyAudioTrackName";
-NSString *keyAudioInputBitrate = @"keyAudioInputBitrate";
-NSString *keyAudioInputSampleRate = @"keyAudioInputSampleRate";
-NSString *keyAudioInputCodec = @"keyAudioInputCodec";
-NSString *keyAudioInputCodecParam = @"keyAudioInputCodecParam";
-NSString *keyAudioInputChannelLayout = @"keyAudioInputChannelLayout";
-NSString *keyAudioTrackLanguageIsoCode = @"keyAudioTrackLanguageIsoCode";
-
-NSString *HBMixdownChangedNotification = @"HBMixdownChangedNotification";
-
-
 @interface HBAudioController () {
     IBOutlet NSTableView         * fTableView;
 
diff --git a/macosx/HBChapterTitlesController.m b/macosx/HBChapterTitlesController.m
index 574dc538c..ad48b48fe 100644
--- a/macosx/HBChapterTitlesController.m
+++ b/macosx/HBChapterTitlesController.m
@@ -5,7 +5,6 @@
    It may be used under the terms of the GNU General Public License. */
    
 #import "HBChapterTitlesController.h"
-#import "Controller.h"
 #import "HBJob.h"
 
 @interface HBChapterTitlesController () <NSTableViewDataSource, NSTableViewDelegate>
diff --git a/macosx/HBJob.h b/macosx/HBJob.h
index b3866f037..d37d48240 100644
--- a/macosx/HBJob.h
+++ b/macosx/HBJob.h
@@ -15,15 +15,30 @@
 #import "HBFilters.h"
 
 #import "HBAudio.h"
+#import "HBAudioTrackPreset.h"
 
 #import "HBAudioDefaults.h"
 #import "HBSubtitlesDefaults.h"
 
 #include "hb.h"
 
+extern NSString *HBMixdownChangedNotification;
 extern NSString *HBContainerChangedNotification;
 extern NSString *keyContainerTag;
 
+
+/**
+ *  Audio track dicts keys.
+ */
+extern NSString *keyAudioTrackIndex;
+extern NSString *keyAudioTrackName;
+extern NSString *keyAudioInputBitrate;
+extern NSString *keyAudioInputSampleRate;
+extern NSString *keyAudioInputCodec;
+extern NSString *keyAudioInputCodecParam;
+extern NSString *keyAudioInputChannelLayout;
+extern NSString *keyAudioTrackLanguageIsoCode;
+
 typedef NS_ENUM(NSUInteger, HBJobState) {
     HBJobStateReady,
     HBJobStateWorking,
diff --git a/macosx/HBJob.m b/macosx/HBJob.m
index 8e26f7275..e72c06a81 100644
--- a/macosx/HBJob.m
+++ b/macosx/HBJob.m
@@ -13,6 +13,16 @@
 
 #import "NSCodingMacro.h"
 
+NSString *keyAudioTrackIndex = @"keyAudioTrackIndex";
+NSString *keyAudioTrackName = @"keyAudioTrackName";
+NSString *keyAudioInputBitrate = @"keyAudioInputBitrate";
+NSString *keyAudioInputSampleRate = @"keyAudioInputSampleRate";
+NSString *keyAudioInputCodec = @"keyAudioInputCodec";
+NSString *keyAudioInputCodecParam = @"keyAudioInputCodecParam";
+NSString *keyAudioInputChannelLayout = @"keyAudioInputChannelLayout";
+NSString *keyAudioTrackLanguageIsoCode = @"keyAudioTrackLanguageIsoCode";
+
+NSString *HBMixdownChangedNotification         = @"HBMixdownChangedNotification";
 NSString *HBContainerChangedNotification       = @"HBContainerChangedNotification";
 NSString *keyContainerTag                      = @"keyContainerTag";
 
diff --git a/macosx/HBPreviewController.h b/macosx/HBPreviewController.h
index a90f8f957..fa45affb0 100644
--- a/macosx/HBPreviewController.h
+++ b/macosx/HBPreviewController.h
@@ -6,8 +6,6 @@
 
 #import <Cocoa/Cocoa.h>
 
-@class HBController;
-
 @class HBCore;
 @class HBJob;
 
diff --git a/macosx/HBPreviewGenerator.m b/macosx/HBPreviewGenerator.m
index fa589bd00..70eec3d74 100644
--- a/macosx/HBPreviewGenerator.m
+++ b/macosx/HBPreviewGenerator.m
@@ -191,7 +191,6 @@ typedef enum EncodeState : NSUInteger {
 /**
  * This function start the encode of a movie preview, the delegate will be
  * called with the updated the progress info and the fileURL.
- * The called must call HBController prepareJobForPreview before this.
  *
  * @param index picture index in title.
  * @param duration the duration in seconds of the preview movie.
diff --git a/macosx/HBSubtitlesController.m b/macosx/HBSubtitlesController.m
index 5f836289c..b6433ef8a 100644
--- a/macosx/HBSubtitlesController.m
+++ b/macosx/HBSubtitlesController.m
@@ -6,11 +6,9 @@
 
 #import "HBSubtitlesController.h"
 #import "HBSubtitlesDefaultsController.h"
-#import "HBSubtitlesDefaults.h"
 
 #import "HBJob.h"
 
-#import "Controller.h"
 #include "hb.h"
 #include "lang.h"
 
@@ -84,7 +82,7 @@ NSString *keySubTrackLanguageIndex = @"keySubTrackLanguageIndex";
                           @"ISO-8859-9E", @"ISO-8859-10", @"ISO-8859-11", @"ISO-8859-13", @"ISO-8859-14", @"ISO-8859-15", @"ISO-8859-16",
                           @"UTF-7", @"UTF-8", @"UTF-16", @"UTF-16LE", @"UTF-16BE", @"UTF-32", @"UTF-32LE", @"UTF-32BE"] retain];
 
-        // Register as observer for the HBController notifications.
+        // Register as observer for the HBJob notifications.
         [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(containerChanged:) name: HBContainerChangedNotification object: nil];
     }
 
diff --git a/macosx/HBVideoController.h b/macosx/HBVideoController.h
index c0c572fa6..0816e1d71 100644
--- a/macosx/HBVideoController.h
+++ b/macosx/HBVideoController.h
@@ -6,9 +6,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-@class HBController;
 @class HBAdvancedController;
-
 @class HBVideo;
 
 /**