MacGui: pass only the tracks array to the addTracksFromQueue: method, no need to...

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

diff --git a/macosx/Controller.m b/macosx/Controller.m
index 728e437819bb602438a261a7a93728f0bab89edc..7bc285fe347f5d95e60fb836a5224f79cf16205b 100644 (file)
--- 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 d6f475c29b9ea3649a60cda0ef670d7b5008aed5..b3cc702d88177bb2e8cb0ee09927b4860ba5292f 100644 (file)
--- 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 afad545126fa0a409732acdb78920fdadb90ad27..374441d85cfdb9d3dfe4d4c29216871394d74cc8 100644 (file)
--- 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];