diff --git a/.gitignore b/.gitignore index b578114..47597d1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ *.[oa] *~ ossp-alsap -ossp-padsp osspd osstest diff --git a/Makefile b/Makefile index 11f2836..43d559c 100644 --- a/Makefile +++ b/Makefile @@ -18,14 +18,6 @@ ifeq "$(origin OSSPD_LDFLAGS)" "undefined" OSSPD_LDFLAGS := $(shell pkg-config --libs fuse) endif -ifeq "$(origin OSSP_PADSP_CFLAGS)" "undefined" -OSSP_PADSP_CFLAGS := $(shell pkg-config --cflags libpulse) -endif - -ifeq "$(origin OSSP_PADSP_LDFLAGS)" "undefined" -OSSP_PADSP_LDFLAGS := $(shell pkg-config --libs libpulse) -endif - ifeq "$(origin OSSP_ALSAP_CFLAGS)" "undefined" OSSP_ALSAP_CFLAGS := $(shell pkg-config --libs alsa) endif @@ -36,12 +28,12 @@ endif headers := ossp.h ossp-util.h ossp-slave.h -all: osspd ossp-padsp ossp-alsap +all: osspd ossp-alsap install: mkdir -p $(DESTDIR)$(prefix)/sbin $(DESTDIR)$(SLAVESDIR) install -m755 osspd $(DESTDIR)$(prefix)/sbin - install -m755 ossp-padsp ossp-alsap $(DESTDIR)$(SLAVESDIR) + install -m755 ossp-alsap $(DESTDIR)$(SLAVESDIR) mkdir -p $(DESTDIR)$(UDEVDIR) install -m644 98-osscuse.rules $(DESTDIR)$(UDEVDIR) @@ -54,9 +46,6 @@ libossp.a: ossp.c ossp.h ossp-util.c ossp-util.h ossp-slave.c ossp-slave.h osspd: osspd.c libossp.a $(headers) $(CC) $(CFLAGS) $(OSSPD_CFLAGS) -DSLAVE_DEFAULT_PATH=\"$(SLAVESDIR)\" -o $@ $< $(OSSPD_LDFLAGS) $(LDFLAGS) -ossp-padsp: ossp-padsp.c libossp.a $(headers) - $(CC) $(CFLAGS) $(OSSP_PADSP_CFLAGS) -o $@ $< $(OSSP_PADSP_LDFLAGS) $(LDFLAGS) - ossp-alsap: ossp-alsap.c libossp.a $(headers) $(CC) $(CFLAGS) $(OSSP_ALSAP_CFLAGS) -o $@ $< $(OSSP_ALSAP_LDFLAGS) $(LDFLAGS) @@ -67,4 +56,4 @@ test: osstest @./osstest clean: - rm -f *.o *.a osspd ossp-padsp ossp-alsap osstest + rm -f *.o *.a osspd ossp-alsap osstest diff --git a/ossp-slave.c b/ossp-slave.c index a290636..eb1791f 100644 --- a/ossp-slave.c +++ b/ossp-slave.c @@ -98,7 +98,7 @@ void ossp_slave_init(int argc, char **argv) snprintf(ossp_user_name, sizeof(ossp_user_name), "%s", pw->pw_name); - snprintf(ossp_log_name, sizeof(ossp_log_name), "ossp-padsp[%s:%d]", + snprintf(ossp_log_name, sizeof(ossp_log_name), "ossp-alsap[%s:%d]", ossp_user_name, getpid()); if (mmap_fd >= 0) { diff --git a/osspd.c b/osspd.c index 6b63c07..20c60ad 100644 --- a/osspd.c +++ b/osspd.c @@ -2005,7 +2005,7 @@ static const char *usage = " --max=MAX maximum number of open streams (default 256)\n" " --umax=MAX maximum number of open streams per UID (default --max)\n" " --exit-on-idle exit if idle\n" -" --dsp-slave=PATH DSP slave (default: " SLAVE_DEFAULT_PATH "/ossp-padsp)\n" +" --dsp-slave=PATH DSP slave (default: " SLAVE_DEFAULT_PATH "/ossp-alsap)\n" " --log=LEVEL log level (0..6)\n" " --timestamp timestamp log messages\n" " -v increase verbosity, can be specified multiple times\n" @@ -2179,7 +2179,7 @@ int main(int argc, char **argv) dsp_slave_path[PATH_MAX - 1] = '\0'; } else { ret = snprintf(dsp_slave_path, PATH_MAX, "%s/%s", - SLAVE_DEFAULT_PATH, "ossp-padsp"); + SLAVE_DEFAULT_PATH, "ossp-alsap"); if (ret >= PATH_MAX) fatal("dsp slave pathname too long"); }