Move some stuff into a utils lib

30 files changed, 64 insertions, 27 deletions

diff --git a/p2pvr/Jamfile.jam b/p2pvr/Jamfile.jam
index 4f69bae..a0948fc 100644
--- a/p2pvr/Jamfile.jam
+++ b/p2pvr/Jamfile.jam
@@ -24,7 +24,7 @@ alias p2daemonlib : glibmm : : :
 build-project daemon ;
 build-project carddaemon ;
 
-install debuginstall : lib//p2pvrlib carddaemon daemon ice : <location>./testing ;
+install debuginstall : lib//p2pvrlib util//p2pvrutil carddaemon daemon ice : <location>./testing ;
 package.install install : : : carddaemon daemon ;
 
 import type ; 
diff --git a/p2pvr/daemon/daemon.cpp b/p2pvr/daemon/daemon.cpp
index 58ca66e..8597a25 100644
--- a/p2pvr/daemon/daemon.cpp
+++ b/p2pvr/daemon/daemon.cpp
@@ -34,12 +34,7 @@ class P2PvrDaemon : public Daemon {
 			adapter->add(new Schedules(), ic->stringToIdentity("Schedules"));
 			adapter->activate();
 
-			auto maint = P2PVR::MaintenancePrx::checkedCast(adapter->createProxy(ic->stringToIdentity("Maintenance")));
-			maint->UpdateNetwork(FE_OFDM);
-			maint->UpdateServices(FE_OFDM);
-			maint->UpdateEvents(FE_OFDM);
-
-			//ic->waitForShutdown();
+			ic->waitForShutdown();
 			timer->destroy();
 		}
 
diff --git a/p2pvr/lib/Jamfile.jam b/p2pvr/lib/Jamfile.jam
index f56741c..a1b6214 100644
--- a/p2pvr/lib/Jamfile.jam
+++ b/p2pvr/lib/Jamfile.jam
@@ -15,11 +15,11 @@ lib p2pvrlib :
 	pch
 	[ glob-tree *.cpp ]
 	[ glob-tree *.sql ]
-	../../libmisc/misc.cpp
 	:
 	<library>boost_system
 	<library>boost_filesystem
 	<library>../ice//p2pvrice
+	<library>../util//p2pvrutil
 	<library>..//p2common
 	<library>..//p2sql
 	<library>..//p2lib
diff --git a/p2pvr/lib/maintenance/events.cpp b/p2pvr/lib/maintenance/events.cpp
index a2d3e21..0327ec8 100644
--- a/p2pvr/lib/maintenance/events.cpp
+++ b/p2pvr/lib/maintenance/events.cpp
@@ -3,10 +3,10 @@
 #include "../siParsers/event.h"
 #include <sqlMergeTask.h>
 #include <Ice/Communicator.h>
-#include "../p2Helpers.h"
-#include "../dvbsiHelpers.h"
-#include "../containerIterator.h"
-#include "../singleIterator.h"
+#include <p2Helpers.h>
+#include <dvbsiHelpers.h>
+#include <containerIterator.h>
+#include <singleIterator.h>
 #include "../temporaryIceAdapterObject.h"
 #include <commonHelpers.h>
 
diff --git a/p2pvr/lib/maintenance/network.cpp b/p2pvr/lib/maintenance/network.cpp
index 7806824..6704b7b 100644
--- a/p2pvr/lib/maintenance/network.cpp
+++ b/p2pvr/lib/maintenance/network.cpp
@@ -3,10 +3,10 @@
 #include "../siParsers/network.h"
 #include <sqlMergeTask.h>
 #include <Ice/Communicator.h>
