libvlc: add mouse events as libvlc_MediaPlayerEvents

[vlc] / src / video_output / video_output.c

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 5004d42b5c5082162c43108bc85ecc9528207152..58ce6603ad86b21b12790ba23ccfd26b1ae51441 100644 (file)
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -38,11 +38,6 @@
 #include <stdlib.h>                                                /* free() */
 #include <string.h>
 
-
-#ifdef HAVE_SYS_TIMES_H
-#   include <sys/times.h>
-#endif
-
 #include <vlc_vout.h>
 
 #include <vlc_filter.h>
@@ -144,20 +139,21 @@ static void video_del_buffer_filter( filter_t *p_filter, picture_t *p_pic )
 
 static int video_filter_buffer_allocation_init( filter_t *p_filter, void *p_data )
 {
-    p_filter->pf_vout_buffer_new = video_new_buffer_filter;
-    p_filter->pf_vout_buffer_del = video_del_buffer_filter;
+    p_filter->pf_video_buffer_new = video_new_buffer_filter;
+    p_filter->pf_video_buffer_del = video_del_buffer_filter;
     p_filter->p_owner = p_data; /* p_vout */
     return VLC_SUCCESS;
 }
 
+#undef vout_Request
 /*****************************************************************************
  * vout_Request: find a video output thread, create one, or destroy one.
  *****************************************************************************
  * This function looks for a video output thread matching the current
  * properties. If not found, it spawns a new one.
  *****************************************************************************/
-vout_thread_t *__vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout,
-                               video_format_t *p_fmt )
+vout_thread_t *vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout,
+                             video_format_t *p_fmt )
 {
     if( !p_fmt )
     {
@@ -281,13 +277,14 @@ vout_thread_t *__vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout,
     return p_vout;
 }
 
+#undef vout_Create
 /*****************************************************************************
  * vout_Create: creates a new video output thread
  *****************************************************************************
  * This function creates a new video output thread, and returns a pointer
  * to its description. On error, it returns NULL.
  *****************************************************************************/
-vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
+vout_thread_t * vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
 {
     vout_thread_t  * p_vout;                            /* thread descriptor */
     int              i_index;                               /* loop variable */
@@ -410,6 +407,8 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
     var_Create( p_vout, "mouse-button-down", VLC_VAR_INTEGER );
     var_Create( p_vout, "mouse-moved", VLC_VAR_BOOL );
     var_Create( p_vout, "mouse-clicked", VLC_VAR_BOOL );
+    /* Mouse object (area of interest in a video filter) */
+    var_Create( p_vout, "mouse-object", VLC_VAR_BOOL );
 
     /* Initialize subpicture unit */
     p_vout->p_spu = spu_Create( p_vout );
@@ -468,7 +467,7 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
     /* Choose the video output module */
     if( !p_vout->p->psz_filter_chain || !*p_vout->p->psz_filter_chain )
     {
-        psz_parser = var_CreateGetString( p_vout, "vout" );
+        psz_parser = NULL;
     }
     else
     {
@@ -744,7 +743,7 @@ void vout_DisplayTitle( vout_thread_t *p_vout, const char *psz_title )
 {
     assert( psz_title );
 
-    if( !config_GetInt( p_vout, "osd" ) )
+    if( !var_InheritBool( p_vout, "osd" ) )
         return;
 
     vlc_mutex_lock( &p_vout->change_lock );
@@ -1446,16 +1445,6 @@ static void CleanThread( vout_thread_t *p_vout )
  *****************************************************************************/
 static void EndThread( vout_thread_t *p_vout )
 {
-#ifdef STATS
-    {
-        struct tms cpu_usage;
-        times( &cpu_usage );
-
-        msg_Dbg( p_vout, "cpu usage (user: %d, system: %d)",
-                 cpu_usage.tms_utime, cpu_usage.tms_stime );
-    }
-#endif
-
     /* FIXME does that function *really* need to be called inside the thread ? */
 
     /* Detach subpicture unit from both input and vout */
@@ -1508,7 +1497,7 @@ static int ChromaCreate( vout_thread_t *p_vout )
 
         return VLC_EGENERIC;
     }
-    p_chroma->pf_vout_buffer_new = ChromaGetPicture;
+    p_chroma->pf_video_buffer_new = ChromaGetPicture;
     return VLC_SUCCESS;
 }