From c29583ec42b071493c9f00d95eaf166b21b5fa83 Mon Sep 17 00:00:00 2001
From: Chris Moeller <kode54@gmail.com>
Date: Thu, 10 Oct 2013 20:02:02 -0700
Subject: [PATCH] Fixed ConverterNode listener

---
 Audio/Chain/ConverterNode.h |  2 +-
 Audio/Chain/ConverterNode.m | 26 ++++++++++++++++----------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/Audio/Chain/ConverterNode.h b/Audio/Chain/ConverterNode.h
index 9349a947a..75771b49b 100644
--- a/Audio/Chain/ConverterNode.h
+++ b/Audio/Chain/ConverterNode.h
@@ -31,7 +31,7 @@
 	AudioStreamBasicDescription outputFormat;
 }
 
-- (void)registerObservers;
+- (id)initWithController:(id)c previous:(id)p;
 
 - (BOOL)setupWithInputFormat:(AudioStreamBasicDescription)inputFormat outputFormat:(AudioStreamBasicDescription)outputFormat;
 - (void)cleanUp;
diff --git a/Audio/Chain/ConverterNode.m b/Audio/Chain/ConverterNode.m
index 5803df537..91e2dcbe1 100644
--- a/Audio/Chain/ConverterNode.m
+++ b/Audio/Chain/ConverterNode.m
@@ -28,6 +28,19 @@ void PrintStreamDesc (AudioStreamBasicDescription *inDesc)
 
 @implementation ConverterNode
 
+- (id)initWithController:(id)c previous:(id)p
+{
+    self = [super initWithController:c previous:p];
+    if (self)
+    {
+        rgInfo = nil;
+        
+        [[NSUserDefaultsController sharedUserDefaultsController] addObserver:self forKeyPath:@"values.volumeScaling"		options:0 context:nil];
+    }
+    
+    return self;
+}
+
 static const float STEREO_DOWNMIX[8-2][8][2]={
     /*3.0*/
     {
@@ -230,12 +243,6 @@ tryagain2:
 	return amountRead;
 }
 
-- (void)registerObservers
-{
-	NSLog(@"REGISTERING OBSERVERS");
-	[[NSUserDefaultsController sharedUserDefaultsController] addObserver:self forKeyPath:@"values.volumeScaling"		options:0 context:nil];
-}
-
 - (void)observeValueForKeyPath:(NSString *)keyPath
 					  ofObject:(id)object
                         change:(NSDictionary *)change
@@ -305,8 +312,6 @@ static float db_to_scale(float db)
 	inputFormat = inf;
 	outputFormat = outf;
     
-    [self registerObservers];
-
     floatFormat = inputFormat;
     floatFormat.mFormatFlags = kAudioFormatFlagsNativeFloatPacked;
     floatFormat.mBitsPerChannel = 32;
@@ -361,6 +366,9 @@ static float db_to_scale(float db)
 - (void)dealloc
 {
 	NSLog(@"Decoder dealloc");
+
+    [[NSUserDefaultsController sharedUserDefaultsController] removeObserver:self forKeyPath:@"values.volumeScaling"];
+    
 	[self cleanUp];
 	[super dealloc];
 }
@@ -390,8 +398,6 @@ static float db_to_scale(float db)
 
 - (void)cleanUp
 {
-    [[NSUserDefaultsController sharedUserDefaultsController] removeObserver:self forKeyPath:@"values.volumeScaling"];
-
     [rgInfo release];
     rgInfo = nil;
     if (converterFloat)