From a1e0f39f45bbcb7fbd0e0ec85348c4c8db6dfb5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Sat, 5 Dec 2009 13:34:39 +0000 Subject: [PATCH] * Build fix; the Jamfile changes caused those to be broken. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34504 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/media/OldAudioModule.cpp | 68 +++++++++-------------- src/kits/media/OldAudioModule.h | 5 +- src/kits/media/OldAudioStream.cpp | 17 +++--- src/kits/media/OldAudioStream.h | 6 +- src/kits/media/OldBufferStream.cpp | 23 ++++---- src/kits/media/OldBufferStreamManager.cpp | 17 +++--- src/kits/media/OldBufferStreamManager.h | 18 +++--- src/kits/media/OldMediaModule.cpp | 17 +++--- src/kits/media/OldSubscriber.cpp | 15 +++-- src/kits/media/OldSubscriber.h | 3 +- 10 files changed, 96 insertions(+), 93 deletions(-) diff --git a/src/kits/media/OldAudioModule.cpp b/src/kits/media/OldAudioModule.cpp index 5f9e7a3f4a..1ea9ba40f0 100644 --- a/src/kits/media/OldAudioModule.cpp +++ b/src/kits/media/OldAudioModule.cpp @@ -1,18 +1,19 @@ -/*********************************************************************** - * AUTHOR: Marcus Overhagen - * FILE: OldAudioModule.cpp - * DESCR: - ***********************************************************************/ -#include -#include "debug.h" +/* + * Copyright 2002, Marcus Overhagen. All Rights Reserved. + * Distributed under the terms of the MIT License. + */ + + +#include "OldAudioModule.h" + +#include + /************************************************************* * public BAudioEvent *************************************************************/ -BAudioEvent::BAudioEvent(int32 frames, - bool stereo, - float *samples) +BAudioEvent::BAudioEvent(int32 frames, bool stereo, float *samples) { UNIMPLEMENTED(); } @@ -108,9 +109,7 @@ BAudioEvent::SetDestination(int32) bool -BAudioEvent::MixIn(float *dst, - int32 frames, - mk_time time) +BAudioEvent::MixIn(float *dst, int32 frames, mk_time time) { UNIMPLEMENTED(); @@ -224,9 +223,8 @@ BDACRenderer::Wakeup() void -BDACRenderer::TransportChanged(mk_time time, - mk_rate rate, - transport_status status) +BDACRenderer::TransportChanged(mk_time time, mk_rate rate, + transport_status status) { UNIMPLEMENTED(); } @@ -252,10 +250,7 @@ BDACRenderer::Channel() bool -BDACRenderer::_WriteDAC(void *arg, - char *buf, - uint32 bytes, - void *header) +BDACRenderer::_WriteDAC(void *arg, char *buf, uint32 bytes, void *header) { UNIMPLEMENTED(); @@ -264,9 +259,7 @@ BDACRenderer::_WriteDAC(void *arg, bool -BDACRenderer::WriteDAC(short *buf, - int32 frames, - audio_buffer_header *header) +BDACRenderer::WriteDAC(short *buf, int32 frames, audio_buffer_header *header) { UNIMPLEMENTED(); @@ -294,9 +287,8 @@ BDACRenderer::MixOutput(short *dst) * public BAudioFileStream *************************************************************/ -BAudioFileStream::BAudioFileStream(BMediaChannel *channel, - BFile *file, - mk_time start) +BAudioFileStream::BAudioFileStream(BMediaChannel *channel, BFile *file, + mk_time start) { UNIMPLEMENTED(); } @@ -317,8 +309,7 @@ BAudioFileStream::GetEvent(BMediaChannel *channel) BMediaEvent * -BAudioFileStream::PeekEvent(BMediaChannel *channel, - mk_time asap) +BAudioFileStream::PeekEvent(BMediaChannel *channel, mk_time asap) { UNIMPLEMENTED(); return NULL; @@ -326,8 +317,7 @@ BAudioFileStream::PeekEvent(BMediaChannel *channel, status_t -BAudioFileStream::SeekToTime(BMediaChannel *channel, - mk_time time) +BAudioFileStream::SeekToTime(BMediaChannel *channel, mk_time time) { UNIMPLEMENTED(); @@ -362,8 +352,7 @@ BAudioFileStream::Channel() * public BADCSource *************************************************************/ -BADCSource::BADCSource(BMediaChannel *channel, - mk_time start) +BADCSource::BADCSource(BMediaChannel *channel, mk_time start) : fEventLock("BADCSource lock") { @@ -386,8 +375,7 @@ BADCSource::GetEvent(BMediaChannel *channel) BMediaEvent * -BADCSource::PeekEvent(BMediaChannel *channel, - mk_time asap) +BADCSource::PeekEvent(BMediaChannel *channel, mk_time asap) { UNIMPLEMENTED(); return NULL; @@ -395,8 +383,7 @@ BADCSource::PeekEvent(BMediaChannel *channel, status_t -BADCSource::SeekToTime(BMediaChannel *channel, - mk_time time) +BADCSource::SeekToTime(BMediaChannel *channel, mk_time time) { UNIMPLEMENTED(); @@ -423,10 +410,7 @@ BADCSource::Channel() *************************************************************/ bool -BADCSource::_ReadADC(void *arg, - char *buf, - uint32 bytes, - void *header) +BADCSource::_ReadADC(void *arg, char *buf, uint32 bytes, void *header) { UNIMPLEMENTED(); @@ -435,9 +419,7 @@ BADCSource::_ReadADC(void *arg, void -BADCSource::ReadADC(short *buf, - int32 frames, - audio_buffer_header *header) +BADCSource::ReadADC(short *buf, int32 frames, audio_buffer_header *header) { UNIMPLEMENTED(); } diff --git a/src/kits/media/OldAudioModule.h b/src/kits/media/OldAudioModule.h index 42b728f2d2..eb502df66c 100644 --- a/src/kits/media/OldAudioModule.h +++ b/src/kits/media/OldAudioModule.h @@ -11,10 +11,11 @@ #ifndef _AUDIO_MODULE_H #define _AUDIO_MODULE_H -#include -#include #include +#include "OldMediaModule.h" +#include "OldMediaDefs.h" + class BADCStream; class BDACStream; class BSubscriber; diff --git a/src/kits/media/OldAudioStream.cpp b/src/kits/media/OldAudioStream.cpp index a3933edb28..72f92f4e5a 100644 --- a/src/kits/media/OldAudioStream.cpp +++ b/src/kits/media/OldAudioStream.cpp @@ -1,10 +1,13 @@ -/*********************************************************************** - * AUTHOR: Marcus Overhagen - * FILE: OldAudioStream.cpp - * DESCR: - ***********************************************************************/ -#include -#include "debug.h" +/* + * Copyright 2002, Marcus Overhagen. All Rights Reserved. + * Distributed under the terms of the MIT License. + */ + + +#include "OldAudioStream.h" + +#include + /************************************************************* * public BADCStream diff --git a/src/kits/media/OldAudioStream.h b/src/kits/media/OldAudioStream.h index 140e65cd6d..f27bbc8c28 100644 --- a/src/kits/media/OldAudioStream.h +++ b/src/kits/media/OldAudioStream.h @@ -8,9 +8,11 @@ #ifndef _AUDIO_STREAM_H #define _AUDIO_STREAM_H -#include + #include +#include "OldBufferStream.h" + /* ================ Class definition for BADCStream and BDACStream @@ -69,7 +71,7 @@ public: float *l_volume, float *r_volume, bool *enabled) const; - + status_t EnableDevice(int32 device, bool enable); bool IsDeviceEnabled(int32 device) const; diff --git a/src/kits/media/OldBufferStream.cpp b/src/kits/media/OldBufferStream.cpp index c4faf4ac86..63cbc4adc9 100644 --- a/src/kits/media/OldBufferStream.cpp +++ b/src/kits/media/OldBufferStream.cpp @@ -1,10 +1,14 @@ -/*********************************************************************** - * AUTHOR: Marcus Overhagen - * FILE: OldBufferStream.cpp - * DESCR: - ***********************************************************************/ -#include -#include "debug.h" +/* + * Copyright 2002, Marcus Overhagen. All Rights Reserved. + * Distributed under the terms of the MIT License. + */ + + +#include "OldBufferStream.h" + +#include +#include + /************************************************************* * public BAbstractBufferStream @@ -36,7 +40,7 @@ BAbstractBufferStream::SetStreamBuffers(size_t bufferSize, return B_ERROR; } - + status_t BAbstractBufferStream::StartStreaming() @@ -181,8 +185,7 @@ BBufferStream::operator new(size_t size) void -BBufferStream::operator delete(void *stream, - size_t size) +BBufferStream::operator delete(void *stream, size_t size) { UNIMPLEMENTED(); } diff --git a/src/kits/media/OldBufferStreamManager.cpp b/src/kits/media/OldBufferStreamManager.cpp index 187ea6bbe7..c09df45f42 100644 --- a/src/kits/media/OldBufferStreamManager.cpp +++ b/src/kits/media/OldBufferStreamManager.cpp @@ -1,10 +1,13 @@ -/*********************************************************************** - * AUTHOR: Marcus Overhagen - * FILE: OldBufferStreamManager.cpp - * DESCR: - ***********************************************************************/ -#include -#include "debug.h" +/* + * Copyright 2002, Marcus Overhagen. All Rights Reserved. + * Distributed under the terms of the MIT License. + */ + + +#include "OldBufferStreamManager.h" + +#include + /************************************************************* * public BBufferStreamManager diff --git a/src/kits/media/OldBufferStreamManager.h b/src/kits/media/OldBufferStreamManager.h index 73b88c4a93..da2c797cee 100644 --- a/src/kits/media/OldBufferStreamManager.h +++ b/src/kits/media/OldBufferStreamManager.h @@ -8,12 +8,14 @@ #ifndef _BUFFER_STREAM_MANAGER_H #define _BUFFER_STREAM_MANAGER_H -#include + #include #include #include #include +#include "OldBufferStream.h" + /* ================ Local Declarations @@ -57,7 +59,7 @@ public: /* Get or set the minimum delay between sending out successive buffers. * Although the StreamManager automatically shuts down when there * are no more subscribers, setting the minumum delay can prevent - * prevent runaway streams. A zero or negative value means no + * prevent runaway streams. A zero or negative value means no * delay. */ bigtime_t BufferDelay() const; @@ -68,7 +70,7 @@ public: * will go hunting for it. When it finds the offending subscriber, * it will be removed from the chain with impunity. * - * The default is B_DEFAULT_TIMEOUT. Setting the timeout to 0 or a + * The default is B_DEFAULT_TIMEOUT. Setting the timeout to 0 or a * negative number will disable this. */ bigtime_t Timeout() const; @@ -93,17 +95,17 @@ public: stream_state Stop(); /* Set the desired state to B_IDLE. The processing thread will - * stop immediately and all buffers will be "reclaimed" back + * stop immediately and all buffers will be "reclaimed" back * to the StreamManager. */ stream_state Abort(); - + /* Return the current state of the stream (B_RUNNING, B_STOPPING, or B_IDLE). */ stream_state State() const; /* When NotificationPort is set, the receiver will get a message - * whenever the state of the StreamManager changes. The msg_id of the + * whenever the state of the StreamManager changes. The msg_id of the * message will be the new state of the StreamManager. */ port_id NotificationPort() const; @@ -130,7 +132,7 @@ public: protected: /**************************************************************** - * + * * The processing thread. This thread waits to acquire a Buffer * (or for the timeout to expire) and takes appropriate action. */ @@ -147,7 +149,7 @@ protected: */ virtual void SetState(stream_state newState); - /* Snooze until the desired time arrives. Returns the + /* Snooze until the desired time arrives. Returns the * current time upon returning. */ bigtime_t SnoozeUntil(bigtime_t sys_time); diff --git a/src/kits/media/OldMediaModule.cpp b/src/kits/media/OldMediaModule.cpp index 8d5f2f48b0..9294f97291 100644 --- a/src/kits/media/OldMediaModule.cpp +++ b/src/kits/media/OldMediaModule.cpp @@ -1,10 +1,13 @@ -/*********************************************************************** - * AUTHOR: Marcus Overhagen - * FILE: OldMediaModule.cpp - * DESCR: - ***********************************************************************/ -#include -#include "debug.h" +/* + * Copyright 2002, Marcus Overhagen. All Rights Reserved. + * Distributed under the terms of the MIT License. + */ + + +#include "OldMediaModule.h" + +#include + /************************************************************* * public BMediaEvent diff --git a/src/kits/media/OldSubscriber.cpp b/src/kits/media/OldSubscriber.cpp index 72362b24b0..2fea36a251 100644 --- a/src/kits/media/OldSubscriber.cpp +++ b/src/kits/media/OldSubscriber.cpp @@ -1,11 +1,14 @@ -/*********************************************************************** - * AUTHOR: Marcus Overhagen - * FILE: OldSubscriber.cpp - * DESCR: - ***********************************************************************/ -#include +/* + * Copyright 2002, Marcus Overhagen. All Rights Reserved. + * Distributed under the terms of the MIT License. + */ + + +#include "OldSubscriber.h" + #include "debug.h" + /************************************************************* * public BSubscriber *************************************************************/ diff --git a/src/kits/media/OldSubscriber.h b/src/kits/media/OldSubscriber.h index 873dc0f76a..4941d7dddb 100644 --- a/src/kits/media/OldSubscriber.h +++ b/src/kits/media/OldSubscriber.h @@ -13,7 +13,8 @@ #include #include -#include + +#include "OldBufferStream.h" /* ================ declarations