Revision
15048
Author
gmaruzz
Date
2009-10-02 09:21:17 -0500 (Fri, 02 Oct 2009)

Log Message

gsmopen: cosmetics

Modified Paths

Diff

Modified: freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen.conf.xml (15047 => 15048)


--- freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen.conf.xml	2009-10-02 13:19:23 UTC (rev 15047)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen.conf.xml	2009-10-02 14:21:17 UTC (rev 15048)
@@ -13,6 +13,9 @@
 	<param name="dialplan" value="XML"/>
 	<param name="context" value="default"/>
     	<param name="destination" value="5000"/>
+    	<param name="alsacname" value="plughw:1"/>
+    	<param name="alsapname" value="plughw:1"/>
+    	<param name="controldevice_name" value="/dev/ttyACM0"/>
     </interface>
     <!-- following interfaces are commented out!
     -->

Modified: freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen.h (15047 => 15048)


--- freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen.h	2009-10-02 13:19:23 UTC (rev 15047)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen.h	2009-10-02 14:21:17 UTC (rev 15048)
@@ -237,7 +237,7 @@
 	switch_mutex_t *mutex;
 	switch_mutex_t *flag_mutex;
 
-	char interface_id[80];
+	char id[80];
 	char name[80];
 	char dialplan[80];
 	char context[80];

Modified: freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.c (15047 => 15048)


--- freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.c	2009-10-02 13:19:23 UTC (rev 15047)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.c	2009-10-02 14:21:17 UTC (rev 15048)
@@ -1480,15 +1480,6 @@
 			}
 
 
-
-
-
-
-
-
-			if (name) {
-				DEBUGA_GSMOPEN("name=%s\n", GSMOPEN_P_LOG, name);
-			}
 			if (interface_id && interface_id < GSMOPEN_MAX_INTERFACES) {
 				private_t newconf;
 				switch_threadattr_t *gsmopen_api_thread_attr = NULL;
@@ -1502,7 +1493,7 @@
 				switch_mutex_init(&globals.GSMOPEN_INTERFACES[interface_id].controldev_lock, SWITCH_MUTEX_NESTED, gsmopen_module_pool);
 
 
-				//FIXME switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].id , id );
+				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].id , id );
 				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].name , name );
 				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].context , context );
 				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].dialplan , dialplan );
@@ -1598,22 +1589,18 @@
 				//globals.GSMOPEN_INTERFACES[interface_id].playback_boost = playback_boost;
 				globals.GSMOPEN_INTERFACES[interface_id].running = running; //FIXME
 
-				gsmopen_store_boost("5", &globals.GSMOPEN_INTERFACES[interface_id].capture_boost); //FIXME
-				gsmopen_store_boost("10", &globals.GSMOPEN_INTERFACES[interface_id].playback_boost); //FIXME
 
 
-				DEBUGA_GSMOPEN("interface_id=%d globals.GSMOPEN_INTERFACES[interface_id].name=%s\n",
-						GSMOPEN_P_LOG, interface_id, globals.GSMOPEN_INTERFACES[interface_id].name);
-				DEBUGA_GSMOPEN
-					("interface_id=%d globals.GSMOPEN_INTERFACES[interface_id].dialplan=%s\n",
-					 GSMOPEN_P_LOG, interface_id, globals.GSMOPEN_INTERFACES[interface_id].dialplan);
-				DEBUGA_GSMOPEN
-					("interface_id=%d globals.GSMOPEN_INTERFACES[interface_id].destination=%s\n",
-					 GSMOPEN_P_LOG, interface_id, globals.GSMOPEN_INTERFACES[interface_id].destination);
-				DEBUGA_GSMOPEN
-					("interface_id=%d globals.GSMOPEN_INTERFACES[interface_id].context=%s\n",
-					 GSMOPEN_P_LOG, interface_id, globals.GSMOPEN_INTERFACES[interface_id].context);
 				WARNINGA("STARTING interface_id=%d\n", GSMOPEN_P_LOG, interface_id);
+				DEBUGA_GSMOPEN("id=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].id);
+				DEBUGA_GSMOPEN("name=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].name);
+				DEBUGA_GSMOPEN("hold-music=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].hold_music);
+				DEBUGA_GSMOPEN("context=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].context);
+				DEBUGA_GSMOPEN("dialplan=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].dialplan);
+				DEBUGA_GSMOPEN("destination=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].destination);
+				DEBUGA_GSMOPEN("controldevice_name=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].controldevice_name);
+				DEBUGA_GSMOPEN("alsacname=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].alsacname);
+				DEBUGA_GSMOPEN("alsapname=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].alsapname);
 
 				int res = 0;
 
@@ -1645,6 +1632,8 @@
 					}
 				}
 
+				gsmopen_store_boost("5", &globals.GSMOPEN_INTERFACES[interface_id].capture_boost); //FIXME
+				gsmopen_store_boost("10", &globals.GSMOPEN_INTERFACES[interface_id].playback_boost); //FIXME
 
 				switch_sleep(100000);
 				switch_threadattr_create(&gsmopen_api_thread_attr, gsmopen_module_pool);
@@ -1653,6 +1642,7 @@
 						&globals.GSMOPEN_INTERFACES[interface_id], gsmopen_module_pool);
 
 				switch_sleep(100000);
+				WARNINGA("STARTED interface_id=%d\n", GSMOPEN_P_LOG, interface_id);
 
 			} else {
 				ERRORA("interface id %d is higher than GSMOPEN_MAX_INTERFACES (%d)\n", GSMOPEN_P_LOG, interface_id, GSMOPEN_MAX_INTERFACES);
@@ -1668,11 +1658,15 @@
 
 				tech_pvt = &globals.GSMOPEN_INTERFACES[i];
 
-				DEBUGA_GSMOPEN("i=%d globals.GSMOPEN_INTERFACES[%d].interface_id=%s\n", GSMOPEN_P_LOG, i, i, globals.GSMOPEN_INTERFACES[i].interface_id);
-				DEBUGA_GSMOPEN("i=%d globals.GSMOPEN_INTERFACES[%d].name=%s\n", GSMOPEN_P_LOG, i, i, globals.GSMOPEN_INTERFACES[i].name);
-				DEBUGA_GSMOPEN("i=%d globals.GSMOPEN_INTERFACES[%d].context=%s\n", GSMOPEN_P_LOG, i, i, globals.GSMOPEN_INTERFACES[i].context);
-				DEBUGA_GSMOPEN("i=%d globals.GSMOPEN_INTERFACES[%d].dialplan=%s\n", GSMOPEN_P_LOG, i, i, globals.GSMOPEN_INTERFACES[i].dialplan);
-				DEBUGA_GSMOPEN("i=%d globals.GSMOPEN_INTERFACES[%d].destination=%s\n", GSMOPEN_P_LOG, i, i, globals.GSMOPEN_INTERFACES[i].destination);
+				DEBUGA_GSMOPEN("id=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].id);
+				DEBUGA_GSMOPEN("name=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].name);
+				DEBUGA_GSMOPEN("context=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].context);
+				DEBUGA_GSMOPEN("hold-music=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].hold_music);
+				DEBUGA_GSMOPEN("dialplan=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].dialplan);
+				DEBUGA_GSMOPEN("destination=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].destination);
+				DEBUGA_GSMOPEN("controldevice_name=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].controldevice_name);
+				DEBUGA_GSMOPEN("alsacname=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].alsacname);
+				DEBUGA_GSMOPEN("alsapname=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].alsapname);
 			}
 		}
 	}