Changeset 13a1c6b8b8c82e1234d11b8b90c9ceb488ee55f0

Timestamp:

31/05/08 21:30:46 (4 months ago)

Author:

Rémi Denis-Courmont <rdenis@simphalempin.com>

git-committer:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1212262246 +0300

git-parent:

[5ba2255e622499a3bb545e89c84a675f0adde07f]

git-author:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1212262246 +0300

Message:

Remove VLC_* dead APIs

Files:

• po/POTFILES.in (modified) (2 diffs)
• src/Makefile.am (modified) (1 diff)
• src/libvlc-common.c (deleted)
• src/libvlc.c (modified) (3 diffs)

po/POTFILES.in

@@ -15 +15 @@
-include/vlc_codec_synchro.h
-include/vlc_common.h
-include/vlc/common.h
-include/vlc_config_cat.h
-include/vlc_config.h
@@ -134 +133 @@
-src/interface/intf_eject.c
-src/libvlc.c
-src/libvlc-common.c
-src/libvlc.h
-src/libvlc-module.c

src/Makefile.am

@@ -265 +265 @@
-SOURCES_libvlc_common = \
-    libvlc.c \
-    libvlc-common.c \
-    libvlc.h \
-    libvlc-module.c \

src/libvlc.c

@@ -1 +1 @@
-/*****************************************************************************
-Implementation of the old libvlc API
+libvlc instances creation and deletion, interfaces handling
- *****************************************************************************
-7
+8
- * $Id$
- *
@@ -26 +26 @@
- *****************************************************************************/
-
-
-
-
-
-
-
+
+
+
-
-/*****************************************************************************
@@ -41 +38 @@
-
-#include <vlc_common.h>
-
-#include "control/libvlc_internal.h"
+#include <vlc_input.h>
+
+#include "modules/modules.h"
+#include "config/configuration.h"
+#include "interface/interface.h"
+
+#include <errno.h>                                                 /* ENOMEM */
+#include <stdio.h>                                              /* sprintf() */
+#include <string.h>
+#include <stdlib.h>                                                /* free() */
+
+#ifndef WIN32
+#   include <netinet/in.h>                            /* BSD: struct in_addr */
+#endif
+
+#ifdef HAVE_UNISTD_H
+#   include <unistd.h>
+#elif defined( WIN32 ) && !defined( UNDER_CE )
+#   include <io.h>
+#endif
+
+#ifdef WIN32                       /* optind, getopt(), included in unistd.h */
+#   include "extras/getopt.h"
+#endif
+
+#ifdef HAVE_LOCALE_H
+#   include <locale.h>
+#endif
+
+#ifdef HAVE_DBUS_3
+/* used for one-instance mode */
+#   include <dbus/dbus.h>
+#endif
+
+#ifdef HAVE_HAL
+#   include <hal/libhal.h>
+#endif
+
+#include <vlc_playlist.h>
+#include <vlc_interface.h>
+
+#include <vlc_aout.h>
+#include "audio_output/aout_internal.h"
+
+#include <vlc_vout.h>
+
+#include <vlc_sout.h>
+#include "stream_output/stream_output.h"
+
+#include <vlc_charset.h>
+
-#include "libvlc.h"
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-/*****************************************************************************
-VLC_VariableSet: set a "safe" vlc variable
+The evil global variables. We handle them with care, don't worry.
- *****************************************************************************/
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return VLC_EGENERIC;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-
-
-
-
+
+
+
+
+
-{
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+