Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed initialization, added debug macros

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@3338 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
beveloper 2003-05-26 12:37:52 +00:00
parent 5b4256ce42
commit a4289a95c0
1 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/kits/media/SoundPlayNode.cpp
View File

@ -6,23 +6,29 @@
* compatibility reasons. * compatibility reasons.
***********************************************************************/ ***********************************************************************/
//#include <ByteOrder.h>
#include <TimeSource.h> #include <TimeSource.h>
#include "SoundPlayNode.h"
#include <string.h> #include <string.h>
#include "debug.h"
#include "ChannelMixer.h"
#include "SampleConverter.h"
#include "SamplingrateConverter.h"
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include "SoundPlayNode.h"
#include "debug.h"
#define DPRINTF 0
#if DPRINTF
#undef DPRINTF
#define DPRINTF printf
#else
#undef DPRINTF
#define DPRINTF if (1) {} else printf
#endif
_SoundPlayNode::_SoundPlayNode(const char *name, const media_multi_audio_format *format, BSoundPlayer *player) : _SoundPlayNode::_SoundPlayNode(const char *name, const media_multi_audio_format *format, BSoundPlayer *player) :
BMediaNode(name), BMediaNode(name),
BBufferProducer(B_MEDIA_RAW_AUDIO), BBufferProducer(B_MEDIA_RAW_AUDIO),
BMediaEventLooper(), BMediaEventLooper(),
mPlayer(player), mPlayer(player),
mInitCheckStatus(B_OK),
mOutputEnabled(true), mOutputEnabled(true),
mBufferGroup(NULL), mBufferGroup(NULL),
mFramesSent(0) mFramesSent(0)
@ -31,24 +37,24 @@ _SoundPlayNode::_SoundPlayNode(const char *name, const media_multi_audio_format
mPreferredFormat.type = B_MEDIA_RAW_AUDIO; mPreferredFormat.type = B_MEDIA_RAW_AUDIO;
mPreferredFormat.u.raw_audio = *format; mPreferredFormat.u.raw_audio = *format;
printf("Format Info:\n"); DPRINTF("Format Info:\n");
printf(" frame_rate: %f\n",mFormat.u.raw_audio.frame_rate); DPRINTF(" frame_rate: %f\n",mFormat.u.raw_audio.frame_rate);
printf(" channel_count: %ld\n",mFormat.u.raw_audio.channel_count); DPRINTF(" channel_count: %ld\n",mFormat.u.raw_audio.channel_count);
printf(" byte_order: %ld (",mFormat.u.raw_audio.byte_order); DPRINTF(" byte_order: %ld (",mFormat.u.raw_audio.byte_order);
switch (mFormat.u.raw_audio.byte_order) { switch (mFormat.u.raw_audio.byte_order) {
case B_MEDIA_BIG_ENDIAN: printf("B_MEDIA_BIG_ENDIAN)\n"); break; case B_MEDIA_BIG_ENDIAN: DPRINTF("B_MEDIA_BIG_ENDIAN)\n"); break;
case B_MEDIA_LITTLE_ENDIAN: printf("B_MEDIA_LITTLE_ENDIAN)\n"); break; case B_MEDIA_LITTLE_ENDIAN: DPRINTF("B_MEDIA_LITTLE_ENDIAN)\n"); break;
default: printf("unknown)\n"); break; default: DPRINTF("unknown)\n"); break;
} }
printf(" buffer_size: %ld\n",mFormat.u.raw_audio.buffer_size); DPRINTF(" buffer_size: %ld\n",mFormat.u.raw_audio.buffer_size);
printf(" format: %ld (",mFormat.u.raw_audio.format); DPRINTF(" format: %ld (",mFormat.u.raw_audio.format);
switch (mFormat.u.raw_audio.format) { switch (mFormat.u.raw_audio.format) {
case media_raw_audio_format::B_AUDIO_FLOAT: printf("B_AUDIO_FLOAT)\n"); break; case media_raw_audio_format::B_AUDIO_FLOAT: DPRINTF("B_AUDIO_FLOAT)\n"); break;
case media_raw_audio_format::B_AUDIO_SHORT: printf("B_AUDIO_SHORT)\n"); break; case media_raw_audio_format::B_AUDIO_SHORT: DPRINTF("B_AUDIO_SHORT)\n"); break;
case media_raw_audio_format::B_AUDIO_INT: printf("B_AUDIO_INT)\n"); break; case media_raw_audio_format::B_AUDIO_INT: DPRINTF("B_AUDIO_INT)\n"); break;
case media_raw_audio_format::B_AUDIO_CHAR: printf("B_AUDIO_CHAR)\n"); break; case media_raw_audio_format::B_AUDIO_CHAR: DPRINTF("B_AUDIO_CHAR)\n"); break;
case media_raw_audio_format::B_AUDIO_UCHAR: printf("B_AUDIO_UCHAR)\n"); break; case media_raw_audio_format::B_AUDIO_UCHAR: DPRINTF("B_AUDIO_UCHAR)\n"); break;
default: printf("unknown)\n"); break; default: DPRINTF("unknown)\n"); break;
} }
} }
@ -636,7 +642,7 @@ _SoundPlayNode::HandleSeek(
bool realTimeEvent = false) bool realTimeEvent = false)
{ {
CALLED(); CALLED();
PRINT(("_SoundPlayNode::HandleSeek(t=%lld,d=%li,bd=%lld)\n",event->event_time,event->data,event->bigdata)); DPRINTF("_SoundPlayNode::HandleSeek(t=%lld,d=%li,bd=%lld)\n",event->event_time,event->data,event->bigdata);
return B_OK; return B_OK;
} }
@ -682,8 +688,8 @@ _SoundPlayNode::AllocateBuffers()
size_t size = mOutput.format.u.raw_audio.buffer_size; size_t size = mOutput.format.u.raw_audio.buffer_size;
int32 count = int32(mLatency / BufferDuration() + 1 + 1); int32 count = int32(mLatency / BufferDuration() + 1 + 1);
PRINT(("\tlatency = %Ld, buffer duration = %Ld\n", mLatency, BufferDuration())); DPRINTF("\tlatency = %Ld, buffer duration = %Ld\n", mLatency, BufferDuration());
PRINT(("\tcreating group of %ld buffers, size = %lu\n", count, size)); DPRINTF("\tcreating group of %ld buffers, size = %lu\n", count, size);
mBufferGroup = new BBufferGroup(size, count); mBufferGroup = new BBufferGroup(size, count);
} }
@ -733,12 +739,10 @@ _SoundPlayNode::FillNextBuffer(bigtime_t event_time)
stamp = mStartTime + bigtime_t(double(mFramesSent) / double(mOutput.format.u.raw_audio.frame_rate) * 1000000.0); stamp = mStartTime + bigtime_t(double(mFramesSent) / double(mOutput.format.u.raw_audio.frame_rate) * 1000000.0);
} }
hdr->start_time = stamp; hdr->start_time = stamp;
PRINT(("TimeSource()->Now() : %li\n", TimeSource()->Now())); DPRINTF("TimeSource()->Now() : %li\n", TimeSource()->Now());
PRINT(("hdr->start_time : %li\n", hdr->start_time)); DPRINTF("hdr->start_time : %li\n", hdr->start_time);
PRINT(("mFramesSent : %li\n", mFramesSent)); DPRINTF("mFramesSent : %li\n", mFramesSent);
PRINT(("mOutput.format.u.raw_audio.frame_rate : %f\n", mOutput.format.u.raw_audio.frame_rate)); DPRINTF("mOutput.format.u.raw_audio.frame_rate : %f\n", mOutput.format.u.raw_audio.frame_rate);
return buf; return buf;
} }