Enable hidden visibility and LTO

9 files changed, 23 insertions, 13 deletions

diff --git a/p2pvr/daemon/Jamfile.jam b/p2pvr/daemon/Jamfile.jam
index 369e714..05b0e9b 100644
--- a/p2pvr/daemon/Jamfile.jam
+++ b/p2pvr/daemon/Jamfile.jam
@@ -23,6 +23,8 @@ lib p2pvrdaemon :
 	<library>../devices//p2pvrdevices
 	<library>../daemonbase//p2pvrdaemonbase
 	<library>..//adhocutil
+	<cflags>-fvisibility=hidden
+	<variant>release:<cflags>-flto
 	<implicit-dependency>../../libtmdb//tmdb
 	<library>slicer
 	<library>slicer-db
diff --git a/p2pvr/daemon/globalDevices.h b/p2pvr/daemon/globalDevices.h
index 33f6231..86d80c5 100644
--- a/p2pvr/daemon/globalDevices.h
+++ b/p2pvr/daemon/globalDevices.h
@@ -6,8 +6,9 @@
 
 #include <dvb.h>
 #include <options.h>
+#include <visibility.h>
 
-class GlobalDevices : public P2PVR::Devices {
+class DLL_PUBLIC GlobalDevices : public P2PVR::Devices {
 	public:
 		P2PVR::TunerPrx GetTunerSpecific(const DVBSI::DeliveryPtr &, const Ice::Current &);
 		P2PVR::TunerPrx GetTunerAny(const DVBSI::DeliveryPtr &, const Ice::Current &);
diff --git a/p2pvr/daemon/maintenance.h b/p2pvr/daemon/maintenance.h
index 7ec0541..7c3e9b3 100644
--- a/p2pvr/daemon/maintenance.h
+++ b/p2pvr/daemon/maintenance.h
@@ -2,9 +2,11 @@
 #define P2PVR_MAINTENANCE_H
 
 #include <p2pvr.h>
+#include <IceUtil/Timer.h>
 #include "dbClient.h"
+#include <visibility.h>
 
-class Maintenance : public P2PVR::Maintenance, public DatabaseClient {
+class DLL_PUBLIC Maintenance : public P2PVR::Maintenance, public DatabaseClient {
 	public:
 		Maintenance(Ice::ObjectAdapterPtr, IceUtil::TimerPtr);
 
@@ -17,7 +19,7 @@ class Maintenance : public P2PVR::Maintenance, public DatabaseClient {
 		INITOPTIONS;
 
 	private:
-		void ScheduledUpdate();
+		DLL_PRIVATE void ScheduledUpdate();
 
 		Ice::ObjectAdapterPtr adapter;
 		IceUtil::TimerPtr timer;
diff --git a/p2pvr/daemon/recorder.h b/p2pvr/daemon/recorder.h
index bef331b..6a6940e 100644
--- a/p2pvr/daemon/recorder.h
+++ b/p2pvr/daemon/recorder.h
@@ -7,8 +7,9 @@
 #include <p2pvr.h>
 #include <mutex>
 #include "serviceStreamer.h"
+#include <visibility.h>
 
-class Recorder : public P2PVR::Recorder {
+class DLL_PUBLIC Recorder : public P2PVR::Recorder {
 	public:
 		typedef std::vector<IceUtil::TimerTaskPtr> Pendings;
 
@@ -32,8 +33,8 @@ class Recorder : public P2PVR::Recorder {
 		INITOPTIONS;
 
 	private:
-		void StartRecording(P2PVR::SchedulePtr schedule, DVBSI::ServicePtr service, P2PVR::EventPtr event);
-		void StopRecording(CurrentPtr);
+		DLL_PRIVATE void StartRecording(P2PVR::SchedulePtr schedule, DVBSI::ServicePtr service, P2PVR::EventPtr event);
+		DLL_PRIVATE void StopRecording(CurrentPtr);
 
 		Ice::ObjectAdapterPtr adapter;
 		IceUtil::TimerPtr timer;
diff --git a/p2pvr/daemon/recordings.h b/p2pvr/daemon/recordings.h
index fc7863a..482ce23 100644
--- a/p2pvr/daemon/recordings.h
+++ b/p2pvr/daemon/recordings.h
@@ -4,8 +4,9 @@
 #include <p2pvr.h>
 #include <string>
 #include "dbClient.h"
+#include <visibility.h>
 
-class Recordings : public DatabaseClient, public P2PVR::Recordings {
+class DLL_PUBLIC Recordings : public DatabaseClient, public P2PVR::Recordings {
 	public:
 		Ice::Int NewRecording(const P2PVR::RecordingPtr & rec, const Ice::Current &);
 		void DeleteRecording(int recordingId, const Ice::Current &);
diff --git a/p2pvr/daemon/schedules.h b/p2pvr/daemon/schedules.h
index 2669449..122e214 100644
--- a/p2pvr/daemon/schedules.h
+++ b/p2pvr/daemon/schedules.h
@@ -5,6 +5,7 @@
 #include <options.h>
 #include "dbClient.h"
 #include <factory.h>
+#include <visibility.h>
 
 typedef boost::posix_time::ptime datetime;
 class Episode;
@@ -61,7 +62,7 @@ class EpisodeGroup {
 		Showings selected;
 };
 
-class Schedules : public P2PVR::Schedules, public DatabaseClient {
+class DLL_PUBLIC Schedules : public P2PVR::Schedules, public DatabaseClient {
 	public:
 		void DeleteSchedule(int id, const Ice::Current &);
 		P2PVR::SchedulePtr GetSchedule(int id, const Ice::Current &);
@@ -74,6 +75,7 @@ class Schedules : public P2PVR::Schedules, public DatabaseClient {
 		INITOPTIONS;
 	protected:
 		static void GetEpisodeIntersects(Episodes &, Episodes &);
+
 	private:
 		static std::string SchedulerAlgorithm;
 };
diff --git a/p2pvr/daemon/si.h b/p2pvr/daemon/si.h
index c57a018..0e388a1 100644
--- a/p2pvr/daemon/si.h
+++ b/p2pvr/daemon/si.h
@@ -3,8 +3,9 @@
 
 #include <p2pvr.h>
 #include "dbClient.h"
+#include <visibility.h>
 
-class SI : public P2PVR::SI, public DatabaseClient {
+class DLL_PUBLIC SI : public P2PVR::SI, public DatabaseClient {
 	public:
 		DVBSI::Networks GetNetworks(const Ice::Current &);
 		P2PVR::Deliveries GetAllDeliveries(const Ice::Current &);
diff --git a/p2pvr/daemon/storage.h b/p2pvr/daemon/storage.h
index 144d6bd..982c3fd 100644
--- a/p2pvr/daemon/storage.h
+++ b/p2pvr/daemon/storage.h
@@ -6,8 +6,9 @@
 #include <string>
 #include <boost/filesystem/path.hpp>
 #include "temporaryIceAdapterObject.h"
+#include <visibility.h>
 
-class Storage : public P2PVR::Storage {
+class DLL_PUBLIC Storage : public P2PVR::Storage {
 	public:
 		P2PVR::RawDataClientPrx OpenForWrite(const std::string &, const Ice::Current &) override;
 		void Close(const P2PVR::RawDataClientPrx & file, const Ice::Current &) override;
diff --git a/p2pvr/daemon/unittests/testp2ice.cpp b/p2pvr/daemon/unittests/testp2ice.cpp
index dc584b6..6eece19 100644
--- a/p2pvr/daemon/unittests/testp2ice.cpp
+++ b/p2pvr/daemon/unittests/testp2ice.cpp
@@ -27,9 +27,8 @@ void
 unloadTests()
 {
 	BOOST_REQUIRE_THROW(RowSetFactory::get("P2PVR-SI-GetEvent"), AdHoc::NoSuchPluginException);
-	// Known issue, these *should* unload, but for some reason, don't.
-	BOOST_WARN_THROW(StreamFactory::get("p2pvrrecordingstream"), AdHoc::NoSuchPluginException);
-	BOOST_WARN_THROW(StreamFactory::get("p2pvrservicestream"), AdHoc::NoSuchPluginException);
+	BOOST_REQUIRE_THROW(StreamFactory::get("p2pvrrecordingstream"), AdHoc::NoSuchPluginException);
+	BOOST_REQUIRE_THROW(StreamFactory::get("p2pvrservicestream"), AdHoc::NoSuchPluginException);
 }
 
 BOOST_GLOBAL_FIXTURE( TestAppInstance );