[Sofaswitch-svn] [commit] r346 - in sofaswitch/trunk: . controller get_started

4 Jul 2007

Author: derek
Date: Wed Jul  4 17:58:25 2007
New Revision: 346

Added:
   sofaswitch/trunk/get_started/common.sgml
Modified:
   sofaswitch/trunk/controller/testmcu3.py
   sofaswitch/trunk/controller/testmcu3_time.py
   sofaswitch/trunk/controller/testmcu3a.py
   sofaswitch/trunk/controller/testmcu3b.py
   sofaswitch/trunk/controller/testmcurec.py
   sofaswitch/trunk/get_started/get_started.xml
   sofaswitch/trunk/mcu_layout.fig

Log:
Modify docs, tidy control scripts.


Modified: sofaswitch/trunk/controller/testmcu3.py
==============================================================================

--- sofaswitch/trunk/controller/testmcu3.py	(original)
+++ sofaswitch/trunk/controller/testmcu3.py	Wed Jul  4 17:58:25 2007
@@ -73,13 +73,12 @@
          self.myController.send_message_to('setreceivedmsgfile ' + self.myRxFile,
                                         self.oWorkerNodes[self.oNode2])
 
-         print self.oWorkerNodes[self.oNode2], ' plays ', self.mySendFile, ' to ', self.oWorkerNodes[self.oNode1]
          self.myController.wait_for_finished_file_message(self.oWorkerNodes[self.oNode2], 28)         
 
       self.myController.send_message_to('hangup', self.oWorkerNodes[self.oNode1])
       self.myController.send_message_to('hangup', self.oWorkerNodes[self.oNode2])
 
-      print 'END of play_file_x_times for ', self.oWorkerNodes[self.oNode2], ' and ', self.oWorkerNodes[self.oNode1]
+
 
 if False:
     memberA = OneMember("memberaRecord.wav", "../prompts/silence1.wav", controller)

Modified: sofaswitch/trunk/controller/testmcu3_time.py
==============================================================================
--- sofaswitch/trunk/controller/testmcu3_time.py	(original)
+++ sofaswitch/trunk/controller/testmcu3_time.py	Wed Jul  4 17:58:25 2007
@@ -75,7 +75,6 @@
          self.myRxfile = self.myRxFile + str(i)
          self.myController.send_message_to('setannouncementfile ' + self.mySendFile,
                                         self.oWorkerNodes[self.oNode2])
-         print self.oWorkerNodes[self.oNode2], ' plays ', self.mySendFile, ' to ', self.oWorkerNodes[self.oNode1]
          self.myController.wait_for_finished_file_message(self.oWorkerNodes[self.oNode2], 28)         
 
       self.myController.send_message_to('hangup', self.oWorkerNodes[self.oNode1])
@@ -84,9 +83,9 @@
       self.myController.RemoveFromMyActives(self.oWorkerNodes[self.oNode2])
       time.sleep(1)
       os.remove("../am/" + self.myRxFile)
-      print 'END of play_file_x_times for ', self.oWorkerNodes[self.oNode2], ' and ', self.oWorkerNodes[self.oNode1]
 
-os.system('echo  The\ time\ is `date | cut -d \   -f4 ` > time.txt')
+
+os.system('echo  The\ time\ is ` date +%l` hours and `date +%M` minutes > time.txt')
 os.system('text2wave time.txt -o time.wav -F 8000 -scale 3')
 
 memberA = OneMember("../controller/time.wav", controller)

Modified: sofaswitch/trunk/controller/testmcu3a.py
==============================================================================
--- sofaswitch/trunk/controller/testmcu3a.py	(original)
+++ sofaswitch/trunk/controller/testmcu3a.py	Wed Jul  4 17:58:25 2007
@@ -75,7 +75,6 @@
          self.myRxfile = self.myRxFile + str(i)
          self.myController.send_message_to('setannouncementfile ' + self.mySendFile,
                                         self.oWorkerNodes[self.oNode2])
