Ticket #174: scan.2.patch

libs/libmythtv/scanwizard.cpp

@@ -431 +431 @@
             return;
         }
 
-#ifdef USE_OWN_SIPARSER
+#if defined(USING_DVB) && defined(USE_OWN_SIPARSER)
         if (GetDVBChannel())
             GetDVBChannel()->disable_siparser = true;
 #endif // !USE_OWN_SIPARSER

libs/libmythtv/siscan.cpp

@@ -157 +157 @@
 
 void *SIScan::SpawnSectionReader(void *param)
 {
+#ifdef USING_DVB
     DVBSIParser *siparser = (DVBSIParser*) param;
     siparser->StartSectionReader();
+#else
+   (void)param;
+#endif
     return NULL;
 }
 
@@ -743 +747 @@
     /* Force dvbchannel to exit */
     if (siparser && GetDVBChannel())
         GetDVBChannel()->StopTuning();
-#endif // USING_DVB
 #ifdef USE_OWN_SIPARSER
     if (siparser)
     {
@@ -752 +755 @@
         delete siparser;
     }
 #endif // !USE_OWN_SIPARSER
+#endif // USING_DVB
     if (scanner_thread_running)
         pthread_join(scanner_thread, NULL);
     if (signalMonitor)
@@ -1342 +1346 @@
                 .arg(service_name));
         }
     }
+#else
+    (void)tid_db;
 #endif // USING_DVB
 }
 
@@ -1520 +1526 @@
 // ///////////////////// Static DB helper methods /////////////////////
 // ///////////////////// Static DB helper methods /////////////////////
 
+#ifdef USING_DVB
 static bool ignore_encrypted_services(int db_mplexid, QString videodevice)
 {
     MSqlQuery query(MSqlQuery::InitCon());
@@ -1543 +1550 @@
     return true;
 }
 
-#ifdef USING_DVB
 static int create_dtv_multiplex_ofdm(const TransportScanItem& item,
                                      const DVBTuning& tuning)
 {