diff options
| author | wm4 <wm4@nowhere> | 2012-08-07 01:26:11 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-08-07 01:29:56 +0200 |
| commit | 22872451369fe219990c6280fc0d1c0c0c344b55 (patch) | |
| tree | d65954cf2d3bf4e66c96a5cbb5ccebdc0305e3a4 /sub | |
| parent | f3bb6692c728bd05f567fe1ca53902ec41bec235 (diff) | |
| download | mpv-22872451369fe219990c6280fc0d1c0c0c344b55.tar.bz2 mpv-22872451369fe219990c6280fc0d1c0c0c344b55.tar.xz | |
VO: remove old VO glue
This transition to a new VO API started over 4 years ago. It's time to
finally end it, and get rid of the horrible hacks.
Also removes some previously undetected dead code from spudec.c.
Diffstat (limited to 'sub')
| -rw-r--r-- | sub/spudec.c | 13 | ||||
| -rw-r--r-- | sub/spudec.h | 2 | ||||
| -rw-r--r-- | sub/sub.h | 5 |
3 files changed, 2 insertions, 18 deletions
diff --git a/sub/spudec.c b/sub/spudec.c index 82e8f2f793..47a3dec22a 100644 --- a/sub/spudec.c +++ b/sub/spudec.c @@ -42,7 +42,6 @@ #include "config.h" #include "mp_msg.h" -#include "libvo/video_out.h" #include "spudec.h" #include "vobsub.h" #include "mpcommon.h" @@ -119,7 +118,6 @@ typedef struct { unsigned char *scaled_aimage; int auto_palette; /* 1 if we lack a palette and must use an heuristic. */ int font_start_level; /* Darkest value used for the computed font */ - struct vo *hw_spu; int spu_changed; unsigned int forced_subs_only; /* flag: 0=display all subtitle, !0 display only forced subtitles */ unsigned int is_forced_sub; /* true if current subtitle is a forced subtitle */ @@ -580,16 +578,7 @@ static void spudec_process_control(spudec_handle_t *this, int pts100) static void spudec_decode(spudec_handle_t *this, int pts100) { - if (!this->hw_spu) - spudec_process_control(this, pts100); - else if (pts100 >= 0) { - static vo_mpegpes_t packet = { NULL, 0, 0x20, 0 }; - static vo_mpegpes_t *pkg=&packet; - packet.data = this->packet; - packet.size = this->packet_size; - packet.timestamp = pts100; - vo_draw_frame(this->hw_spu, (uint8_t**)&pkg); - } + spudec_process_control(this, pts100); } int spudec_changed(void * this) diff --git a/sub/spudec.h b/sub/spudec.h index 533ac511e8..6104ad7228 100644 --- a/sub/spudec.h +++ b/sub/spudec.h @@ -19,7 +19,7 @@ #ifndef MPLAYER_SPUDEC_H #define MPLAYER_SPUDEC_H -#include "libvo/video_out.h" +#include <stdint.h> void spudec_heartbeat(void *this, unsigned int pts100); void spudec_assemble(void *this, unsigned char *packet, unsigned int len, int pts100); @@ -175,11 +175,6 @@ void osd_free(struct osd_state *osd); void osd_set_nav_box (uint16_t sx, uint16_t sy, uint16_t ex, uint16_t ey); #endif - -#ifdef IS_OLD_VO -#define vo_remove_text(...) osd_remove_text(global_osd, __VA_ARGS__) -#endif - // used only by osd_ft.c or osd_libass.c void osd_alloc_buf(mp_osd_obj_t* obj); void vo_draw_text_from_buffer(mp_osd_obj_t* obj,void (*draw_alpha)(void *ctx, int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride), void *ctx); |