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 /libvo/video_out.h | |
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 'libvo/video_out.h')
-rw-r--r-- | libvo/video_out.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/libvo/video_out.h b/libvo/video_out.h index 6cc7c0d02f..3042efd8d2 100644 --- a/libvo/video_out.h +++ b/libvo/video_out.h @@ -156,10 +156,6 @@ struct vo_driver { // of pts values itself bool buffer_frames; - // This is set if the driver is not new and contains pointers to - // old-API functions to be used instead of the ones below. - struct vo_old_functions *old_functions; - const vo_info_t *info; /* * Preinitializes driver (real INITIALIZATION) @@ -239,20 +235,6 @@ struct vo_driver { const struct m_option *options; }; -struct vo_old_functions { - int (*preinit)(const char *arg); - int (*config)(uint32_t width, uint32_t height, uint32_t d_width, - uint32_t d_height, uint32_t fullscreen, char *title, - uint32_t format); - int (*control)(uint32_t request, void *data); - int (*draw_frame)(uint8_t *src[]); - int (*draw_slice)(uint8_t *src[], int stride[], int w,int h, int x,int y); - void (*draw_osd)(void); - void (*flip_page)(void); - void (*check_events)(void); - void (*uninit)(void); -}; - struct vo { int config_ok; // Last config call was successful? int config_count; // Total number of successful config calls @@ -313,7 +295,6 @@ int vo_draw_image(struct vo *vo, struct mp_image *mpi, double pts); int vo_redraw_frame(struct vo *vo); int vo_get_buffered_frame(struct vo *vo, bool eof); void vo_skip_frame(struct vo *vo); -int vo_draw_frame(struct vo *vo, uint8_t *src[]); int vo_draw_slice(struct vo *vo, uint8_t *src[], int stride[], int w, int h, int x, int y); void vo_new_frame_imminent(struct vo *vo); void vo_draw_osd(struct vo *vo, struct osd_state *osd); |