:art: More renaming

diff --git a/include/plug.h b/include/plug.h
index ec96647856aa095c614c91538d05da0b515dbf7d..6a0029f9f84749a4fbf4a30c346cdd2f20fe2d8a 100644 (file)
--- a/include/plug.h
+++ b/include/plug.h
@@ -23,7 +23,7 @@ void plug_end(const Gwion gwion);
 #define GWMODSTR(a) m_str GWMODSTR_NAME() { return #a; }
 #define GWMODINI(a)  ANN2(1) void* GWMODINI_NAME(const Gwion gwion, const Vector args)
 #define GWMODEND(a)  ANN void  GWMODEND_NAME(const Gwion gwion, void* self)
-#define GWDRIVER(a)  ANN void  GWDRIVER_NAME(Driver* d)
+#define GWDRIVER(a)  ANN void  GWDRIVER_NAME(DriverData* d)
 
 ANN void plug_ini(const Gwion gwion, const Vector);
 ANN Vector split_args(const m_str str);

diff --git a/include/vm.h b/include/vm.h
index a7a3a30f65e7bc96f237bf3be4b7b27af1f04f9b..1e7c27159dc18744305e2b6da770613aa401090b 100644 (file)
--- a/include/vm.h
+++ b/include/vm.h
@@ -15,14 +15,14 @@ struct VM_Code_ {
 };
 
 struct VM_;
-struct Driver_;
-typedef void (*f_bbqset)(struct Driver_*);
+struct DriverData_;
+typedef void (*f_bbqset)(struct DriverData_*);
 typedef void (*f_bbqrun)(const struct VM_*);
 struct BBQ_ {
   uint64_t pos;
   m_float* in;
   m_float* out;
-  volatile uint is_running;// : 1; // => shreduler
+  volatile uint is_running;
   struct SoundInfo_ *si;
   f_bbqset func;
   f_bbqrun run;

diff --git a/src/gwion.c b/src/gwion.c
index 07cd3162796cac6171802bfc4dcc5733c6b6d0ab..449284a58a78710eceb7ef8ef78d9fd6c4485cfa 100644 (file)
--- a/src/gwion.c
+++ b/src/gwion.c
@@ -27,7 +27,7 @@
 #endif
 
 ANN static struct BBQ_ * new_driverinfo(void) {
-  struct BBQ_ * di = (struct BBQ*)xcalloc(1, sizeof(struct BBQ_));
+  struct BBQ_ * di = (struct BBQ_*)xcalloc(1, sizeof(struct BBQ_));
   di->func = dummy_driver;
   di->run = vm_run;
   di->driver = (DriverData*)xcalloc(1, sizeof(DriverData));

diff --git a/tests/import/driver.c b/tests/import/driver.c
index 9e685f8a50190f1a2d7a3fcf8eac0e157fce7b21..91bf817eb5b688ba4b6f1db24479d2155c6a9348 100644 (file)
--- a/tests/import/driver.c
+++ b/tests/import/driver.c
@@ -9,18 +9,18 @@
 #include "gwion.h"
 #include "plug.h"
 
-static void dummy_run(VM* vm, DriverInfo* di) {
+static void dummy_run(VM* vm, struct BBQ_* di) {
   while(vm->bbq->is_running) {
     di->run(vm);
     ++vm->bbq->pos;
   }
 }
 
-static m_bool dummy_ini(VM* vm __attribute__((unused)), DriverInfo* di __attribute__((unused))) {
+static m_bool dummy_ini(VM* vm __attribute__((unused)), struct BBQ_* di __attribute__((unused))) {
   return GW_OK;
 }
 GWMODSTR(dummy2);
-GWDRIVER(Driver* d) {
+GWDRIVER(dummy2) {
   d->ini = dummy_ini;
   d->run = dummy_run;
 }