diff options
| author | Max Kellermann <max@duempel.org> | 2009-07-06 10:01:02 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-07-06 10:01:02 +0200 |
| commit | 78fa3f06f9fadcc274c0a0042d28d59c88bff152 (patch) | |
| tree | 75a02c2926fb72fff0b5832dbdfd4430d8a25e87 /src/output_control.c | |
| parent | 1350cd0e42d1860af1149db3e3b4eb3b944779fe (diff) | |
| download | mpd-78fa3f06f9fadcc274c0a0042d28d59c88bff152.tar.gz mpd-78fa3f06f9fadcc274c0a0042d28d59c88bff152.tar.xz mpd-78fa3f06f9fadcc274c0a0042d28d59c88bff152.zip | |
output: added command REOPEN
REOPEN is called when the input audio format changes. The output
thread may be reconfigure the PCM converter.
Diffstat (limited to 'src/output_control.c')
| -rw-r--r-- | src/output_control.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/output_control.c b/src/output_control.c index eac9bdfcb..2c193c30f 100644 --- a/src/output_control.c +++ b/src/output_control.c @@ -82,26 +82,13 @@ audio_output_open(struct audio_output *ao, ao->in_audio_format = *audio_format; ao->chunk = NULL; - if (!ao->config_audio_format) { - if (ao->open) - audio_output_close(ao); - - /* no audio format is configured: copy in->out, let - the output's open() method determine the effective - out_audio_format */ - ao->out_audio_format = ao->in_audio_format; - } - ao->pipe = mp; if (ao->thread == NULL) audio_output_thread_start(ao); + ao_command(ao, ao->open ? AO_COMMAND_REOPEN : AO_COMMAND_OPEN); open = ao->open; - if (!open) { - ao_command(ao, AO_COMMAND_OPEN); - open = ao->open; - } if (open && ao->mixer != NULL) mixer_open(ao->mixer); |