From 07f5c0fbfb43b099fa09b273a1074093c7579903 Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Sat, 1 Aug 2015 17:41:55 +0200
Subject: Replace some loops with iterators to foreach loops

---
 src/EtiReader.cpp | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

(limited to 'src/EtiReader.cpp')

diff --git a/src/EtiReader.cpp b/src/EtiReader.cpp
index 500101b..76f8dbb 100644
--- a/src/EtiReader.cpp
+++ b/src/EtiReader.cpp
@@ -57,7 +57,6 @@ EtiReader::EtiReader(
         unsigned tist_delay_stages,
         RemoteControllers* rcs) :
     state(EtiReaderStateSync),
-    myFicSource(NULL),
     myTimestampDecoder(tist_offset_s, tist_delay_stages)
 {
     PDEBUG("EtiReader::EtiReader()\n");
@@ -68,17 +67,7 @@ EtiReader::EtiReader(
     eti_fc_valid = false;
 }
 
-EtiReader::~EtiReader()
-{
-    PDEBUG("EtiReader::~EtiReader()\n");
-
-//    if (myFicSource != NULL) {
-//        delete myFicSource;
-//    }
-}
-
-
-FicSource* EtiReader::getFic()
+std::shared_ptr<FicSource>& EtiReader::getFic()
 {
     return myFicSource;
 }
@@ -169,8 +158,8 @@ int EtiReader::process(const Buffer* dataIn)
             if (!eti_fc.FICF) {
                 throw std::runtime_error("FIC must be present to modulate!");
             }
-            if (myFicSource == NULL) {
-                myFicSource = new FicSource(eti_fc);
+            if (not myFicSource) {
+                myFicSource = make_shared<FicSource>(eti_fc);
             }
             break;
         case EtiReaderStateNst:
-- 
cgit v1.2.3