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

CMoviePlayerGui: Send PLUGIN_PLAYSTATE_LEAVE_ALL to plugin...

Browse Source 
...when tv/radio button are pressed on remote control

 - Set Lua api version to 1.32


Origin commit data
------------------
Branch: ni/coolstream
Commit: e4de37f1bb
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2015-12-15 (Tue, 15 Dec 2015)



------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2015-12-15 09:57:53 +01:00
parent fa6b9de3bc
commit 712b4b1dc4
4 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -277,10 +277,11 @@ static void set_lua_variables(lua_State *L)
table_key playstate[] =
{
{ "NORMAL", CMoviePlayerGui::PLUGIN_PLAYSTATE_NORMAL },
{ "STOP", CMoviePlayerGui::PLUGIN_PLAYSTATE_STOP },
{ "NEXT", CMoviePlayerGui::PLUGIN_PLAYSTATE_NEXT },
{ "PREV", CMoviePlayerGui::PLUGIN_PLAYSTATE_PREV },
{ "NORMAL", CMoviePlayerGui::PLUGIN_PLAYSTATE_NORMAL },
{ "STOP", CMoviePlayerGui::PLUGIN_PLAYSTATE_STOP },
{ "NEXT", CMoviePlayerGui::PLUGIN_PLAYSTATE_NEXT },
{ "PREV", CMoviePlayerGui::PLUGIN_PLAYSTATE_PREV },
{ "LEAVE_ALL", CMoviePlayerGui::PLUGIN_PLAYSTATE_LEAVE_ALL },
{ NULL, 0 }
};

2
src/gui/lua/luainstance.h
View File

@@ -31,7 +31,7 @@ extern "C" {
#include "luainstance_helpers.h"
#define LUA_API_VERSION_MAJOR 1
#define LUA_API_VERSION_MINOR 31
#define LUA_API_VERSION_MINOR 32
/* inspired by Steve Kemp http://www.steve.org.uk/ */
class CLuaInstance

4
src/gui/movieplayer.cpp
View File

@@ -1171,7 +1171,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
menu_ret = menu_return::RETURN_EXIT_ALL;
playstate = CMoviePlayerGui::STOPPED;
keyPressed = CMoviePlayerGui::PLUGIN_PLAYSTATE_STOP;
keyPressed = CMoviePlayerGui::PLUGIN_PLAYSTATE_LEAVE_ALL;
ClearQueue();
g_RCInput->postMsg(msg, data);
} else if (msg == CRCInput::RC_timeout || msg == NeutrinoMessages::EVT_TIMER) {
@@ -1194,7 +1194,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
printf("CMoviePlayerGui::PlayFile: neutrino handleMsg messages_return::cancel_all\n");
menu_ret = menu_return::RETURN_EXIT_ALL;
playstate = CMoviePlayerGui::STOPPED;
keyPressed = CMoviePlayerGui::PLUGIN_PLAYSTATE_STOP;
keyPressed = CMoviePlayerGui::PLUGIN_PLAYSTATE_LEAVE_ALL;
ClearQueue();
}
else if (msg <= CRCInput::RC_MaxRC ) {

9
src/gui/movieplayer.h
View File

@@ -69,10 +69,11 @@ class CMoviePlayerGui : public CMenuTarget
enum
{
PLUGIN_PLAYSTATE_NORMAL = 0,
PLUGIN_PLAYSTATE_STOP = 1,
PLUGIN_PLAYSTATE_NEXT = 2,
PLUGIN_PLAYSTATE_PREV = 3
PLUGIN_PLAYSTATE_NORMAL = 0,
PLUGIN_PLAYSTATE_STOP = 1,
PLUGIN_PLAYSTATE_NEXT = 2,
PLUGIN_PLAYSTATE_PREV = 3,
PLUGIN_PLAYSTATE_LEAVE_ALL = 4
};
enum repeat_mode_enum { REPEAT_OFF = 0, REPEAT_TRACK = 1, REPEAT_ALL = 2 };