From bdfbbed5ca671461628e30ae439beca480f667f2 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Sun, 11 Dec 2005 08:24:13 +0000 Subject: [PATCH] pcm dump() routines update: use spaces to indent texts --- src/pcm/pcm.c | 56 ++++++++++++++++++++++---------------------- src/pcm/pcm_dmix.c | 2 +- src/pcm/pcm_dshare.c | 2 +- src/pcm/pcm_dsnoop.c | 2 +- src/pcm/pcm_hw.c | 2 +- src/pcm/pcm_ladspa.c | 7 +----- src/pcm/pcm_multi.c | 8 +++---- src/pcm/pcm_route.c | 4 ++-- src/pcm/pcm_share.c | 6 ++--- src/pcm/pcm_shm.c | 2 +- 10 files changed, 43 insertions(+), 48 deletions(-) diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c index 9ca150b3..79102203 100644 --- a/src/pcm/pcm.c +++ b/src/pcm/pcm.c @@ -1734,18 +1734,18 @@ int snd_pcm_dump_hw_setup(snd_pcm_t *pcm, snd_output_t *out) SNDMSG("PCM not set up"); return -EIO; } - snd_output_printf(out, "stream : %s\n", snd_pcm_stream_name(pcm->stream)); - snd_output_printf(out, "access : %s\n", snd_pcm_access_name(pcm->access)); - snd_output_printf(out, "format : %s\n", snd_pcm_format_name(pcm->format)); - snd_output_printf(out, "subformat : %s\n", snd_pcm_subformat_name(pcm->subformat)); - snd_output_printf(out, "channels : %u\n", pcm->channels); - snd_output_printf(out, "rate : %u\n", pcm->rate); - snd_output_printf(out, "exact rate : %g (%u/%u)\n", (double) pcm->rate_num / pcm->rate_den, pcm->rate_num, pcm->rate_den); - snd_output_printf(out, "msbits : %u\n", pcm->msbits); - snd_output_printf(out, "buffer_size : %lu\n", pcm->buffer_size); - snd_output_printf(out, "period_size : %lu\n", pcm->period_size); - snd_output_printf(out, "period_time : %u\n", pcm->period_time); - snd_output_printf(out, "tick_time : %u\n", pcm->tick_time); + snd_output_printf(out, " stream : %s\n", snd_pcm_stream_name(pcm->stream)); + snd_output_printf(out, " access : %s\n", snd_pcm_access_name(pcm->access)); + snd_output_printf(out, " format : %s\n", snd_pcm_format_name(pcm->format)); + snd_output_printf(out, " subformat : %s\n", snd_pcm_subformat_name(pcm->subformat)); + snd_output_printf(out, " channels : %u\n", pcm->channels); + snd_output_printf(out, " rate : %u\n", pcm->rate); + snd_output_printf(out, " exact rate : %g (%u/%u)\n", (double) pcm->rate_num / pcm->rate_den, pcm->rate_num, pcm->rate_den); + snd_output_printf(out, " msbits : %u\n", pcm->msbits); + snd_output_printf(out, " buffer_size : %lu\n", pcm->buffer_size); + snd_output_printf(out, " period_size : %lu\n", pcm->period_size); + snd_output_printf(out, " period_time : %u\n", pcm->period_time); + snd_output_printf(out, " tick_time : %u\n", pcm->tick_time); return 0; } @@ -1763,16 +1763,16 @@ int snd_pcm_dump_sw_setup(snd_pcm_t *pcm, snd_output_t *out) SNDMSG("PCM not set up"); return -EIO; } - snd_output_printf(out, "tstamp_mode : %s\n", snd_pcm_tstamp_mode_name(pcm->tstamp_mode)); - snd_output_printf(out, "period_step : %d\n", pcm->period_step); - snd_output_printf(out, "sleep_min : %d\n", pcm->sleep_min); - snd_output_printf(out, "avail_min : %ld\n", pcm->avail_min); - snd_output_printf(out, "xfer_align : %ld\n", pcm->xfer_align); - snd_output_printf(out, "start_threshold : %ld\n", pcm->start_threshold); - snd_output_printf(out, "stop_threshold : %ld\n", pcm->stop_threshold); - snd_output_printf(out, "silence_threshold: %ld\n", pcm->silence_threshold); - snd_output_printf(out, "silence_size : %ld\n", pcm->silence_size); - snd_output_printf(out, "boundary : %ld\n", pcm->boundary); + snd_output_printf(out, " tstamp_mode : %s\n", snd_pcm_tstamp_mode_name(pcm->tstamp_mode)); + snd_output_printf(out, " period_step : %d\n", pcm->period_step); + snd_output_printf(out, " sleep_min : %d\n", pcm->sleep_min); + snd_output_printf(out, " avail_min : %ld\n", pcm->avail_min); + snd_output_printf(out, " xfer_align : %ld\n", pcm->xfer_align); + snd_output_printf(out, " start_threshold : %ld\n", pcm->start_threshold); + snd_output_printf(out, " stop_threshold : %ld\n", pcm->stop_threshold); + snd_output_printf(out, " silence_threshold: %ld\n", pcm->silence_threshold); + snd_output_printf(out, " silence_size : %ld\n", pcm->silence_size); + snd_output_printf(out, " boundary : %ld\n", pcm->boundary); return 0; } @@ -1798,14 +1798,14 @@ int snd_pcm_dump_setup(snd_pcm_t *pcm, snd_output_t *out) int snd_pcm_status_dump(snd_pcm_status_t *status, snd_output_t *out) { assert(status); - snd_output_printf(out, "state : %s\n", snd_pcm_state_name((snd_pcm_state_t) status->state)); - snd_output_printf(out, "trigger_time: %ld.%06ld\n", + snd_output_printf(out, " state : %s\n", snd_pcm_state_name((snd_pcm_state_t) status->state)); + snd_output_printf(out, " trigger_time: %ld.%06ld\n", status->trigger_tstamp.tv_sec, status->trigger_tstamp.tv_nsec); - snd_output_printf(out, "tstamp : %ld.%06ld\n", + snd_output_printf(out, " tstamp : %ld.%06ld\n", status->tstamp.tv_sec, status->tstamp.tv_nsec); - snd_output_printf(out, "delay : %ld\n", (long)status->delay); - snd_output_printf(out, "avail : %ld\n", (long)status->avail); - snd_output_printf(out, "avail_max : %ld\n", (long)status->avail_max); + snd_output_printf(out, " delay : %ld\n", (long)status->delay); + snd_output_printf(out, " avail : %ld\n", (long)status->avail); + snd_output_printf(out, " avail_max : %ld\n", (long)status->avail_max); return 0; } diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c index c1d02d18..2f35d32e 100644 --- a/src/pcm/pcm_dmix.c +++ b/src/pcm/pcm_dmix.c @@ -680,7 +680,7 @@ static void snd_pcm_dmix_dump(snd_pcm_t *pcm, snd_output_t *out) snd_output_printf(out, "Direct Stream Mixing PCM\n"); if (pcm->setup) { - snd_output_printf(out, "\nIts setup is:\n"); + snd_output_printf(out, "Its setup is:\n"); snd_pcm_dump_setup(pcm, out); } if (dmix->spcm) diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c index 7265d7c1..c732b175 100644 --- a/src/pcm/pcm_dshare.c +++ b/src/pcm/pcm_dshare.c @@ -525,7 +525,7 @@ static void snd_pcm_dshare_dump(snd_pcm_t *pcm, snd_output_t *out) snd_output_printf(out, "Direct Share PCM\n"); if (pcm->setup) { - snd_output_printf(out, "\nIts setup is:\n"); + snd_output_printf(out, "Its setup is:\n"); snd_pcm_dump_setup(pcm, out); } if (dshare->spcm) diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c index 1cbf4bc7..3e64889b 100644 --- a/src/pcm/pcm_dsnoop.c +++ b/src/pcm/pcm_dsnoop.c @@ -415,7 +415,7 @@ static void snd_pcm_dsnoop_dump(snd_pcm_t *pcm, snd_output_t *out) snd_output_printf(out, "Direct Snoop PCM\n"); if (pcm->setup) { - snd_output_printf(out, "\nIts setup is:\n"); + snd_output_printf(out, "Its setup is:\n"); snd_pcm_dump_setup(pcm, out); } if (dsnoop->spcm) diff --git a/src/pcm/pcm_hw.c b/src/pcm/pcm_hw.c index d50fec1d..66426887 100644 --- a/src/pcm/pcm_hw.c +++ b/src/pcm/pcm_hw.c @@ -986,7 +986,7 @@ static void snd_pcm_hw_dump(snd_pcm_t *pcm, snd_output_t *out) hw->card, name, hw->device, hw->subdevice); free(name); if (pcm->setup) { - snd_output_printf(out, "\nIts setup is:\n"); + snd_output_printf(out, "Its setup is:\n"); snd_pcm_dump_setup(pcm, out); } } diff --git a/src/pcm/pcm_ladspa.c b/src/pcm/pcm_ladspa.c index 49dd4784..dfde01e2 100644 --- a/src/pcm/pcm_ladspa.c +++ b/src/pcm/pcm_ladspa.c @@ -3,7 +3,7 @@ * \ingroup PCM_Plugins * \brief ALSA Plugin <-> LADSPA Plugin Interface * \author Jaroslav Kysela - * \date 2001 + * \date 2001,2005 */ /* * PCM - LADSPA integration plugin @@ -59,11 +59,6 @@ typedef struct { snd_pcm_ladspa_instance_t **finstances; } snd_pcm_ladspa_t; -typedef struct { - struct list_head list; - LADSPA_Handle *handle; -} snd_pcm_ladspa_subinstance_t; - struct snd_pcm_ladspa_instance { struct list_head list; const LADSPA_Descriptor *desc; diff --git a/src/pcm/pcm_multi.c b/src/pcm/pcm_multi.c index f7a018b4..c2ade361 100644 --- a/src/pcm/pcm_multi.c +++ b/src/pcm/pcm_multi.c @@ -675,20 +675,20 @@ static void snd_pcm_multi_dump(snd_pcm_t *pcm, snd_output_t *out) snd_pcm_multi_t *multi = pcm->private_data; unsigned int k; snd_output_printf(out, "Multi PCM\n"); - snd_output_printf(out, "\nChannel bindings:\n"); + snd_output_printf(out, " Channel bindings:\n"); for (k = 0; k < multi->channels_count; ++k) { snd_pcm_multi_channel_t *c = &multi->channels[k]; if (c->slave_idx < 0) continue; - snd_output_printf(out, "%d: slave %d, channel %d\n", + snd_output_printf(out, " %d: slave %d, channel %d\n", k, c->slave_idx, c->slave_channel); } if (pcm->setup) { - snd_output_printf(out, "\nIts setup is:\n"); + snd_output_printf(out, "Its setup is:\n"); snd_pcm_dump_setup(pcm, out); } for (k = 0; k < multi->slaves_count; ++k) { - snd_output_printf(out, "\nSlave #%d: ", k); + snd_output_printf(out, "Slave #%d: ", k); snd_pcm_dump(multi->slaves[k].pcm, out); } } diff --git a/src/pcm/pcm_route.c b/src/pcm/pcm_route.c index 28268865..42070d68 100644 --- a/src/pcm/pcm_route.c +++ b/src/pcm/pcm_route.c @@ -711,11 +711,11 @@ static void snd_pcm_route_dump(snd_pcm_t *pcm, snd_output_t *out) else snd_output_printf(out, "Route conversion PCM (sformat=%s)\n", snd_pcm_format_name(route->sformat)); - snd_output_puts(out, "Transformation table:\n"); + snd_output_puts(out, " Transformation table:\n"); for (dst = 0; dst < route->params.ndsts; dst++) { snd_pcm_route_ttable_dst_t *d = &route->params.dsts[dst]; unsigned int src; - snd_output_printf(out, "%d <- ", dst); + snd_output_printf(out, " %d <- ", dst); if (d->nsrcs == 0) { snd_output_printf(out, "none\n"); continue; diff --git a/src/pcm/pcm_share.c b/src/pcm/pcm_share.c index 2ae6bf57..d73fb8b2 100644 --- a/src/pcm/pcm_share.c +++ b/src/pcm/pcm_share.c @@ -1276,11 +1276,11 @@ static void snd_pcm_share_dump(snd_pcm_t *pcm, snd_output_t *out) snd_pcm_share_slave_t *slave = share->slave; unsigned int k; snd_output_printf(out, "Share PCM\n"); - snd_output_printf(out, "\nChannel bindings:\n"); + snd_output_printf(out, " Channel bindings:\n"); for (k = 0; k < share->channels; ++k) - snd_output_printf(out, "%d: %d\n", k, share->slave_channels[k]); + snd_output_printf(out, " %d: %d\n", k, share->slave_channels[k]); if (pcm->setup) { - snd_output_printf(out, "\nIts setup is:\n"); + snd_output_printf(out, "Its setup is:\n"); snd_pcm_dump_setup(pcm, out); } snd_output_printf(out, "Slave: "); diff --git a/src/pcm/pcm_shm.c b/src/pcm/pcm_shm.c index ad57f0f0..0640c4bb 100644 --- a/src/pcm/pcm_shm.c +++ b/src/pcm/pcm_shm.c @@ -569,7 +569,7 @@ static void snd_pcm_shm_dump(snd_pcm_t *pcm, snd_output_t *out) { snd_output_printf(out, "Shm PCM\n"); if (pcm->setup) { - snd_output_printf(out, "\nIts setup is:\n"); + snd_output_printf(out, "Its setup is:\n"); snd_pcm_dump_setup(pcm, out); } } -- 2.47.1