MacGui: set the chapter titles directly in HBJob. Move more things over to HBTitle and HBJob.

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

1 files changed, 7 insertions, 8 deletions

diff --git a/macosx/HBJob.h b/macosx/HBJob.h
index 119a81fb7..29b8dd89f 100644
--- a/macosx/HBJob.h
+++ b/macosx/HBJob.h
@@ -8,6 +8,7 @@
 
 #import "HBTitle.h"
 
+#import "HBRange.h"
 #import "HBVideo.h"
 #import "HBPicture.h"
 #import "HBFilters.h"
@@ -20,7 +21,7 @@
 @class HBPreset;
 
 typedef NS_ENUM(NSUInteger, HBJobState) {
-    HBJobStateNone,
+    HBJobStateReady,
     HBJobStateWorking,
     HBJobStateCompleted,
     HBJobStateCanceled
@@ -31,7 +32,7 @@ typedef NS_ENUM(NSUInteger, HBJobState) {
  */
 @interface HBJob : NSObject <NSCoding, NSCopying>
 
-- (instancetype)initWithTitle:(HBTitle *)title url:(NSURL *)fileURL andPreset:(HBPreset *)preset;
+- (instancetype)initWithTitle:(HBTitle *)title andPreset:(HBPreset *)preset;
 - (void)applyPreset:(HBPreset *)preset;
 
 /**
@@ -47,17 +48,15 @@ typedef NS_ENUM(NSUInteger, HBJobState) {
 
 // Libhb job
 @property (nonatomic, readonly) hb_job_t *hb_job;
-
-// Old job format
-@property (nonatomic, readwrite, retain) NSDictionary *jobDict;
 @property (nonatomic, readonly) NSAttributedString *jobDescription;
 
 // Job settings
-@property (nonatomic, readwrite) int fileFormat;
+@property (nonatomic, readwrite) int container;
 
 @property (nonatomic, readwrite) BOOL mp4HttpOptimize;
 @property (nonatomic, readwrite) BOOL mp4iPodCompatible;
 
+@property (nonatomic, readonly) HBRange *range;
 @property (nonatomic, readonly) HBVideo *video;
 @property (nonatomic, readonly) HBPicture *picture;
 @property (nonatomic, readonly) HBFilters *filters;
@@ -65,8 +64,8 @@ typedef NS_ENUM(NSUInteger, HBJobState) {
 @property (nonatomic, readonly) NSMutableArray *audioTracks;
 @property (nonatomic, readonly) NSMutableArray *subtitlesTracks;
 
-@property (nonatomic, readonly) BOOL chaptersEnabled;
-@property (nonatomic, readonly) NSMutableArray *chapterNames;
+@property (nonatomic, readwrite) BOOL chaptersEnabled;
+@property (nonatomic, readonly) NSMutableArray *chapterTitles;
 
 // Defaults settings
 @property (nonatomic, readonly) HBAudioDefaults *audioDefaults;