From 1b5cc4a2517ee8e6cebb44063ea03eb4128b4ab1 Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Thu, 27 Oct 2011 01:10:01 +0200 Subject: [PATCH] cec: moved CEC handlers to implementations/ --- src/lib/CECBusDevice.cpp | 5 +++-- src/lib/CECBusDevice.h | 3 ++- src/lib/Makefile.am | 12 ++++++------ src/lib/{ => implementations}/ANCommandHandler.cpp | 0 src/lib/{ => implementations}/ANCommandHandler.h | 0 src/lib/{ => implementations}/CECCommandHandler.cpp | 0 src/lib/{ => implementations}/CECCommandHandler.h | 0 src/lib/{ => implementations}/SLCommandHandler.cpp | 0 src/lib/{ => implementations}/SLCommandHandler.h | 0 9 files changed, 11 insertions(+), 9 deletions(-) rename src/lib/{ => implementations}/ANCommandHandler.cpp (100%) rename src/lib/{ => implementations}/ANCommandHandler.h (100%) rename src/lib/{ => implementations}/CECCommandHandler.cpp (100%) rename src/lib/{ => implementations}/CECCommandHandler.h (100%) rename src/lib/{ => implementations}/SLCommandHandler.cpp (100%) rename src/lib/{ => implementations}/SLCommandHandler.h (100%) diff --git a/src/lib/CECBusDevice.cpp b/src/lib/CECBusDevice.cpp index bcd73cf..9eb2ed6 100644 --- 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 b7ae7e9..fc42556 100644 --- a/src/lib/CECBusDevice.h +++ b/src/lib/CECBusDevice.h @@ -31,13 +31,14 @@ * http://www.pulse-eight.net/ */ -#include "CECCommandHandler.h" +#include #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 c608a67..243c317 100644 --- 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 -- 2.34.1