summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2015-01-27 02:41:29 +0000
committerDan Goodliffe <dan@randomdan.homeip.net>2015-06-13 17:29:49 +0100
commit33a8b31afd92bf6c51b665fa95cb3662e8e60038 (patch)
tree579067c3603768d7972f218364ef0ac3679a74cf
parentAdd deps on sql (diff)
downloadp2pvr-33a8b31afd92bf6c51b665fa95cb3662e8e60038.tar.bz2
p2pvr-33a8b31afd92bf6c51b665fa95cb3662e8e60038.tar.xz
p2pvr-33a8b31afd92bf6c51b665fa95cb3662e8e60038.zip
Move some bits from lib into more focused parts
-rw-r--r--p2pvr/daemon/Jamfile.jam1
-rw-r--r--p2pvr/daemon/containerIterator.h (renamed from p2pvr/lib/containerIterator.h)0
-rw-r--r--p2pvr/daemon/objectRowState.cpp (renamed from p2pvr/lib/objectRowState.cpp)0
-rw-r--r--p2pvr/daemon/objectRowState.h (renamed from p2pvr/lib/objectRowState.h)0
-rw-r--r--p2pvr/daemon/resources.h (renamed from p2pvr/lib/resources.h)0
-rw-r--r--p2pvr/daemon/unittests/Jamfile.jam2
-rw-r--r--p2pvr/daemonbase/fileSink.cpp (renamed from p2pvr/lib/fileSink.cpp)0
-rw-r--r--p2pvr/daemonbase/fileSink.h (renamed from p2pvr/lib/fileSink.h)0
-rw-r--r--p2pvr/dvb/bindSiParserHandler.h (renamed from p2pvr/lib/bindSiParserHandler.h)0
-rw-r--r--p2pvr/lib/serviceStreamer.cpp1
10 files changed, 2 insertions, 2 deletions
diff --git a/p2pvr/daemon/Jamfile.jam b/p2pvr/daemon/Jamfile.jam
index e9c7327..8a9bc7f 100644
--- a/p2pvr/daemon/Jamfile.jam
+++ b/p2pvr/daemon/Jamfile.jam
@@ -22,6 +22,7 @@ lib p2pvrdaemon :
<library>../daemonbase//p2pvrdaemonbase
<implicit-dependency>../../libtmdb//tmdb
<library>slicer
+ <include>.
: :
<include>.
<library>../ice//p2pvrice
diff --git a/p2pvr/lib/containerIterator.h b/p2pvr/daemon/containerIterator.h
index 14c339d..14c339d 100644
--- a/p2pvr/lib/containerIterator.h
+++ b/p2pvr/daemon/containerIterator.h
diff --git a/p2pvr/lib/objectRowState.cpp b/p2pvr/daemon/objectRowState.cpp
index 89e5ac8..89e5ac8 100644
--- a/p2pvr/lib/objectRowState.cpp
+++ b/p2pvr/daemon/objectRowState.cpp
diff --git a/p2pvr/lib/objectRowState.h b/p2pvr/daemon/objectRowState.h
index 3e3fd2f..3e3fd2f 100644
--- a/p2pvr/lib/objectRowState.h
+++ b/p2pvr/daemon/objectRowState.h
diff --git a/p2pvr/lib/resources.h b/p2pvr/daemon/resources.h
index 18b1de2..18b1de2 100644
--- a/p2pvr/lib/resources.h
+++ b/p2pvr/daemon/resources.h
diff --git a/p2pvr/daemon/unittests/Jamfile.jam b/p2pvr/daemon/unittests/Jamfile.jam
index d95db07..28d4fbd 100644
--- a/p2pvr/daemon/unittests/Jamfile.jam
+++ b/p2pvr/daemon/unittests/Jamfile.jam
@@ -26,7 +26,7 @@ run
: : :
<define>BOOST_TEST_DYN_LINK
<library>../..//boost_utf
- <library>../../lib//p2pvrlib
+ <include>..
: testEmbedding ;
run
diff --git a/p2pvr/lib/fileSink.cpp b/p2pvr/daemonbase/fileSink.cpp
index dade921..dade921 100644
--- a/p2pvr/lib/fileSink.cpp
+++ b/p2pvr/daemonbase/fileSink.cpp
diff --git a/p2pvr/lib/fileSink.h b/p2pvr/daemonbase/fileSink.h
index 8c7594b..8c7594b 100644
--- a/p2pvr/lib/fileSink.h
+++ b/p2pvr/daemonbase/fileSink.h
diff --git a/p2pvr/lib/bindSiParserHandler.h b/p2pvr/dvb/bindSiParserHandler.h
index a4813c2..a4813c2 100644
--- a/p2pvr/lib/bindSiParserHandler.h
+++ b/p2pvr/dvb/bindSiParserHandler.h
diff --git a/p2pvr/lib/serviceStreamer.cpp b/p2pvr/lib/serviceStreamer.cpp
index 99a204a..bd7c04c 100644
--- a/p2pvr/lib/serviceStreamer.cpp
+++ b/p2pvr/lib/serviceStreamer.cpp
@@ -1,7 +1,6 @@
#include <pch.hpp>
#include "serviceStreamer.h"
#include <boost/bind.hpp>
-#include "fileSink.h"
#include "bindSiParserHandler.h"
ServiceStreamer::ServiceStreamer(int sid, P2PVR::RawDataClientPrx t, const Ice::CommunicatorPtr & ic, const Ice::ObjectAdapterPtr & a) :