kaffeine/kaffeine-gcc47.patch

27 lines
1.3 KiB
Diff
Raw Normal View History

Index: src/dvb/dvbepg.cpp
===================================================================
--- src/dvb/dvbepg.cpp.orig
+++ src/dvb/dvbepg.cpp
@@ -690,15 +690,15 @@ void AtscEpgFilter::processEitSection(co
// 1980-01-06T000000 minus 15 secs (= UTC - GPS in 2011)
QDateTime baseDateTime = QDateTime(QDate(1980, 1, 5), QTime(23, 59, 45), Qt::UTC);
- for (AtscEitSectionEntry entry = eitSection.entries(); (entryCount > 0) && entry.isValid();
- --entryCount, entry.advance()) {
+ for (AtscEitSectionEntry AESentry = eitSection.entries(); (entryCount > 0) && AESentry.isValid();
+ --entryCount, AESentry.advance()) {
DvbEpgEntry epgEntry;
epgEntry.channel = channel;
- epgEntry.begin = baseDateTime.addSecs(entry.startTime());
- epgEntry.duration = QTime().addSecs(entry.duration());
- epgEntry.title = entry.title();
+ epgEntry.begin = baseDateTime.addSecs(AESentry.startTime());
+ epgEntry.duration = QTime().addSecs(AESentry.duration());
+ epgEntry.title = AESentry.title();
- quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(entry.eventId()));
+ quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(AESentry.eventId()));
DvbSharedEpgEntry entry = epgEntries.value(id);
if (entry.isValid() && (entry->channel == epgEntry.channel) &&