-         print self.oWorkerNodes[self.oNode2], ' plays ', self.mySendFile, ' to ', self.oWorkerNodes[self.oNode1]
          self.myController.wait_for_finished_file_message(self.oWorkerNodes[self.oNode2], 28)         
 
       self.myController.send_message_to('hangup', self.oWorkerNodes[self.oNode1])
@@ -84,7 +83,7 @@
       self.myController.RemoveFromMyActives(self.oWorkerNodes[self.oNode2])
       time.sleep(1)
       os.remove("../am/" + self.myRxFile)
-      print 'END of play_file_x_times for ', self.oWorkerNodes[self.oNode2], ' and ', self.oWorkerNodes[self.oNode1]
+
 
 
 memberA = OneMember("../prompts/silence1.wav", controller)

Modified: sofaswitch/trunk/controller/testmcu3b.py
==============================================================================
--- sofaswitch/trunk/controller/testmcu3b.py	(original)
+++ sofaswitch/trunk/controller/testmcu3b.py	Wed Jul  4 17:58:25 2007
@@ -75,7 +75,6 @@
          self.myRxfile = self.myRxFile + str(i)
          self.myController.send_message_to('setannouncementfile ' + self.mySendFile,
                                         self.oWorkerNodes[self.oNode2])
-         print self.oWorkerNodes[self.oNode2], ' plays ', self.mySendFile, ' to ', self.oWorkerNodes[self.oNode1]
          self.myController.wait_for_finished_file_message(self.oWorkerNodes[self.oNode2], 28)         
 
       self.myController.send_message_to('hangup', self.oWorkerNodes[self.oNode1])
@@ -84,7 +83,7 @@
       self.myController.RemoveFromMyActives(self.oWorkerNodes[self.oNode2])
       time.sleep(1)
       os.remove("../am/" + self.myRxFile)
-      print 'END of play_file_x_times for ', self.oWorkerNodes[self.oNode2], ' and ', self.oWorkerNodes[self.oNode1]
+
 
 
 memberA = OneMember("../prompts/entering.wav", controller)

Modified: sofaswitch/trunk/controller/testmcurec.py
==============================================================================
--- sofaswitch/trunk/controller/testmcurec.py	(original)
+++ sofaswitch/trunk/controller/testmcurec.py	Wed Jul  4 17:58:25 2007
@@ -74,7 +74,6 @@
       for i in range(0, repeats):
          self.myController.send_message_to('setannouncementfile ' + self.mySendFile,
                                         self.oWorkerNodes[self.oNode2])
-         print self.oWorkerNodes[self.oNode2], ' plays ', self.mySendFile, ' to ', self.oWorkerNodes[self.oNode1]
          self.myController.wait_for_finished_file_message(self.oWorkerNodes[self.oNode2], 28)         
 
       self.myController.send_message_to('hangup', self.oWorkerNodes[self.oNode1])
@@ -82,8 +81,6 @@
       self.myController.RemoveFromMyActives(self.oWorkerNodes[self.oNode1])
       self.myController.RemoveFromMyActives(self.oWorkerNodes[self.oNode2])
 
-      print 'END of play_file_x_times for ', self.oWorkerNodes[self.oNode2], ' and ', self.oWorkerNodes[self.oNode1]
-
 
 memberA = OneMember("../prompts/silence2.wav", controller)
 memberA.play_file_x_times(1)    

