mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-03 02:41:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

CLuaInstance::PlayFile: Function now returns the status of buttons

Browse Source 
- Set Lua api version to 1.1

 return code  defined LUA Variables
 --------------------------------------------------
 0 = normal exit  PLAYSTATE.NORMAL
 1 = aborted by stop button PLAYSTATE.STOP
 2 = next button  PLAYSTATE.NEXT
 3 = prev button  PLAYSTATE.PREV


Origin commit data
------------------
Branch: ni/coolstream
Commit: b56be92d59
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2015-09-04 (Fri, 04 Sep 2015)

Origin message was:
------------------
CLuaInstance::PlayFile: Function now returns the status of buttons

- Set Lua api version to 1.1

   return code       defined LUA Variables
 --------------------------------------------------
 0 = normal exit       PLAYSTATE.NORMAL
 1 = aborted by stop button  PLAYSTATE.STOP
 2 = next button       PLAYSTATE.NEXT
 3 = prev button       PLAYSTATE.PREV


------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2015-09-04 13:09:43 +02:00
parent 8918159dd2
commit dc8c15bbc4
4 changed files with 45 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gui/movieplayer.cpp
View File

@@ -168,6 +168,8 @@ void CMoviePlayerGui::Init(void)
info_1 = "";
info_2 = "";
filelist_it = filelist.end();
keyPressed = CMoviePlayerGui::PLUGIN_PLAYSTATE_NORMAL;
isLuaPlay = false;
}
void CMoviePlayerGui::cutNeutrino()
@@ -279,6 +281,12 @@ int CMoviePlayerGui::exec(CMenuTarget * parent, const std::string & actionKey)
is_file_player = true;
PlayFile();
}
else if (actionKey == "http_lua") {
isHTTP = true;
isLuaPlay = true;
is_file_player = true;
PlayFile();
}
else {
return menu_return::RETURN_REPAINT;
}
@@ -402,6 +410,7 @@ void CMoviePlayerGui::ClearFlags()
isMovieBrowser = false;
isBookmark = false;
isHTTP = false;
isLuaPlay = false;
isUPNP = false;
isWebTV = false;
isYT = false;
@@ -852,6 +861,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
bool update_lcd = true;
int eof = 0;
bool at_eof = !(playstate >= CMoviePlayerGui::PLAY);;
keyPressed = CMoviePlayerGui::PLUGIN_PLAYSTATE_NORMAL;
while (playstate >= CMoviePlayerGui::PLAY)
{
if (update_lcd) {
@@ -906,6 +916,15 @@ void CMoviePlayerGui::PlayFileLoop(void)
g_PluginList->startPlugin_by_name(g_settings.movieplayer_plugin.c_str ());
} else if (msg == (neutrino_msg_t) g_settings.mpkey_stop) {
playstate = CMoviePlayerGui::STOPPED;
keyPressed = CMoviePlayerGui::PLUGIN_PLAYSTATE_STOP;
ClearQueue();
} else if (isLuaPlay && (msg == (neutrino_msg_t) CRCInput::RC_right)) {
playstate = CMoviePlayerGui::STOPPED;
keyPressed = CMoviePlayerGui::PLUGIN_PLAYSTATE_NEXT;
ClearQueue();
} else if (isLuaPlay && (msg == (neutrino_msg_t) CRCInput::RC_left)) {
playstate = CMoviePlayerGui::STOPPED;
keyPressed = CMoviePlayerGui::PLUGIN_PLAYSTATE_PREV;
ClearQueue();
} else if ((!filelist.empty() && msg == (neutrino_msg_t) CRCInput::RC_right)) {
if (filelist_it < (filelist.end() - 1)) {