Ticket #9445: dvbstream-1.patch

mythtv/libs/libmythtv/mpeg/dvbstreamdata.h

@@ -18 +20 @@
 typedef vector<DVBOtherStreamListener*>  dvb_other_listener_vec_t;
 typedef vector<DVBEITStreamListener*>    dvb_eit_listener_vec_t;
 
-typedef QMap<uint, bool>                 dvb_has_eit_t;
-
 class DVBStreamData : virtual public MPEGStreamData
 {
   public:
@@ -43 +43 @@
     // EIT info/processing
     inline void SetDishNetEIT(bool);
     inline bool HasAnyEIT(void) const;
-    inline bool HasEIT(uint serviceid) const;
     bool HasEITPIDChanges(const uint_vec_t &in_use_pids) const;
     bool GetEITPIDChanges(const uint_vec_t &in_use_pids,
                           uint_vec_t &add_pids,
@@ -215 +214 @@
     /// Decode DishNet's long-term DVB EIT
     bool                      _dvb_eit_dishnet_long;
     /// Tell us if the DVB service has EIT
-    dvb_has_eit_t             _dvb_has_eit;
+    bool                      _dvb_has_eit;
 
     // Signals
     dvb_main_listener_vec_t   _dvb_main_listeners;
@@ -254 +257 @@
 inline bool DVBStreamData::HasAnyEIT(void) const
 {
     QMutexLocker locker(&_listener_lock);
-    return _dvb_has_eit.size();
-}
-
-inline bool DVBStreamData::HasEIT(uint serviceid) const
-{
-    QMutexLocker locker(&_listener_lock);
-
-    dvb_has_eit_t::const_iterator it = _dvb_has_eit.find(serviceid);
-    if (it != _dvb_has_eit.end())
-        return *it;
-
-    return false;
+    return _dvb_has_eit;
 }
 
 #endif // DVBSTREAMDATA_H_

mythtv/libs/libmythtv/mpeg/dvbstreamdata.cpp

@@ -37 +40 @@
     _dvb_main_listeners.clear();
     _dvb_other_listeners.clear();
     _dvb_eit_listeners.clear();
-    _dvb_has_eit.clear();
+    _dvb_has_eit = false;
 }
 
 void DVBStreamData::SetDesiredService(uint netid, uint tsid, int serviceid)
@@ -398 +433 @@
 {
     QMutexLocker locker(&_listener_lock);
+    uint i;
 
-    for (uint i = 0; i < sdt->ServiceCount(); i++)
-    {
-        if (sdt->HasEITSchedule(i) || sdt->HasEITPresentFollowing(i))
-            _dvb_has_eit[sdt->ServiceID(i)] = true;
-    }
+    for (i = 0; (i < sdt->ServiceCount() &&
+                 !sdt->HasEITSchedule(i) &&
+                 !sdt->HasEITPresentFollowing(i)); i++);
+    _dvb_has_eit = i < sdt->ServiceCount();
 
     for (uint i = 0; i < _dvb_main_listeners.size(); i++)
         _dvb_main_listeners[i]->HandleSDT(tsid, sdt);