Some heavy changes today:

[vlc] / plugins / fb / vout_fb.c

diff --git a/plugins/fb/vout_fb.c b/plugins/fb/vout_fb.c
index 8ea49bff3cfaed3b7e84ddbe04ddc31ebe70c2dc..6d8bd2285a0e3d0b0ad9afbdd204aaeacabf2203 100644 (file)
--- a/plugins/fb/vout_fb.c
+++ b/plugins/fb/vout_fb.c
@@ -2,7 +2,7 @@
  * vout_fb.c: framebuffer video output display method
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: vout_fb.c,v 1.15 2001/12/07 18:33:07 sam Exp $
+ * $Id: vout_fb.c,v 1.16 2001/12/30 07:09:55 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -21,14 +21,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#define MODULE_NAME fb
-#include "modules_inner.h"
-
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include "defs.h"
-
 #include <errno.h>                                                 /* ENOMEM */
 #include <signal.h>                                      /* SIGUSR1, SIGUSR2 */
 #include <stdlib.h>                                                /* free() */
@@ -44,18 +39,11 @@
 #include <linux/vt.h>                                                /* VT_* */
 #include <linux/kd.h>                                                 /* KD* */
 
-#include "common.h"
-#include "intf_msg.h"
-#include "threads.h"
-#include "mtime.h"
-#include "tests.h"
-#include "modules.h"
+#include <videolan/vlc.h>
 
 #include "video.h"
 #include "video_output.h"
 
-#include "modules_export.h"
-
 /*****************************************************************************
  * vout_sys_t: video output framebuffer method descriptor
  *****************************************************************************
@@ -132,11 +120,6 @@ static int vout_Probe( probedata_t *p_data )
 {
     int i_fd;
 
-    if( TestMethod( VOUT_METHOD_VAR, "fb" ) )
-    {
-        return( 999 );
-    }
-
     i_fd = open( main_GetPszVariable( VOUT_FB_DEV_VAR,
                                       VOUT_FB_DEV_DEFAULT ), O_RDWR );
     if( i_fd == -1 )