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

* Coding style fixes.

Browse Source 
* Fixed build with tracing enabled.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38467 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2010-08-30 22:22:15 +00:00
parent 252999c4e2
commit 30816b7ebd
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/mediaplayer/media_node_framework/audio/AudioFormatConverter.cpp
+3 -3
View File
@@ -13,6 +13,7 @@
//#define TRACE_AUDIO_CONVERTER //#define TRACE_AUDIO_CONVERTER
#ifdef TRACE_AUDIO_CONVERTER #ifdef TRACE_AUDIO_CONVERTER
# include <stdio.h>
# define TRACE(x...) printf(x) # define TRACE(x...) printf(x)
#else #else
# define TRACE(x...) # define TRACE(x...)
@@ -147,7 +148,7 @@ swap_sample_byte_order(void* buffer, uint32 format, size_t length)
AudioFormatConverter::AudioFormatConverter(AudioReader* source, uint32 format, AudioFormatConverter::AudioFormatConverter(AudioReader* source, uint32 format,
uint32 byte_order) uint32 byteOrder)
: :
AudioReader(), AudioReader(),
fSource(NULL) fSource(NULL)
@@ -158,7 +159,7 @@ AudioFormatConverter::AudioFormatConverter(AudioReader* source, uint32 format,
&& source->Format().u.raw_audio.byte_order == hostByteOrder) { && source->Format().u.raw_audio.byte_order == hostByteOrder) {
fFormat = source->Format(); fFormat = source->Format();
fFormat.u.raw_audio.format = format; fFormat.u.raw_audio.format = format;
fFormat.u.raw_audio.byte_order = byte_order; fFormat.u.raw_audio.byte_order = byteOrder;
int32 inSampleSize = source->Format().u.raw_audio.format int32 inSampleSize = source->Format().u.raw_audio.format
& media_raw_audio_format::B_AUDIO_SIZE_MASK; & media_raw_audio_format::B_AUDIO_SIZE_MASK;
int32 outSampleSize = fFormat.u.raw_audio.format int32 outSampleSize = fFormat.u.raw_audio.format
@@ -203,7 +204,6 @@ AudioFormatConverter::Read(void* buffer, int64 pos, int64 frames)
return fSource->Read(buffer, pos, frames); return fSource->Read(buffer, pos, frames);
} }
int32 inSampleSize = fSource->Format().u.raw_audio.format int32 inSampleSize = fSource->Format().u.raw_audio.format
& media_raw_audio_format::B_AUDIO_SIZE_MASK; & media_raw_audio_format::B_AUDIO_SIZE_MASK;
int32 outSampleSize = fFormat.u.raw_audio.format int32 outSampleSize = fFormat.u.raw_audio.format