[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.13-329-ge8f93b1
Lennart Poettering
gitmailer-noreply at 0pointer.de
Tue Jan 20 17:02:42 PST 2009
This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.
The master branch has been updated
from 7368a6e6be5dbbdc8e13003ef6841fe3fe1840bc (commit)
- Log -----------------------------------------------------------------
e8f93b1... make implementation of module-alsa-card complete
7ca0e00... fill in dev_id properly
28f05e0... remove leftover define
cba4c6b... when changing profiles do the actual assignment in the generic implementation
1d0bd6e... remove bogus pa_core_check_idle() call
dc2a4bd... add set-card-profile CLI command
9a0dbda... allow cards be referenced by their index
b6b0e07... fix copy/paste error
16d200e... add an API to create arbitrary alsa sinks/sources dynamically without having to load/unload modules
b88b89a... add new call pa_alsa_open_by_device_id_profile()
04e9214... export pa_channel_map_superset()
-----------------------------------------------------------------------
Summary of changes:
src/Makefile.am | 2 +-
src/map-file | 1 +
.../alsa/{module-alsa-sink.c => alsa-sink.c} | 146 +--
src/{pulse/error.h => modules/alsa/alsa-sink.h} | 19 +-
.../alsa/{module-alsa-source.c => alsa-source.c} | 145 +--
src/{pulse/error.h => modules/alsa/alsa-source.h} | 19 +-
src/modules/alsa/alsa-util.c | 95 +-
src/modules/alsa/alsa-util.h | 37 +-
src/modules/alsa/module-alsa-card.c | 106 ++-
src/modules/alsa/module-alsa-sink.c | 1578 +-------------------
src/modules/alsa/module-alsa-source.c | 1371 +-----------------
src/pulse/channelmap.c | 19 +
src/pulse/channelmap.h | 3 +
src/pulsecore/card.c | 8 +-
src/pulsecore/cli-command.c | 45 +
src/pulsecore/namereg.c | 2 +
src/pulsecore/source.c | 2 +-
17 files changed, 401 insertions(+), 3197 deletions(-)
copy src/modules/alsa/{module-alsa-sink.c => alsa-sink.c} (95%)
copy src/{pulse/error.h => modules/alsa/alsa-sink.h} (72%)
copy src/modules/alsa/{module-alsa-source.c => alsa-source.c} (94%)
copy src/{pulse/error.h => modules/alsa/alsa-source.h} (72%)
-----------------------------------------------------------------------
commit 04e9214065637a6ad17983d18475eb4e67c2c680
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Jan 20 21:00:35 2009 +0100
export pa_channel_map_superset()
diff --git a/src/map-file b/src/map-file
index 042e2ad..55b13e1 100644
--- a/src/map-file
+++ b/src/map-file
@@ -18,6 +18,7 @@ pa_channel_map_init_mono;
pa_channel_map_init_stereo;
pa_channel_map_parse;
pa_channel_map_snprint;
+pa_channel_map_superset;
pa_channel_map_valid;
pa_channel_position_to_pretty_string;
pa_channel_position_to_string;
diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c
index eb7042b..b7f44b8 100644
--- a/src/modules/alsa/alsa-util.c
+++ b/src/modules/alsa/alsa-util.c
@@ -574,25 +574,6 @@ static const struct pa_alsa_profile_info device_table[] = {
{{ 0, { 0 }}, NULL, NULL, NULL, 0 }
};
-static pa_bool_t channel_map_superset(const pa_channel_map *a, const pa_channel_map *b) {
- pa_bool_t in_a[PA_CHANNEL_POSITION_MAX];
- unsigned i;
-
- pa_assert(a);
- pa_assert(b);
-
- memset(in_a, 0, sizeof(in_a));
-
- for (i = 0; i < a->channels; i++)
- in_a[a->map[i]] = TRUE;
-
- for (i = 0; i < b->channels; i++)
- if (!in_a[b->map[i]])
- return FALSE;
-
- return TRUE;
-}
-
snd_pcm_t *pa_alsa_open_by_device_id(
const char *dev_id,
char **dev,
@@ -629,7 +610,7 @@ snd_pcm_t *pa_alsa_open_by_device_id(
i = 0;
for (;;) {
- if ((direction > 0) == channel_map_superset(&device_table[i].map, map)) {
+ if ((direction > 0) == pa_channel_map_superset(&device_table[i].map, map)) {
pa_sample_spec try_ss;
pa_log_debug("Checking for %s (%s)", device_table[i].name, device_table[i].alsa_name);
diff --git a/src/pulse/channelmap.c b/src/pulse/channelmap.c
index fd313bd..26eae59 100644
--- a/src/pulse/channelmap.c
+++ b/src/pulse/channelmap.c
@@ -577,3 +577,22 @@ int pa_channel_map_compatible(const pa_channel_map *map, const pa_sample_spec *s
return map->channels == ss->channels;
}
+
+int pa_channel_map_superset(const pa_channel_map *a, const pa_channel_map *b) {
+ pa_bool_t in_a[PA_CHANNEL_POSITION_MAX];
+ unsigned i;
+
+ pa_assert(a);
+ pa_assert(b);
+
+ memset(in_a, 0, sizeof(in_a));
+
+ for (i = 0; i < a->channels; i++)
+ in_a[a->map[i]] = TRUE;
+
+ for (i = 0; i < b->channels; i++)
+ if (!in_a[b->map[i]])
+ return 0;
+
+ return 1;
+}
diff --git a/src/pulse/channelmap.h b/src/pulse/channelmap.h
index d7d19d7..a6c044f 100644
--- a/src/pulse/channelmap.h
+++ b/src/pulse/channelmap.h
@@ -227,6 +227,9 @@ int pa_channel_map_valid(const pa_channel_map *map) PA_GCC_PURE;
* the specified sample spec. \since 0.9.12 */
int pa_channel_map_compatible(const pa_channel_map *map, const pa_sample_spec *ss) PA_GCC_PURE;
+/** Returns non-zero if every channel defined in b is also defined in a. \since 0.9.15 */
+int pa_channel_map_superset(const pa_channel_map *a, const pa_channel_map *b) PA_GCC_PURE;
+
PA_C_DECL_END
#endif
commit b88b89a676da1238972886f54780af62262a0043
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Jan 20 21:36:57 2009 +0100
add new call pa_alsa_open_by_device_id_profile()
diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c
index b7f44b8..e154f6e 100644
--- a/src/modules/alsa/alsa-util.c
+++ b/src/modules/alsa/alsa-util.c
@@ -574,7 +574,7 @@ static const struct pa_alsa_profile_info device_table[] = {
{{ 0, { 0 }}, NULL, NULL, NULL, 0 }
};
-snd_pcm_t *pa_alsa_open_by_device_id(
+snd_pcm_t *pa_alsa_open_by_device_id_auto(
const char *dev_id,
char **dev,
pa_sample_spec *ss,
@@ -585,8 +585,7 @@ snd_pcm_t *pa_alsa_open_by_device_id(
snd_pcm_uframes_t tsched_size,
pa_bool_t *use_mmap,
pa_bool_t *use_tsched,
- const char**config_description,
- const char **config_name) {
+ const pa_alsa_profile_info **profile) {
int i;
int direction = 1;
@@ -642,11 +641,8 @@ snd_pcm_t *pa_alsa_open_by_device_id(
*map = device_table[i].map;
pa_assert(map->channels == ss->channels);
- if (config_description)
- *config_description = device_table[i].description;
- if (config_name)
- *config_name = device_table[i].name;
-
+ if (profile)
+ *profile = &device_table[i];
return pcm_handle;
}
@@ -703,10 +699,64 @@ snd_pcm_t *pa_alsa_open_by_device_id(
pcm_handle = pa_alsa_open_by_device_string(d, dev, ss, map, mode, nfrags, period_size, tsched_size, use_mmap, use_tsched, FALSE);
pa_xfree(d);
- if (pcm_handle) {
- *config_description = NULL;
- *config_name = NULL;
- }
+ if (pcm_handle && profile)
+ *profile = NULL;
+
+ return pcm_handle;
+}
+
+snd_pcm_t *pa_alsa_open_by_device_id_profile(
+ const char *dev_id,
+ char **dev,
+ pa_sample_spec *ss,
+ pa_channel_map* map,
+ int mode,
+ uint32_t *nfrags,
+ snd_pcm_uframes_t *period_size,
+ snd_pcm_uframes_t tsched_size,
+ pa_bool_t *use_mmap,
+ pa_bool_t *use_tsched,
+ const pa_alsa_profile_info *profile) {
+
+ char *d;
+ snd_pcm_t *pcm_handle;
+ pa_sample_spec try_ss;
+
+ pa_assert(dev_id);
+ pa_assert(dev);
+ pa_assert(ss);
+ pa_assert(map);
+ pa_assert(nfrags);
+ pa_assert(period_size);
+ pa_assert(profile);
+
+ d = pa_sprintf_malloc("%s:%s", profile->alsa_name, dev_id);
+
+ try_ss.channels = profile->map.channels;
+ try_ss.rate = ss->rate;
+ try_ss.format = ss->format;
+
+ pcm_handle = pa_alsa_open_by_device_string(
+ d,
+ dev,
+ &try_ss,
+ map,
+ mode,
+ nfrags,
+ period_size,
+ tsched_size,
+ use_mmap,
+ use_tsched,
+ TRUE);
+
+ pa_xfree(d);
+
+ if (!pcm_handle)
+ return NULL;
+
+ *ss = try_ss;
+ *map = profile->map;
+ pa_assert(map->channels == ss->channels);
return pcm_handle;
}
diff --git a/src/modules/alsa/alsa-util.h b/src/modules/alsa/alsa-util.h
index 5965625..18b0402 100644
--- a/src/modules/alsa/alsa-util.h
+++ b/src/modules/alsa/alsa-util.h
@@ -54,7 +54,16 @@ int pa_alsa_set_sw_params(snd_pcm_t *pcm, snd_pcm_uframes_t avail_min);
int pa_alsa_prepare_mixer(snd_mixer_t *mixer, const char *dev);
snd_mixer_elem_t *pa_alsa_find_elem(snd_mixer_t *mixer, const char *name, const char *fallback, pa_bool_t playback);
-snd_pcm_t *pa_alsa_open_by_device_id(
+typedef struct pa_alsa_profile_info {
+ pa_channel_map map;
+ const char *alsa_name;
+ const char *description;
+ const char *name;
+ unsigned priority;
+} pa_alsa_profile_info;
+
+/* Picks a working profile based on the specified ss/map */
+snd_pcm_t *pa_alsa_open_by_device_id_auto(
const char *dev_id,
char **dev,
pa_sample_spec *ss,
@@ -65,9 +74,23 @@ snd_pcm_t *pa_alsa_open_by_device_id(
snd_pcm_uframes_t tsched_size,
pa_bool_t *use_mmap,
pa_bool_t *use_tsched,
- const char **config_name,
- const char **config_description);
+ const pa_alsa_profile_info **profile);
+/* Uses the specified profile */
+snd_pcm_t *pa_alsa_open_by_device_id_profile(
+ const char *dev_id,
+ char **dev,
+ pa_sample_spec *ss,
+ pa_channel_map* map,
+ int mode,
+ uint32_t *nfrags,
+ snd_pcm_uframes_t *period_size,
+ snd_pcm_uframes_t tsched_size,
+ pa_bool_t *use_mmap,
+ pa_bool_t *use_tsched,
+ const pa_alsa_profile_info *profile);
+
+/* Opens the explicit ALSA device */
snd_pcm_t *pa_alsa_open_by_device_string(
const char *device,
char **dev,
@@ -81,14 +104,6 @@ snd_pcm_t *pa_alsa_open_by_device_string(
pa_bool_t *use_tsched,
pa_bool_t require_exact_channel_number);
-typedef struct pa_alsa_profile_info {
- pa_channel_map map;
- const char *alsa_name;
- const char *description;
- const char *name;
- unsigned priority;
-} pa_alsa_profile_info;
-
int pa_alsa_probe_profiles(
const char *dev_id,
const pa_sample_spec *ss,
diff --git a/src/modules/alsa/module-alsa-sink.c b/src/modules/alsa/module-alsa-sink.c
index 62ce89c..12d3407 100644
--- a/src/modules/alsa/module-alsa-sink.c
+++ b/src/modules/alsa/module-alsa-sink.c
@@ -1253,7 +1253,7 @@ int pa__init(pa_module*m) {
pa_bool_t use_mmap = TRUE, b, use_tsched = TRUE, d;
pa_usec_t usec;
pa_sink_new_data data;
- const char *profile_description = NULL, *profile_name = NULL;
+ const pa_alsa_profile_info *profile = NULL;
snd_pcm_info_alloca(&pcm_info);
@@ -1332,13 +1332,13 @@ int pa__init(pa_module*m) {
if ((dev_id = pa_modargs_get_value(ma, "device_id", NULL))) {
- if (!(u->pcm_handle = pa_alsa_open_by_device_id(
+ if (!(u->pcm_handle = pa_alsa_open_by_device_id_auto(
dev_id,
&u->device_name,
&ss, &map,
SND_PCM_STREAM_PLAYBACK,
&nfrags, &period_frames, tsched_frames,
- &b, &d, &profile_description, &profile_name)))
+ &b, &d, &profile)))
goto fail;
@@ -1358,8 +1358,8 @@ int pa__init(pa_module*m) {
pa_assert(u->device_name);
pa_log_info("Successfully opened device %s.", u->device_name);
- if (profile_description)
- pa_log_info("Selected configuration '%s' (%s).", profile_description, profile_name);
+ if (profile)
+ pa_log_info("Selected configuration '%s' (%s).", profile->description, profile->name);
if (use_mmap && !b) {
pa_log_info("Device doesn't support mmap(), falling back to UNIX read/write mode.");
@@ -1444,10 +1444,10 @@ int pa__init(pa_module*m) {
pa_proplist_setf(data.proplist, PA_PROP_DEVICE_BUFFERING_FRAGMENT_SIZE, "%lu", (unsigned long) (period_frames * frame_size));
pa_proplist_sets(data.proplist, PA_PROP_DEVICE_ACCESS_MODE, u->use_tsched ? "mmap+timer" : (u->use_mmap ? "mmap" : "serial"));
- if (profile_name)
- pa_proplist_sets(data.proplist, PA_PROP_DEVICE_PROFILE_NAME, profile_name);
- if (profile_description)
- pa_proplist_sets(data.proplist, PA_PROP_DEVICE_PROFILE_DESCRIPTION, profile_description);
+ if (profile) {
+ pa_proplist_sets(data.proplist, PA_PROP_DEVICE_PROFILE_NAME, profile->name);
+ pa_proplist_sets(data.proplist, PA_PROP_DEVICE_PROFILE_DESCRIPTION, profile->description);
+ }
u->sink = pa_sink_new(m->core, &data, PA_SINK_HARDWARE|PA_SINK_LATENCY);
pa_sink_new_data_done(&data);
diff --git a/src/modules/alsa/module-alsa-source.c b/src/modules/alsa/module-alsa-source.c
index 7ca305f..08ef12f 100644
--- a/src/modules/alsa/module-alsa-source.c
+++ b/src/modules/alsa/module-alsa-source.c
@@ -1087,7 +1087,7 @@ int pa__init(pa_module*m) {
pa_bool_t namereg_fail;
pa_bool_t use_mmap = TRUE, b, use_tsched = TRUE, d;
pa_source_new_data data;
- const char *profile_description = NULL, *profile_name = NULL;
+ const pa_alsa_profile_info *profile = NULL;
snd_pcm_info_alloca(&pcm_info);
@@ -1161,13 +1161,13 @@ int pa__init(pa_module*m) {
if ((dev_id = pa_modargs_get_value(ma, "device_id", NULL))) {
- if (!(u->pcm_handle = pa_alsa_open_by_device_id(
+ if (!(u->pcm_handle = pa_alsa_open_by_device_id_auto(
dev_id,
&u->device_name,
&ss, &map,
SND_PCM_STREAM_CAPTURE,
&nfrags, &period_frames, tsched_frames,
- &b, &d, &profile_description, &profile_name)))
+ &b, &d, &profile)))
goto fail;
} else {
@@ -1185,8 +1185,8 @@ int pa__init(pa_module*m) {
pa_assert(u->device_name);
pa_log_info("Successfully opened device %s.", u->device_name);
- if (profile_description)
- pa_log_info("Selected configuration '%s' (%s).", profile_description, profile_name);
+ if (profile)
+ pa_log_info("Selected configuration '%s' (%s).", profile->description, profile->name);
if (use_mmap && !b) {
pa_log_info("Device doesn't support mmap(), falling back to UNIX read/write mode.");
@@ -1271,10 +1271,10 @@ int pa__init(pa_module*m) {
pa_proplist_setf(data.proplist, PA_PROP_DEVICE_BUFFERING_FRAGMENT_SIZE, "%lu", (unsigned long) (period_frames * frame_size));
pa_proplist_sets(data.proplist, PA_PROP_DEVICE_ACCESS_MODE, u->use_tsched ? "mmap+timer" : (u->use_mmap ? "mmap" : "serial"));
- if (profile_name)
- pa_proplist_sets(data.proplist, PA_PROP_DEVICE_PROFILE_NAME, profile_name);
- if (profile_description)
- pa_proplist_sets(data.proplist, PA_PROP_DEVICE_PROFILE_DESCRIPTION, profile_description);
+ if (profile) {
+ pa_proplist_sets(data.proplist, PA_PROP_DEVICE_PROFILE_NAME, profile->name);
+ pa_proplist_sets(data.proplist, PA_PROP_DEVICE_PROFILE_DESCRIPTION, profile->description);
+ }
u->source = pa_source_new(m->core, &data, PA_SOURCE_HARDWARE|PA_SOURCE_LATENCY);
pa_source_new_data_done(&data);
commit 16d200e3694658267ff4e04a296ffdb5668e8af6
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Jan 21 00:23:18 2009 +0100
add an API to create arbitrary alsa sinks/sources dynamically without having to load/unload modules
diff --git a/src/Makefile.am b/src/Makefile.am
index 17e14be..3151b49 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1254,7 +1254,7 @@ module_oss_la_LIBADD = $(AM_LIBADD) liboss-util.la libpulsecore- at PA_MAJORMINORMI
# ALSA
-libalsa_util_la_SOURCES = modules/alsa/alsa-util.c modules/alsa/alsa-util.h
+libalsa_util_la_SOURCES = modules/alsa/alsa-util.c modules/alsa/alsa-util.h modules/alsa/alsa-sink.c modules/alsa/alsa-sink.h modules/alsa/alsa-source.c modules/alsa/alsa-source.h
libalsa_util_la_LDFLAGS = -avoid-version
libalsa_util_la_LIBADD = $(AM_LIBADD) $(ASOUNDLIB_LIBS) libpulsecore- at PA_MAJORMINORMICRO@.la libpulsecommon- at PA_MAJORMINORMICRO@.la libpulse.la
libalsa_util_la_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS)
diff --git a/src/modules/alsa/module-alsa-sink.c b/src/modules/alsa/alsa-sink.c
similarity index 96%
copy from src/modules/alsa/module-alsa-sink.c
copy to src/modules/alsa/alsa-sink.c
index 12d3407..9556915 100644
--- a/src/modules/alsa/module-alsa-sink.c
+++ b/src/modules/alsa/alsa-sink.c
@@ -53,43 +53,7 @@
#include <pulsecore/time-smoother.h>
#include "alsa-util.h"
-#include "module-alsa-sink-symdef.h"
-
-PA_MODULE_AUTHOR("Lennart Poettering");
-PA_MODULE_DESCRIPTION("ALSA Sink");
-PA_MODULE_VERSION(PACKAGE_VERSION);
-PA_MODULE_LOAD_ONCE(FALSE);
-PA_MODULE_USAGE(
- "sink_name=<name for the sink> "
- "device=<ALSA device> "
- "device_id=<ALSA card index> "
- "format=<sample format> "
- "rate=<sample rate> "
- "channels=<number of channels> "
- "channel_map=<channel map> "
- "fragments=<number of fragments> "
- "fragment_size=<fragment size> "
- "mmap=<enable memory mapping?> "
- "tsched=<enable system timer based scheduling mode?> "
- "tsched_buffer_size=<buffer size when using timer based scheduling> "
- "tsched_buffer_watermark=<lower fill watermark>");
-
-static const char* const valid_modargs[] = {
- "sink_name",
- "device",
- "device_id",
- "format",
- "rate",
- "channels",
- "channel_map",
- "fragments",
- "fragment_size",
- "mmap",
- "tsched",
- "tsched_buffer_size",
- "tsched_buffer_watermark",
- NULL
-};
+#include "alsa-sink.h"
#define DEFAULT_DEVICE "default"
#define DEFAULT_TSCHED_BUFFER_USEC (2*PA_USEC_PER_SEC) /* 2s */
@@ -138,6 +102,8 @@ struct userdata {
snd_pcm_sframes_t hwbuf_unused_frames;
};
+static void userdata_free(struct userdata *u);
+
static void fix_tsched_watermark(struct userdata *u) {
size_t max_use;
size_t min_sleep, min_wakeup;
@@ -1235,9 +1201,8 @@ finish:
pa_log_debug("Thread shutting down");
}
-int pa__init(pa_module*m) {
+pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const pa_alsa_profile_info *profile) {
- pa_modargs *ma = NULL;
struct userdata *u = NULL;
const char *dev_id;
pa_sample_spec ss;
@@ -1253,19 +1218,11 @@ int pa__init(pa_module*m) {
pa_bool_t use_mmap = TRUE, b, use_tsched = TRUE, d;
pa_usec_t usec;
pa_sink_new_data data;
- const pa_alsa_profile_info *profile = NULL;
snd_pcm_info_alloca(&pcm_info);
pa_assert(m);
- pa_alsa_redirect_errors_inc();
-
- if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
- pa_log("Failed to parse module arguments");
- goto fail;
- }
-
ss = m->core->default_sample_spec;
if (pa_modargs_get_sample_spec_and_channel_map(ma, &ss, &map, PA_CHANNEL_MAP_ALSA) < 0) {
pa_log("Failed to parse sample specification and channel map");
@@ -1308,7 +1265,7 @@ int pa__init(pa_module*m) {
use_tsched = FALSE;
}
- m->userdata = u = pa_xnew0(struct userdata, 1);
+ u = pa_xnew0(struct userdata, 1);
u->core = m->core;
u->module = m;
u->use_mmap = use_mmap;
@@ -1325,12 +1282,22 @@ int pa__init(pa_module*m) {
pa_smoother_set_time_offset(u->smoother, usec);
pa_smoother_pause(u->smoother, usec);
- snd_config_update_free_global();
-
b = use_mmap;
d = use_tsched;
- if ((dev_id = pa_modargs_get_value(ma, "device_id", NULL))) {
+ if (profile) {
+
+ if (!(u->pcm_handle = pa_alsa_open_by_device_id_profile(
+ dev_id,
+ &u->device_name,
+ &ss, &map,
+ SND_PCM_STREAM_PLAYBACK,
+ &nfrags, &period_frames, tsched_frames,
+ &b, &d, profile)))
+
+ goto fail;
+
+ } else if ((dev_id = pa_modargs_get_value(ma, "device_id", NULL))) {
if (!(u->pcm_handle = pa_alsa_open_by_device_id_auto(
dev_id,
@@ -1425,7 +1392,10 @@ int pa__init(pa_module*m) {
if ((name = pa_modargs_get_value(ma, "sink_name", NULL)))
namereg_fail = TRUE;
- else {
+ else if ((name = pa_modargs_get_value(ma, "name", NULL))) {
+ name = name_buf = pa_sprintf_malloc("alsa_output.%s", name);
+ namereg_fail = TRUE;
+ } else {
name = name_buf = pa_sprintf_malloc("alsa_output.%s", u->device_name);
namereg_fail = FALSE;
}
@@ -1604,36 +1574,17 @@ int pa__init(pa_module*m) {
pa_sink_put(u->sink);
- pa_modargs_free(ma);
-
- return 0;
+ return u->sink;
fail:
- if (ma)
- pa_modargs_free(ma);
-
- pa__done(m);
+ userdata_free(u);
- return -1;
+ return NULL;
}
-int pa__get_n_used(pa_module *m) {
- struct userdata *u;
-
- pa_assert(m);
- pa_assert_se(u = m->userdata);
-
- return pa_sink_linked_by(u->sink);
-}
-
-void pa__done(pa_module*m) {
- struct userdata *u;
-
- pa_assert(m);
-
- if (!(u = m->userdata))
- goto finish;
+static void userdata_free(struct userdata *u) {
+ pa_assert(u);
if (u->sink)
pa_sink_unlink(u->sink);
@@ -1673,9 +1624,13 @@ void pa__done(pa_module*m) {
pa_xfree(u->device_name);
pa_xfree(u);
+}
-finish:
+void pa_alsa_sink_free(pa_sink *s) {
+ struct userdata *u;
- snd_config_update_free_global();
- pa_alsa_redirect_errors_dec();
+ pa_sink_assert_ref(s);
+ pa_assert_se(u = s->userdata);
+
+ userdata_free(u);
}
diff --git a/src/modules/alsa/alsa-sink.h b/src/modules/alsa/alsa-sink.h
new file mode 100644
index 0000000..e503201
--- /dev/null
+++ b/src/modules/alsa/alsa-sink.h
@@ -0,0 +1,36 @@
+#ifndef fooalsasinkhfoo
+#define fooalsasinkhfoo
+
+/***
+ This file is part of PulseAudio.
+
+ Copyright 2004-2006 Lennart Poettering
+ Copyright 2006 Pierre Ossman <ossman at cendio.se> for Cendio AB
+
+ PulseAudio is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2 of the License,
+ or (at your option) any later version.
+
+ PulseAudio is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with PulseAudio; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ USA.
+***/
+
+#include <pulsecore/module.h>
+#include <pulsecore/modargs.h>
+#include <pulsecore/sink.h>
+
+#include "alsa-util.h"
+
+pa_sink* pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const pa_alsa_profile_info *profile);
+
+void pa_alsa_sink_free(pa_sink *s);
+
+#endif
diff --git a/src/modules/alsa/module-alsa-source.c b/src/modules/alsa/alsa-source.c
similarity index 95%
copy from src/modules/alsa/module-alsa-source.c
copy to src/modules/alsa/alsa-source.c
index 08ef12f..c0bf20d 100644
--- a/src/modules/alsa/module-alsa-source.c
+++ b/src/modules/alsa/alsa-source.c
@@ -54,43 +54,7 @@
#include <pulsecore/rtclock.h>
#include "alsa-util.h"
-#include "module-alsa-source-symdef.h"
-
-PA_MODULE_AUTHOR("Lennart Poettering");
-PA_MODULE_DESCRIPTION("ALSA Source");
-PA_MODULE_VERSION(PACKAGE_VERSION);
-PA_MODULE_LOAD_ONCE(FALSE);
-PA_MODULE_USAGE(
- "source_name=<name for the source> "
- "device=<ALSA device> "
- "device_id=<ALSA card index> "
- "format=<sample format> "
- "rate=<sample rate> "
- "channels=<number of channels> "
- "channel_map=<channel map> "
- "fragments=<number of fragments> "
- "fragment_size=<fragment size> "
- "mmap=<enable memory mapping?> "
- "tsched=<enable system timer based scheduling mode?> "
- "tsched_buffer_size=<buffer size when using timer based scheduling> "
- "tsched_buffer_watermark=<upper fill watermark>");
-
-static const char* const valid_modargs[] = {
- "source_name",
- "device",
- "device_id",
- "format",
- "rate",
- "channels",
- "channel_map",
- "fragments",
- "fragment_size",
- "mmap",
- "tsched",
- "tsched_buffer_size",
- "tsched_buffer_watermark",
- NULL
-};
+#include "alsa-source.h"
#define DEFAULT_DEVICE "default"
#define DEFAULT_TSCHED_BUFFER_USEC (2*PA_USEC_PER_SEC) /* 2s */
@@ -136,6 +100,8 @@ struct userdata {
snd_pcm_sframes_t hwbuf_unused_frames;
};
+static void userdata_free(struct userdata *u);
+
static void fix_tsched_watermark(struct userdata *u) {
size_t max_use;
size_t min_sleep, min_wakeup;
@@ -1070,9 +1036,8 @@ finish:
pa_log_debug("Thread shutting down");
}
-int pa__init(pa_module*m) {
+pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const pa_alsa_profile_info *profile) {
- pa_modargs *ma = NULL;
struct userdata *u = NULL;
const char *dev_id;
pa_sample_spec ss;
@@ -1087,19 +1052,11 @@ int pa__init(pa_module*m) {
pa_bool_t namereg_fail;
pa_bool_t use_mmap = TRUE, b, use_tsched = TRUE, d;
pa_source_new_data data;
- const pa_alsa_profile_info *profile = NULL;
snd_pcm_info_alloca(&pcm_info);
pa_assert(m);
- pa_alsa_redirect_errors_inc();
-
- if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
- pa_log("Failed to parse module arguments");
- goto fail;
- }
-
ss = m->core->default_sample_spec;
if (pa_modargs_get_sample_spec_and_channel_map(ma, &ss, &map, PA_CHANNEL_MAP_ALSA) < 0) {
pa_log("Failed to parse sample specification");
@@ -1142,7 +1099,7 @@ int pa__init(pa_module*m) {
use_tsched = FALSE;
}
- m->userdata = u = pa_xnew0(struct userdata, 1);
+ u = pa_xnew0(struct userdata, 1);
u->core = m->core;
u->module = m;
u->use_mmap = use_mmap;
@@ -1154,12 +1111,21 @@ int pa__init(pa_module*m) {
u->smoother = pa_smoother_new(DEFAULT_TSCHED_WATERMARK_USEC, DEFAULT_TSCHED_WATERMARK_USEC, TRUE, 5);
pa_smoother_set_time_offset(u->smoother, pa_rtclock_usec());
- snd_config_update_free_global();
-
b = use_mmap;
d = use_tsched;
- if ((dev_id = pa_modargs_get_value(ma, "device_id", NULL))) {
+ if (profile) {
+
+ if (!(u->pcm_handle = pa_alsa_open_by_device_id_profile(
+ dev_id,
+ &u->device_name,
+ &ss, &map,
+ SND_PCM_STREAM_CAPTURE,
+ &nfrags, &period_frames, tsched_frames,
+ &b, &d, profile)))
+ goto fail;
+
+ } else if ((dev_id = pa_modargs_get_value(ma, "device_id", NULL))) {
if (!(u->pcm_handle = pa_alsa_open_by_device_id_auto(
dev_id,
@@ -1425,36 +1391,17 @@ int pa__init(pa_module*m) {
pa_source_put(u->source);
- pa_modargs_free(ma);
-
- return 0;
+ return u->source;
fail:
- if (ma)
- pa_modargs_free(ma);
+ userdata_free(u);
- pa__done(m);
-
- return -1;
-}
-
-int pa__get_n_used(pa_module *m) {
- struct userdata *u;
-
- pa_assert(m);
- pa_assert_se(u = m->userdata);
-
- return pa_source_linked_by(u->source);
+ return NULL;
}
-void pa__done(pa_module*m) {
- struct userdata *u;
-
- pa_assert(m);
-
- if (!(u = m->userdata))
- goto finish;
+static void userdata_free(struct userdata *u) {
+ pa_assert(u);
if (u->source)
pa_source_unlink(u->source);
@@ -1491,8 +1438,13 @@ void pa__done(pa_module*m) {
pa_xfree(u->device_name);
pa_xfree(u);
+}
-finish:
- snd_config_update_free_global();
- pa_alsa_redirect_errors_dec();
+void pa_alsa_source_free(pa_source *s) {
+ struct userdata *u;
+
+ pa_source_assert_ref(s);
+ pa_assert_se(u = s->userdata);
+
+ userdata_free(u);
}
diff --git a/src/modules/alsa/alsa-source.h b/src/modules/alsa/alsa-source.h
new file mode 100644
index 0000000..bdb24d1
--- /dev/null
+++ b/src/modules/alsa/alsa-source.h
@@ -0,0 +1,36 @@
+#ifndef fooalsasourcehfoo
+#define fooalsasourcehfoo
+
+/***
+ This file is part of PulseAudio.
+
+ Copyright 2004-2006 Lennart Poettering
+ Copyright 2006 Pierre Ossman <ossman at cendio.se> for Cendio AB
+
+ PulseAudio is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2 of the License,
+ or (at your option) any later version.
+
+ PulseAudio is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with PulseAudio; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ USA.
+***/
+
+#include <pulsecore/module.h>
+#include <pulsecore/modargs.h>
+#include <pulsecore/source.h>
+
+#include "alsa-util.h"
+
+pa_source* pa_alsa_source_new(pa_module *m, pa_modargs *ma, const pa_alsa_profile_info *profile);
+
+void pa_alsa_source_free(pa_source *s);
+
+#endif
diff --git a/src/modules/alsa/module-alsa-sink.c b/src/modules/alsa/module-alsa-sink.c
index 12d3407..f8303a5 100644
--- a/src/modules/alsa/module-alsa-sink.c
+++ b/src/modules/alsa/module-alsa-sink.c
@@ -24,35 +24,13 @@
#include <config.h>
#endif
-#include <stdio.h>
-
-#include <asoundlib.h>
-
-#ifdef HAVE_VALGRIND_MEMCHECK_H
-#include <valgrind/memcheck.h>
-#endif
-
-#include <pulse/xmalloc.h>
-#include <pulse/util.h>
-#include <pulse/timeval.h>
-
#include <pulsecore/core.h>
#include <pulsecore/module.h>
-#include <pulsecore/memchunk.h>
#include <pulsecore/sink.h>
#include <pulsecore/modargs.h>
-#include <pulsecore/core-util.h>
-#include <pulsecore/sample-util.h>
-#include <pulsecore/log.h>
-#include <pulsecore/macro.h>
-#include <pulsecore/thread.h>
-#include <pulsecore/core-error.h>
-#include <pulsecore/thread-mq.h>
-#include <pulsecore/rtpoll.h>
-#include <pulsecore/rtclock.h>
-#include <pulsecore/time-smoother.h>
#include "alsa-util.h"
+#include "alsa-sink.h"
#include "module-alsa-sink-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering");
@@ -91,1518 +69,21 @@ static const char* const valid_modargs[] = {
NULL
};
-#define DEFAULT_DEVICE "default"
-#define DEFAULT_TSCHED_BUFFER_USEC (2*PA_USEC_PER_SEC) /* 2s */
-#define DEFAULT_TSCHED_WATERMARK_USEC (20*PA_USEC_PER_MSEC) /* 20ms */
-#define TSCHED_MIN_SLEEP_USEC (3*PA_USEC_PER_MSEC) /* 3ms */
-#define TSCHED_MIN_WAKEUP_USEC (3*PA_USEC_PER_MSEC) /* 3ms */
-
-struct userdata {
- pa_core *core;
- pa_module *module;
- pa_sink *sink;
-
- pa_thread *thread;
- pa_thread_mq thread_mq;
- pa_rtpoll *rtpoll;
-
- snd_pcm_t *pcm_handle;
-
- pa_alsa_fdlist *mixer_fdl;
- snd_mixer_t *mixer_handle;
- snd_mixer_elem_t *mixer_elem;
- long hw_volume_max, hw_volume_min;
- long hw_dB_max, hw_dB_min;
- pa_bool_t hw_dB_supported;
- pa_bool_t mixer_seperate_channels;
- pa_cvolume hardware_volume;
-
- size_t frame_size, fragment_size, hwbuf_size, tsched_watermark;
- unsigned nfragments;
- pa_memchunk memchunk;
-
- char *device_name;
-
- pa_bool_t use_mmap, use_tsched;
-
- pa_bool_t first, after_rewind;
-
- pa_rtpoll_item *alsa_rtpoll_item;
-
- snd_mixer_selem_channel_id_t mixer_map[SND_MIXER_SCHN_LAST];
-
- pa_smoother *smoother;
- int64_t frame_index;
- uint64_t since_start;
-
- snd_pcm_sframes_t hwbuf_unused_frames;
-};
-
-static void fix_tsched_watermark(struct userdata *u) {
- size_t max_use;
- size_t min_sleep, min_wakeup;
- pa_assert(u);
-
- max_use = u->hwbuf_size - (size_t) u->hwbuf_unused_frames * u->frame_size;
-
- min_sleep = pa_usec_to_bytes(TSCHED_MIN_SLEEP_USEC, &u->sink->sample_spec);
- min_wakeup = pa_usec_to_bytes(TSCHED_MIN_WAKEUP_USEC, &u->sink->sample_spec);
-
- if (min_sleep > max_use/2)
- min_sleep = pa_frame_align(max_use/2, &u->sink->sample_spec);
- if (min_sleep < u->frame_size)
- min_sleep = u->frame_size;
-
- if (min_wakeup > max_use/2)
- min_wakeup = pa_frame_align(max_use/2, &u->sink->sample_spec);
- if (min_wakeup < u->frame_size)
- min_wakeup = u->frame_size;
-
- if (u->tsched_watermark > max_use-min_sleep)
- u->tsched_watermark = max_use-min_sleep;
-
- if (u->tsched_watermark < min_wakeup)
- u->tsched_watermark = min_wakeup;
-}
-
-static void hw_sleep_time(struct userdata *u, pa_usec_t *sleep_usec, pa_usec_t*process_usec) {
- pa_usec_t usec, wm;
-
- pa_assert(sleep_usec);
- pa_assert(process_usec);
-
- pa_assert(u);
-
- usec = pa_sink_get_requested_latency_within_thread(u->sink);
-
- if (usec == (pa_usec_t) -1)
- usec = pa_bytes_to_usec(u->hwbuf_size, &u->sink->sample_spec);
-
-/* pa_log_debug("hw buffer time: %u ms", (unsigned) (usec / PA_USEC_PER_MSEC)); */
-
- wm = pa_bytes_to_usec(u->tsched_watermark, &u->sink->sample_spec);
-
- if (usec >= wm) {
- *sleep_usec = usec - wm;
- *process_usec = wm;
- } else
- *process_usec = *sleep_usec = usec / 2;
-
-/* pa_log_debug("after watermark: %u ms", (unsigned) (*sleep_usec / PA_USEC_PER_MSEC)); */
-}
-
-static int try_recover(struct userdata *u, const char *call, int err) {
- pa_assert(u);
- pa_assert(call);
- pa_assert(err < 0);
-
- pa_log_debug("%s: %s", call, snd_strerror(err));
-
- pa_assert(err != -EAGAIN);
-
- if (err == -EPIPE)
- pa_log_debug("%s: Buffer underrun!", call);
-
- if ((err = snd_pcm_recover(u->pcm_handle, err, 1)) == 0) {
- u->first = TRUE;
- u->since_start = 0;
- return 0;
- }
-
- pa_log("%s: %s", call, snd_strerror(err));
- return -1;
-}
-
-static size_t check_left_to_play(struct userdata *u, snd_pcm_sframes_t n) {
- size_t left_to_play;
-
- if ((size_t) n*u->frame_size < u->hwbuf_size)
- left_to_play = u->hwbuf_size - ((size_t) n*u->frame_size);
- else
- left_to_play = 0;
-
- if (left_to_play > 0) {
-/* pa_log_debug("%0.2f ms left to play", (double) pa_bytes_to_usec(left_to_play, &u->sink->sample_spec) / PA_USEC_PER_MSEC); */
- } else if (!u->first && !u->after_rewind) {
- pa_log_info("Underrun!");
-
- if (u->use_tsched) {
- size_t old_watermark = u->tsched_watermark;
-
- u->tsched_watermark *= 2;
- fix_tsched_watermark(u);
-
- if (old_watermark != u->tsched_watermark)
- pa_log_notice("Increasing wakeup watermark to %0.2f ms",
- (double) pa_bytes_to_usec(u->tsched_watermark, &u->sink->sample_spec) / PA_USEC_PER_MSEC);
- }
- }
-
- return left_to_play;
-}
-
-static int mmap_write(struct userdata *u, pa_usec_t *sleep_usec, pa_bool_t polled) {
- int work_done = 0;
- pa_usec_t max_sleep_usec = 0, process_usec = 0;
- size_t left_to_play;
-
- pa_assert(u);
- pa_sink_assert_ref(u->sink);
-
- if (u->use_tsched)
- hw_sleep_time(u, &max_sleep_usec, &process_usec);
-
- for (;;) {
- snd_pcm_sframes_t n;
- int r;
-
- snd_pcm_hwsync(u->pcm_handle);
-
- /* First we determine how many samples are missing to fill the
- * buffer up to 100% */
-
- if (PA_UNLIKELY((n = pa_alsa_safe_avail_update(u->pcm_handle, u->hwbuf_size, &u->sink->sample_spec)) < 0)) {
-
- if ((r = try_recover(u, "snd_pcm_avail_update", (int) n)) == 0)
- continue;
-
- return r;
- }
-
- left_to_play = check_left_to_play(u, n);
-
- if (u->use_tsched)
-
- /* We won't fill up the playback buffer before at least
- * half the sleep time is over because otherwise we might
- * ask for more data from the clients then they expect. We
- * need to guarantee that clients only have to keep around
- * a single hw buffer length. */
-
- if (!polled &&
- pa_bytes_to_usec(left_to_play, &u->sink->sample_spec) > process_usec+max_sleep_usec/2)
- break;
-
- if (PA_UNLIKELY(n <= u->hwbuf_unused_frames)) {
-
- if (polled)
- pa_log("ALSA woke us up to write new data to the device, but there was actually nothing to write! "
- "Most likely this is an ALSA driver bug. Please report this issue to the ALSA developers. "
- "We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail_update() returned 0.");
-
- break;
- }
-
- n -= u->hwbuf_unused_frames;
-
- polled = FALSE;
-
-/* pa_log_debug("Filling up"); */
-
- for (;;) {
- pa_memchunk chunk;
- void *p;
- int err;
- const snd_pcm_channel_area_t *areas;
- snd_pcm_uframes_t offset, frames = (snd_pcm_uframes_t) n;
- snd_pcm_sframes_t sframes;
-
-/* pa_log_debug("%lu frames to write", (unsigned long) frames); */
-
- if (PA_UNLIKELY((err = pa_alsa_safe_mmap_begin(u->pcm_handle, &areas, &offset, &frames, u->hwbuf_size, &u->sink->sample_spec)) < 0)) {
-
- if ((r = try_recover(u, "snd_pcm_mmap_begin", err)) == 0)
- continue;
-
- return r;
- }
-
- /* Make sure that if these memblocks need to be copied they will fit into one slot */
- if (frames > pa_mempool_block_size_max(u->sink->core->mempool)/u->frame_size)
- frames = pa_mempool_block_size_max(u->sink->core->mempool)/u->frame_size;
-
- /* Check these are multiples of 8 bit */
- pa_assert((areas[0].first & 7) == 0);
- pa_assert((areas[0].step & 7)== 0);
-
- /* We assume a single interleaved memory buffer */
- pa_assert((areas[0].first >> 3) == 0);
- pa_assert((areas[0].step >> 3) == u->frame_size);
-
- p = (uint8_t*) areas[0].addr + (offset * u->frame_size);
-
- chunk.memblock = pa_memblock_new_fixed(u->core->mempool, p, frames * u->frame_size, TRUE);
- chunk.length = pa_memblock_get_length(chunk.memblock);
- chunk.index = 0;
-
- pa_sink_render_into_full(u->sink, &chunk);
-
- /* FIXME: Maybe we can do something to keep this memory block
- * a little bit longer around? */
- pa_memblock_unref_fixed(chunk.memblock);
-
- if (PA_UNLIKELY((sframes = snd_pcm_mmap_commit(u->pcm_handle, offset, frames)) < 0)) {
-
- if ((r = try_recover(u, "snd_pcm_mmap_commit", (int) sframes)) == 0)
- continue;
-
- return r;
- }
-
- work_done = 1;
-
- u->frame_index += (int64_t) frames;
- u->since_start += frames * u->frame_size;
-
-/* pa_log_debug("wrote %lu frames", (unsigned long) frames); */
-
- if (frames >= (snd_pcm_uframes_t) n)
- break;
-
- n -= (snd_pcm_sframes_t) frames;
- }
- }
-
- *sleep_usec = pa_bytes_to_usec(left_to_play, &u->sink->sample_spec) - process_usec;
- return work_done;
-}
-
-static int unix_write(struct userdata *u, pa_usec_t *sleep_usec, pa_bool_t polled) {
- int work_done = 0;
- pa_usec_t max_sleep_usec = 0, process_usec = 0;
- size_t left_to_play;
-
- pa_assert(u);
- pa_sink_assert_ref(u->sink);
-
- if (u->use_tsched)
- hw_sleep_time(u, &max_sleep_usec, &process_usec);
-
- for (;;) {
- snd_pcm_sframes_t n;
- int r;
-
- snd_pcm_hwsync(u->pcm_handle);
-
- if (PA_UNLIKELY((n = pa_alsa_safe_avail_update(u->pcm_handle, u->hwbuf_size, &u->sink->sample_spec)) < 0)) {
-
- if ((r = try_recover(u, "snd_pcm_avail_update", (int) n)) == 0)
- continue;
-
- return r;
- }
-
- left_to_play = check_left_to_play(u, n);
-
- if (u->use_tsched)
-
- /* We won't fill up the playback buffer before at least
- * half the sleep time is over because otherwise we might
- * ask for more data from the clients then they expect. We
- * need to guarantee that clients only have to keep around
- * a single hw buffer length. */
-
- if (!polled &&
- pa_bytes_to_usec(left_to_play, &u->sink->sample_spec) > process_usec+max_sleep_usec/2)
- break;
-
- if (PA_UNLIKELY(n <= u->hwbuf_unused_frames)) {
-
- if (polled)
- pa_log("ALSA woke us up to write new data to the device, but there was actually nothing to write! "
- "Most likely this is an ALSA driver bug. Please report this issue to the ALSA developers. "
- "We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail_update() returned 0.");
-
- break;
- }
-
- n -= u->hwbuf_unused_frames;
-
- polled = FALSE;
-
- for (;;) {
- snd_pcm_sframes_t frames;
- void *p;
-
-/* pa_log_debug("%lu frames to write", (unsigned long) frames); */
-
- if (u->memchunk.length <= 0)
- pa_sink_render(u->sink, (size_t) n * u->frame_size, &u->memchunk);
-
- pa_assert(u->memchunk.length > 0);
-
- frames = (snd_pcm_sframes_t) (u->memchunk.length / u->frame_size);
-
- if (frames > n)
- frames = n;
-
- p = pa_memblock_acquire(u->memchunk.memblock);
- frames = snd_pcm_writei(u->pcm_handle, (const uint8_t*) p + u->memchunk.index, (snd_pcm_uframes_t) frames);
- pa_memblock_release(u->memchunk.memblock);
-
- pa_assert(frames != 0);
-
- if (PA_UNLIKELY(frames < 0)) {
-
- if ((r = try_recover(u, "snd_pcm_writei", (int) frames)) == 0)
- continue;
-
- return r;
- }
-
- u->memchunk.index += (size_t) frames * u->frame_size;
- u->memchunk.length -= (size_t) frames * u->frame_size;
-
- if (u->memchunk.length <= 0) {
- pa_memblock_unref(u->memchunk.memblock);
- pa_memchunk_reset(&u->memchunk);
- }
-
- work_done = 1;
-
- u->frame_index += frames;
- u->since_start += (size_t) frames * u->frame_size;
-
-/* pa_log_debug("wrote %lu frames", (unsigned long) frames); */
-
- if (frames >= n)
- break;
-
- n -= frames;
- }
- }
-
- *sleep_usec = pa_bytes_to_usec(left_to_play, &u->sink->sample_spec) - process_usec;
- return work_done;
-}
-
-static void update_smoother(struct userdata *u) {
- snd_pcm_sframes_t delay = 0;
- int64_t frames;
- int err;
- pa_usec_t now1, now2;
-/* struct timeval timestamp; */
- snd_pcm_status_t *status;
-
- snd_pcm_status_alloca(&status);
-
- pa_assert(u);
- pa_assert(u->pcm_handle);
-
- /* Let's update the time smoother */
-
- snd_pcm_hwsync(u->pcm_handle);
- snd_pcm_avail_update(u->pcm_handle);
-
-/* if (PA_UNLIKELY((err = snd_pcm_status(u->pcm_handle, status)) < 0)) { */
-/* pa_log("Failed to query DSP status data: %s", snd_strerror(err)); */
-/* return; */
-/* } */
-
-/* delay = snd_pcm_status_get_delay(status); */
-
- if (PA_UNLIKELY((err = snd_pcm_delay(u->pcm_handle, &delay)) < 0)) {
- pa_log("Failed to query DSP status data: %s", snd_strerror(err));
- return;
- }
-
- frames = u->frame_index - delay;
-
-/* pa_log_debug("frame_index = %llu, delay = %llu, p = %llu", (unsigned long long) u->frame_index, (unsigned long long) delay, (unsigned long long) frames); */
-
-/* snd_pcm_status_get_tstamp(status, ×tamp); */
-/* pa_rtclock_from_wallclock(×tamp); */
-/* now1 = pa_timeval_load(×tamp); */
-
- now1 = pa_rtclock_usec();
- now2 = pa_bytes_to_usec((uint64_t) frames * u->frame_size, &u->sink->sample_spec);
- pa_smoother_put(u->smoother, now1, now2);
-}
-
-static pa_usec_t sink_get_latency(struct userdata *u) {
- pa_usec_t r = 0;
- int64_t delay;
- pa_usec_t now1, now2;
-
- pa_assert(u);
-
- now1 = pa_rtclock_usec();
- now2 = pa_smoother_get(u->smoother, now1);
-
- delay = (int64_t) pa_bytes_to_usec((uint64_t) u->frame_index * u->frame_size, &u->sink->sample_spec) - (int64_t) now2;
-
- if (delay > 0)
- r = (pa_usec_t) delay;
-
- if (u->memchunk.memblock)
- r += pa_bytes_to_usec(u->memchunk.length, &u->sink->sample_spec);
-
- return r;
-}
-
-static int build_pollfd(struct userdata *u) {
- pa_assert(u);
- pa_assert(u->pcm_handle);
-
- if (u->alsa_rtpoll_item)
- pa_rtpoll_item_free(u->alsa_rtpoll_item);
-
- if (!(u->alsa_rtpoll_item = pa_alsa_build_pollfd(u->pcm_handle, u->rtpoll)))
- return -1;
-
- return 0;
-}
-
-static int suspend(struct userdata *u) {
- pa_assert(u);
- pa_assert(u->pcm_handle);
-
- pa_smoother_pause(u->smoother, pa_rtclock_usec());
-
- /* Let's suspend -- we don't call snd_pcm_drain() here since that might
- * take awfully long with our long buffer sizes today. */
- snd_pcm_close(u->pcm_handle);
- u->pcm_handle = NULL;
-
- if (u->alsa_rtpoll_item) {
- pa_rtpoll_item_free(u->alsa_rtpoll_item);
- u->alsa_rtpoll_item = NULL;
- }
-
- pa_log_info("Device suspended...");
-
- return 0;
-}
-
-static int update_sw_params(struct userdata *u) {
- snd_pcm_uframes_t avail_min;
- int err;
-
- pa_assert(u);
-
- /* Use the full buffer if noone asked us for anything specific */
- u->hwbuf_unused_frames = 0;
-
- if (u->use_tsched) {
- pa_usec_t latency;
-
- if ((latency = pa_sink_get_requested_latency_within_thread(u->sink)) != (pa_usec_t) -1) {
- size_t b;
-
- pa_log_debug("latency set to %0.2fms", (double) latency / PA_USEC_PER_MSEC);
-
- b = pa_usec_to_bytes(latency, &u->sink->sample_spec);
-
- /* We need at least one sample in our buffer */
-
- if (PA_UNLIKELY(b < u->frame_size))
- b = u->frame_size;
-
- u->hwbuf_unused_frames = (snd_pcm_sframes_t)
- (PA_LIKELY(b < u->hwbuf_size) ?
- ((u->hwbuf_size - b) / u->frame_size) : 0);
- }
-
- fix_tsched_watermark(u);
- }
-
- pa_log_debug("hwbuf_unused_frames=%lu", (unsigned long) u->hwbuf_unused_frames);
-
- /* We need at last one frame in the used part of the buffer */
- avail_min = (snd_pcm_uframes_t) u->hwbuf_unused_frames + 1;
-
- if (u->use_tsched) {
- pa_usec_t sleep_usec, process_usec;
-
- hw_sleep_time(u, &sleep_usec, &process_usec);
- avail_min += pa_usec_to_bytes(sleep_usec, &u->sink->sample_spec) / u->frame_size;
- }
-
- pa_log_debug("setting avail_min=%lu", (unsigned long) avail_min);
-
- if ((err = pa_alsa_set_sw_params(u->pcm_handle, avail_min)) < 0) {
- pa_log("Failed to set software parameters: %s", snd_strerror(err));
- return err;
- }
-
- pa_sink_set_max_request(u->sink, u->hwbuf_size - (size_t) u->hwbuf_unused_frames * u->frame_size);
-
- return 0;
-}
-
-static int unsuspend(struct userdata *u) {
- pa_sample_spec ss;
- int err;
- pa_bool_t b, d;
- unsigned nfrags;
- snd_pcm_uframes_t period_size;
-
- pa_assert(u);
- pa_assert(!u->pcm_handle);
-
- pa_log_info("Trying resume...");
-
- snd_config_update_free_global();
- if ((err = snd_pcm_open(&u->pcm_handle, u->device_name, SND_PCM_STREAM_PLAYBACK,
- /*SND_PCM_NONBLOCK|*/
- SND_PCM_NO_AUTO_RESAMPLE|
- SND_PCM_NO_AUTO_CHANNELS|
- SND_PCM_NO_AUTO_FORMAT)) < 0) {
- pa_log("Error opening PCM device %s: %s", u->device_name, snd_strerror(err));
- goto fail;
- }
-
- ss = u->sink->sample_spec;
- nfrags = u->nfragments;
- period_size = u->fragment_size / u->frame_size;
- b = u->use_mmap;
- d = u->use_tsched;
-
- if ((err = pa_alsa_set_hw_params(u->pcm_handle, &ss, &nfrags, &period_size, u->hwbuf_size / u->frame_size, &b, &d, TRUE)) < 0) {
- pa_log("Failed to set hardware parameters: %s", snd_strerror(err));
- goto fail;
- }
-
- if (b != u->use_mmap || d != u->use_tsched) {
- pa_log_warn("Resume failed, couldn't get original access mode.");
- goto fail;
- }
-
- if (!pa_sample_spec_equal(&ss, &u->sink->sample_spec)) {
- pa_log_warn("Resume failed, couldn't restore original sample settings.");
- goto fail;
- }
-
- if (nfrags != u->nfragments || period_size*u->frame_size != u->fragment_size) {
- pa_log_warn("Resume failed, couldn't restore original fragment settings. (Old: %lu*%lu, New %lu*%lu)",
- (unsigned long) u->nfragments, (unsigned long) u->fragment_size,
- (unsigned long) nfrags, period_size * u->frame_size);
- goto fail;
- }
-
- if (update_sw_params(u) < 0)
- goto fail;
-
- if (build_pollfd(u) < 0)
- goto fail;
-
- /* FIXME: We need to reload the volume somehow */
-
- u->first = TRUE;
- u->since_start = 0;
-
- pa_log_info("Resumed successfully...");
-
- return 0;
-
-fail:
- if (u->pcm_handle) {
- snd_pcm_close(u->pcm_handle);
- u->pcm_handle = NULL;
- }
-
- return -1;
-}
-
-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;
-
- switch (code) {
-
- case PA_SINK_MESSAGE_GET_LATENCY: {
- pa_usec_t r = 0;
-
- if (u->pcm_handle)
- r = sink_get_latency(u);
-
- *((pa_usec_t*) data) = r;
-
- return 0;
- }
-
- case PA_SINK_MESSAGE_SET_STATE:
-
- switch ((pa_sink_state_t) PA_PTR_TO_UINT(data)) {
-
- case PA_SINK_SUSPENDED:
- pa_assert(PA_SINK_IS_OPENED(u->sink->thread_info.state));
-
- if (suspend(u) < 0)
- return -1;
-
- break;
-
- case PA_SINK_IDLE:
- case PA_SINK_RUNNING:
-
- if (u->sink->thread_info.state == PA_SINK_INIT) {
- if (build_pollfd(u) < 0)
- return -1;
- }
-
- if (u->sink->thread_info.state == PA_SINK_SUSPENDED) {
- if (unsuspend(u) < 0)
- return -1;
- }
-
- break;
-
- case PA_SINK_UNLINKED:
- case PA_SINK_INIT:
- ;
- }
-
- break;
- }
-
- return pa_sink_process_msg(o, code, data, offset, chunk);
-}
-
-static int mixer_callback(snd_mixer_elem_t *elem, unsigned int mask) {
- struct userdata *u = snd_mixer_elem_get_callback_private(elem);
-
- pa_assert(u);
- pa_assert(u->mixer_handle);
-
- if (mask == SND_CTL_EVENT_MASK_REMOVE)
- return 0;
-
- if (mask & SND_CTL_EVENT_MASK_VALUE) {
- pa_sink_get_volume(u->sink, TRUE);
- pa_sink_get_mute(u->sink, TRUE);
- }
-
- return 0;
-}
-
-static pa_volume_t from_alsa_volume(struct userdata *u, long alsa_vol) {
-
- return (pa_volume_t) round(((double) (alsa_vol - u->hw_volume_min) * PA_VOLUME_NORM) /
- (double) (u->hw_volume_max - u->hw_volume_min));
-}
-
-static long to_alsa_volume(struct userdata *u, pa_volume_t vol) {
- long alsa_vol;
-
- alsa_vol = (long) round(((double) vol * (double) (u->hw_volume_max - u->hw_volume_min))
- / PA_VOLUME_NORM) + u->hw_volume_min;
-
- return PA_CLAMP_UNLIKELY(alsa_vol, u->hw_volume_min, u->hw_volume_max);
-}
-
-static int sink_get_volume_cb(pa_sink *s) {
- struct userdata *u = s->userdata;
- int err;
- unsigned i;
- pa_cvolume r;
- char t[PA_CVOLUME_SNPRINT_MAX];
-
- pa_assert(u);
- pa_assert(u->mixer_elem);
-
- if (u->mixer_seperate_channels) {
-
- r.channels = s->sample_spec.channels;
-
- for (i = 0; i < s->sample_spec.channels; i++) {
- long alsa_vol;
-
- if (u->hw_dB_supported) {
-
- if ((err = snd_mixer_selem_get_playback_dB(u->mixer_elem, u->mixer_map[i], &alsa_vol)) < 0)
- goto fail;
-
-#ifdef HAVE_VALGRIND_MEMCHECK_H
- VALGRIND_MAKE_MEM_DEFINED(&alsa_vol, sizeof(alsa_vol));
-#endif
-
- r.values[i] = pa_sw_volume_from_dB((double) (alsa_vol - u->hw_dB_max) / 100.0);
- } else {
-
- if ((err = snd_mixer_selem_get_playback_volume(u->mixer_elem, u->mixer_map[i], &alsa_vol)) < 0)
- goto fail;
-
- r.values[i] = from_alsa_volume(u, alsa_vol);
- }
- }
-
- } else {
- long alsa_vol;
-
- if (u->hw_dB_supported) {
-
- if ((err = snd_mixer_selem_get_playback_dB(u->mixer_elem, SND_MIXER_SCHN_MONO, &alsa_vol)) < 0)
- goto fail;
-
-#ifdef HAVE_VALGRIND_MEMCHECK_H
- VALGRIND_MAKE_MEM_DEFINED(&alsa_vol, sizeof(alsa_vol));
-#endif
-
- pa_cvolume_set(&r, s->sample_spec.channels, pa_sw_volume_from_dB((double) (alsa_vol - u->hw_dB_max) / 100.0));
-
- } else {
-
- if ((err = snd_mixer_selem_get_playback_volume(u->mixer_elem, SND_MIXER_SCHN_MONO, &alsa_vol)) < 0)
- goto fail;
-
- pa_cvolume_set(&r, s->sample_spec.channels, from_alsa_volume(u, alsa_vol));
- }
- }
-
- pa_log_debug("Read hardware volume: %s", pa_cvolume_snprint(t, sizeof(t), &r));
-
- if (!pa_cvolume_equal(&u->hardware_volume, &r)) {
-
- u->hardware_volume = s->volume = r;
-
- if (u->hw_dB_supported) {
- pa_cvolume reset;
-
- /* Hmm, so the hardware volume changed, let's reset our software volume */
-
- pa_cvolume_reset(&reset, s->sample_spec.channels);
- pa_sink_set_soft_volume(s, &reset);
- }
- }
-
- return 0;
-
-fail:
- pa_log_error("Unable to read volume: %s", snd_strerror(err));
-
- return -1;
-}
-
-static int sink_set_volume_cb(pa_sink *s) {
- struct userdata *u = s->userdata;
- int err;
- unsigned i;
- pa_cvolume r;
-
- pa_assert(u);
- pa_assert(u->mixer_elem);
-
- if (u->mixer_seperate_channels) {
-
- r.channels = s->sample_spec.channels;
-
- for (i = 0; i < s->sample_spec.channels; i++) {
- long alsa_vol;
- pa_volume_t vol;
-
- vol = s->volume.values[i];
-
- if (u->hw_dB_supported) {
-
- alsa_vol = (long) (pa_sw_volume_to_dB(vol) * 100);
- alsa_vol += u->hw_dB_max;
- alsa_vol = PA_CLAMP_UNLIKELY(alsa_vol, u->hw_dB_min, u->hw_dB_max);
-
- if ((err = snd_mixer_selem_set_playback_dB(u->mixer_elem, u->mixer_map[i], alsa_vol, 1)) < 0)
- goto fail;
-
- if ((err = snd_mixer_selem_get_playback_dB(u->mixer_elem, u->mixer_map[i], &alsa_vol)) < 0)
- goto fail;
-
- r.values[i] = pa_sw_volume_from_dB((double) (alsa_vol - u->hw_dB_max) / 100.0);
-
- } else {
- alsa_vol = to_alsa_volume(u, vol);
-
- if ((err = snd_mixer_selem_set_playback_volume(u->mixer_elem, u->mixer_map[i], alsa_vol)) < 0)
- goto fail;
-
- if ((err = snd_mixer_selem_get_playback_volume(u->mixer_elem, u->mixer_map[i], &alsa_vol)) < 0)
- goto fail;
-
- r.values[i] = from_alsa_volume(u, alsa_vol);
- }
- }
-
- } else {
- pa_volume_t vol;
- long alsa_vol;
-
- vol = pa_cvolume_max(&s->volume);
-
- if (u->hw_dB_supported) {
- alsa_vol = (long) (pa_sw_volume_to_dB(vol) * 100);
- alsa_vol += u->hw_dB_max;
- alsa_vol = PA_CLAMP_UNLIKELY(alsa_vol, u->hw_dB_min, u->hw_dB_max);
-
- if ((err = snd_mixer_selem_set_playback_dB_all(u->mixer_elem, alsa_vol, 1)) < 0)
- goto fail;
-
- if ((err = snd_mixer_selem_get_playback_dB(u->mixer_elem, SND_MIXER_SCHN_MONO, &alsa_vol)) < 0)
- goto fail;
-
- pa_cvolume_set(&r, s->volume.channels, pa_sw_volume_from_dB((double) (alsa_vol - u->hw_dB_max) / 100.0));
-
- } else {
- alsa_vol = to_alsa_volume(u, vol);
-
- if ((err = snd_mixer_selem_set_playback_volume_all(u->mixer_elem, alsa_vol)) < 0)
- goto fail;
-
- if ((err = snd_mixer_selem_get_playback_volume(u->mixer_elem, SND_MIXER_SCHN_MONO, &alsa_vol)) < 0)
- goto fail;
-
- pa_cvolume_set(&r, s->sample_spec.channels, from_alsa_volume(u, alsa_vol));
- }
- }
-
- u->hardware_volume = r;
-
- if (u->hw_dB_supported) {
- char t[PA_CVOLUME_SNPRINT_MAX];
-
- /* Match exactly what the user requested by software */
-
- pa_sw_cvolume_divide(&r, &s->volume, &r);
- pa_sink_set_soft_volume(s, &r);
-
- pa_log_debug("Requested volume: %s", pa_cvolume_snprint(t, sizeof(t), &s->volume));
- pa_log_debug("Got hardware volume: %s", pa_cvolume_snprint(t, sizeof(t), &u->hardware_volume));
- pa_log_debug("Calculated software volume: %s", pa_cvolume_snprint(t, sizeof(t), &r));
-
- } else
-
- /* We can't match exactly what the user requested, hence let's
- * at least tell the user about it */
-
- s->volume = r;
-
- return 0;
-
-fail:
- pa_log_error("Unable to set volume: %s", snd_strerror(err));
-
- return -1;
-}
-
-static int sink_get_mute_cb(pa_sink *s) {
- struct userdata *u = s->userdata;
- int err, sw;
-
- pa_assert(u);
- pa_assert(u->mixer_elem);
-
- if ((err = snd_mixer_selem_get_playback_switch(u->mixer_elem, 0, &sw)) < 0) {
- pa_log_error("Unable to get switch: %s", snd_strerror(err));
- return -1;
- }
-
- s->muted = !sw;
-
- return 0;
-}
-
-static int sink_set_mute_cb(pa_sink *s) {
- struct userdata *u = s->userdata;
- int err;
-
- pa_assert(u);
- pa_assert(u->mixer_elem);
-
- if ((err = snd_mixer_selem_set_playback_switch_all(u->mixer_elem, !s->muted)) < 0) {
- pa_log_error("Unable to set switch: %s", snd_strerror(err));
- return -1;
- }
-
- return 0;
-}
-
-static void sink_update_requested_latency_cb(pa_sink *s) {
- struct userdata *u = s->userdata;
- snd_pcm_sframes_t before;
- pa_assert(u);
-
- if (!u->pcm_handle)
- return;
-
- before = u->hwbuf_unused_frames;
- update_sw_params(u);
-
- /* Let's check whether we now use only a smaller part of the
- buffer then before. If so, we need to make sure that subsequent
- rewinds are relative to the new maxium fill level and not to the
- current fill level. Thus, let's do a full rewind once, to clear
- things up. */
-
- if (u->hwbuf_unused_frames > before) {
- pa_log_debug("Requesting rewind due to latency change.");
- pa_sink_request_rewind(s, (size_t) -1);
- }
-}
-
-static int process_rewind(struct userdata *u) {
- snd_pcm_sframes_t unused;
- size_t rewind_nbytes, unused_nbytes, limit_nbytes;
- pa_assert(u);
-
- /* Figure out how much we shall rewind and reset the counter */
- rewind_nbytes = u->sink->thread_info.rewind_nbytes;
- u->sink->thread_info.rewind_nbytes = 0;
-
- if (rewind_nbytes <= 0)
- goto finish;
-
- pa_assert(rewind_nbytes > 0);
- pa_log_debug("Requested to rewind %lu bytes.", (unsigned long) rewind_nbytes);
-
- snd_pcm_hwsync(u->pcm_handle);
- if ((unused = snd_pcm_avail_update(u->pcm_handle)) < 0) {
- pa_log("snd_pcm_avail_update() failed: %s", snd_strerror((int) unused));
- return -1;
- }
-
- unused_nbytes = u->tsched_watermark + (size_t) unused * u->frame_size;
-
- if (u->hwbuf_size > unused_nbytes)
- limit_nbytes = u->hwbuf_size - unused_nbytes;
- else
- limit_nbytes = 0;
-
- if (rewind_nbytes > limit_nbytes)
- rewind_nbytes = limit_nbytes;
-
- if (rewind_nbytes > 0) {
- snd_pcm_sframes_t in_frames, out_frames;
-
- pa_log_debug("Limited to %lu bytes.", (unsigned long) rewind_nbytes);
-
- in_frames = (snd_pcm_sframes_t) (rewind_nbytes / u->frame_size);
- pa_log_debug("before: %lu", (unsigned long) in_frames);
- if ((out_frames = snd_pcm_rewind(u->pcm_handle, (snd_pcm_uframes_t) in_frames)) < 0) {
- pa_log("snd_pcm_rewind() failed: %s", snd_strerror((int) out_frames));
- return -1;
- }
- pa_log_debug("after: %lu", (unsigned long) out_frames);
-
- rewind_nbytes = (size_t) out_frames * u->frame_size;
-
- if (rewind_nbytes <= 0)
- pa_log_info("Tried rewind, but was apparently not possible.");
- else {
- u->frame_index -= out_frames;
- pa_log_debug("Rewound %lu bytes.", (unsigned long) rewind_nbytes);
- pa_sink_process_rewind(u->sink, rewind_nbytes);
-
- u->after_rewind = TRUE;
- return 0;
- }
- } else
- pa_log_debug("Mhmm, actually there is nothing to rewind.");
-
-finish:
-
- pa_sink_process_rewind(u->sink, 0);
-
- return 0;
-
-}
-
-static void thread_func(void *userdata) {
- struct userdata *u = userdata;
- unsigned short revents = 0;
-
- pa_assert(u);
-
- pa_log_debug("Thread starting up");
-
- if (u->core->realtime_scheduling)
- pa_make_realtime(u->core->realtime_priority);
-
- pa_thread_mq_install(&u->thread_mq);
- pa_rtpoll_install(u->rtpoll);
-
- for (;;) {
- int ret;
-
-/* pa_log_debug("loop"); */
-
- /* Render some data and write it to the dsp */
- if (PA_SINK_IS_OPENED(u->sink->thread_info.state)) {
- int work_done;
- pa_usec_t sleep_usec = 0;
-
- if (u->sink->thread_info.rewind_requested)
- if (process_rewind(u) < 0)
- goto fail;
-
- if (u->use_mmap)
- work_done = mmap_write(u, &sleep_usec, revents & POLLOUT);
- else
- work_done = unix_write(u, &sleep_usec, revents & POLLOUT);
-
- if (work_done < 0)
- goto fail;
-
-/* pa_log_debug("work_done = %i", work_done); */
-
- if (work_done) {
-
- if (u->first) {
- pa_log_info("Starting playback.");
- snd_pcm_start(u->pcm_handle);
-
- pa_smoother_resume(u->smoother, pa_rtclock_usec());
- }
-
- update_smoother(u);
- }
-
- if (u->use_tsched) {
- pa_usec_t cusec;
-
- if (u->since_start <= u->hwbuf_size) {
-
- /* USB devices on ALSA seem to hit a buffer
- * underrun during the first iterations much
- * quicker then we calculate here, probably due to
- * the transport latency. To accomodate for that
- * we artificially decrease the sleep time until
- * we have filled the buffer at least once
- * completely.*/
-
- /*pa_log_debug("Cutting sleep time for the initial iterations by half.");*/
- sleep_usec /= 2;
- }
-
- /* OK, the playback buffer is now full, let's
- * calculate when to wake up next */
-/* pa_log_debug("Waking up in %0.2fms (sound card clock).", (double) sleep_usec / PA_USEC_PER_MSEC); */
-
- /* Convert from the sound card time domain to the
- * system time domain */
- cusec = pa_smoother_translate(u->smoother, pa_rtclock_usec(), sleep_usec);
-
-/* pa_log_debug("Waking up in %0.2fms (system clock).", (double) cusec / PA_USEC_PER_MSEC); */
-
- /* We don't trust the conversion, so we wake up whatever comes first */
- pa_rtpoll_set_timer_relative(u->rtpoll, PA_MIN(sleep_usec, cusec));
- }
-
- u->first = FALSE;
- u->after_rewind = FALSE;
-
- } else if (u->use_tsched)
-
- /* OK, we're in an invalid state, let's disable our timers */
- pa_rtpoll_set_timer_disabled(u->rtpoll);
-
- /* Hmm, nothing to do. Let's sleep */
- if ((ret = pa_rtpoll_run(u->rtpoll, TRUE)) < 0)
- goto fail;
-
- if (ret == 0)
- goto finish;
-
- /* Tell ALSA about this and process its response */
- if (PA_SINK_IS_OPENED(u->sink->thread_info.state)) {
- struct pollfd *pollfd;
- int err;
- unsigned n;
-
- pollfd = pa_rtpoll_item_get_pollfd(u->alsa_rtpoll_item, &n);
-
- if ((err = snd_pcm_poll_descriptors_revents(u->pcm_handle, pollfd, n, &revents)) < 0) {
- pa_log("snd_pcm_poll_descriptors_revents() failed: %s", snd_strerror(err));
- goto fail;
- }
-
- if (revents & (POLLIN|POLLERR|POLLNVAL|POLLHUP|POLLPRI)) {
- if (pa_alsa_recover_from_poll(u->pcm_handle, revents) < 0)
- goto fail;
-
- u->first = TRUE;
- u->since_start = 0;
- }
-
- if (revents && u->use_tsched)
- pa_log_debug("Wakeup from ALSA!%s%s", (revents & POLLIN) ? " INPUT" : "", (revents & POLLOUT) ? " OUTPUT" : "");
- } else
- revents = 0;
- }
-
-fail:
- /* 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_module*m) {
-
pa_modargs *ma = NULL;
- struct userdata *u = NULL;
- const char *dev_id;
- pa_sample_spec ss;
- pa_channel_map map;
- uint32_t nfrags, hwbuf_size, frag_size, tsched_size, tsched_watermark;
- snd_pcm_uframes_t period_frames, tsched_frames;
- size_t frame_size;
- snd_pcm_info_t *pcm_info = NULL;
- int err;
- const char *name;
- char *name_buf = NULL;
- pa_bool_t namereg_fail;
- pa_bool_t use_mmap = TRUE, b, use_tsched = TRUE, d;
- pa_usec_t usec;
- pa_sink_new_data data;
- const pa_alsa_profile_info *profile = NULL;
-
- snd_pcm_info_alloca(&pcm_info);
pa_assert(m);
pa_alsa_redirect_errors_inc();
+ snd_config_update_free_global();
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
pa_log("Failed to parse module arguments");
goto fail;
}
- ss = m->core->default_sample_spec;
- if (pa_modargs_get_sample_spec_and_channel_map(ma, &ss, &map, PA_CHANNEL_MAP_ALSA) < 0) {
- pa_log("Failed to parse sample specification and channel map");
- goto fail;
- }
-
- frame_size = pa_frame_size(&ss);
-
- nfrags = m->core->default_n_fragments;
- frag_size = (uint32_t) pa_usec_to_bytes(m->core->default_fragment_size_msec*PA_USEC_PER_MSEC, &ss);
- if (frag_size <= 0)
- frag_size = (uint32_t) frame_size;
- tsched_size = (uint32_t) pa_usec_to_bytes(DEFAULT_TSCHED_BUFFER_USEC, &ss);
- tsched_watermark = (uint32_t) pa_usec_to_bytes(DEFAULT_TSCHED_WATERMARK_USEC, &ss);
-
- if (pa_modargs_get_value_u32(ma, "fragments", &nfrags) < 0 ||
- pa_modargs_get_value_u32(ma, "fragment_size", &frag_size) < 0 ||
- pa_modargs_get_value_u32(ma, "tsched_buffer_size", &tsched_size) < 0 ||
- pa_modargs_get_value_u32(ma, "tsched_buffer_watermark", &tsched_watermark) < 0) {
- pa_log("Failed to parse buffer metrics");
- goto fail;
- }
-
- hwbuf_size = frag_size * nfrags;
- period_frames = frag_size/frame_size;
- tsched_frames = tsched_size/frame_size;
-
- if (pa_modargs_get_value_boolean(ma, "mmap", &use_mmap) < 0) {
- pa_log("Failed to parse mmap argument.");
- goto fail;
- }
-
- if (pa_modargs_get_value_boolean(ma, "tsched", &use_tsched) < 0) {
- pa_log("Failed to parse tsched argument.");
- goto fail;
- }
-
- if (use_tsched && !pa_rtclock_hrtimer()) {
- pa_log_notice("Disabling timer-based scheduling because high-resolution timers are not available from the kernel.");
- use_tsched = FALSE;
- }
-
- m->userdata = u = pa_xnew0(struct userdata, 1);
- u->core = m->core;
- u->module = m;
- u->use_mmap = use_mmap;
- u->use_tsched = use_tsched;
- u->first = TRUE;
- u->since_start = 0;
- u->after_rewind = FALSE;
- u->rtpoll = pa_rtpoll_new();
- pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll);
- u->alsa_rtpoll_item = NULL;
-
- u->smoother = pa_smoother_new(DEFAULT_TSCHED_BUFFER_USEC*2, DEFAULT_TSCHED_BUFFER_USEC*2, TRUE, 5);
- usec = pa_rtclock_usec();
- pa_smoother_set_time_offset(u->smoother, usec);
- pa_smoother_pause(u->smoother, usec);
-
- snd_config_update_free_global();
-
- b = use_mmap;
- d = use_tsched;
-
- if ((dev_id = pa_modargs_get_value(ma, "device_id", NULL))) {
-
- if (!(u->pcm_handle = pa_alsa_open_by_device_id_auto(
- dev_id,
- &u->device_name,
- &ss, &map,
- SND_PCM_STREAM_PLAYBACK,
- &nfrags, &period_frames, tsched_frames,
- &b, &d, &profile)))
-
- goto fail;
-
- } else {
-
- if (!(u->pcm_handle = pa_alsa_open_by_device_string(
- pa_modargs_get_value(ma, "device", DEFAULT_DEVICE),
- &u->device_name,
- &ss, &map,
- SND_PCM_STREAM_PLAYBACK,
- &nfrags, &period_frames, tsched_frames,
- &b, &d, FALSE)))
- goto fail;
-
- }
-
- pa_assert(u->device_name);
- pa_log_info("Successfully opened device %s.", u->device_name);
-
- if (profile)
- pa_log_info("Selected configuration '%s' (%s).", profile->description, profile->name);
-
- if (use_mmap && !b) {
- pa_log_info("Device doesn't support mmap(), falling back to UNIX read/write mode.");
- u->use_mmap = use_mmap = FALSE;
- }
-
- if (use_tsched && (!b || !d)) {
- pa_log_info("Cannot enabled timer-based scheduling, falling back to sound IRQ scheduling.");
- u->use_tsched = use_tsched = FALSE;
- }
-
- if (u->use_mmap)
- pa_log_info("Successfully enabled mmap() mode.");
-
- if (u->use_tsched)
- pa_log_info("Successfully enabled timer-based scheduling mode.");
-
- if ((err = snd_pcm_info(u->pcm_handle, pcm_info)) < 0) {
- pa_log("Error fetching PCM info: %s", snd_strerror(err));
+ if (!(m->userdata = pa_alsa_sink_new(m, ma, NULL)))
goto fail;
- }
-
- /* ALSA might tweak the sample spec, so recalculate the frame size */
- frame_size = pa_frame_size(&ss);
-
- if ((err = snd_mixer_open(&u->mixer_handle, 0)) < 0)
- pa_log_warn("Error opening mixer: %s", snd_strerror(err));
- else {
- pa_bool_t found = FALSE;
-
- if (pa_alsa_prepare_mixer(u->mixer_handle, u->device_name) >= 0)
- found = TRUE;
- else {
- snd_pcm_info_t *info;
-
- snd_pcm_info_alloca(&info);
-
- if (snd_pcm_info(u->pcm_handle, info) >= 0) {
- char *md;
- int card;
-
- if ((card = snd_pcm_info_get_card(info)) >= 0) {
-
- md = pa_sprintf_malloc("hw:%i", card);
-
- if (strcmp(u->device_name, md))
- if (pa_alsa_prepare_mixer(u->mixer_handle, md) >= 0)
- found = TRUE;
- pa_xfree(md);
- }
- }
- }
-
- if (found)
- if (!(u->mixer_elem = pa_alsa_find_elem(u->mixer_handle, "Master", "PCM", TRUE)))
- found = FALSE;
-
- if (!found) {
- snd_mixer_close(u->mixer_handle);
- u->mixer_handle = NULL;
- }
- }
-
- if ((name = pa_modargs_get_value(ma, "sink_name", NULL)))
- namereg_fail = TRUE;
- else {
- name = name_buf = pa_sprintf_malloc("alsa_output.%s", u->device_name);
- namereg_fail = FALSE;
- }
-
- pa_sink_new_data_init(&data);
- data.driver = __FILE__;
- data.module = m;
- pa_sink_new_data_set_name(&data, name);
- data.namereg_fail = namereg_fail;
- pa_sink_new_data_set_sample_spec(&data, &ss);
- pa_sink_new_data_set_channel_map(&data, &map);
-
- pa_alsa_init_proplist_pcm(data.proplist, pcm_info);
- pa_proplist_sets(data.proplist, PA_PROP_DEVICE_STRING, u->device_name);
- pa_proplist_setf(data.proplist, PA_PROP_DEVICE_BUFFERING_BUFFER_SIZE, "%lu", (unsigned long) (period_frames * frame_size * nfrags));
- pa_proplist_setf(data.proplist, PA_PROP_DEVICE_BUFFERING_FRAGMENT_SIZE, "%lu", (unsigned long) (period_frames * frame_size));
- pa_proplist_sets(data.proplist, PA_PROP_DEVICE_ACCESS_MODE, u->use_tsched ? "mmap+timer" : (u->use_mmap ? "mmap" : "serial"));
-
- if (profile) {
- pa_proplist_sets(data.proplist, PA_PROP_DEVICE_PROFILE_NAME, profile->name);
- pa_proplist_sets(data.proplist, PA_PROP_DEVICE_PROFILE_DESCRIPTION, profile->description);
- }
-
- u->sink = pa_sink_new(m->core, &data, PA_SINK_HARDWARE|PA_SINK_LATENCY);
- pa_sink_new_data_done(&data);
- pa_xfree(name_buf);
-
- if (!u->sink) {
- pa_log("Failed to create sink object");
- goto fail;
- }
-
- u->sink->parent.process_msg = sink_process_msg;
- u->sink->update_requested_latency = sink_update_requested_latency_cb;
- u->sink->userdata = u;
-
- pa_sink_set_asyncmsgq(u->sink, u->thread_mq.inq);
- pa_sink_set_rtpoll(u->sink, u->rtpoll);
-
- u->frame_size = frame_size;
- u->fragment_size = frag_size = (uint32_t) (period_frames * frame_size);
- u->nfragments = nfrags;
- u->hwbuf_size = u->fragment_size * nfrags;
- u->hwbuf_unused_frames = 0;
- u->tsched_watermark = tsched_watermark;
- u->frame_index = 0;
- u->hw_dB_supported = FALSE;
- u->hw_dB_min = u->hw_dB_max = 0;
- u->hw_volume_min = u->hw_volume_max = 0;
- u->mixer_seperate_channels = FALSE;
- pa_cvolume_mute(&u->hardware_volume, u->sink->sample_spec.channels);
-
- if (use_tsched)
- fix_tsched_watermark(u);
-
- u->sink->thread_info.max_rewind = use_tsched ? u->hwbuf_size : 0;
- u->sink->thread_info.max_request = u->hwbuf_size;
-
- pa_sink_set_latency_range(u->sink,
- !use_tsched ? pa_bytes_to_usec(u->hwbuf_size, &ss) : (pa_usec_t) -1,
- pa_bytes_to_usec(u->hwbuf_size, &ss));
-
- pa_log_info("Using %u fragments of size %lu bytes, buffer time is %0.2fms",
- nfrags, (long unsigned) u->fragment_size,
- (double) pa_bytes_to_usec(u->hwbuf_size, &ss) / PA_USEC_PER_MSEC);
-
- if (use_tsched)
- pa_log_info("Time scheduling watermark is %0.2fms",
- (double) pa_bytes_to_usec(u->tsched_watermark, &ss) / PA_USEC_PER_MSEC);
-
- if (update_sw_params(u) < 0)
- goto fail;
-
- pa_memchunk_reset(&u->memchunk);
-
- if (u->mixer_handle) {
- pa_assert(u->mixer_elem);
-
- if (snd_mixer_selem_has_playback_volume(u->mixer_elem)) {
- pa_bool_t suitable = FALSE;
-
- if (snd_mixer_selem_get_playback_volume_range(u->mixer_elem, &u->hw_volume_min, &u->hw_volume_max) < 0)
- pa_log_info("Failed to get volume range. Falling back to software volume control.");
- else if (u->hw_volume_min >= u->hw_volume_max)
- pa_log_warn("Your kernel driver is broken: it reports a volume range from %li to %li which makes no sense.", u->hw_volume_min, u->hw_volume_max);
- else {
- pa_log_info("Volume ranges from %li to %li.", u->hw_volume_min, u->hw_volume_max);
- suitable = TRUE;
- }
-
- if (suitable) {
- if (snd_mixer_selem_get_playback_dB_range(u->mixer_elem, &u->hw_dB_min, &u->hw_dB_max) < 0)
- pa_log_info("Mixer doesn't support dB information.");
- else {
-#ifdef HAVE_VALGRIND_MEMCHECK_H
- VALGRIND_MAKE_MEM_DEFINED(&u->hw_dB_min, sizeof(u->hw_dB_min));
- VALGRIND_MAKE_MEM_DEFINED(&u->hw_dB_max, sizeof(u->hw_dB_max));
-#endif
-
- if (u->hw_dB_min >= u->hw_dB_max)
- pa_log_warn("Your kernel driver is broken: it reports a volume range from %0.2f dB to %0.2f dB which makes no sense.", (double) u->hw_dB_min/100.0, (double) u->hw_dB_max/100.0);
- else {
- pa_log_info("Volume ranges from %0.2f dB to %0.2f dB.", (double) u->hw_dB_min/100.0, (double) u->hw_dB_max/100.0);
- u->hw_dB_supported = TRUE;
-
- if (u->hw_dB_max > 0) {
- u->sink->base_volume = pa_sw_volume_from_dB(- (double) u->hw_dB_max/100.0);
- pa_log_info("Fixing base volume to %0.2f dB", pa_sw_volume_to_dB(u->sink->base_volume));
- } else
- pa_log_info("No particular base volume set, fixing to 0 dB");
- }
- }
-
- if (!u->hw_dB_supported &&
- u->hw_volume_max - u->hw_volume_min < 3) {
-
- pa_log_info("Device doesn't do dB volume and has less than 4 volume levels. Falling back to software volume control.");
- suitable = FALSE;
- }
- }
-
- if (suitable) {
- u->mixer_seperate_channels = pa_alsa_calc_mixer_map(u->mixer_elem, &map, u->mixer_map, TRUE) >= 0;
-
- u->sink->get_volume = sink_get_volume_cb;
- u->sink->set_volume = sink_set_volume_cb;
- u->sink->flags |= PA_SINK_HW_VOLUME_CTRL | (u->hw_dB_supported ? PA_SINK_DECIBEL_VOLUME : 0);
- pa_log_info("Using hardware volume control. Hardware dB scale %s.", u->hw_dB_supported ? "supported" : "not supported");
-
- } else
- pa_log_info("Using software volume control.");
- }
-
- if (snd_mixer_selem_has_playback_switch(u->mixer_elem)) {
- u->sink->get_mute = sink_get_mute_cb;
- u->sink->set_mute = sink_set_mute_cb;
- u->sink->flags |= PA_SINK_HW_MUTE_CTRL;
- } else
- pa_log_info("Using software mute control.");
-
- u->mixer_fdl = pa_alsa_fdlist_new();
-
- if (pa_alsa_fdlist_set_mixer(u->mixer_fdl, u->mixer_handle, m->core->mainloop) < 0) {
- pa_log("Failed to initialize file descriptor monitoring");
- goto fail;
- }
-
- snd_mixer_elem_set_callback(u->mixer_elem, mixer_callback);
- snd_mixer_elem_set_callback_private(u->mixer_elem, u);
- } else
- u->mixer_fdl = NULL;
-
- pa_alsa_dump(u->pcm_handle);
-
- if (!(u->thread = pa_thread_new(thread_func, u))) {
- pa_log("Failed to create thread.");
- goto fail;
- }
-
- /* Get initial mixer settings */
- if (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 (data.muted_is_set) {
- if (u->sink->set_mute)
- u->sink->set_mute(u->sink);
- } else {
- if (u->sink->get_mute)
- u->sink->get_mute(u->sink);
- }
-
- pa_sink_put(u->sink);
pa_modargs_free(ma);
@@ -1619,62 +100,21 @@ fail:
}
int pa__get_n_used(pa_module *m) {
- struct userdata *u;
+ pa_sink *sink;
pa_assert(m);
- pa_assert_se(u = m->userdata);
+ pa_assert_se(sink = m->userdata);
- return pa_sink_linked_by(u->sink);
+ return pa_sink_linked_by(sink);
}
void pa__done(pa_module*m) {
- struct userdata *u;
+ pa_sink *sink;
pa_assert(m);
- if (!(u = m->userdata))
- goto finish;
-
- if (u->sink)
- pa_sink_unlink(u->sink);
-
- if (u->thread) {
- pa_asyncmsgq_send(u->thread_mq.inq, NULL, PA_MESSAGE_SHUTDOWN, NULL, 0, NULL);
- pa_thread_free(u->thread);
- }
-
- 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->alsa_rtpoll_item)
- pa_rtpoll_item_free(u->alsa_rtpoll_item);
-
- if (u->rtpoll)
- pa_rtpoll_free(u->rtpoll);
-
- if (u->mixer_fdl)
- pa_alsa_fdlist_free(u->mixer_fdl);
-
- if (u->mixer_handle)
- snd_mixer_close(u->mixer_handle);
-
- if (u->pcm_handle) {
- snd_pcm_drop(u->pcm_handle);
- snd_pcm_close(u->pcm_handle);
- }
-
- if (u->smoother)
- pa_smoother_free(u->smoother);
-
- pa_xfree(u->device_name);
- pa_xfree(u);
-
-finish:
+ if ((sink = m->userdata))
+ pa_alsa_sink_free(sink);
snd_config_update_free_global();
pa_alsa_redirect_errors_dec();
diff --git a/src/modules/alsa/module-alsa-source.c b/src/modules/alsa/module-alsa-source.c
index 08ef12f..a3b5715 100644
--- a/src/modules/alsa/module-alsa-source.c
+++ b/src/modules/alsa/module-alsa-source.c
@@ -54,6 +54,7 @@
#include <pulsecore/rtclock.h>
#include "alsa-util.h"
+#include "alsa-source.h"
#include "module-alsa-source-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering");
@@ -93,1337 +94,22 @@ static const char* const valid_modargs[] = {
};
#define DEFAULT_DEVICE "default"
-#define DEFAULT_TSCHED_BUFFER_USEC (2*PA_USEC_PER_SEC) /* 2s */
-#define DEFAULT_TSCHED_WATERMARK_USEC (20*PA_USEC_PER_MSEC) /* 20ms */
-#define TSCHED_MIN_SLEEP_USEC (3*PA_USEC_PER_MSEC) /* 3ms */
-#define TSCHED_MIN_WAKEUP_USEC (3*PA_USEC_PER_MSEC) /* 3ms */
-
-struct userdata {
- pa_core *core;
- pa_module *module;
- pa_source *source;
-
- pa_thread *thread;
- pa_thread_mq thread_mq;
- pa_rtpoll *rtpoll;
-
- snd_pcm_t *pcm_handle;
-
- pa_alsa_fdlist *mixer_fdl;
- snd_mixer_t *mixer_handle;
- snd_mixer_elem_t *mixer_elem;
- long hw_volume_max, hw_volume_min;
- long hw_dB_max, hw_dB_min;
- pa_bool_t hw_dB_supported;
- pa_bool_t mixer_seperate_channels;
-
- pa_cvolume hardware_volume;
-
- size_t frame_size, fragment_size, hwbuf_size, tsched_watermark;
- unsigned nfragments;
-
- char *device_name;
-
- pa_bool_t use_mmap, use_tsched;
-
- pa_rtpoll_item *alsa_rtpoll_item;
-
- snd_mixer_selem_channel_id_t mixer_map[SND_MIXER_SCHN_LAST];
-
- pa_smoother *smoother;
- int64_t frame_index;
-
- snd_pcm_sframes_t hwbuf_unused_frames;
-};
-
-static void fix_tsched_watermark(struct userdata *u) {
- size_t max_use;
- size_t min_sleep, min_wakeup;
- pa_assert(u);
-
- max_use = u->hwbuf_size - (size_t) u->hwbuf_unused_frames * u->frame_size;
-
- min_sleep = pa_usec_to_bytes(TSCHED_MIN_SLEEP_USEC, &u->source->sample_spec);
- min_wakeup = pa_usec_to_bytes(TSCHED_MIN_WAKEUP_USEC, &u->source->sample_spec);
-
- if (min_sleep > max_use/2)
- min_sleep = pa_frame_align(max_use/2, &u->source->sample_spec);
- if (min_sleep < u->frame_size)
- min_sleep = u->frame_size;
-
- if (min_wakeup > max_use/2)
- min_wakeup = pa_frame_align(max_use/2, &u->source->sample_spec);
- if (min_wakeup < u->frame_size)
- min_wakeup = u->frame_size;
-
- if (u->tsched_watermark > max_use-min_sleep)
- u->tsched_watermark = max_use-min_sleep;
-
- if (u->tsched_watermark < min_wakeup)
- u->tsched_watermark = min_wakeup;
-}
-
-static pa_usec_t hw_sleep_time(struct userdata *u, pa_usec_t *sleep_usec, pa_usec_t*process_usec) {
- pa_usec_t wm, usec;
-
- pa_assert(u);
-
- usec = pa_source_get_requested_latency_within_thread(u->source);
-
- if (usec == (pa_usec_t) -1)
- usec = pa_bytes_to_usec(u->hwbuf_size, &u->source->sample_spec);
-
-/* pa_log_debug("hw buffer time: %u ms", (unsigned) (usec / PA_USEC_PER_MSEC)); */
-
- wm = pa_bytes_to_usec(u->tsched_watermark, &u->source->sample_spec);
-
- if (usec >= wm) {
- *sleep_usec = usec - wm;
- *process_usec = wm;
- } else
- *process_usec = *sleep_usec = usec /= 2;
-
-/* pa_log_debug("after watermark: %u ms", (unsigned) (*sleep_usec / PA_USEC_PER_MSEC)); */
-
- return usec;
-}
-
-static int try_recover(struct userdata *u, const char *call, int err) {
- pa_assert(u);
- pa_assert(call);
- pa_assert(err < 0);
-
- pa_log_debug("%s: %s", call, snd_strerror(err));
-
- pa_assert(err != -EAGAIN);
-
- if (err == -EPIPE)
- pa_log_debug("%s: Buffer overrun!", call);
-
- if ((err = snd_pcm_recover(u->pcm_handle, err, 1)) == 0) {
- snd_pcm_start(u->pcm_handle);
- return 0;
- }
-
- pa_log("%s: %s", call, snd_strerror(err));
- return -1;
-}
-
-static size_t check_left_to_record(struct userdata *u, snd_pcm_sframes_t n) {
- size_t left_to_record;
- size_t rec_space = u->hwbuf_size - (size_t) u->hwbuf_unused_frames*u->frame_size;
-
- if ((size_t) n*u->frame_size < rec_space)
- left_to_record = rec_space - ((size_t) n*u->frame_size);
- else
- left_to_record = 0;
-
- if (left_to_record > 0) {
-/* pa_log_debug("%0.2f ms left to record", (double) pa_bytes_to_usec(left_to_record, &u->source->sample_spec) / PA_USEC_PER_MSEC); */
- } else {
- pa_log_info("Overrun!");
-
- if (u->use_tsched) {
- size_t old_watermark = u->tsched_watermark;
-
- u->tsched_watermark *= 2;
- fix_tsched_watermark(u);
-
- if (old_watermark != u->tsched_watermark)
- pa_log_notice("Increasing wakeup watermark to %0.2f ms",
- (double) pa_bytes_to_usec(u->tsched_watermark, &u->source->sample_spec) / PA_USEC_PER_MSEC);
- }
- }
-
- return left_to_record;
-}
-
-static int mmap_read(struct userdata *u, pa_usec_t *sleep_usec, pa_bool_t polled) {
- int work_done = 0;
- pa_usec_t max_sleep_usec = 0, process_usec = 0;
- size_t left_to_record;
-
- pa_assert(u);
- pa_source_assert_ref(u->source);
-
- if (u->use_tsched)
- hw_sleep_time(u, &max_sleep_usec, &process_usec);
-
- for (;;) {
- snd_pcm_sframes_t n;
- int r;
-
- snd_pcm_hwsync(u->pcm_handle);
-
- if (PA_UNLIKELY((n = pa_alsa_safe_avail_update(u->pcm_handle, u->hwbuf_size, &u->source->sample_spec)) < 0)) {
-
- if ((r = try_recover(u, "snd_pcm_avail_update", (int) n)) == 0)
- continue;
-
- return r;
- }
-
- left_to_record = check_left_to_record(u, n);
-
- if (u->use_tsched)
- if (!polled &&
- pa_bytes_to_usec(left_to_record, &u->source->sample_spec) > process_usec+max_sleep_usec/2)
- break;
-
- if (PA_UNLIKELY(n <= 0)) {
-
- if (polled)
- pa_log("ALSA woke us up to read new data from the device, but there was actually nothing to read! "
- "Most likely this is an ALSA driver bug. Please report this issue to the ALSA developers. "
- "We were woken up with POLLIN set -- however a subsequent snd_pcm_avail_update() returned 0.");
-
- break;
- }
-
- polled = FALSE;
-
- for (;;) {
- int err;
- const snd_pcm_channel_area_t *areas;
- snd_pcm_uframes_t offset, frames = (snd_pcm_uframes_t) n;
- pa_memchunk chunk;
- void *p;
- snd_pcm_sframes_t sframes;
-
-/* pa_log_debug("%lu frames to read", (unsigned long) frames); */
-
- if (PA_UNLIKELY((err = pa_alsa_safe_mmap_begin(u->pcm_handle, &areas, &offset, &frames, u->hwbuf_size, &u->source->sample_spec)) < 0)) {
-
- if ((r = try_recover(u, "snd_pcm_mmap_begin", err)) == 0)
- continue;
-
- return r;
- }
-
- /* Make sure that if these memblocks need to be copied they will fit into one slot */
- if (frames > pa_mempool_block_size_max(u->source->core->mempool)/u->frame_size)
- frames = pa_mempool_block_size_max(u->source->core->mempool)/u->frame_size;
-
- /* Check these are multiples of 8 bit */
- pa_assert((areas[0].first & 7) == 0);
- pa_assert((areas[0].step & 7)== 0);
-
- /* We assume a single interleaved memory buffer */
- pa_assert((areas[0].first >> 3) == 0);
- pa_assert((areas[0].step >> 3) == u->frame_size);
-
- p = (uint8_t*) areas[0].addr + (offset * u->frame_size);
-
- chunk.memblock = pa_memblock_new_fixed(u->core->mempool, p, frames * u->frame_size, TRUE);
- chunk.length = pa_memblock_get_length(chunk.memblock);
- chunk.index = 0;
-
- pa_source_post(u->source, &chunk);
- pa_memblock_unref_fixed(chunk.memblock);
-
- if (PA_UNLIKELY((sframes = snd_pcm_mmap_commit(u->pcm_handle, offset, frames)) < 0)) {
-
- if ((r = try_recover(u, "snd_pcm_mmap_commit", (int) sframes)) == 0)
- continue;
-
- return r;
- }
-
- work_done = 1;
-
- u->frame_index += (int64_t) frames;
-
-/* pa_log_debug("read %lu frames", (unsigned long) frames); */
-
- if (frames >= (snd_pcm_uframes_t) n)
- break;
-
- n -= (snd_pcm_sframes_t) frames;
- }
- }
-
- *sleep_usec = pa_bytes_to_usec(left_to_record, &u->source->sample_spec) - process_usec;
- return work_done;
-}
-
-static int unix_read(struct userdata *u, pa_usec_t *sleep_usec, pa_bool_t polled) {
- int work_done = 0;
- pa_usec_t max_sleep_usec = 0, process_usec = 0;
- size_t left_to_record;
-
- pa_assert(u);
- pa_source_assert_ref(u->source);
-
- if (u->use_tsched)
- hw_sleep_time(u, &max_sleep_usec, &process_usec);
-
- for (;;) {
- snd_pcm_sframes_t n;
- int r;
-
- snd_pcm_hwsync(u->pcm_handle);
-
- if (PA_UNLIKELY((n = pa_alsa_safe_avail_update(u->pcm_handle, u->hwbuf_size, &u->source->sample_spec)) < 0)) {
-
- if ((r = try_recover(u, "snd_pcm_avail_update", (int) n)) == 0)
- continue;
-
- return r;
- }
-
- left_to_record = check_left_to_record(u, n);
-
- if (u->use_tsched)
- if (!polled &&
- pa_bytes_to_usec(left_to_record, &u->source->sample_spec) > process_usec+max_sleep_usec/2)
- break;
-
- if (PA_UNLIKELY(n <= 0)) {
-
- if (polled)
- pa_log("ALSA woke us up to read new data from the device, but there was actually nothing to read! "
- "Most likely this is an ALSA driver bug. Please report this issue to the ALSA developers. "
- "We were woken up with POLLIN set -- however a subsequent snd_pcm_avail_update() returned 0.");
-
- return work_done;
- }
-
- polled = FALSE;
-
- for (;;) {
- void *p;
- snd_pcm_sframes_t frames;
- pa_memchunk chunk;
-
- chunk.memblock = pa_memblock_new(u->core->mempool, (size_t) -1);
-
- frames = (snd_pcm_sframes_t) (pa_memblock_get_length(chunk.memblock) / u->frame_size);
-
- if (frames > n)
- frames = n;
-
-/* pa_log_debug("%lu frames to read", (unsigned long) n); */
-
- p = pa_memblock_acquire(chunk.memblock);
- frames = snd_pcm_readi(u->pcm_handle, (uint8_t*) p, (snd_pcm_uframes_t) frames);
- pa_memblock_release(chunk.memblock);
-
- pa_assert(frames != 0);
-
- if (PA_UNLIKELY(frames < 0)) {
- pa_memblock_unref(chunk.memblock);
-
- if ((r = try_recover(u, "snd_pcm_readi", (int) (frames))) == 0)
- continue;
-
- return r;
- }
-
- chunk.index = 0;
- chunk.length = (size_t) frames * u->frame_size;
-
- pa_source_post(u->source, &chunk);
- pa_memblock_unref(chunk.memblock);
-
- work_done = 1;
-
- u->frame_index += frames;
-
-/* pa_log_debug("read %lu frames", (unsigned long) frames); */
-
- if (frames >= n)
- break;
-
- n -= frames;
- }
- }
-
- *sleep_usec = pa_bytes_to_usec(left_to_record, &u->source->sample_spec) - process_usec;
- return work_done;
-}
-
-static void update_smoother(struct userdata *u) {
- snd_pcm_sframes_t delay = 0;
- int64_t frames;
- int err;
- pa_usec_t now1, now2;
-
- pa_assert(u);
- pa_assert(u->pcm_handle);
-
- /* Let's update the time smoother */
-
- snd_pcm_hwsync(u->pcm_handle);
- snd_pcm_avail_update(u->pcm_handle);
-
- if (PA_UNLIKELY((err = snd_pcm_delay(u->pcm_handle, &delay)) < 0)) {
- pa_log_warn("Failed to get delay: %s", snd_strerror(err));
- return;
- }
-
- frames = u->frame_index + delay;
-
- now1 = pa_rtclock_usec();
- now2 = pa_bytes_to_usec((uint64_t) frames * u->frame_size, &u->source->sample_spec);
-
- pa_smoother_put(u->smoother, now1, now2);
-}
-
-static pa_usec_t source_get_latency(struct userdata *u) {
- pa_usec_t r = 0;
- int64_t delay;
- pa_usec_t now1, now2;
-
- pa_assert(u);
-
- now1 = pa_rtclock_usec();
- now2 = pa_smoother_get(u->smoother, now1);
-
- delay = (int64_t) now2 - (int64_t) pa_bytes_to_usec((uint64_t) u->frame_index * u->frame_size, &u->source->sample_spec);
-
- if (delay > 0)
- r = (pa_usec_t) delay;
-
- return r;
-}
-
-static int build_pollfd(struct userdata *u) {
- pa_assert(u);
- pa_assert(u->pcm_handle);
-
- if (u->alsa_rtpoll_item)
- pa_rtpoll_item_free(u->alsa_rtpoll_item);
-
- if (!(u->alsa_rtpoll_item = pa_alsa_build_pollfd(u->pcm_handle, u->rtpoll)))
- return -1;
-
- return 0;
-}
-
-static int suspend(struct userdata *u) {
- pa_assert(u);
- pa_assert(u->pcm_handle);
-
- pa_smoother_pause(u->smoother, pa_rtclock_usec());
-
- /* Let's suspend */
- snd_pcm_close(u->pcm_handle);
- u->pcm_handle = NULL;
-
- if (u->alsa_rtpoll_item) {
- pa_rtpoll_item_free(u->alsa_rtpoll_item);
- u->alsa_rtpoll_item = NULL;
- }
-
- pa_log_info("Device suspended...");
-
- return 0;
-}
-
-static int update_sw_params(struct userdata *u) {
- snd_pcm_uframes_t avail_min;
- int err;
-
- pa_assert(u);
-
- /* Use the full buffer if noone asked us for anything specific */
- u->hwbuf_unused_frames = 0;
-
- if (u->use_tsched) {
- pa_usec_t latency;
-
- if ((latency = pa_source_get_requested_latency_within_thread(u->source)) != (pa_usec_t) -1) {
- size_t b;
-
- pa_log_debug("latency set to %0.2fms", (double) latency / PA_USEC_PER_MSEC);
-
- b = pa_usec_to_bytes(latency, &u->source->sample_spec);
-
- /* We need at least one sample in our buffer */
-
- if (PA_UNLIKELY(b < u->frame_size))
- b = u->frame_size;
-
- u->hwbuf_unused_frames = (snd_pcm_sframes_t)
- (PA_LIKELY(b < u->hwbuf_size) ?
- ((u->hwbuf_size - b) / u->frame_size) : 0);
- }
-
- fix_tsched_watermark(u);
- }
-
- pa_log_debug("hwbuf_unused_frames=%lu", (unsigned long) u->hwbuf_unused_frames);
-
- avail_min = 1;
-
- if (u->use_tsched) {
- pa_usec_t sleep_usec, process_usec;
-
- hw_sleep_time(u, &sleep_usec, &process_usec);
- avail_min += pa_usec_to_bytes(sleep_usec, &u->source->sample_spec) / u->frame_size;
- }
-
- pa_log_debug("setting avail_min=%lu", (unsigned long) avail_min);
-
- if ((err = pa_alsa_set_sw_params(u->pcm_handle, avail_min)) < 0) {
- pa_log("Failed to set software parameters: %s", snd_strerror(err));
- return err;
- }
-
- return 0;
-}
-
-static int unsuspend(struct userdata *u) {
- pa_sample_spec ss;
- int err;
- pa_bool_t b, d;
- unsigned nfrags;
- snd_pcm_uframes_t period_size;
-
- pa_assert(u);
- pa_assert(!u->pcm_handle);
-
- pa_log_info("Trying resume...");
-
- snd_config_update_free_global();
-
- if ((err = snd_pcm_open(&u->pcm_handle, u->device_name, SND_PCM_STREAM_CAPTURE,
- /*SND_PCM_NONBLOCK|*/
- SND_PCM_NO_AUTO_RESAMPLE|
- SND_PCM_NO_AUTO_CHANNELS|
- SND_PCM_NO_AUTO_FORMAT)) < 0) {
- pa_log("Error opening PCM device %s: %s", u->device_name, snd_strerror(err));
- goto fail;
- }
-
- ss = u->source->sample_spec;
- nfrags = u->nfragments;
- period_size = u->fragment_size / u->frame_size;
- b = u->use_mmap;
- d = u->use_tsched;
-
- if ((err = pa_alsa_set_hw_params(u->pcm_handle, &ss, &nfrags, &period_size, u->hwbuf_size / u->frame_size, &b, &d, TRUE)) < 0) {
- pa_log("Failed to set hardware parameters: %s", snd_strerror(err));
- goto fail;
- }
-
- if (b != u->use_mmap || d != u->use_tsched) {
- pa_log_warn("Resume failed, couldn't get original access mode.");
- goto fail;
- }
-
- if (!pa_sample_spec_equal(&ss, &u->source->sample_spec)) {
- pa_log_warn("Resume failed, couldn't restore original sample settings.");
- goto fail;
- }
-
- if (nfrags != u->nfragments || period_size*u->frame_size != u->fragment_size) {
- pa_log_warn("Resume failed, couldn't restore original fragment settings. (Old: %lu*%lu, New %lu*%lu)",
- (unsigned long) u->nfragments, (unsigned long) u->fragment_size,
- (unsigned long) nfrags, period_size * u->frame_size);
- goto fail;
- }
-
- if (update_sw_params(u) < 0)
- goto fail;
-
- if (build_pollfd(u) < 0)
- goto fail;
-
- /* FIXME: We need to reload the volume somehow */
-
- snd_pcm_start(u->pcm_handle);
- pa_smoother_resume(u->smoother, pa_rtclock_usec());
-
- pa_log_info("Resumed successfully...");
-
- return 0;
-
-fail:
- if (u->pcm_handle) {
- snd_pcm_close(u->pcm_handle);
- u->pcm_handle = NULL;
- }
-
- return -1;
-}
-
-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;
-
- switch (code) {
-
- case PA_SOURCE_MESSAGE_GET_LATENCY: {
- pa_usec_t r = 0;
-
- if (u->pcm_handle)
- r = source_get_latency(u);
-
- *((pa_usec_t*) data) = r;
-
- return 0;
- }
-
- case PA_SOURCE_MESSAGE_SET_STATE:
-
- 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));
-
- if (suspend(u) < 0)
- return -1;
-
- break;
-
- case PA_SOURCE_IDLE:
- case PA_SOURCE_RUNNING:
-
- if (u->source->thread_info.state == PA_SOURCE_INIT) {
- if (build_pollfd(u) < 0)
- return -1;
-
- snd_pcm_start(u->pcm_handle);
- }
-
- if (u->source->thread_info.state == PA_SOURCE_SUSPENDED) {
- if (unsuspend(u) < 0)
- return -1;
- }
-
- break;
-
- case PA_SOURCE_UNLINKED:
- case PA_SOURCE_INIT:
- ;
- }
-
- break;
- }
-
- return pa_source_process_msg(o, code, data, offset, chunk);
-}
-
-static int mixer_callback(snd_mixer_elem_t *elem, unsigned int mask) {
- struct userdata *u = snd_mixer_elem_get_callback_private(elem);
-
- pa_assert(u);
- pa_assert(u->mixer_handle);
-
- if (mask == SND_CTL_EVENT_MASK_REMOVE)
- return 0;
-
- if (mask & SND_CTL_EVENT_MASK_VALUE) {
- pa_source_get_volume(u->source, TRUE);
- pa_source_get_mute(u->source, TRUE);
- }
-
- return 0;
-}
-
-static pa_volume_t from_alsa_volume(struct userdata *u, long alsa_vol) {
-
- return (pa_volume_t) round(((double) (alsa_vol - u->hw_volume_min) * PA_VOLUME_NORM) /
- (double) (u->hw_volume_max - u->hw_volume_min));
-}
-
-static long to_alsa_volume(struct userdata *u, pa_volume_t vol) {
- long alsa_vol;
-
- alsa_vol = (long) round(((double) vol * (double) (u->hw_volume_max - u->hw_volume_min))
- / PA_VOLUME_NORM) + u->hw_volume_min;
-
- return PA_CLAMP_UNLIKELY(alsa_vol, u->hw_volume_min, u->hw_volume_max);
-}
-
-static int source_get_volume_cb(pa_source *s) {
- struct userdata *u = s->userdata;
- int err;
- unsigned i;
- pa_cvolume r;
- char t[PA_CVOLUME_SNPRINT_MAX];
-
- pa_assert(u);
- pa_assert(u->mixer_elem);
-
- if (u->mixer_seperate_channels) {
-
- r.channels = s->sample_spec.channels;
-
- for (i = 0; i < s->sample_spec.channels; i++) {
- long alsa_vol;
-
- if (u->hw_dB_supported) {
-
- if ((err = snd_mixer_selem_get_capture_dB(u->mixer_elem, u->mixer_map[i], &alsa_vol)) < 0)
- goto fail;
-
-#ifdef HAVE_VALGRIND_MEMCHECK_H
- VALGRIND_MAKE_MEM_DEFINED(&alsa_vol, sizeof(alsa_vol));
-#endif
-
- r.values[i] = pa_sw_volume_from_dB((double) (alsa_vol - u->hw_dB_max) / 100.0);
- } else {
-
- if ((err = snd_mixer_selem_get_capture_volume(u->mixer_elem, u->mixer_map[i], &alsa_vol)) < 0)
- goto fail;
-
- r.values[i] = from_alsa_volume(u, alsa_vol);
- }
- }
-
- } else {
- long alsa_vol;
-
- if (u->hw_dB_supported) {
-
- if ((err = snd_mixer_selem_get_capture_dB(u->mixer_elem, SND_MIXER_SCHN_MONO, &alsa_vol)) < 0)
- goto fail;
-
-#ifdef HAVE_VALGRIND_MEMCHECK_H
- VALGRIND_MAKE_MEM_DEFINED(&alsa_vol, sizeof(alsa_vol));
-#endif
-
- pa_cvolume_set(&r, s->sample_spec.channels, pa_sw_volume_from_dB((double) (alsa_vol - u->hw_dB_max) / 100.0));
-
- } else {
-
- if ((err = snd_mixer_selem_get_capture_volume(u->mixer_elem, SND_MIXER_SCHN_MONO, &alsa_vol)) < 0)
- goto fail;
-
- pa_cvolume_set(&r, s->sample_spec.channels, from_alsa_volume(u, alsa_vol));
- }
- }
-
- pa_log_debug("Read hardware volume: %s", pa_cvolume_snprint(t, sizeof(t), &r));
-
- if (!pa_cvolume_equal(&u->hardware_volume, &r)) {
-
- u->hardware_volume = s->volume = r;
-
- if (u->hw_dB_supported) {
- pa_cvolume reset;
-
- /* Hmm, so the hardware volume changed, let's reset our software volume */
-
- pa_cvolume_reset(&reset, s->sample_spec.channels);
- pa_source_set_soft_volume(s, &reset);
- }
- }
-
- return 0;
-
-fail:
- pa_log_error("Unable to read volume: %s", snd_strerror(err));
-
- return -1;
-}
-
-static int source_set_volume_cb(pa_source *s) {
- struct userdata *u = s->userdata;
- int err;
- unsigned i;
- pa_cvolume r;
-
- pa_assert(u);
- pa_assert(u->mixer_elem);
-
- if (u->mixer_seperate_channels) {
-
- r.channels = s->sample_spec.channels;
-
- for (i = 0; i < s->sample_spec.channels; i++) {
- long alsa_vol;
- pa_volume_t vol;
-
- vol = s->volume.values[i];
-
- if (u->hw_dB_supported) {
-
- alsa_vol = (long) (pa_sw_volume_to_dB(vol) * 100);
- alsa_vol += u->hw_dB_max;
- alsa_vol = PA_CLAMP_UNLIKELY(alsa_vol, u->hw_dB_min, u->hw_dB_max);
-
- if ((err = snd_mixer_selem_set_capture_dB(u->mixer_elem, u->mixer_map[i], alsa_vol, 1)) < 0)
- goto fail;
-
- if ((err = snd_mixer_selem_get_capture_dB(u->mixer_elem, u->mixer_map[i], &alsa_vol)) < 0)
- goto fail;
-
- r.values[i] = pa_sw_volume_from_dB((double) (alsa_vol - u->hw_dB_max) / 100.0);
-
- } else {
- alsa_vol = to_alsa_volume(u, vol);
-
- if ((err = snd_mixer_selem_set_capture_volume(u->mixer_elem, u->mixer_map[i], alsa_vol)) < 0)
- goto fail;
-
- if ((err = snd_mixer_selem_get_capture_volume(u->mixer_elem, u->mixer_map[i], &alsa_vol)) < 0)
- goto fail;
-
- r.values[i] = from_alsa_volume(u, alsa_vol);
- }
- }
-
- } else {
- pa_volume_t vol;
- long alsa_vol;
-
- vol = pa_cvolume_max(&s->volume);
-
- if (u->hw_dB_supported) {
- alsa_vol = (long) (pa_sw_volume_to_dB(vol) * 100);
- alsa_vol += u->hw_dB_max;
- alsa_vol = PA_CLAMP_UNLIKELY(alsa_vol, u->hw_dB_min, u->hw_dB_max);
-
- if ((err = snd_mixer_selem_set_capture_dB_all(u->mixer_elem, alsa_vol, 1)) < 0)
- goto fail;
-
- if ((err = snd_mixer_selem_get_capture_dB(u->mixer_elem, SND_MIXER_SCHN_MONO, &alsa_vol)) < 0)
- goto fail;
-
- pa_cvolume_set(&r, s->volume.channels, pa_sw_volume_from_dB((double) (alsa_vol - u->hw_dB_max) / 100.0));
-
- } else {
- alsa_vol = to_alsa_volume(u, vol);
-
- if ((err = snd_mixer_selem_set_capture_volume_all(u->mixer_elem, alsa_vol)) < 0)
- goto fail;
-
- if ((err = snd_mixer_selem_get_capture_volume(u->mixer_elem, SND_MIXER_SCHN_MONO, &alsa_vol)) < 0)
- goto fail;
-
- pa_cvolume_set(&r, s->sample_spec.channels, from_alsa_volume(u, alsa_vol));
- }
- }
-
- u->hardware_volume = r;
-
- if (u->hw_dB_supported) {
- char t[PA_CVOLUME_SNPRINT_MAX];
-
- /* Match exactly what the user requested by software */
-
- pa_sw_cvolume_divide(&r, &s->volume, &r);
- pa_source_set_soft_volume(s, &r);
-
- pa_log_debug("Requested volume: %s", pa_cvolume_snprint(t, sizeof(t), &s->volume));
- pa_log_debug("Got hardware volume: %s", pa_cvolume_snprint(t, sizeof(t), &u->hardware_volume));
- pa_log_debug("Calculated software volume: %s", pa_cvolume_snprint(t, sizeof(t), &r));
-
- } else
-
- /* We can't match exactly what the user requested, hence let's
- * at least tell the user about it */
-
- s->volume = r;
-
- return 0;
-
-fail:
- pa_log_error("Unable to set volume: %s", snd_strerror(err));
-
- return -1;
-}
-
-static int source_get_mute_cb(pa_source *s) {
- struct userdata *u = s->userdata;
- int err, sw;
-
- pa_assert(u);
- pa_assert(u->mixer_elem);
-
- if ((err = snd_mixer_selem_get_capture_switch(u->mixer_elem, 0, &sw)) < 0) {
- pa_log_error("Unable to get switch: %s", snd_strerror(err));
- return -1;
- }
-
- s->muted = !sw;
-
- return 0;
-}
-
-static int source_set_mute_cb(pa_source *s) {
- struct userdata *u = s->userdata;
- int err;
-
- pa_assert(u);
- pa_assert(u->mixer_elem);
-
- if ((err = snd_mixer_selem_set_capture_switch_all(u->mixer_elem, !s->muted)) < 0) {
- pa_log_error("Unable to set switch: %s", snd_strerror(err));
- return -1;
- }
-
- return 0;
-}
-
-static void source_update_requested_latency_cb(pa_source *s) {
- struct userdata *u = s->userdata;
- pa_assert(u);
-
- if (!u->pcm_handle)
- return;
-
- update_sw_params(u);
-}
-
-static void thread_func(void *userdata) {
- struct userdata *u = userdata;
- unsigned short revents = 0;
-
- pa_assert(u);
-
- pa_log_debug("Thread starting up");
-
- if (u->core->realtime_scheduling)
- pa_make_realtime(u->core->realtime_priority);
-
- pa_thread_mq_install(&u->thread_mq);
- pa_rtpoll_install(u->rtpoll);
-
- for (;;) {
- int ret;
-
-/* pa_log_debug("loop"); */
-
- /* Read some data and pass it to the sources */
- if (PA_SOURCE_IS_OPENED(u->source->thread_info.state)) {
- int work_done = 0;
- pa_usec_t sleep_usec = 0;
-
- if (u->use_mmap)
- work_done = mmap_read(u, &sleep_usec, revents & POLLIN);
- else
- work_done = unix_read(u, &sleep_usec, revents & POLLIN);
-
- if (work_done < 0)
- goto fail;
-
-/* pa_log_debug("work_done = %i", work_done); */
-
- if (work_done)
- update_smoother(u);
-
- if (u->use_tsched) {
- pa_usec_t cusec;
-
- /* OK, the capture buffer is now empty, let's
- * calculate when to wake up next */
-
-/* pa_log_debug("Waking up in %0.2fms (sound card clock).", (double) sleep_usec / PA_USEC_PER_MSEC); */
-
- /* Convert from the sound card time domain to the
- * system time domain */
- cusec = pa_smoother_translate(u->smoother, pa_rtclock_usec(), sleep_usec);
-
-/* pa_log_debug("Waking up in %0.2fms (system clock).", (double) cusec / PA_USEC_PER_MSEC); */
-
- /* We don't trust the conversion, so we wake up whatever comes first */
- pa_rtpoll_set_timer_relative(u->rtpoll, PA_MIN(sleep_usec, cusec));
- }
- } else if (u->use_tsched)
-
- /* OK, we're in an invalid state, let's disable our timers */
- pa_rtpoll_set_timer_disabled(u->rtpoll);
-
- /* Hmm, nothing to do. Let's sleep */
- if ((ret = pa_rtpoll_run(u->rtpoll, TRUE)) < 0)
- goto fail;
-
- if (ret == 0)
- goto finish;
-
- /* Tell ALSA about this and process its response */
- if (PA_SOURCE_IS_OPENED(u->source->thread_info.state)) {
- struct pollfd *pollfd;
- int err;
- unsigned n;
-
- pollfd = pa_rtpoll_item_get_pollfd(u->alsa_rtpoll_item, &n);
-
- if ((err = snd_pcm_poll_descriptors_revents(u->pcm_handle, pollfd, n, &revents)) < 0) {
- pa_log("snd_pcm_poll_descriptors_revents() failed: %s", snd_strerror(err));
- goto fail;
- }
-
- if (revents & (POLLOUT|POLLERR|POLLNVAL|POLLHUP|POLLPRI)) {
- if (pa_alsa_recover_from_poll(u->pcm_handle, revents) < 0)
- goto fail;
-
- snd_pcm_start(u->pcm_handle);
- }
-
- if (revents && u->use_tsched)
- pa_log_debug("Wakeup from ALSA!%s%s", (revents & POLLIN) ? " INPUT" : "", (revents & POLLOUT) ? " OUTPUT" : "");
- } else
- revents = 0;
- }
-
-fail:
- /* 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_module*m) {
-
pa_modargs *ma = NULL;
- struct userdata *u = NULL;
- const char *dev_id;
- pa_sample_spec ss;
- pa_channel_map map;
- uint32_t nfrags, hwbuf_size, frag_size, tsched_size, tsched_watermark;
- snd_pcm_uframes_t period_frames, tsched_frames;
- size_t frame_size;
- snd_pcm_info_t *pcm_info = NULL;
- int err;
- const char *name;
- char *name_buf = NULL;
- pa_bool_t namereg_fail;
- pa_bool_t use_mmap = TRUE, b, use_tsched = TRUE, d;
- pa_source_new_data data;
- const pa_alsa_profile_info *profile = NULL;
-
- snd_pcm_info_alloca(&pcm_info);
pa_assert(m);
pa_alsa_redirect_errors_inc();
+ snd_config_update_free_global();
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
pa_log("Failed to parse module arguments");
goto fail;
}
- ss = m->core->default_sample_spec;
- if (pa_modargs_get_sample_spec_and_channel_map(ma, &ss, &map, PA_CHANNEL_MAP_ALSA) < 0) {
- pa_log("Failed to parse sample specification");
+ if (!(m->userdata = pa_alsa_source_new(m, ma, NULL)))
goto fail;
- }
-
- frame_size = pa_frame_size(&ss);
-
- nfrags = m->core->default_n_fragments;
- frag_size = (uint32_t) pa_usec_to_bytes(m->core->default_fragment_size_msec*PA_USEC_PER_MSEC, &ss);
- if (frag_size <= 0)
- frag_size = (uint32_t) frame_size;
- tsched_size = (uint32_t) pa_usec_to_bytes(DEFAULT_TSCHED_BUFFER_USEC, &ss);
- tsched_watermark = (uint32_t) pa_usec_to_bytes(DEFAULT_TSCHED_WATERMARK_USEC, &ss);
-
- if (pa_modargs_get_value_u32(ma, "fragments", &nfrags) < 0 ||
- pa_modargs_get_value_u32(ma, "fragment_size", &frag_size) < 0 ||
- pa_modargs_get_value_u32(ma, "tsched_buffer_size", &tsched_size) < 0 ||
- pa_modargs_get_value_u32(ma, "tsched_buffer_watermark", &tsched_watermark) < 0) {
- pa_log("Failed to parse buffer metrics");
- goto fail;
- }
-
- hwbuf_size = frag_size * nfrags;
- period_frames = frag_size/frame_size;
- tsched_frames = tsched_size/frame_size;
-
- if (pa_modargs_get_value_boolean(ma, "mmap", &use_mmap) < 0) {
- pa_log("Failed to parse mmap argument.");
- goto fail;
- }
-
- if (pa_modargs_get_value_boolean(ma, "tsched", &use_tsched) < 0) {
- pa_log("Failed to parse timer_scheduling argument.");
- goto fail;
- }
-
- if (use_tsched && !pa_rtclock_hrtimer()) {
- pa_log_notice("Disabling timer-based scheduling because high-resolution timers are not available from the kernel.");
- use_tsched = FALSE;
- }
-
- m->userdata = u = pa_xnew0(struct userdata, 1);
- u->core = m->core;
- u->module = m;
- u->use_mmap = use_mmap;
- u->use_tsched = use_tsched;
- u->rtpoll = pa_rtpoll_new();
- pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll);
- u->alsa_rtpoll_item = NULL;
-
- u->smoother = pa_smoother_new(DEFAULT_TSCHED_WATERMARK_USEC, DEFAULT_TSCHED_WATERMARK_USEC, TRUE, 5);
- pa_smoother_set_time_offset(u->smoother, pa_rtclock_usec());
-
- snd_config_update_free_global();
-
- b = use_mmap;
- d = use_tsched;
-
- if ((dev_id = pa_modargs_get_value(ma, "device_id", NULL))) {
-
- if (!(u->pcm_handle = pa_alsa_open_by_device_id_auto(
- dev_id,
- &u->device_name,
- &ss, &map,
- SND_PCM_STREAM_CAPTURE,
- &nfrags, &period_frames, tsched_frames,
- &b, &d, &profile)))
- goto fail;
-
- } else {
-
- if (!(u->pcm_handle = pa_alsa_open_by_device_string(
- pa_modargs_get_value(ma, "device", DEFAULT_DEVICE),
- &u->device_name,
- &ss, &map,
- SND_PCM_STREAM_CAPTURE,
- &nfrags, &period_frames, tsched_frames,
- &b, &d, FALSE)))
- goto fail;
- }
-
- pa_assert(u->device_name);
- pa_log_info("Successfully opened device %s.", u->device_name);
-
- if (profile)
- pa_log_info("Selected configuration '%s' (%s).", profile->description, profile->name);
-
- if (use_mmap && !b) {
- pa_log_info("Device doesn't support mmap(), falling back to UNIX read/write mode.");
- u->use_mmap = use_mmap = FALSE;
- }
-
- if (use_tsched && (!b || !d)) {
- pa_log_info("Cannot enabled timer-based scheduling, falling back to sound IRQ scheduling.");
- u->use_tsched = use_tsched = FALSE;
- }
-
- if (u->use_mmap)
- pa_log_info("Successfully enabled mmap() mode.");
-
- if (u->use_tsched)
- pa_log_info("Successfully enabled timer-based scheduling mode.");
-
- if ((err = snd_pcm_info(u->pcm_handle, pcm_info)) < 0) {
- pa_log("Error fetching PCM info: %s", snd_strerror(err));
- goto fail;
- }
-
- /* ALSA might tweak the sample spec, so recalculate the frame size */
- frame_size = pa_frame_size(&ss);
-
- if ((err = snd_mixer_open(&u->mixer_handle, 0)) < 0)
- pa_log("Error opening mixer: %s", snd_strerror(err));
- else {
- pa_bool_t found = FALSE;
-
- if (pa_alsa_prepare_mixer(u->mixer_handle, u->device_name) >= 0)
- found = TRUE;
- else {
- snd_pcm_info_t* info;
-
- snd_pcm_info_alloca(&info);
-
- if (snd_pcm_info(u->pcm_handle, info) >= 0) {
- char *md;
- int card;
-
- if ((card = snd_pcm_info_get_card(info)) >= 0) {
-
- md = pa_sprintf_malloc("hw:%i", card);
-
- if (strcmp(u->device_name, md))
- if (pa_alsa_prepare_mixer(u->mixer_handle, md) >= 0)
- found = TRUE;
- pa_xfree(md);
- }
- }
- }
-
- if (found)
- if (!(u->mixer_elem = pa_alsa_find_elem(u->mixer_handle, "Capture", "Mic", FALSE)))
- found = FALSE;
-
- if (!found) {
- snd_mixer_close(u->mixer_handle);
- u->mixer_handle = NULL;
- }
- }
-
- if ((name = pa_modargs_get_value(ma, "source_name", NULL)))
- namereg_fail = TRUE;
- else {
- name = name_buf = pa_sprintf_malloc("alsa_input.%s", u->device_name);
- namereg_fail = FALSE;
- }
-
- pa_source_new_data_init(&data);
- data.driver = __FILE__;
- data.module = m;
- pa_source_new_data_set_name(&data, name);
- data.namereg_fail = namereg_fail;
- pa_source_new_data_set_sample_spec(&data, &ss);
- pa_source_new_data_set_channel_map(&data, &map);
-
- pa_alsa_init_proplist_pcm(data.proplist, pcm_info);
- pa_proplist_sets(data.proplist, PA_PROP_DEVICE_STRING, u->device_name);
- pa_proplist_setf(data.proplist, PA_PROP_DEVICE_BUFFERING_BUFFER_SIZE, "%lu", (unsigned long) (period_frames * frame_size * nfrags));
- pa_proplist_setf(data.proplist, PA_PROP_DEVICE_BUFFERING_FRAGMENT_SIZE, "%lu", (unsigned long) (period_frames * frame_size));
- pa_proplist_sets(data.proplist, PA_PROP_DEVICE_ACCESS_MODE, u->use_tsched ? "mmap+timer" : (u->use_mmap ? "mmap" : "serial"));
-
- if (profile) {
- pa_proplist_sets(data.proplist, PA_PROP_DEVICE_PROFILE_NAME, profile->name);
- pa_proplist_sets(data.proplist, PA_PROP_DEVICE_PROFILE_DESCRIPTION, profile->description);
- }
-
- u->source = pa_source_new(m->core, &data, PA_SOURCE_HARDWARE|PA_SOURCE_LATENCY);
- pa_source_new_data_done(&data);
- pa_xfree(name_buf);
-
- if (!u->source) {
- pa_log("Failed to create source object");
- goto fail;
- }
-
- u->source->parent.process_msg = source_process_msg;
- u->source->update_requested_latency = source_update_requested_latency_cb;
- u->source->userdata = u;
-
- pa_source_set_asyncmsgq(u->source, u->thread_mq.inq);
- pa_source_set_rtpoll(u->source, u->rtpoll);
-
- u->frame_size = frame_size;
- u->fragment_size = frag_size = (uint32_t) (period_frames * frame_size);
- u->nfragments = nfrags;
- u->hwbuf_size = u->fragment_size * nfrags;
- u->hwbuf_unused_frames = 0;
- u->tsched_watermark = tsched_watermark;
- u->frame_index = 0;
- u->hw_dB_supported = FALSE;
- u->hw_dB_min = u->hw_dB_max = 0;
- u->hw_volume_min = u->hw_volume_max = 0;
- u->mixer_seperate_channels = FALSE;
- pa_cvolume_mute(&u->hardware_volume, u->source->sample_spec.channels);
-
- if (use_tsched)
- fix_tsched_watermark(u);
-
- pa_source_set_latency_range(u->source,
- !use_tsched ? pa_bytes_to_usec(u->hwbuf_size, &ss) : (pa_usec_t) -1,
- pa_bytes_to_usec(u->hwbuf_size, &ss));
-
- pa_log_info("Using %u fragments of size %lu bytes, buffer time is %0.2fms",
- nfrags, (long unsigned) u->fragment_size,
- (double) pa_bytes_to_usec(u->hwbuf_size, &ss) / PA_USEC_PER_MSEC);
-
- if (use_tsched)
- pa_log_info("Time scheduling watermark is %0.2fms",
- (double) pa_bytes_to_usec(u->tsched_watermark, &ss) / PA_USEC_PER_MSEC);
-
- if (update_sw_params(u) < 0)
- goto fail;
-
- if (u->mixer_handle) {
- pa_assert(u->mixer_elem);
-
- if (snd_mixer_selem_has_capture_volume(u->mixer_elem)) {
- pa_bool_t suitable = FALSE;
-
- if (snd_mixer_selem_get_capture_volume_range(u->mixer_elem, &u->hw_volume_min, &u->hw_volume_max) < 0)
- pa_log_info("Failed to get volume range. Falling back to software volume control.");
- else if (u->hw_volume_min >= u->hw_volume_max)
- pa_log_warn("Your kernel driver is broken: it reports a volume range from %li to %li which makes no sense.", u->hw_volume_min, u->hw_volume_max);
- else {
- pa_log_info("Volume ranges from %li to %li.", u->hw_volume_min, u->hw_volume_max);
- suitable = TRUE;
- }
-
- if (suitable) {
- if (snd_mixer_selem_get_capture_dB_range(u->mixer_elem, &u->hw_dB_min, &u->hw_dB_max) < 0)
- pa_log_info("Mixer doesn't support dB information.");
- else {
-#ifdef HAVE_VALGRIND_MEMCHECK_H
- VALGRIND_MAKE_MEM_DEFINED(&u->hw_dB_min, sizeof(u->hw_dB_min));
- VALGRIND_MAKE_MEM_DEFINED(&u->hw_dB_max, sizeof(u->hw_dB_max));
-#endif
-
- if (u->hw_dB_min >= u->hw_dB_max)
- pa_log_warn("Your kernel driver is broken: it reports a volume range from %0.2f dB to %0.2f dB which makes no sense.", (double) u->hw_dB_min/100.0, (double) u->hw_dB_max/100.0);
- else {
- pa_log_info("Volume ranges from %0.2f dB to %0.2f dB.", (double) u->hw_dB_min/100.0, (double) u->hw_dB_max/100.0);
- u->hw_dB_supported = TRUE;
-
- if (u->hw_dB_max > 0) {
- u->source->base_volume = pa_sw_volume_from_dB(- (double) u->hw_dB_max/100.0);
- pa_log_info("Fixing base volume to %0.2f dB", pa_sw_volume_to_dB(u->source->base_volume));
- } else
- pa_log_info("No particular base volume set, fixing to 0 dB");
-
- }
- }
-
- if (!u->hw_dB_supported &&
- u->hw_volume_max - u->hw_volume_min < 3) {
-
- pa_log_info("Device has less than 4 volume levels. Falling back to software volume control.");
- suitable = FALSE;
- }
- }
-
- if (suitable) {
- u->mixer_seperate_channels = pa_alsa_calc_mixer_map(u->mixer_elem, &map, u->mixer_map, FALSE) >= 0;
-
- u->source->get_volume = source_get_volume_cb;
- u->source->set_volume = source_set_volume_cb;
- u->source->flags |= PA_SOURCE_HW_VOLUME_CTRL | (u->hw_dB_supported ? PA_SOURCE_DECIBEL_VOLUME : 0);
- pa_log_info("Using hardware volume control. Hardware dB scale %s.", u->hw_dB_supported ? "supported" : "not supported");
- } else
- pa_log_info("Using software volume control.");
- }
-
- if (snd_mixer_selem_has_capture_switch(u->mixer_elem)) {
- u->source->get_mute = source_get_mute_cb;
- u->source->set_mute = source_set_mute_cb;
- u->source->flags |= PA_SOURCE_HW_MUTE_CTRL;
- } else
- pa_log_info("Using software mute control.");
-
- u->mixer_fdl = pa_alsa_fdlist_new();
-
- if (pa_alsa_fdlist_set_mixer(u->mixer_fdl, u->mixer_handle, m->core->mainloop) < 0) {
- pa_log("Failed to initialize file descriptor monitoring");
- goto fail;
- }
-
- snd_mixer_elem_set_callback(u->mixer_elem, mixer_callback);
- snd_mixer_elem_set_callback_private(u->mixer_elem, u);
- } else
- u->mixer_fdl = NULL;
-
- pa_alsa_dump(u->pcm_handle);
-
- if (!(u->thread = pa_thread_new(thread_func, u))) {
- pa_log("Failed to create thread.");
- goto fail;
- }
- /* Get initial mixer settings */
- if (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 (data.muted_is_set) {
- if (u->source->set_mute)
- u->source->set_mute(u->source);
- } else {
- if (u->source->get_mute)
- u->source->get_mute(u->source);
- }
-
- pa_source_put(u->source);
pa_modargs_free(ma);
@@ -1440,59 +126,22 @@ fail:
}
int pa__get_n_used(pa_module *m) {
- struct userdata *u;
+ pa_source *source;
pa_assert(m);
- pa_assert_se(u = m->userdata);
+ pa_assert_se(source = m->userdata);
- return pa_source_linked_by(u->source);
+ return pa_source_linked_by(source);
}
void pa__done(pa_module*m) {
- struct userdata *u;
+ pa_source *source;
pa_assert(m);
- if (!(u = m->userdata))
- goto finish;
-
- if (u->source)
- pa_source_unlink(u->source);
-
- if (u->thread) {
- pa_asyncmsgq_send(u->thread_mq.inq, NULL, PA_MESSAGE_SHUTDOWN, NULL, 0, NULL);
- pa_thread_free(u->thread);
- }
-
- pa_thread_mq_done(&u->thread_mq);
-
- if (u->source)
- pa_source_unref(u->source);
-
- if (u->alsa_rtpoll_item)
- pa_rtpoll_item_free(u->alsa_rtpoll_item);
-
- if (u->rtpoll)
- pa_rtpoll_free(u->rtpoll);
-
- if (u->mixer_fdl)
- pa_alsa_fdlist_free(u->mixer_fdl);
-
- if (u->mixer_handle)
- snd_mixer_close(u->mixer_handle);
-
- if (u->pcm_handle) {
- snd_pcm_drop(u->pcm_handle);
- snd_pcm_close(u->pcm_handle);
- }
-
- if (u->smoother)
- pa_smoother_free(u->smoother);
-
- pa_xfree(u->device_name);
- pa_xfree(u);
+ if ((source = m->userdata))
+ pa_alsa_source_free(source);
-finish:
snd_config_update_free_global();
pa_alsa_redirect_errors_dec();
}
commit b6b0e07c316be822ced5136fd29d96976ccab0f2
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Jan 21 01:52:10 2009 +0100
fix copy/paste error
diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c
index 57018a2..a30ef95 100644
--- a/src/pulsecore/source.c
+++ b/src/pulsecore/source.c
@@ -322,7 +322,7 @@ void pa_source_unlink(pa_source *s) {
pa_idxset_remove_by_data(s->core->sources, s, NULL);
if (s->card)
- pa_idxset_remove_by_data(s->card->sinks, s, NULL);
+ pa_idxset_remove_by_data(s->card->sources, s, NULL);
while ((o = pa_idxset_first(s->outputs, NULL))) {
pa_assert(o != j);
commit 9a0dbda654614214d1f0a3556d814a415ef212eb
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Jan 21 01:53:09 2009 +0100
allow cards be referenced by their index
diff --git a/src/pulsecore/namereg.c b/src/pulsecore/namereg.c
index 2734bab..ed652ab 100644
--- a/src/pulsecore/namereg.c
+++ b/src/pulsecore/namereg.c
@@ -223,6 +223,8 @@ void* pa_namereg_get(pa_core *c, const char *name, pa_namereg_type_t type) {
return pa_idxset_get_by_index(c->sources, idx);
else if (type == PA_NAMEREG_SAMPLE && c->scache)
return pa_idxset_get_by_index(c->scache, idx);
+ else if (type == PA_NAMEREG_CARD)
+ return pa_idxset_get_by_index(c->cards, idx);
return NULL;
}
commit dc2a4bd887083b2374ed96a9e4943f0b55373ac0
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Jan 21 01:54:14 2009 +0100
add set-card-profile CLI command
diff --git a/src/pulsecore/cli-command.c b/src/pulsecore/cli-command.c
index f810579..da3ef1e 100644
--- a/src/pulsecore/cli-command.c
+++ b/src/pulsecore/cli-command.c
@@ -123,6 +123,7 @@ static int pa_cli_command_update_sink_proplist(pa_core *c, pa_tokenizer *t, pa_s
static int pa_cli_command_update_source_proplist(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, pa_bool_t *fail);
static int pa_cli_command_update_sink_input_proplist(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, pa_bool_t *fail);
static int pa_cli_command_update_source_output_proplist(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, pa_bool_t *fail);
+static int pa_cli_command_card_profile(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, pa_bool_t *fail);
/* A method table for all available commands */
@@ -173,6 +174,7 @@ static const struct command commands[] = {
{ "suspend-sink", pa_cli_command_suspend_sink, "Suspend sink (args: index|name, bool)", 3},
{ "suspend-source", pa_cli_command_suspend_source, "Suspend source (args: index|name, bool)", 3},
{ "suspend", pa_cli_command_suspend, "Suspend all sinks and all sources (args: bool)", 2},
+ { "set-card-profile", pa_cli_command_card_profile, "Change the profile of a card (aargs: index, name)", 3},
{ "set-log-level", pa_cli_command_log_level, "Change the log level (args: numeric level)", 2},
{ "set-log-meta", pa_cli_command_log_meta, "Show source code location in log messages (args: bool)", 2},
{ "set-log-time", pa_cli_command_log_time, "Show timestamps in log messages (args: bool)", 2},
@@ -1411,10 +1413,43 @@ static int pa_cli_command_log_backtrace(pa_core *c, pa_tokenizer *t, pa_strbuf *
return 0;
}
+static int pa_cli_command_card_profile(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, pa_bool_t *fail) {
+ const char *n, *p;
+ pa_card *card;
+
+ pa_core_assert_ref(c);
+ pa_assert(t);
+ pa_assert(buf);
+ pa_assert(fail);
+
+ if (!(n = pa_tokenizer_get(t, 1))) {
+ pa_strbuf_puts(buf, "You need to specify a card either by its name or its index.\n");
+ return -1;
+ }
+
+ if (!(p = pa_tokenizer_get(t, 2))) {
+ pa_strbuf_puts(buf, "You need to specify a profile by its name.\n");
+ return -1;
+ }
+
+ if (!(card = pa_namereg_get(c, n, PA_NAMEREG_CARD))) {
+ pa_strbuf_puts(buf, "No card found by this name or index.\n");
+ return -1;
+ }
+
+ if (pa_card_set_profile(card, p) < 0) {
+ pa_strbuf_printf(buf, "Failed to set card profile to '%s'.\n", p);
+ return -1;
+ }
+
+ return 0;
+}
+
static int pa_cli_command_dump(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, pa_bool_t *fail) {
pa_module *m;
pa_sink *sink;
pa_source *source;
+ pa_card *card;
int nl;
const char *p;
uint32_t idx;
@@ -1470,6 +1505,16 @@ static int pa_cli_command_dump(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, pa_b
pa_strbuf_printf(buf, "suspend-source %s %s\n", source->name, pa_yes_no(pa_source_get_state(source) == PA_SOURCE_SUSPENDED));
}
+ for (card = pa_idxset_first(c->cards, &idx); card; card = pa_idxset_next(c->cards, &idx)) {
+
+ if (!nl) {
+ pa_strbuf_puts(buf, "\n");
+ nl = 1;
+ }
+
+ if (card->active_profile)
+ pa_strbuf_printf(buf, "set-card-profile %s %s\n", card->name, card->active_profile->name);
+ }
nl = 0;
commit 1d0bd6e5b77b372cd5168d2d19713c201df71d66
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Jan 21 01:55:26 2009 +0100
remove bogus pa_core_check_idle() call
diff --git a/src/pulsecore/card.c b/src/pulsecore/card.c
index cb77553..f42ad91 100644
--- a/src/pulsecore/card.c
+++ b/src/pulsecore/card.c
@@ -189,8 +189,6 @@ void pa_card_free(pa_card *c) {
pa_xfree(c->driver);
pa_xfree(c->name);
pa_xfree(c);
-
- pa_core_check_idle(core);
}
int pa_card_set_profile(pa_card *c, const char *name) {
commit cba4c6b9ebec0979d3dd98be5756b6a04859d146
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Jan 21 01:59:15 2009 +0100
when changing profiles do the actual assignment in the generic implementation
diff --git a/src/pulsecore/card.c b/src/pulsecore/card.c
index f42ad91..af2a178 100644
--- a/src/pulsecore/card.c
+++ b/src/pulsecore/card.c
@@ -196,7 +196,7 @@ int pa_card_set_profile(pa_card *c, const char *name) {
pa_assert(c);
if (!c->set_profile) {
- pa_log_warn("set_profile() operation not implemented for card %u", c->index);
+ pa_log_warn("set_profile() operation not implemented for card %u \"%s\"", c->index, c->name);
return -1;
}
@@ -214,5 +214,9 @@ int pa_card_set_profile(pa_card *c, const char *name) {
pa_subscription_post(c->core, PA_SUBSCRIPTION_EVENT_CARD|PA_SUBSCRIPTION_EVENT_CHANGE, c->index);
+ pa_log_info("Successfully changed profile of card %u \"%s\" to %s", c->index, c->name, profile->name);
+
+ c->active_profile = profile;
+
return 0;
}
commit 28f05e0435360e517c9c0426f14a9090f07787ec
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Jan 21 01:59:59 2009 +0100
remove leftover define
diff --git a/src/modules/alsa/module-alsa-source.c b/src/modules/alsa/module-alsa-source.c
index a3b5715..468a126 100644
--- a/src/modules/alsa/module-alsa-source.c
+++ b/src/modules/alsa/module-alsa-source.c
@@ -93,8 +93,6 @@ static const char* const valid_modargs[] = {
NULL
};
-#define DEFAULT_DEVICE "default"
-
int pa__init(pa_module*m) {
pa_modargs *ma = NULL;
commit 7ca0e00a2c81bed61b0f5d0185b2458c416991fb
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Jan 21 02:01:44 2009 +0100
fill in dev_id properly
diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
index 9556915..e890ef7 100644
--- a/src/modules/alsa/alsa-sink.c
+++ b/src/modules/alsa/alsa-sink.c
@@ -1204,7 +1204,7 @@ finish:
pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const pa_alsa_profile_info *profile) {
struct userdata *u = NULL;
- const char *dev_id;
+ const char *dev_id = NULL;
pa_sample_spec ss;
pa_channel_map map;
uint32_t nfrags, hwbuf_size, frag_size, tsched_size, tsched_watermark;
@@ -1222,6 +1222,7 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const pa_alsa_profile_in
snd_pcm_info_alloca(&pcm_info);
pa_assert(m);
+ pa_assert(ma);
ss = m->core->default_sample_spec;
if (pa_modargs_get_sample_spec_and_channel_map(ma, &ss, &map, PA_CHANNEL_MAP_ALSA) < 0) {
@@ -1287,6 +1288,11 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const pa_alsa_profile_in
if (profile) {
+ if (!(dev_id = pa_modargs_get_value(ma, "device_id", NULL))) {
+ pa_log("device_id= not set");
+ goto fail;
+ }
+
if (!(u->pcm_handle = pa_alsa_open_by_device_id_profile(
dev_id,
&u->device_name,
diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c
index c0bf20d..f4d9738 100644
--- a/src/modules/alsa/alsa-source.c
+++ b/src/modules/alsa/alsa-source.c
@@ -1039,7 +1039,7 @@ finish:
pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const pa_alsa_profile_info *profile) {
struct userdata *u = NULL;
- const char *dev_id;
+ const char *dev_id = NULL;
pa_sample_spec ss;
pa_channel_map map;
uint32_t nfrags, hwbuf_size, frag_size, tsched_size, tsched_watermark;
@@ -1116,6 +1116,11 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const pa_alsa_profil
if (profile) {
+ if (!(dev_id = pa_modargs_get_value(ma, "device_id", NULL))) {
+ pa_log("device_id= not set");
+ goto fail;
+ }
+
if (!(u->pcm_handle = pa_alsa_open_by_device_id_profile(
dev_id,
&u->device_name,
commit e8f93b125e0e0776024ae78a2bdd33daf4442326
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Jan 21 02:02:30 2009 +0100
make implementation of module-alsa-card complete
diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
index e890ef7..e6b3e0e 100644
--- a/src/modules/alsa/alsa-sink.c
+++ b/src/modules/alsa/alsa-sink.c
@@ -1201,7 +1201,7 @@ finish:
pa_log_debug("Thread shutting down");
}
-pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const pa_alsa_profile_info *profile) {
+pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_card *card, const pa_alsa_profile_info *profile) {
struct userdata *u = NULL;
const char *dev_id = NULL;
@@ -1372,11 +1372,11 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const pa_alsa_profile_in
if (snd_pcm_info(u->pcm_handle, info) >= 0) {
char *md;
- int card;
+ int card_idx;
- if ((card = snd_pcm_info_get_card(info)) >= 0) {
+ if ((card_idx = snd_pcm_info_get_card(info)) >= 0) {
- md = pa_sprintf_malloc("hw:%i", card);
+ md = pa_sprintf_malloc("hw:%i", card_idx);
if (strcmp(u->device_name, md))
if (pa_alsa_prepare_mixer(u->mixer_handle, md) >= 0)
@@ -1407,8 +1407,9 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const pa_alsa_profile_in
}
pa_sink_new_data_init(&data);
- data.driver = __FILE__;
+ data.driver = driver;
data.module = m;
+ data.card = card;
pa_sink_new_data_set_name(&data, name);
data.namereg_fail = namereg_fail;
pa_sink_new_data_set_sample_spec(&data, &ss);
diff --git a/src/modules/alsa/alsa-sink.h b/src/modules/alsa/alsa-sink.h
index e503201..47ece9e 100644
--- a/src/modules/alsa/alsa-sink.h
+++ b/src/modules/alsa/alsa-sink.h
@@ -29,7 +29,7 @@
#include "alsa-util.h"
-pa_sink* pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const pa_alsa_profile_info *profile);
+pa_sink* pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_card *card, const pa_alsa_profile_info *profile);
void pa_alsa_sink_free(pa_sink *s);
diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c
index f4d9738..29145f6 100644
--- a/src/modules/alsa/alsa-source.c
+++ b/src/modules/alsa/alsa-source.c
@@ -1036,7 +1036,7 @@ finish:
pa_log_debug("Thread shutting down");
}
-pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const pa_alsa_profile_info *profile) {
+pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, pa_card *card, const pa_alsa_profile_info *profile) {
struct userdata *u = NULL;
const char *dev_id = NULL;
@@ -1197,11 +1197,11 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const pa_alsa_profil
if (snd_pcm_info(u->pcm_handle, info) >= 0) {
char *md;
- int card;
+ int card_idx;
- if ((card = snd_pcm_info_get_card(info)) >= 0) {
+ if ((card_idx = snd_pcm_info_get_card(info)) >= 0) {
- md = pa_sprintf_malloc("hw:%i", card);
+ md = pa_sprintf_malloc("hw:%i", card_idx);
if (strcmp(u->device_name, md))
if (pa_alsa_prepare_mixer(u->mixer_handle, md) >= 0)
@@ -1223,14 +1223,18 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const pa_alsa_profil
if ((name = pa_modargs_get_value(ma, "source_name", NULL)))
namereg_fail = TRUE;
- else {
+ else if ((name = pa_modargs_get_value(ma, "name", NULL))) {
+ name = name_buf = pa_sprintf_malloc("alsa_input.%s", name);
+ namereg_fail = TRUE;
+ } else {
name = name_buf = pa_sprintf_malloc("alsa_input.%s", u->device_name);
namereg_fail = FALSE;
}
pa_source_new_data_init(&data);
- data.driver = __FILE__;
+ data.driver = driver;
data.module = m;
+ data.card = card;
pa_source_new_data_set_name(&data, name);
data.namereg_fail = namereg_fail;
pa_source_new_data_set_sample_spec(&data, &ss);
diff --git a/src/modules/alsa/alsa-source.h b/src/modules/alsa/alsa-source.h
index bdb24d1..5fed6cc 100644
--- a/src/modules/alsa/alsa-source.h
+++ b/src/modules/alsa/alsa-source.h
@@ -29,7 +29,7 @@
#include "alsa-util.h"
-pa_source* pa_alsa_source_new(pa_module *m, pa_modargs *ma, const pa_alsa_profile_info *profile);
+pa_source* pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, pa_card *card, const pa_alsa_profile_info *profile);
void pa_alsa_source_free(pa_source *s);
diff --git a/src/modules/alsa/module-alsa-card.c b/src/modules/alsa/module-alsa-card.c
index 6c947c0..f250602 100644
--- a/src/modules/alsa/module-alsa-card.c
+++ b/src/modules/alsa/module-alsa-card.c
@@ -28,6 +28,8 @@
#include <pulsecore/modargs.h>
#include "alsa-util.h"
+#include "alsa-sink.h"
+#include "alsa-source.h"
#include "module-alsa-card-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering");
@@ -48,19 +50,17 @@ PA_MODULE_USAGE(
"profile=<profile name>");
static const char* const valid_modargs[] = {
- "sink_name",
- "device",
+ "name",
"device_id",
"format",
"rate",
- "channels",
- "channel_map",
"fragments",
"fragment_size",
"mmap",
"tsched",
"tsched_buffer_size",
"tsched_buffer_watermark",
+ "profile",
NULL
};
@@ -73,10 +73,14 @@ struct userdata {
char *device_id;
pa_card *card;
+ pa_sink *sink;
+ pa_source *source;
+
+ pa_modargs *modargs;
};
struct profile_data {
- const pa_alsa_profile_info *sink, *source;
+ const pa_alsa_profile_info *sink_profile, *source_profile;
};
static void enumerate_cb(
@@ -119,8 +123,8 @@ static void enumerate_cb(
d = PA_CARD_PROFILE_DATA(p);
- d->sink = sink;
- d->source = source;
+ d->sink_profile = sink;
+ d->source_profile = source;
pa_hashmap_put(profiles, p->name, p);
}
@@ -132,11 +136,59 @@ static void add_disabled_profile(pa_hashmap *profiles) {
p = pa_card_profile_new("off", "Off", sizeof(struct profile_data));
d = PA_CARD_PROFILE_DATA(p);
- d->sink = d->source = NULL;
+ d->sink_profile = d->source_profile = NULL;
pa_hashmap_put(profiles, p->name, p);
}
+static int card_set_profile(pa_card *c, pa_card_profile *new_profile) {
+ struct userdata *u;
+ struct profile_data *nd, *od;
+
+ pa_assert(c);
+ pa_assert(new_profile);
+ pa_assert_se(u = c->userdata);
+
+ nd = PA_CARD_PROFILE_DATA(new_profile);
+ od = PA_CARD_PROFILE_DATA(c->active_profile);
+
+ if (od->sink_profile != nd->sink_profile) {
+ if (u->sink) {
+ pa_alsa_sink_free(u->sink);
+ u->sink = NULL;
+ }
+
+ if (nd->sink_profile)
+ u->sink = pa_alsa_sink_new(c->module, u->modargs, __FILE__, c, nd->sink_profile);
+ }
+
+ if (od->source_profile != nd->source_profile) {
+ if (u->source) {
+ pa_alsa_source_free(u->source);
+ u->source = NULL;
+ }
+
+ if (nd->source_profile)
+ u->source = pa_alsa_source_new(c->module, u->modargs, __FILE__, c, nd->source_profile);
+ }
+
+ return 0;
+}
+
+static void init_profile(struct userdata *u) {
+ struct profile_data *d;
+
+ pa_assert(u);
+
+ d = PA_CARD_PROFILE_DATA(u->card->active_profile);
+
+ if (d->sink_profile)
+ u->sink = pa_alsa_sink_new(u->module, u->modargs, __FILE__, u->card, d->sink_profile);
+
+ if (d->source_profile)
+ u->source = pa_alsa_source_new(u->module, u->modargs, __FILE__, u->card, d->source_profile);
+}
+
int pa__init(pa_module*m) {
pa_card_new_data data;
pa_modargs *ma;
@@ -144,6 +196,7 @@ int pa__init(pa_module*m) {
struct userdata *u;
pa_alsa_redirect_errors_inc();
+ snd_config_update_free_global();
pa_assert(m);
@@ -152,10 +205,14 @@ int pa__init(pa_module*m) {
goto fail;
}
- m->userdata = u = pa_xnew0(struct userdata, 1);
+ m->userdata = u = pa_xnew(struct userdata, 1);
u->core = m->core;
u->module = m;
u->device_id = pa_xstrdup(pa_modargs_get_value(ma, "device_id", DEFAULT_DEVICE_ID));
+ u->card = NULL;
+ u->sink = NULL;
+ u->source = NULL;
+ u->modargs = ma;
if ((alsa_card_index = snd_card_get_index(u->device_id)) < 0) {
pa_log("Card '%s' doesn't exist: %s", u->device_id, snd_strerror(alsa_card_index));
@@ -186,17 +243,33 @@ int pa__init(pa_module*m) {
u->card = pa_card_new(m->core, &data);
pa_card_new_data_done(&data);
+ if (!u->card)
+ goto fail;
+
+ u->card->userdata = u;
+ u->card->set_profile = card_set_profile;
+
+ init_profile(u);
+
return 0;
fail:
- if (ma)
- pa_modargs_free(ma);
-
pa__done(m);
return -1;
}
+int pa__get_n_used(pa_module *m) {
+ struct userdata *u;
+
+ pa_assert(m);
+ pa_assert_se(u = m->userdata);
+
+ return
+ (u->sink ? pa_sink_linked_by(u->sink) : 0) +
+ (u->source ? pa_source_linked_by(u->source) : 0);
+}
+
void pa__done(pa_module*m) {
struct userdata *u;
@@ -205,9 +278,18 @@ void pa__done(pa_module*m) {
if (!(u = m->userdata))
goto finish;
+ if (u->sink)
+ pa_alsa_sink_free(u->sink);
+
+ if (u->source)
+ pa_alsa_source_free(u->source);
+
if (u->card)
pa_card_free(u->card);
+ if (u->modargs)
+ pa_modargs_free(u->modargs);
+
pa_xfree(u->device_id);
pa_xfree(u);
diff --git a/src/modules/alsa/module-alsa-sink.c b/src/modules/alsa/module-alsa-sink.c
index f8303a5..6a66ad3 100644
--- a/src/modules/alsa/module-alsa-sink.c
+++ b/src/modules/alsa/module-alsa-sink.c
@@ -82,7 +82,7 @@ int pa__init(pa_module*m) {
goto fail;
}
- if (!(m->userdata = pa_alsa_sink_new(m, ma, NULL)))
+ if (!(m->userdata = pa_alsa_sink_new(m, ma, __FILE__, NULL, NULL)))
goto fail;
pa_modargs_free(ma);
diff --git a/src/modules/alsa/module-alsa-source.c b/src/modules/alsa/module-alsa-source.c
index 468a126..7dc22fe 100644
--- a/src/modules/alsa/module-alsa-source.c
+++ b/src/modules/alsa/module-alsa-source.c
@@ -106,7 +106,7 @@ int pa__init(pa_module*m) {
goto fail;
}
- if (!(m->userdata = pa_alsa_source_new(m, ma, NULL)))
+ if (!(m->userdata = pa_alsa_source_new(m, ma, __FILE__, NULL, NULL)))
goto fail;
pa_modargs_free(ma);
--
hooks/post-receive
PulseAudio Sound Server
More information about the pulseaudio-commits
mailing list