1 files changed, 14 insertions, 12 deletions

diff --git a/p2pvr/daemon/globalDevices.cpp b/p2pvr/daemon/globalDevices.cpp
index 4557fc6..0705415 100644
--- a/p2pvr/daemon/globalDevices.cpp
+++ b/p2pvr/daemon/globalDevices.cpp
@@ -3,6 +3,7 @@
 
 namespace po = boost::program_options;
 
+namespace P2PVR {
 GlobalDevices::Options::Options() :
 	IceTray::Options("P2PVR Devices")
 {
@@ -13,57 +14,57 @@ ICETRAY_OPTIONS(GlobalDevices::Options,
 		 "ICE address of remote device pools (<object>:<endpoint>)")
 )
 
-P2PVR::TunerPrx
+TunerPrx
 GlobalDevices::GetTunerSpecific(const DVBSI::DeliveryPtr & delivery, const Ice::Current & ice)
 {
 	auto ic = ice.adapter->getCommunicator();
 	for (const auto & pool : options->Devices) {
 		try {
-			auto poolprx = P2PVR::DevicesPrx::checkedCast(ic->stringToProxy(pool));
+			auto poolprx = DevicesPrx::checkedCast(ic->stringToProxy(pool));
 			return poolprx->GetTunerSpecific(delivery);
 		}
 		catch (...) {
 		}
 	}
-	throw P2PVR::NoSuitableDeviceAvailable();
+	throw NoSuitableDeviceAvailable();
 }
 
-P2PVR::TunerPrx
+TunerPrx
 GlobalDevices::GetTunerAny(const DVBSI::DeliveryPtr & delivery, const Ice::Current & ice)
 {
 	auto ic = ice.adapter->getCommunicator();
 	for (const auto & pool : options->Devices) {
 		try {
-			auto poolprx = P2PVR::DevicesPrx::checkedCast(ic->stringToProxy(pool));
+			auto poolprx = DevicesPrx::checkedCast(ic->stringToProxy(pool));
 			return poolprx->GetTunerAny(delivery);
 		}
 		catch (...) {
 		}
 	}
-	throw P2PVR::NoSuitableDeviceAvailable();
+	throw NoSuitableDeviceAvailable();
 }
 
-P2PVR::PrivateTunerPrx
+PrivateTunerPrx
 GlobalDevices::GetPrivateTuner(short type, const Ice::Current & ice)
 {
 	auto ic = ice.adapter->getCommunicator();
 	for (const auto & pool : options->Devices) {
 		try {
-			auto poolprx = P2PVR::DevicesPrx::checkedCast(ic->stringToProxy(pool));
+			auto poolprx = DevicesPrx::checkedCast(ic->stringToProxy(pool));
 			return poolprx->GetPrivateTuner(type);
 		}
 		catch (...) {
 		}
 	}
-	throw P2PVR::NoSuitableDeviceAvailable();
+	throw NoSuitableDeviceAvailable();
 }
 
 void
-GlobalDevices::ReleaseTuner(const P2PVR::TunerPrx & tuner, const Ice::Current & ice)
+GlobalDevices::ReleaseTuner(const TunerPrx & tuner, const Ice::Current & ice)
 {
 	auto ic = ice.adapter->getCommunicator();
 	for (const auto & pool : options->Devices) {
-		auto poolprx = P2PVR::DevicesPrx::checkedCast(ic->stringToProxy(pool));
+		auto poolprx = DevicesPrx::checkedCast(ic->stringToProxy(pool));
 		poolprx->ReleaseTuner(tuner);
 	}
 }
@@ -75,7 +76,7 @@ GlobalDevices::TunerCount(const Ice::Current & ice)
 	auto ic = ice.adapter->getCommunicator();
 	for (const auto & pool : options->Devices) {
 		try {
-			auto poolprx = P2PVR::DevicesPrx::checkedCast(ic->stringToProxy(pool));
+			auto poolprx = DevicesPrx::checkedCast(ic->stringToProxy(pool));
 			total += poolprx->TunerCount();
 		}
 		catch (...) {
@@ -84,4 +85,5 @@ GlobalDevices::TunerCount(const Ice::Current & ice)
 	}
 	return total;
 }
+}