mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-03 10:51:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

- movieplayer: try to fix bookmark menu

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2020-07-26 23:03:57 +02:00
committed by Thilo Graf
parent 28a3a51aba
commit 396e460364
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/movieplayer.cpp
View File

@@ -1989,9 +1989,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
callInfoViewer(); callInfoViewer();
} else if (msg == (neutrino_msg_t) g_settings.mpkey_bookmark) { } else if (msg == (neutrino_msg_t) g_settings.mpkey_bookmark) {
#if HAVE_COOL_HARDWARE || HAVE_ARM_HARDWARE #if HAVE_COOL_HARDWARE || HAVE_ARM_HARDWARE
if (is_file_player) if (is_file_player && selectChapter() == -1)
selectChapter();
else
#endif #endif
handleMovieBrowser((neutrino_msg_t) g_settings.mpkey_bookmark, position); handleMovieBrowser((neutrino_msg_t) g_settings.mpkey_bookmark, position);
update_lcd = true; update_lcd = true;
@@ -2899,10 +2897,10 @@ void CMoviePlayerGui::showHelp()
helpbox.hide(); helpbox.hide();
} }
void CMoviePlayerGui::selectChapter() int CMoviePlayerGui::selectChapter()
{ {
if (!is_file_player) if (!is_file_player)
return; return 1;
std::vector<int> positions; std::vector<std::string> titles; std::vector<int> positions; std::vector<std::string> titles;
playback->GetChapters(positions, titles); playback->GetChapters(positions, titles);
@@ -2912,7 +2910,7 @@ void CMoviePlayerGui::selectChapter()
playback->GetTitles(playlists, ptitles, current); playback->GetTitles(playlists, ptitles, current);
if (positions.empty() && playlists.empty()) if (positions.empty() && playlists.empty())
return; return -1;
CMenuWidget ChSelector(LOCALE_MOVIEBROWSER_MENU_MAIN_BOOKMARKS, NEUTRINO_ICON_AUDIO); CMenuWidget ChSelector(LOCALE_MOVIEBROWSER_MENU_MAIN_BOOKMARKS, NEUTRINO_ICON_AUDIO);
//ChSelector.addIntroItems(); //ChSelector.addIntroItems();
@@ -2955,6 +2953,8 @@ void CMoviePlayerGui::selectChapter()
currentapid = 0; currentapid = 0;
playback->SetTitle(playlists[pselect]); playback->SetTitle(playlists[pselect]);
} }
return 0;
} }
std::string CMoviePlayerGui::getAPIDDesc(unsigned int i) std::string CMoviePlayerGui::getAPIDDesc(unsigned int i)

2
src/gui/movieplayer.h
View File

@@ -234,7 +234,7 @@ class CMoviePlayerGui : public CMenuTarget
void updateLcd(bool display_playtime = false); void updateLcd(bool display_playtime = false);
bool convertSubtitle(std::string &text); bool convertSubtitle(std::string &text);
void selectChapter(); int selectChapter();
void selectAutoLang(); void selectAutoLang();
void parsePlaylist(CFile *file); void parsePlaylist(CFile *file);
bool mountIso(CFile *file); bool mountIso(CFile *file);