Commit f0b4d8c7fbad83c15905e93ea66785447de49dcb
2018-07-26T14:14:06
split rtbuf_signal
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169
diff --git a/build/rtbuf_signal/Makefile b/build/rtbuf_signal/Makefile
new file mode 100644
index 0000000..f5a839c
--- /dev/null
+++ b/build/rtbuf_signal/Makefile
@@ -0,0 +1,30 @@
+
+PROGRAM = signal.so
+SRCDIR = ../..
+
+CPPFLAGS =
+CFLAGS = -O0 -ggdb -W -Wall -Werror -fpic
+
+LDFLAGS = -fPIC -shared
+LIBS = -lm
+HEADERS = rtbuf.h rtbuf_lib.h rtbuf_signal.h
+OBJECTS = rtbuf_signal.o rtbuf_signal_sinus.o
+
+SRC = ${HEADERS} ${OBJECTS:%.o=%.c}
+
+${PROGRAM}: ${OBJECTS}
+ ${CC} ${LDFLAGS} ${OBJECTS} ${LIBS} -o ${PROGRAM}
+
+${OBJECTS}: ${HEADERS}
+
+${SRC}: %: ${SRCDIR}/%
+ if [ -f $@ ]; then chmod u+w $@; fi
+ cp $< $@
+ chmod a-w $@
+
+CLEANFILES += ${PROGRAM} ${OBJECTS} ${SRC}
+
+clean:
+ rm -f ${CLEANFILES}
+
+.PHONY: clean
diff --git a/rtbuf_signal.c b/rtbuf_signal.c
index 3a56bd7..ae51ffc 100644
--- a/rtbuf_signal.c
+++ b/rtbuf_signal.c
@@ -5,55 +5,12 @@
#include "rtbuf_lib.h"
#include "rtbuf_signal.h"
-enum {
- SINUS_FREQUENCY = 0,
- SINUS_AMPLITUDE,
- SINUS_ARITY
-};
-
-typedef struct sinus_data {
- double samples[RTBUF_SIGNAL_SAMPLES];
- double phase;
-} s_sinus_data;
-
-extern int sinus (s_rtbuf *rtb);
-extern int sinus_start (s_rtbuf *rtb);
-
-const char *sinus_vars[] = { "frequency", "amplitude", 0 };
-
const char *rtbuf_lib_name = "signal";
unsigned long rtbuf_lib_ver = RTBUF_LIB_VER;
s_rtbuf_lib_fun rtbuf_lib_fun[] = {
- { "sinus", sinus, sinus_start, 0,
- sizeof(s_sinus_data) / sizeof(double),
- sizeof(double), sinus_vars },
+ { "sinus", rtbuf_signal_sinus, rtbuf_signal_sinus_start, 0,
+ sizeof(s_rtbuf_signal_sinus_data) / sizeof(double),
+ sizeof(double),
+ (const char*[]) { "frequency", "amplitude", 0 } },
{ 0, 0, 0, 0, 0, 0, 0 }
};
-
-int sinus (s_rtbuf *rtb)
-{
- double phase;
- unsigned int i = 0;
- s_sinus_data *data = (s_sinus_data*) rtb->data;
- int freq = rtb->var[SINUS_FREQUENCY];
- double *freq_samples = freq < 0 ? 0 : (double*) g_rtbuf[freq].data;
- phase = data->phase;
- while (i < RTBUF_SIGNAL_SAMPLES) {
- double f = freq_samples ? freq_samples[i] : 220;
- //printf(" i=%u freq=%f", i, f);
- f /= (double) RTBUF_SIGNAL_SAMPLERATE;
- phase = phase + 2.0 * M_PI * f;
- data->samples[i] = sin(phase);
- //printf(" sin=%f", data->samples[i]);
- i++;
- }
- data->phase = phase;
- return 0;
-}
-
-int sinus_start (s_rtbuf *rtb)
-{
- s_sinus_data *data = (s_sinus_data*) rtb->data;
- data->phase = 0;
- return 0;
-}
diff --git a/rtbuf_signal.h b/rtbuf_signal.h
index cd677c7..23dc781 100644
--- a/rtbuf_signal.h
+++ b/rtbuf_signal.h
@@ -4,4 +4,22 @@
#define RTBUF_SIGNAL_SAMPLES 256
#define RTBUF_SIGNAL_SAMPLERATE 44100
+/* sinus */
+
+enum {
+ RTBUF_SIGNAL_SINUS_VAR_FREQUENCY = 0,
+ RTBUF_SIGNAL_SINUS_VAR_AMPLITUDE,
+ RTBUF_SIGNAL_SINUS_VAR_N
+};
+
+typedef struct rtbuf_signal_sinus_data {
+ double samples[RTBUF_SIGNAL_SAMPLES];
+ double phase;
+} s_rtbuf_signal_sinus_data;
+
+int rtbuf_signal_sinus (s_rtbuf *rtb);
+int rtbuf_signal_sinus_start (s_rtbuf *rtb);
+
+const char **g_rtbuf_signal_sinus_vars;
+
#endif /* RTBUF_SIGNAL_H */
diff --git a/rtbuf_signal_sinus.c b/rtbuf_signal_sinus.c
new file mode 100644
index 0000000..8e6e1f4
--- /dev/null
+++ b/rtbuf_signal_sinus.c
@@ -0,0 +1,36 @@
+
+#include <math.h>
+#include <stdio.h>
+#include "rtbuf.h"
+#include "rtbuf_lib.h"
+#include "rtbuf_signal.h"
+
+int rtbuf_signal_sinus (s_rtbuf *rtb)
+{
+ double phase;
+ unsigned int i = 0;
+ s_rtbuf_signal_sinus_data *data;
+ int freq = rtb->var[RTBUF_SIGNAL_SINUS_VAR_FREQUENCY];
+ double *freq_samples = freq < 0 ? 0 : (double*) g_rtbuf[freq].data;
+ data = (s_rtbuf_signal_sinus_data*) rtb->data;
+ phase = data->phase;
+ while (i < RTBUF_SIGNAL_SAMPLES) {
+ double f = freq_samples ? freq_samples[i] : 220;
+ //printf(" i=%u freq=%f", i, f);
+ f /= (double) RTBUF_SIGNAL_SAMPLERATE;
+ phase = phase + 2.0 * M_PI * f;
+ data->samples[i] = sin(phase);
+ //printf(" sin=%f", data->samples[i]);
+ i++;
+ }
+ data->phase = phase;
+ return 0;
+}
+
+int rtbuf_signal_sinus_start (s_rtbuf *rtb)
+{
+ s_rtbuf_signal_sinus_data *data;
+ data = (s_rtbuf_signal_sinus_data*) rtb->data;
+ data->phase = 0;
+ return 0;
+}