mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 09:51:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui/moviebrowser.cpp: change marked list to pointers; honor sort order

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2003ed670d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-22 (Mon, 22 Sep 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2014-09-22 17:03:02 +04:00
parent d0085a5143
commit 1e49e5d6f5
5 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/movieplayer.cpp
View File

@@ -434,7 +434,7 @@ bool CMoviePlayerGui::prepareFile(CFile *file)
if (isMovieBrowser) {
if (filelist_it != filelist.end()) {
unsigned idx = filelist_it - filelist.begin();
p_movie_info = &milist[idx];
p_movie_info = milist[idx];
}
if (isYT) {
file_name = file->Url;
@@ -492,7 +492,7 @@ bool CMoviePlayerGui::SelectFile()
filelist_it = filelist.end();
if (moviebrowser->getSelectedFiles(filelist, milist)) {
filelist_it = filelist.begin();
p_movie_info = &(*milist.begin());
p_movie_info = *(milist.begin());
file = &(*filelist_it);
}
else if ((file = moviebrowser->getSelectedFile()) != NULL) {
@@ -690,8 +690,11 @@ bool CMoviePlayerGui::PlayFileStart(void)
printf("IS FILE PLAYER: %s\n", is_file_player ? "true": "false" );
if (p_movie_info) {
movie_info = *p_movie_info;
p_movie_info = &movie_info;
if (timeshift != TSHIFT_MODE_OFF) {
// p_movie_info may be invalidated by CRecordManager while we're still using it. Create and use a copy.
movie_info = *p_movie_info;
p_movie_info = &movie_info;
}
duration = p_movie_info->length * 60 * 1000;
int percent = CZapit::getInstance()->GetPidVolume(p_movie_info->epgId, currentapid, currentac3 == 1);