diff options
| -rw-r--r-- | xine/demux_xvdr_tsdata.c | 13 | ||||
| -rw-r--r-- | xine/demux_xvdr_tsdata.h | 4 |
2 files changed, 10 insertions, 7 deletions
diff --git a/xine/demux_xvdr_tsdata.c b/xine/demux_xvdr_tsdata.c index 6f50b3ae..e09afb81 100644 --- a/xine/demux_xvdr_tsdata.c +++ b/xine/demux_xvdr_tsdata.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: demux_xvdr_tsdata.c,v 1.3 2010-02-15 11:28:02 phintuka Exp $ + * $Id: demux_xvdr_tsdata.c,v 1.4 2010-03-19 21:44:27 phintuka Exp $ * */ @@ -39,20 +39,23 @@ static void ts_data_ts2es_reset(ts_data_t *ts_data) } } -void ts_data_reset_audio(ts_data_t *ts_data, fifo_buffer_t *audio_fifo) +void ts_data_reset_audio(ts_data_t *ts_data, fifo_buffer_t *audio_fifo, int keep_channel) { if (ts_data) { int i; for (i = 0; ts_data->audio[i]; i++) { - ts2es_dispose(ts_data->audio[i]); - ts_data->audio[i] = NULL; + if (i != keep_channel) { + ts2es_dispose(ts_data->audio[i]); + ts_data->audio[i] = NULL; + } } if (audio_fifo) { for (i = 0; i < ts_data->pmt.audio_tracks_count; i++) - ts_data->audio[i] = ts2es_init(audio_fifo, ts_data->pmt.audio_tracks[i].type, i); + if (!ts_data->audio[i]) + ts_data->audio[i] = ts2es_init(audio_fifo, ts_data->pmt.audio_tracks[i].type, i); } } } diff --git a/xine/demux_xvdr_tsdata.h b/xine/demux_xvdr_tsdata.h index b58fb6af..892f84df 100644 --- a/xine/demux_xvdr_tsdata.h +++ b/xine/demux_xvdr_tsdata.h @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: demux_xvdr_tsdata.h,v 1.2 2010-01-22 23:06:58 phintuka Exp $ + * $Id: demux_xvdr_tsdata.h,v 1.3 2010-03-19 21:44:27 phintuka Exp $ * */ @@ -30,7 +30,7 @@ void ts_data_ts2es_init (ts_data_t **ts_data, fifo_buffer_t *video_fifo, fifo_bu void ts_data_flush (ts_data_t *ts_data); void ts_data_dispose (ts_data_t **ts_data); -void ts_data_reset_audio(ts_data_t *ts_data, fifo_buffer_t *audio_fifo); +void ts_data_reset_audio(ts_data_t *ts_data, fifo_buffer_t *audio_fifo, int keep_channel); #endif /* _DEMUX_XVDR_TSDATA_H_ */ |