diff options
Diffstat (limited to 'src/xine-engine')
| -rw-r--r-- | src/xine-engine/video_decoder.c | 18 | ||||
| -rw-r--r-- | src/xine-engine/video_overlay.c | 3 | ||||
| -rw-r--r-- | src/xine-engine/xine.c | 4 |
3 files changed, 13 insertions, 12 deletions
diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c index dc461f6f0..e08a52a9b 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.102 2002/10/19 18:51:22 guenter Exp $ + * $Id: video_decoder.c,v 1.103 2002/10/21 12:11:02 jcdutton Exp $ * */ @@ -37,18 +37,18 @@ #define LOG */ -static spu_decoder_t* update_spu_decoder (xine_stream_t *this, int type) { +static spu_decoder_t* update_spu_decoder (xine_stream_t *stream, int type) { int streamtype = (type>>16) & 0xFF; - if( this->spu_decoder_streamtype != streamtype || - !this->spu_decoder_plugin ) { + if( stream->spu_decoder_streamtype != streamtype || + !stream->spu_decoder_plugin ) { - if (this->spu_decoder_plugin) - this->spu_decoder_plugin->close (this->spu_decoder_plugin); + if (stream->spu_decoder_plugin) + free_spu_decoder (stream, stream->spu_decoder_plugin); - this->spu_decoder_streamtype = streamtype; - this->spu_decoder_plugin = get_spu_decoder (this, streamtype); + stream->spu_decoder_streamtype = streamtype; + stream->spu_decoder_plugin = get_spu_decoder (stream, streamtype); /* obsolete? if (this->spu_decoder_plugin ) @@ -56,7 +56,7 @@ static spu_decoder_t* update_spu_decoder (xine_stream_t *this, int type) { this->video_out); */ } - return this->spu_decoder_plugin; + return stream->spu_decoder_plugin; } void *video_decoder_loop (void *stream_gen) { diff --git a/src/xine-engine/video_overlay.c b/src/xine-engine/video_overlay.c index 11a520917..f38c79890 100644 --- a/src/xine-engine/video_overlay.c +++ b/src/xine-engine/video_overlay.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_overlay.c,v 1.24 2002/09/04 23:31:13 guenter Exp $ + * $Id: video_overlay.c,v 1.25 2002/10/21 12:11:03 jcdutton Exp $ * */ @@ -252,6 +252,7 @@ static int32_t video_overlay_add_event(video_overlay_instance_t *this_gen, void video_overlay_event_t *event = (video_overlay_event_t *) event_gen; video_overlay_t *this = (video_overlay_t *) this_gen; uint32_t last_event,this_event,new_event; + printf("xine-lib:video_overlay_add_event called\n"); pthread_mutex_lock (&this->events_mutex); diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index 0718fe999..77b0d72d2 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.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: xine.c,v 1.171 2002/10/20 23:55:23 guenter Exp $ + * $Id: xine.c,v 1.172 2002/10/21 12:11:03 jcdutton Exp $ * * top-level xine functions * @@ -654,7 +654,6 @@ void xine_init (xine_t *this) { void xine_select_spu_channel (xine_stream_t *stream, int channel) { pthread_mutex_lock (&stream->frontend_lock); - stream->spu_channel_user = (channel >= -2 ? channel : -2); switch (stream->spu_channel_user) { @@ -670,6 +669,7 @@ void xine_select_spu_channel (xine_stream_t *stream, int channel) { stream->spu_channel = stream->spu_channel_user; stream->video_out->enable_ovl (stream->video_out, 1); } + printf("xine-lib:xine_select_spu_channel:set to %d\n",stream->spu_channel); pthread_mutex_unlock (&stream->frontend_lock); } |