diff --git a/Application/AppController.m b/Application/AppController.m index b8bcc763f..109b4667d 100644 --- a/Application/AppController.m +++ b/Application/AppController.m @@ -466,6 +466,8 @@ void* kAppControllerContext = &kAppControllerContext; [userDefaultsValuesDict setObject:@"cubic" forKey:@"resampling"]; + [userDefaultsValuesDict setObject:@"normal" forKey:@"outputResampling"]; + [userDefaultsValuesDict setObject:[NSNumber numberWithInteger:CogStatusStopped] forKey:@"lastPlaybackStatus"]; [userDefaultsValuesDict setObject:[NSNumber numberWithInteger:-1] forKey:@"lastTrackPlaying"]; [userDefaultsValuesDict setObject:[NSNumber numberWithDouble:0] forKey:@"lastTrackPosition"]; diff --git a/Audio/AudioPlayer.m b/Audio/AudioPlayer.m index 75ce0b081..77c4732bc 100644 --- a/Audio/AudioPlayer.m +++ b/Audio/AudioPlayer.m @@ -60,9 +60,6 @@ - (void)play:(NSURL *)url withUserInfo:(id)userInfo withRGInfo:(NSDictionary *)rgi startPaused:(BOOL)paused andSeekTo:(double)time { - if (output) { - [output close]; - } @synchronized(chainQueue) { for (id anObject in chainQueue) { @@ -240,7 +237,6 @@ { //Need to reset everything's buffers, and then seek? /*HACK TO TEST HOW WELL THIS WOULD WORK*/ - [self play:[[bufferChain inputNode] stealDecoder] startPaused:paused]; [output seek:time]; [bufferChain seek:time]; /*END HACK*/ diff --git a/Audio/Chain/ConverterNode.h b/Audio/Chain/ConverterNode.h index 21170933a..12042e102 100644 --- a/Audio/Chain/ConverterNode.h +++ b/Audio/Chain/ConverterNode.h @@ -12,32 +12,41 @@ #import #import +#import