git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reoder derivation
[enigma2.git]
/
lib
/
service
/
listboxservice.cpp
diff --git
a/lib/service/listboxservice.cpp
b/lib/service/listboxservice.cpp
index e1f1beb07b4d1f8b1363261285daf9bc59b3b208..035658ee1a6d5f3c9543106375b9a5e760a2e471 100644
(file)
--- a/
lib/service/listboxservice.cpp
+++ b/
lib/service/listboxservice.cpp
@@
-2,6
+2,7
@@
#include <lib/service/service.h>
#include <lib/gdi/font.h>
#include <lib/dvb/epgcache.h>
#include <lib/service/service.h>
#include <lib/gdi/font.h>
#include <lib/dvb/epgcache.h>
+#include <lib/dvb/pmt.h>
void eListboxServiceContent::setRoot(const eServiceReference &root)
{
void eListboxServiceContent::setRoot(const eServiceReference &root)
{
@@
-152,8
+153,8
@@
void eListboxServiceContent::setElementFont(int element, gFont *font)
void eListboxServiceContent::sort()
{
ePtr<iListableService> lst;
void eListboxServiceContent::sort()
{
ePtr<iListableService> lst;
- if (!m_service_center->list(m_root, lst))
- {
+
if (!m_service_center->list(m_root, lst))
+
{
m_list.sort(iListableServiceCompare(lst));
/* FIXME: is this really required or can we somehow keep the current entry? */
cursorHome();
m_list.sort(iListableServiceCompare(lst));
/* FIXME: is this really required or can we somehow keep the current entry? */
cursorHome();
@@
-165,7
+166,7
@@
void eListboxServiceContent::sort()
DEFINE_REF(eListboxServiceContent);
eListboxServiceContent::eListboxServiceContent()
DEFINE_REF(eListboxServiceContent);
eListboxServiceContent::eListboxServiceContent()
- :
epgcache(eEPGCache::getInstance()),
m_visual_mode(visModeSimple), m_size(0), m_current_marked(false), m_numberoffset(0)
+ :m_visual_mode(visModeSimple), m_size(0), m_current_marked(false), m_numberoffset(0)
{
cursorHome();
eServiceCenter::getInstance(m_service_center);
{
cursorHome();
eServiceCenter::getInstance(m_service_center);
@@
-347,7
+348,10
@@
void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const
/* get service information */
ePtr<iStaticServiceInformation> service_info;
m_service_center->info(*m_cursor, service_info);
/* get service information */
ePtr<iStaticServiceInformation> service_info;
m_service_center->info(*m_cursor, service_info);
-
+
+ if (m_is_playable_ignore.valid() && !service_info->isPlayable(*m_cursor, m_is_playable_ignore))
+ painter.setForegroundColor(gRGB(0xbbbbbb));
+
for (int e = 0; e < celElements; ++e)
{
if (!m_element_font[e])
for (int e = 0; e < celElements; ++e)
{
if (!m_element_font[e])
@@
-380,8
+384,7
@@
void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const
case celServiceInfo:
{
ePtr<eServiceEvent> evt;
case celServiceInfo:
{
ePtr<eServiceEvent> evt;
- time_t t=-1;
- if ( !epgcache->lookupEventTime(*m_cursor, t, evt) )
+ if ( !service_info->getEvent(*m_cursor, evt) )
text = '(' + evt->getEventName() + ')';
else
continue;
text = '(' + evt->getEventName() + ')';
else
continue;
@@
-431,3
+434,7
@@
void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const
painter.clippop();
}
painter.clippop();
}
+void eListboxServiceContent::setIgnoreService( const eServiceReference &service )
+{
+ m_is_playable_ignore=service;
+}