mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-06 13:29:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

minor cleanups

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1560 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-07-28 23:49:39 +00:00
parent 6afbbba102
commit 13a4327c1f
1 changed files with 11 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/modules/module-alsa-sink.c
View file

@ -564,7 +564,7 @@ static void thread_func(void *userdata) {
pa_assert(u->memchunk.length > 0); pa_assert(u->memchunk.length > 0);
p = pa_memblock_acquire(u->memchunk.memblock); p = pa_memblock_acquire(u->memchunk.memblock);
t = snd_pcm_writei(u->pcm_handle, (uint8_t*) p + u->memchunk.index, u->memchunk.length / u->frame_size); t = snd_pcm_writei(u->pcm_handle, (const uint8_t*) p + u->memchunk.index, u->memchunk.length / u->frame_size);
pa_memblock_release(u->memchunk.memblock); pa_memblock_release(u->memchunk.memblock);
/* pa_log("wrote %i bytes of %u (%u)", t*u->frame_size, u->memchunk.length, l); */ /* pa_log("wrote %i bytes of %u (%u)", t*u->frame_size, u->memchunk.length, l); */
@ -654,11 +654,6 @@ static void thread_func(void *userdata) {
} else } else
revents = 0; revents = 0;
if (revents & ~(POLLOUT|POLLERR)) {
pa_log("DSP shutdown.");
goto fail;
}
pa_assert((pollfd[POLLFD_ASYNCQ].revents & ~POLLIN) == 0); pa_assert((pollfd[POLLFD_ASYNCQ].revents & ~POLLIN) == 0);
} }
@ -697,13 +692,13 @@ int pa__init(pa_core *c, pa_module*m) {
pa_assert(m); pa_assert(m);
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) { if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
pa_log("failed to parse module arguments"); pa_log("Failed to parse module arguments");
goto fail; goto fail;
} }
ss = c->default_sample_spec; ss = c->default_sample_spec;
if (pa_modargs_get_sample_spec_and_channel_map(ma, &ss, &map, PA_CHANNEL_MAP_ALSA) < 0) { 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"); pa_log("Failed to parse sample specification and channel map");
goto fail; goto fail;
} }
@ -715,7 +710,7 @@ int pa__init(pa_core *c, pa_module*m) {
frag_size = frame_size; frag_size = frame_size;
if (pa_modargs_get_value_u32(ma, "fragments", &nfrags) < 0 || pa_modargs_get_value_u32(ma, "fragment_size", &frag_size) < 0) { if (pa_modargs_get_value_u32(ma, "fragments", &nfrags) < 0 || pa_modargs_get_value_u32(ma, "fragment_size", &frag_size) < 0) {
pa_log("failed to parse buffer metrics"); pa_log("Failed to parse buffer metrics");
goto fail; goto fail;
} }
period_size = frag_size/frame_size; period_size = frag_size/frame_size;
@ -809,7 +804,7 @@ int pa__init(pa_core *c, pa_module*m) {
u->sink->is_hardware = 1; u->sink->is_hardware = 1;
u->frame_size = frame_size; u->frame_size = frame_size;
u->fragment_size = period_size * frame_size; u->fragment_size = frag_size = period_size * frame_size;
u->nfragments = nfrags; u->nfragments = nfrags;
u->hwbuf_size = u->fragment_size * nfrags; u->hwbuf_size = u->fragment_size * nfrags;
@ -836,13 +831,13 @@ int pa__init(pa_core *c, pa_module*m) {
snd_mixer_selem_get_playback_volume_range(u->mixer_elem, &u->hw_volume_min, &u->hw_volume_max); snd_mixer_selem_get_playback_volume_range(u->mixer_elem, &u->hw_volume_min, &u->hw_volume_max);
} }
} }
if (snd_mixer_selem_has_playback_switch(u->mixer_elem)) { if (snd_mixer_selem_has_playback_switch(u->mixer_elem)) {
u->sink->get_mute = sink_get_mute_cb; u->sink->get_mute = sink_get_mute_cb;
u->sink->set_mute = sink_set_mute_cb; u->sink->set_mute = sink_set_mute_cb;
} }
u->mixer_fdl = pa_alsa_fdlist_new(); u->mixer_fdl = pa_alsa_fdlist_new();
pa_assert(u->mixer_fdl);
if (pa_alsa_fdlist_set_mixer(u->mixer_fdl, u->mixer_handle, c->mainloop) < 0) { if (pa_alsa_fdlist_set_mixer(u->mixer_fdl, u->mixer_handle, c->mainloop) < 0) {
pa_log("failed to initialise file descriptor monitoring"); pa_log("failed to initialise file descriptor monitoring");
@ -854,7 +849,6 @@ int pa__init(pa_core *c, pa_module*m) {
} else } else
u->mixer_fdl = NULL; u->mixer_fdl = NULL;
if (!(u->thread = pa_thread_new(thread_func, u))) { if (!(u->thread = pa_thread_new(thread_func, u))) {
pa_log("Failed to create thread."); pa_log("Failed to create thread.");
goto fail; goto fail;
@ -872,9 +866,9 @@ finish:
if (ma) if (ma)
pa_modargs_free(ma); pa_modargs_free(ma);
if (pcm_info) if (pcm_info)
snd_pcm_info_free(pcm_info); snd_pcm_info_free(pcm_info);
return ret; return ret;
@ -924,9 +918,8 @@ void pa__done(pa_core *c, pa_module*m) {
} }
pa_xfree(u->device_name); pa_xfree(u->device_name);
snd_config_update_free_global();
pa_xfree(u); pa_xfree(u);
snd_config_update_free_global();
} }