diff options
Diffstat (limited to 'src/libspudec')
| -rw-r--r-- | src/libspudec/spu.c | 6 | ||||
| -rw-r--r-- | src/libspudec/spu.h | 3 | ||||
| -rw-r--r-- | src/libspudec/xine_decoder.c | 11 |
3 files changed, 9 insertions, 11 deletions
diff --git a/src/libspudec/spu.c b/src/libspudec/spu.c index c05e949c2..b96a9ae9d 100644 --- a/src/libspudec/spu.c +++ b/src/libspudec/spu.c @@ -35,7 +35,7 @@ * along with this program; see the file COPYING. If not, write to * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: spu.c,v 1.57 2002/11/26 16:05:00 mroi Exp $ + * $Id: spu.c,v 1.58 2002/12/26 21:53:42 miguelfreitas Exp $ * */ @@ -84,7 +84,7 @@ void spudec_decode_nav(spudec_decoder_t *this, buf_element_t *buf) { uint32_t header_len; pci_t pci; dsi_t dsi; - video_overlay_instance_t *ovl_instance = this->vo_out->get_overlay_instance (this->vo_out); + video_overlay_instance_t *ovl_instance = this->stream->video_out->get_overlay_instance (this->stream->video_out); p = buf->content; if (p[0] || p[1] || (p[2] != 1)) { @@ -276,7 +276,7 @@ void spudec_reassembly (spudec_seq_t *seq, uint8_t *pkt_data, u_int pkt_len) void spudec_process (spudec_decoder_t *this, uint32_t stream_id) { spudec_seq_t *cur_seq; - video_overlay_instance_t *ovl_instance = this->vo_out->get_overlay_instance (this->vo_out); + video_overlay_instance_t *ovl_instance = this->stream->video_out->get_overlay_instance (this->stream->video_out); int pending = 1; cur_seq = &this->spudec_stream_state[stream_id].ra_seq; diff --git a/src/libspudec/spu.h b/src/libspudec/spu.h index 807048b2b..79bec4fe5 100644 --- a/src/libspudec/spu.h +++ b/src/libspudec/spu.h @@ -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: spu.h,v 1.18 2002/11/26 16:05:00 mroi Exp $ + * $Id: spu.h,v 1.19 2002/12/26 21:53:42 miguelfreitas Exp $ * * This file was originally part of the OMS program. * @@ -111,7 +111,6 @@ typedef struct spudec_decoder_s { spudec_state_t state; - xine_video_port_t *vo_out; vo_overlay_t overlay; int ovl_caps; int output_open; diff --git a/src/libspudec/xine_decoder.c b/src/libspudec/xine_decoder.c index e948a9a82..83c974964 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.91 2002/12/21 16:35:46 esnel Exp $ + * $Id: xine_decoder.c,v 1.92 2002/12/26 21:53:42 miguelfreitas Exp $ * * stuff needed to turn libspu into a xine decoder plugin */ @@ -146,7 +146,7 @@ static void spudec_decode_data (spu_decoder_t *this_gen, buf_element_t *buf) { static void spudec_reset (spu_decoder_t *this_gen) { spudec_decoder_t *this = (spudec_decoder_t *) this_gen; - video_overlay_instance_t *ovl_instance = this->vo_out->get_overlay_instance (this->vo_out); + video_overlay_instance_t *ovl_instance = this->stream->video_out->get_overlay_instance (this->stream->video_out); int i; if( this->menu_handle >= 0 ) @@ -172,7 +172,7 @@ static void spudec_dispose (spu_decoder_t *this_gen) { spudec_decoder_t *this = (spudec_decoder_t *) this_gen; int i; - video_overlay_instance_t *ovl_instance = this->vo_out->get_overlay_instance (this->vo_out); + video_overlay_instance_t *ovl_instance = this->stream->video_out->get_overlay_instance (this->stream->video_out); if( this->menu_handle >= 0 ) ovl_instance->free_handle(ovl_instance, @@ -266,8 +266,8 @@ static void spudec_set_button (spu_decoder_t *this_gen, int32_t button, int32_t overlay_event->event_type = OVERLAY_EVENT_HIDE; } overlay_event->vpts = 0; - if (this->vo_out) { - ovl_instance = this->vo_out->get_overlay_instance (this->vo_out); + if (this->stream->video_out) { + ovl_instance = this->stream->video_out->get_overlay_instance (this->stream->video_out); #ifdef LOG_BUTTON fprintf(stderr, "libspudec: add_event type=%d : current time=%lld, spu vpts=%lli\n", overlay_event->event_type, @@ -306,7 +306,6 @@ static spu_decoder_t *open_plugin (spu_decoder_class_t *class_gen, xine_stream_t pthread_mutex_init(&this->nav_pci_lock, NULL); - this->vo_out = stream->video_out; this->ovl_caps = stream->video_out->get_capabilities(stream->video_out); this->output_open = 0; this->last_event_vpts = 0; |