[vlc-commits] Lua: remove non-working menu object
Rémi Denis-Courmont
git at videolan.org
Thu Jan 31 18:36:33 CET 2013
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Jan 31 18:52:40 2013 +0200| [4c4456b3c7ba8babcf528061a8387c76061395a5] | committer: Rémi Denis-Courmont
Lua: remove non-working menu object
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4c4456b3c7ba8babcf528061a8387c76061395a5
---
modules/lua/libs/osd.c | 63 ------------------------------------------------
share/lua/README.txt | 7 ------
2 files changed, 70 deletions(-)
diff --git a/modules/lua/libs/osd.c b/modules/lua/libs/osd.c
index 1b60eee..5870cb0 100644
--- a/modules/lua/libs/osd.c
+++ b/modules/lua/libs/osd.c
@@ -215,55 +215,6 @@ static int vlclua_spu_channel_clear( lua_State *L )
return 0;
}
-static int vlclua_menu_show( lua_State *L )
-{
- vlc_object_t *p_this = vlclua_get_this( L );
- osd_MenuShow( p_this );
- return 0;
-}
-
-static int vlclua_menu_hide( lua_State *L )
-{
- vlc_object_t *p_this = vlclua_get_this( L );
- osd_MenuHide( p_this );
- return 0;
-}
-
-static int vlclua_menu_prev( lua_State *L )
-{
- vlc_object_t *p_this = vlclua_get_this( L );
- osd_MenuPrev( p_this );
- return 0;
-}
-
-static int vlclua_menu_next( lua_State *L )
-{
- vlc_object_t *p_this = vlclua_get_this( L );
- osd_MenuNext( p_this );
- return 0;
-}
-
-static int vlclua_menu_up( lua_State *L )
-{
- vlc_object_t *p_this = vlclua_get_this( L );
- osd_MenuUp( p_this );
- return 0;
-}
-
-static int vlclua_menu_down( lua_State *L )
-{
- vlc_object_t *p_this = vlclua_get_this( L );
- osd_MenuDown( p_this );
- return 0;
-}
-
-static int vlclua_menu_activate( lua_State *L )
-{
- vlc_object_t *p_this = vlclua_get_this( L );
- osd_MenuActivate( p_this );
- return 0;
-}
-
/*****************************************************************************
*
*****************************************************************************/
@@ -276,23 +227,9 @@ static const luaL_Reg vlclua_osd_reg[] = {
{ NULL, NULL }
};
-static const luaL_Reg vlclua_menu_reg[] = {
- { "show", vlclua_menu_show },
- { "hide", vlclua_menu_hide },
- { "prev", vlclua_menu_prev },
- { "next", vlclua_menu_next },
- { "up", vlclua_menu_up },
- { "down", vlclua_menu_down },
- { "activate", vlclua_menu_activate },
- { NULL, NULL }
-};
-
void luaopen_osd( lua_State *L )
{
lua_newtable( L );
luaL_register( L, NULL, vlclua_osd_reg );
- lua_newtable( L );
- luaL_register( L, NULL, vlclua_menu_reg );
- lua_setfield( L, -2, "menu" );
lua_setfield( L, -2, "osd" );
}
diff --git a/share/lua/README.txt b/share/lua/README.txt
index d977693..74512be 100644
--- a/share/lua/README.txt
+++ b/share/lua/README.txt
@@ -220,13 +220,6 @@ osd.slider( position, type, [id] ): Display slider. Position is an integer
from 0 to 100. Type can be "horizontal" or "vertical".
osd.channel_register(): Register a new OSD channel. Returns the channel id.
osd.channel_clear( id ): Clear OSD channel.
-osd.menu.show(): Show the OSD menu.
-osd.menu.hide(): Hide the OSD menu.
-osd.menu.prev(): Select previous/left item.
-osd.menu.next(): Select next/right item.
-osd.menu.up(): Move selection up.
-osd.menu.down(): Move selection down.
-osd.menu.activate(): Activate/validate current selection.
Playlist
--------
More information about the vlc-commits
mailing list