From 78c88e5f196bb22db1b18cbb74233a70ca2ec9f4 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 3 Jan 2018 14:47:21 +0100 Subject: [PATCH] movieplayer: remove playlist handling from RC_ok; mpkey_play already handles playlist Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/d9469474f2d22a3ca3847b530056c4275b509077 Author: vanhofen 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 --- src/gui/movieplayer.cpp | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index 687b7f3e9..8e11a58b8 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -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)