[asterisk-scf-commits] asterisk-scf/release/media_rtp_pjmedia.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  cffbdedd90059681ec922ecc2e401e9b394cd70b (commit)
      from  665876529c03f497b3bbccd91e79c79a5fbcdbe8 (commit)

Summary of changes:
 config/RtpConfigurator.py |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)


- Log -----------------------------------------------------------------
commit cffbdedd90059681ec922ecc2e401e9b394cd70b
Author: Joshua Colp <jcolp at digium.com>
Date:   Sat Jun 25 21:29:10 2011 -0300

    Bring up to date with build system changes and slice changes.

diff --git a/config/RtpConfigurator.py b/config/RtpConfigurator.py
index 60a1bba..018a1e0 100755
--- a/config/RtpConfigurator.py
+++ b/config/RtpConfigurator.py
@@ -19,32 +19,32 @@
 # Rtp configurator
 
 # Bring in the common configuration infrastructure
-import Ice, Configurator, sys
+import Ice, Configurator, sys, os
 
 # Load our component specific configuration definitions
-Ice.loadSlice('-I. -I/opt/Ice-3.4.1/slice -I../../slice --all ../local-slice/RtpConfigurationIf.ice')
-import AsteriskSCF.Media.RTP.V1
+Ice.loadSlice("-I" + os.environ["ASTSCF_HOME"] + " -I" + Ice.getSliceDir() + " --all ../slice/AsteriskSCF/Configuration/MediaRTPPJMedia/RtpConfigurationIf.ice")
+import AsteriskSCF.Configuration.MediaRTPPJMedia.V1
 
 # Add our own visitor implementations for the sections we support
 class RtpSectionVisitors(Configurator.SectionVisitors):
     def visit_general(self, config, section):
-        group = AsteriskSCF.Media.RTP.V1.RtpGeneralGroup()
+        group = AsteriskSCF.Configuration.MediaRTPPJMedia.V1.RtpGeneralGroup()
         group.configurationItems = { }
 
         mapper = Configurator.OptionMapper()
 
-        portsItem = AsteriskSCF.Media.RTP.V1.PortRangesItem()
-        mapper.map('startport', portsItem, 'startPort', AsteriskSCF.Media.RTP.V1.PortRangesItemName, config.getint, 10000)
-        mapper.map('endport', portsItem, 'endPort', AsteriskSCF.Media.RTP.V1.PortRangesItemName, config.getint, 20000)
+        portsItem = AsteriskSCF.Configuration.MediaRTPPJMedia.V1.PortRangesItem()
+        mapper.map('startport', portsItem, 'startPort', AsteriskSCF.Configuration.MediaRTPPJMedia.V1.PortRangesItemName, config.getint, 10000)
+        mapper.map('endport', portsItem, 'endPort', AsteriskSCF.Configuration.MediaRTPPJMedia.V1.PortRangesItemName, config.getint, 20000)
 
-        workerItem = AsteriskSCF.Media.RTP.V1.WorkerThreadCountItem()
-        mapper.map('workerthreadcount', workerItem, 'count', AsteriskSCF.Media.RTP.V1.WorkerThreadCountItemName, config.getint, 4)
+        workerItem = AsteriskSCF.Configuration.MediaRTPPJMedia.V1.WorkerThreadCountItem()
+        mapper.map('workerthreadcount', workerItem, 'count', AsteriskSCF.Configuration.MediaRTPPJMedia.V1.WorkerThreadCountItemName, config.getint, 4)
 
-        ipv4BindingItem = AsteriskSCF.Media.RTP.V1.BindingIPv4Item()
-        mapper.map('ipv4bind', ipv4BindingItem, 'address', AsteriskSCF.Media.RTP.V1.BindingIPv4AddressItemName, config.get, None)
+        ipv4BindingItem = AsteriskSCF.Configuration.MediaRTPPJMedia.V1.BindingIPv4Item()
+        mapper.map('ipv4bind', ipv4BindingItem, 'address', AsteriskSCF.Configuration.MediaRTPPJMedia.V1.BindingIPv4AddressItemName, config.get, None)
 
-        ipv6BindingItem = AsteriskSCF.Media.RTP.V1.BindingIPv6Item()
-        mapper.map('ipv6bind', ipv6BindingItem, 'address', AsteriskSCF.Media.RTP.V1.BindingIPv6AddressItemName, config.get, None)
+        ipv6BindingItem = AsteriskSCF.Configuration.MediaRTPPJMedia.V1.BindingIPv6Item()
+        mapper.map('ipv6bind', ipv6BindingItem, 'address', AsteriskSCF.Configuration.MediaRTPPJMedia.V1.BindingIPv6AddressItemName, config.get, None)
 
         for option in config.options(section):
             mapper.execute(group, section, option)
@@ -54,8 +54,8 @@ class RtpSectionVisitors(Configurator.SectionVisitors):
         self.groups.append(group)
 
 # In order to do service locator based lookup we need to pass in a params object
-serviceLocatorParams = AsteriskSCF.Media.RTP.V1.RtpConfigurationParams()
-serviceLocatorParams.category = AsteriskSCF.Media.RTP.V1.ConfigurationDiscoveryCategory
+serviceLocatorParams = AsteriskSCF.Configuration.MediaRTPPJMedia.V1.RtpConfigurationParams()
+serviceLocatorParams.category = AsteriskSCF.Configuration.MediaRTPPJMedia.V1.ConfigurationDiscoveryCategory
 
 # Make a configurator application and let it run
 app = Configurator.ConfiguratorApp('Rtp.config', RtpSectionVisitors(), None, serviceLocatorParams)

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


-- 
asterisk-scf/release/media_rtp_pjmedia.git