summaryrefslogtreecommitdiffstats
path: root/libmenu
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-02-21 15:48:03 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-02-21 15:48:03 +0000
commite0bc115b4d20cc2f46ac7773e7a6b3ba5d912f97 (patch)
treee773a5f9f3a5ab15b1d2e2f2fd570524e3aca8dd /libmenu
parent160b880c4fd10cec41ba2c14c846d0a7e7f21048 (diff)
downloadmpv-e0bc115b4d20cc2f46ac7773e7a6b3ba5d912f97.tar.bz2
mpv-e0bc115b4d20cc2f46ac7773e7a6b3ba5d912f97.tar.xz
cosmetics: Rename struct vf_instance_s --> vf_instance.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30684 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmenu')
-rw-r--r--libmenu/menu.h2
-rw-r--r--libmenu/vf_menu.c12
2 files changed, 7 insertions, 7 deletions
diff --git a/libmenu/menu.h b/libmenu/menu.h
index a22dc12abf..1578f5f426 100644
--- a/libmenu/menu.h
+++ b/libmenu/menu.h
@@ -114,6 +114,6 @@ void menu_draw_text_full(mp_image_t* mpi,char* txt,
void menu_draw_box(mp_image_t* mpi, unsigned char grey, unsigned char alpha, int x, int y, int w, int h);
-void vf_menu_pause_update(struct vf_instance_s* vf);
+void vf_menu_pause_update(struct vf_instance *vf);
#endif /* MPLAYER_MENU_H */
diff --git a/libmenu/vf_menu.c b/libmenu/vf_menu.c
index 6a49f671af..c1e9eb220b 100644
--- a/libmenu/vf_menu.c
+++ b/libmenu/vf_menu.c
@@ -54,9 +54,9 @@ struct vf_priv_s {
int passthrough;
};
-static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts);
+static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts);
-void vf_menu_pause_update(struct vf_instance_s* vf) {
+void vf_menu_pause_update(struct vf_instance *vf) {
const vo_functions_t *video_out = mpctx_get_video_out(vf->priv->current->ctx);
if(pause_mpi) {
put_image(vf,pause_mpi, MP_NOPTS_VALUE);
@@ -120,7 +120,7 @@ static int cmd_filter(mp_cmd_t* cmd, int paused, struct vf_priv_s * priv) {
return 0;
}
-static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static void get_image(struct vf_instance *vf, mp_image_t *mpi){
mp_image_t *dmpi;
if(mpi->type == MP_IMGTYPE_TEMP && (!(mpi->flags&MP_IMGFLAG_PRESERVE)) ) {
@@ -137,7 +137,7 @@ static int key_cb(int code) {
return menu_read_key(st_priv->current,code);
}
-static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
+static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){
mp_image_t *dmpi = NULL;
if (vf->priv->passthrough) {
@@ -213,7 +213,7 @@ static void uninit(vf_instance_t *vf) {
}
}
-static int config(struct vf_instance_s* vf, int width, int height, int d_width, int d_height,
+static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height,
unsigned int flags, unsigned int outfmt) {
#ifdef CONFIG_FREETYPE
// here is the right place to get screen dimensions
@@ -227,7 +227,7 @@ static int config(struct vf_instance_s* vf, int width, int height, int d_width,
return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
}
-static int query_format(struct vf_instance_s* vf, unsigned int fmt){
+static int query_format(struct vf_instance *vf, unsigned int fmt){
return vf_next_query_format(vf,fmt);
}