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

make info copy only in timeshift mode

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1bbf65c2d3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-04-20 (Sun, 20 Apr 2014)

Origin message was:
------------------
 make info copy only in timeshift mode

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

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2014-04-20 21:03:21 +02:00
parent 5a6bcdeb78
commit ecf30282c9
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/movieplayer.cpp
View File

@@ -511,9 +511,11 @@ void CMoviePlayerGui::PlayFile(void)
MI_MOVIE_INFO mi; MI_MOVIE_INFO mi;
if(p_movie_info) { if(p_movie_info) {
if(timeshift){
// p_movie_info may be invalidated by CRecordManager while we're still using it. Create and use a copy. // p_movie_info may be invalidated by CRecordManager while we're still using it. Create and use a copy.
mi = *p_movie_info; mi = *p_movie_info;
p_movie_info = &mi; p_movie_info = &mi;
}
duration = p_movie_info->length * 60 * 1000; duration = p_movie_info->length * 60 * 1000;
int percent = CZapit::getInstance()->GetPidVolume(p_movie_info->epgId, currentapid, currentac3 == 1); int percent = CZapit::getInstance()->GetPidVolume(p_movie_info->epgId, currentapid, currentac3 == 1);

2
src/nhttpd/web/languages/Makefile.am
View File

@@ -1,4 +1,4 @@
installdir = $(DATADIR)/neutrino/httpd/languages installdir = $(DATADIR)/neutrino/httpd/languages
install_DATA = Deutsch English Portuguese Slovak install_DATA = Czech Deutsch English Portuguese Slovak