Remove trailing whitespace, add checks for malloc return value.

[vlc] / include / vlc_devices.h

diff --git a/include/vlc_devices.h b/include/vlc_devices.h
index 78b6c7ad4470188715982afc7e83c9e099b432b8..cd20320e2e5528608d7445cbfae70160a811a223 100644 (file)
--- a/include/vlc_devices.h
+++ b/include/vlc_devices.h
@@ -2,7 +2,7 @@
  * vlc_devices.h : Devices handling
  *****************************************************************************
  * Copyright (C) 1999-2006 the VideoLAN team
- * $Id: vlc_input.h 15915 2006-06-15 21:22:35Z zorglub $
+ * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
  *
@@ -21,6 +21,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#if !defined( __LIBVLC__ )
+  #error You are not libvlc or one of its plugins. You cannot include this file
+#endif
+
 #ifndef _VLC_DEVICES_H
 #define _VLC_DEVICES_H 1
 
@@ -41,9 +45,23 @@ struct device_t
 {
     int             i_capabilities;
     int             i_media_type;
+    bool      b_seen;
     char *psz_uri;
-    char *psz_media_name;
+    char *psz_name;
 };
 
-static inline void device_GetDVD()
-{}
+struct device_probe_t
+{
+    VLC_COMMON_MEMBERS;
+    int         i_devices;
+    device_t  **pp_devices;
+
+    probe_sys_t *p_sys;
+    void      ( *pf_run )    ( device_probe_t * );  /** Run function */
+};
+
+static inline void device_GetDVD(void)
+{
+}
+
+#endif