[asterisk-scf-commits] asterisk-scf/integration/media_operations_core.git branch "retry_deux" created.

[Commits to the Asterisk SCF project code repositories]

branch "retry_deux" has been created
        at  35af73f185554cc3705bfb774caeae2233bd7130 (commit)

- Log -----------------------------------------------------------------
commit 35af73f185554cc3705bfb774caeae2233bd7130
Author: Brent Eagles <beagles at digium.com>
Date:   Fri Mar 2 15:55:21 2012 -0330

    Modifications for recent updates to slice.

diff --git a/src/DSP.cpp b/src/DSP.cpp
index 8bddd01..8110e66 100644
--- a/src/DSP.cpp
+++ b/src/DSP.cpp
@@ -1,3 +1,6 @@
+#ifdef _MSC_VER
+#   define _USE_MATH_DEFINES
+#endif
 #include <cmath>
 #include "DSP.h"
 
diff --git a/src/InbandTelephonyEvents.cpp b/src/InbandTelephonyEvents.cpp
index e7c6ce0..4676cdc 100644
--- a/src/InbandTelephonyEvents.cpp
+++ b/src/InbandTelephonyEvents.cpp
@@ -18,7 +18,7 @@
 #include <AsteriskSCF/SessionCommunications/TelephonyEventsIf.h>
 #include <AsteriskSCF/Media/Formats/AudioFormatsIf.h>
 #include <AsteriskSCF/Replication/MediaOperationsCore/MediaOperationsCoreIf.h>
-#include <AsteriskSCF/Helpers/OperationContext.h>
+#include <AsteriskSCF/Operations/OperationContext.h>
 
 #include <IceUtil/UUID.h>
 
@@ -107,7 +107,7 @@ class InbandTelephonyEventOperation : public TranslatorOperation
             {
                 try
                 {
-                    (*iter)->write(AsteriskSCF::createContext(), event);
+                    (*iter)->write(AsteriskSCF::Operations::createContext(), event);
                 }
                 catch (const std::exception&)
                 {
diff --git a/src/MediaOperationsCore.cpp b/src/MediaOperationsCore.cpp
index 4dd9975..f26334c 100644
--- a/src/MediaOperationsCore.cpp
+++ b/src/MediaOperationsCore.cpp
@@ -234,13 +234,13 @@ private:
             MediaOperationsComparePtr compare = new MediaOperationsCompare(iter->first);
             ServiceLocatorParamsComparePrx compareProxy = ServiceLocatorParamsComparePrx::uncheckedCast(getServiceAdapter()->addWithUUID(compare));
 
-            getServiceLocatorManagement()->addCompare(iter->first->getName(), compareProxy);
+            getServiceLocatorManagement()->addCompare(AsteriskSCF::Operations::createContext(), iter->first->getName(), compareProxy);
         }
     }
 
     void onUnregisterPrimaryServices()
     {
-        getServiceLocatorManagement()->removeCompare(CompareGuid);
+        getServiceLocatorManagement()->removeCompare(AsteriskSCF::Operations::createContext(), CompareGuid);
     }
 
     void createReplicationStateListeners()
diff --git a/src/TranslatorSink.cpp b/src/TranslatorSink.cpp
index 81719b4..343e7e3 100644
--- a/src/TranslatorSink.cpp
+++ b/src/TranslatorSink.cpp
@@ -50,7 +50,8 @@ void TranslatorSink::setTranslator(const TranslatorPtr& translator)
     mTranslator = translator;
 }
 
-void TranslatorSink::setSource(const StreamSourcePrx& source, const Ice::Current&)
+void TranslatorSink::setSource(const AsteriskSCF::System::V1::OperationContextPtr&, 
+    const StreamSourcePrx& source, const Ice::Current&)
 {
     mSource = source;
 }
diff --git a/src/TranslatorSink.h b/src/TranslatorSink.h
index 2281695..5c0ea17 100644
--- a/src/TranslatorSink.h
+++ b/src/TranslatorSink.h
@@ -39,7 +39,9 @@ public:
 
     void setTranslator(const TranslatorPtr& translator);
 
-    void setSource(const AsteriskSCF::Media::V1::StreamSourcePrx& source, const Ice::Current&);
+    void setSource(
+        const AsteriskSCF::System::V1::OperationContextPtr&,
+        const AsteriskSCF::Media::V1::StreamSourcePrx& source, const Ice::Current&);
 
     AsteriskSCF::Media::V1::StreamSourcePrx getSource(const Ice::Current&);
 
diff --git a/src/TranslatorSource.cpp b/src/TranslatorSource.cpp
index 02a6c4e..8999416 100644
--- a/src/TranslatorSource.cpp
+++ b/src/TranslatorSource.cpp
@@ -39,7 +39,8 @@ TranslatorSource::~TranslatorSource()
     mLogger(Debug) << "TranslatorSource destructor called";
 }
 
-void TranslatorSource::addSink(const StreamSinkPrx& sink, const Ice::Current&)
+void TranslatorSource::addSink(const AsteriskSCF::System::V1::OperationContextPtr&, 
+    const StreamSinkPrx& sink, const Ice::Current&)
 {
     if (std::find(mSinks.begin(), mSinks.end(), sink) == mSinks.end())
     {
@@ -47,7 +48,8 @@ void TranslatorSource::addSink(const StreamSinkPrx& sink, const Ice::Current&)
     }
 }
 
-void TranslatorSource::removeSink(const StreamSinkPrx& sink, const Ice::Current&)
+void TranslatorSource::removeSink(const AsteriskSCF::System::V1::OperationContextPtr&, 
+    const StreamSinkPrx& sink, const Ice::Current&)
 {
     mSinks.erase(std::remove(mSinks.begin(), mSinks.end(), sink), mSinks.end());
 }
diff --git a/src/TranslatorSource.h b/src/TranslatorSource.h
index f3cd278..f4ebd6b 100644
--- a/src/TranslatorSource.h
+++ b/src/TranslatorSource.h
@@ -33,9 +33,11 @@ public:
 
     ~TranslatorSource();
 
-    void addSink(const AsteriskSCF::Media::V1::StreamSinkPrx& sink, const Ice::Current&);
+    void addSink(const AsteriskSCF::System::V1::OperationContextPtr&, 
+        const AsteriskSCF::Media::V1::StreamSinkPrx& sink, const Ice::Current&);
     
-    void removeSink(const AsteriskSCF::Media::V1::StreamSinkPrx& sink, const Ice::Current&);
+    void removeSink(const AsteriskSCF::System::V1::OperationContextPtr&, 
+        const AsteriskSCF::Media::V1::StreamSinkPrx& sink, const Ice::Current&);
     
     AsteriskSCF::Media::V1::StreamSinkSeq getSinks(const Ice::Current&);
 
diff --git a/test/TestMediaOperations.cpp b/test/TestMediaOperations.cpp
index 394c547..e963177 100644
--- a/test/TestMediaOperations.cpp
+++ b/test/TestMediaOperations.cpp
@@ -31,7 +31,7 @@
 #include <AsteriskSCF/Media/MediaIf.h>
 #include <AsteriskSCF/Media/MediaOperationIf.h>
 #include <AsteriskSCF/Media/Formats/AudioFormatsIf.h>
-#include <AsteriskSCF/Helpers/OperationContext.h>
+#include <AsteriskSCF/Operations/OperationContext.h>
 
 #include <boost/test/debug.hpp>
 #include <boost/thread/mutex.hpp>

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/media_operations_core.git