* include/interface.h: renamed this file to vlc_interface.h to avoid name

    collisions with a couple of plugins.

diff --git a/include/vlc/intf.h b/include/vlc/intf.h
index 3d325b29ee5fac255f9beb33f3e7c3d98e343c5b..c8185f7bf7ba5f2791b658e3c0d6a7854c5fa8ea 100644 (file)
--- a/include/vlc/intf.h
+++ b/include/vlc/intf.h
@@ -2,7 +2,7 @@
  * intf.h: interface header for vlc
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: intf.h,v 1.2 2002/06/07 23:53:44 sam Exp $
+ * $Id: intf.h,v 1.3 2003/06/24 13:33:49 sam Exp $
  *
  * 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
@@ -34,7 +34,7 @@ extern "C" {
 /*****************************************************************************
  * Required internal headers
  *****************************************************************************/
-#include "interface.h"
+#include "vlc_interface.h"
 #include "intf_eject.h"
 #include "vlc_playlist.h"
 #include "stream_control.h"

diff --git a/include/interface.h b/include/vlc_interface.h
similarity index 96%
rename from include/interface.h
rename to include/vlc_interface.h
index f6717d346e63ff59f0967c16b6743cfc0401d0b4..02e6d4551ca6cb959fb7537f8e2b1d7981bf5a2a 100644 (file)
--- a/include/interface.h
+++ b/include/vlc_interface.h
@@ -1,10 +1,10 @@
 /*****************************************************************************
- * interface.h: interface access for other threads
+ * vlc_interface.h: interface access for other threads
  * This library provides basic functions for threads to interact with user
  * interface, such as message output.
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: interface.h,v 1.41 2003/06/22 15:43:54 gbazin Exp $
+ * $Id: vlc_interface.h,v 1.1 2003/06/24 13:33:49 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *

diff --git a/src/input/input.c b/src/input/input.c
index e9e8e42e55dc0ad247ffec83c39d261d3b79f81d..2d51bfa59fb1806e877ca566e2c39e2b6d8f2c82 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -4,7 +4,7 @@
  * decoders.
  *****************************************************************************
  * Copyright (C) 1998-2002 VideoLAN
- * $Id: input.c,v 1.230 2003/05/22 16:01:02 gbazin Exp $
+ * $Id: input.c,v 1.231 2003/06/24 13:33:48 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -46,7 +46,7 @@
 #include "stream_output.h"
 #include <vlc/vout.h>
 
-#include "interface.h"
+#include "vlc_interface.h"
 
 /*****************************************************************************
  * Local prototypes

diff --git a/src/input/input_info.c b/src/input/input_info.c
index 507e88dbe8184c14a7d899e8dff22b3c486e5d9f..2392309794cde5d4e6f1726a88a41ae318313fde 100644 (file)
--- a/src/input/input_info.c
+++ b/src/input/input_info.c
@@ -2,7 +2,7 @@
  * input_info.c: Convenient functions to handle the input info structures
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: input_info.c,v 1.10 2003/05/08 19:06:46 titer Exp $
+ * $Id: input_info.c,v 1.11 2003/06/24 13:33:48 sam Exp $
  *
  * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
  *
@@ -31,7 +31,7 @@
 
 #include "stream_control.h"
 #include "input_ext-intf.h"
-#include "interface.h"
+#include "vlc_interface.h"
 
 /**
  * \brief Find info category by name.

diff --git a/src/interface/interface.c b/src/interface/interface.c
index f964912b4edde7a0feb006f8bf668b184667dac3..979cbc8adecb822cbf3910a82e51ce5b4aca35b1 100644 (file)
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -4,7 +4,7 @@
  * interface, such as command line.
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: interface.c,v 1.103 2003/02/07 01:09:12 sam Exp $
+ * $Id: interface.c,v 1.104 2003/06/24 13:33:49 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -37,7 +37,7 @@
 
 #include "audio_output.h"
 
-#include "interface.h"
+#include "vlc_interface.h"
 
 #include "video.h"
 #include "video_output.h"

diff --git a/src/libvlc.c b/src/libvlc.c
index e5d458a486d06ab2d687fe1cf1d7ee3be7af472a..3803151ecdf0cde26d8946870230bb6fc265ac25 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -2,7 +2,7 @@
  * libvlc.c: main libvlc source
  *****************************************************************************
  * Copyright (C) 1998-2002 VideoLAN
- * $Id: libvlc.c,v 1.89 2003/06/21 21:59:12 sam Exp $
+ * $Id: libvlc.c,v 1.90 2003/06/24 13:33:49 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -69,7 +69,7 @@
 #include "input_ext-intf.h"
 
 #include "vlc_playlist.h"
-#include "interface.h"
+#include "vlc_interface.h"
 
 #include "audio_output.h"
 

diff --git a/src/misc/messages.c b/src/misc/messages.c
index 7ecae43d601e6eec45171e7ac24aed7ad02f0e52..8d01dea5c92f0e00062bb45a8fc7eb7b04308232 100644 (file)
--- a/src/misc/messages.c
+++ b/src/misc/messages.c
@@ -4,7 +4,7 @@
  * modules, especially intf modules. See config.h for output configuration.
  *****************************************************************************
  * Copyright (C) 1998-2002 VideoLAN
- * $Id: messages.c,v 1.33 2003/06/13 03:21:40 sam Exp $
+ * $Id: messages.c,v 1.34 2003/06/24 13:33:49 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -46,7 +46,7 @@
 #   include <unistd.h>                                   /* close(), write() */
 #endif
 
-#include "interface.h"
+#include "vlc_interface.h"
 
 /*****************************************************************************
  * Local macros

diff --git a/src/misc/modules.c b/src/misc/modules.c
index 7ca81367817c5aaec94e712865d5772572ce2342..f9f24e56266698b73d1c19d6fc2cdc5e67883308 100644 (file)
--- a/src/misc/modules.c
+++ b/src/misc/modules.c
@@ -2,7 +2,7 @@
  * modules.c : Builtin and plugin modules management functions
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: modules.c,v 1.121 2003/06/23 16:09:13 gbazin Exp $
+ * $Id: modules.c,v 1.122 2003/06/24 13:33:49 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Ethan C. Baldridge <BaldridgeE@cadmus.com>
@@ -69,7 +69,7 @@
 
 #include "error.h"
 
-#include "interface.h"
+#include "vlc_interface.h"
 #include "vlc_playlist.h"
 #include "intf_eject.h"
 

diff --git a/src/misc/objects.c b/src/misc/objects.c
index d8e0cdd2be7b0de0b8f5f7a842c6ff135d5edaf2..f1512ffd20e1233881f09aeaca947e76d38c4d48 100644 (file)
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -2,7 +2,7 @@
  * objects.c: vlc_object_t handling
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: objects.c,v 1.35 2003/02/23 19:07:02 fenrir Exp $
+ * $Id: objects.c,v 1.36 2003/06/24 13:33:49 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -42,7 +42,7 @@
 #include "stream_output.h"
 
 #include "vlc_playlist.h"
-#include "interface.h"
+#include "vlc_interface.h"
 
 #include "httpd.h"
 /*****************************************************************************