From be0aa8592a62719b84fa1b710b6694a55cac0d05 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Wed, 7 Sep 2022 00:24:31 -0400
Subject: [PATCH] Add ffmpegtileprovider to the module factory so it can be
 created like the other tileproviders

---
 modules/globebrowsing/globebrowsingmodule.cpp         | 2 ++
 modules/globebrowsing/src/layer.cpp                   | 2 ++
 modules/globebrowsing/src/layergroupid.h              | 1 +
 modules/globebrowsing/src/tileprovider/tileprovider.h | 3 ++-
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/globebrowsing/globebrowsingmodule.cpp b/modules/globebrowsing/globebrowsingmodule.cpp
index 2181b3ab1d..144d12bcda 100644
--- a/modules/globebrowsing/globebrowsingmodule.cpp
+++ b/modules/globebrowsing/globebrowsingmodule.cpp
@@ -47,6 +47,7 @@
 #include <modules/globebrowsing/src/tileprovider/tileprovider.h>
 #include <modules/globebrowsing/src/tileprovider/tileproviderbyindex.h>
 #include <modules/globebrowsing/src/tileprovider/tileproviderbylevel.h>
+#include <modules/globebrowsing/src/tileprovider/ffmpegtileprovider.h>
 #include <openspace/camera/camera.h>
 #include <openspace/documentation/verifier.h>
 #include <openspace/engine/globals.h>
@@ -316,6 +317,7 @@ void GlobeBrowsingModule::internalInitialize(const ghoul::Dictionary& dict) {
     fTileProvider->registerClass<SizeReferenceTileProvider>("SizeReferenceTileLayer");
     fTileProvider->registerClass<TileProviderByLevel>("ByLevelTileLayer");
     fTileProvider->registerClass<TileProviderByIndex>("ByIndexTileLayer");
+    fTileProvider->registerClass<FfmpegTileProvider>("VideoTileLayer");
 
     ghoul::TemplateFactory<DashboardItem>* fDashboard =
         FactoryManager::ref().factory<DashboardItem>();
diff --git a/modules/globebrowsing/src/layer.cpp b/modules/globebrowsing/src/layer.cpp
index baee723ec4..ae57faf980 100644
--- a/modules/globebrowsing/src/layer.cpp
+++ b/modules/globebrowsing/src/layer.cpp
@@ -477,6 +477,7 @@ void Layer::initializeBasedOnType(layers::Layer::ID id, ghoul::Dictionary initDi
         case layers::Layer::ID::TileIndexTileLayer:
         case layers::Layer::ID::ByIndexTileLayer:
         case layers::Layer::ID::ByLevelTileLayer:
+        case layers::Layer::ID::VideoTileLayer:
             // We add the id to the dictionary since it needs to be known by
             // the tile provider
             initDict.setValue(
@@ -488,6 +489,7 @@ void Layer::initializeBasedOnType(layers::Layer::ID id, ghoul::Dictionary initDi
                 LDEBUG("Initializing tile provider for layer: '" + name + "'");
             }
             _tileProvider = TileProvider::createFromDictionary(id, std::move(initDict));
+            
             break;
         case layers::Layer::ID::SolidColor:
             if (initDict.hasValue<glm::dvec3>(ColorInfo.identifier)) {
diff --git a/modules/globebrowsing/src/layergroupid.h b/modules/globebrowsing/src/layergroupid.h
index 2337c2e055..d6014e79a8 100644
--- a/modules/globebrowsing/src/layergroupid.h
+++ b/modules/globebrowsing/src/layergroupid.h
@@ -68,6 +68,7 @@ struct Layer {
         ByLevelTileLayer,
         SolidColor,
         SpoutImageTileLayer,
+        VideoTileLayer,
         Unknown
     };
 
diff --git a/modules/globebrowsing/src/tileprovider/tileprovider.h b/modules/globebrowsing/src/tileprovider/tileprovider.h
index 8b3a661015..359c987ad8 100644
--- a/modules/globebrowsing/src/tileprovider/tileprovider.h
+++ b/modules/globebrowsing/src/tileprovider/tileprovider.h
@@ -66,7 +66,8 @@ enum class Type {
     TileIndexTileProvider,
     ByIndexTileProvider,
     ByLevelTileProvider,
-    InterpolateTileProvider
+    InterpolateTileProvider, 
+    FfmpegTileProvider
 };