X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fdevices.c;h=e6241c8d473f6520560257fd1f5b609363ddc31b;hb=7686840e5c2b384eab661455a5e532a97c669e96;hp=3d8f6be141122413919e661b899f09cab45f7d90;hpb=f485214f09dd284cbb85674e937fbbb0a6032a2e;p=vlc

diff --git a/src/misc/devices.c b/src/misc/devices.c
index 3d8f6be141..e6241c8d47 100644
--- a/src/misc/devices.c
+++ b/src/misc/devices.c
@@ -2,9 +2,9 @@
  * devices.c : Handling of devices probing
  *****************************************************************************
  * Copyright (C) 1998-2004 the VideoLAN team
- * $Id: cpu.c 14103 2006-02-01 12:44:16Z sam $
+ * $Id$
  *
- * Authors: ClÃment Stenac <zorglub@videolan.org>
+ * Authors: Clément Stenac <zorglub@videolan.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,32 +21,38 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#if 0
+
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
 #include <vlc/intf.h>
 #include <vlc_devices.h>
 
+static intf_thread_t *p_probe_thread = NULL;
+
 void devices_ProbeCreate( vlc_object_t *p_this )
 {
     intf_thread_t * p_probe;
-    p_this->p_libvlc_global->p_probe = NULL;
 
     /* Allocate structure */
     p_probe = vlc_object_create( p_this, VLC_OBJECT_INTF );
     if( !p_probe )
-    {
-        msg_Err( p_this, "out of memory" );
         return;
-    }
-    p_probe->p_module = module_Need( p_probe, "devices probe", "", VLC_FALSE );
+    p_probe->p_module = module_Need( p_probe, "devices probe", "", false );
     if( p_probe->p_module == NULL )
     {
         msg_Err( p_this, "no devices probing module could be loaded" );
-        vlc_object_destroy( p_probe );
+        vlc_object_release( p_probe );
         return;
     }
 
-    p_this->p_libvlc_global->p_probe = p_probe;
+    p_probe_thread = p_probe;
 }
+
+#endif