A bit of vlc/libvlc cleanup:

[vlc] / include / vlc / vlc.h

diff --git a/include/vlc/vlc.h b/include/vlc/vlc.h
index e7667d3f29239c1323c20d3864b881072bd1be77..0f1144632852385750424fde6f073d11324f3908 100644 (file)
--- a/include/vlc/vlc.h
+++ b/include/vlc/vlc.h
@@ -21,7 +21,7 @@
  *
  * 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.
  *****************************************************************************/
 
 /**
@@ -138,24 +138,24 @@ struct vlc_list_t
 
 /* Used by VLC_AddTarget() */
 #define PLAYLIST_INSERT          0x0001
-#define PLAYLIST_REPLACE         0x0002
-#define PLAYLIST_APPEND          0x0004
-#define PLAYLIST_GO              0x0008
-#define PLAYLIST_CHECK_INSERT    0x0010
+#define PLAYLIST_APPEND          0x0002
+#define PLAYLIST_GO              0x0004
+#define PLAYLIST_PREPARSE        0x0008
+#define PLAYLIST_SPREPARSE       0x0010
 
 #define PLAYLIST_END           -666
 
 /*****************************************************************************
  * Required internal headers
  *****************************************************************************/
-#if defined( __VLC__ )
+#if defined( __LIBVLC__ )
 #   include "vlc_common.h"
 #endif
 
 /*****************************************************************************
  * Exported libvlc API
  *****************************************************************************/
-#if !defined( __VLC__ )
+#if !defined( __LIBVLC__ )
 /* Otherwise they are declared and exported in vlc_common.h */
 /**
  * Retrieve libvlc version
@@ -214,7 +214,7 @@ char const * VLC_Changeset ( void );
  */
 char const * VLC_Error ( int i_err );
 
-#endif /* __VLC__ */
+#endif /* __LIBVLC__ */
 
 /**
  * Initialize libvlc