Ticket #1502: myth.diff

libs/libmythtv/dvbsignalmonitor.h

@@ -48 +48 @@
     int GetDVBCardNum(void) const;
 
     bool SupportsTSMonitoring(void);
+
+    DVBChannel *GetDVBChannel(void) const { return(channel); };
+    void SetDVBChannel(DVBChannel *_channel) { channel = _channel; };
+
   protected:
     SignalMonitorValue signalToNoise;
     SignalMonitorValue bitErrorRate;
@@ -58 +62 @@
     pthread_t          table_monitor_thread;
 
     FilterMap          filters; ///< PID filters for table monitoring
+    DVBChannel         *channel;
 };
 
 #endif // DVBSIGNALMONITOR_H

libs/libmythtv/dvbchannel.cpp

@@ -633 +633 @@
                   "Setting Frontend tuning parameters failed.");
             return false;
         }
+
+        // Special case for Nova-T. Should use configurable timeout.
+        if (GetFrontendName() == "DiBcom 3000P/M-C DVB-T") {
+          usleep(2000000);
+        }
         wait_for_backend(fd_frontend, 5 /* msec */);
 
         prev_tuning.params = params;

libs/libmythtv/dvbsignalmonitor.cpp

@@ -83 +83 @@
     QString msg = QString("DVBSignalMonitor(%1)::constructor(%2,%3): %4")
         .arg(channel->GetDevice()).arg(capturecardnum);
 
+    SetDVBChannel(_channel);
+
 #define DVB_IO(WHAT,WHERE,ERRMSG,FLAG) \
     if (ioctl(_channel->GetFd(), WHAT, WHERE)) \
         VERBOSE(VB_IMPORTANT, msg.arg(ERRMSG).arg(strerror(errno))); \
@@ -542 +544 @@
     uint32_t ber = 0, ublocks = 0;
     fe_status_t  status;
     bzero(&status, sizeof(status));
+    DVBChannel *channel = GetDVBChannel();
 
     // Get info from card
     int fd_frontend = channel->GetFd();
     ioctl(fd_frontend, FE_READ_STATUS, &status);
+    // Special case for Nova-T. Should use configurable timeout.
+    if (channel->GetFrontendName() == "DiBcom 3000P/M-C DVB-T") {
+      usleep(2000000);
+    }
+
     if (HasFlags(kDTVSigMon_WaitForSig))
         ioctl(fd_frontend, FE_READ_SIGNAL_STRENGTH, &sig);
     if (HasFlags(kDVBSigMon_WaitForSNR))