[vlc-devel] commit: Made vout_display_t::manage() optional. (Laurent Aimar )
git version control
git at videolan.org
Sun Sep 27 11:54:25 CEST 2009
vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sat Sep 26 21:12:10 2009 +0200| [7d6feff668bd4b361e7d504fda33c4ae3b8d98e4] | committer: Laurent Aimar
Made vout_display_t::manage() optional.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7d6feff668bd4b361e7d504fda33c4ae3b8d98e4
---
include/vlc_vout_display.h | 2 +-
src/video_output/display.c | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/include/vlc_vout_display.h b/include/vlc_vout_display.h
index 5ac63e9..9f97fba 100644
--- a/include/vlc_vout_display.h
+++ b/include/vlc_vout_display.h
@@ -293,7 +293,7 @@ struct vout_display_t {
/* Control on the module (mandatory) */
int (*control)(vout_display_t *, int, va_list);
- /* Manage pending event (mandatory for now) */
+ /* Manage pending event (optional) */
void (*manage)(vout_display_t *);
/* Private place holder for the vout_display_t module (optional)
diff --git a/src/video_output/display.c b/src/video_output/display.c
index 2bcef79..e3a3305 100644
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -161,7 +161,8 @@ static int vout_display_Control(vout_display_t *vd, int query, ...)
}
static void vout_display_Manage(vout_display_t *vd)
{
- vd->manage(vd);
+ if (vd->manage)
+ vd->manage(vd);
}
/* */
More information about the vlc-devel
mailing list