mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-29 16:31:05 +02:00
movieplayer: try to fix bookmark menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9f5efc7e2d
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-07-26 (Sun, 26 Jul 2020)
Origin message was:
------------------
- movieplayer: try to fix bookmark menu
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -1997,9 +1997,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
|
||||
callInfoViewer();
|
||||
} else if (msg == (neutrino_msg_t) g_settings.mpkey_bookmark) {
|
||||
#if HAVE_COOL_HARDWARE || HAVE_ARM_HARDWARE
|
||||
if (is_file_player)
|
||||
selectChapter();
|
||||
else
|
||||
if (is_file_player && selectChapter() == -1)
|
||||
#endif
|
||||
handleMovieBrowser((neutrino_msg_t) g_settings.mpkey_bookmark, position);
|
||||
update_lcd = true;
|
||||
@@ -2928,10 +2926,10 @@ void CMoviePlayerGui::showHelp()
|
||||
helpbox.hide();
|
||||
}
|
||||
|
||||
void CMoviePlayerGui::selectChapter()
|
||||
int CMoviePlayerGui::selectChapter()
|
||||
{
|
||||
if (!is_file_player)
|
||||
return;
|
||||
return 1;
|
||||
|
||||
std::vector<int> positions; std::vector<std::string> titles;
|
||||
playback->GetChapters(positions, titles);
|
||||
@@ -2941,7 +2939,7 @@ void CMoviePlayerGui::selectChapter()
|
||||
playback->GetTitles(playlists, ptitles, current);
|
||||
|
||||
if (positions.empty() && playlists.empty())
|
||||
return;
|
||||
return -1;
|
||||
|
||||
CMenuWidget ChSelector(LOCALE_MOVIEBROWSER_MENU_MAIN_BOOKMARKS, NEUTRINO_ICON_AUDIO);
|
||||
//ChSelector.addIntroItems();
|
||||
@@ -2984,6 +2982,8 @@ void CMoviePlayerGui::selectChapter()
|
||||
currentapid = 0;
|
||||
playback->SetTitle(playlists[pselect]);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
std::string CMoviePlayerGui::getAPIDDesc(unsigned int i)
|
||||
|
@@ -232,7 +232,7 @@ class CMoviePlayerGui : public CMenuTarget
|
||||
void updateLcd(bool display_playtime = false);
|
||||
|
||||
bool convertSubtitle(std::string &text);
|
||||
void selectChapter();
|
||||
int selectChapter();
|
||||
void selectAutoLang();
|
||||
void parsePlaylist(CFile *file);
|
||||
bool mountIso(CFile *file);
|
||||
|
Reference in New Issue
Block a user