git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
[enigma2.git]
/
lib
/
service
/
servicedvb.cpp
diff --git
a/lib/service/servicedvb.cpp
b/lib/service/servicedvb.cpp
index 954a3964dff1390176e31427fcdd575d7e155529..2f98ed6b1e9d15b0f7a4ce114d088daf6d8820ed 100644
(file)
--- a/
lib/service/servicedvb.cpp
+++ b/
lib/service/servicedvb.cpp
@@
-412,7
+412,7
@@
RESULT eStaticServiceDVBBouquetInformation::getName(const eServiceReference &ref
return -1;
}
return -1;
}
-int eStaticServiceDVBBouquetInformation::isPlayable(const eServiceReference &ref, const eServiceReference &ignore)
+int eStaticServiceDVBBouquetInformation::isPlayable(const eServiceReference &ref, const eServiceReference &ignore
, bool simulate
)
{
if (ref.flags & eServiceReference::isGroup)
{
{
if (ref.flags & eServiceReference::isGroup)
{
@@
-453,7
+453,7
@@
int eStaticServiceDVBBouquetInformation::isPlayable(const eServiceReference &ref
{ 2, 1, 3 } // -T -S -C
};
((const eServiceReferenceDVB&)*it).getChannelID(chid);
{ 2, 1, 3 } // -T -S -C
};
((const eServiceReferenceDVB&)*it).getChannelID(chid);
- int tmp=res->canAllocateChannel(chid, chid_ignore);
+ int tmp=res->canAllocateChannel(chid, chid_ignore
, simulate
);
switch(tmp)
{
case 0:
switch(tmp)
{
case 0: