-/* $Id$ */
-
/***
This file is part of PulseAudio.
* the device. If none is avilable from the inputs, we write silence
* instead.
*
- * If power should be saved on IDLE this should be implemented in a
- * special suspend-on-idle module that will put us into SUSPEND mode
- * as soon and we're idle for too long.
+ * If power should be saved on IDLE module-suspend-on-idle should be used.
*
*/
-/* TODO: handle restoring of volume after suspend */
-
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <sys/soundcard.h>
#include <sys/ioctl.h>
-#include <sys/poll.h>
#include <stdlib.h>
#include <sys/stat.h>
#include <stdio.h>
#include <unistd.h>
#include <limits.h>
#include <signal.h>
+#include <poll.h>
#include <pulse/xmalloc.h>
#include <pulse/util.h>
#include <pulsecore/core-util.h>
#include <pulsecore/modargs.h>
#include <pulsecore/log.h>
+#include <pulsecore/macro.h>
+#include <pulsecore/thread-mq.h>
+#include <pulsecore/rtpoll.h>
#include "oss-util.h"
#include "module-oss-symdef.h"
-PA_MODULE_AUTHOR("Lennart Poettering")
-PA_MODULE_DESCRIPTION("OSS Sink/Source")
-PA_MODULE_VERSION(PACKAGE_VERSION)
+PA_MODULE_AUTHOR("Lennart Poettering");
+PA_MODULE_DESCRIPTION("OSS Sink/Source");
+PA_MODULE_VERSION(PACKAGE_VERSION);
+PA_MODULE_LOAD_ONCE(FALSE);
PA_MODULE_USAGE(
"sink_name=<name for the sink> "
"source_name=<name for the source> "
"fragments=<number of fragments> "
"fragment_size=<fragment size> "
"channel_map=<channel map> "
- "mmap=<enable memory mapping?>")
+ "mmap=<enable memory mapping?>");
#define DEFAULT_DEVICE "/dev/dsp"
-#define DEFAULT_NFRAGS 4
-#define DEFAULT_FRAGSIZE_MSEC 25
-
struct userdata {
pa_core *core;
pa_module *module;
pa_sink *sink;
pa_source *source;
+
pa_thread *thread;
- pa_asyncmsgq *asyncmsgq;
+ pa_thread_mq thread_mq;
+ pa_rtpoll *rtpoll;
char *device_name;
-
+
pa_memchunk memchunk;
+ size_t frame_size;
uint32_t in_fragment_size, out_fragment_size, in_nfrags, out_nfrags, in_hwbuf_size, out_hwbuf_size;
- int use_getospace, use_getispace;
- int use_getodelay;
-
- int use_pcm_volume;
- int use_input_volume;
+ pa_bool_t use_getospace, use_getispace;
+ pa_bool_t use_getodelay;
- int sink_suspended, source_suspended;
+ pa_bool_t sink_suspended, source_suspended;
int fd;
int mode;
+ int mixer_fd;
+ int mixer_devmask;
+
int nfrags, frag_size;
- int use_mmap;
+ pa_bool_t use_mmap;
unsigned out_mmap_current, in_mmap_current;
void *in_mmap, *out_mmap;
pa_memblock **in_mmap_memblocks, **out_mmap_memblocks;
int in_mmap_saved_nfrags, out_mmap_saved_nfrags;
+
+ pa_rtpoll_item *rtpoll_item;
};
static const char* const valid_modargs[] = {
NULL
};
-static void trigger(struct userdata *u, int quick) {
+static void trigger(struct userdata *u, pa_bool_t quick) {
int enable_bits = 0, zero = 0;
-/* pa_log_debug("trigger"); */
+ pa_assert(u);
+
+ if (u->fd < 0)
+ return;
+
+ pa_log_debug("trigger");
- if (u->source && u->source->thread_info.state != PA_SOURCE_SUSPENDED)
+ if (u->source && PA_SOURCE_IS_OPENED(u->source->thread_info.state))
enable_bits |= PCM_ENABLE_INPUT;
-
- if (u->sink && u->sink->thread_info.state != PA_SINK_SUSPENDED)
+
+ if (u->sink && PA_SINK_IS_OPENED(u->sink->thread_info.state))
enable_bits |= PCM_ENABLE_OUTPUT;
-
+
+ pa_log_debug("trigger: %i", enable_bits);
+
+
if (u->use_mmap) {
if (!quick)
- /* First, let's stop all playback, capturing */
ioctl(u->fd, SNDCTL_DSP_SETTRIGGER, &zero);
#ifdef SNDCTL_DSP_HALT
if (ioctl(u->fd, SNDCTL_DSP_HALT, NULL) < 0)
pa_log_warn("SNDCTL_DSP_HALT: %s", pa_cstrerror(errno));
#endif
-
+
if (ioctl(u->fd, SNDCTL_DSP_SETTRIGGER, &enable_bits) < 0)
pa_log_warn("SNDCTL_DSP_SETTRIGGER: %s", pa_cstrerror(errno));
-
+
if (u->sink && !(enable_bits & PCM_ENABLE_OUTPUT)) {
pa_log_debug("clearing playback buffer");
pa_silence_memory(u->out_mmap, u->out_hwbuf_size, &u->sink->sample_spec);
}
-
+
} else {
if (enable_bits)
if (ioctl(u->fd, SNDCTL_DSP_POST, NULL) < 0)
pa_log_warn("SNDCTL_DSP_POST: %s", pa_cstrerror(errno));
-
+
if (!quick) {
/*
* Some crappy drivers do not start the recording until we
* read something. Without this snippet, poll will never
* register the fd as ready.
*/
-
- if (u->source && u->source->thread_info.state != PA_SOURCE_SUSPENDED) {
+
+ if (u->source && PA_SOURCE_IS_OPENED(u->source->thread_info.state)) {
uint8_t *buf = pa_xnew(uint8_t, u->in_fragment_size);
pa_read(u->fd, buf, u->in_fragment_size, NULL);
pa_xfree(buf);
pa_assert(u);
pa_assert(u->out_mmap_memblocks);
+/* pa_log("Mmmap writing %u blocks", n); */
+
while (n > 0) {
pa_memchunk chunk;
static int mmap_write(struct userdata *u) {
struct count_info info;
-
-
+
pa_assert(u);
pa_assert(u->sink);
+/* pa_log("Mmmap writing..."); */
+
if (ioctl(u->fd, SNDCTL_DSP_GETOPTR, &info) < 0) {
pa_log("SNDCTL_DSP_GETOPTR: %s", pa_cstrerror(errno));
return -1;
if (info.blocks > 0)
mmap_fill_memblocks(u, info.blocks);
-
+
return info.blocks;
}
pa_assert(u);
pa_assert(u->in_mmap_memblocks);
+/* pa_log("Mmmap reading %u blocks", n); */
+
while (n > 0) {
pa_memchunk chunk;
if (!u->in_mmap_memblocks[u->in_mmap_current]) {
-
+
chunk.memblock = u->in_mmap_memblocks[u->in_mmap_current] =
pa_memblock_new_fixed(
u->core->mempool,
(uint8_t*) u->in_mmap + u->in_fragment_size*u->in_mmap_current,
u->in_fragment_size,
1);
-
+
chunk.length = pa_memblock_get_length(chunk.memblock);
chunk.index = 0;
static void mmap_clear_memblocks(struct userdata*u, unsigned n) {
unsigned i = u->in_mmap_current;
-
+
pa_assert(u);
pa_assert(u->in_mmap_memblocks);
pa_assert(u);
pa_assert(u->source);
+/* pa_log("Mmmap reading..."); */
+
if (ioctl(u->fd, SNDCTL_DSP_GETIPTR, &info) < 0) {
pa_log("SNDCTL_DSP_GETIPTR: %s", pa_cstrerror(errno));
return -1;
}
+/* pa_log("... %i", info.blocks); */
+
info.blocks += u->in_mmap_saved_nfrags;
u->in_mmap_saved_nfrags = 0;
mmap_post_memblocks(u, info.blocks);
mmap_clear_memblocks(u, u->in_nfrags/2);
}
-
+
return info.blocks;
}
static pa_usec_t mmap_sink_get_latency(struct userdata *u) {
struct count_info info;
size_t bpos, n;
-
+
pa_assert(u);
if (ioctl(u->fd, SNDCTL_DSP_GETOPTR, &info) < 0) {
static pa_usec_t io_sink_get_latency(struct userdata *u) {
pa_usec_t r = 0;
-
+
pa_assert(u);
-
+
if (u->use_getodelay) {
int arg;
-
+
if (ioctl(u->fd, SNDCTL_DSP_GETODELAY, &arg) < 0) {
pa_log_info("Device doesn't support SNDCTL_DSP_GETODELAY: %s", pa_cstrerror(errno));
u->use_getodelay = 0;
} else
r = pa_bytes_to_usec(arg, &u->sink->sample_spec);
-
+
}
-
+
if (!u->use_getodelay && u->use_getospace) {
struct audio_buf_info info;
-
+
if (ioctl(u->fd, SNDCTL_DSP_GETOSPACE, &info) < 0) {
pa_log_info("Device doesn't support SNDCTL_DSP_GETOSPACE: %s", pa_cstrerror(errno));
u->use_getospace = 0;
static pa_usec_t io_source_get_latency(struct userdata *u) {
pa_usec_t r = 0;
-
+
pa_assert(u);
-
+
if (u->use_getispace) {
struct audio_buf_info info;
return r;
}
+static void build_pollfd(struct userdata *u) {
+ struct pollfd *pollfd;
+
+ pa_assert(u);
+ pa_assert(u->fd >= 0);
+
+ if (u->rtpoll_item)
+ pa_rtpoll_item_free(u->rtpoll_item);
+
+ u->rtpoll_item = pa_rtpoll_item_new(u->rtpoll, PA_RTPOLL_NEVER, 1);
+ pollfd = pa_rtpoll_item_get_pollfd(u->rtpoll_item, NULL);
+ pollfd->fd = u->fd;
+ pollfd->events = 0;
+ pollfd->revents = 0;
+}
+
static int suspend(struct userdata *u) {
pa_assert(u);
pa_assert(u->fd >= 0);
+ pa_log_info("Suspending...");
+
if (u->out_mmap_memblocks) {
unsigned i;
for (i = 0; i < u->out_nfrags; i++)
u->in_mmap_memblocks[i] = NULL;
}
}
-
+
if (u->in_mmap && u->in_mmap != MAP_FAILED) {
munmap(u->in_mmap, u->in_hwbuf_size);
u->in_mmap = NULL;
}
-
+
if (u->out_mmap && u->out_mmap != MAP_FAILED) {
munmap(u->out_mmap, u->out_hwbuf_size);
u->out_mmap = NULL;
/* Let's suspend */
ioctl(u->fd, SNDCTL_DSP_SYNC, NULL);
- close(u->fd);
+ pa_close(u->fd);
u->fd = -1;
- pa_log_debug("Device suspended...");
-
+ if (u->rtpoll_item) {
+ pa_rtpoll_item_free(u->rtpoll_item);
+ u->rtpoll_item = NULL;
+ }
+
+ pa_log_info("Device suspended...");
+
return 0;
}
+static int sink_get_volume(pa_sink *s);
+static int source_get_volume(pa_source *s);
+
static int unsuspend(struct userdata *u) {
int m;
pa_sample_spec ss, *ss_original;
m = u->mode;
- pa_log_debug("Trying resume...");
+ pa_log_info("Trying resume...");
if ((u->fd = pa_oss_open(u->device_name, &m, NULL)) < 0) {
pa_log_warn("Resume failed, device busy (%s)", pa_cstrerror(errno));
goto fail;
}
-
+
pa_silence_memory(u->out_mmap, u->out_hwbuf_size, &ss);
}
}
u->out_mmap_current = u->in_mmap_current = 0;
u->out_mmap_saved_nfrags = u->in_mmap_saved_nfrags = 0;
-
- /* Now, start only what we need */
- trigger(u, 0);
- pa_log_debug("Resumed successfully...");
+ pa_assert(!u->rtpoll_item);
+
+ build_pollfd(u);
+
+ if (u->sink)
+ sink_get_volume(u->sink);
+ if (u->source)
+ source_get_volume(u->source);
+
+ pa_log_info("Resumed successfully...");
return 0;
fail:
- close(u->fd);
+ pa_close(u->fd);
u->fd = -1;
return -1;
}
-static int sink_process_msg(pa_msgobject *o, int code, void *data, pa_memchunk *chunk) {
+static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) {
struct userdata *u = PA_SINK(o)->userdata;
- int do_trigger = 0, ret;
+ int ret;
+ pa_bool_t do_trigger = FALSE, quick = TRUE;
switch (code) {
*((pa_usec_t*) data) = r;
- break;
+ return 0;
}
case PA_SINK_MESSAGE_SET_STATE:
- if (PA_PTR_TO_UINT(data) == PA_SINK_SUSPENDED) {
- pa_assert(u->sink->thread_info.state != PA_SINK_SUSPENDED);
+ switch ((pa_sink_state_t) PA_PTR_TO_UINT(data)) {
- if (u->source_suspended) {
- if (suspend(u) < 0)
- return -1;
- } else
- do_trigger = 1;
+ case PA_SINK_SUSPENDED:
+ pa_assert(PA_SINK_IS_OPENED(u->sink->thread_info.state));
- u->sink_suspended = 1;
-
- } else if (u->sink->thread_info.state == PA_SINK_SUSPENDED) {
- pa_assert(PA_PTR_TO_UINT(data) != PA_SINK_SUSPENDED);
+ if (!u->source || u->source_suspended) {
+ if (suspend(u) < 0)
+ return -1;
+ }
- if (u->source_suspended) {
- if (unsuspend(u) < 0)
- return -1;
- } else
- do_trigger = 1;
+ do_trigger = TRUE;
- u->out_mmap_current = 0;
- u->out_mmap_saved_nfrags = 0;
+ u->sink_suspended = TRUE;
+ break;
- u->sink_suspended = 0;
- }
-
- break;
+ case PA_SINK_IDLE:
+ case PA_SINK_RUNNING:
- case PA_SINK_MESSAGE_SET_VOLUME:
+ if (u->sink->thread_info.state == PA_SINK_INIT) {
+ do_trigger = TRUE;
+ quick = u->source && PA_SOURCE_IS_OPENED(u->source->thread_info.state);
+ }
- if (u->use_pcm_volume && u->fd >= 0) {
+ if (u->sink->thread_info.state == PA_SINK_SUSPENDED) {
- if (pa_oss_set_pcm_volume(u->fd, &u->sink->sample_spec, ((pa_cvolume*) data)) < 0) {
- pa_log_info("Device doesn't support setting mixer settings: %s", pa_cstrerror(errno));
- u->use_pcm_volume = 0;
- } else
- return 0;
- }
+ if (!u->source || u->source_suspended) {
+ if (unsuspend(u) < 0)
+ return -1;
+ quick = FALSE;
+ }
- break;
+ do_trigger = TRUE;
- case PA_SINK_MESSAGE_GET_VOLUME:
+ u->out_mmap_current = 0;
+ u->out_mmap_saved_nfrags = 0;
- if (u->use_pcm_volume && u->fd >= 0) {
+ u->sink_suspended = FALSE;
+ }
+
+ break;
- if (pa_oss_get_pcm_volume(u->fd, &u->sink->sample_spec, ((pa_cvolume*) data)) < 0) {
- pa_log_info("Device doesn't support reading mixer settings: %s", pa_cstrerror(errno));
- u->use_pcm_volume = 0;
- } else
- return 0;
+ case PA_SINK_UNLINKED:
+ case PA_SINK_INIT:
+ ;
}
break;
+
}
- ret = pa_sink_process_msg(o, code, data, chunk);
+ ret = pa_sink_process_msg(o, code, data, offset, chunk);
if (do_trigger)
- trigger(u, 1);
-
+ trigger(u, quick);
+
return ret;
}
-static int source_process_msg(pa_msgobject *o, int code, void *data, pa_memchunk *chunk) {
+static int source_process_msg(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) {
struct userdata *u = PA_SOURCE(o)->userdata;
- int do_trigger = 0, ret;
+ int ret;
+ int do_trigger = FALSE, quick = TRUE;
switch (code) {
else
r = io_source_get_latency(u);
}
-
+
*((pa_usec_t*) data) = r;
- break;
+ return 0;
}
case PA_SOURCE_MESSAGE_SET_STATE:
- if (PA_PTR_TO_UINT(data) == PA_SOURCE_SUSPENDED) {
- pa_assert(u->source->thread_info.state != PA_SOURCE_SUSPENDED);
-
- if (u->sink_suspended) {
- if (suspend(u) < 0)
- return -1;
- } else
- do_trigger = 1;
+ switch ((pa_source_state_t) PA_PTR_TO_UINT(data)) {
+ case PA_SOURCE_SUSPENDED:
+ pa_assert(PA_SOURCE_IS_OPENED(u->source->thread_info.state));
- u->source_suspended = 1;
+ if (!u->sink || u->sink_suspended) {
+ if (suspend(u) < 0)
+ return -1;
+ }
- } else if (u->source->thread_info.state == PA_SOURCE_SUSPENDED) {
- pa_assert(PA_PTR_TO_UINT(data) != PA_SOURCE_SUSPENDED);
+ do_trigger = TRUE;
- if (u->sink_suspended) {
- if (unsuspend(u) < 0)
- return -1;
- } else
- do_trigger = 1;
-
- u->in_mmap_current = 0;
- u->in_mmap_saved_nfrags = 0;
+ u->source_suspended = TRUE;
+ break;
- u->source_suspended = 0;
- }
+ case PA_SOURCE_IDLE:
+ case PA_SOURCE_RUNNING:
- break;
+ if (u->source->thread_info.state == PA_SOURCE_INIT) {
+ do_trigger = TRUE;
+ quick = u->sink && PA_SINK_IS_OPENED(u->sink->thread_info.state);
+ }
- case PA_SOURCE_MESSAGE_SET_VOLUME:
+ if (u->source->thread_info.state == PA_SOURCE_SUSPENDED) {
- if (u->use_input_volume && u->fd >= 0) {
+ if (!u->sink || u->sink_suspended) {
+ if (unsuspend(u) < 0)
+ return -1;
+ quick = FALSE;
+ }
- if (pa_oss_set_input_volume(u->fd, &u->source->sample_spec, ((pa_cvolume*) data)) < 0) {
- pa_log_info("Device doesn't support setting mixer settings: %s", pa_cstrerror(errno));
- u->use_input_volume = 0;
- } else
- return 0;
- }
+ do_trigger = TRUE;
- break;
+ u->in_mmap_current = 0;
+ u->in_mmap_saved_nfrags = 0;
- case PA_SOURCE_MESSAGE_GET_VOLUME:
+ u->source_suspended = FALSE;
+ }
+ break;
- if (u->use_input_volume && u->fd >= 0) {
+ case PA_SOURCE_UNLINKED:
+ case PA_SOURCE_INIT:
+ ;
- if (pa_oss_get_input_volume(u->fd, &u->source->sample_spec, ((pa_cvolume*) data)) < 0) {
- pa_log_info("Device doesn't support reading mixer settings: %s", pa_cstrerror(errno));
- u->use_input_volume = 0;
- } else
- return 0;
}
-
break;
+
}
- ret = pa_source_process_msg(o, code, data, chunk);
+ ret = pa_source_process_msg(o, code, data, offset, chunk);
if (do_trigger)
- trigger(u, 1);
+ trigger(u, quick);
return ret;
}
-static void thread_func(void *userdata) {
- enum {
- POLLFD_ASYNCQ,
- POLLFD_DSP,
- POLLFD_MAX,
- };
+static int sink_get_volume(pa_sink *s) {
+ struct userdata *u;
+ int r;
+
+ pa_assert_se(u = s->userdata);
+
+ pa_assert(u->mixer_devmask & (SOUND_MASK_VOLUME|SOUND_MASK_PCM));
+
+ if (u->mixer_devmask & SOUND_MASK_VOLUME)
+ if ((r = pa_oss_get_volume(u->mixer_fd, SOUND_MIXER_READ_VOLUME, &s->sample_spec, &s->volume)) >= 0)
+ return r;
+ if (u->mixer_devmask & SOUND_MASK_PCM)
+ if ((r = pa_oss_get_volume(u->mixer_fd, SOUND_MIXER_READ_PCM, &s->sample_spec, &s->volume)) >= 0)
+ return r;
+
+ pa_log_info("Device doesn't support reading mixer settings: %s", pa_cstrerror(errno));
+ return -1;
+}
+
+static int sink_set_volume(pa_sink *s) {
+ struct userdata *u;
+ int r;
+
+ pa_assert_se(u = s->userdata);
+
+ pa_assert(u->mixer_devmask & (SOUND_MASK_VOLUME|SOUND_MASK_PCM));
+
+ if (u->mixer_devmask & SOUND_MASK_VOLUME)
+ if ((r = pa_oss_set_volume(u->mixer_fd, SOUND_MIXER_WRITE_VOLUME, &s->sample_spec, &s->volume)) >= 0)
+ return r;
+
+ if (u->mixer_devmask & SOUND_MASK_PCM)
+ if ((r = pa_oss_get_volume(u->mixer_fd, SOUND_MIXER_WRITE_PCM, &s->sample_spec, &s->volume)) >= 0)
+ return r;
+
+ pa_log_info("Device doesn't support writing mixer settings: %s", pa_cstrerror(errno));
+ return -1;
+}
+
+static int source_get_volume(pa_source *s) {
+ struct userdata *u;
+ int r;
+
+ pa_assert_se(u = s->userdata);
+
+ pa_assert(u->mixer_devmask & (SOUND_MASK_IGAIN|SOUND_MASK_RECLEV));
+
+ if (u->mixer_devmask & SOUND_MASK_IGAIN)
+ if ((r = pa_oss_get_volume(u->mixer_fd, SOUND_MIXER_READ_IGAIN, &s->sample_spec, &s->volume)) >= 0)
+ return r;
+
+ if (u->mixer_devmask & SOUND_MASK_RECLEV)
+ if ((r = pa_oss_get_volume(u->mixer_fd, SOUND_MIXER_READ_RECLEV, &s->sample_spec, &s->volume)) >= 0)
+ return r;
+
+ pa_log_info("Device doesn't support reading mixer settings: %s", pa_cstrerror(errno));
+ return -1;
+}
+
+static int source_set_volume(pa_source *s) {
+ struct userdata *u;
+ int r;
+
+ pa_assert_se(u = s->userdata);
+
+ pa_assert(u->mixer_devmask & (SOUND_MASK_IGAIN|SOUND_MASK_RECLEV));
+
+ if (u->mixer_devmask & SOUND_MASK_IGAIN)
+ if ((r = pa_oss_set_volume(u->mixer_fd, SOUND_MIXER_WRITE_IGAIN, &s->sample_spec, &s->volume)) >= 0)
+ return r;
+
+ if (u->mixer_devmask & SOUND_MASK_RECLEV)
+ if ((r = pa_oss_get_volume(u->mixer_fd, SOUND_MIXER_WRITE_RECLEV, &s->sample_spec, &s->volume)) >= 0)
+ return r;
+
+ pa_log_info("Device doesn't support writing mixer settings: %s", pa_cstrerror(errno));
+ return -1;
+}
+
+static void thread_func(void *userdata) {
struct userdata *u = userdata;
- struct pollfd pollfd[POLLFD_MAX];
int write_type = 0, read_type = 0;
+ unsigned short revents = 0;
pa_assert(u);
pa_log_debug("Thread starting up");
- trigger(u, 0);
-
- memset(&pollfd, 0, sizeof(pollfd));
+ if (u->core->realtime_scheduling)
+ pa_make_realtime(u->core->realtime_priority);
- pollfd[POLLFD_ASYNCQ].fd = pa_asyncmsgq_get_fd(u->asyncmsgq);
- pollfd[POLLFD_ASYNCQ].events = POLLIN;
- pollfd[POLLFD_DSP].fd = u->fd;
+ pa_thread_mq_install(&u->thread_mq);
+ pa_rtpoll_install(u->rtpoll);
for (;;) {
- pa_msgobject *object;
- int code;
- void *data;
- pa_memchunk chunk;
- int r;
-
-/* pa_log("loop"); */
-
- /* Check whether there is a message for us to process */
- if (pa_asyncmsgq_get(u->asyncmsgq, &object, &code, &data, &chunk, 0) == 0) {
- int ret;
+ int ret;
-/* pa_log("processing msg"); */
+/* pa_log("loop"); */
- if (!object && code == PA_MESSAGE_SHUTDOWN) {
- pa_asyncmsgq_done(u->asyncmsgq, 0);
- goto finish;
- }
-
- ret = pa_asyncmsgq_dispatch(object, code, data, &chunk);
- pa_asyncmsgq_done(u->asyncmsgq, ret);
- continue;
- }
-
-/* pa_log("loop2"); */
+ if (PA_SINK_IS_OPENED(u->sink->thread_info.state))
+ if (u->sink->thread_info.rewind_requested)
+ pa_sink_process_rewind(u->sink, 0);
/* Render some data and write it to the dsp */
- if (u->sink && u->sink->thread_info.state != PA_SINK_SUSPENDED && (pollfd[POLLFD_DSP].revents & POLLOUT)) {
+ if (u->sink && PA_SINK_IS_OPENED(u->sink->thread_info.state) && ((revents & POLLOUT) || u->use_mmap || u->use_getospace)) {
if (u->use_mmap) {
- int ret;
if ((ret = mmap_write(u)) < 0)
goto fail;
- pollfd[POLLFD_DSP].revents &= ~POLLOUT;
-
+ revents &= ~POLLOUT;
+
if (ret > 0)
continue;
} else {
ssize_t l;
- void *p;
- int loop = 0;
-
+ pa_bool_t loop = FALSE, work_done = FALSE;
+
l = u->out_fragment_size;
-
+
if (u->use_getospace) {
audio_buf_info info;
-
+
if (ioctl(u->fd, SNDCTL_DSP_GETOSPACE, &info) < 0) {
pa_log_info("Device doesn't support SNDCTL_DSP_GETOSPACE: %s", pa_cstrerror(errno));
- u->use_getospace = 0;
+ u->use_getospace = FALSE;
} else {
- if (info.bytes >= l) {
- l = (info.bytes/l)*l;
- loop = 1;
- }
+ l = info.bytes;
+
+ /* We loop only if GETOSPACE worked and we
+ * actually *know* that we can write more than
+ * one fragment at a time */
+ loop = TRUE;
}
}
-
- do {
+
+ /* Round down to multiples of the fragment size,
+ * because OSS needs that (at least some versions
+ * do) */
+ l = (l/u->out_fragment_size) * u->out_fragment_size;
+
+ /* Hmm, so poll() signalled us that we can read
+ * something, but GETOSPACE told us there was nothing?
+ * Hmm, make the best of it, try to read some data, to
+ * avoid spinning forever. */
+ if (l <= 0 && (revents & POLLOUT)) {
+ l = u->out_fragment_size;
+ loop = FALSE;
+ }
+
+ while (l > 0) {
+ void *p;
ssize_t t;
-
- pa_assert(l > 0);
-
+
if (u->memchunk.length <= 0)
pa_sink_render(u->sink, l, &u->memchunk);
-
+
pa_assert(u->memchunk.length > 0);
-
+
p = pa_memblock_acquire(u->memchunk.memblock);
t = pa_write(u->fd, (uint8_t*) p + u->memchunk.index, u->memchunk.length, &write_type);
pa_memblock_release(u->memchunk.memblock);
-
+
/* pa_log("wrote %i bytes of %u", t, l); */
-
+
pa_assert(t != 0);
-
+
if (t < 0) {
-
+
if (errno == EINTR)
continue;
-
+
else if (errno == EAGAIN) {
- pa_log_debug("EAGAIN");
-
- pollfd[POLLFD_DSP].revents &= ~POLLOUT;
+ pa_log_debug("EAGAIN");
+
+ revents &= ~POLLOUT;
break;
-
+
} else {
pa_log("Failed to write data to DSP: %s", pa_cstrerror(errno));
goto fail;
}
-
+
} else {
-
+
u->memchunk.index += t;
u->memchunk.length -= t;
-
+
if (u->memchunk.length <= 0) {
pa_memblock_unref(u->memchunk.memblock);
pa_memchunk_reset(&u->memchunk);
}
-
+
l -= t;
-
- pollfd[POLLFD_DSP].revents &= ~POLLOUT;
+
+ revents &= ~POLLOUT;
+ work_done = TRUE;
}
-
- } while (loop && l > 0);
-
- continue;
+
+ if (!loop)
+ break;
+ }
+
+ if (work_done)
+ continue;
}
}
- /* Try to read some data and pass it on to the source driver */
+ /* Try to read some data and pass it on to the source driver. */
- if (u->source && u->source->thread_info.state != PA_SOURCE_SUSPENDED && ((pollfd[POLLFD_DSP].revents & POLLIN))) {
+ if (u->source && PA_SOURCE_IS_OPENED(u->source->thread_info.state) && ((revents & POLLIN) || u->use_mmap || u->use_getispace)) {
if (u->use_mmap) {
- int ret;
if ((ret = mmap_read(u)) < 0)
goto fail;
- pollfd[POLLFD_DSP].revents &= ~POLLIN;
-
+ revents &= ~POLLIN;
+
if (ret > 0)
continue;
void *p;
ssize_t l;
pa_memchunk memchunk;
- int loop = 0;
+ pa_bool_t loop = FALSE, work_done = FALSE;
l = u->in_fragment_size;
if (ioctl(u->fd, SNDCTL_DSP_GETISPACE, &info) < 0) {
pa_log_info("Device doesn't support SNDCTL_DSP_GETISPACE: %s", pa_cstrerror(errno));
- u->use_getispace = 0;
+ u->use_getispace = FALSE;
} else {
- if (info.bytes >= l) {
- l = (info.bytes/l)*l;
- loop = 1;
- }
+ l = info.bytes;
+ loop = TRUE;
}
}
- do {
- ssize_t t;
+ l = (l/u->in_fragment_size) * u->in_fragment_size;
+
+ if (l <= 0 && (revents & POLLIN)) {
+ l = u->in_fragment_size;
+ loop = FALSE;
+ }
+
+ while (l > 0) {
+ ssize_t t, k;
pa_assert(l > 0);
- memchunk.memblock = pa_memblock_new(u->core->mempool, l);
+ memchunk.memblock = pa_memblock_new(u->core->mempool, (size_t) -1);
+
+ k = pa_memblock_get_length(memchunk.memblock);
+
+ if (k > l)
+ k = l;
+
+ k = (k/u->frame_size)*u->frame_size;
p = pa_memblock_acquire(memchunk.memblock);
- t = pa_read(u->fd, p, l, &read_type);
+ t = pa_read(u->fd, p, k, &read_type);
pa_memblock_release(memchunk.memblock);
pa_assert(t != 0); /* EOF cannot happen */
/* pa_log("read %i bytes of %u", t, l); */
-
+
if (t < 0) {
pa_memblock_unref(memchunk.memblock);
continue;
else if (errno == EAGAIN) {
- pa_log_debug("EAGAIN");
+ pa_log_debug("EAGAIN");
- pollfd[POLLFD_DSP].revents &= ~POLLIN;
+ revents &= ~POLLIN;
break;
} else {
l -= t;
- pollfd[POLLFD_DSP].revents &= ~POLLIN;
+ revents &= ~POLLIN;
+ work_done = TRUE;
}
- } while (loop && l > 0);
- continue;
- }
- }
+ if (!loop)
+ break;
+ }
- if (u->fd >= 0) {
- pollfd[POLLFD_DSP].fd = u->fd;
- pollfd[POLLFD_DSP].events =
- ((u->source && u->source->thread_info.state != PA_SOURCE_SUSPENDED) ? POLLIN : 0) |
- ((u->sink && u->sink->thread_info.state != PA_SINK_SUSPENDED) ? POLLOUT : 0);
+ if (work_done)
+ continue;
+ }
}
-
- /* Hmm, nothing to do. Let's sleep */
- if (pa_asyncmsgq_before_poll(u->asyncmsgq) < 0)
- continue;
+/* pa_log("loop2 revents=%i", revents); */
-/* pa_log("polling for %i (legend: %i=POLLIN, %i=POLLOUT)", u->fd >= 0 ? pollfd[POLLFD_DSP].events : -1, POLLIN, POLLOUT); */
- r = poll(pollfd, u->fd >= 0 ? POLLFD_MAX : POLLFD_DSP, -1);
-/* pa_log("polling got dsp=%i amq=%i (%i)", r > 0 ? pollfd[POLLFD_DSP].revents : 0, r > 0 ? pollfd[POLLFD_ASYNCQ].revents : 0, r); */
+ if (u->rtpoll_item) {
+ struct pollfd *pollfd;
- pa_asyncmsgq_after_poll(u->asyncmsgq);
+ pa_assert(u->fd >= 0);
- if (u->fd < 0)
- pollfd[POLLFD_DSP].revents = 0;
-
- if (r < 0) {
- if (errno == EINTR) {
- pollfd[POLLFD_ASYNCQ].revents = 0;
- pollfd[POLLFD_DSP].revents = 0;
- continue;
- }
+ pollfd = pa_rtpoll_item_get_pollfd(u->rtpoll_item, NULL);
+ pollfd->events =
+ ((u->source && PA_SOURCE_IS_OPENED(u->source->thread_info.state)) ? POLLIN : 0) |
+ ((u->sink && PA_SINK_IS_OPENED(u->sink->thread_info.state)) ? POLLOUT : 0);
+ }
- pa_log("poll() failed: %s", pa_cstrerror(errno));
+ /* Hmm, nothing to do. Let's sleep */
+ if ((ret = pa_rtpoll_run(u->rtpoll, TRUE)) < 0)
goto fail;
- }
- pa_assert(r > 0);
+ if (ret == 0)
+ goto finish;
- if (pollfd[POLLFD_DSP].revents & ~(POLLOUT|POLLIN)) {
- pa_log("DSP shutdown.");
- goto fail;
- }
+ if (u->rtpoll_item) {
+ struct pollfd *pollfd;
+
+ pollfd = pa_rtpoll_item_get_pollfd(u->rtpoll_item, NULL);
- pa_assert((pollfd[POLLFD_ASYNCQ].revents & ~POLLIN) == 0);
+ if (pollfd->revents & ~(POLLOUT|POLLIN)) {
+ pa_log("DSP shutdown.");
+ goto fail;
+ }
+
+ revents = pollfd->revents;
+ } else
+ revents = 0;
}
fail:
- /* We have to continue processing messages until we receive the
- * SHUTDOWN message */
- pa_asyncmsgq_post(u->core->asyncmsgq, PA_MSGOBJECT(u->core), PA_CORE_MESSAGE_UNLOAD_MODULE, u->module, NULL, NULL);
- pa_asyncmsgq_wait_for(u->asyncmsgq, PA_MESSAGE_SHUTDOWN);
+ /* If this was no regular exit from the loop we have to continue
+ * processing messages until we received PA_MESSAGE_SHUTDOWN */
+ pa_asyncmsgq_post(u->thread_mq.outq, PA_MSGOBJECT(u->core), PA_CORE_MESSAGE_UNLOAD_MODULE, u->module, 0, NULL, NULL);
+ pa_asyncmsgq_wait_for(u->thread_mq.inq, PA_MESSAGE_SHUTDOWN);
finish:
pa_log_debug("Thread shutting down");
}
-int pa__init(pa_core *c, pa_module*m) {
+int pa__init(pa_module*m) {
+
struct audio_buf_info info;
struct userdata *u = NULL;
- const char *p;
+ const char *dev;
int fd = -1;
int nfrags, frag_size;
int mode, caps;
- int record = 1, playback = 1, use_mmap = 1;
+ pa_bool_t record = TRUE, playback = TRUE, use_mmap = TRUE;
pa_sample_spec ss;
pa_channel_map map;
pa_modargs *ma = NULL;
- char hwdesc[64], *t;
+ char hwdesc[64];
const char *name;
- int namereg_fail;
+ pa_bool_t namereg_fail;
+ pa_sink_new_data sink_new_data;
+ pa_source_new_data source_new_data;
- pa_assert(c);
pa_assert(m);
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
}
if (pa_modargs_get_value_boolean(ma, "record", &record) < 0 || pa_modargs_get_value_boolean(ma, "playback", &playback) < 0) {
- pa_log("record= and playback= expect numeric argument.");
+ pa_log("record= and playback= expect boolean argument.");
goto fail;
}
mode = (playback && record) ? O_RDWR : (playback ? O_WRONLY : (record ? O_RDONLY : 0));
- ss = c->default_sample_spec;
+ ss = m->core->default_sample_spec;
if (pa_modargs_get_sample_spec_and_channel_map(ma, &ss, &map, PA_CHANNEL_MAP_OSS) < 0) {
pa_log("Failed to parse sample specification or channel map");
goto fail;
}
- nfrags = DEFAULT_NFRAGS;
- frag_size = pa_usec_to_bytes(DEFAULT_FRAGSIZE_MSEC*1000, &ss);
+ nfrags = m->core->default_n_fragments;
+ frag_size = pa_usec_to_bytes(m->core->default_fragment_size_msec*1000, &ss);
if (frag_size <= 0)
frag_size = pa_frame_size(&ss);
pa_log("Failed to parse mmap argument.");
goto fail;
}
-
- if ((fd = pa_oss_open(p = pa_modargs_get_value(ma, "device", DEFAULT_DEVICE), &mode, &caps)) < 0)
+
+ if ((fd = pa_oss_open(dev = pa_modargs_get_value(ma, "device", DEFAULT_DEVICE), &mode, &caps)) < 0)
goto fail;
if (use_mmap && (!(caps & DSP_CAP_MMAP) || !(caps & DSP_CAP_TRIGGER))) {
pa_log_info("OSS device not mmap capable, falling back to UNIX read/write mode.");
use_mmap = 0;
}
-
+
if (use_mmap && mode == O_WRONLY) {
- pa_log_info("Device opened for write only, cannot do memory mapping, falling back to UNIX read/write mode.");
+ pa_log_info("Device opened for playback only, cannot do memory mapping, falling back to UNIX write() mode.");
use_mmap = 0;
}
- if (pa_oss_get_hw_description(p, hwdesc, sizeof(hwdesc)) >= 0)
+ if (pa_oss_get_hw_description(dev, hwdesc, sizeof(hwdesc)) >= 0)
pa_log_info("Hardware name is '%s'.", hwdesc);
else
hwdesc[0] = 0;
pa_assert(frag_size > 0);
u = pa_xnew0(struct userdata, 1);
- u->core = c;
+ u->core = m->core;
u->module = m;
m->userdata = u;
- u->use_getospace = u->use_getispace = 1;
- u->use_getodelay = 1;
- u->use_input_volume = u->use_pcm_volume = 1;
+ u->fd = fd;
+ u->mixer_fd = -1;
+ u->use_getospace = u->use_getispace = TRUE;
+ u->use_getodelay = TRUE;
u->mode = mode;
- u->device_name = pa_xstrdup(p);
+ u->frame_size = pa_frame_size(&ss);
+ u->device_name = pa_xstrdup(dev);
u->in_nfrags = u->out_nfrags = u->nfrags = nfrags;
u->out_fragment_size = u->in_fragment_size = u->frag_size = frag_size;
u->use_mmap = use_mmap;
- pa_assert_se(u->asyncmsgq = pa_asyncmsgq_new(0));
+ u->rtpoll = pa_rtpoll_new();
+ pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll);
+ u->rtpoll_item = NULL;
+ build_pollfd(u);
if (ioctl(fd, SNDCTL_DSP_GETISPACE, &info) >= 0) {
pa_log_info("Input -- %u fragments of size %u.", info.fragstotal, info.fragsize);
u->in_fragment_size = info.fragsize;
u->in_nfrags = info.fragstotal;
- u->use_getispace = 1;
+ u->use_getispace = TRUE;
}
if (ioctl(fd, SNDCTL_DSP_GETOSPACE, &info) >= 0) {
pa_log_info("Output -- %u fragments of size %u.", info.fragstotal, info.fragsize);
u->out_fragment_size = info.fragsize;
u->out_nfrags = info.fragstotal;
- u->use_getospace = 1;
+ u->use_getospace = TRUE;
}
u->in_hwbuf_size = u->in_nfrags * u->in_fragment_size;
u->out_hwbuf_size = u->out_nfrags * u->out_fragment_size;
-
+
if (mode != O_WRONLY) {
char *name_buf = NULL;
if (use_mmap) {
if ((u->in_mmap = mmap(NULL, u->in_hwbuf_size, PROT_READ, MAP_SHARED, fd, 0)) == MAP_FAILED) {
- if (mode == O_RDWR) {
- pa_log_debug("mmap() failed for input. Changing to O_WRONLY mode.");
- mode = O_WRONLY;
- goto try_write;
- } else {
- pa_log("mmap(): %s", pa_cstrerror(errno));
- goto fail;
- }
- }
-
- pa_log_debug("Successfully mmap()ed input buffer.");
+ pa_log_warn("mmap(PROT_READ) failed, reverting to non-mmap mode: %s", pa_cstrerror(errno));
+ use_mmap = u->use_mmap = FALSE;
+ u->in_mmap = NULL;
+ } else
+ pa_log_debug("Successfully mmap()ed input buffer.");
}
if ((name = pa_modargs_get_value(ma, "source_name", NULL)))
- namereg_fail = 1;
+ namereg_fail = TRUE;
else {
- name = name_buf = pa_sprintf_malloc("oss_input.%s", pa_path_get_filename(p));
- namereg_fail = 0;
+ name = name_buf = pa_sprintf_malloc("oss_input.%s", pa_path_get_filename(dev));
+ namereg_fail = FALSE;
}
- u->source = pa_source_new(c, __FILE__, name, namereg_fail, &ss, &map);
+ pa_source_new_data_init(&source_new_data);
+ source_new_data.driver = __FILE__;
+ source_new_data.module = m;
+ pa_source_new_data_set_name(&source_new_data, name);
+ source_new_data.namereg_fail = namereg_fail;
+ pa_source_new_data_set_sample_spec(&source_new_data, &ss);
+ pa_source_new_data_set_channel_map(&source_new_data, &map);
+ pa_proplist_sets(source_new_data.proplist, PA_PROP_DEVICE_STRING, dev);
+ pa_proplist_sets(source_new_data.proplist, PA_PROP_DEVICE_API, "oss");
+ pa_proplist_sets(source_new_data.proplist, PA_PROP_DEVICE_DESCRIPTION, hwdesc[0] ? hwdesc : dev);
+ pa_proplist_sets(source_new_data.proplist, PA_PROP_DEVICE_ACCESS_MODE, use_mmap ? "mmap" : "serial");
+ pa_proplist_setf(source_new_data.proplist, PA_PROP_DEVICE_BUFFERING_BUFFER_SIZE, "%lu", (unsigned long) (u->in_hwbuf_size));
+ pa_proplist_setf(source_new_data.proplist, PA_PROP_DEVICE_BUFFERING_FRAGMENT_SIZE, "%lu", (unsigned long) (u->in_fragment_size));
+
+ u->source = pa_source_new(m->core, &source_new_data, PA_SOURCE_HARDWARE|PA_SOURCE_LATENCY);
+ pa_source_new_data_done(&source_new_data);
pa_xfree(name_buf);
- if (!u->source)
+
+ if (!u->source) {
+ pa_log("Failed to create source object");
goto fail;
+ }
u->source->parent.process_msg = source_process_msg;
u->source->userdata = u;
- pa_source_set_module(u->source, m);
- pa_source_set_asyncmsgq(u->source, u->asyncmsgq);
- pa_source_set_description(u->source, t = pa_sprintf_malloc("OSS PCM on %s%s%s%s",
- p,
- hwdesc[0] ? " (" : "",
- hwdesc[0] ? hwdesc : "",
- hwdesc[0] ? ")" : ""));
- pa_xfree(t);
- u->source->is_hardware = 1;
- u->source->refresh_volume = 1;
+ pa_source_set_asyncmsgq(u->source, u->thread_mq.inq);
+ pa_source_set_rtpoll(u->source, u->rtpoll);
+ u->source->refresh_volume = TRUE;
if (use_mmap)
u->in_mmap_memblocks = pa_xnew0(pa_memblock*, u->in_nfrags);
}
-try_write:
-
if (mode != O_RDONLY) {
char *name_buf = NULL;
mode = O_WRONLY;
goto go_on;
} else {
- pa_log("mmap(): %s", pa_cstrerror(errno));
- goto fail;
+ pa_log_warn("mmap(PROT_WRITE) failed, reverting to non-mmap mode: %s", pa_cstrerror(errno));
+ u->use_mmap = use_mmap = FALSE;
+ u->out_mmap = NULL;
}
+ } else {
+ pa_log_debug("Successfully mmap()ed output buffer.");
+ pa_silence_memory(u->out_mmap, u->out_hwbuf_size, &ss);
}
-
- pa_log_debug("Successfully mmap()ed output buffer.");
- pa_silence_memory(u->out_mmap, u->out_hwbuf_size, &ss);
}
-
+
if ((name = pa_modargs_get_value(ma, "sink_name", NULL)))
- namereg_fail = 1;
+ namereg_fail = TRUE;
else {
- name = name_buf = pa_sprintf_malloc("oss_output.%s", pa_path_get_filename(p));
- namereg_fail = 0;
+ name = name_buf = pa_sprintf_malloc("oss_output.%s", pa_path_get_filename(dev));
+ namereg_fail = FALSE;
}
- u->sink = pa_sink_new(c, __FILE__, name, namereg_fail, &ss, &map);
+ pa_sink_new_data_init(&sink_new_data);
+ sink_new_data.driver = __FILE__;
+ sink_new_data.module = m;
+ pa_sink_new_data_set_name(&sink_new_data, name);
+ sink_new_data.namereg_fail = namereg_fail;
+ pa_sink_new_data_set_sample_spec(&sink_new_data, &ss);
+ pa_sink_new_data_set_channel_map(&sink_new_data, &map);
+ pa_proplist_sets(sink_new_data.proplist, PA_PROP_DEVICE_STRING, dev);
+ pa_proplist_sets(sink_new_data.proplist, PA_PROP_DEVICE_API, "oss");
+ pa_proplist_sets(sink_new_data.proplist, PA_PROP_DEVICE_DESCRIPTION, hwdesc[0] ? hwdesc : dev);
+ pa_proplist_sets(sink_new_data.proplist, PA_PROP_DEVICE_ACCESS_MODE, use_mmap ? "mmap" : "serial");
+ pa_proplist_setf(sink_new_data.proplist, PA_PROP_DEVICE_BUFFERING_BUFFER_SIZE, "%lu", (unsigned long) (u->out_hwbuf_size));
+ pa_proplist_setf(sink_new_data.proplist, PA_PROP_DEVICE_BUFFERING_FRAGMENT_SIZE, "%lu", (unsigned long) (u->out_fragment_size));
+
+ u->sink = pa_sink_new(m->core, &sink_new_data, PA_SINK_HARDWARE|PA_SINK_LATENCY);
+ pa_sink_new_data_done(&sink_new_data);
pa_xfree(name_buf);
- if (!u->sink)
+
+ if (!u->sink) {
+ pa_log("Failed to create sink object");
goto fail;
+ }
u->sink->parent.process_msg = sink_process_msg;
u->sink->userdata = u;
-
- pa_sink_set_module(u->sink, m);
- pa_sink_set_asyncmsgq(u->sink, u->asyncmsgq);
- pa_sink_set_description(u->sink, t = pa_sprintf_malloc("OSS PCM on %s%s%s%s",
- p,
- hwdesc[0] ? " (" : "",
- hwdesc[0] ? hwdesc : "",
- hwdesc[0] ? ")" : ""));
- pa_xfree(t);
- u->sink->is_hardware = 1;
- u->sink->refresh_volume = 1;
+
+ pa_sink_set_asyncmsgq(u->sink, u->thread_mq.inq);
+ pa_sink_set_rtpoll(u->sink, u->rtpoll);
+ u->sink->refresh_volume = TRUE;
+
+ u->sink->thread_info.max_request = u->out_hwbuf_size;
if (use_mmap)
u->out_mmap_memblocks = pa_xnew0(pa_memblock*, u->out_nfrags);
}
+ if ((u->mixer_fd = pa_oss_open_mixer_for_device(u->device_name)) >= 0) {
+ pa_bool_t do_close = TRUE;
+ u->mixer_devmask = 0;
+
+ if (ioctl(fd, SOUND_MIXER_READ_DEVMASK, &u->mixer_devmask) < 0)
+ pa_log_warn("SOUND_MIXER_READ_DEVMASK failed: %s", pa_cstrerror(errno));
+
+ else {
+ if (u->sink && (u->mixer_devmask & (SOUND_MASK_VOLUME|SOUND_MASK_PCM))) {
+ pa_log_debug("Found hardware mixer track for playback.");
+ u->sink->flags |= PA_SINK_HW_VOLUME_CTRL;
+ u->sink->get_volume = sink_get_volume;
+ u->sink->set_volume = sink_set_volume;
+ do_close = FALSE;
+ }
+
+ if (u->source && (u->mixer_devmask & (SOUND_MASK_RECLEV|SOUND_MASK_IGAIN))) {
+ pa_log_debug("Found hardware mixer track for recording.");
+ u->source->flags |= PA_SOURCE_HW_VOLUME_CTRL;
+ u->source->get_volume = source_get_volume;
+ u->source->set_volume = source_set_volume;
+ do_close = FALSE;
+ }
+ }
+
+ if (do_close) {
+ pa_close(u->mixer_fd);
+ u->mixer_fd = -1;
+ }
+ }
+
go_on:
-
- pa_assert(u->source || u->sink);
- u->fd = fd;
+ pa_assert(u->source || u->sink);
pa_memchunk_reset(&u->memchunk);
goto fail;
}
- pa_modargs_free(ma);
-
/* Read mixer settings */
- if (u->source)
- pa_asyncmsgq_post(u->asyncmsgq, PA_MSGOBJECT(u->source), PA_SOURCE_MESSAGE_GET_VOLUME, &u->source->volume, NULL, NULL);
+ if (u->sink) {
+ if (sink_new_data.volume_is_set) {
+ if (u->sink->set_volume)
+ u->sink->set_volume(u->sink);
+ } else {
+ if (u->sink->get_volume)
+ u->sink->get_volume(u->sink);
+ }
+ }
+
+ if (u->source) {
+ if (source_new_data.volume_is_set) {
+ if (u->source->set_volume)
+ u->source->set_volume(u->source);
+ } else {
+ if (u->source->get_volume)
+ u->source->get_volume(u->source);
+ }
+ }
+
if (u->sink)
- pa_asyncmsgq_post(u->asyncmsgq, PA_MSGOBJECT(u->sink), PA_SINK_MESSAGE_GET_VOLUME, &u->sink->volume, NULL, NULL);
+ pa_sink_put(u->sink);
+ if (u->source)
+ pa_source_put(u->source);
+
+ pa_modargs_free(ma);
return 0;
fail:
- if (fd >= 0)
- close(fd);
+
+ if (u)
+ pa__done(m);
+ else if (fd >= 0)
+ pa_close(fd);
if (ma)
pa_modargs_free(ma);
return -1;
}
-void pa__done(pa_core *c, pa_module*m) {
+void pa__done(pa_module*m) {
struct userdata *u;
- pa_assert(c);
pa_assert(m);
if (!(u = m->userdata))
return;
if (u->sink)
- pa_sink_disconnect(u->sink);
+ pa_sink_unlink(u->sink);
if (u->source)
- pa_source_disconnect(u->source);
+ pa_source_unlink(u->source);
if (u->thread) {
- pa_asyncmsgq_send(u->asyncmsgq, NULL, PA_MESSAGE_SHUTDOWN, NULL, NULL);
+ pa_asyncmsgq_send(u->thread_mq.inq, NULL, PA_MESSAGE_SHUTDOWN, NULL, 0, NULL);
pa_thread_free(u->thread);
}
- if (u->asyncmsgq)
- pa_asyncmsgq_free(u->asyncmsgq);
+ pa_thread_mq_done(&u->thread_mq);
if (u->sink)
pa_sink_unref(u->sink);
if (u->memchunk.memblock)
pa_memblock_unref(u->memchunk.memblock);
+ if (u->rtpoll_item)
+ pa_rtpoll_item_free(u->rtpoll_item);
+
+ if (u->rtpoll)
+ pa_rtpoll_free(u->rtpoll);
+
if (u->out_mmap_memblocks) {
unsigned i;
for (i = 0; i < u->out_nfrags; i++)
if (u->out_mmap && u->out_mmap != MAP_FAILED)
munmap(u->out_mmap, u->out_hwbuf_size);
-
+
if (u->fd >= 0)
- close(u->fd);
+ pa_close(u->fd);
+
+ if (u->mixer_fd >= 0)
+ pa_close(u->mixer_fd);
pa_xfree(u->device_name);
-
+
pa_xfree(u);
}