Author: derek Date: Tue Nov 21 16:03:10 2006 New Revision: 215 Modified: sofaswitch/trunk/callflow/src/startfor.cpp sofaswitch/trunk/callflow/tests/parent.src sofaswitch/trunk/voip/mymanager.cxx Log: Fix default operation in for loop. Modify parent example to launch 20 children, not one. Work on voip manager.cxx, to exclude g.711 codec. Not right - some issues here. Modified: sofaswitch/trunk/callflow/src/startfor.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/startfor.cpp (original) +++ sofaswitch/trunk/callflow/src/startfor.cpp Tue Nov 21 16:03:10 2006 @@ -36,7 +36,7 @@ InformationSection(wxT("Test for Termination (Python code)"), wxT("self.i < loops")); displayData[displayData.size()] = - InformationSection(wxT("Increment (Python code)"), wxT("self.i++")); + InformationSection(wxT("Increment (Python code)"), wxT("self.i+=1")); } void DndShapeStartFor::Draw(wxDC& dc) Modified: sofaswitch/trunk/callflow/tests/parent.src ============================================================================== --- sofaswitch/trunk/callflow/tests/parent.src (original) +++ sofaswitch/trunk/callflow/tests/parent.src Tue Nov 21 16:03:10 2006 @@ -1 +1 @@ -14<B>574<B>226<B> extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>Terminating<ms><special>Python variable to hold event data<ms>self.termTime<ms><special> <B><Shape>14<B>533<B>200<B> extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>timer<ms><special>Python variable to hold event data<ms>self.eventData<ms><special> <B><Shape>18<B>518<B>99<B> extra <special>Tool Tip<ms>Load New Graph<ms><special>new graph file (Python code)<ms>"child.graph"<ms><special>Python variable to pass to child<ms>self.data[a]<ms><special> <B><Shape>2<B>564<B>314<B> extra <special>Tool Tip<ms>End Processing<ms><special> <B><Shape>1<B>518<B>50<B> extra <special>Tool Tip<ms>Start Processing<ms><special> <B><Shape>2<B>599<B>249<B> extra <special>Tool Tip<ms>End Processing<ms><special> <B><Shape>20<B>534<B>247<B> extra <special>Tool Tip<ms>Death<ms><special> <B><Shape>10<B>572<B>265<B> extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "child has terminated", self.termTime<ms><special> <B><Shape>12<B>519<B>146<B> extra <special>Tool Tip<ms>Timer<ms><special>Timer period (seconds, Python code)<ms>10<ms><special>Timer label (Python code)<ms>self.myId + "thistimer"<ms><special> <B><Shape> +9<B>187<B>42<B>187,236,283,240,285,42,334,44<special>Tool Tip<ms>Join blocks shape<ms><special> <B><Shape>12<B>307<B>42<B> extra <special>Tool Tip<ms>Timer<ms><special>Timer period (seconds, Python code)<ms>10<ms><special>Timer label (Python code)<ms>self.myId + "thistimer"<ms><special> <B><Shape>20<B>322<B>143<B> extra <special>Tool Tip<ms>Death<ms><special> <B><Shape>18<B>160<B>141<B> extra <special>Tool Tip<ms>Load New Graph<ms><special>new graph file (Python code)<ms>"child.graph"<ms><special>Python variable to pass to child<ms>self.data[a]<ms><special> <B><Shape>4<B>154<B>189<B> extra <special>Tool Tip<ms>End For Loop<ms><special> <B><Shape>2<B>352<B>210<B> extra <special>Tool Tip<ms>End Processing<ms><special> <B><Shape>9<B>152<B>120<B>152,120,153,214<special>Tool Tip<ms>Join blocks shape<ms><special> <B><Shape>3<B>153<B>93<B> extra <special>Tool Tip<ms>Start For<ms><special>Initialise (Python code)<ms>self.i = 0<ms><special>Test for Termination (Python code)<ms>self.i < 20<ms><special>Increment (Python code)<ms>self.i++<ms><special> <B><Shape>1<B>160<B>46<B> extra <special>Tool Tip<ms>Start Processing<ms><special> <B><Shape>14<B>362<B>122<B> extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>Terminating<ms><special>Python variable to hold event data<ms>self.termTime<ms><special> <B><Shape>10<B>360<B>161<B> extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "child has terminated", self.termTime<ms><special> <B><Shape>2<B>387<B>145<B> extra <special>Tool Tip<ms>End Processing<ms><special> <B><Shape>14<B>321<B>96<B> extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>timer<ms><special>Python variable to hold event data<ms>self.eventData<ms><special> <B><Shape> Modified: sofaswitch/trunk/voip/mymanager.cxx ============================================================================== --- sofaswitch/trunk/voip/mymanager.cxx (original) +++ sofaswitch/trunk/voip/mymanager.cxx Tue Nov 21 16:03:10 2006 @@ -168,13 +168,15 @@ toDelete += "H.261(QCIF)"; toDelete += "RGB32"; toDelete += "RGB24"; - - if (args.HasOption('D')) - toDelete += args.GetOptionString('D').Lines(); + toDelete += "G.711-uLaw-64k"; + toDelete += "G.711-ALaw-64k"; + PStringArray toRemove = args.GetOptionString('D').Lines(); + PStringArray toReorder = args.GetOptionString('P').Lines(); + toDelete += toRemove; - SetMediaFormatMask(toDelete); + SetMediaFormatMask(toRemove); if (args.HasOption('P')) - SetMediaFormatOrder(args.GetOptionString('P').Lines()); + SetMediaFormatOrder(toReorder); cout << "Jitter buffer: " << GetMinAudioJitterDelay() << '-' << GetMaxAudioJitterDelay() << " ms\n" "Codecs removed: " << setfill(',') << GetMediaFormatMask() << "\n"