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

pw-cat: redirect verbose output to stderr

Browse source 
So that it doesn't interfere with the stdout output when using a
pipe.
This commit is contained in:
Wim Taymans 2024-08-23 15:31:36 +02:00
parent b13705d6de
commit 3dfecf18d6
1 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

54
src/tools/pw-cat.c
View file

@ -678,7 +678,7 @@ static void channelmap_print(struct channelmap *map)
const char *name = spa_debug_type_find_name(spa_type_audio_channel, map->channels[i]); const char *name = spa_debug_type_find_name(spa_type_audio_channel, map->channels[i]);
if (name == NULL) if (name == NULL)
name = ":UNK"; name = ":UNK";
printf("%s%s", spa_debug_type_short_name(name), i + 1 < map->n_channels ? "," : ""); fprintf(stderr, "%s%s", spa_debug_type_short_name(name), i + 1 < map->n_channels ? "," : "");
} }
} }
@ -687,7 +687,7 @@ static void on_core_info(void *userdata, const struct pw_core_info *info)
struct data *data = userdata; struct data *data = userdata;
if (data->verbose) if (data->verbose)
printf("remote %"PRIu32" is named \"%s\"\n", fprintf(stderr, "remote %"PRIu32" is named \"%s\"\n",
info->id, info->name); info->id, info->name);
} }
@ -716,7 +716,7 @@ on_state_changed(void *userdata, enum pw_stream_state old,
int ret; int ret;
if (data->verbose) if (data->verbose)
printf("stream state changed %s -> %s\n", fprintf(stderr, "stream state changed %s -> %s\n",
pw_stream_state_as_string(old), pw_stream_state_as_string(old),
pw_stream_state_as_string(state)); pw_stream_state_as_string(state));
@ -727,7 +727,7 @@ on_state_changed(void *userdata, enum pw_stream_state old,
SPA_PROP_volume, 1, &data->volume, SPA_PROP_volume, 1, &data->volume,
0); 0);
if (data->verbose) if (data->verbose)
printf("stream set volume to %.3f - %s\n", data->volume, fprintf(stderr, "stream set volume to %.3f - %s\n", data->volume,
ret == 0 ? "success" : "FAILED"); ret == 0 ? "success" : "FAILED");
data->volume_is_set = true; data->volume_is_set = true;
@ -736,7 +736,7 @@ on_state_changed(void *userdata, enum pw_stream_state old,
struct timespec timeout = {0, 1}, interval = {1, 0}; struct timespec timeout = {0, 1}, interval = {1, 0};
struct pw_loop *l = pw_main_loop_get_loop(data->loop); struct pw_loop *l = pw_main_loop_get_loop(data->loop);
pw_loop_update_timer(l, data->timer, &timeout, &interval, false); pw_loop_update_timer(l, data->timer, &timeout, &interval, false);
printf("stream node %"PRIu32"\n", fprintf(stderr, "stream node %"PRIu32"\n",
pw_stream_get_node_id(data->stream)); pw_stream_get_node_id(data->stream));
} }
break; break;
@ -748,13 +748,13 @@ on_state_changed(void *userdata, enum pw_stream_state old,
} }
break; break;
case PW_STREAM_STATE_ERROR: case PW_STREAM_STATE_ERROR:
printf("stream node %"PRIu32" error: %s\n", fprintf(stderr, "stream node %"PRIu32" error: %s\n",
pw_stream_get_node_id(data->stream), pw_stream_get_node_id(data->stream),
error); error);
pw_main_loop_quit(data->loop); pw_main_loop_quit(data->loop);
break; break;
case PW_STREAM_STATE_UNCONNECTED: case PW_STREAM_STATE_UNCONNECTED:
printf("stream node %"PRIu32" unconnected\n", fprintf(stderr, "stream node %"PRIu32" unconnected\n",
pw_stream_get_node_id(data->stream)); pw_stream_get_node_id(data->stream));
pw_main_loop_quit(data->loop); pw_main_loop_quit(data->loop);
break; break;
@ -785,7 +785,7 @@ on_param_changed(void *userdata, uint32_t id, const struct spa_pod *param)
int err; int err;
if (data->verbose) if (data->verbose)
printf("stream param change: %s\n", fprintf(stderr, "stream param change: %s\n",
spa_debug_type_find_name(spa_type_param, id)); spa_debug_type_find_name(spa_type_param, id));
if (id != SPA_PARAM_Format || param == NULL) if (id != SPA_PARAM_Format || param == NULL)
@ -812,7 +812,7 @@ on_param_changed(void *userdata, uint32_t id, const struct spa_pod *param)
data->stride = data->dsf.layout.channels * SPA_ABS(data->dsf.layout.interleave); data->stride = data->dsf.layout.channels * SPA_ABS(data->dsf.layout.interleave);
if (data->verbose) { if (data->verbose) {
printf("DSD: channels:%d bitorder:%s interleave:%d stride:%d\n", fprintf(stderr, "DSD: channels:%d bitorder:%s interleave:%d stride:%d\n",
data->dsf.layout.channels, data->dsf.layout.channels,
data->dsf.layout.lsb ? "lsb" : "msb", data->dsf.layout.lsb ? "lsb" : "msb",
data->dsf.layout.interleave, data->dsf.layout.interleave,
@ -874,7 +874,7 @@ static void on_process(void *userdata)
fprintf(stderr, "fill error %d\n", n_fill_frames); fprintf(stderr, "fill error %d\n", n_fill_frames);
} else { } else {
if (data->verbose) if (data->verbose)
printf("drain start\n"); fprintf(stderr, "drain start\n");
} }
} else { } else {
bool null_frame = false; bool null_frame = false;
@ -905,7 +905,7 @@ static void on_drained(void *userdata)
struct data *data = userdata; struct data *data = userdata;
if (data->verbose) if (data->verbose)
printf("stream drained\n"); fprintf(stderr, "stream drained\n");
data->drained = true; data->drained = true;
pw_main_loop_quit(data->loop); pw_main_loop_quit(data->loop);
@ -931,7 +931,7 @@ static void do_print_delay(void *userdata, uint64_t expirations)
struct data *data = userdata; struct data *data = userdata;
struct pw_time time; struct pw_time time;
pw_stream_get_time_n(data->stream, &time, sizeof(time)); pw_stream_get_time_n(data->stream, &time, sizeof(time));
printf("stream time: now:%"PRIi64" rate:%u/%u ticks:%"PRIu64 fprintf(stderr, "stream time: now:%"PRIi64" rate:%u/%u ticks:%"PRIu64
" delay:%"PRIi64" queued:%"PRIu64 " delay:%"PRIi64" queued:%"PRIu64
" buffered:%"PRIi64" buffers:%u avail:%u size:%"PRIu64"\n", " buffered:%"PRIi64" buffers:%u avail:%u size:%"PRIu64"\n",
time.now, time.now,
@ -1081,7 +1081,7 @@ static int midi_play(struct data *d, void *src, unsigned int n_frames, bool *nul
midi_file_read_event(d->midi.file, &ev); midi_file_read_event(d->midi.file, &ev);
if (d->verbose) if (d->verbose)
midi_file_dump_event(stdout, &ev); midi_file_dump_event(stderr, &ev);
if (ev.type == MIDI_EVENT_TYPE_MIDI1) { if (ev.type == MIDI_EVENT_TYPE_MIDI1) {
size_t size; size_t size;
@ -1145,7 +1145,7 @@ static int midi_record(struct data *d, void *src, unsigned int n_frames, bool *n
ev.type = MIDI_EVENT_TYPE_UMP; ev.type = MIDI_EVENT_TYPE_UMP;
if (d->verbose) if (d->verbose)
midi_file_dump_event(stdout, &ev); midi_file_dump_event(stderr, &ev);
midi_file_write_event(d->midi.file, &ev); midi_file_write_event(d->midi.file, &ev);
} }
@ -1170,7 +1170,7 @@ static int setup_midifile(struct data *data)
} }
if (data->verbose) if (data->verbose)
printf("midifile: opened file \"%s\" format %08x ntracks:%d div:%d\n", fprintf(stderr, "midifile: opened file \"%s\" format %08x ntracks:%d div:%d\n",
data->filename, data->filename,
data->midi.info.format, data->midi.info.ntracks, data->midi.info.format, data->midi.info.ntracks,
data->midi.info.division); data->midi.info.division);
@ -1221,7 +1221,7 @@ static int setup_dsdfile(struct data *data)
if (data->dsf.file != NULL) { if (data->dsf.file != NULL) {
if (data->verbose) if (data->verbose)
printf("dsffile: opened file \"%s\" channels:%d rate:%d " fprintf(stderr, "dsffile: opened file \"%s\" channels:%d rate:%d "
"samples:%"PRIu64" bitorder:%s\n", "samples:%"PRIu64" bitorder:%s\n",
data->filename, data->filename,
data->dsf.info.channels, data->dsf.info.rate, data->dsf.info.channels, data->dsf.info.rate,
@ -1231,7 +1231,7 @@ static int setup_dsdfile(struct data *data)
data->fill = dsf_play; data->fill = dsf_play;
} else { } else {
if (data->verbose) if (data->verbose)
printf("dfffile: opened file \"%s\" channels:%d rate:%d " fprintf(stderr, "dfffile: opened file \"%s\" channels:%d rate:%d "
"samples:%"PRIu64" bitorder:%s\n", "samples:%"PRIu64" bitorder:%s\n",
data->filename, data->filename,
data->dff.info.channels, data->dff.info.rate, data->dff.info.channels, data->dff.info.rate,
@ -1275,7 +1275,7 @@ static int setup_pipe(struct data *data)
data->fill = data->mode == mode_playback ? stdin_play : stdout_record; data->fill = data->mode == mode_playback ? stdin_play : stdout_record;
if (data->verbose) if (data->verbose)
printf("PIPE: rate=%u channels=%u fmt=%s samplesize=%u stride=%u\n", fprintf(stderr, "PIPE: rate=%u channels=%u fmt=%s samplesize=%u stride=%u\n",
data->rate, data->channels, data->rate, data->channels,
info->name, info->width, data->stride); info->name, info->width, data->stride);
@ -1445,7 +1445,7 @@ static int setup_encodedfile(struct data *data)
data->fill = encoded_playback_fill; data->fill = encoded_playback_fill;
if (data->verbose) { if (data->verbose) {
printf("Opened file \"%s\" with encoded audio; channels:%d rate:%d bitrate: %d time units %d/%d\n", fprintf(stderr, "Opened file \"%s\" with encoded audio; channels:%d rate:%d bitrate: %d time units %d/%d\n",
data->filename, data->channels, data->rate, data->bitrate, data->filename, data->channels, data->rate, data->bitrate,
data->encoded.audio_stream->time_base.num, data->encoded.audio_stream->time_base.den); data->encoded.audio_stream->time_base.num, data->encoded.audio_stream->time_base.den);
} }
@ -1492,7 +1492,7 @@ static int setup_sndfile(struct data *data)
} }
if (data->verbose) if (data->verbose)
printf("sndfile: opened file \"%s\" format %08x channels:%d rate:%d\n", fprintf(stderr, "sndfile: opened file \"%s\" format %08x channels:%d rate:%d\n",
data->filename, info.format, info.channels, info.samplerate); data->filename, info.format, info.channels, info.samplerate);
if (data->channels > 0 && info.channels != data->channels) { if (data->channels > 0 && info.channels != data->channels) {
fprintf(stderr, "sndfile: given channels (%u) don't match file channels (%d)\n", fprintf(stderr, "sndfile: given channels (%u) don't match file channels (%d)\n",
@ -1519,9 +1519,9 @@ static int setup_sndfile(struct data *data)
def = true; def = true;
} }
if (data->verbose) { if (data->verbose) {
printf("sndfile: using %s channel map: ", def ? "default" : "file"); fprintf(stderr, "sndfile: using %s channel map: ", def ? "default" : "file");
channelmap_print(&data->channelmap); channelmap_print(&data->channelmap);
printf("\n"); fprintf(stderr, "\n");
} }
} }
fill_properties(data); fill_properties(data);
@ -1535,7 +1535,7 @@ static int setup_sndfile(struct data *data)
return -EIO; return -EIO;
if (data->verbose) if (data->verbose)
printf("PCM: fmt:%s rate:%u channels:%u width:%u\n", fprintf(stderr, "PCM: fmt:%s rate:%u channels:%u width:%u\n",
fi->name, data->rate, data->channels, fi->width); fi->name, data->rate, data->channels, fi->width);
/* we read and write S24 as S32 with sndfile */ /* we read and write S24 as S32 with sndfile */
@ -1615,7 +1615,7 @@ static int setup_properties(struct data *data)
} }
if (data->verbose) if (data->verbose)
printf("rate:%d latency:%u (%.3fs)\n", fprintf(stderr, "rate:%d latency:%u (%.3fs)\n",
data->rate, nom, data->rate ? (double)nom/data->rate : 0.0f); data->rate, nom, data->rate ? (double)nom/data->rate : 0.0f);
if (nom && pw_properties_get(data->props, PW_KEY_NODE_LATENCY) == NULL) if (nom && pw_properties_get(data->props, PW_KEY_NODE_LATENCY) == NULL)
pw_properties_setf(data->props, PW_KEY_NODE_LATENCY, "%u/%u", nom, data->rate); pw_properties_setf(data->props, PW_KEY_NODE_LATENCY, "%u/%u", nom, data->rate);
@ -2032,7 +2032,7 @@ int main(int argc, char *argv[])
pw_stream_add_listener(data.stream, &data.stream_listener, &stream_events, &data); pw_stream_add_listener(data.stream, &data.stream_listener, &stream_events, &data);
if (data.verbose) if (data.verbose)
printf("connecting %s stream; target=%s\n", fprintf(stderr, "connecting %s stream; target=%s\n",
data.mode == mode_playback ? "playback" : "record", data.mode == mode_playback ? "playback" : "record",
data.target); data.target);
@ -2056,11 +2056,11 @@ int main(int argc, char *argv[])
const char *key, *val; const char *key, *val;
if ((props = pw_stream_get_properties(data.stream)) != NULL) { if ((props = pw_stream_get_properties(data.stream)) != NULL) {
printf("stream properties:\n"); fprintf(stderr, "stream properties:\n");
pstate = NULL; pstate = NULL;
while ((key = pw_properties_iterate(props, &pstate)) != NULL && while ((key = pw_properties_iterate(props, &pstate)) != NULL &&
(val = pw_properties_get(props, key)) != NULL) { (val = pw_properties_get(props, key)) != NULL) {
printf("\t%s = \"%s\"\n", key, val); fprintf(stderr, "\t%s = \"%s\"\n", key, val);
} }
} }
} }