Generate Windows resource file on need basis

[vlc] / src / video_output / video_output.c

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 0c09a45dd1ef0a5a0157fe890df83171a4d129d5..584f73ce51190c133bd2c33af768d7843f6581d5 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,8 +139,8 @@ 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;
 }
@@ -468,7 +463,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
     {
@@ -589,21 +584,6 @@ static void vout_Destructor( vlc_object_t * p_this )
 
     free( p_vout->p );
 
-#ifndef __APPLE__
-    vout_thread_t *p_another_vout;
-
-    /* This is a dirty hack mostly for Linux, where there is no way to get the
-     * GUI back if you closed it while playing video. This is solved in
-     * Mac OS X, where we have this novelty called menubar, that will always
-     * allow you access to the applications main functionality. They should try
-     * that on linux sometime. */
-    p_another_vout = vlc_object_find( p_this->p_libvlc,
-                                      VLC_OBJECT_VOUT, FIND_ANYWHERE );
-    if( p_another_vout == NULL )
-        var_SetBool( p_this->p_libvlc, "intf-show", true );
-    else
-        vlc_object_release( p_another_vout );
-#endif
 }
 
 /* */
@@ -759,7 +739,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 );
@@ -1461,16 +1441,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 */
@@ -1523,7 +1493,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;
 }