Changeset 912:e0480ffcba74 in roaraudio for roard/driver.c

Timestamp:

12/06/08 22:36:19 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

got esd driver working via vio, changed driver interface a bit to get a memory leak away

File:

• roard/driver.c (modified) (5 diffs)

roard/driver.c

@@ -28 +28 @@
  { "null", "null audio driver", "/dev/null", NULL, NULL, NULL, NULL, NULL, NULL, NULL},
 #ifdef ROAR_HAVE_ESD
- { "esd", "EsounD audio driver", "localhost, remote.host.dom", driver_esd_open, driver_esd_close, driver_esd_pause, driver_esd_write, driver_esd_read, driver_esd_flush, NULL},
+ { "esd", "EsounD audio driver", "localhost, remote.host.dom", NULL, driver_esd_close, driver_esd_pause, NULL, NULL, driver_esd_flush, driver_esd_open_vio},
 #endif
  { "roar", "RoarAudio driver", "localhost, remote.host.dom", driver_roar_open, driver_roar_close, driver_roar_pause, driver_roar_write, driver_roar_read, driver_roar_flush, NULL},
@@ -62 +62 @@
      return -1;
 
+    memset(*inst, 0, sizeof(struct roar_vio_calls));
+
     if ( (i = g_driver[i].vio_init(*inst, device, info)) == -1 ) {
      free(*inst);
@@ -68 +70 @@
     return i;
    }
+
+   ROAR_WARN("driver_open(*): driver uses old non-vio interface!");
 
    if ( g_driver[i].open )
@@ -79 +83 @@
 
 int driver_close(DRIVER_USERDATA_T   inst, int driver) {
+ int ret = 0;
  ROAR_DBG("driver_close(inst=%p, driver=%i) = ?", inst, driver);
 
@@ -85 +90 @@
 
  if ( g_driver[driver].close )
-  return g_driver[driver].close(inst);
+  ret = g_driver[driver].close(inst);
 
- return 0;
+ if ( g_driver[driver].vio_init != NULL )
+  free(inst);
+
+ return ret;
 }