[asterisk-scf-commits] asterisk-scf/integration/sip.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  9ab3a86daa7ccdbc052ad38718a2e77cb79b17d5 (commit)
      from  2eca1e06cc0d179f25178384dafa9c021ff19e7e (commit)

Summary of changes:
 src/SipEndpoint.cpp |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)


- Log -----------------------------------------------------------------
commit 9ab3a86daa7ccdbc052ad38718a2e77cb79b17d5
Author: Joshua Colp <jcolp at digium.com>
Date:   Wed Aug 25 17:55:51 2010 -0300

    Remove specifying ulaw in the formats passed to the service locator, not really used yet and I will just end up removing it anyway.

diff --git a/src/SipEndpoint.cpp b/src/SipEndpoint.cpp
index 96515c5..251ec63 100644
--- a/src/SipEndpoint.cpp
+++ b/src/SipEndpoint.cpp
@@ -235,14 +235,6 @@ SipEndpoint::SipEndpoint(Ice::ObjectAdapterPtr adapter, boost::shared_ptr<SipEnd
 
    // Get an RTP session capable of handling the formats we are going to offer
    Hydra::Media::V1::FormatSeq formats;
-   // For testing just request a session capable of handling the ulaw media format
-   Hydra::Media::V1::AudioFormatPtr format = new Hydra::Media::V1::AudioFormat();
-   format->name = "ulaw";
-   format->sampleRate = 8000;
-   format->frameSize = 20;
-   format->maximumFrameSize = 20;
-   format->minimumFrameSize = 20;
-   formats.push_back(format);
    requestRTPSessions(formats);
 }
 
@@ -341,7 +333,6 @@ void SipEndpoint::requestRTPSessions(Hydra::Media::V1::FormatSeq& formats)
    // TODO: This needs to be improved for multiple streams
    Hydra::Media::RTP::V1::RTPServiceLocatorParamsPtr params = new Hydra::Media::RTP::V1::RTPServiceLocatorParams();
    params->category = "rtp";
-   params->formats = formats;
 
    SipChannelServiceDataModel& mDataModelInstance(SipChannelServiceDataModel::getInstance());
    Hydra::Media::RTP::V1::RTPMediaServicePrx factory = Hydra::Media::RTP::V1::RTPMediaServicePrx::uncheckedCast(mDataModelInstance.getServiceLocator()->locate(params));

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


-- 
asterisk-scf/integration/sip.git