[Freeswitch-branches] [commit] r11590 - freeswitch/branches/gmaruzz/mod_skypiax/asterisk

[FreeSWITCH SVN]

Author: gmaruzz
Date: Sun Feb  1 17:43:35 2009
New Revision: 11590

Log:
skypiax: now multichannel on *, at least on linux. Need tests

Modified:
   freeswitch/branches/gmaruzz/mod_skypiax/asterisk/Makefile
   freeswitch/branches/gmaruzz/mod_skypiax/asterisk/chan_skypiax.c

Modified: freeswitch/branches/gmaruzz/mod_skypiax/asterisk/Makefile
==============================================================================
--- freeswitch/branches/gmaruzz/mod_skypiax/asterisk/Makefile	(original)
+++ freeswitch/branches/gmaruzz/mod_skypiax/asterisk/Makefile	Sun Feb  1 17:43:35 2009
@@ -21,7 +21,7 @@
 #AST_INCLUDE_DIR=/home/maruzz/devel/svn_asterisk_branches_160/include
 #AST_INCLUDE_DIR=/home/maruzz/devel/svn_asterisk_branches_12/include
 #AST_INCLUDE_DIR=/home/maruzz/devel/svn_asterisk_branches_14/include
-AST_INCLUDE_DIR=/home/maruzz/devel/svn_celliax_trunk/asterisk-1.2.rev137401/include
+AST_INCLUDE_DIR=/home/user/devel/svn_celliax_trunk/asterisk-1.2.rev137401/include
 
 #ASTERISK
 CFLAGS+=-DASTERISK

Modified: freeswitch/branches/gmaruzz/mod_skypiax/asterisk/chan_skypiax.c
==============================================================================
--- freeswitch/branches/gmaruzz/mod_skypiax/asterisk/chan_skypiax.c	(original)
+++ freeswitch/branches/gmaruzz/mod_skypiax/asterisk/chan_skypiax.c	Sun Feb  1 17:43:35 2009
@@ -1278,6 +1278,9 @@
       M_STR("context", tmp->context)
       M_STR("language", tmp->language)
       M_STR("extension", tmp->exten)
+      M_STR("X11_display", tmp->X11_display)
+      M_UINT("tcp_cli_port", tmp->tcp_cli_port)
+      M_UINT("tcp_srv_port", tmp->tcp_srv_port)
       M_F("playback_boost", skypiax_store_boost(v->value, &tmp->playback_boost))
       M_F("capture_boost", skypiax_store_boost(v->value, &tmp->capture_boost))
       M_UINT("skypiax_dir_entry_extension_prefix",
@@ -1388,29 +1391,6 @@
     DEBUGA_SOUND("playback_boost is %f\n", SKYPIAX_TMP_LOG, tmp->playback_boost);
     DEBUGA_SOUND("capture_boost is %f\n", SKYPIAX_TMP_LOG, tmp->capture_boost);
   }
-  /* if skype is true for this interface, let's check if another interface has skype true */
-  if (tmp->skype) {
-    struct skypiax_pvt *p = NULL, *p2 = NULL;
-    /* lock the skypiax_iflock, maybe unneeded */
-    LOKKA(&skypiax_iflock);
-    p = skypiax_iflist;
-    /* for each pvt in the interfaces list (skypiax_iflist) */
-    while (p) {
-      p2 = p->next;
-      /* if another interface has skype true */
-      if (p->skype) {
-        ERRORA
-          ("This interface (category '[%s]') has 'skype=yes' in config, but up in skypiax.conf config file the interface category '[%s]' has yet 'skype=yes'. Only one interface at time can support skype. I'm sure, I wrote it ;). Setting 'skype=no' for interface category '[%s] and continuing\n",
-           SKYPIAX_P_LOG, tmp->name, p->name, tmp->name);
-        /* set this interface's skype to false */
-        tmp->skype = 0;
-      }
-      /* next interface, please */
-      p = p2;
-    }
-    /* unlock the skypiax_iflock */
-    UNLOCKA(&skypiax_iflock);
-  }
 /* initialize the soundcard channels (input and output) used by this interface (a multichannel soundcard can be used by multiple interfaces), optionally starting the sound managing threads */
   res = skypiax_sound_init(tmp);
   if (res == -1) {