Added: sofaswitch/trunk/get_started/common.sgml
==============================================================================
--- (empty file)
+++ sofaswitch/trunk/get_started/common.sgml	Wed Jul  4 17:58:25 2007
@@ -0,0 +1,31 @@
+<chapter>
+<title>Common command options to &sofaswitch; utilities</title>
+<titleabbrev>Command options</titleabbrev>
+
+<para>
+There are multiple command options to the different &sofaswitch;
+utilities. Many of these utilities share the same options, which are listed below.
+<itemizedlist>
+<listitem><literal>-h</literal> will always generate a help message on the particular sofa
+       switch utility.
+</listitem>
+<listitem><literal>-t</literal> will generate debug information. With more
+        <literal>t</literal>'s (say <literal>-tttt</literal>)
+        there will be lots of debug information
+</listitem>
+<listitem><literal>-o</literal> will send the debug information to the specified file. These
+       debug information options (<literal>-t</literal>, <literal>-o</literal>)
+        are only available on the debug build.
+</listitem>
+<listitem><literal>-s</literal> will specify the server to use for messages. If not specified, it
+       defaults to localhost.
+</listitem>
+<listitem><literal>-i</literal> will specify the id this utility uses when connecting to the
+       message server. Each utility has its own default id. For example, the
+       voip executable has an id of "voip"
+</listitem>
+<listitem><literal>-v</literal> report program version info.
+</listitem>
+</itemizedlist>
+</para>
+</chapter>

Modified: sofaswitch/trunk/get_started/get_started.xml
==============================================================================
--- sofaswitch/trunk/get_started/get_started.xml	(original)
+++ sofaswitch/trunk/get_started/get_started.xml	Wed Jul  4 17:58:25 2007
@@ -14,6 +14,7 @@
 <!ENTITY sound   SYSTEM "sound.sgml">
 <!ENTITY am      SYSTEM "answeringmachine.sgml">
 <!ENTITY mcu     SYSTEM "conference.sgml">
+<!ENTITY common  SYSTEM "common.sgml">
 <!ENTITY app1    SYSTEM "app1.sgml">
 
 
@@ -55,7 +56,7 @@
 &sound;
 &am;
 &mcu;
-
+&common;
 &app1;
 </book>
 

Modified: sofaswitch/trunk/mcu_layout.fig
==============================================================================
--- sofaswitch/trunk/mcu_layout.fig	(original)
+++ sofaswitch/trunk/mcu_layout.fig	Wed Jul  4 17:58:25 2007
@@ -66,14 +66,14 @@
 	1 0 4.00 240.00 480.00
 	1 0 4.00 240.00 480.00
 	 2295 3735 4545 3735
-4 0 0 50 -1 0 30 0.0000 4 210 1125 5715 7380 ssmcu\001
-4 0 0 50 -1 0 30 0.0000 4 210 900 9585 7740 ssam\001
-4 0 0 50 -1 0 30 0.0000 4 315 1125 9945 4230 ssam1\001
-4 0 0 50 -1 0 30 0.0000 4 315 1125 9945 6390 ssam2\001
+4 0 0 50 -1 0 30 0.0000 4 210 1125 5715 7380 mcu\001
+4 0 0 50 -1 0 30 0.0000 4 210 900 9585 7740 am\001
+4 0 0 50 -1 0 30 0.0000 4 315 1125 9945 4230 am1\001
+4 0 0 50 -1 0 30 0.0000 4 315 1125 9945 6390 am2\001
 4 0 0 50 -1 0 30 0.0000 4 315 1725 855 9090 controller\001
 4 0 0 50 -1 0 30 0.0000 4 210 1095 4905 9045 server\001
 4 0 0 50 -1 0 30 0.0000 4 315 1080 945 4185 sound\001
-4 0 0 50 -1 0 30 0.0000 4 315 1350 4545 3870 ssmcu3\001
-4 0 0 50 -1 0 30 0.0000 4 315 1350 5895 4455 ssmcu2\001
-4 0 0 50 -1 0 30 0.0000 4 315 1350 5850 6300 ssmcu1\001
+4 0 0 50 -1 0 30 0.0000 4 315 1350 4545 3870 mcu3\001
+4 0 0 50 -1 0 30 0.0000 4 315 1350 5895 4455 mcu2\001
+4 0 0 50 -1 0 30 0.0000 4 315 1350 5850 6300 mcu1\001
 4 0 0 50 -1 10 22 0.0000 4 165 900 5670 5265 room\001

    

[Sofaswitch-svn] [commit] r346 - in sofaswitch/trunk: . controller get_started

SofaSWITCH SVN