[vlc-devel] commit: Deprecate the C rc, http and telnet interfaces. They are still available as oldrc, oldhttp and oldtelnet. ( Antoine Cellerier )
git version control
git at videolan.org
Mon Dec 21 21:56:12 CET 2009
vlc | branch: master | Antoine Cellerier <dionoea at videolan.org> | Sun Dec 20 15:31:23 2009 +0100| [57548ac9e60dacba20b414065943a89e10e59521] | committer: Antoine Cellerier
Deprecate the C rc, http and telnet interfaces. They are still available as oldrc, oldhttp and oldtelnet.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=57548ac9e60dacba20b414065943a89e10e59521
---
configure.ac | 14 +++++++-------
modules/control/Modules.am | 4 ++--
modules/control/http/Modules.am | 2 +-
modules/misc/lua/intf.c | 6 +++---
modules/misc/lua/vlc.c | 19 ++++++++++++-------
5 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/configure.ac b/configure.ac
index a13514e..5f549c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -349,7 +349,7 @@ case "${host_os}" in
VLC_ADD_LDFLAGS([vlc],[-mwindows])
VLC_ADD_LIBS([activex mozilla],[-lgdi32])
VLC_ADD_LIBS([cdda vcdx cddax sdl_image aout_sdl vout_sdl],[-lwinmm])
- VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout access_output_rtmp sap slp http stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp telnet rc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a],[-lws2_32])
+ VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout access_output_rtmp sap slp oldhttp stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp oldtelnet oldrc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a],[-lws2_32])
VLC_ADD_LIBS([access_file], [-lshlwapi])
dnl
dnl DEP and ASLR options
@@ -363,7 +363,7 @@ case "${host_os}" in
fi
if test "${SYS}" = "mingwce"; then
# add ws2 for closesocket, select, recv
- VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_rtmp sap http netsync audioscrobbler growl rtp stream_out_rtp remoteosd ts telnet audiobargraph_a],[-lws2])
+ VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_rtmp sap oldhttp netsync audioscrobbler growl rtp stream_out_rtp remoteosd ts oldtelnet audiobargraph_a],[-lws2])
VLC_ADD_LIBS([libvlccore],[-lmmtimer])
fi
;;
@@ -388,9 +388,9 @@ case "${host_os}" in
LDFLAGS_save="${LDFLAGS_save} -lintl"; LDFLAGS="${LDFLAGS_save}"
dnl Check for BONE
if test -f /boot/beos/system/lib/libbind.so; then
- VLC_ADD_LIBS([access_file access_ftp access_mms access_output_udp telnet netsync sap libvlccore growl_udp],[-lbind -lsocket])
+ VLC_ADD_LIBS([access_file access_ftp access_mms access_output_udp oldtelnet netsync sap libvlccore growl_udp],[-lbind -lsocket])
else
- VLC_ADD_LIBS([access_file access_ftp access_mms access_output_udp telnet netsync sap libvlccore growl_udp],[-lnet])
+ VLC_ADD_LIBS([access_file access_ftp access_mms access_output_udp oldtelnet netsync sap libvlccore growl_udp],[-lnet])
fi
dnl Ugly check for Zeta
@@ -1232,7 +1232,7 @@ AC_LANG_POP(C++)
if test "${SYS}" != "mingwce"; then
VLC_ADD_PLUGIN([gestures])
- VLC_ADD_PLUGIN([rc])
+ VLC_ADD_PLUGIN([oldrc])
VLC_ADD_PLUGIN([hotkeys])
VLC_ADD_PLUGIN([showintf])
VLC_ADD_PLUGIN([marq])
@@ -1805,7 +1805,7 @@ AC_ARG_ENABLE(httpd,
[ --enable-httpd HTTP daemon (default enabled)])
if test "${enable_httpd}" != "no"
then
- VLC_ADD_PLUGIN([http])
+ VLC_ADD_PLUGIN([oldhttp])
AC_DEFINE(ENABLE_HTTPD, 1, Define if you want the HTTP dameon support)
fi
AM_CONDITIONAL(BUILD_HTTPD, [test "${enable_httpd}" != "no"])
@@ -1839,7 +1839,7 @@ AS_IF([test "${enable_vlm}" != "no"], [
AC_MSG_ERROR([VLM requires the stream output. Do not use --disable-sout.])
])
AC_DEFINE(ENABLE_VLM, 1, [Define if you want the VideoLAN manager support])
- VLC_ADD_PLUGIN([telnet])
+ VLC_ADD_PLUGIN([oldtelnet])
])
AM_CONDITIONAL([ENABLE_VLM], [test "${enable_vlm}" != "no"])
diff --git a/modules/control/Modules.am b/modules/control/Modules.am
index 62f72bb..acaaa5c 100644
--- a/modules/control/Modules.am
+++ b/modules/control/Modules.am
@@ -1,11 +1,11 @@
SUBDIRS = http globalhotkeys
SOURCES_gestures = gestures.c
-SOURCES_telnet = telnet.c
+SOURCES_oldtelnet = telnet.c
SOURCES_netsync = netsync.c
SOURCES_ntservice = ntservice.c
SOURCES_hotkeys = hotkeys.c
SOURCES_lirc = lirc.c
-SOURCES_rc = rc.c
+SOURCES_oldrc = rc.c
SOURCES_dbus = dbus.c dbus.h
SOURCES_signals = signals.c
if HAVE_DARWIN
diff --git a/modules/control/http/Modules.am b/modules/control/http/Modules.am
index da2b0ec..2020956 100644
--- a/modules/control/http/Modules.am
+++ b/modules/control/http/Modules.am
@@ -1,4 +1,4 @@
-SOURCES_http = \
+SOURCES_oldhttp = \
http.c \
http.h \
rpn.c \
diff --git a/modules/misc/lua/intf.c b/modules/misc/lua/intf.c
index 424a32d..538faf1 100644
--- a/modules/misc/lua/intf.c
+++ b/modules/misc/lua/intf.c
@@ -99,13 +99,13 @@ static const struct
const char *psz_name;
} pp_shortcuts[] = {
{ "luarc", "rc" },
- /* { "rc", "rc" }, */
+ { "rc", "rc" },
{ "luahotkeys", "hotkeys" },
/* { "hotkeys", "hotkeys" }, */
{ "luatelnet", "telnet" },
- /* { "telnet", "telnet" }, */
+ { "telnet", "telnet" },
{ "luahttp", "http" },
- /* { "http", "http" }, */
+ { "http", "http" },
{ NULL, NULL } };
static bool WordInList( const char *psz_list, const char *psz_word )
diff --git a/modules/misc/lua/vlc.c b/modules/misc/lua/vlc.c
index f26638e..275fcc0 100644
--- a/modules/misc/lua/vlc.c
+++ b/modules/misc/lua/vlc.c
@@ -73,16 +73,21 @@ vlc_module_begin ()
set_callbacks( Import_LuaPlaylist, Close_LuaPlaylist )
add_submodule ()
- add_shortcut( "luaintf" )
+ set_description( N_("Lua Interface Module (shortcuts)") )
add_shortcut( "luarc" )
- /* add_shortcut( "rc" ) */
+ add_shortcut( "rc" )
+ set_capability( "interface", 25 )
+ set_callbacks( Open_LuaIntf, Close_LuaIntf )
+
+ add_submodule ()
+ set_description( N_("Lua Interface Module") )
+ add_shortcut( "luaintf" )
+ add_shortcut( "luahttp" )
+ add_shortcut( "http" )
+ add_shortcut( "luatelnet" )
+ add_shortcut( "telnet" )
add_shortcut( "luahotkeys" )
/* add_shortcut( "hotkeys" ) */
- add_shortcut( "luatelnet" )
- /* add_shortcut( "telnet" ) */
- add_shortcut( "luahttp" )
- /* add_shortcut( "http" ) */
- set_description( N_("Lua Interface Module") )
set_capability( "interface", 0 )
add_string( "lua-intf", "dummy", NULL,
INTF_TEXT, INTF_LONGTEXT, false )
More information about the vlc-devel
mailing list