enhanced & corrected AtmoLight filter module

[vlc] / modules / video_filter / atmo / AtmoExternalCaptureInput.h

diff --git a/modules/video_filter/atmo/AtmoExternalCaptureInput.h b/modules/video_filter/atmo/AtmoExternalCaptureInput.h
index 354033c5a7321a1898dd622d18f338507a416262..2ec00cd17f9537064494797a5b9f4a233de2260b 100644 (file)
--- a/modules/video_filter/atmo/AtmoExternalCaptureInput.h
+++ b/modules/video_filter/atmo/AtmoExternalCaptureInput.h
@@ -12,9 +12,9 @@
 #   endif
 #endif
 
-#if !defined(_ATMO_VLC_PLUGIN_)
-#  include <comdef.h>          
-#  include "AtmoWin_h.h"
+#if defined(_ATMO_VLC_PLUGIN_)
+#  include <vlc_common.h>
+#  include <vlc_threads.h>
 #endif
 
 #include "AtmoInput.h"
@@ -24,9 +24,7 @@
 #include "AtmoCalculations.h"
 
 
-class CAtmoExternalCaptureInput :
-      public CAtmoInput,
-      public CThread
+class CAtmoExternalCaptureInput :  public CAtmoInput
 {
 protected:
 #if defined(_ATMO_VLC_PLUGIN_)
@@ -34,6 +32,7 @@ protected:
     vlc_mutex_t  m_WakeupLock;
 #else
     HANDLE m_hWakeupEvent;
+    CRITICAL_SECTION m_BufferLock;
 #endif
 
     BITMAPINFOHEADER m_CurrentFrameHeader;
@@ -67,17 +66,6 @@ public:
     */
     virtual ATMO_BOOL Close(void);
 
-    /*
-      this method is called from the AtmoLiveView thread - to get the
-      new color packet (a packet is an RGB triple for each channel)
-    */
-    virtual tColorPacket GetColorPacket(void);
-
-    /*
-      this method is also called from the AtmoLiveView thread - to
-      resync on a frame
-    */
-    virtual void WaitForNextFrame(DWORD timeout);
 };
 
 #endif