From: Mark Spencer <markster@digium.com>
Date: Fri, 30 Mar 2001 19:24:13 +0000 (+0000)
Subject: Version 0.1.7 from FTP
X-Git-Tag: 0.1.7~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ef47e8b675e40536a4fa6c80f086f8e108454ac8;p=thirdparty%2Fasterisk.git

Version 0.1.7 from FTP


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

diff --git a/channels/chan_oss.c b/channels/chan_oss.c
index 582618008e..2791e3f766 100755
--- a/channels/chan_oss.c
+++ b/channels/chan_oss.c
@@ -385,7 +385,7 @@ static int soundcard_writeframe(short *data)
 {	
 	/* Write an exactly FRAME_SIZE sized of frame */
 	static int bufcnt = 0;
-	static char buffer[FRAME_SIZE * 2 * MAX_BUFFER_SIZE * 5];
+	static short buffer[FRAME_SIZE * MAX_BUFFER_SIZE * 5];
 	struct audio_buf_info info;
 	int res;
 	int fd = sounddev;
@@ -407,7 +407,7 @@ static int soundcard_writeframe(short *data)
 	} else {
 		/* Copy the data into our buffer */
 		res = FRAME_SIZE * 2;
-		memcpy(buffer + (bufcnt * FRAME_SIZE * 2), data, FRAME_SIZE * 2);
+		memcpy(buffer + (bufcnt * FRAME_SIZE), data, FRAME_SIZE * 2);
 		bufcnt++;
 		if (bufcnt == buffersize) {
 			res = write(fd, ((void *)buffer), FRAME_SIZE * 2 * buffersize);
@@ -548,7 +548,7 @@ static struct ast_channel *oss_new(struct chan_oss_pvt *p, int state)
 		snprintf(tmp->name, sizeof(tmp->name), "OSS/%s", DEV_DSP + 5);
 		tmp->type = type;
 		tmp->fd = funnel[0];
-		tmp->format = AST_FORMAT_SLINEAR;
+		tmp->nativeformats = AST_FORMAT_SLINEAR;
 		tmp->pvt->pvt = p;
 		tmp->pvt->send_digit = oss_digit;
 		tmp->pvt->send_text = oss_text;
@@ -841,3 +841,8 @@ int usecount()
 	pthread_mutex_unlock(&usecnt_lock);
 	return res;
 }
+
+char *key()
+{
+	return ASTERISK_GPL_KEY;
+}