:art: boolify DRVINI

diff --git a/include/driver.h b/include/driver.h
index 3118941e3db22a90c867c8f6b9720914ae0b01a5..c9dea6530d2a3783cc0ec2bcea1b99d618d31b69 100644 (file)
--- a/include/driver.h
+++ b/include/driver.h
@@ -1,7 +1,7 @@
 #ifndef __DRIVER
 #define __DRIVER
 #include "soundinfo.h"
-typedef m_bool (*f_drvini)(struct VM_ *, struct BBQ_ *);
+typedef bool (*f_drvini)(struct VM_ *, struct BBQ_ *);
 typedef void (*f_drvrun)(struct VM_ *, struct BBQ_ *);
 typedef void (*f_drvdel)(struct VM_ *, struct BBQ_ *);
 
@@ -25,12 +25,12 @@ typedef struct BBQ_ {
   bool                is_running;
 } Driver;
 
-#define DRVINI(a) ANN m_bool a(struct VM_ *vm NUSED, Driver *di NUSED)
+#define DRVINI(a) ANN bool a(struct VM_ *vm NUSED, Driver *di NUSED)
 #define DRVRUN(a) ANN void a(struct VM_ *vm NUSED, Driver *di NUSED)
 #define DRVDEL(a) ANN void a(struct VM_ *vm NUSED, Driver *di NUSED)
 
-ANN void dummy_driver(DriverData *);
-ANN void driver_alloc(Driver *);
+ANN void    dummy_driver(DriverData *);
+ANN void    driver_alloc(Driver *);
 ANN Driver *new_driver(MemPool);
 ANN void    free_driver(Driver *, struct VM_ *);
 #endif

diff --git a/plug b/plug
index 3df21f0b68d5bf2aa606119f7405f841feea3780..82b13e3b9c04c292342461b481289f68d428e04e 160000 (submodule)
--- a/plug
+++ b/plug
@@ -1 +1 @@
-Subproject commit 3df21f0b68d5bf2aa606119f7405f841feea3780
+Subproject commit 82b13e3b9c04c292342461b481289f68d428e04e

diff --git a/src/gwion.c b/src/gwion.c
index 0876be2e6e9ec0fac590fabae925896a1c7431f3..d1934b89ad601455b095db93959f516deba2d5f5 100644 (file)
--- a/src/gwion.c
+++ b/src/gwion.c
@@ -20,8 +20,7 @@ ANN static bool gwion_audio(const Gwion gwion) {
   Driver *const di = gwion->vm->bbq;
   if (di->si->arg) CHECK_B((di->func = driver_ini(gwion, di->si)));
   di->func(di->driver);
-  if(di->driver->ini(gwion->vm, di) < 0)
-    return false;
+  CHECK_B(di->driver->ini(gwion->vm, di));
   driver_alloc(di);
   return true;
 }

diff --git a/src/vm/driver.c b/src/vm/driver.c
index 3550ff6fa6de8f30b99e9504594d2cc8792421ab..62e7400e45d65d1a7cf83cf07daef7d15515d313 100644 (file)
--- a/src/vm/driver.c
+++ b/src/vm/driver.c
@@ -37,7 +37,7 @@ static DRVRUN(dummy_run) {
 
 static DRVINI(dummy_ini) {
   gw_err("{-/}using dummy driver{0}\n");
-  return GW_OK;
+  return true;
 }
 
 void dummy_driver(DriverData *dd) {

diff --git a/tests/driver/simple_driver.c b/tests/driver/simple_driver.c
index 7bcede9c496f479f01cb9f2a7550570ba0517578..d3c85e2df791d0f0db643eaa93910c6082c3ab46 100644 (file)
--- a/tests/driver/simple_driver.c
+++ b/tests/driver/simple_driver.c
@@ -11,7 +11,7 @@ static DRVRUN(simple_driver_run) {
   }
 }
 
-static DRVINI(simple_driver_ini) { return GW_OK; }
+static DRVINI(simple_driver_ini) { return true; }
 
 static DRVDEL(simple_driver_del) {}