[asterisk-scf-commits] asterisk-scf/release/test_channel.git branch "fileplayback_endpoint" updated.

[Commits to the Asterisk SCF project code repositories]

branch "fileplayback_endpoint" has been updated
       via  15c9407983dec12427941598c4bf46dcd29a5ceb (commit)
      from  32301a1abb01244b115d999696651071fb2482c5 (commit)

Summary of changes:
 src/FilePlaybackSessionEndpoint.cpp |   34 +++++++++++++++++-----------------
 src/FilePlaybackSessionEndpoint.h   |    2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)


- Log -----------------------------------------------------------------
commit 15c9407983dec12427941598c4bf46dcd29a5ceb
Author: Brent Eagles <beagles at digium.com>
Date:   Fri Jan 7 15:37:12 2011 -0330

    Updates to support changes to logging code for reference counted loggers.

diff --git a/src/FilePlaybackSessionEndpoint.cpp b/src/FilePlaybackSessionEndpoint.cpp
index 832acfe..9b48a2d 100644
--- a/src/FilePlaybackSessionEndpoint.cpp
+++ b/src/FilePlaybackSessionEndpoint.cpp
@@ -54,7 +54,7 @@ namespace FBSPNS /* arbitrary ns name to deal with anonymous NS bugs */
 {
 
 static std::string getFilename(const Ice::CommunicatorPtr& communicator, const std::string& destination,
-  const AsteriskSCF::System::Logging::LoggerPtr& logger)
+  const AsteriskSCF::System::Logging::Logger& logger)
 {
     boost::filesystem::path basePath = communicator->getProperties()->getProperty("MediaFiles");
     basePath /= destination;
@@ -117,7 +117,7 @@ public:
 class MatroskaMediaSource : public AsteriskSCF::Media::V1::StreamSource
 {
 public:
-    MatroskaMediaSource(const AsteriskSCF::System::Logging::LoggerPtr& logger,
+    MatroskaMediaSource(const AsteriskSCF::System::Logging::Logger& logger,
       const std::string& id, 
       const AsteriskSCF::RemoteControl::V1::SourceControllerPrx& controller,
       const std::string& defaultFile):
@@ -470,7 +470,7 @@ private:
     AsteriskSCF::TestUtil::MediaEchoThreadPtr mThread;
 
     // Asterisk SCF logger object.
-    AsteriskSCF::System::Logging::LoggerPtr mLogger;
+    AsteriskSCF::System::Logging::Logger mLogger;
 
     // The names of the tracks in this source, in string form.
     Ice::StringSeq mTracks;
@@ -492,7 +492,7 @@ class MatroskaSourceRemoteControl : public AsteriskSCF::RemoteControl::V1::Sourc
 {
 public:
     MatroskaSourceRemoteControl(const MatroskaMediaSourcePtr& source,
-      const AsteriskSCF::System::Logging::LoggerPtr& logger) :
+      const AsteriskSCF::System::Logging::Logger& logger) :
         mLogger(logger),
         mSource(source)
     {
@@ -550,7 +550,7 @@ public:
         mSource = 0;
     }
 private:
-    AsteriskSCF::System::Logging::LoggerPtr mLogger;
+    AsteriskSCF::System::Logging::Logger mLogger;
     MatroskaMediaSourcePtr mSource;
 };
 typedef IceUtil::Handle<MatroskaSourceRemoteControl> MatroskaSourceRemoteControlPtr;
@@ -564,7 +564,7 @@ typedef IceUtil::Handle<MatroskaSourceRemoteControl> MatroskaSourceRemoteControl
 class MatroskaMediaSink : public AsteriskSCF::Media::V1::StreamSink
 {
 public:
-    MatroskaMediaSink(const AsteriskSCF::System::Logging::LoggerPtr& logger, const std::string& id, 
+    MatroskaMediaSink(const AsteriskSCF::System::Logging::Logger& logger, const std::string& id, 
       const AsteriskSCF::RemoteControl::V1::SinkControllerPrx& controller) :
         mLogger(logger),
         mId(id),
@@ -621,7 +621,7 @@ private:
     IceUtil::Mutex mMutex;
 
     // Logger object.
-    AsteriskSCF::System::Logging::LoggerPtr mLogger;
+    AsteriskSCF::System::Logging::Logger mLogger;
 
     // Id string, required for the StreamSink interface implementation.
     std::string mId;
@@ -643,7 +643,7 @@ typedef IceUtil::Handle<MatroskaMediaSink> MatroskaMediaSinkPtr;
 class MatroskaSinkRemoteControl : public AsteriskSCF::RemoteControl::V1::Sink
 {
 public:
-    MatroskaSinkRemoteControl(const MatroskaMediaSinkPtr& sink, const AsteriskSCF::System::Logging::LoggerPtr& logger) :
+    MatroskaSinkRemoteControl(const MatroskaMediaSinkPtr& sink, const AsteriskSCF::System::Logging::Logger& logger) :
         mSink(sink),
         mLogger(logger)
     {
@@ -681,7 +681,7 @@ public:
 
 private:
     MatroskaMediaSinkPtr mSink;
-    AsteriskSCF::System::Logging::LoggerPtr mLogger;
+    AsteriskSCF::System::Logging::Logger mLogger;
 };
 typedef IceUtil::Handle<MatroskaSinkRemoteControl> MatroskaSinkRemoteControlPtr;
 
@@ -689,7 +689,7 @@ class MatroskaMediaSession : public AsteriskSCF::Media::V1::Session
 {
 public:
     MatroskaMediaSession(const Ice::ObjectAdapterPtr& adapter, 
-      const AsteriskSCF::System::Logging::LoggerPtr& logger,
+      const AsteriskSCF::System::Logging::Logger& logger,
       const std::string& file, 
       const std::string& id) :
         mAdapter(adapter),
@@ -792,7 +792,7 @@ public:
 private:
     IceUtil::Mutex mMutex;
     Ice::ObjectAdapterPtr mAdapter;
-    AsteriskSCF::System::Logging::LoggerPtr mLogger;
+    AsteriskSCF::System::Logging::Logger mLogger;
     const std::string mFilename;
     const std::string mId;
     MatroskaMediaSinkPtr mSink;
@@ -816,7 +816,7 @@ class FileSession : virtual public AsteriskSCF::SessionCommunications::V1::Sessi
 {
 public:
     FileSession(const Ice::ObjectAdapterPtr& adapter, const std::string& id, const std::string& name, 
-      const AsteriskSCF::System::Logging::LoggerPtr& logger) : 
+      const AsteriskSCF::System::Logging::Logger& logger) : 
         SessionListenerMgr(adapter->getCommunicator(), id, true),
         mAdapter(adapter),
         mId(id),
@@ -985,7 +985,7 @@ private:
     Ice::ObjectAdapterPtr mAdapter;
     std::string mId;
     std::string mName;
-    AsteriskSCF::System::Logging::LoggerPtr mLogger;
+    AsteriskSCF::System::Logging::Logger mLogger;
     bool mDestroyed;
     AsteriskSCF::SessionCommunications::V1::SessionPrx mProxy;
     AsteriskSCF::SessionCommunications::V1::BridgePrx mBridge;
@@ -1018,7 +1018,7 @@ namespace FilePlayback
 class FilePlaybackEndpointImpl
 {
 public:
-    FilePlaybackEndpointImpl(const Ice::ObjectAdapterPtr& adapter, const AsteriskSCF::System::Logging::LoggerPtr& logger);
+    FilePlaybackEndpointImpl(const Ice::ObjectAdapterPtr& adapter, const AsteriskSCF::System::Logging::Logger& logger);
     AsteriskSCF::SessionCommunications::V1::SessionPrx createSession(const std::string& destination, 
       const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener, const Ice::Current&);
     AsteriskSCF::SessionCommunications::V1::SessionSeq getSessions(const Ice::Current&);
@@ -1026,7 +1026,7 @@ public:
     void removeDefaultSessionListener(const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener, const Ice::Current& current);
 private:
 
-    AsteriskSCF::System::Logging::LoggerPtr mLogger;
+    AsteriskSCF::System::Logging::Logger mLogger;
     Ice::ObjectAdapterPtr mAdapter;
     std::vector<FileSessionInfo> mSessions;
     std::vector<AsteriskSCF::SessionCommunications::V1::SessionListenerPrx> mDefaultListeners;
@@ -1041,7 +1041,7 @@ private:
 // FilePlaybackEndpointImpl
 //
 AsteriskSCF::FilePlayback::FilePlaybackEndpointImpl::FilePlaybackEndpointImpl(const Ice::ObjectAdapterPtr& adapter,
-  const AsteriskSCF::System::Logging::LoggerPtr& logger):
+  const AsteriskSCF::System::Logging::Logger& logger):
     mLogger(logger),
     mAdapter(adapter)
 {
@@ -1196,7 +1196,7 @@ void AsteriskSCF::FilePlayback::FilePlaybackEndpointImpl::reap()
 // FilePlaybackEndpoint
 //
 AsteriskSCF::FilePlayback::FilePlaybackEndpoint::FilePlaybackEndpoint(const Ice::ObjectAdapterPtr& adapter, 
-  const AsteriskSCF::System::Logging::LoggerPtr& logger) :
+  const AsteriskSCF::System::Logging::Logger& logger) :
     mImpl(new FilePlaybackEndpointImpl(adapter, logger)),
     mId("fileplayback")
 {
diff --git a/src/FilePlaybackSessionEndpoint.h b/src/FilePlaybackSessionEndpoint.h
index 46a96cd..2e25d8c 100644
--- a/src/FilePlaybackSessionEndpoint.h
+++ b/src/FilePlaybackSessionEndpoint.h
@@ -32,7 +32,7 @@ namespace FilePlayback
     class FilePlaybackEndpoint : public AsteriskSCF::RemoteControl::V1::SessionFactory
     {
     public:
-        FilePlaybackEndpoint(const Ice::ObjectAdapterPtr& adapter, const AsteriskSCF::System::Logging::LoggerPtr&);
+        FilePlaybackEndpoint(const Ice::ObjectAdapterPtr& adapter, const AsteriskSCF::System::Logging::Logger& logger);
         ~FilePlaybackEndpoint();
 
         AsteriskSCF::SessionCommunications::V1::SessionPrx createSession(const std::string& destination, 

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


-- 
asterisk-scf/release/test_channel.git