First pass at VPB updates

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1392 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_vpb.c b/channels/chan_vpb.c
index 74f6c4ea8d0805d2132ebc7deb2348565adb8797..61700a1fdd9221afbf77bdcc444ff825e0ae9819 100755 (executable)
--- a/channels/chan_vpb.c
+++ b/channels/chan_vpb.c
@@ -82,7 +82,7 @@ static ast_mutex_t monlock = AST_MUTEX_INITIALIZER;
 
 /* This is the thread for the monitor which checks for input on the channels
    which are not currently in use.  */
-static pthread_t monitor_thread;
+static ast_mutex_t monitor_thread;
 
 static int mthreadactive = -1; /* Flag for monitoring monitorthread.*/
 
@@ -177,7 +177,7 @@ static int vpb_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags,
               bridges[i].fo = fo;
               bridges[i].c0 = c0;
               bridges[i].c1 = c1;
-              pthread_mutex_init(&bridges[i].lock, NULL);
+              ast_mutex_init(&bridges[i].lock, NULL);
               pthread_cond_init(&bridges[i].cond, NULL);
          }            
      } ast_mutex_unlock(&bridge_lock); 
@@ -215,7 +215,7 @@ static int vpb_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags,
      
      ast_mutex_lock(&bridge_lock); {
          bridges[i].inuse = 0;
-         pthread_mutex_destroy(&bridges[i].lock);
+         ast_mutex_destroy(&bridges[i].lock);
          pthread_cond_destroy(&bridges[i].cond);       
      } ast_mutex_unlock(&bridge_lock); 
      
@@ -586,7 +586,7 @@ struct vpb_pvt *mkif(int board, int channel, int mode, float txgain, float rxgai
 
      tmp->readthread = 0;
 
-     pthread_mutex_init(&tmp->lock, NULL);
+     ast_mutex_init(&tmp->lock, NULL);
 
      if (setrxgain)      
          vpb_record_set_gain(tmp->handle, rxgain);
@@ -1229,7 +1229,7 @@ int unload_module()
 
                while(iflist) {
                     p = iflist;                    
-                    pthread_mutex_destroy(&p->lock);
+                    ast_mutex_destroy(&p->lock);
                     pthread_cancel(p->readthread);
                     p->readthread = 0;
                     
@@ -1243,7 +1243,7 @@ int unload_module()
        ast_mutex_lock(&bridge_lock); {
             memset(bridges, 0, sizeof bridges);             
        } ast_mutex_unlock(&bridge_lock);
-       pthread_mutex_destroy(&bridge_lock);
+       ast_mutex_destroy(&bridge_lock);
 
        tcounter = 0;