-#include "../p2Helpers.h"
-#include "../dvbsiHelpers.h"
-#include "../containerIterator.h"
-#include "../singleIterator.h"
+#include <p2Helpers.h>
+#include <dvbsiHelpers.h>
+#include <containerIterator.h>
+#include <singleIterator.h>
 #include "../temporaryIceAdapterObject.h"
 
 class SiNetworkInformationMerger : public SiNetworkInformationParser {
diff --git a/p2pvr/lib/maintenance/programAssociations.cpp b/p2pvr/lib/maintenance/programAssociations.cpp
index 69287da..c859684 100644
--- a/p2pvr/lib/maintenance/programAssociations.cpp
+++ b/p2pvr/lib/maintenance/programAssociations.cpp
@@ -3,9 +3,9 @@
 #include "../siParsers/programAssociation.h"
 #include <sqlMergeTask.h>
 #include <Ice/Communicator.h>
-#include "../p2Helpers.h"
-#include "../dvbsiHelpers.h"
-#include "../mapIterator.h"
+#include <p2Helpers.h>
+#include <dvbsiHelpers.h>
+#include <mapIterator.h>
 #include "../temporaryIceAdapterObject.h"
 
 class SiProgramAssociationHandler : public SiProgramAssociationParser {
diff --git a/p2pvr/lib/maintenance/programMap.cpp b/p2pvr/lib/maintenance/programMap.cpp
index a7cfe40..75e5ce8 100644
--- a/p2pvr/lib/maintenance/programMap.cpp
+++ b/p2pvr/lib/maintenance/programMap.cpp
@@ -3,10 +3,10 @@
 #include "../siParsers/programMap.h"
 #include <sqlMergeTask.h>
 #include <Ice/Communicator.h>
-#include "../p2Helpers.h"
-#include "../dvbsiHelpers.h"
-#include "../containerIterator.h"
-#include "../singleIterator.h"
+#include <p2Helpers.h>
+#include <dvbsiHelpers.h>
+#include <containerIterator.h>
+#include <singleIterator.h>
 #include "../temporaryIceAdapterObject.h"
 #include <rdbmsDataSource.h>
 #include <column.h>
diff --git a/p2pvr/lib/maintenance/services.cpp b/p2pvr/lib/maintenance/services.cpp
index ec4c6dc..ba958a8 100644
--- a/p2pvr/lib/maintenance/services.cpp
+++ b/p2pvr/lib/maintenance/services.cpp
@@ -3,10 +3,10 @@
 #include "../siParsers/service.h"
 #include <sqlMergeTask.h>
 #include <Ice/Communicator.h>
-#include "../p2Helpers.h"
-#include "../dvbsiHelpers.h"
-#include "../containerIterator.h"
-#include "../singleIterator.h"
+#include <p2Helpers.h>
+#include <dvbsiHelpers.h>
+#include <containerIterator.h>
+#include <singleIterator.h>
 #include "../temporaryIceAdapterObject.h"
 
 class SiServicesMerger : public SiServicesParser {
diff --git a/p2pvr/util/Jamfile.jam b/p2pvr/util/Jamfile.jam
new file mode 100644
index 0000000..84b2654
--- /dev/null
+++ b/p2pvr/util/Jamfile.jam
@@ -0,0 +1,19 @@
+cpp-pch pch : pch.hpp :
+	<library>..//p2common
+	<library>..//p2lib
+	<implicit-dependency>../ice//p2pvrice
+;
+
+lib p2pvrutil :
+	pch
+	[ glob-tree *.cpp ]
+	../../libmisc/misc.cpp
+	:
+	<library>..//p2common
+	<library>..//p2lib
+	<library>../ice//p2pvrice
+	<implicit-dependency>../ice//p2pvrice
+	: :
+	<include>.
+	;
+
diff --git a/p2pvr/lib/containerCreator.h b/p2pvr/util/containerCreator.h
index 9804d9b..9804d9b 100644
--- a/p2pvr/lib/containerCreator.h
+++ b/p2pvr/util/containerCreator.h
diff --git a/p2pvr/lib/containerIterator.h b/p2pvr/util/containerIterator.h
index 2b61055..2b61055 100644
--- a/p2pvr/lib/containerIterator.h
+++ b/p2pvr/util/containerIterator.h
diff --git a/p2pvr/lib/dvbsiHelpers.h b/p2pvr/util/dvbsiHelpers.h
index b8cc1cf..b8cc1cf 100644
--- a/p2pvr/lib/dvbsiHelpers.h
+++ b/p2pvr/util/dvbsiHelpers.h
diff --git a/p2pvr/lib/dvbsiHelpers/cableDelivery.cpp b/p2pvr/util/dvbsiHelpers/cableDelivery.cpp
index 7bf9f6d..7bf9f6d 100644
--- a/p2pvr/lib/dvbsiHelpers/cableDelivery.cpp
+++ b/p2pvr/util/dvbsiHelpers/cableDelivery.cpp
diff --git a/p2pvr/lib/dvbsiHelpers/event.cpp b/p2pvr/util/dvbsiHelpers/event.cpp
index decd2b9..decd2b9 100644
--- a/p2pvr/lib/dvbsiHelpers/event.cpp
+++ b/p2pvr/util/dvbsiHelpers/event.cpp
diff --git a/p2pvr/lib/dvbsiHelpers/network.cpp b/p2pvr/util/dvbsiHelpers/network.cpp
index 3b117f1..3b117f1 100644
--- a/p2pvr/lib/dvbsiHelpers/network.cpp
+++ b/p2pvr/util/dvbsiHelpers/network.cpp
diff --git a/p2pvr/lib/dvbsiHelpers/networkService.cpp b/p2pvr/util/dvbsiHelpers/networkService.cpp
index a4a47d5..a4a47d5 100644
--- a/p2pvr/lib/dvbsiHelpers/networkService.cpp
+++ b/p2pvr/util/dvbsiHelpers/networkService.cpp
diff --git a/p2pvr/lib/dvbsiHelpers/networkTransportStream.cpp b/p2pvr/util/dvbsiHelpers/networkTransportStream.cpp
index bdc7c4f..bdc7c4f 100644
--- a/p2pvr/lib/dvbsiHelpers/networkTransportStream.cpp
+++ b/p2pvr/util/dvbsiHelpers/networkTransportStream.cpp
diff --git a/p2pvr/lib/dvbsiHelpers/programMap.cpp b/p2pvr/util/dvbsiHelpers/programMap.cpp
index d8cf400..d8cf400 100644
--- a/p2pvr/lib/dvbsiHelpers/programMap.cpp
+++ b/p2pvr/util/dvbsiHelpers/programMap.cpp
diff --git a/p2pvr/lib/dvbsiHelpers/satelliteDelivery.cpp b/p2pvr/util/dvbsiHelpers/satelliteDelivery.cpp
index 8231fc3..8231fc3 100644
--- a/p2pvr/lib/dvbsiHelpers/satelliteDelivery.cpp
+++ b/p2pvr/util/dvbsiHelpers/satelliteDelivery.cpp
diff --git a/p2pvr/lib/dvbsiHelpers/service.cpp b/p2pvr/util/dvbsiHelpers/service.cpp
index 9f82d91..9f82d91 100644
--- a/p2pvr/lib/dvbsiHelpers/service.cpp
+++ b/p2pvr/util/dvbsiHelpers/service.cpp
diff --git a/p2pvr/lib/dvbsiHelpers/terrestrialDelivery.cpp b/p2pvr/util/dvbsiHelpers/terrestrialDelivery.cpp
index 46e60f9..46e60f9 100644
--- a/p2pvr/lib/dvbsiHelpers/terrestrialDelivery.cpp
+++ b/p2pvr/util/dvbsiHelpers/terrestrialDelivery.cpp
diff --git a/p2pvr/lib/fileHandle.cpp b/p2pvr/util/fileHandle.cpp
index b85d390..b85d390 100644
--- a/p2pvr/lib/fileHandle.cpp
+++ b/p2pvr/util/fileHandle.cpp
diff --git a/p2pvr/lib/fileHandle.h b/p2pvr/util/fileHandle.h
index 3c8d45e..3c8d45e 100644
--- a/p2pvr/lib/fileHandle.h
+++ b/p2pvr/util/fileHandle.h
diff --git a/p2pvr/lib/mapIterator.cpp b/p2pvr/util/mapIterator.cpp
index 157669a..157669a 100644
--- a/p2pvr/lib/mapIterator.cpp
+++ b/p2pvr/util/mapIterator.cpp
diff --git a/p2pvr/lib/mapIterator.h b/p2pvr/util/mapIterator.h
index 8a06fe6..8a06fe6 100644
--- a/p2pvr/lib/mapIterator.h
+++ b/p2pvr/util/mapIterator.h
diff --git a/p2pvr/lib/objectRowState.h b/p2pvr/util/objectRowState.h
index 9ba69f0..9ba69f0 100644
--- a/p2pvr/lib/objectRowState.h
+++ b/p2pvr/util/objectRowState.h
diff --git a/p2pvr/lib/p2Helpers.cpp b/p2pvr/util/p2Helpers.cpp
index 0c1fe37..0c1fe37 100644
--- a/p2pvr/lib/p2Helpers.cpp
+++ b/p2pvr/util/p2Helpers.cpp
diff --git a/p2pvr/lib/p2Helpers.h b/p2pvr/util/p2Helpers.h
index 7ea56de..7ea56de 100644
--- a/p2pvr/lib/p2Helpers.h
+++ b/p2pvr/util/p2Helpers.h
diff --git a/p2pvr/util/pch.hpp b/p2pvr/util/pch.hpp
new file mode 100644
index 0000000..dafc462
--- /dev/null
+++ b/p2pvr/util/pch.hpp
@@ -0,0 +1,23 @@
+#ifdef BOOST_BUILD_PCH_ENABLED
+#ifndef P2PVRUTIL_PCH
+#define P2PVRUTIL_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 <variableType.h>
+
+#endif
+#endif
+
+
diff --git a/p2pvr/lib/singleIterator.h b/p2pvr/util/singleIterator.h
index 1aac418..1aac418 100644
--- a/p2pvr/lib/singleIterator.h
+++ b/p2pvr/util/singleIterator.h