mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-30 17:01:08 +02:00
movieplayer: remove playlist handling from RC_ok; mpkey_play already handles playlist
Origin commit data
------------------
Branch: ni/coolstream
Commit: d9469474f2
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-03 (Wed, 03 Jan 2018)
Origin message was:
------------------
- movieplayer: remove playlist handling from RC_ok; mpkey_play already handles playlist
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -1632,31 +1632,6 @@ void CMoviePlayerGui::PlayFileLoop(void)
|
||||
playstate = CMoviePlayerGui::STOPPED;
|
||||
keyPressed = CMoviePlayerGui::PLUGIN_PLAYSTATE_STOP;
|
||||
ClearQueue();
|
||||
} else if ((!filelist.empty() && msg == (neutrino_msg_t) CRCInput::RC_ok)) {
|
||||
disableOsdElements(MUTE);
|
||||
CFileBrowser *playlist = new CFileBrowser();
|
||||
CFile *pfile = NULL;
|
||||
pfile = &(*filelist_it);
|
||||
int selected = std::distance( filelist.begin(), filelist_it );
|
||||
filelist_it = filelist.end();
|
||||
if (playlist->playlist_manager(filelist, selected, is_audio_playing))
|
||||
{
|
||||
playstate = CMoviePlayerGui::STOPPED;
|
||||
CFile *sfile = NULL;
|
||||
for (filelist_it = filelist.begin(); filelist_it != filelist.end(); ++filelist_it)
|
||||
{
|
||||
pfile = &(*filelist_it);
|
||||
sfile = playlist->getSelectedFile();
|
||||
if ( (sfile->getFileName() == pfile->getFileName()) && (sfile->getPath() == pfile->getPath()))
|
||||
break;
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (!filelist.empty())
|
||||
filelist_it = filelist.begin() + selected;
|
||||
}
|
||||
delete playlist;
|
||||
enableOsdElements(MUTE);
|
||||
} else if (msg == CRCInput::RC_left || msg == CRCInput::RC_right) {
|
||||
bool reset_vzap_it = true;
|
||||
switch (g_settings.mode_left_right_key_tv)
|
||||
|
Reference in New Issue
Block a user