diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2015-10-14 15:32:43 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2015-10-14 15:32:43 +0200 |
| commit | a84e372d3f977f657378bb489f9ed5d88ea70334 (patch) | |
| tree | c6dd78a239bc0ea3d5da2415d0c01bec3c245a0a | |
| parent | added first version of an openwrt package (diff) | |
fixed etc dir
| -rw-r--r-- | app/dolmetschctl.c | 2 | ||||
| -rw-r--r-- | app/mixer.c | 2 | ||||
| -rw-r--r-- | openwrt/dolmetsch-ctl/Makefile | 1 | ||||
| -rwxr-xr-x | openwrt/dolmetsch-ctl/files/dolmetschctl-client.init | 4 | ||||
| -rwxr-xr-x | openwrt/dolmetsch-ctl/files/dolmetschctl.init | 2 |
5 files changed, 8 insertions, 3 deletions
diff --git a/app/dolmetschctl.c b/app/dolmetschctl.c index 3b20cb6..a4b91d1 100644 --- a/app/dolmetschctl.c +++ b/app/dolmetschctl.c @@ -58,7 +58,7 @@ void print_usage() printf(" -h print this and exit\n"); printf(" -v print version information and exit\n"); printf(" -x <name> the name of the mixer, dolmetschctl will look for\n"); - printf(" language files inside '%s/<name>/'\n", ETCDIR); + printf(" language files inside '%s/dolmetschctl/<name>/'\n", ETCDIR); printf(" -d <dev> the mixer MIDI device name to use, i.e. hw:2,0,0\n"); printf(" (use `amidi -l` to list all available devices)'\n"); printf(" -m <dev> the MIDI control device name to use, this can be omitted to\n"); diff --git a/app/mixer.c b/app/mixer.c index 54df1b4..b95c031 100644 --- a/app/mixer.c +++ b/app/mixer.c @@ -90,7 +90,7 @@ static int mixer_read_config_file(mixer_t* x, int dirfd, const char* filename) static int mixer_read_config(mixer_t* x) { char path[1024]; - int ret = snprintf(path, sizeof(path), "%s/%s", ETCDIR, x->name_); + int ret = snprintf(path, sizeof(path), "%s/dolmetschctl/%s", ETCDIR, x->name_); assert(ret < sizeof(path)); DIR* d = opendir(path); diff --git a/openwrt/dolmetsch-ctl/Makefile b/openwrt/dolmetsch-ctl/Makefile index 00b95d3..0857746 100644 --- a/openwrt/dolmetsch-ctl/Makefile +++ b/openwrt/dolmetsch-ctl/Makefile @@ -9,6 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dolmetschctl PKG_VERSION:=2015-10-14 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=git://git.spreadspace.org/dolmetschctl.git PKG_SOURCE:=$(PKG_NAME).tar.gz diff --git a/openwrt/dolmetsch-ctl/files/dolmetschctl-client.init b/openwrt/dolmetsch-ctl/files/dolmetschctl-client.init index 837d427..fade639 100755 --- a/openwrt/dolmetsch-ctl/files/dolmetschctl-client.init +++ b/openwrt/dolmetsch-ctl/files/dolmetschctl-client.init @@ -1,4 +1,6 @@ #!/bin/sh /etc/rc.common +START=99 +STOP=1 USE_PROCD=1 @@ -6,7 +8,7 @@ PROG=/usr/bin/dolmetschctl-client start_service() { procd_open_instance - procd_set_param command $PROG -m hw:0,0,0 -o 192.168.1.27:1234 + procd_set_param command $PROG -m hw:0,0,0 -o 192.168.17.1:1234 procd_set_param respawn procd_set_param stdout 1 procd_set_param stderr 1 diff --git a/openwrt/dolmetsch-ctl/files/dolmetschctl.init b/openwrt/dolmetsch-ctl/files/dolmetschctl.init index 7a2bfc9..8b4b365 100755 --- a/openwrt/dolmetsch-ctl/files/dolmetschctl.init +++ b/openwrt/dolmetsch-ctl/files/dolmetschctl.init @@ -1,4 +1,6 @@ #!/bin/sh /etc/rc.common +START=99 +STOP=1 USE_PROCD=1 |