From d0c670ad0d177a81c5aa2395c8155d47c719cb5f Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Sun, 11 Dec 2016 16:35:39 +0100
Subject: Include default firfilter taps in binary and enable by default

---
 src/DabMod.cpp | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'src/DabMod.cpp')

diff --git a/src/DabMod.cpp b/src/DabMod.cpp
index 194c441..fc28218 100644
--- a/src/DabMod.cpp
+++ b/src/DabMod.cpp
@@ -423,14 +423,7 @@ int launch_modulator(int argc, char* argv[])
 
         // FIR Filter parameters:
         if (pt.get("firfilter.enabled", 0) == 1) {
-            try {
-                filterTapsFilename = pt.get<std::string>("firfilter.filtertapsfile");
-            }
-            catch (std::exception &e) {
-                std::cerr << "Error: " << e.what() << "\n";
-                std::cerr << "       Configuration enables firfilter, but does not specify filter taps file\n";
-                throw std::runtime_error("Configuration error");
-            }
+            filterTapsFilename = pt.get<std::string>("firfilter.filtertapsfile", "default");
         }
 
         // Output options
@@ -609,7 +602,7 @@ int launch_modulator(int argc, char* argv[])
 
     // When using the FIRFilter, increase the modulator offset pipelining delay
     // by the correct amount
-    if (filterTapsFilename != "") {
+    if (not filterTapsFilename.empty()) {
         tist_delay_stages += FIRFILTER_PIPELINE_DELAY;
     }
 
-- 
cgit v1.2.3