mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

movieplayer: try to fix bookmark menu

Browse Source 
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:
vanhofen
2020-07-26 23:03:57 +02:00
parent 18e25e560d
commit c1c7fca73a
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

@@ -1997,9 +1997,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;
@@ -2928,10 +2926,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);
@@ -2941,7 +2939,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();
@@ -2984,6 +2982,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

@@ -232,7 +232,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);