MacGui: Move the audio/subtitles selection logic out of the view controllers. Now it's possible to create a HBJob and apply a preset to without the UI classes help.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6741 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 16 insertions, 19 deletions

diff --git a/macosx/HBJob.h b/macosx/HBJob.h
index 721db9dfe..d7e4f14c7 100644
--- a/macosx/HBJob.h
+++ b/macosx/HBJob.h
@@ -14,19 +14,16 @@
 #import "HBPicture.h"
 #import "HBFilters.h"
 
-#import "HBAudioTrack.h"
-#import "HBAudioTrackPreset.h"
-
-#import "HBAudioDefaults.h"
-#import "HBSubtitlesDefaults.h"
-
-#include "hb.h"
+#import "HBAudio.h"
+#import "HBSubtitles.h"
 
 extern NSString *HBMixdownChangedNotification;
 extern NSString *HBContainerChangedNotification;
-extern NSString *keyContainerTag;
 
-typedef NS_ENUM(NSUInteger, HBJobState) {
+/**
+ *  A flag to indicate the job's state
+ */
+typedef NS_ENUM(NSUInteger, HBJobState){
     HBJobStateReady,
     HBJobStateWorking,
     HBJobStateCompleted,
@@ -47,18 +44,22 @@ typedef NS_ENUM(NSUInteger, HBJobState) {
  *  Current state of the job.
  */
 @property (nonatomic, readwrite) HBJobState state;
+
 @property (nonatomic, readwrite, copy) NSString *presetName;
 
 @property (nonatomic, readwrite, assign) HBTitle *title;
 @property (nonatomic, readonly) int titleIdx;
 @property (nonatomic, readwrite) int pidId;
 
-// Urls
+/**
+ *  The file URL of the source.
+ */
 @property (nonatomic, readonly) NSURL *fileURL;
-@property (nonatomic, readwrite, copy) NSURL *destURL;
 
-// Libhb job
-@property (nonatomic, readonly) hb_job_t *hb_job;
+/**
+ *  The file URL at which the new file will be created.
+ */
+@property (nonatomic, readwrite, copy) NSURL *destURL;
 
 // Job settings
 @property (nonatomic, readwrite) int container;
@@ -72,14 +73,10 @@ typedef NS_ENUM(NSUInteger, HBJobState) {
 @property (nonatomic, readonly) HBPicture *picture;
 @property (nonatomic, readonly) HBFilters *filters;
 
-@property (nonatomic, readonly) NSMutableArray *audioTracks;
-@property (nonatomic, readonly) NSMutableArray *subtitlesTracks;
+@property (nonatomic, readonly) HBAudio *audio;
+@property (nonatomic, readonly) HBSubtitles *subtitles;
 
 @property (nonatomic, readwrite) BOOL chaptersEnabled;
 @property (nonatomic, readonly) NSMutableArray *chapterTitles;
 
-// Defaults settings
-@property (nonatomic, readonly) HBAudioDefaults *audioDefaults;
-@property (nonatomic, readonly) HBSubtitlesDefaults *subtitlesDefaults;
-
 @end