kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Version 0.1.12 from FTP

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@456 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2002-05-31 16:25:56 +00:00
parent f18ffcb4b7
commit 11fefdc37c
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
channels/chan_alsa.c
View File

@@ -71,7 +71,7 @@ static int silencethreshold = 1000;
static char digits[80] = ""; static char digits[80] = "";
static char text2send[80] = ""; static char text2send[80] = "";
static pthread_mutex_t usecnt_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t usecnt_lock = AST_MUTEX_INITIALIZER;
static char *type = "Console"; static char *type = "Console";
static char *desc = "ALSA Console Channel Driver"; static char *desc = "ALSA Console Channel Driver";
@@ -782,7 +782,7 @@ static int alsa_indicate(struct ast_channel *chan, int cond)
static struct ast_channel *alsa_new(struct chan_alsa_pvt *p, int state) static struct ast_channel *alsa_new(struct chan_alsa_pvt *p, int state)
{ {
struct ast_channel *tmp; struct ast_channel *tmp;
tmp = ast_channel_alloc(); tmp = ast_channel_alloc(0);
if (tmp) { if (tmp) {
snprintf(tmp->name, sizeof(tmp->name), "ALSA/%s", indevname); snprintf(tmp->name, sizeof(tmp->name), "ALSA/%s", indevname);
tmp->type = type; tmp->type = type;

9
channels/chan_vofr.c
View File

@@ -14,6 +14,7 @@
#include <stdio.h> #include <stdio.h>
#include <pthread.h> #include <pthread.h>
#include <string.h> #include <string.h>
#include <asterisk/lock.h>
#include <asterisk/channel.h> #include <asterisk/channel.h>
#include <asterisk/channel_pvt.h> #include <asterisk/channel_pvt.h>
#include <asterisk/config.h> #include <asterisk/config.h>
@@ -52,14 +53,14 @@ static char context[AST_MAX_EXTENSION] = "default";
static char language[MAX_LANGUAGE] = ""; static char language[MAX_LANGUAGE] = "";
static int usecnt =0; static int usecnt =0;
static pthread_mutex_t usecnt_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t usecnt_lock = AST_MUTEX_INITIALIZER;
/* Protect the interface list (of vofr_pvt's) */ /* Protect the interface list (of vofr_pvt's) */
static pthread_mutex_t iflock = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t iflock = AST_MUTEX_INITIALIZER;
/* Protect the monitoring thread, so only one process can kill or start it, and not /* Protect the monitoring thread, so only one process can kill or start it, and not
when it's doing something critical. */ when it's doing something critical. */
static pthread_mutex_t monlock = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t monlock = AST_MUTEX_INITIALIZER;
/* This is the thread for the monitor which checks for input on the channels /* This is the thread for the monitor which checks for input on the channels
which are not currently in use. */ which are not currently in use. */
@@ -798,7 +799,7 @@ static int vofr_fixup(struct ast_channel *oldchan, struct ast_channel *newchan)
static struct ast_channel *vofr_new(struct vofr_pvt *i, int state) static struct ast_channel *vofr_new(struct vofr_pvt *i, int state)
{ {
struct ast_channel *tmp; struct ast_channel *tmp;
tmp = ast_channel_alloc(); tmp = ast_channel_alloc(0);
if (tmp) { if (tmp) {
#ifdef OLD_SANGOMA_API #ifdef OLD_SANGOMA_API
snprintf(tmp->name, sizeof(tmp->name), "AdtranVoFR/%s", i->sa.spkt_device); snprintf(tmp->name, sizeof(tmp->name), "AdtranVoFR/%s", i->sa.spkt_device);