enhanced & corrected AtmoLight filter module

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

diff --git a/modules/video_filter/atmo/AtmoSerialConnection.h b/modules/video_filter/atmo/AtmoClassicConnection.h
similarity index 66%
rename from modules/video_filter/atmo/AtmoSerialConnection.h
rename to modules/video_filter/atmo/AtmoClassicConnection.h
index 22ddb72facc17b9c712e6fc6ea0a48a4c113eb2d..7d0c56abf5249105a54bbbec9dff09876c1e18b1 100644 (file)
--- a/modules/video_filter/atmo/AtmoSerialConnection.h
+++ b/modules/video_filter/atmo/AtmoClassicConnection.h
@@ -6,8 +6,8 @@
  *
  * $Id$
  */
-#ifndef _AtmoSerialConnection_h_
-#define _AtmoSerialConnection_h_
+#ifndef _AtmoClassicConnection_h_
+#define _AtmoClassicConnection_h_
 
 #include "AtmoDefs.h"
 #include "AtmoConnection.h"
@@ -18,7 +18,7 @@
 #endif
 
 
-class CAtmoSerialConnection : public CAtmoConnection {
+class CAtmoClassicConnection : public CAtmoConnection {
     private:
         HANDLE m_hComport;
 
@@ -29,8 +29,8 @@ class CAtmoSerialConnection : public CAtmoConnection {
 #endif
 
     public:
-       CAtmoSerialConnection(CAtmoConfig *cfg);
-       virtual ~CAtmoSerialConnection(void);
+       CAtmoClassicConnection(CAtmoConfig *cfg);
+       virtual ~CAtmoClassicConnection(void);
 
           virtual ATMO_BOOL OpenConnection();
 
@@ -38,12 +38,7 @@ class CAtmoSerialConnection : public CAtmoConnection {
 
        virtual ATMO_BOOL isOpen(void);
 
-       virtual ATMO_BOOL SendData(unsigned char numChannels,
-                                  int red[],
-                                  int green[],
-                                  int blue[]);
-
-       virtual ATMO_BOOL SendData(tColorPacket data);
+       virtual ATMO_BOOL SendData(pColorPacket data);
 
        virtual ATMO_BOOL HardwareWhiteAdjust(int global_gamma,
                                              int global_contrast,
@@ -54,6 +49,18 @@ class CAtmoSerialConnection : public CAtmoConnection {
                                              int gamma_green,
                                              int gamma_blue,
                                              ATMO_BOOL storeToEeprom);
+
+       virtual int getNumChannels() { return 5; }
+
+
+       virtual const char *getDevicePath() { return "atmo"; }
+
+#if !defined(_ATMO_VLC_PLUGIN_)
+       virtual char *getChannelName(int ch);
+       virtual ATMO_BOOL ShowConfigDialog(HINSTANCE hInst, HWND parent, CAtmoConfig *cfg);
+#endif
+
+       virtual ATMO_BOOL CreateDefaultMapping(CAtmoChannelAssignment *ca);
 };
 
 #endif