From 30816b7ebdfec5550ebdacd092673bdeccf340bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Mon, 30 Aug 2010 22:22:15 +0000 Subject: [PATCH] * Coding style fixes. * Fixed build with tracing enabled. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38467 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../media_node_framework/audio/AudioFormatConverter.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/apps/mediaplayer/media_node_framework/audio/AudioFormatConverter.cpp b/src/apps/mediaplayer/media_node_framework/audio/AudioFormatConverter.cpp index 8167d3bbe2..f6e24f34e8 100644 --- a/src/apps/mediaplayer/media_node_framework/audio/AudioFormatConverter.cpp +++ b/src/apps/mediaplayer/media_node_framework/audio/AudioFormatConverter.cpp @@ -13,6 +13,7 @@ //#define TRACE_AUDIO_CONVERTER #ifdef TRACE_AUDIO_CONVERTER +# include # define TRACE(x...) printf(x) #else # define TRACE(x...) @@ -147,7 +148,7 @@ swap_sample_byte_order(void* buffer, uint32 format, size_t length) AudioFormatConverter::AudioFormatConverter(AudioReader* source, uint32 format, - uint32 byte_order) + uint32 byteOrder) : AudioReader(), fSource(NULL) @@ -158,7 +159,7 @@ AudioFormatConverter::AudioFormatConverter(AudioReader* source, uint32 format, && source->Format().u.raw_audio.byte_order == hostByteOrder) { fFormat = source->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 & media_raw_audio_format::B_AUDIO_SIZE_MASK; 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); } - int32 inSampleSize = fSource->Format().u.raw_audio.format & media_raw_audio_format::B_AUDIO_SIZE_MASK; int32 outSampleSize = fFormat.u.raw_audio.format