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

- movieplayer: remove playlist handling from RC_ok; mpkey_play already handles playlist

Browse Source 
Conflicts:
	src/gui/movieplayer.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2018-01-03 14:47:21 +01:00
committed by Thilo Graf
parent 5e2002014d
commit 3395ef1203
1 changed files with 0 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/gui/movieplayer.cpp
View File

@@ -1614,31 +1614,6 @@ void CMoviePlayerGui::PlayFileLoop(void)
playstate = CMoviePlayerGui::STOPPED; playstate = CMoviePlayerGui::STOPPED;
keyPressed = CMoviePlayerGui::PLUGIN_PLAYSTATE_STOP; keyPressed = CMoviePlayerGui::PLUGIN_PLAYSTATE_STOP;
ClearQueue(); 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_player))
{
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) { } else if (msg == CRCInput::RC_left || msg == CRCInput::RC_right) {
bool reset_vzap_it = true; bool reset_vzap_it = true;
switch (g_settings.mode_left_right_key_tv) switch (g_settings.mode_left_right_key_tv)