hrev52425 adds 1 changeset to branch 'master'
old head: 804f91e6346f6f99bf9123f6ff3f0322cf02cbe1
new head: 66741d3615a0ddbe3ff49687b1b0d96f8b2d00c5
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=66741d3615a0+%5E804f91e6346f
----------------------------------------------------------------------------
66741d3615a0: media: Remove BeOSR3MediaDefs.h
* Fix for cmedia driver included.
[ Barrett17 <b.vitruvio@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev52425
Commit: 66741d3615a0ddbe3ff49687b1b0d96f8b2d00c5
URL: https://git.haiku-os.org/haiku/commit/?id=66741d3615a0
Author: Barrett17 <b.vitruvio@xxxxxxxxx>
Date: Tue Oct 23 14:08:06 2018 UTC
----------------------------------------------------------------------------
2 files changed, 12 insertions(+), 87 deletions(-)
headers/private/audio/R3MediaDefs.h | 86 -----------------------
src/add-ons/kernel/drivers/audio/cmedia/pcm.c | 13 +++-
----------------------------------------------------------------------------
diff --git a/headers/private/audio/R3MediaDefs.h
b/headers/private/audio/R3MediaDefs.h
deleted file mode 100644
index b290db6649..0000000000
--- a/headers/private/audio/R3MediaDefs.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/******************************************************************************
-
- File: MediaDefs.h
-
- Copyright 1995-1999, Be Incorporated
- This file may be used under the terms of the Be Sample Code License.
-
-******************************************************************************/
-#ifndef _R3_MEDIA_DEFS_H
-#define _R3_MEDIA_DEFS_H
-
-#include <SupportDefs.h>
-#include <Errors.h>
-#if defined(__cplusplus)
-# include <MediaDefs.h>
-#else
- /* values for byte_ordering */
- enum { B_BIG_ENDIAN, B_LITTLE_ENDIAN };
-
- /* values for sample_format */
- enum {
- B_UNDEFINED_SAMPLES,
- B_LINEAR_SAMPLES,
- B_FLOAT_SAMPLES,
- B_MULAW_SAMPLES
- };
-#endif
-
-/* Buffer header for audio server */
-
-typedef struct audio_buffer_header {
- int32 buffer_number;
- int32 subscriber_count;
- bigtime_t time;
- int32 reserved_1;
- int32 reserved_2;
- bigtime_t sample_clock;
-} audio_buffer_header;
-
-
-#define B_MEDIA_LEVEL
B_REAL_TIME_PRIORITY
-
-#define B_NO_CHANGE (-1)
-
-/* ================
- Subscriber IDs and special values
- ================ */
-
-#define B_NO_SUBSCRIBER_ID
((subscriber_id)-1)
-#define B_NO_SUBSCRIBER_NAME "not subscribed"
-
-#define B_SHARED_SUBSCRIBER_ID ((subscriber_id)-2)
-#define B_SHARED_SUBSCRIBER_NAME "shared subscriber"
-
-/* ================
- Values for sound files and audio streams
- ================ */
-
-
-/* Audio device codes for BAudioSubscriber's
- * Get/SetVolume() and EnableDevice() calls
- */
-enum {
- B_CD_THROUGH = 0,
- B_LINE_IN_THROUGH,
- B_ADC_IN,
- B_LOOPBACK,
- B_DAC_OUT,
- B_MASTER_OUT,
- B_SPEAKER_OUT,
- B_SOUND_DEVICE_END
-};
-
-/* ADC input codes */
-enum {
- B_CD_IN,
- B_LINE_IN,
- B_MIC_IN
-};
-
-enum {
- B_DAC_STREAM = 2354,
- B_ADC_STREAM
-};
-
-#endif /* #ifndef _R3_MEDIA_DEFS_H */
diff --git a/src/add-ons/kernel/drivers/audio/cmedia/pcm.c
b/src/add-ons/kernel/drivers/audio/cmedia/pcm.c
index 09e133a2ce..02fafa347f 100644
--- a/src/add-ons/kernel/drivers/audio/cmedia/pcm.c
+++ b/src/add-ons/kernel/drivers/audio/cmedia/pcm.c
@@ -5,7 +5,7 @@
#include <string.h>
#include <ByteOrder.h>
-#include "R3MediaDefs.h"
+#include <MediaDefs.h>
#include "cm_private.h"
#include "sound.h"
@@ -17,6 +17,17 @@ extern int sprintf(char *, const char *, ...);
extern void dump_card(cmedia_pci_dev * card);
+// Buffer header for audio server from BeOS R3 MediaDefs.h
+
+typedef struct audio_buffer_header {
+ int32 buffer_number;
+ int32 subscriber_count;
+ bigtime_t time;
+ int32 reserved_1;
+ int32 reserved_2;
+ bigtime_t sample_clock;
+} audio_buffer_header;
+
#if !defined(OLDAPI)
#if DEBUG
#define OLDAPI(x) dprintf x
