Revert the unintentional commit from r30222. Sorry.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30223 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
4970545477
commit
b71c18c4e8
@ -12,7 +12,6 @@ Addon mixer.media_addon :
|
||||
MixerSettings.cpp
|
||||
MixerUtils.cpp
|
||||
Resampler.cpp
|
||||
ResamplerSmooth.cpp
|
||||
: be media
|
||||
;
|
||||
|
||||
|
@ -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 <Buffer.h>
|
||||
@ -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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user