mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 17:31:11 +02:00
CMoviePlayerGui: Creating an possibility to block restoreNeutrino()...
...from an external plugin
- This better play playlists with plugins
Origin commit data
------------------
Branch: ni/coolstream
Commit: 558fea4ec4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2015-12-08 (Tue, 08 Dec 2015)
------------------
This commit was generated by Migit
This commit is contained in:
@@ -189,6 +189,7 @@ void CMoviePlayerGui::Init(void)
|
||||
filelist_it = filelist.end();
|
||||
keyPressed = CMoviePlayerGui::PLUGIN_PLAYSTATE_NORMAL;
|
||||
isLuaPlay = false;
|
||||
blockedFromPlugin = false;
|
||||
}
|
||||
|
||||
void CMoviePlayerGui::cutNeutrino()
|
||||
@@ -766,7 +767,10 @@ void CMoviePlayerGui::PlayFile(void)
|
||||
PlayFileStart();
|
||||
mutex.unlock();
|
||||
PlayFileLoop();
|
||||
PlayFileEnd(repeat_mode == REPEAT_OFF);
|
||||
bool repeat = (repeat_mode == REPEAT_OFF);
|
||||
if (isLuaPlay)
|
||||
repeat = (!blockedFromPlugin);
|
||||
PlayFileEnd(repeat);
|
||||
}
|
||||
|
||||
bool CMoviePlayerGui::PlayFileStart(void)
|
||||
|
@@ -90,6 +90,7 @@ class CMoviePlayerGui : public CMenuTarget
|
||||
CMoviePlayerGui::state playstate;
|
||||
int keyPressed;
|
||||
bool isLuaPlay;
|
||||
bool blockedFromPlugin;
|
||||
int speed;
|
||||
int startposition;
|
||||
int position;
|
||||
@@ -161,7 +162,6 @@ class CMoviePlayerGui : public CMenuTarget
|
||||
void PlayFileLoop();
|
||||
void PlayFileEnd(bool restore = true);
|
||||
void cutNeutrino();
|
||||
void restoreNeutrino();
|
||||
|
||||
void showHelpTS(void);
|
||||
void callInfoViewer();
|
||||
@@ -221,6 +221,9 @@ class CMoviePlayerGui : public CMenuTarget
|
||||
int getKeyPressed() { return keyPressed; };
|
||||
size_t GetReadCount();
|
||||
std::string GetFile() { return pretty_name; }
|
||||
void restoreNeutrino();
|
||||
void setBlockedFromPlugin(bool b) { blockedFromPlugin = b; };
|
||||
bool getBlockedFromPlugin() { return blockedFromPlugin; };
|
||||
};
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user