cec: moved CEC handlers to implementations/

diff --git a/src/lib/CECBusDevice.cpp b/src/lib/CECBusDevice.cpp
index bcd73cfd908532617fe2c530592024433de33ff3..9eb2ed6e4d2aeb68efb543327ebbd04836730376 100644 (file)
--- a/src/lib/CECBusDevice.cpp
+++ b/src/lib/CECBusDevice.cpp
@@ -32,8 +32,9 @@
 
 #include "CECBusDevice.h"
 #include "CECProcessor.h"
-#include "ANCommandHandler.h"
-#include "SLCommandHandler.h"
+#include "implementations/ANCommandHandler.h"
+#include "implementations/CECCommandHandler.h"
+#include "implementations/SLCommandHandler.h"
 
 using namespace CEC;
 

diff --git a/src/lib/CECBusDevice.h b/src/lib/CECBusDevice.h
index b7ae7e92bb1a5455e77552afe300905473d61d1e..fc42556e320e2fc1f85268e7a77844a48b1cc8e6 100644 (file)
--- a/src/lib/CECBusDevice.h
+++ b/src/lib/CECBusDevice.h
@@ -31,13 +31,14 @@
  *     http://www.pulse-eight.net/
  */
 
-#include "CECCommandHandler.h"
+#include <cectypes.h>
 #include "platform/threads.h"
 #include "util/StdString.h"
 
 namespace CEC
 {
   class CCECProcessor;
+  class CCECCommandHandler;
 
   class CCECBusDevice
   {

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index c608a6701ac3801352bb6e8158b73e448f293f6b..243c3177b7ef452321b85e36b370d37098a7496f 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -12,20 +12,20 @@ libcec_la_SOURCES = AdapterCommunication.cpp \
                     AdapterCommunication.h \
                     AdapterDetection.cpp \
                     AdapterDetection.h \
-                    ANCommandHandler.cpp \
-                    ANCommandHandler.h \
                     CECBusDevice.cpp \
                     CECBusDevice.h \
-                    CECCommandHandler.cpp \
-                    CECCommandHandler.h \
                     CECProcessor.cpp \
                     CECProcessor.h \
                     LibCEC.cpp \
                     LibCEC.h \
                     LibCECC.cpp \
-                    SLCommandHandler.cpp \
-                    SLCommandHandler.h \
                     util/StdString.h \
+                    implementations/ANCommandHandler.cpp \
+                    implementations/ANCommandHandler.h \
+                    implementations/CECCommandHandler.cpp \
+                    implementations/CECCommandHandler.h \
+                    implementations/SLCommandHandler.cpp \
+                    implementations/SLCommandHandler.h \
                     platform/timeutils.h \
                     platform/baudrate.h \
                     platform/os-dependent.h \

diff --git a/src/lib/ANCommandHandler.cpp b/src/lib/implementations/ANCommandHandler.cpp
similarity index 100%
rename from src/lib/ANCommandHandler.cpp
rename to src/lib/implementations/ANCommandHandler.cpp

diff --git a/src/lib/ANCommandHandler.h b/src/lib/implementations/ANCommandHandler.h
similarity index 100%
rename from src/lib/ANCommandHandler.h
rename to src/lib/implementations/ANCommandHandler.h

diff --git a/src/lib/CECCommandHandler.cpp b/src/lib/implementations/CECCommandHandler.cpp
similarity index 100%
rename from src/lib/CECCommandHandler.cpp
rename to src/lib/implementations/CECCommandHandler.cpp

diff --git a/src/lib/CECCommandHandler.h b/src/lib/implementations/CECCommandHandler.h
similarity index 100%
rename from src/lib/CECCommandHandler.h
rename to src/lib/implementations/CECCommandHandler.h

diff --git a/src/lib/SLCommandHandler.cpp b/src/lib/implementations/SLCommandHandler.cpp
similarity index 100%
rename from src/lib/SLCommandHandler.cpp
rename to src/lib/implementations/SLCommandHandler.cpp

diff --git a/src/lib/SLCommandHandler.h b/src/lib/implementations/SLCommandHandler.h
similarity index 100%
rename from src/lib/SLCommandHandler.h
rename to src/lib/implementations/SLCommandHandler.h