mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 08:51:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

- neutrino: unify modes handling; ...

Browse Source 
remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2017-11-20 15:19:06 +01:00
committed by Thilo Graf
parent 1f86b6aa62
commit 0fc3e793a4
28 changed files with 233 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/lua/lua_video.cpp
View File

@@ -282,7 +282,7 @@ int CLuaInstVideo::channelRezap(lua_State *L)
/* CLuaVideo *D = VideoCheckData(L, 1);
if (!D) return 0; */
CNeutrinoApp::getInstance()->channelRezap();
if (CNeutrinoApp::getInstance()->getMode() == CNeutrinoApp::mode_radio)
if (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_radio)
CFrameBuffer::getInstance()->showFrame("radiomode.jpg");
return 0;
}

26
src/gui/lua/luainstance.cpp
View File

@@ -370,19 +370,19 @@ static void set_lua_variables(lua_State *L)
table_key neutrino_mode[] =
{
{ "UNKNOWN", (lua_Integer)CNeutrinoApp::mode_unknown },
{ "TV", (lua_Integer)CNeutrinoApp::mode_tv },
{ "RADIO", (lua_Integer)CNeutrinoApp::mode_radio },
{ "SCART", (lua_Integer)CNeutrinoApp::mode_scart },
{ "STANDBY", (lua_Integer)CNeutrinoApp::mode_standby },
{ "AUDIO", (lua_Integer)CNeutrinoApp::mode_audio },
{ "PIC", (lua_Integer)CNeutrinoApp::mode_pic },
{ "TS", (lua_Integer)CNeutrinoApp::mode_ts },
{ "OFF", (lua_Integer)CNeutrinoApp::mode_off },
{ "WEBTV", (lua_Integer)CNeutrinoApp::mode_webtv },
{ "WEBRADIO", (lua_Integer)CNeutrinoApp::mode_webradio },
{ "MASK", (lua_Integer)CNeutrinoApp::mode_mask },
{ "NOREZAP", (lua_Integer)CNeutrinoApp::norezap },
{ "UNKNOWN", (lua_Integer)NeutrinoModes::mode_unknown },
{ "TV", (lua_Integer)NeutrinoModes::mode_tv },
{ "RADIO", (lua_Integer)NeutrinoModes::mode_radio },
{ "SCART", (lua_Integer)NeutrinoModes::mode_scart },
{ "STANDBY", (lua_Integer)NeutrinoModes::mode_standby },
{ "AUDIO", (lua_Integer)NeutrinoModes::mode_audio },
{ "PIC", (lua_Integer)NeutrinoModes::mode_pic },
{ "TS", (lua_Integer)NeutrinoModes::mode_ts },
{ "OFF", (lua_Integer)NeutrinoModes::mode_off },
{ "WEBTV", (lua_Integer)NeutrinoModes::mode_webtv },
{ "WEBRADIO", (lua_Integer)NeutrinoModes::mode_webradio },
{ "MASK", (lua_Integer)NeutrinoModes::mode_mask },
{ "NOREZAP", (lua_Integer)NeutrinoModes::norezap },
{ NULL, 0 }
};