i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert the unintentional commit from r30222. Sorry.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30223 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2009-04-17 09:55:38 +00:00
parent 4970545477
commit b71c18c4e8
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/media/media-add-ons/mixer/Jamfile
-1
View File
@@ -12,7 +12,6 @@ Addon mixer.media_addon :
MixerSettings.cpp MixerSettings.cpp
MixerUtils.cpp MixerUtils.cpp
Resampler.cpp Resampler.cpp
ResamplerSmooth.cpp
: be media : be media
; ;
src/add-ons/media/media-add-ons/mixer/MixerCore.cpp
+2 -9
View File
@@ -10,8 +10,7 @@
#include "MixerInput.h" #include "MixerInput.h"
#include "MixerOutput.h" #include "MixerOutput.h"
#include "MixerUtils.h" #include "MixerUtils.h"
//#include "Resampler.h" #include "Resampler.h"
#include "ResamplerSmooth.h"
#include "RtList.h" #include "RtList.h"
#include <Buffer.h> #include <Buffer.h>
@@ -262,15 +261,9 @@ MixerCore::ApplyOutputFormat()
} }
fResampler = new Resampler * [fMixBufferChannelCount]; fResampler = new Resampler * [fMixBufferChannelCount];
#if 0
for (int i = 0; i < fMixBufferChannelCount; i++) for (int i = 0; i < fMixBufferChannelCount; i++)
fResampler[i] = new Resampler(media_raw_audio_format::B_AUDIO_FLOAT, fResampler[i] = new Resampler(media_raw_audio_format::B_AUDIO_FLOAT,
format.format); format.format);
#else
for (int i = 0; i < fMixBufferChannelCount; i++)
fResampler[i] = new ResamplerSmooth(media_raw_audio_format::B_AUDIO_FLOAT,
format.format);
#endif
TRACE("MixerCore::OutputFormatChanged:\n"); TRACE("MixerCore::OutputFormatChanged:\n");
TRACE(" fMixBufferFrameRate %ld\n", fMixBufferFrameRate); TRACE(" fMixBufferFrameRate %ld\n", fMixBufferFrameRate);