Commit e01eb15e authored by Sam Hocevar's avatar Sam Hocevar

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

    collisions with a couple of plugins.
parent a38fc196
......@@ -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"
......
/*****************************************************************************
* 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>
*
......
......@@ -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
......
......@@ -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.
......
......@@ -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"
......
......@@ -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"
......
......@@ -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
......
......@@ -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"
......
......@@ -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"
/*****************************************************************************
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment