diff options
| author | Lennart Poettering <lennart@poettering.net> | 2006-02-21 23:56:46 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2006-02-21 23:56:46 +0000 |
| commit | 8d882644be745509ee4cc1d02c8c524977195ebf (patch) | |
| tree | 4a540e2553d78ba397c9c38f6d3b987b8eee5363 /src | |
| parent | 5014db91d55ce1b4f6b3691f6fd75078da588a40 (diff) | |
add hw info to description for oss-mmap, too
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@557 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/module-oss-mmap.c | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/src/modules/module-oss-mmap.c b/src/modules/module-oss-mmap.c index 617e51e2..82f65a3c 100644 --- a/src/modules/module-oss-mmap.c +++ b/src/modules/module-oss-mmap.c @@ -254,7 +254,10 @@ int pa__init(pa_core *c, pa_module*m) { int enable_bits = 0, zero = 0; int playback = 1, record = 1; pa_modargs *ma = NULL; - assert(c && m); + char hwdesc[64]; + + assert(c); + assert(m); m->userdata = u = pa_xmalloc0(sizeof(struct userdata)); u->module = m; @@ -294,6 +297,11 @@ int pa__init(pa_core *c, pa_module*m) { if ((u->fd = pa_oss_open(p = pa_modargs_get_value(ma, "device", DEFAULT_DEVICE), &mode, &caps)) < 0) goto fail; + if (pa_oss_get_hw_description(p, hwdesc, sizeof(hwdesc)) >= 0) + pa_log_info(__FILE__": hardware name is '%s'.\n", hwdesc); + else + hwdesc[0] = 0; + if (!(caps & DSP_CAP_MMAP) || !(caps & DSP_CAP_REALTIME) || !(caps & DSP_CAP_TRIGGER)) { pa_log(__FILE__": OSS device not mmap capable.\n"); goto fail; @@ -331,7 +339,11 @@ int pa__init(pa_core *c, pa_module*m) { assert(u->source); u->source->userdata = u; pa_source_set_owner(u->source, m); - u->source->description = pa_sprintf_malloc("Open Sound System PCM/mmap() on '%s'", p); + u->source->description = pa_sprintf_malloc("Open Sound System PCM/mmap() on '%s'%s%s%s", + p, + hwdesc[0] ? " (" : "", + hwdesc[0] ? hwdesc : "", + hwdesc[0] ? ")" : ""); u->in_memblocks = pa_xmalloc0(sizeof(pa_memblock *)*u->in_fragments); @@ -366,7 +378,11 @@ int pa__init(pa_core *c, pa_module*m) { u->sink->set_hw_volume = sink_set_hw_volume; u->sink->userdata = u; pa_sink_set_owner(u->sink, m); - u->sink->description = pa_sprintf_malloc("Open Sound System PCM/mmap() on '%s'", p); + u->sink->description = pa_sprintf_malloc("Open Sound System PCM/mmap() on '%s'%s%s%s", + p, + hwdesc[0] ? " (" : "", + hwdesc[0] ? hwdesc : "", + hwdesc[0] ? ")" : ""); u->out_memblocks = pa_xmalloc0(sizeof(struct memblock *)*u->out_fragments); |