summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorritsuka <[email protected]>2014-11-02 15:17:54 +0000
committerritsuka <[email protected]>2014-11-02 15:17:54 +0000
commitcdbf8a54bf52ac4bbdff5d39484c711a4237d1cf (patch)
tree27ce95faafd2f445d12ba280e413ee3ab87990c0
parent18ee2d5b932919e60396060ea063053ac8fc711a (diff)
MacGui: pass only the tracks array to the addTracksFromQueue: method, no need to pass the entire job dict.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6498 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--macosx/Controller.m2
-rw-r--r--macosx/HBAudioController.h2
-rw-r--r--macosx/HBAudioController.m4
3 files changed, 4 insertions, 4 deletions
diff --git a/macosx/Controller.m b/macosx/Controller.m
index 728e43781..7bc285fe3 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -2843,7 +2843,7 @@ fWorkingCount = 0;
/* Audio */
/* Now lets add our new tracks to the audio list here */
- [fAudioController addTracksFromQueue: queueToApply];
+ [fAudioController addTracksFromQueue:[queueToApply objectForKey:@"AudioList"]];
/* Subtitles Defaults */
[fSubtitlesViewController.settings applySettingsFromPreset:queueToApply[@"SubtitlesDefaults"]];
diff --git a/macosx/HBAudioController.h b/macosx/HBAudioController.h
index d6f475c29..b3cc702d8 100644
--- a/macosx/HBAudioController.h
+++ b/macosx/HBAudioController.h
@@ -36,7 +36,7 @@ extern NSString *HBMixdownChangedNotification;
@property (readonly, nonatomic, copy) NSArray *audioTracks;
- (void) applySettingsFromPreset:(NSDictionary *)preset;
-- (void) addTracksFromQueue: (NSMutableDictionary *) aQueue;
+- (void) addTracksFromQueue: (NSArray *) queueArray;
- (BOOL) anyCodecMatches: (int) aCodecValue;
- (void) settingTrackToNone: (HBAudio *) newNoneTrack;
diff --git a/macosx/HBAudioController.m b/macosx/HBAudioController.m
index afad54512..374441d85 100644
--- a/macosx/HBAudioController.m
+++ b/macosx/HBAudioController.m
@@ -170,7 +170,7 @@ NSString *HBMixdownChangedNotification = @"HBMixdownChangedNotification";
return tracksArray;
}
-- (void) addTracksFromQueue: (NSMutableDictionary *) aQueue
+- (void) addTracksFromQueue: (NSArray *) queueArray
{
// Reinitialize the configured list of audio tracks
@@ -178,7 +178,7 @@ NSString *HBMixdownChangedNotification = @"HBMixdownChangedNotification";
// The following is the pattern to follow, but with Audio%dTrack being the key to seek...
// Can we assume that there will be no skip in the data?
- for (NSDictionary *audioDict in aQueue[@"AudioList"])
+ for (NSDictionary *audioDict in queueArray)
{
HBAudio *newAudio = [[HBAudio alloc] init];
[newAudio setController: self];