Revert "atmo: add support for new device fnordlicht"

[vlc] / modules / video_filter / atmo / AtmoTools.cpp

diff --git a/modules/video_filter/atmo/AtmoTools.cpp b/modules/video_filter/atmo/AtmoTools.cpp
index e96bb32315190cff7bde02adf3da776730d4b988..69e07739ccd2e6a66394e24684b53c4457cff89e 100644 (file)
--- a/modules/video_filter/atmo/AtmoTools.cpp
+++ b/modules/video_filter/atmo/AtmoTools.cpp
@@ -13,7 +13,6 @@
 #include "AtmoDmxSerialConnection.h"
 #include "AtmoMultiConnection.h"
 #include "MoMoConnection.h"
-#include "FnordlichtConnection.h"
 #include "AtmoExternalCaptureInput.h"
 #include <math.h>
 
@@ -28,6 +27,7 @@
 #   include "AtmoGdiDisplayCaptureInput.h"
 #endif
 
+
 CAtmoTools::CAtmoTools(void)
 {
 }
@@ -40,6 +40,7 @@ void CAtmoTools::ShowShutdownColor(CAtmoDynData *pDynData)
 {
     pDynData->LockCriticalSection();
 
+
     CAtmoConnection *atmoConnection = pDynData->getAtmoConnection();
     CAtmoConfig *atmoConfig = pDynData->getAtmoConfig();
     if((atmoConnection != NULL) && (atmoConfig!=NULL) && atmoConfig->isSetShutdownColor()) {
@@ -402,24 +403,6 @@ ATMO_BOOL CAtmoTools::RecreateConnection(CAtmoDynData *pDynData)
                return ATMO_TRUE;
            }
 
-           case actFnordlicht: {
-               CFnordlichtConnection *tempConnection = new CFnordlichtConnection( atmoConfig );
-               if(tempConnection->OpenConnection() == ATMO_FALSE) {
-                  pDynData->setAtmoConnection(tempConnection);
-                  pDynData->UnLockCriticalSection();
-                  return ATMO_FALSE;
-               }
-               pDynData->setAtmoConnection(tempConnection);
-               pDynData->ReloadZoneDefinitionBitmaps();
-
-               tempConnection->CreateDefaultMapping( atmoConfig->getChannelAssignment(0) );
-
-               CAtmoTools::SetChannelAssignment(pDynData, atmoConfig->getCurrentChannelAssignment() );
-
-               pDynData->UnLockCriticalSection();
-               return ATMO_TRUE;
-           }
-
            default: {
                pDynData->UnLockCriticalSection();
                return ATMO_FALSE;