MacGui: use HBJob tracks array in HBAudioController and HBSubtitlesController. Add a method to convert a HBJob to a hb_job_t.

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

1 files changed, 25 insertions, 10 deletions

diff --git a/macosx/HBJob.h b/macosx/HBJob.h
index bb69ed773..119a81fb7 100644
--- a/macosx/HBJob.h
+++ b/macosx/HBJob.h
@@ -12,16 +12,18 @@
 #import "HBPicture.h"
 #import "HBFilters.h"
 
-@class HBAudioDefaults;
-@class HBSubtitlesDefaults;
+#import "HBAudioDefaults.h"
+#import "HBSubtitlesDefaults.h"
+
+#include "hb.h"
 
 @class HBPreset;
 
-typedef NS_ENUM(NSUInteger, HBJobStatus) {
-    HBJobStatusNone,
-    HBJobStatusWorking,
-    HBJobStatusCompleted,
-    HBJobStatusCanceled
+typedef NS_ENUM(NSUInteger, HBJobState) {
+    HBJobStateNone,
+    HBJobStateWorking,
+    HBJobStateCompleted,
+    HBJobStateCanceled
 };
 
 /**
@@ -32,11 +34,19 @@ typedef NS_ENUM(NSUInteger, HBJobStatus) {
 - (instancetype)initWithTitle:(HBTitle *)title url:(NSURL *)fileURL andPreset:(HBPreset *)preset;
 - (void)applyPreset:(HBPreset *)preset;
 
-@property (nonatomic, readonly) HBJobStatus status;
+/**
+ *  Current state of the job.
+ */
+@property (nonatomic, readonly) HBJobState state;
 
-// libhb
 @property (nonatomic, readonly) HBTitle *title;
+
+// urls
 @property (nonatomic, readonly) NSURL *fileURL;
+@property (nonatomic, readonly) NSURL *destURL;
+
+// Libhb job
+@property (nonatomic, readonly) hb_job_t *hb_job;
 
 // Old job format
 @property (nonatomic, readwrite, retain) NSDictionary *jobDict;
@@ -45,7 +55,6 @@ typedef NS_ENUM(NSUInteger, HBJobStatus) {
 // Job settings
 @property (nonatomic, readwrite) int fileFormat;
 
-@property (nonatomic, readwrite) BOOL mp4LargeFile;
 @property (nonatomic, readwrite) BOOL mp4HttpOptimize;
 @property (nonatomic, readwrite) BOOL mp4iPodCompatible;
 
@@ -53,6 +62,12 @@ typedef NS_ENUM(NSUInteger, HBJobStatus) {
 @property (nonatomic, readonly) HBPicture *picture;
 @property (nonatomic, readonly) HBFilters *filters;
 
+@property (nonatomic, readonly) NSMutableArray *audioTracks;
+@property (nonatomic, readonly) NSMutableArray *subtitlesTracks;
+
+@property (nonatomic, readonly) BOOL chaptersEnabled;
+@property (nonatomic, readonly) NSMutableArray *chapterNames;
+
 // Defaults settings
 @property (nonatomic, readonly) HBAudioDefaults *audioDefaults;
 @property (nonatomic, readonly) HBSubtitlesDefaults *subtitlesDefaults;