[vlc-commits] Win32: revert to old rc interface

[Pierre Ynard]

vlc/vlc-1.1 | branch: master | Pierre Ynard <linkfanel at yahoo.fr> | Mon Feb 14 00:29:50 2011 +0100| [a64a47441020e07dbc0070bc55ad7a3e35221e7f] | committer: Pierre Ynard

Win32: revert to old rc interface

See #4455. The lua interface merely polls, reads and writes on file
descriptors 0 and 1, and expects it to work. There is no support for
spawning a console and redirecting/getting file descriptors to it, and
file descriptors are mixed with socket descriptors and polled, which
won't work on windows. Until something is done about it, revert to the
old rc interface

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=a64a47441020e07dbc0070bc55ad7a3e35221e7f
---

 modules/control/rc.c    |    3 +++
 modules/misc/lua/intf.c |    2 ++
 modules/misc/lua/vlc.c  |    2 ++
 3 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/modules/control/rc.c b/modules/control/rc.c
index e3fca8c..631f145 100644
--- a/modules/control/rc.c
+++ b/modules/control/rc.c
@@ -201,6 +201,9 @@ vlc_module_begin ()
     set_capability( "interface", 20 )
 
     set_callbacks( Activate, Deactivate )
+#ifdef WIN32
+    add_shortcut( "rc" )
+#endif
 vlc_module_end ()
 
 /*****************************************************************************
diff --git a/modules/misc/lua/intf.c b/modules/misc/lua/intf.c
index f79e0ef..7ff18e5 100644
--- a/modules/misc/lua/intf.c
+++ b/modules/misc/lua/intf.c
@@ -72,7 +72,9 @@ static const struct
     const char *psz_name;
 } pp_shortcuts[] = {
     { "luarc", "rc" },
+#ifndef WIN32
     { "rc", "rc" },
+#endif
     /* { "luahotkeys", "hotkeys" }, */
     /* { "hotkeys", "hotkeys" }, */
     { "luatelnet", "telnet" },
diff --git a/modules/misc/lua/vlc.c b/modules/misc/lua/vlc.c
index ba866ca..88bc941 100644
--- a/modules/misc/lua/vlc.c
+++ b/modules/misc/lua/vlc.c
@@ -143,7 +143,9 @@ vlc_module_begin ()
     add_submodule ()
         set_description( N_("Lua Interface Module (shortcuts)") )
         add_shortcut( "luarc" )
+#ifndef WIN32
         add_shortcut( "rc" )
+#endif
         set_capability( "interface", 25 )
         set_callbacks( Open_LuaIntf, Close_LuaIntf )