:art: Separate Soundinfo

diff --git a/include/driver.h b/include/driver.h
index b336f6f8ca412a29d69fcb99b3d16977beb9933e..cc610e1837bfc274242928fe0080445ee39454df 100644 (file)
--- a/include/driver.h
+++ b/include/driver.h
@@ -1,6 +1,6 @@
 #ifndef __DRIVER
 #define __DRIVER
-
+#include "soundinfo.h"
 typedef m_bool (*f_drvini)(struct VM_*, struct BBQ_*);
 typedef void   (*f_drvrun)(struct VM_*, struct BBQ_*);
 typedef void   (*f_drvdel)(struct VM_*, struct BBQ_*);
@@ -12,12 +12,13 @@ typedef struct DriverData_ {
   f_drvdel del;
 } DriverData;
 
+/*
 struct SoundInfo_ {
   uint32_t sr;
   uint8_t in, out;
   m_str arg;
 };
-
+*/
 typedef void (*f_bbqset)(struct DriverData_*);
 typedef void (*f_bbqrun)(const struct VM_*);
 typedef struct BBQ_ {

diff --git a/include/soundinfo.h b/include/soundinfo.h
new file mode 100644 (file)
index 0000000..33a861e
--- /dev/null
+++ b/include/soundinfo.h
@@ -0,0 +1,8 @@
+#ifndef __SOUNDINFO
+#define __SOUNDINFO
+struct SoundInfo_ {
+  uint32_t sr;
+  uint8_t in, out;
+  m_str arg;
+};
+#endif

diff --git a/src/arg.c b/src/arg.c
index 44a1d174262728a15ad66643208973d6bfdefed0..67afd0f6161b43f9f194749ee7652c0926862116 100644 (file)
--- a/src/arg.c
+++ b/src/arg.c
@@ -1,9 +1,7 @@
 #include <string.h>
 #include "gwion_util.h"
-#include "oo.h"
-#include "vm.h"
-#include "driver.h"
 #include "arg.h"
+#include "soundinfo.h"
 #define GWIONRC ".gwionrc"
 
 ANN static inline void config_end(const Vector config) {