From b042d58100282b480834b283fb40f3b5390327e8 Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Fri, 10 Apr 2015 12:54:40 +0200
Subject: Use make_shared in DabMod.cpp

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

(limited to 'src/DabMod.cpp')

diff --git a/src/DabMod.cpp b/src/DabMod.cpp
index 304d252..b713d30 100644
--- a/src/DabMod.cpp
+++ b/src/DabMod.cpp
@@ -726,22 +726,22 @@ int main(int argc, char* argv[])
 
     if (useFileOutput) {
         if (fileOutputFormat == "complexf") {
-            output = shared_ptr<OutputFile>(new OutputFile(outputName));
+            output = make_shared<OutputFile>(outputName);
         }
         else if (fileOutputFormat == "s8") {
             // We must normalise the samples to the interval [-127.0; 127.0]
             normalise = 127.0f / normalise_factor;
 
-            format_converter = shared_ptr<FormatConverter>(new FormatConverter());
+            format_converter = make_shared<FormatConverter>();
 
-            output = shared_ptr<OutputFile>(new OutputFile(outputName));
+            output = make_shared<OutputFile>(outputName);
         }
     }
 #if defined(HAVE_OUTPUT_UHD)
     else if (useUHDOutput) {
         normalise = 1.0f / normalise_factor;
         outputuhd_conf.sampleRate = outputRate;
-        output = shared_ptr<OutputUHD>(new OutputUHD(outputuhd_conf, logger));
+        output = make_shared<OutputUHD>(outputuhd_conf, &logger);
         ((OutputUHD*)output.get())->enrol_at(rcs);
     }
 #endif
@@ -808,8 +808,7 @@ int main(int argc, char* argv[])
                     run_again = true;
 
                     // Create a new input reader
-                    inputZeroMQReader = shared_ptr<InputZeroMQReader>(
-                            new InputZeroMQReader(logger));
+                    inputZeroMQReader = make_shared<InputZeroMQReader>(logger);
                     inputZeroMQReader->Open(inputName, inputMaxFramesQueued);
                     m.inputReader = inputZeroMQReader.get();
                 }
-- 
cgit v1.2.3