Prepare to privatize some members of VLC_COMMON_MEMBERS

[vlc] / src / libvlc.h

diff --git a/src/libvlc.h b/src/libvlc.h
index ee4434eb08db54107694d338d0f189fc2068213c..9aedae50f208455b0036b269118587392f22a3bb 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -1,9 +1,12 @@
 /*****************************************************************************
  * libvlc.h: Internal libvlc generic/misc declaration
  *****************************************************************************
+ * Copyright (C) 1999, 2000, 2001, 2002 the VideoLAN team
  * Copyright © 2006-2007 Rémi Denis-Courmont
  * $Id$
  *
+ * Authors: Vincent Seguin <seguin@via.ecp.fr>
+ *
  * 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
  * the Free Software Foundation; either version 2 of the License, or
@@ -34,7 +37,6 @@ extern vlc_object_t *
 vlc_custom_create (vlc_object_t *p_this, size_t i_size, int i_type,
                    const char *psz_type);
 
-#if 0
 /*****************************************************************************
  * libvlc_global_data_t (global variable)
  *****************************************************************************
@@ -71,9 +73,25 @@ struct libvlc_global_data_t
     char *                 psz_vlcpath;
 #endif
 };
-#endif
 
+#define vlc_global( a ) __vlc_global( VLC_OBJECT( a ) )
+static inline libvlc_global_data_t *__vlc_global( vlc_object_t *p_this )
+{
+    return (libvlc_global_data_t *)p_this->p_libvlc_global;
+}
 
 extern uint32_t cpu_flags;
+uint32_t CPUCapabilities( void );
+
+/* Private LibVLC data for each objects */
+struct vlc_object_internals_t
+{
+
+};
+
+static inline vlc_object_internals_t *vlc_internals( vlc_object_t *obj )
+{
+    return obj->p_internals;
+}
 
 #endif