diff options
| -rw-r--r-- | client/Makefile | 4 | ||||
| -rw-r--r-- | client/dolmetschctl-client.c | 4 | ||||
| -rw-r--r-- | client/midi_client.c (renamed from client/midi.c) | 2 | ||||
| -rw-r--r-- | client/midi_client.h (renamed from client/midi.h) | 2 | ||||
| -rw-r--r-- | client/osc_client.c (renamed from client/osc.c) | 4 | ||||
| -rw-r--r-- | client/osc_client.h (renamed from client/osc.h) | 0 | ||||
| -rw-r--r-- | server/Makefile | 10 | ||||
| -rw-r--r-- | server/dolmetschctl.c | 4 | ||||
| -rw-r--r-- | server/midi_server.c (renamed from server/midi.c) | 2 | ||||
| -rw-r--r-- | server/midi_server.h (renamed from server/midi.h) | 0 | ||||
| -rw-r--r-- | server/osc_server.c (renamed from server/osc.c) | 2 | ||||
| -rw-r--r-- | server/osc_server.h (renamed from server/osc.h) | 0 |
12 files changed, 17 insertions, 17 deletions
diff --git a/client/Makefile b/client/Makefile index bb767d9..0d47f83 100644 --- a/client/Makefile +++ b/client/Makefile @@ -27,8 +27,8 @@ endif EXECUTABLE := dolmetschctl-client C_OBJS := slist.o \ - midi.o \ - osc.o \ + midi_client.o \ + osc_client.o \ dolmetschctl-client.o C_SRCS := $(C_OBJS:%.o=%.c) diff --git a/client/dolmetschctl-client.c b/client/dolmetschctl-client.c index b67f238..9815924 100644 --- a/client/dolmetschctl-client.c +++ b/client/dolmetschctl-client.c @@ -30,8 +30,8 @@ #include <lo/lo.h> #include <alsa/asoundlib.h> -#include "midi.h" -#include "osc.h" +#include "midi_client.h" +#include "osc_client.h" void print_version() diff --git a/client/midi.c b/client/midi_client.c index 7075432..456ec7d 100644 --- a/client/midi.c +++ b/client/midi_client.c @@ -27,7 +27,7 @@ #include <poll.h> #include <assert.h> -#include "midi.h" +#include "midi_client.h" #define NOTE_EN 0x00 #define NOTE_DE 0x01 diff --git a/client/midi.h b/client/midi_client.h index 1a051ae..7ae65bd 100644 --- a/client/midi.h +++ b/client/midi_client.h @@ -27,7 +27,7 @@ #include <poll.h> #include "slist.h" -#include "osc.h" +#include "osc_client.h" typedef struct { u_int8_t* buf_; diff --git a/client/osc.c b/client/osc_client.c index 79ee76e..a70eb67 100644 --- a/client/osc.c +++ b/client/osc_client.c @@ -28,8 +28,8 @@ #include <error.h> #include <assert.h> -#include "osc.h" -#include "midi.h" +#include "osc_client.h" +#include "midi_client.h" static void print_error(int num, const char *msg, const char *path) diff --git a/client/osc.h b/client/osc_client.h index 9d1ad94..9d1ad94 100644 --- a/client/osc.h +++ b/client/osc_client.h diff --git a/server/Makefile b/server/Makefile index ff1bd06..2fb8c2d 100644 --- a/server/Makefile +++ b/server/Makefile @@ -26,11 +26,11 @@ endif EXECUTABLE := dolmetschctl -C_OBJS := osc.o \ - midi.o \ - slist.o \ +C_OBJS := slist.o \ + osc_server.o \ + midi_server.o \ mixer.o \ - dolmetschctl.o + dolmetschctl.o C_SRCS := $(C_OBJS:%.o=%.c) @@ -91,4 +91,4 @@ remove-bin: remove-etc: purge: remove - rm -rf $(DESTDIR)$(ETCDIR)/$(EXECUTABLE)/
\ No newline at end of file + rm -rf $(DESTDIR)$(ETCDIR)/$(EXECUTABLE)/ diff --git a/server/dolmetschctl.c b/server/dolmetschctl.c index 5bb9965..3b20cb6 100644 --- a/server/dolmetschctl.c +++ b/server/dolmetschctl.c @@ -31,8 +31,8 @@ #include <alsa/asoundlib.h> #include "mixer.h" -#include "midi.h" -#include "osc.h" +#include "midi_server.h" +#include "osc_server.h" void print_version() diff --git a/server/midi.c b/server/midi_server.c index 6ef5775..dbbf222 100644 --- a/server/midi.c +++ b/server/midi_server.c @@ -27,7 +27,7 @@ #include <poll.h> #include <assert.h> -#include "midi.h" +#include "midi_server.h" #define NOTE_EN 0x00 #define NOTE_DE 0x01 diff --git a/server/midi.h b/server/midi_server.h index 537c356..537c356 100644 --- a/server/midi.h +++ b/server/midi_server.h diff --git a/server/osc.c b/server/osc_server.c index 1011ad8..223a192 100644 --- a/server/osc.c +++ b/server/osc_server.c @@ -28,7 +28,7 @@ #include <error.h> #include <assert.h> -#include "osc.h" +#include "osc_server.h" static void print_error(int num, const char *msg, const char *path) diff --git a/server/osc.h b/server/osc_server.h index 40210b3..40210b3 100644 --- a/server/osc.h +++ b/server/osc_server.h |