From 9635738cc349e37e76f23a4d99eda696197cb715 Mon Sep 17 00:00:00 2001 From: Guenter Bartsch Date: Thu, 15 Nov 2001 23:18:04 +0000 Subject: improved audio/spu channel selection, let the user take control over both if he/she wants to CVS patchset: 1047 CVS date: 2001/11/15 23:18:04 --- src/xine-engine/video_decoder.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/xine-engine/video_decoder.c') diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c index 20a59d96b..87ca1a956 100644 --- a/src/xine-engine/video_decoder.c +++ b/src/xine-engine/video_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_decoder.c,v 1.63 2001/11/13 21:47:59 heikos Exp $ + * $Id: video_decoder.c,v 1.64 2001/11/15 23:18:04 guenter Exp $ * */ @@ -145,7 +145,9 @@ void *video_decoder_loop (void *this_gen) { break; case BUF_CONTROL_SPU_CHANNEL: - this->spu_channel = buf->decoder_info[0]; + this->spu_channel_auto = buf->decoder_info[0]; + if (this->spu_channel_user == -1) + this->spu_channel = this->spu_channel_auto; break; case BUF_CONTROL_END: -- cgit v1.2.3