[Openh323-cvs] opal/src/opal call.cxx,2.39,2.39.2.1

[Craig S. <cso...@us...>]

Update of /cvsroot/openh323/opal/src/opal
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22341/src/opal

Modified Files:
      Tag: Phobos
	call.cxx 
Log Message:
Backported from CVS head


Index: call.cxx
===================================================================
RCS file: /cvsroot/openh323/opal/src/opal/call.cxx,v
retrieving revision 2.39
retrieving revision 2.39.2.1
diff -C2 -d -r2.39 -r2.39.2.1
*** call.cxx	24 Nov 2005 20:31:55 -0000	2.39
--- call.cxx	31 Jan 2006 08:10:37 -0000	2.39.2.1
***************
*** 26,29 ****
--- 26,35 ----
   *
   * $Log$
+  * Revision 2.39.2.1  2006/01/31 08:10:37  csoutheren
+  * Backported from CVS head
+  *
+  * Revision 2.40  2006/01/31 03:29:46  csoutheren
+  * Removed compiler warning
+  *
   * Revision 2.39  2005/11/24 20:31:55  dsandras
   * Added support for echo cancelation using Speex.
***************
*** 504,526 ****
    OpalMediaPatch * patch = NULL;
  
!   for (PSafePtr<OpalConnection> conn(connectionsActive, PSafeReadOnly); conn != NULL; ++conn) {
!     if (conn != &connection) {
!       OpalMediaStream * sink = conn->OpenSinkMediaStream(source);
!       if (sink == NULL)
!         return FALSE;
!       if (source.RequiresPatchThread()) {
!         if (patch == NULL) {
!           patch = manager.CreateMediaPatch(source);
!           if (patch == NULL)
!             return FALSE;
          }
-         patch->AddSink(sink);
        }
      }
    }
  
!   for (PSafePtr<OpalConnection> conn(connectionsActive, PSafeReadOnly); conn != NULL; ++conn) {
!     if (patch)
!       conn->OnPatchMediaStream(conn == &connection, *patch);
    }
    
--- 510,536 ----
    OpalMediaPatch * patch = NULL;
  
!   {
!     for (PSafePtr<OpalConnection> conn(connectionsActive, PSafeReadOnly); conn != NULL; ++conn) {
!       if (conn != &connection) {
!         OpalMediaStream * sink = conn->OpenSinkMediaStream(source);
!         if (sink == NULL)
!           return FALSE;
!         if (source.RequiresPatchThread()) {
!           if (patch == NULL) {
!             patch = manager.CreateMediaPatch(source);
!             if (patch == NULL)
!               return FALSE;
!           }
!           patch->AddSink(sink);
          }
        }
      }
    }
  
!   {
!     for (PSafePtr<OpalConnection> conn(connectionsActive, PSafeReadOnly); conn != NULL; ++conn) {
!       if (patch)
!         conn->OnPatchMediaStream(conn == &connection, *patch);
!     }
    }