From 3395ef120332d002e5494c2bed407174d73af8fd Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Wed, 3 Jan 2018 14:47:21 +0100 Subject: [PATCH] - movieplayer: remove playlist handling from RC_ok; mpkey_play already handles playlist Conflicts: src/gui/movieplayer.cpp Signed-off-by: Thilo Graf --- src/gui/movieplayer.cpp | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index 116bdb443..86bda8cc9 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -1614,31 +1614,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_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) { bool reset_vzap_it = true; switch (g_settings.mode_left_right_key_tv)