Merge back branch 0.8.6-playlist-vlm to trunk.

[vlc] / include / vlc_objects.h

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 768fb57dd30a68e675d16b9fd5fe7f14cae4c8b6..6f8af171419095bfa2f132b4da2767ad01de8adf 100644 (file)
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -18,12 +18,12 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /**
  * \file
- * This file defines the vlc_object_t structure and object types
+ * This file defines the vlc_object_t structure and object types.
  */
 
 /**
@@ -60,6 +60,8 @@
 #define VLC_OBJECT_SD         (-26)
 #define VLC_OBJECT_XML        (-27)
 #define VLC_OBJECT_OSDMENU    (-28)
+#define VLC_OBJECT_STATS      (-29)
+#define VLC_OBJECT_HTTPD_HOST (-30)
 
 #define VLC_OBJECT_GENERIC  (-666)
 
@@ -70,6 +72,11 @@
 
 #define FIND_STRICT         0x0010
 
+/* Object flags */
+#define OBJECT_FLAGS_NODBG       0x0001
+#define OBJECT_FLAGS_QUIET       0x0002
+#define OBJECT_FLAGS_NOINTERACT  0x0004
+
 /*****************************************************************************
  * The vlc_object_t type. Yes, it's that simple :-)
  *****************************************************************************/
@@ -92,6 +99,7 @@ VLC_EXPORT( void, __vlc_object_yield, ( vlc_object_t * ) );
 VLC_EXPORT( void, __vlc_object_release, ( vlc_object_t * ) );
 VLC_EXPORT( vlc_list_t *, __vlc_list_find, ( vlc_object_t *, int, int ) );
 VLC_EXPORT( void, vlc_list_release, ( vlc_list_t * ) );
+VLC_EXPORT( vlc_t *, vlc_current_object, ( int ) );
 
 /*}@*/
 
@@ -122,4 +130,3 @@ VLC_EXPORT( void, vlc_list_release, ( vlc_list_t * ) );
 
 #define vlc_list_find(a,b,c) \
     __vlc_list_find( VLC_OBJECT(a),b,c)
-