Restructure into more sensibly arranged libs

104 files changed, 163 insertions, 59 deletions

diff --git a/p2pvr/Jamfile.jam b/p2pvr/Jamfile.jam
index 565da4e..9a4baac 100644
--- a/p2pvr/Jamfile.jam
+++ b/p2pvr/Jamfile.jam
@@ -25,11 +25,10 @@ alias p2daemonlib : glibmm : : :
 	<cflags>"-I /usr/include/project2/daemon/lib"
 	<linkflags>"-lp2daemonlib"
 ;
-build-project streamer ;
 build-project daemon ;
 build-project carddaemon ;
 
-install debuginstall : lib//p2pvrlib util//p2pvrutil carddaemon daemon ice streamer//streamer : <location>./testing ;
+install debuginstall : dvb//p2pvrdvb devices//p2pvrdevices lib//p2pvrlib carddaemon//p2pvrcarddaemon daemonbase//p2pvrdaemonbase daemon//p2pvrdaemon ice//p2pvrice : <location>./testing ;
 package.install install : : : carddaemon daemon ;
 
 import type ; 
diff --git a/p2pvr/carddaemon/Jamfile.jam b/p2pvr/carddaemon/Jamfile.jam
index 5efeb01..3598c3b 100644
--- a/p2pvr/carddaemon/Jamfile.jam
+++ b/p2pvr/carddaemon/Jamfile.jam
@@ -1,9 +1,7 @@
-lib boost_filesystem ;
-lib boost_system ;
-
 lib p2pvrcarddaemon :
 	[ glob *.cpp ]
 	:
 	<library>../ice//p2pvrice
-	<library>../lib//p2pvrlib
+	<library>../devices//p2pvrdevices
+	<library>../daemonbase//p2pvrdaemonbase
 	;
diff --git a/p2pvr/daemon/Jamfile.jam b/p2pvr/daemon/Jamfile.jam
index 8a6ee8c..338f65e 100644
--- a/p2pvr/daemon/Jamfile.jam
+++ b/p2pvr/daemon/Jamfile.jam
@@ -1,9 +1,20 @@
-lib Ice ;
-lib IceUtil ;
+cpp-pch pch : pch.hpp :
+	<library>../ice//p2pvrice
+	<library>../lib//p2pvrlib
+	<library>../dvb//p2pvrdvb
+	<library>..//p2sql
+	<library>../devices//p2pvrdevices
+	<library>../daemonbase//p2pvrdaemonbase
+;
 
 lib p2pvrdaemon :
-	[ glob *.cpp ]
+	pch
+	[ glob-tree *.cpp *.sql ]
 	:
 	<library>../ice//p2pvrice
 	<library>../lib//p2pvrlib
+	<library>../dvb//p2pvrdvb
+	<library>..//p2sql
+	<library>../devices//p2pvrdevices
+	<library>../daemonbase//p2pvrdaemonbase
 	;
diff --git a/p2pvr/lib/dbClient.cpp b/p2pvr/daemon/dbClient.cpp
index 8267584..8267584 100644
--- a/p2pvr/lib/dbClient.cpp
+++ b/p2pvr/daemon/dbClient.cpp
diff --git a/p2pvr/lib/dbClient.h b/p2pvr/daemon/dbClient.h
index 84cf5e7..84cf5e7 100644
--- a/p2pvr/lib/dbClient.h
+++ b/p2pvr/daemon/dbClient.h
diff --git a/p2pvr/lib/globalDevices.cpp b/p2pvr/daemon/globalDevices.cpp
index 4368cea..4368cea 100644
--- a/p2pvr/lib/globalDevices.cpp
+++ b/p2pvr/daemon/globalDevices.cpp
diff --git a/p2pvr/lib/globalDevices.h b/p2pvr/daemon/globalDevices.h
index da27c95..da27c95 100644
--- a/p2pvr/lib/globalDevices.h
+++ b/p2pvr/daemon/globalDevices.h
diff --git a/p2pvr/lib/maintenance.cpp b/p2pvr/daemon/maintenance.cpp
index 3475544..3475544 100644
--- a/p2pvr/lib/maintenance.cpp
+++ b/p2pvr/daemon/maintenance.cpp
diff --git a/p2pvr/lib/maintenance.h b/p2pvr/daemon/maintenance.h
index 563455a..563455a 100644
--- a/p2pvr/lib/maintenance.h
+++ b/p2pvr/daemon/maintenance.h
diff --git a/p2pvr/lib/maintenance/events.cpp b/p2pvr/daemon/maintenance/events.cpp
index baa2bbf..b0c8b74 100644
--- a/p2pvr/lib/maintenance/events.cpp
+++ b/p2pvr/daemon/maintenance/events.cpp
@@ -1,13 +1,13 @@
 #include <pch.hpp>
 #include "../maintenance.h"
-#include "../siParsers/event.h"
+#include <siParsers/event.h>
 #include <sqlMergeTask.h>
 #include <Ice/Communicator.h>
 #include <p2Helpers.h>
 #include <dvbsiHelpers.h>
 #include <containerIterator.h>
 #include <singleIterator.h>
