* 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

@@ -1,18 +1,19 @@
-/***********************************************************************
+/*
- * AUTHOR: Marcus Overhagen
+ * Copyright 2002, Marcus Overhagen. All Rights Reserved.
- *   FILE: OldAudioModule.cpp
+ * Distributed under the terms of the MIT License.
- *  DESCR: 
+ */
- ***********************************************************************/
+
-#include <OldAudioModule.h>
+
-#include "debug.h"
+#include "OldAudioModule.h"
+
+#include <debug.h>
+
 
 /*************************************************************
  * public BAudioEvent
  *************************************************************/
 
-BAudioEvent::BAudioEvent(int32 frames,
+BAudioEvent::BAudioEvent(int32 frames, bool stereo, float *samples)
-						 bool stereo,
-						 float *samples)
 {
 	UNIMPLEMENTED();
 }
@@ -108,9 +109,7 @@ BAudioEvent::SetDestination(int32)
 
 
 bool
-BAudioEvent::MixIn(float *dst,
+BAudioEvent::MixIn(float *dst, int32 frames, mk_time time)
-				   int32 frames,
-				   mk_time time)
 {
 	UNIMPLEMENTED();
 
@@ -224,8 +223,7 @@ BDACRenderer::Wakeup()
 
 
 void
-BDACRenderer::TransportChanged(mk_time time,
+BDACRenderer::TransportChanged(mk_time time, mk_rate rate,
-							   mk_rate rate,
 	transport_status status)
 {
 	UNIMPLEMENTED();
@@ -252,10 +250,7 @@ BDACRenderer::Channel()
 
 
 bool
-BDACRenderer::_WriteDAC(void *arg,
+BDACRenderer::_WriteDAC(void *arg, char *buf, uint32 bytes, void *header)
-						char *buf,
-						uint32 bytes,
-						void *header)
 {
 	UNIMPLEMENTED();
 
@@ -264,9 +259,7 @@ BDACRenderer::_WriteDAC(void *arg,
 
 
 bool
-BDACRenderer::WriteDAC(short *buf,
+BDACRenderer::WriteDAC(short *buf, int32 frames, audio_buffer_header *header)
-					   int32 frames,
-					   audio_buffer_header *header)
 {
 	UNIMPLEMENTED();
 
@@ -294,8 +287,7 @@ BDACRenderer::MixOutput(short *dst)
  * public BAudioFileStream
  *************************************************************/
 
-BAudioFileStream::BAudioFileStream(BMediaChannel *channel,
+BAudioFileStream::BAudioFileStream(BMediaChannel *channel, BFile *file,
-								   BFile *file,
 	mk_time start)
 {
 	UNIMPLEMENTED();
@@ -317,8 +309,7 @@ BAudioFileStream::GetEvent(BMediaChannel *channel)
 
 
 BMediaEvent *
-BAudioFileStream::PeekEvent(BMediaChannel *channel,
+BAudioFileStream::PeekEvent(BMediaChannel *channel, mk_time asap)
-							mk_time asap)
 {
 	UNIMPLEMENTED();
 	return NULL;
@@ -326,8 +317,7 @@ BAudioFileStream::PeekEvent(BMediaChannel *channel,
 
 
 status_t
-BAudioFileStream::SeekToTime(BMediaChannel *channel,
+BAudioFileStream::SeekToTime(BMediaChannel *channel, mk_time time)
-							 mk_time time)
 {
 	UNIMPLEMENTED();
 
@@ -362,8 +352,7 @@ BAudioFileStream::Channel()
  * public BADCSource
  *************************************************************/
 
-BADCSource::BADCSource(BMediaChannel *channel,
+BADCSource::BADCSource(BMediaChannel *channel, mk_time start)
-					   mk_time start)
 	:
 	fEventLock("BADCSource lock")
 {
@@ -386,8 +375,7 @@ BADCSource::GetEvent(BMediaChannel *channel)
 
 
 BMediaEvent *
-BADCSource::PeekEvent(BMediaChannel *channel,
+BADCSource::PeekEvent(BMediaChannel *channel, mk_time asap)
-					  mk_time asap)
 {
 	UNIMPLEMENTED();
 	return NULL;
@@ -395,8 +383,7 @@ BADCSource::PeekEvent(BMediaChannel *channel,
 
 
 status_t
-BADCSource::SeekToTime(BMediaChannel *channel,
+BADCSource::SeekToTime(BMediaChannel *channel, mk_time time)
-					   mk_time time)
 {
 	UNIMPLEMENTED();
 
@@ -423,10 +410,7 @@ BADCSource::Channel()
  *************************************************************/
 
 bool
-BADCSource::_ReadADC(void *arg,
+BADCSource::_ReadADC(void *arg, char *buf, uint32 bytes, void *header)
-					 char *buf,
-					 uint32 bytes,
-					 void *header)
 {
 	UNIMPLEMENTED();
 
@@ -435,9 +419,7 @@ BADCSource::_ReadADC(void *arg,
 
 
 void
-BADCSource::ReadADC(short *buf,
+BADCSource::ReadADC(short *buf, int32 frames, audio_buffer_header *header)
-					int32 frames,
-					audio_buffer_header *header)
 {
 	UNIMPLEMENTED();
 }

src/kits/media/OldAudioModule.h

@@ -11,10 +11,11 @@
 #ifndef _AUDIO_MODULE_H
 #define _AUDIO_MODULE_H
 
-#include <OldMediaModule.h>
-#include <OldMediaDefs.h>
 #include <File.h>
 
+#include "OldMediaModule.h"
+#include "OldMediaDefs.h"
+
 class BADCStream;
 class BDACStream;
 class BSubscriber;

src/kits/media/OldAudioStream.cpp

@@ -1,10 +1,13 @@
-/***********************************************************************
+/*
- * AUTHOR: Marcus Overhagen
+ * Copyright 2002, Marcus Overhagen. All Rights Reserved.
- *   FILE: OldAudioStream.cpp
+ * Distributed under the terms of the MIT License.
- *  DESCR: 
+ */
- ***********************************************************************/
+
-#include <OldAudioStream.h>
+
-#include "debug.h"
+#include "OldAudioStream.h"
+
+#include <debug.h>
+
 
 /*************************************************************
  * public BADCStream

src/kits/media/OldAudioStream.h

@@ -8,9 +8,11 @@
 #ifndef _AUDIO_STREAM_H
 #define _AUDIO_STREAM_H
 
-#include <OldBufferStream.h>
+
 #include <ClassInfo.h>
 
+#include "OldBufferStream.h"
+
 
 /* ================
    Class definition for BADCStream and BDACStream

src/kits/media/OldBufferStream.cpp

@@ -1,10 +1,14 @@
-/***********************************************************************
+/*
- * AUTHOR: Marcus Overhagen
+ * Copyright 2002, Marcus Overhagen. All Rights Reserved.
- *   FILE: OldBufferStream.cpp
+ * Distributed under the terms of the MIT License.
- *  DESCR: 
+ */
- ***********************************************************************/
+
-#include <OldBufferStream.h>
+
-#include "debug.h"
+#include "OldBufferStream.h"
+
+#include <debug.h>
+#include <new>
+
 
 /*************************************************************
  * public BAbstractBufferStream
@@ -181,8 +185,7 @@ BBufferStream::operator new(size_t size)
 
 
 void
-BBufferStream::operator delete(void *stream,
+BBufferStream::operator delete(void *stream, size_t size)
-							   size_t size)
 {
 	UNIMPLEMENTED();
 }

src/kits/media/OldBufferStreamManager.cpp

@@ -1,10 +1,13 @@
-/***********************************************************************
+/*
- * AUTHOR: Marcus Overhagen
+ * Copyright 2002, Marcus Overhagen. All Rights Reserved.
- *   FILE: OldBufferStreamManager.cpp
+ * Distributed under the terms of the MIT License.
- *  DESCR: 
+ */
- ***********************************************************************/
+
-#include <OldBufferStreamManager.h>
+
-#include "debug.h"
+#include "OldBufferStreamManager.h"
+
+#include <debug.h>
+
 
 /*************************************************************
  * public BBufferStreamManager

src/kits/media/OldBufferStreamManager.h

@@ -8,12 +8,14 @@
 #ifndef _BUFFER_STREAM_MANAGER_H
 #define _BUFFER_STREAM_MANAGER_H
 
-#include <OldBufferStream.h>
+
 #include <OS.h>
 #include <SupportDefs.h>
 #include <ClassInfo.h>
 #include <Locker.h>
 
+#include "OldBufferStream.h"
+
 
 /* ================
    Local Declarations

src/kits/media/OldMediaModule.cpp

@@ -1,10 +1,13 @@
-/***********************************************************************
+/*
- * AUTHOR: Marcus Overhagen
+ * Copyright 2002, Marcus Overhagen. All Rights Reserved.
- *   FILE: OldMediaModule.cpp
+ * Distributed under the terms of the MIT License.
- *  DESCR: 
+ */
- ***********************************************************************/
+
-#include <OldMediaModule.h>
+
-#include "debug.h"
+#include "OldMediaModule.h"
+
+#include <debug.h>
+
 
 /*************************************************************
  * public BMediaEvent

src/kits/media/OldSubscriber.cpp

@@ -1,11 +1,14 @@
-/***********************************************************************
+/*
- * AUTHOR: Marcus Overhagen
+ * Copyright 2002, Marcus Overhagen. All Rights Reserved.
- *   FILE: OldSubscriber.cpp
+ * Distributed under the terms of the MIT License.
- *  DESCR: 
+ */
- ***********************************************************************/
+
-#include <OldSubscriber.h>
+
+#include "OldSubscriber.h"
+
 #include "debug.h"
 
+
 /*************************************************************
  * public BSubscriber
  *************************************************************/

src/kits/media/OldSubscriber.h

@@ -13,7 +13,8 @@
 
 #include <MediaDefs.h>
 #include <ClassInfo.h>
-#include <OldBufferStream.h>
+
+#include "OldBufferStream.h"
 
 /* ================
    declarations