mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 01:11:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove globals and use new zapit class members

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1698 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2011-09-18 13:35:08 +00:00
parent 0172f074b8
commit 6c6c2e9b29
15 changed files with 75 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/movieplayer.cpp
View File

@@ -76,6 +76,7 @@
#include <video.h>
#include "libtuxtxt/teletext.h"
#include <zapit/zapit.h>
//int dvbsub_start(int pid);//???
@@ -85,7 +86,6 @@
extern cVideo * videoDecoder;
extern CRemoteControl *g_RemoteControl; /* neutrino.cpp */
extern CInfoClock *InfoClock;
extern t_channel_id live_channel_id;
#define MINUTEOFFSET 117*262072
#define MP_TS_SIZE 262072 // ~0.5 sec
@@ -485,6 +485,7 @@ void CMoviePlayerGui::PlayFile(void)
CVCRControl::getInstance()->GetPids(&g_vpid, &g_vtype, &CAPIDSelectExec::g_currentapid, &CAPIDSelectExec::g_currentac3, &g_numpida, CAPIDSelectExec::g_apids, CAPIDSelectExec::g_ac3flags);
p_movie_info = CVCRControl::getInstance()->GetMovieInfo();
#endif
t_channel_id live_channel_id = CZapit::getInstance()->GetCurrentChannelID();
p_movie_info = CRecordManager::getInstance()->GetMovieInfo(live_channel_id);
rec_filename = CRecordManager::getInstance()->GetFileName(live_channel_id) + ".ts";
fillPids(p_movie_info);