Use var_Inherit* instead of var_CreateGet*.

[vlc] / include / vlc / vlc.h

diff --git a/include/vlc/vlc.h b/include/vlc/vlc.h
index e40c6c00f6adfbe322699bbcf9a754b11502c738..73b4922a757242cf954b153516768000a9e5db9f 100644 (file)
--- a/include/vlc/vlc.h
+++ b/include/vlc/vlc.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * vlc.h: global header for libvlc
  *****************************************************************************
- * Copyright (C) 1998-2004 the VideoLAN team
+ * Copyright (C) 1998-2008 the VideoLAN team
  * $Id$
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
@@ -25,21 +25,27 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_VLC_H
-#define _VLC_VLC_H 1
+#ifndef VLC_VLC_H
+#define VLC_VLC_H 1
 
-# ifdef __LIBVLC__
-#  include <vlc_common.h> /* FIXME */
-# endif
+/**
+ * \file
+ * This file defines libvlc new external API
+ */
 
 # ifdef __cplusplus
 extern "C" {
 # endif
 
 #include <vlc/libvlc_structures.h>
-#include <vlc/libvlc_events.h>
 #include <vlc/libvlc.h>
+#include <vlc/libvlc_media.h>
+#include <vlc/libvlc_media_player.h>
 #include <vlc/libvlc_media_list.h>
+#include <vlc/libvlc_media_list_player.h>
+#include <vlc/libvlc_media_library.h>
+#include <vlc/libvlc_media_discoverer.h>
+#include <vlc/libvlc_events.h>
 #include <vlc/libvlc_vlm.h>
 #include <vlc/deprecated.h>
 
@@ -47,10 +53,4 @@ extern "C" {
 }
 # endif
 
-#define LICENSE_MSG \
-  _("This program comes with NO WARRANTY, to the extent permitted by " \
-    "law.\nYou may redistribute it under the terms of the GNU General " \
-    "Public License;\nsee the file named COPYING for details.\n" \
-    "Written by the VideoLAN team; see the AUTHORS file.\n")
-
 #endif /* _VLC_VLC_H */