-#include "../temporaryIceAdapterObject.h"
+#include <temporaryIceAdapterObject.h>
 #include <commonHelpers.h>
 
 class SiEventsHandler : public SiEpgParser {
diff --git a/p2pvr/lib/maintenance/network.cpp b/p2pvr/daemon/maintenance/network.cpp
index c66a2dd..d9ce0ec 100644
--- a/p2pvr/lib/maintenance/network.cpp
+++ b/p2pvr/daemon/maintenance/network.cpp
@@ -1,13 +1,13 @@
 #include <pch.hpp>
 #include "../maintenance.h"
-#include "../siParsers/network.h"
+#include <siParsers/network.h>
 #include <sqlMergeTask.h>
 #include <Ice/Communicator.h>
 #include <p2Helpers.h>
 #include <dvbsiHelpers.h>
 #include <containerIterator.h>
 #include <singleIterator.h>
-#include "../temporaryIceAdapterObject.h"
+#include <temporaryIceAdapterObject.h>
 
 class SiNetworkInformationMerger : public SiNetworkInformationParser {
 	public:
diff --git a/p2pvr/lib/maintenance/programAssociations.cpp b/p2pvr/daemon/maintenance/programAssociations.cpp
index 94a39be..ad6438c 100644
--- a/p2pvr/lib/maintenance/programAssociations.cpp
+++ b/p2pvr/daemon/maintenance/programAssociations.cpp
@@ -1,12 +1,12 @@
 #include <pch.hpp>
 #include "../maintenance.h"
-#include "../siParsers/programAssociation.h"
+#include <siParsers/programAssociation.h>
 #include <sqlMergeTask.h>
 #include <Ice/Communicator.h>
 #include <p2Helpers.h>
 #include <dvbsiHelpers.h>
 #include <mapIterator.h>
-#include "../temporaryIceAdapterObject.h"
+#include <temporaryIceAdapterObject.h>
 
 class SiProgramAssociationHandler : public SiProgramAssociationParser {
 	public:
diff --git a/p2pvr/lib/maintenance/programMap.cpp b/p2pvr/daemon/maintenance/programMap.cpp
index 2a2793d..94d7752 100644
--- a/p2pvr/lib/maintenance/programMap.cpp
+++ b/p2pvr/daemon/maintenance/programMap.cpp
@@ -1,13 +1,13 @@
 #include <pch.hpp>
 #include "../maintenance.h"
-#include "../siParsers/programMap.h"
+#include <siParsers/programMap.h>
 #include <sqlMergeTask.h>
 #include <Ice/Communicator.h>
 #include <p2Helpers.h>
 #include <dvbsiHelpers.h>
 #include <containerIterator.h>
 #include <singleIterator.h>
-#include "../temporaryIceAdapterObject.h"
+#include <temporaryIceAdapterObject.h>
 #include <rdbmsDataSource.h>
 #include <column.h>
 #include <selectcommand.h>
diff --git a/p2pvr/lib/maintenance/services.cpp b/p2pvr/daemon/maintenance/services.cpp
index 2f97161..55409c2 100644
--- a/p2pvr/lib/maintenance/services.cpp
+++ b/p2pvr/daemon/maintenance/services.cpp
@@ -1,13 +1,13 @@
 #include <pch.hpp>
 #include "../maintenance.h"
-#include "../siParsers/service.h"
+#include <siParsers/service.h>
 #include <sqlMergeTask.h>
 #include <Ice/Communicator.h>
 #include <p2Helpers.h>
 #include <dvbsiHelpers.h>
 #include <containerIterator.h>
 #include <singleIterator.h>
-#include "../temporaryIceAdapterObject.h"
+#include <temporaryIceAdapterObject.h>
 
 class SiServicesMerger : public SiServicesParser {
 	public:
diff --git a/p2pvr/daemon/pch.hpp b/p2pvr/daemon/pch.hpp
new file mode 100644
index 0000000..bf16cef
--- /dev/null
+++ b/p2pvr/daemon/pch.hpp
@@ -0,0 +1,24 @@
+#ifdef BOOST_BUILD_PCH_ENABLED
+#ifndef P2PVRLIB_PCH
+#define P2PVRLIB_PCH
+
+#include <Ice/Ice.h>
+#include <glibmm.h>
+#include <boost/bind.hpp>
+#include <boost/foreach.hpp>
+#include <boost/function.hpp>
+#include <boost/intrusive_ptr.hpp>
+#include <boost/shared_ptr.hpp>
+
+#include <list>
+#include <map>
+#include <set>
+#include <string>
+#include <vector>
+
+#include <variableType.h>
+#include <rdbmsDataSource.h>
+
+#endif
+#endif
+
diff --git a/p2pvr/lib/recorder.cpp b/p2pvr/daemon/recorder.cpp
index bdd18c6..bdd18c6 100644
--- a/p2pvr/lib/recorder.cpp
+++ b/p2pvr/daemon/recorder.cpp
diff --git a/p2pvr/lib/recorder.h b/p2pvr/daemon/recorder.h
index 78c604b..78c604b 100644
--- a/p2pvr/lib/recorder.h
+++ b/p2pvr/daemon/recorder.h
diff --git a/p2pvr/lib/recordings.cpp b/p2pvr/daemon/recordings.cpp
index d2c9658..bad8032 100644
--- a/p2pvr/lib/recordings.cpp
+++ b/p2pvr/daemon/recordings.cpp
@@ -5,11 +5,11 @@
 #include <logger.h>
 #include "sqlContainerCreator.h"
 
-ResourceString(Recording_Insert, lib_sql_Recordings_insert_sql);
-ResourceString(Recording_InsertNewId, lib_sql_Recordings_insertNewId_sql);
-ResourceString(Recording_Delete, lib_sql_Recordings_delete_sql);
-ResourceString(Recording_GetStorage, lib_sql_Recordings_getStorage_sql);
-ResourceString(Recording_GetAll, lib_sql_Recordings_getAll_sql);
+ResourceString(Recording_Insert, daemon_sql_Recordings_insert_sql);
+ResourceString(Recording_InsertNewId, daemon_sql_Recordings_insertNewId_sql);
+ResourceString(Recording_Delete, daemon_sql_Recordings_delete_sql);
+ResourceString(Recording_GetStorage, daemon_sql_Recordings_getStorage_sql);
+ResourceString(Recording_GetAll, daemon_sql_Recordings_getAll_sql);
 
 template<>
 void
diff --git a/p2pvr/lib/recordings.h b/p2pvr/daemon/recordings.h
index 0f18a36..0f18a36 100644
--- a/p2pvr/lib/recordings.h
+++ b/p2pvr/daemon/recordings.h
diff --git a/p2pvr/lib/schedulers/bitDumbScheduler.cpp b/p2pvr/daemon/schedulers/bitDumbScheduler.cpp
index f3cf5fb..f3cf5fb 100644
--- a/p2pvr/lib/schedulers/bitDumbScheduler.cpp
+++ b/p2pvr/daemon/schedulers/bitDumbScheduler.cpp
diff --git a/p2pvr/lib/schedules.cpp b/p2pvr/daemon/schedules.cpp
index 99d4983..90df59c 100644
--- a/p2pvr/lib/schedules.cpp
+++ b/p2pvr/daemon/schedules.cpp
@@ -12,14 +12,14 @@
 #include <boost/date_time/posix_time/posix_time.hpp> 
 #include <instanceStore.impl.h>
 
-ResourceString(Schedules_GetCandidates, lib_sql_Schedules_GetCandidates_sql);
-ResourceString(Schedules_insert, lib_sql_Schedules_insert_sql);
-ResourceString(Schedules_insertNewId, lib_sql_Schedules_insertNewId_sql);
-ResourceString(Schedules_update, lib_sql_Schedules_update_sql);
-ResourceString(Schedules_delete, lib_sql_Schedules_delete_sql);
-ResourceString(Schedules_selectAll, lib_sql_Schedules_selectAll_sql);
-ResourceString(Schedules_selectById, lib_sql_Schedules_selectById_sql);
-ResourceString(Schedules_scheduledToRecord, lib_sql_Schedules_scheduledToRecord_sql);
+ResourceString(Schedules_GetCandidates, daemon_sql_Schedules_GetCandidates_sql);
+ResourceString(Schedules_insert, daemon_sql_Schedules_insert_sql);
+ResourceString(Schedules_insertNewId, daemon_sql_Schedules_insertNewId_sql);
+ResourceString(Schedules_update, daemon_sql_Schedules_update_sql);
+ResourceString(Schedules_delete, daemon_sql_Schedules_delete_sql);
+ResourceString(Schedules_selectAll, daemon_sql_Schedules_selectAll_sql);
+ResourceString(Schedules_selectById, daemon_sql_Schedules_selectById_sql);
+ResourceString(Schedules_scheduledToRecord, daemon_sql_Schedules_scheduledToRecord_sql);
 
 std::string Schedules::SchedulerAlgorithm;
 
diff --git a/p2pvr/lib/schedules.h b/p2pvr/daemon/schedules.h
index f7075dd..f7075dd 100644
--- a/p2pvr/lib/schedules.h
+++ b/p2pvr/daemon/schedules.h
diff --git a/p2pvr/lib/si.cpp b/p2pvr/daemon/si.cpp
index b358f72..557003c 100644
--- a/p2pvr/lib/si.cpp
+++ b/p2pvr/daemon/si.cpp
@@ -6,12 +6,12 @@
 #include <linux/dvb/frontend.h>
 #include <logger.h>
 
-ResourceString(SI_serviceNextUsed, lib_sql_SI_serviceNextUsed_sql);
-ResourceString(SI_servicesSelectAll, lib_sql_SI_servicesSelectAll_sql);
-ResourceString(SI_servicesSelectById, lib_sql_SI_servicesSelectById_sql);
-ResourceString(SI_eventById, lib_sql_SI_eventById_sql);
-ResourceString(SI_eventsOnNow, lib_sql_SI_eventsOnNow_sql);
-ResourceString(SI_eventsInRange, lib_sql_SI_eventsInRange_sql);
+ResourceString(SI_serviceNextUsed, daemon_sql_SI_serviceNextUsed_sql);
+ResourceString(SI_servicesSelectAll, daemon_sql_SI_servicesSelectAll_sql);
+ResourceString(SI_servicesSelectById, daemon_sql_SI_servicesSelectById_sql);
+ResourceString(SI_eventById, daemon_sql_SI_eventById_sql);
+ResourceString(SI_eventsOnNow, daemon_sql_SI_eventsOnNow_sql);
+ResourceString(SI_eventsInRange, daemon_sql_SI_eventsInRange_sql);
 
 P2PVR::Deliveries
 SI::GetAllDeliveries(short type, const Ice::Current &)
diff --git a/p2pvr/lib/si.h b/p2pvr/daemon/si.h
index 6b720dc..6b720dc 100644
--- a/p2pvr/lib/si.h
+++ b/p2pvr/daemon/si.h
diff --git a/p2pvr/lib/sql/Recordings_delete.sql b/p2pvr/daemon/sql/Recordings_delete.sql
index 3395376..3395376 100644
--- a/p2pvr/lib/sql/Recordings_delete.sql
+++ b/p2pvr/daemon/sql/Recordings_delete.sql
diff --git a/p2pvr/lib/sql/Recordings_getAll.sql b/p2pvr/daemon/sql/Recordings_getAll.sql
index c0a096c..c0a096c 100644
--- a/p2pvr/lib/sql/Recordings_getAll.sql
+++ b/p2pvr/daemon/sql/Recordings_getAll.sql
diff --git a/p2pvr/lib/sql/Recordings_getStorage.sql b/p2pvr/daemon/sql/Recordings_getStorage.sql
index fdaf58d..fdaf58d 100644
--- a/p2pvr/lib/sql/Recordings_getStorage.sql
+++ b/p2pvr/daemon/sql/Recordings_getStorage.sql
diff --git a/p2pvr/lib/sql/Recordings_insert.sql b/p2pvr/daemon/sql/Recordings_insert.sql
index dfe2ccc..dfe2ccc 100644
--- a/p2pvr/lib/sql/Recordings_insert.sql
+++ b/p2pvr/daemon/sql/Recordings_insert.sql
diff --git a/p2pvr/lib/sql/Recordings_insertNewId.sql b/p2pvr/daemon/sql/Recordings_insertNewId.sql
index 0583b49..0583b49 100644
--- a/p2pvr/lib/sql/Recordings_insertNewId.sql
+++ b/p2pvr/daemon/sql/Recordings_insertNewId.sql
diff --git a/p2pvr/lib/sql/SI_eventById.sql b/p2pvr/daemon/sql/SI_eventById.sql
index f0e028d..f0e028d 100644
--- a/p2pvr/lib/sql/SI_eventById.sql
+++ b/p2pvr/daemon/sql/SI_eventById.sql
diff --git a/p2pvr/lib/sql/SI_eventsInRange.sql b/p2pvr/daemon/sql/SI_eventsInRange.sql
index 0a2d6de..0a2d6de 100644
--- a/p2pvr/lib/sql/SI_eventsInRange.sql
+++ b/p2pvr/daemon/sql/SI_eventsInRange.sql
diff --git a/p2pvr/lib/sql/SI_eventsOnNow.sql b/p2pvr/daemon/sql/SI_eventsOnNow.sql
index 36760b4..36760b4 100644
--- a/p2pvr/lib/sql/SI_eventsOnNow.sql
+++ b/p2pvr/daemon/sql/SI_eventsOnNow.sql
diff --git a/p2pvr/lib/sql/SI_serviceNextUsed.sql b/p2pvr/daemon/sql/SI_serviceNextUsed.sql
index 8e906ad..8e906ad 100644
--- a/p2pvr/lib/sql/SI_serviceNextUsed.sql
+++ b/p2pvr/daemon/sql/SI_serviceNextUsed.sql
diff --git a/p2pvr/lib/sql/SI_servicesSelectAll.sql b/p2pvr/daemon/sql/SI_servicesSelectAll.sql
index 513a076..513a076 100644
--- a/p2pvr/lib/sql/SI_servicesSelectAll.sql
+++ b/p2pvr/daemon/sql/SI_servicesSelectAll.sql
diff --git a/p2pvr/lib/sql/SI_servicesSelectById.sql b/p2pvr/daemon/sql/SI_servicesSelectById.sql
index f0bda72..f0bda72 100644
--- a/p2pvr/lib/sql/SI_servicesSelectById.sql
+++ b/p2pvr/daemon/sql/SI_servicesSelectById.sql
diff --git a/p2pvr/lib/sql/Schedules_GetCandidates.sql b/p2pvr/daemon/sql/Schedules_GetCandidates.sql
index 8e8b15e..8e8b15e 100644
--- a/p2pvr/lib/sql/Schedules_GetCandidates.sql
+++ b/p2pvr/daemon/sql/Schedules_GetCandidates.sql
diff --git a/p2pvr/lib/sql/Schedules_delete.sql b/p2pvr/daemon/sql/Schedules_delete.sql
index e14edc3..e14edc3 100644
--- a/p2pvr/lib/sql/Schedules_delete.sql
+++ b/p2pvr/daemon/sql/Schedules_delete.sql
diff --git a/p2pvr/lib/sql/Schedules_insert.sql b/p2pvr/daemon/sql/Schedules_insert.sql
index 100e78b..100e78b 100644
--- a/p2pvr/lib/sql/Schedules_insert.sql
+++ b/p2pvr/daemon/sql/Schedules_insert.sql
diff --git a/p2pvr/lib/sql/Schedules_insertNewId.sql b/p2pvr/daemon/sql/Schedules_insertNewId.sql
index f66acd5..f66acd5 100644
--- a/p2pvr/lib/sql/Schedules_insertNewId.sql
+++ b/p2pvr/daemon/sql/Schedules_insertNewId.sql
diff --git a/p2pvr/lib/sql/Schedules_pendingRecord.sql b/p2pvr/daemon/sql/Schedules_pendingRecord.sql
index ba4d7d8..ba4d7d8 100644
--- a/p2pvr/lib/sql/Schedules_pendingRecord.sql
+++ b/p2pvr/daemon/sql/Schedules_pendingRecord.sql
diff --git a/p2pvr/lib/sql/Schedules_scheduledToRecord.sql b/p2pvr/daemon/sql/Schedules_scheduledToRecord.sql
index 3874c37..3874c37 100644
--- a/p2pvr/lib/sql/Schedules_scheduledToRecord.sql
+++ b/p2pvr/daemon/sql/Schedules_scheduledToRecord.sql
diff --git a/p2pvr/lib/sql/Schedules_selectAll.sql b/p2pvr/daemon/sql/Schedules_selectAll.sql
index e9e500e..e9e500e 100644
--- a/p2pvr/lib/sql/Schedules_selectAll.sql
+++ b/p2pvr/daemon/sql/Schedules_selectAll.sql
diff --git a/p2pvr/lib/sql/Schedules_selectById.sql b/p2pvr/daemon/sql/Schedules_selectById.sql
index 4990418..4990418 100644
--- a/p2pvr/lib/sql/Schedules_selectById.sql
+++ b/p2pvr/daemon/sql/Schedules_selectById.sql
diff --git a/p2pvr/lib/sql/Schedules_update.sql b/p2pvr/daemon/sql/Schedules_update.sql
index 56c9531..56c9531 100644
--- a/p2pvr/lib/sql/Schedules_update.sql
+++ b/p2pvr/daemon/sql/Schedules_update.sql
diff --git a/p2pvr/lib/sqlContainerCreator.h b/p2pvr/daemon/sqlContainerCreator.h
index 5c8d8f8..5c8d8f8 100644
--- a/p2pvr/lib/sqlContainerCreator.h
+++ b/p2pvr/daemon/sqlContainerCreator.h
diff --git a/p2pvr/lib/storage.cpp b/p2pvr/daemon/storage.cpp
index 9d9345d..9d9345d 100644
--- a/p2pvr/lib/storage.cpp
+++ b/p2pvr/daemon/storage.cpp
diff --git a/p2pvr/lib/storage.h b/p2pvr/daemon/storage.h
index 093e00d..093e00d 100644
--- a/p2pvr/lib/storage.h
+++ b/p2pvr/daemon/storage.h
diff --git a/p2pvr/daemonbase/Jamfile.jam b/p2pvr/daemonbase/Jamfile.jam
new file mode 100644
index 0000000..bae7dca
--- /dev/null
+++ b/p2pvr/daemonbase/Jamfile.jam
@@ -0,0 +1,21 @@
+lib boost_system ;
+lib boost_filesystem ;
+
+cpp-pch pch : pch.hpp :
+	<library>..//p2common
+	<library>..//p2daemonlib
+	<implicit-dependency>../ice//p2pvrice
+;
+
+lib p2pvrdaemonbase :
+	pch
+	[ glob-tree *.cpp ]
+	:
+	<library>..//p2common
+	<library>../lib//p2pvrlib
+	<implicit-dependency>../ice//p2pvrice
+	: :
+	<implicit-dependency>../ice//p2pvrice
+	<library>..//p2daemonlib
+	<include>.
+	;
diff --git a/p2pvr/lib/daemonBase.cpp b/p2pvr/daemonbase/daemonBase.cpp
index 4739498..4739498 100644
--- a/p2pvr/lib/daemonBase.cpp
+++ b/p2pvr/daemonbase/daemonBase.cpp
diff --git a/p2pvr/lib/daemonBase.h b/p2pvr/daemonbase/daemonBase.h
index 3cf9b19..3cf9b19 100644
--- a/p2pvr/lib/daemonBase.h
+++ b/p2pvr/daemonbase/daemonBase.h
diff --git a/p2pvr/lib/p2LoggerWrapper.cpp b/p2pvr/daemonbase/p2LoggerWrapper.cpp
index 60ec191..60ec191 100644
--- a/p2pvr/lib/p2LoggerWrapper.cpp
+++ b/p2pvr/daemonbase/p2LoggerWrapper.cpp
diff --git a/p2pvr/lib/p2LoggerWrapper.h b/p2pvr/daemonbase/p2LoggerWrapper.h
index 8febda5..8febda5 100644
--- a/p2pvr/lib/p2LoggerWrapper.h
+++ b/p2pvr/daemonbase/p2LoggerWrapper.h
diff --git a/p2pvr/daemonbase/pch.hpp b/p2pvr/daemonbase/pch.hpp
new file mode 100644
index 0000000..28b23b5
--- /dev/null
+++ b/p2pvr/daemonbase/pch.hpp
@@ -0,0 +1,13 @@
+#ifdef BOOST_BUILD_PCH_ENABLED
+#ifndef P2PVRLIB_PCH
+#define P2PVRLIB_PCH
+
+#include <Ice/Ice.h>
+#include <variableType.h>
+#include <daemon.h>
+#include <options.h>
+#include <logger.h>
+
+#endif
+#endif
+
diff --git a/p2pvr/devices/Jamfile.jam b/p2pvr/devices/Jamfile.jam
new file mode 100644
index 0000000..a3452a4
--- /dev/null
+++ b/p2pvr/devices/Jamfile.jam
@@ -0,0 +1,27 @@
+lib boost_system ;
+lib boost_filesystem ;
+
+cpp-pch pch : pch.hpp :
+	<library>boost_system
+	<library>boost_filesystem
+	<library>..//p2common
+	<implicit-dependency>../ice//p2pvrice
+;
+
+lib p2pvrdevices :
+	pch
+	[ glob-tree *.cpp ]
+	:
+	<library>boost_system
+	<library>boost_filesystem
+	<library>../dvb//p2pvrdvb
+	<library>../ice//p2pvrice
+	<library>../lib//p2pvrlib
+	<library>..//p2common
+	<implicit-dependency>../ice//p2pvrice
+	: :
+	<library>boost_filesystem
+	<implicit-dependency>../ice//p2pvrice
+	<library>boost_system
+	<include>.
+	;
diff --git a/p2pvr/lib/frontend.cpp b/p2pvr/devices/frontend.cpp
index 54870a1..54870a1 100644
--- a/p2pvr/lib/frontend.cpp
+++ b/p2pvr/devices/frontend.cpp
diff --git a/p2pvr/lib/frontend.h b/p2pvr/devices/frontend.h
index d33353d..d33353d 100644
--- a/p2pvr/lib/frontend.h
+++ b/p2pvr/devices/frontend.h
diff --git a/p2pvr/lib/frontends/ofdm.cpp b/p2pvr/devices/frontends/ofdm.cpp
index 93e0d86..93e0d86 100644
--- a/p2pvr/lib/frontends/ofdm.cpp
+++ b/p2pvr/devices/frontends/ofdm.cpp
diff --git a/p2pvr/lib/localDevices.cpp b/p2pvr/devices/localDevices.cpp
index 7a43a15..7a43a15 100644
--- a/p2pvr/lib/localDevices.cpp
+++ b/p2pvr/devices/localDevices.cpp
diff --git a/p2pvr/lib/localDevices.h b/p2pvr/devices/localDevices.h
index 5521f8d..5521f8d 100644
--- a/p2pvr/lib/localDevices.h
+++ b/p2pvr/devices/localDevices.h
diff --git a/p2pvr/devices/pch.hpp b/p2pvr/devices/pch.hpp
new file mode 100644
index 0000000..2eeeea5
--- /dev/null
+++ b/p2pvr/devices/pch.hpp
@@ -0,0 +1,24 @@
+#ifdef BOOST_BUILD_PCH_ENABLED
+#ifndef P2PVRLIB_PCH
+#define P2PVRLIB_PCH
+
+#include <Ice/Ice.h>
+#include <boost/bind.hpp>
+#include <boost/foreach.hpp>
+#include <boost/function.hpp>
+#include <boost/intrusive_ptr.hpp>
+#include <boost/shared_ptr.hpp>
+
+#include <list>
+#include <map>
+#include <set>
+#include <string>
+#include <vector>
+#include <thread>
+
+#include <options.h>
+#include <plugable.h>
+
+#endif
+#endif
+
diff --git a/p2pvr/lib/tuner.cpp b/p2pvr/devices/tuner.cpp
index fe90231..fe90231 100644
--- a/p2pvr/lib/tuner.cpp
+++ b/p2pvr/devices/tuner.cpp
diff --git a/p2pvr/lib/tuner.h b/p2pvr/devices/tuner.h
index 670a17d..670a17d 100644
--- a/p2pvr/lib/tuner.h
+++ b/p2pvr/devices/tuner.h
diff --git a/p2pvr/lib/tunerSendSi.cpp b/p2pvr/devices/tunerSendSi.cpp
index e1f4637..e1f4637 100644
--- a/p2pvr/lib/tunerSendSi.cpp
+++ b/p2pvr/devices/tunerSendSi.cpp
diff --git a/p2pvr/lib/tunerSendSi.h b/p2pvr/devices/tunerSendSi.h
index df48f43..df48f43 100644
--- a/p2pvr/lib/tunerSendSi.h
+++ b/p2pvr/devices/tunerSendSi.h
diff --git a/p2pvr/lib/tunerSendTs.cpp b/p2pvr/devices/tunerSendTs.cpp
index 70b6670..70b6670 100644
--- a/p2pvr/lib/tunerSendTs.cpp
+++ b/p2pvr/devices/tunerSendTs.cpp
diff --git a/p2pvr/lib/tunerSendTs.h b/p2pvr/devices/tunerSendTs.h
index ecf32fd..ecf32fd 100644
--- a/p2pvr/lib/tunerSendTs.h
+++ b/p2pvr/devices/tunerSendTs.h
diff --git a/p2pvr/util/Jamfile.jam b/p2pvr/dvb/Jamfile.jam
index 84b2654..c8f2fe0 100644
--- a/p2pvr/util/Jamfile.jam
+++ b/p2pvr/dvb/Jamfile.jam
@@ -1,19 +1,14 @@
 cpp-pch pch : pch.hpp :
-	<library>..//p2common
-	<library>..//p2lib
 	<implicit-dependency>../ice//p2pvrice
 ;
 
-lib p2pvrutil :
+lib p2pvrdvb :
 	pch
 	[ glob-tree *.cpp ]
-	../../libmisc/misc.cpp
 	:
-	<library>..//p2common
-	<library>..//p2lib
 	<library>../ice//p2pvrice
 	<implicit-dependency>../ice//p2pvrice
 	: :
+	<implicit-dependency>../ice//p2pvrice
 	<include>.
 	;
-
diff --git a/p2pvr/util/pch.hpp b/p2pvr/dvb/pch.hpp
index dafc462..c6319b8 100644
--- a/p2pvr/util/pch.hpp
+++ b/p2pvr/dvb/pch.hpp
@@ -1,8 +1,9 @@
 #ifdef BOOST_BUILD_PCH_ENABLED
-#ifndef P2PVRUTIL_PCH
-#define P2PVRUTIL_PCH
+#ifndef P2PVRLIB_PCH
+#define P2PVRLIB_PCH
 
 #include <Ice/Ice.h>
+#include <glibmm.h>
 #include <boost/bind.hpp>
 #include <boost/foreach.hpp>
 #include <boost/function.hpp>
@@ -15,9 +16,8 @@
 #include <string>
 #include <vector>
 
-#include <variableType.h>
+#include <dvbsi.h>
 
 #endif
 #endif
 
-
diff --git a/p2pvr/lib/siParsers/event.cpp b/p2pvr/dvb/siParsers/event.cpp
index c094331..c094331 100644
--- a/p2pvr/lib/siParsers/event.cpp
+++ b/p2pvr/dvb/siParsers/event.cpp
diff --git a/p2pvr/lib/siParsers/event.h b/p2pvr/dvb/siParsers/event.h
index 6b316cc..6b316cc 100644
--- a/p2pvr/lib/siParsers/event.h
+++ b/p2pvr/dvb/siParsers/event.h
diff --git a/p2pvr/lib/siParsers/network.cpp b/p2pvr/dvb/siParsers/network.cpp
index b91da1a..b91da1a 100644
--- a/p2pvr/lib/siParsers/network.cpp
+++ b/p2pvr/dvb/siParsers/network.cpp
diff --git a/p2pvr/lib/siParsers/network.h b/p2pvr/dvb/siParsers/network.h
index 4f8e6e3..4f8e6e3 100644
--- a/p2pvr/lib/siParsers/network.h
+++ b/p2pvr/dvb/siParsers/network.h
diff --git a/p2pvr/lib/siParsers/programAssociation.cpp b/p2pvr/dvb/siParsers/programAssociation.cpp
index 7839b9e..7839b9e 100644
--- a/p2pvr/lib/siParsers/programAssociation.cpp
+++ b/p2pvr/dvb/siParsers/programAssociation.cpp
diff --git a/p2pvr/lib/siParsers/programAssociation.h b/p2pvr/dvb/siParsers/programAssociation.h
index 653be0c..653be0c 100644
--- a/p2pvr/lib/siParsers/programAssociation.h
+++ b/p2pvr/dvb/siParsers/programAssociation.h
diff --git a/p2pvr/lib/siParsers/programMap.cpp b/p2pvr/dvb/siParsers/programMap.cpp
index 1ba78c4..1ba78c4 100644
--- a/p2pvr/lib/siParsers/programMap.cpp
+++ b/p2pvr/dvb/siParsers/programMap.cpp
diff --git a/p2pvr/lib/siParsers/programMap.h b/p2pvr/dvb/siParsers/programMap.h
index 07821b5..07821b5 100644
--- a/p2pvr/lib/siParsers/programMap.h
+++ b/p2pvr/dvb/siParsers/programMap.h
diff --git a/p2pvr/lib/siParsers/service.cpp b/p2pvr/dvb/siParsers/service.cpp
index fbcd966..fbcd966 100644
--- a/p2pvr/lib/siParsers/service.cpp
+++ b/p2pvr/dvb/siParsers/service.cpp
diff --git a/p2pvr/lib/siParsers/service.h b/p2pvr/dvb/siParsers/service.h
index 611eb90..611eb90 100644
--- a/p2pvr/lib/siParsers/service.h
+++ b/p2pvr/dvb/siParsers/service.h
diff --git a/p2pvr/lib/siParsers/table.cpp b/p2pvr/dvb/siParsers/table.cpp
index 9844814..9844814 100644
--- a/p2pvr/lib/siParsers/table.cpp
+++ b/p2pvr/dvb/siParsers/table.cpp
diff --git a/p2pvr/lib/siParsers/table.h b/p2pvr/dvb/siParsers/table.h
index c470159..c470159 100644
--- a/p2pvr/lib/siParsers/table.h
+++ b/p2pvr/dvb/siParsers/table.h
diff --git a/p2pvr/ice/Jamfile.jam b/p2pvr/ice/Jamfile.jam
index cc97614..8ece4f7 100644
--- a/p2pvr/ice/Jamfile.jam
+++ b/p2pvr/ice/Jamfile.jam
@@ -3,8 +3,7 @@ lib IceUtil ;
 lib pthread ;
 
 lib p2pvrice :
-	[ glob *.cpp ]
-	[ glob *.ice ] :
+	[ glob *.cpp *.ice ] :
 	<library>Ice
 	<library>IceUtil
 	<library>pthread
diff --git a/p2pvr/lib/Jamfile.jam b/p2pvr/lib/Jamfile.jam
index 1868a6a..a7ce426 100644
--- a/p2pvr/lib/Jamfile.jam
+++ b/p2pvr/lib/Jamfile.jam
@@ -5,23 +5,19 @@ cpp-pch pch : pch.hpp :
 	<library>boost_system
 	<library>boost_filesystem
 	<library>..//p2common
-	<library>..//p2sql
 	<library>..//p2lib
-	<library>..//p2daemonlib
 	<implicit-dependency>../ice//p2pvrice
 ;
 
 lib p2pvrlib :
 	pch
 	[ glob-tree *.cpp ]
-	[ glob-tree *.sql ]
 	:
 	<library>boost_system
 	<library>boost_filesystem
 	<library>../ice//p2pvrice
-	<library>../util//p2pvrutil
+	<library>../dvb//p2pvrdvb
 	<library>..//p2common
-	<library>..//p2sql
 	<library>..//p2lib
 	<implicit-dependency>../ice//p2pvrice
 	: :
diff --git a/p2pvr/util/containerCreator.h b/p2pvr/lib/containerCreator.h
index 9804d9b..9804d9b 100644
--- a/p2pvr/util/containerCreator.h
+++ b/p2pvr/lib/containerCreator.h
diff --git a/p2pvr/util/containerIterator.h b/p2pvr/lib/containerIterator.h
index 2b61055..2b61055 100644
--- a/p2pvr/util/containerIterator.h
+++ b/p2pvr/lib/containerIterator.h
diff --git a/p2pvr/util/dvbsiHelpers.h b/p2pvr/lib/dvbsiHelpers.h
index 137bf98..137bf98 100644
--- a/p2pvr/util/dvbsiHelpers.h
+++ b/p2pvr/lib/dvbsiHelpers.h
diff --git a/p2pvr/util/dvbsiHelpers/cableDelivery.cpp b/p2pvr/lib/dvbsiHelpers/cableDelivery.cpp
index 7bf9f6d..7bf9f6d 100644
--- a/p2pvr/util/dvbsiHelpers/cableDelivery.cpp
+++ b/p2pvr/lib/dvbsiHelpers/cableDelivery.cpp
diff --git a/p2pvr/util/dvbsiHelpers/event.cpp b/p2pvr/lib/dvbsiHelpers/event.cpp
index ca072df..ca072df 100644
--- a/p2pvr/util/dvbsiHelpers/event.cpp
+++ b/p2pvr/lib/dvbsiHelpers/event.cpp
diff --git a/p2pvr/util/dvbsiHelpers/network.cpp b/p2pvr/lib/dvbsiHelpers/network.cpp
index 3b117f1..3b117f1 100644
--- a/p2pvr/util/dvbsiHelpers/network.cpp
+++ b/p2pvr/lib/dvbsiHelpers/network.cpp
diff --git a/p2pvr/util/dvbsiHelpers/networkService.cpp b/p2pvr/lib/dvbsiHelpers/networkService.cpp
index a4a47d5..a4a47d5 100644
--- a/p2pvr/util/dvbsiHelpers/networkService.cpp
+++ b/p2pvr/lib/dvbsiHelpers/networkService.cpp
diff --git a/p2pvr/util/dvbsiHelpers/networkTransportStream.cpp b/p2pvr/lib/dvbsiHelpers/networkTransportStream.cpp
index bdc7c4f..bdc7c4f 100644
--- a/p2pvr/util/dvbsiHelpers/networkTransportStream.cpp
+++ b/p2pvr/lib/dvbsiHelpers/networkTransportStream.cpp
diff --git a/p2pvr/util/dvbsiHelpers/programMap.cpp b/p2pvr/lib/dvbsiHelpers/programMap.cpp
index d8cf400..d8cf400 100644
--- a/p2pvr/util/dvbsiHelpers/programMap.cpp
+++ b/p2pvr/lib/dvbsiHelpers/programMap.cpp
diff --git a/p2pvr/util/dvbsiHelpers/satelliteDelivery.cpp b/p2pvr/lib/dvbsiHelpers/satelliteDelivery.cpp
index 8231fc3..8231fc3 100644
--- a/p2pvr/util/dvbsiHelpers/satelliteDelivery.cpp
+++ b/p2pvr/lib/dvbsiHelpers/satelliteDelivery.cpp
diff --git a/p2pvr/util/dvbsiHelpers/service.cpp b/p2pvr/lib/dvbsiHelpers/service.cpp
index 9f82d91..9f82d91 100644
--- a/p2pvr/util/dvbsiHelpers/service.cpp
+++ b/p2pvr/lib/dvbsiHelpers/service.cpp
diff --git a/p2pvr/util/dvbsiHelpers/terrestrialDelivery.cpp b/p2pvr/lib/dvbsiHelpers/terrestrialDelivery.cpp
index 46e60f9..46e60f9 100644
--- a/p2pvr/util/dvbsiHelpers/terrestrialDelivery.cpp
+++ b/p2pvr/lib/dvbsiHelpers/terrestrialDelivery.cpp
diff --git a/p2pvr/util/fileHandle.cpp b/p2pvr/lib/fileHandle.cpp
index b85d390..b85d390 100644
--- a/p2pvr/util/fileHandle.cpp
+++ b/p2pvr/lib/fileHandle.cpp
diff --git a/p2pvr/util/fileHandle.h b/p2pvr/lib/fileHandle.h
index 3c8d45e..3c8d45e 100644
--- a/p2pvr/util/fileHandle.h
+++ b/p2pvr/lib/fileHandle.h
diff --git a/p2pvr/util/mapIterator.cpp b/p2pvr/lib/mapIterator.cpp
index 157669a..157669a 100644
--- a/p2pvr/util/mapIterator.cpp
+++ b/p2pvr/lib/mapIterator.cpp
diff --git a/p2pvr/util/mapIterator.h b/p2pvr/lib/mapIterator.h
index 8a06fe6..8a06fe6 100644
--- a/p2pvr/util/mapIterator.h
+++ b/p2pvr/lib/mapIterator.h
diff --git a/p2pvr/util/objectRowState.h b/p2pvr/lib/objectRowState.h
index 9ba69f0..9ba69f0 100644
--- a/p2pvr/util/objectRowState.h
+++ b/p2pvr/lib/objectRowState.h
diff --git a/p2pvr/util/p2Helpers.cpp b/p2pvr/lib/p2Helpers.cpp
index c58ff1a..c58ff1a 100644
--- a/p2pvr/util/p2Helpers.cpp
+++ b/p2pvr/lib/p2Helpers.cpp
diff --git a/p2pvr/util/p2Helpers.h b/p2pvr/lib/p2Helpers.h
index 3b73f1b..3b73f1b 100644
--- a/p2pvr/util/p2Helpers.h
+++ b/p2pvr/lib/p2Helpers.h
diff --git a/p2pvr/util/p2pvrHelpers/schedule.cpp b/p2pvr/lib/p2pvrHelpers/schedule.cpp
index f8abc1e..f8abc1e 100644
--- a/p2pvr/util/p2pvrHelpers/schedule.cpp
+++ b/p2pvr/lib/p2pvrHelpers/schedule.cpp
diff --git a/p2pvr/util/singleIterator.h b/p2pvr/lib/singleIterator.h
index 1aac418..1aac418 100644
--- a/p2pvr/util/singleIterator.h
+++ b/p2pvr/lib/singleIterator.h
diff --git a/p2pvr/streamer/Jamfile.jam b/p2pvr/streamer/Jamfile.jam
index 7f4d2b4..d17e9b2 100644
--- a/p2pvr/streamer/Jamfile.jam
+++ b/p2pvr/streamer/Jamfile.jam
@@ -1,10 +1,7 @@
-
-
 lib streamer :
 	[ glob-tree *.cpp ]
 	: :
 	<library>../ice//p2pvrice
 	<library>../lib//p2pvrlib
-	<library>../util//p2pvrutil
 	<implicit-dependency>../ice//p2pvrice
 	;