Restored carousels!

carousel.cpp

@@ -41,7 +41,7 @@ TTXPageStream* Carousel::nextCarousel()
 
         if (p->Expired())
         {
-            //std::cerr << "[Carousel::nextCarousel] page " << std::hex << p->GetPageNumber() << std::dec << " cycle time=" << p->GetCycleTime() << std::endl;
+            std::cerr << "[Carousel::nextCarousel] page " << std::hex << p->GetPageNumber() << std::dec << " cycle time=" << p->GetCycleTime() << std::endl;
             p->SetTransitionTime(); // We found a carousel that is ready to step
             break;
         }

filemonitor.cpp

@@ -133,7 +133,7 @@ void FileMonitor::run()
       }
     }
     closedir(dp);
-    std::cerr << "[FileMonitor::run] Finished scan" << std::endl;
+    // std::cerr << "[FileMonitor::run] Finished scan" << std::endl;
 
 		// Delete pages that no longer exist (this blocks the thread until the pages are removed)
 		_pageList->DeleteOldPages();

mag.cpp

@@ -118,7 +118,7 @@ Packet* Mag::GetPacket(Packet* p)
     }
     else  // No carousel? Take the next page in the main sequence
     {
-      std::cerr << "X";
+      // std::cerr << "X";
       if (_it==_pageSet->end())
       {
         std::cerr << "This can not happen" << std::endl;
@@ -140,7 +140,7 @@ Packet* Mag::GetPacket(Packet* p)
         return filler;
         // Stays in HEADER mode so that we run this again
       }
-      if (_page->IsCarousel()) // This should not happen. We should not consider carousels at this point.
+      if (_page->IsCarousel() && _page->GetCarouselFlag()) // Don't let registered carousel pages into the main page sequence
       {
         // todo:
         // std::cerr << "Page is a carousel. This can not happen" << std::endl;