threads: Make sure we don't re-create a thread if the object has already one.

[vlc] / modules / video_output / x11 / x11.c

diff --git a/modules/video_output/x11/x11.c b/modules/video_output/x11/x11.c
index 1ef3aaf2717f05dd59bac5e8824a3ffb8ce5c985..9da6f1038a5ca4bfbae223f90953267fac70ce82 100644 (file)
--- a/modules/video_output/x11/x11.c
+++ b/modules/video_output/x11/x11.c
@@ -31,14 +31,14 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 /*****************************************************************************
  * Exported prototypes
  *****************************************************************************/
-extern int  E_(Activate)   ( vlc_object_t * );
-extern void E_(Deactivate) ( vlc_object_t * );
+extern int  Activate   ( vlc_object_t * );
+extern void Deactivate ( vlc_object_t * );
 
 /*****************************************************************************
  * Module descriptor
@@ -78,8 +78,8 @@ vlc_module_begin();
 #ifdef HAVE_XINERAMA
     add_integer ( "x11-xineramascreen", 0, NULL, SCREEN_TEXT, SCREEN_LONGTEXT, true );
 #endif
-    set_description( _("X11 video output") );
+    set_description( N_("X11 video output") );
     set_capability( "video output", 70 );
-    set_callbacks( E_(Activate), E_(Deactivate) );
+    set_callbacks( Activate, Deactivate );
 vlc_module_end();