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

reduce globales, show epginfo in timeshift

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1070 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2f07e68048
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2011-01-26 (Wed, 26 Jan 2011)



------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2011-01-26 19:29:53 +00:00
parent b7f7db394f
commit 47ab627fd8
3 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gui/movieplayer.cpp
View File

@@ -110,11 +110,6 @@ static unsigned short g_vtype = 0;
static std::string g_language[REC_MAX_APIDS];
static unsigned short g_currentapid = 0, g_currentac3 = 0, apidchanged = 0;
std::string g_file_epg;
std::string g_file_epg1;
int file_prozent;
int timeshift;
bool get_movie_info_apid_name(int apid, MI_MOVIE_INFO * movie_info, std::string * apidtitle)
{
if (movie_info == NULL || apidtitle == NULL)
@@ -1250,6 +1245,20 @@ void CMoviePlayerGui::PlayFile(void)
} else if ( msg == NeutrinoMessages::ANNOUNCE_RECORD ||
msg == NeutrinoMessages::RECORD_START) {
CNeutrinoApp::getInstance()->handleMsg(msg, data);
} else if (timeshift && msg == NeutrinoMessages::SHOW_EPG ) {
bool restore = FileTime.IsVisible();
FileTime.hide();
if (g_settings.mode_clock)
InfoClock->StopClock();
g_EpgData->show(CNeutrinoApp::getInstance()->channelList->getActiveChannel_ChannelID());
if(restore) {
FileTime.show(position / 1000);
FileTime.updatePos(file_prozent);
}
} else if ( msg == NeutrinoMessages::ZAPTO ||
msg == NeutrinoMessages::STANDBY_ON ||
msg == NeutrinoMessages::SHUTDOWN ||