Make header self-contained.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30222 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2009-04-17 09:52:53 +00:00
parent 24b822d843
commit 4970545477
3 changed files with 16 additions and 5 deletions
@@ -12,6 +12,7 @@ Addon mixer.media_addon :
MixerSettings.cpp MixerSettings.cpp
MixerUtils.cpp MixerUtils.cpp
Resampler.cpp Resampler.cpp
ResamplerSmooth.cpp
: be media : be media
; ;
@@ -10,7 +10,8 @@
#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>
@@ -261,9 +262,15 @@ 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);
@@ -1,5 +1,3 @@
#ifndef _RESAMPLER_H
#define _RESAMPLER_H
/* Copyright (C) 2003 Marcus Overhagen /* Copyright (C) 2003 Marcus Overhagen
* Released under terms of the MIT license. * Released under terms of the MIT license.
* *
@@ -10,6 +8,11 @@
* both source and destination. * both source and destination.
* *
*/ */
#ifndef _RESAMPLER_H
#define _RESAMPLER_H
#include <SupportDefs.h>
class Resampler class Resampler
{ {
@@ -53,4 +56,4 @@ Resampler::Resample(const void *src, int32 src_sample_offset, int32 src_sample_c
(this->*fFunc)(src, src_sample_offset, src_sample_count, dst, dst_sample_offset, dst_sample_count, gain); (this->*fFunc)(src, src_sample_offset, src_sample_count, dst, dst_sample_offset, dst_sample_count, gain);
} }
#endif #endif // _RESAMPLER_H