[asterisk-scf-commits] asterisk-scf/integration/bridging.git branch "retry_deux" updated.

[Commits to the Asterisk SCF project code repositories]

branch "retry_deux" has been updated
       via  6041bae5bef378b2f7913f7bea1077c56cc48c71 (commit)
      from  46ec3fe223bcbdfda572f468a66f9e6fdf6969d2 (commit)

Summary of changes:
 src/MediaSplicer.cpp |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
 mode change 100755 => 100644 src/BridgeCreationExtensionPointImpl.cpp
 mode change 100755 => 100644 src/BridgeCreationExtensionPointImpl.h
 mode change 100755 => 100644 src/BridgeImpl.cpp
 mode change 100755 => 100644 src/BridgeManagerImpl.cpp
 mode change 100755 => 100644 src/MediaMixer.cpp
 mode change 100755 => 100644 src/MediaSplicer.cpp
 mode change 100755 => 100644 src/ReplicatorSmartProxy.h
 mode change 100755 => 100644 src/SessionOperations.h
 mode change 100755 => 100644 src/SessionWrapper.cpp
 mode change 100755 => 100644 src/SessionWrapper.h


- Log -----------------------------------------------------------------
commit 6041bae5bef378b2f7913f7bea1077c56cc48c71
Author: Brent Eagles <beagles at digium.com>
Date:   Mon Apr 23 13:53:56 2012 -0230

    Fix an out of range issue that was occurring in the MediaSplicer objects.

diff --git a/src/BridgeCreationExtensionPointImpl.cpp b/src/BridgeCreationExtensionPointImpl.cpp
old mode 100755
new mode 100644
diff --git a/src/BridgeCreationExtensionPointImpl.h b/src/BridgeCreationExtensionPointImpl.h
old mode 100755
new mode 100644
diff --git a/src/BridgeImpl.cpp b/src/BridgeImpl.cpp
old mode 100755
new mode 100644
diff --git a/src/BridgeManagerImpl.cpp b/src/BridgeManagerImpl.cpp
old mode 100755
new mode 100644
diff --git a/src/MediaMixer.cpp b/src/MediaMixer.cpp
old mode 100755
new mode 100644
diff --git a/src/MediaSplicer.cpp b/src/MediaSplicer.cpp
old mode 100755
new mode 100644
index 9a17057..90431f1
--- a/src/MediaSplicer.cpp
+++ b/src/MediaSplicer.cpp
@@ -666,7 +666,7 @@ public:
                     continue;
                 }
 
-                for (StreamInformationDict::const_iterator theirStream = theirStreams.begin();
+                for (StreamInformationDict::iterator theirStream = theirStreams.begin();
                      theirStream != theirStreams.end();
                      ++theirStream)
                 {
@@ -686,7 +686,10 @@ public:
 		    StreamSourceSeq sources = stream->second->sources;
 
                     // Attempt to establish a direct connection later
-                    directConnections.insert(make_pair(stream->first, theirStream->second->sinks.front()));
+                    if (!theirStream->second->sinks.empty())
+                    {
+                        directConnections.insert(make_pair(stream->first, theirStream->second->sinks.front()));
+                    }
 
 		    while (!sinks.empty() && !theirStream->second->sources.empty())
 		    {
diff --git a/src/ReplicatorSmartProxy.h b/src/ReplicatorSmartProxy.h
old mode 100755
new mode 100644
diff --git a/src/SessionOperations.h b/src/SessionOperations.h
old mode 100755
new mode 100644
diff --git a/src/SessionWrapper.cpp b/src/SessionWrapper.cpp
old mode 100755
new mode 100644
diff --git a/src/SessionWrapper.h b/src/SessionWrapper.h
old mode 100755
new mode 100644

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


-- 
asterisk-scf/integration/bridging.git