enhanced & corrected AtmoLight filter module

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

diff --git a/modules/video_filter/atmo/AtmoInput.cpp b/modules/video_filter/atmo/AtmoInput.cpp
index 3cf6ef1c0fe36f5a37bdaf3f198732bf0c9e328c..fc0ba660bd13f81cbdb7fd288ae31f014faf4765 100644 (file)
--- a/modules/video_filter/atmo/AtmoInput.cpp
+++ b/modules/video_filter/atmo/AtmoInput.cpp
@@ -7,20 +7,25 @@
  *
  * $Id$
  */
-
+#include "AtmoDefs.h"
 #include "AtmoInput.h"
 
-CAtmoInput::CAtmoInput(CAtmoDynData *pAtmoDynData)
+#if defined(_ATMO_VLC_PLUGIN_)
+CAtmoInput::CAtmoInput(CAtmoDynData *pAtmoDynData) : CThread(pAtmoDynData->getAtmoFilter())
 {
-  this->m_pAtmoDynData = pAtmoDynData;
+  m_pAtmoDynData         = pAtmoDynData;
+  m_pAtmoColorCalculator = new CAtmoColorCalculator(pAtmoDynData->getAtmoConfig());
 }
-
-CAtmoInput::~CAtmoInput(void)
+#else
+CAtmoInput::CAtmoInput(CAtmoDynData *pAtmoDynData)
 {
+  m_pAtmoDynData = pAtmoDynData;
+  m_pAtmoColorCalculator = new CAtmoColorCalculator(pAtmoDynData->getAtmoConfig());
 }
+#endif
 
-void CAtmoInput::WaitForNextFrame(DWORD timeout)
+CAtmoInput::~CAtmoInput(void)
 {
-    return;
+  delete m_pAtmoColorCalculator;
 }