diff options
| author | Lennart Poettering <lennart@poettering.net> | 2008-04-11 16:33:33 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2008-04-11 16:33:33 +0000 |
| commit | 78368db54f1e47dd4d7c74142d1a7abebb85f8bb (patch) | |
| tree | 2b8d9e4a0983dd06b9ae11e61845fbe2648959c6 /src/modules/module-alsa-source.c | |
| parent | 1c5f66519d06b65099c89e44a40c8ba070c0ca64 (diff) | |
redirect alsa errors to normal PA log system; export buffer settings in device props
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/glitch-free@2246 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/modules/module-alsa-source.c')
| -rw-r--r-- | src/modules/module-alsa-source.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/modules/module-alsa-source.c b/src/modules/module-alsa-source.c index caaa5458..83b7f53a 100644 --- a/src/modules/module-alsa-source.c +++ b/src/modules/module-alsa-source.c @@ -61,7 +61,7 @@ PA_MODULE_LOAD_ONCE(FALSE); PA_MODULE_USAGE( "source_name=<name for the source> " "device=<ALSA device> " - "device_id=<ALSA device id> " + "device_id=<ALSA card index> " "format=<sample format> " "rate=<sample rate> " "channels=<number of channels> " @@ -889,6 +889,8 @@ int pa__init(pa_module*m) { 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; @@ -1061,6 +1063,8 @@ int pa__init(pa_module*m) { pa_proplist_sets(data.proplist, PA_PROP_DEVICE_STRING, u->device_name); pa_proplist_sets(data.proplist, PA_PROP_DEVICE_API, "alsa"); pa_proplist_sets(data.proplist, PA_PROP_DEVICE_DESCRIPTION, snd_pcm_info_get_name(pcm_info)); + 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)); if (class_table[snd_pcm_info_get_class(pcm_info)]) pa_proplist_sets(data.proplist, PA_PROP_DEVICE_CLASS, class_table[snd_pcm_info_get_class(pcm_info)]); @@ -1228,8 +1232,10 @@ void pa__done(pa_module*m) { pa_assert(m); - if (!(u = m->userdata)) + if (!(u = m->userdata)) { + pa_alsa_redirect_errors_dec(); return; + } if (u->source) pa_source_unlink(u->source); @@ -1268,4 +1274,5 @@ void pa__done(pa_module*m) { pa_xfree(u); snd_config_update_free_global(); + pa_alsa_redirect_errors_dec(); } |