git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use correct eDVBServicePMTHandler to get program info
[enigma2.git]
/
lib
/
service
/
servicedvb.cpp
diff --git
a/lib/service/servicedvb.cpp
b/lib/service/servicedvb.cpp
index c95923c94aca405cb367f62ee6f36ae0a16f4ba5..725909a71beb5291ecaecd38341841c552e70e06 100644
(file)
--- a/
lib/service/servicedvb.cpp
+++ b/
lib/service/servicedvb.cpp
@@
-1157,7
+1157,9
@@
int eDVBServicePlay::getInfo(int w)
if (w == sCAIDs)
return resIsPyObject;
if (w == sCAIDs)
return resIsPyObject;
- if (m_service_handler.getProgramInfo(program))
+ eDVBServicePMTHandler &h = m_timeshift_active ? m_service_handler_timeshift : m_service_handler;
+
+ if (h.getProgramInfo(program))
return -1;
switch (w)
return -1;
switch (w)
@@
-1246,7
+1248,8
@@
PyObject *eDVBServicePlay::getInfoObject(int w)
int eDVBServicePlay::getNumberOfTracks()
{
eDVBServicePMTHandler::program program;
int eDVBServicePlay::getNumberOfTracks()
{
eDVBServicePMTHandler::program program;
- if (m_service_handler.getProgramInfo(program))
+ eDVBServicePMTHandler &h = m_timeshift_active ? m_service_handler_timeshift : m_service_handler;
+ if (h.getProgramInfo(program))
return 0;
return program.audioStreams.size();
}
return 0;
return program.audioStreams.size();
}
@@
-1264,8
+1267,9
@@
RESULT eDVBServicePlay::selectTrack(unsigned int i)
RESULT eDVBServicePlay::getTrackInfo(struct iAudioTrackInfo &info, unsigned int i)
{
eDVBServicePMTHandler::program program;
RESULT eDVBServicePlay::getTrackInfo(struct iAudioTrackInfo &info, unsigned int i)
{
eDVBServicePMTHandler::program program;
+ eDVBServicePMTHandler &h = m_timeshift_active ? m_service_handler_timeshift : m_service_handler;
- if (
m_service_handler
.getProgramInfo(program))
+ if (
h
.getProgramInfo(program))
return -1;
if (i >= program.audioStreams.size())
return -1;
if (i >= program.audioStreams.size())
@@
-1302,8
+1306,9
@@
RESULT eDVBServicePlay::getTrackInfo(struct iAudioTrackInfo &info, unsigned int
int eDVBServicePlay::selectAudioStream(int i)
{
eDVBServicePMTHandler::program program;
int eDVBServicePlay::selectAudioStream(int i)
{
eDVBServicePMTHandler::program program;
+ eDVBServicePMTHandler &h = m_timeshift_active ? m_service_handler_timeshift : m_service_handler;
- if (
m_service_handler
.getProgramInfo(program))
+ if (
h
.getProgramInfo(program))
return -1;
if ((unsigned int)i >= program.audioStreams.size())
return -1;
if ((unsigned int)i >= program.audioStreams.size())
@@
-1588,7
+1593,9
@@
void eDVBServicePlay::updateTimeshiftPids()
return;
eDVBServicePMTHandler::program program;
return;
eDVBServicePMTHandler::program program;
- if (m_service_handler.getProgramInfo(program))
+ eDVBServicePMTHandler &h = m_timeshift_active ? m_service_handler_timeshift : m_service_handler;
+
+ if (h.getProgramInfo(program))
return;
else
{
return;
else
{