8cf7b6253f
locally: * fix audio when using bsdbt848 video driver (problems noted by simon@) * allow 24-bit audio output formats in the sndio backend (from ratchov@) mostly from edd@ (MAINTAINER)
51 lines
1.0 KiB
Plaintext
51 lines
1.0 KiB
Plaintext
$OpenBSD: patch-stream_audio_in_h,v 1.2 2010/05/26 21:29:56 jakemsr Exp $
|
|
--- stream/audio_in.h.orig Sat Jan 30 22:26:47 2010
|
|
+++ stream/audio_in.h Mon Mar 8 14:28:42 2010
|
|
@@ -21,6 +21,7 @@
|
|
|
|
#define AUDIO_IN_ALSA 1
|
|
#define AUDIO_IN_OSS 2
|
|
+#define AUDIO_IN_SNDIO 3
|
|
|
|
#include "config.h"
|
|
|
|
@@ -45,6 +46,16 @@ typedef struct {
|
|
} ai_oss_t;
|
|
#endif
|
|
|
|
+#ifdef CONFIG_SNDIO_AUDIO
|
|
+#include <sndio.h>
|
|
+
|
|
+typedef struct {
|
|
+ char *device;
|
|
+
|
|
+ struct sio_hdl *hdl;
|
|
+} ai_sndio_t;
|
|
+#endif
|
|
+
|
|
typedef struct
|
|
{
|
|
int type;
|
|
@@ -67,6 +78,9 @@ typedef struct
|
|
#ifdef CONFIG_OSS_AUDIO
|
|
ai_oss_t oss;
|
|
#endif
|
|
+#ifdef CONFIG_SNDIO_AUDIO
|
|
+ ai_sndio_t sndio;
|
|
+#endif
|
|
} audio_in_t;
|
|
|
|
int audio_in_init(audio_in_t *ai, int type);
|
|
@@ -88,6 +102,11 @@ int ai_alsa_xrun(audio_in_t *ai);
|
|
int ai_oss_set_samplerate(audio_in_t *ai);
|
|
int ai_oss_set_channels(audio_in_t *ai);
|
|
int ai_oss_init(audio_in_t *ai);
|
|
+#endif
|
|
+
|
|
+#ifdef CONFIG_SNDIO_AUDIO
|
|
+int ai_sndio_setup(audio_in_t *ai);
|
|
+int ai_sndio_init(audio_in_t *ai);
|
|
#endif
|
|
|
|
#endif /* MPLAYER_AUDIO_IN_H */
|