mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-02 09:01:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't include full path in driver name.

Browse source
This commit is contained in:
Lennart Poettering 2009-01-22 00:15:19 +01:00
parent bf7217b6a5
commit 0f7954a9f5
6 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/pulsecore/card.c
View file

@ -28,6 +28,7 @@
#include <string.h> #include <string.h>
#include <pulse/xmalloc.h> #include <pulse/xmalloc.h>
#include <pulse/util.h>
#include <pulsecore/log.h> #include <pulsecore/log.h>
#include <pulsecore/macro.h> #include <pulsecore/macro.h>
@ -128,7 +129,7 @@ pa_card *pa_card_new(pa_core *core, pa_card_new_data *data) {
c->core = core; c->core = core;
c->name = pa_xstrdup(data->name); c->name = pa_xstrdup(data->name);
c->proplist = pa_proplist_copy(data->proplist); c->proplist = pa_proplist_copy(data->proplist);
c->driver = pa_xstrdup(data->driver); c->driver = pa_xstrdup(pa_path_get_filename(data->driver));
c->module = data->module; c->module = data->module;
c->sinks = pa_idxset_new(NULL, NULL); c->sinks = pa_idxset_new(NULL, NULL);

3
src/pulsecore/client.c
View file

@ -29,6 +29,7 @@
#include <string.h> #include <string.h>
#include <pulse/xmalloc.h> #include <pulse/xmalloc.h>
#include <pulse/util.h>
#include <pulsecore/core-subscribe.h> #include <pulsecore/core-subscribe.h>
#include <pulsecore/log.h> #include <pulsecore/log.h>
@ -64,7 +65,7 @@ pa_client *pa_client_new(pa_core *core, pa_client_new_data *data) {
c = pa_xnew(pa_client, 1); c = pa_xnew(pa_client, 1);
c->core = core; c->core = core;
c->proplist = pa_proplist_copy(data->proplist); c->proplist = pa_proplist_copy(data->proplist);
c->driver = pa_xstrdup(data->driver); c->driver = pa_xstrdup(pa_path_get_filename(data->driver));
c->module = data->module; c->module = data->module;
c->sink_inputs = pa_idxset_new(NULL, NULL); c->sink_inputs = pa_idxset_new(NULL, NULL);

3
src/pulsecore/sink-input.c
View file

@ -30,6 +30,7 @@
#include <pulse/utf8.h> #include <pulse/utf8.h>
#include <pulse/xmalloc.h> #include <pulse/xmalloc.h>
#include <pulse/util.h>
#include <pulsecore/sample-util.h> #include <pulsecore/sample-util.h>
#include <pulsecore/core-subscribe.h> #include <pulsecore/core-subscribe.h>
@ -229,7 +230,7 @@ pa_sink_input* pa_sink_input_new(
i->state = PA_SINK_INPUT_INIT; i->state = PA_SINK_INPUT_INIT;
i->flags = flags; i->flags = flags;
i->proplist = pa_proplist_copy(data->proplist); i->proplist = pa_proplist_copy(data->proplist);
i->driver = pa_xstrdup(data->driver); i->driver = pa_xstrdup(pa_path_get_filename(data->driver));
i->module = data->module; i->module = data->module;
i->sink = data->sink; i->sink = data->sink;
i->client = data->client; i->client = data->client;

3
src/pulsecore/sink.c
View file

@ -32,6 +32,7 @@
#include <pulse/utf8.h> #include <pulse/utf8.h>
#include <pulse/xmalloc.h> #include <pulse/xmalloc.h>
#include <pulse/timeval.h> #include <pulse/timeval.h>
#include <pulse/util.h>
#include <pulsecore/sink-input.h> #include <pulsecore/sink-input.h>
#include <pulsecore/namereg.h> #include <pulsecore/namereg.h>
@ -184,7 +185,7 @@ pa_sink* pa_sink_new(
s->flags = flags; s->flags = flags;
s->name = pa_xstrdup(name); s->name = pa_xstrdup(name);
s->proplist = pa_proplist_copy(data->proplist); s->proplist = pa_proplist_copy(data->proplist);
s->driver = pa_xstrdup(data->driver); s->driver = pa_xstrdup(pa_path_get_filename(data->driver));
s->module = data->module; s->module = data->module;
s->card = data->card; s->card = data->card;

3
src/pulsecore/source-output.c
View file

@ -29,6 +29,7 @@
#include <pulse/utf8.h> #include <pulse/utf8.h>
#include <pulse/xmalloc.h> #include <pulse/xmalloc.h>
#include <pulse/util.h>
#include <pulsecore/sample-util.h> #include <pulsecore/sample-util.h>
#include <pulsecore/core-subscribe.h> #include <pulsecore/core-subscribe.h>
@ -192,7 +193,7 @@ pa_source_output* pa_source_output_new(
o->state = PA_SOURCE_OUTPUT_INIT; o->state = PA_SOURCE_OUTPUT_INIT;
o->flags = flags; o->flags = flags;
o->proplist = pa_proplist_copy(data->proplist); o->proplist = pa_proplist_copy(data->proplist);
o->driver = pa_xstrdup(data->driver); o->driver = pa_xstrdup(pa_path_get_filename(data->driver));
o->module = data->module; o->module = data->module;
o->source = data->source; o->source = data->source;
o->client = data->client; o->client = data->client;

3
src/pulsecore/source.c
View file

@ -31,6 +31,7 @@
#include <pulse/utf8.h> #include <pulse/utf8.h>
#include <pulse/xmalloc.h> #include <pulse/xmalloc.h>
#include <pulse/timeval.h> #include <pulse/timeval.h>
#include <pulse/util.h>
#include <pulsecore/source-output.h> #include <pulsecore/source-output.h>
#include <pulsecore/namereg.h> #include <pulsecore/namereg.h>
@ -175,7 +176,7 @@ pa_source* pa_source_new(
s->flags = flags; s->flags = flags;
s->name = pa_xstrdup(name); s->name = pa_xstrdup(name);
s->proplist = pa_proplist_copy(data->proplist); s->proplist = pa_proplist_copy(data->proplist);
s->driver = pa_xstrdup(data->driver); s->driver = pa_xstrdup(pa_path_get_filename(data->driver));
s->module = data->module; s->module = data->module;
s->card = data->card; s->card = data->card;