diff options
Diffstat (limited to 'src/libspudec')
| -rw-r--r-- | src/libspudec/spu.h | 4 | ||||
| -rw-r--r-- | src/libspudec/spu_decoder_api.h | 2 | ||||
| -rw-r--r-- | src/libspudec/xine_decoder.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/libspudec/spu.h b/src/libspudec/spu.h index dc5959498..5fd959859 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.16 2002/10/21 12:11:01 jcdutton Exp $ + * $Id: spu.h,v 1.17 2002/11/20 11:57:44 mroi Exp $ * * This file was originally part of the OMS program. * @@ -110,7 +110,7 @@ typedef struct spudec_decoder_s { spudec_state_t state; - vo_instance_t *vo_out; + xine_video_port_t *vo_out; vo_overlay_t overlay; int ovl_caps; int output_open; diff --git a/src/libspudec/spu_decoder_api.h b/src/libspudec/spu_decoder_api.h index e0a64c6ed..68011c1a2 100644 --- a/src/libspudec/spu_decoder_api.h +++ b/src/libspudec/spu_decoder_api.h @@ -24,7 +24,7 @@ #ifndef HAVE_SPU_API_H #define HAVE_SPU_API_H -#define SPU_DECODER_IFACE_VERSION 11 +#define SPU_DECODER_IFACE_VERSION 12 /* FIXME: Needed for spu_button_t */ /* But will not be on all users's systems. (From the libspudec directory or libdvdread). */ /*#include "nav_types.h" */ diff --git a/src/libspudec/xine_decoder.c b/src/libspudec/xine_decoder.c index 2da1241d0..756582dfc 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.87 2002/11/19 00:45:41 miguelfreitas Exp $ + * $Id: xine_decoder.c,v 1.88 2002/11/20 11:57:45 mroi Exp $ * * stuff needed to turn libspu into a xine decoder plugin */ @@ -249,7 +249,7 @@ static void spudec_set_button (spu_decoder_t *this_gen, int32_t button, int32_t #ifdef LOG_BUTTON fprintf(stderr, "libspudec: add_event type=%d : current time=%lld, spu vpts=%lli\n", overlay_event->event_type, - this->stream->metronom->get_current_time(this->stream->metronom), + this->stream->xine->clock->get_current_time(this->stream->xine->clock), overlay_event->vpts); #endif ovl_instance->add_event (ovl_instance, (void *)overlay_event); @@ -348,6 +348,6 @@ static decoder_info_t dec_info_data = { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_SPU_DECODER, 11, "spudec", XINE_VERSION_CODE, &dec_info_data, &init_plugin }, + { PLUGIN_SPU_DECODER, 12, "spudec", XINE_VERSION_CODE, &dec_info_data, &init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; |