From b71c18c4e8fbcb1a5a04af1992cd797c0cae0098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Fri, 17 Apr 2009 09:55:38 +0000 Subject: [PATCH] Revert the unintentional commit from r30222. Sorry. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30223 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/media/media-add-ons/mixer/Jamfile | 1 - src/add-ons/media/media-add-ons/mixer/MixerCore.cpp | 11 ++--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/add-ons/media/media-add-ons/mixer/Jamfile b/src/add-ons/media/media-add-ons/mixer/Jamfile index 6cbe852076..201e4a2f6e 100644 --- a/src/add-ons/media/media-add-ons/mixer/Jamfile +++ b/src/add-ons/media/media-add-ons/mixer/Jamfile @@ -12,7 +12,6 @@ Addon mixer.media_addon : MixerSettings.cpp MixerUtils.cpp Resampler.cpp - ResamplerSmooth.cpp : be media ; diff --git a/src/add-ons/media/media-add-ons/mixer/MixerCore.cpp b/src/add-ons/media/media-add-ons/mixer/MixerCore.cpp index 9463e9d64c..942bf36abe 100644 --- a/src/add-ons/media/media-add-ons/mixer/MixerCore.cpp +++ b/src/add-ons/media/media-add-ons/mixer/MixerCore.cpp @@ -10,8 +10,7 @@ #include "MixerInput.h" #include "MixerOutput.h" #include "MixerUtils.h" -//#include "Resampler.h" -#include "ResamplerSmooth.h" +#include "Resampler.h" #include "RtList.h" #include @@ -262,15 +261,9 @@ MixerCore::ApplyOutputFormat() } fResampler = new Resampler * [fMixBufferChannelCount]; -#if 0 for (int i = 0; i < fMixBufferChannelCount; i++) fResampler[i] = new Resampler(media_raw_audio_format::B_AUDIO_FLOAT, - format.format); -#else - for (int i = 0; i < fMixBufferChannelCount; i++) - fResampler[i] = new ResamplerSmooth(media_raw_audio_format::B_AUDIO_FLOAT, - format.format); -#endif + format.format); TRACE("MixerCore::OutputFormatChanged:\n"); TRACE(" fMixBufferFrameRate %ld\n", fMixBufferFrameRate);