summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2006-01-30 12:21:53 +0000
committerPierre Ossman <ossman@cendio.se>2006-01-30 12:21:53 +0000
commit7da06d3fe7ce17422e1175339bd59b0dfb716443 (patch)
treeae4cd8c46205dc1080ba2186794583679794dd3d
parent22db575adc789c9bf6deabefe0843addc7ed2910 (diff)
Fixes for the new infrastructure so that the solaris module compiles.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@469 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r--polyp/module-solaris.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/polyp/module-solaris.c b/polyp/module-solaris.c
index ce9308be..f85e71df 100644
--- a/polyp/module-solaris.c
+++ b/polyp/module-solaris.c
@@ -57,8 +57,6 @@ PA_MODULE_DESCRIPTION("Solaris Sink/Source")
PA_MODULE_VERSION(PACKAGE_VERSION)
PA_MODULE_USAGE("sink_name=<name for the sink> source_name=<name for the source> device=<OSS device> record=<enable source?> playback=<enable sink?> format=<sample format> channels=<number of channels> rate=<sample rate> buffer_size=<record buffer size>")
-#define PA_TYPEID_SOLARIS PA_TYPEID_MAKE('S', 'L', 'R', 'S')
-
struct userdata {
pa_sink *sink;
pa_source *source;
@@ -398,7 +396,7 @@ int pa__init(pa_core *c, pa_module*m) {
u->core = c;
if (mode != O_WRONLY) {
- u->source = pa_source_new(c, PA_TYPEID_SOLARIS, pa_modargs_get_value(ma, "source_name", DEFAULT_SOURCE_NAME), 0, &ss);
+ u->source = pa_source_new(c, __FILE__, pa_modargs_get_value(ma, "source_name", DEFAULT_SOURCE_NAME), 0, &ss, NULL);
assert(u->source);
u->source->userdata = u;
u->source->get_latency = source_get_latency_cb;
@@ -408,7 +406,7 @@ int pa__init(pa_core *c, pa_module*m) {
u->source = NULL;
if (mode != O_RDONLY) {
- u->sink = pa_sink_new(c, PA_TYPEID_SOLARIS, pa_modargs_get_value(ma, "sink_name", DEFAULT_SINK_NAME), 0, &ss);
+ u->sink = pa_sink_new(c, __FILE__, pa_modargs_get_value(ma, "sink_name", DEFAULT_SINK_NAME), 0, &ss, NULL);
assert(u->sink);
u->sink->get_latency = sink_get_latency_cb;
u->sink->userdata = u;