diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-24 01:53:58 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-24 01:53:58 +0300 |
| commit | a232f564d3f271277135276281c03cca7807ef16 (patch) | |
| tree | 63c0ebd5b39094e2cc24da83a4e5ce889964b003 /libvo/old_vo_wrapper.h | |
| parent | de560e8167c21a8fd9ea34f5f42f377102d65232 (diff) | |
| download | mpv-a232f564d3f271277135276281c03cca7807ef16.tar.bz2 mpv-a232f564d3f271277135276281c03cca7807ef16.tar.xz | |
Create a context struct for OSD state
This commit creates the struct and passes it to some functions that
needs to access OSD state but does not yet move much data from globals
to it.
vf_expand accesses the OSD state for rendering purposes outside of the
normal OSD draw time. The way this currently works is suboptimal, but
I did not attempt to clean it up now. To keep things working the same
way vf_expand needs to know the address of the state object to be able
to access the data even in the functions that should normally not need
it. For that purpose this commit adds a VFCTRL to tell vf_expand the
address of the object.
Diffstat (limited to 'libvo/old_vo_wrapper.h')
| -rw-r--r-- | libvo/old_vo_wrapper.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libvo/old_vo_wrapper.h b/libvo/old_vo_wrapper.h index b81f065497..e7e98fdad6 100644 --- a/libvo/old_vo_wrapper.h +++ b/libvo/old_vo_wrapper.h @@ -5,6 +5,7 @@ #include "video_out.h" extern struct vo *global_vo; +extern struct osd_state *global_osd; int old_vo_preinit(struct vo *vo, const char *); int old_vo_config(struct vo *vo, uint32_t width, uint32_t height, @@ -14,11 +15,12 @@ int old_vo_control(struct vo *vo, uint32_t request, void *data); int old_vo_draw_frame(struct vo *vo, uint8_t *src[]); int old_vo_draw_slice(struct vo *vo, uint8_t *src[], int stride[], int w, int h, int x, int y); -void old_vo_draw_osd(struct vo *vo); +void old_vo_draw_osd(struct vo *vo, struct osd_state *osd); void old_vo_flip_page(struct vo *vo); void old_vo_check_events(struct vo *vo); void old_vo_uninit(struct vo *vo); void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride)); +int vo_update_osd(int dxs, int dys); #endif |