[vlc-commits] Revert "pulse: restart when we need to move a passthrough input"
Thomas Guillem
git at videolan.org
Mon Sep 26 14:47:02 CEST 2016
vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Mon Sep 26 14:44:18 2016 +0200| [eb4955866c8e8eeade331454a01f8839a69dd0cd] | committer: Thomas Guillem
Revert "pulse: restart when we need to move a passthrough input"
This reverts commit a3925097aa23b6179ddf61bb04e43cd9a90e6f7f.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=eb4955866c8e8eeade331454a01f8839a69dd0cd
---
modules/audio_output/pulse.c | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c
index bde37d3..a088e44 100644
--- a/modules/audio_output/pulse.c
+++ b/modules/audio_output/pulse.c
@@ -75,7 +75,6 @@ struct aout_sys_t
char *sink_force; /**< Forced sink name (stream must be NULL) */
struct sink *sinks; /**< Locally-cached list of sinks */
- bool passthrough;
};
static void VolumeReport(audio_output_t *aout)
@@ -656,15 +655,6 @@ static int StreamMove(audio_output_t *aout, const char *name)
aout_DeviceReport(aout, name);
return 0;
}
- else if (sys->passthrough)
- {
- /* A sink connected with a passthrough input cannot be moved */
- msg_Dbg(aout, "request restart to connect to sink %s", name);
- free(sys->sink_force);
- sys->sink_force = strdup(name);
- aout_RestartRequest(aout, AOUT_RESTART_OUTPUT);
- return 0;
- }
pa_operation *op;
uint32_t idx = pa_stream_get_index(sys->stream);
@@ -934,7 +924,6 @@ static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt)
sys->flags_force = PA_STREAM_NOFLAGS;
free(sys->sink_force);
sys->sink_force = NULL;
- sys->passthrough = fmt->i_format == VLC_CODEC_SPDIFL;
if (encoding == PA_ENCODING_INVALID)
{
More information about the vlc-commits
mailing list