Lua: new input and input_item facilities

[vlc] / modules / misc / lua / libs / net.c

diff --git a/modules/misc/lua/libs/net.c b/modules/misc/lua/libs/net.c
index f9210b54441e7487f443468fcb0f0cfe892c4762..321da9ef27728b5f3c85bed7ff43d6919a4a8ae1 100644 (file)
--- a/modules/misc/lua/libs/net.c
+++ b/modules/misc/lua/libs/net.c
@@ -121,8 +121,7 @@ static int vlclua_net_accept( lua_State *L )
 {
     vlc_object_t *p_this = vlclua_get_this( L );
     int **ppi_fd = (int**)luaL_checkudata( L, 1, "net_listen" );
-    mtime_t i_wait = luaL_optint( L, 2, -1 ); /* default to block */
-    int i_fd = net_Accept( p_this, *ppi_fd, i_wait );
+    int i_fd = net_Accept( p_this, *ppi_fd );
     lua_pushinteger( L, i_fd );
     return 1;
 }
@@ -376,8 +375,8 @@ static const luaL_Reg vlclua_net_reg[] = {
     { "recv", vlclua_net_recv },
     { "select", vlclua_net_select },
     { "fd_set_new", vlclua_fd_set_new },
-    { "fd_read", vlclua_fd_read },
-    { "fd_write", vlclua_fd_write },
+    { "read", vlclua_fd_read },
+    { "write", vlclua_fd_write },
     { "stat", vlclua_stat }, /* Not really "net" */
     { "opendir", vlclua_opendir }, /* Not really "net" */
     { NULL, NULL }