[asterisk-scf-commits] asterisk-scf/integration/mediaformatgeneric.git branch "retry_deux" created.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Fri Mar 2 13:16:31 CST 2012
branch "retry_deux" has been created
at dc5a3443a6af095d8fccaf4165e390e1adbad33f (commit)
- Log -----------------------------------------------------------------
commit dc5a3443a6af095d8fccaf4165e390e1adbad33f
Author: Brent Eagles <beagles at digium.com>
Date: Fri Mar 2 15:45:15 2012 -0330
Update method signature to match slice.
diff --git a/src/Component.cpp b/src/Component.cpp
index de5eeeb..1cc0904 100644
--- a/src/Component.cpp
+++ b/src/Component.cpp
@@ -30,6 +30,8 @@
#include <AsteriskSCF/Logger.h>
#include <AsteriskSCF/Discovery/LocatorRegistrationWrapper.h>
#include <AsteriskSCF/Component/Component.h>
+#include <AsteriskSCF/Operations/OperationContext.h>
+
#include "MediaFormatGeneric.h"
#include "Configuration.h"
@@ -96,7 +98,6 @@ void SDPDescriptorCompareServiceImpl::removeAllFormats()
}
FormatPtr SDPDescriptorServiceImpl::getNamedFormat(
- const AsteriskSCF::System::V1::OperationContextPtr&,
const std::string& name, int, int, const Ice::StringSeq& params, const Ice::Current&)
{
boost::shared_lock<boost::shared_mutex> lock(mLock);
@@ -518,7 +519,7 @@ void Component::createPrimaryServices()
ServiceLocatorParamsComparePrx comparatorServicePrx = ServiceLocatorParamsComparePrx::uncheckedCast(
getServiceAdapter()->addWithUUID(mSdpComparator));
mCompareGuid = getName() + ".Media/SDP_Descriptor";
- getServiceLocatorManagement()->addCompare(mCompareGuid, comparatorServicePrx);
+ getServiceLocatorManagement()->addCompare(AsteriskSCF::Operations::createContext(), mCompareGuid, comparatorServicePrx);
}
catch(const Ice::Exception& e)
diff --git a/src/MediaFormatGeneric.h b/src/MediaFormatGeneric.h
index 64d7a6a..643c595 100644
--- a/src/MediaFormatGeneric.h
+++ b/src/MediaFormatGeneric.h
@@ -57,7 +57,6 @@ class SDPDescriptorServiceImpl : public AsteriskSCF::Media::SDP::V1::SDPDescript
{
public:
AsteriskSCF::Media::V1::FormatPtr getNamedFormat(
- const AsteriskSCF::System::V1::OperationContextPtr&,
const std::string&, int, int, const Ice::StringSeq&, const Ice::Current&);
AsteriskSCF::Media::V1::FormatPtr getDescribedFormat(const AsteriskSCF::Media::SDP::V1::SDPDescriptorPtr&,
const Ice::Current&);
-----------------------------------------------------------------------
--
asterisk-scf/integration/mediaformatgeneric.git
More information about the asterisk-scf-commits
mailing list