Changeset 4604:00c316cc785d in roaraudio

Timestamp:

11/14/10 17:13:55 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support NULL as default (with internal list) driver selection for cdrivers

Files:

• include/libroareio/driver.h (modified) (1 diff)
• libroareio/driver.c (modified) (2 diffs)
• libroareio/driver_oss.c (modified) (1 diff)
• libroareio/driver_roar.c (modified) (1 diff)

include/libroareio/driver.h

@@ -40 +40 @@
 
 struct roar_cdriver {
- char * name;
- int  (*open)(struct roar_vio_calls * calls, char * name, char * dev, struct roar_audio_info * info, int dir);
+ const char * name;
+ int  (*open)(struct roar_vio_calls * calls, const char * name, char * dev, struct roar_audio_info * info, int dir);
 };
 
-int roar_cdriver_open(struct roar_vio_calls * calls, char * name, char * dev, struct roar_audio_info * info, int dir);
+int roar_cdriver_open(struct roar_vio_calls * calls, const char * name, char * dev, struct roar_audio_info * info, int dir);
 
 // driver prototypes:
-int roar_cdriver_oss (struct roar_vio_calls * calls, char * name, char * dev, struct roar_audio_info * info, int dir);
-int roar_cdriver_roar(struct roar_vio_calls * calls, char * name, char * dev, struct roar_audio_info * info, int dir);
+int roar_cdriver_oss (struct roar_vio_calls * calls, const char * name, char * dev, struct roar_audio_info * info, int dir);
+int roar_cdriver_roar(struct roar_vio_calls * calls, const char * name, char * dev, struct roar_audio_info * info, int dir);
 
 #endif

libroareio/driver.c

@@ -32 +32 @@
 #endif
 
-int roar_cdriver_null(struct roar_vio_calls * calls, char * name, char * dev, struct roar_audio_info * info, int dir) {
+int roar_cdriver_null(struct roar_vio_calls * calls, const char * name, char * dev, struct roar_audio_info * info, int dir) {
  ROAR_DBG("roar_cdriver_null(calls=%p, name='%s', dev='%s', info=%p{...}, dir=%i(?)) = ?", calls, name, dev, info, dir);
 
@@ -55 +55 @@
 };
 
-int roar_cdriver_open(struct roar_vio_calls * calls, char * name, char * dev, struct roar_audio_info * info, int dir) {
+
+static int roar_cdriver_open_default(struct roar_vio_calls * calls, char * dev, struct roar_audio_info * info, int dir) {
+ const char * names[] = {
+  // native APIs:
+  "oss",
+  // Virtual APIs:
+  "roar",
+  // Dummys:
+  "null"
+ };
+ size_t i;
+ int ret;
+
+ if ( dev != NULL ) {
+  ROAR_WARN("roar_cdriver_open_default(calls=%p, dev='%s', info=%p, dir=%i): Try to open given device without driver name is a bad thing to do. This is normaly a Application error.", calls, dev, info, dir);
+ }
+
+ for (i = 0; i < (sizeof(names)/sizeof(*names)); i++) {
+  ret = roar_cdriver_open(calls, names[i], dev, info, dir);
+  if ( ret != -1 )
+   return ret;
+ }
+
+ return -1;
+}
+
+int roar_cdriver_open(struct roar_vio_calls * calls, const char * name, char * dev, struct roar_audio_info * info, int dir) {
  int i;
  char *delm;
+
+ if ( name == NULL )
+  return roar_cdriver_open_default(calls, dev, info, dir);
 
  for (i = 0; _g_roar_cdriver[i].name != NULL; i++) {

libroareio/driver_oss.c

@@ -59 +59 @@
 #define _err() roar_vio_close(calls); return -1
 
-int roar_cdriver_oss(struct roar_vio_calls * calls, char * name, char * dev, struct roar_audio_info * info, int dir) {
+int roar_cdriver_oss(struct roar_vio_calls * calls, const char * name, char * dev, struct roar_audio_info * info, int dir) {
  struct roar_vio_sysio_ioctl ctl;
  int tmp, ctmp;

libroareio/driver_roar.c

@@ -27 +27 @@
 #include "driver.h"
 
-int roar_cdriver_roar(struct roar_vio_calls * calls, char * name, char * dev, struct roar_audio_info * info, int dir) {
+int roar_cdriver_roar(struct roar_vio_calls * calls, const char * name, char * dev, struct roar_audio_info * info, int dir) {
  return roar_vio_simple_stream(calls, info->rate, info->channels, info->bits, info->codec, dev, dir, "libroareio client");
 }