Commit 753a7d15 authored by Adrien Maglo's avatar Adrien Maglo

QT/EPG: Fix EPGItem management.

Synchronize correctly with the EPG structures provided by the core.
Remove EPGItems from the EPGView when they are not anymore stored.
parent c57d47db
......@@ -25,17 +25,29 @@
#define EPGEVENT_H
class QString;
class EPGItem;
#include <QDateTime>
class EPGEvent
{
public:
EPGEvent( const QString& eventName )
: current( false ), updated( true )
: current( false ), updated( true ), item( NULL )
{
name = eventName;
}
bool operator==( const EPGEvent & other ) const
{
return start == other.start
&& duration == other.duration
&& name == other.name
&& description == other.description
&& shortDescription == other.shortDescription
&& channelName == other.channelName
&& current == other.current;
}
QDateTime start;
int duration;
QString name;
......@@ -44,6 +56,8 @@ public:
QString channelName;
bool current;
bool updated;
EPGItem *item;
};
#endif // EPGEVENT_H
......@@ -88,17 +88,16 @@ void EPGView::addEvent( EPGEvent* event )
item->setShortDescription( event->shortDescription );
item->setCurrent( event->current );
scene()->addItem( item );
}
event->item = item;
void EPGView::updateEvent( EPGEvent* event )
{
//qDebug() << "Update event: " << event->name;
scene()->addItem( item );
}
void EPGView::delEvent( EPGEvent* event )
{
//qDebug() << "Del event: " << event->name;
if( event->item != NULL )
scene()->removeItem( event->item );
event->item = NULL;
}
void EPGView::updateDuration()
......
......@@ -45,7 +45,6 @@ public:
const QDateTime& startTime();
void addEvent( EPGEvent* event );
void updateEvent( EPGEvent* event );
void delEvent( EPGEvent* event );
void updateDuration();
......
......@@ -80,52 +80,42 @@ void EPGWidget::updateEPG( vlc_epg_t **pp_epg, int i_epg )
for ( int j = 0; j < p_epg->i_event; ++j )
{
EPGEvent *item = NULL;
vlc_epg_event_t *p_event = p_epg->pp_event[j];
QString eventName = qfu( p_event->psz_name );
QDateTime eventStart = QDateTime::fromTime_t( p_event->i_start );
QList<EPGEvent*> events = m_events.values( channelName );
EPGEvent *item = new EPGEvent( eventName );
item->description = qfu( p_event->psz_description );
item->shortDescription = qfu( p_event->psz_short_description );
item->start = eventStart;
item->duration = p_event->i_duration;
item->channelName = channelName;
item->current = ( p_epg->p_current == p_event ) ? true : false;
bool alreadyIn = false;
for ( int k = 0; k < events.count(); ++k )
{
if ( events.at( k )->name == eventName &&
events.at( k )->channelName == channelName &&
events.at( k )->start == eventStart )
if ( *events.at( k ) == *item )
{
/* Update the event. */
item = events.at( k );
item->updated = true;
item->description = qfu( p_event->psz_description );
item->shortDescription = qfu( p_event->psz_short_description );
item->start = eventStart;
item->duration = p_event->i_duration;
item->current = ( p_epg->p_current == p_event ) ? true : false;
if ( item->start < m_epgView->startTime() )
m_epgView->setStartTime( item->start );
m_epgView->updateEvent( item );
alreadyIn = true;
events.at( k )->updated = true;
break;
}
}
if ( !item )
if ( !alreadyIn )
{
item = new EPGEvent( eventName );
item->description = qfu( p_event->psz_description );
item->shortDescription = qfu( p_event->psz_short_description );
item->start = eventStart;
item->duration = p_event->i_duration;
item->channelName = channelName;
item->current = ( p_epg->p_current == p_event ) ? true : false;
m_events.insert( channelName, item );
if ( item->start < m_epgView->startTime() )
m_epgView->setStartTime( item->start );
m_epgView->addEvent( item );
}
else
delete item;
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment