diff options
| author | Guenter Bartsch <guenter@users.sourceforge.net> | 2001-11-15 23:18:04 +0000 |
|---|---|---|
| committer | Guenter Bartsch <guenter@users.sourceforge.net> | 2001-11-15 23:18:04 +0000 |
| commit | 9635738cc349e37e76f23a4d99eda696197cb715 (patch) | |
| tree | c77eaa18c0a85983252dd7f5ef5bbba04e18a015 /src/libspudec/xine_decoder.c | |
| parent | 230d3c07ef6fca8fb08ae8f14235c56b535d7e64 (diff) | |
| download | xine-lib-9635738cc349e37e76f23a4d99eda696197cb715.tar.gz xine-lib-9635738cc349e37e76f23a4d99eda696197cb715.tar.bz2 | |
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
Diffstat (limited to 'src/libspudec/xine_decoder.c')
| -rw-r--r-- | src/libspudec/xine_decoder.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libspudec/xine_decoder.c b/src/libspudec/xine_decoder.c index 6346f4849..9a968bb63 100644 --- a/src/libspudec/xine_decoder.c +++ b/src/libspudec/xine_decoder.c @@ -19,7 +19,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: xine_decoder.c,v 1.32 2001/11/10 13:48:03 guenter Exp $ + * $Id: xine_decoder.c,v 1.33 2001/11/15 23:18:04 guenter Exp $ * * stuff needed to turn libspu into a xine decoder plugin */ @@ -378,6 +378,7 @@ static void spu_process (spudec_decoder_t *this, uint32_t stream_id) { do { if (!this->spu_stream_state[stream_id].ra_seq.finished) { + //spudec_nextseq(this); /* Get do commands to build the event. */ spu_do_commands(&this->state, this->cur_seq, &this->overlay); @@ -385,6 +386,7 @@ static void spu_process (spudec_decoder_t *this, uint32_t stream_id) { * For subtitles, open event. * For menus, store it for later. */ + if ((this->xine->spu_channel != stream_id) && (this->state.menu == 0) ) { xprintf (VERBOSE|SPU, "Dropping SPU channel %d\n", stream_id); |