diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-10-10 11:39:25 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-10-10 11:39:25 +0200 |
| commit | 2e71bf974f42cfe9edf9c8289602eec0c7ecadf9 (patch) | |
| tree | 574bd00266dacf3dc7b21d6f601131c85340663b /src/fig/FIGCarousel.h | |
| parent | bbafa23de92eb542f4c8266d484aed9faf88d360 (diff) | |
| parent | 4576c71f10dc009ce0dd9aedbc2f81a3e1a8be0e (diff) | |
| download | dabmux-2e71bf974f42cfe9edf9c8289602eec0c7ecadf9.tar.gz dabmux-2e71bf974f42cfe9edf9c8289602eec0c7ecadf9.tar.bz2 dabmux-2e71bf974f42cfe9edf9c8289602eec0c7ecadf9.zip | |
Merge next into servicelinking
Diffstat (limited to 'src/fig/FIGCarousel.h')
| -rw-r--r-- | src/fig/FIGCarousel.h | 5 |
1 files changed, 1 insertions, 4 deletions
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; |