diff options
| author | Uoti Urpala <uau@mplayer2.org> | 2011-12-07 00:13:51 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2011-12-07 00:13:51 +0200 |
| commit | fe69b49ccc2bb3e00977f4110a59ffe3b0516d6f (patch) | |
| tree | c78705f95df4143bc28d19db6ad36df2ab2cf215 /libvo/video_out.h | |
| parent | 92e5414897707d998b4ba46664709347760f5b11 (diff) | |
| parent | 82118dc35edfbf9b6714e1e4e6b1823fc3205ff7 (diff) | |
| download | mpv-fe69b49ccc2bb3e00977f4110a59ffe3b0516d6f.tar.bz2 mpv-fe69b49ccc2bb3e00977f4110a59ffe3b0516d6f.tar.xz | |
Merge remote-tracking branch 'wm4/window_title'
Diffstat (limited to 'libvo/video_out.h')
| -rw-r--r-- | libvo/video_out.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libvo/video_out.h b/libvo/video_out.h index 0a56fd23a9..06c606f4d2 100644 --- a/libvo/video_out.h +++ b/libvo/video_out.h @@ -190,7 +190,7 @@ struct vo_driver { */ int (*config)(struct vo *vo, uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, - char *title, uint32_t format); + uint32_t format); /* * Control interface @@ -303,7 +303,7 @@ struct vo *init_best_video_out(struct MPOpts *opts, struct vo_x11_state *x11, struct input_ctx *input_ctx); int vo_config(struct vo *vo, uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, - char *title, uint32_t format); + uint32_t format); void list_video_out(void); int vo_control(struct vo *vo, uint32_t request, void *data); @@ -320,6 +320,7 @@ void vo_check_events(struct vo *vo); void vo_seek_reset(struct vo *vo); void vo_destroy(struct vo *vo); +const char *vo_get_window_title(struct vo *vo); // NULL terminated array of all drivers extern const struct vo_driver *video_out_drivers[]; |