Merge next into servicelinking

2 files changed, 6 insertions, 27 deletions

diff --git a/src/fig/FIGCarousel.cpp b/src/fig/FIGCarousel.cpp
index bd2bf51..ac2a80b 100644
--- a/src/fig/FIGCarousel.cpp
+++ b/src/fig/FIGCarousel.cpp
@@ -113,11 +113,11 @@ FIGCarousel::FIGCarousel(std::shared_ptr<dabEnsemble> ensemble) :
 
 void FIGCarousel::load_and_allocate(IFIG& fig, FIBAllocation fib)
 {
-    int type = fig.figtype();
-    int extension = fig.figextension();
-
-    m_figs_available[std::make_pair(type, extension)] = &fig;
-    allocate_fig_to_fib(type, extension, fib);
+    FIGCarouselElement el;
+    el.fig = &fig;
+    el.deadline = 0;
+    el.increase_deadline();
+    m_fibs[fib].push_back(el);
 }
 
 void FIGCarousel::update(unsigned long currentFrame)
@@ -125,24 +125,6 @@ void FIGCarousel::update(unsigned long currentFrame)
     m_rti.currentFrame = currentFrame;
 }
 
-void FIGCarousel::allocate_fig_to_fib(int figtype, int extension, FIBAllocation fib)
-{
-    auto fig = m_figs_available.find(std::make_pair(figtype, extension));
-
-    if (fig != m_figs_available.end()) {
-        FIGCarouselElement el;
-        el.fig = fig->second;
-        el.deadline = 0;
-        el.increase_deadline();
-        m_fibs[fib].push_back(el);
-    }
-    else {
-        std::stringstream ss;
-        ss << "No FIG " << figtype << "/" << extension << " available";
-        throw std::runtime_error(ss.str());
-    }
-}
-
 void dumpfib(const uint8_t *buf, size_t bufsize) {
     std::cerr << "FIB ";
     for (size_t i = 0; i < bufsize; i++) {
diff --git a/src/fig/FIGCarousel.h b/src/fig/FIGCarousel.h
index be0b23f..f52f266 100644
--- a/src/fig/FIGCarousel.h
+++ b/src/fig/FIGCarousel.h
@@ -3,7 +3,7 @@
    2011, 2012 Her Majesty the Queen in Right of Canada (Communications
    Research Center Canada)
 
-   Copyright (C) 2015
+   Copyright (C) 2016
    Matthias P. Braendli, matthias.braendli@mpb.li
 
    Implementation of the FIG carousel to schedule the FIGs into the
@@ -62,8 +62,6 @@ class FIGCarousel {
 
         void update(unsigned long currentFrame);
 
-        void allocate_fig_to_fib(int figtype, int extension, FIBAllocation fib);
-
         /* Write all FIBs to the buffer, including correct padding and crc.
          * Returns number of bytes written.
          *
@@ -81,7 +79,6 @@ class FIGCarousel {
         void load_and_allocate(IFIG& fig, FIBAllocation fib);
 
         FIGRuntimeInformation m_rti;
-        std::map<std::pair<int, int>, IFIG*> m_figs_available;
 
         // Some FIGs can be mapped to a specific FIB or to FIB_ANY
         std::map<FIBAllocation, std::list<FIGCarouselElement> > m_fibs;