Ticket #5228: iptvchannelfetcher2.patch

libs/libmythtv/iptv/iptvchannelfetcher.cpp

@@ -15 +15 @@
 #define LOC QString("IPTVChanFetch: ")
 #define LOC_ERR QString("IPTVChanFetch, Error: ")
 
-void *run_scan_thunk(void*);
-
 static bool parse_chan_info(const QString   &rawdata,
                             IPTVChannelInfo &info,
                             QString         &channum,
@@ -26 +24 @@
                          QString       &channum,
                          QString       &name);
 
+/** \fn IPTVChannelFetcherThread::run(void) 
+*   \brief Thunk that allows iptvfetcher Qthread to 
+*         call IPTVChannelFetcher::RunScan(). 
+*/ 
+void IPTVChannelFetcherThread::run(void) 
+{ 
+    iptvfetcher->RunScan(); 
+} 
+
 IPTVChannelFetcher::IPTVChannelFetcher(
     uint cardid, const QString &inputname, uint sourceid) :
     _cardid(cardid),       _inputname(Q3DeepCopy<QString>(inputname)),
@@ -57 +64 @@
         _stop_now = true;
         _lock.unlock();
 
-        pthread_join(_thread, NULL);
+        _thread.wait();
         return;
     }
 
@@ -76 +83 @@
 
     _stop_now = false;
 
-    pthread_create(&_thread, NULL, run_scan_thunk, this);
+    _thread.iptvfetcher = this; 
+    _thread.start(QThread::NormalPriority); 
 
     while (!_thread_running && !_stop_now)
         usleep(5000);
@@ -86 +94 @@
     return _thread_running;
 }
 
-void *run_scan_thunk(void *param)
-{
-    IPTVChannelFetcher *chanscan = (IPTVChannelFetcher*) param;
-    chanscan->RunScan();
-
-    return NULL;
-}
-
 void IPTVChannelFetcher::RunScan(void)
 {
     _thread_running = true;
@@ -113 +113 @@
     emit ServiceScanPercentComplete(5);
     emit ServiceScanUpdateText(tr("Downloading Playlist"));
 
-    QString playlist = DownloadPlaylist(url, false);
+    QString playlist = DownloadPlaylist(url, true);
 
     if (_stop_now || playlist.isEmpty())
     {

libs/libmythtv/iptv/iptvchannelfetcher.h

@@ -1 +1 @@
 #ifndef _IPTVCHANNELFETCHER_H_
 #define _IPTVCHANNELFETCHER_H_
 
-// POSIX headers
-#include <pthread.h>
-
 // Qt headers
 #include <qobject.h>
 #include <qmutex.h>
+#include <qthread.h>
 
 // MythTV headers
 #include "iptvchannelinfo.h"
 
+class IPTVChannelFetcher;
+
+class IPTVChannelFetcherThread : public QThread 
+{ 
+  public: 
+    virtual void run(); 
+    IPTVChannelFetcher   *iptvfetcher; 
+}; 
+
 class IPTVChannelFetcher : public QObject
 {
     Q_OBJECT
 
-    friend void *run_scan_thunk(void *param);
+    friend class IPTVChannelFetcherThread; 
 
   public:
     IPTVChannelFetcher(uint cardid, const QString &inputname, uint sourceid);
@@ -37 +44 @@
     /// \brief Signals that the scan is complete
     void ServiceScanComplete(void);
 
+  protected:
+    void RunScan(void);
+
   private:
     ~IPTVChannelFetcher();
     void SetTotalNumChannels(uint val) { _chan_cnt = (val) ? val : 1; }
     void SetNumChannelsParsed(uint);
     void SetNumChannelsInserted(uint);
     void SetMessage(const QString &status);
-    void RunScan(void);
 
   private:
     uint      _cardid;
@@ -52 +61 @@
     uint      _chan_cnt;
     bool      _thread_running;
     bool      _stop_now;
-    pthread_t _thread;
+    IPTVChannelFetcherThread _thread;
     QMutex    _lock;
 };