X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=port.cpp;h=017ba699f73336605c8ba83d3d14ed8fb4bbc949;hp=a68ca59768a7e2ebb2dce9a4364a85c29b767350;hb=1ace98e214e20173f027f50abac2546159735e59;hpb=2ed0fee489c37a6e2d4473f6185ebbe3e746ac11

diff --git a/port.cpp b/port.cpp
index a68ca59..017ba69 100644
--- a/port.cpp
+++ b/port.cpp
@@ -141,6 +141,8 @@ Port::Port(int type, char *portname, struct port_settings *settings)
 	}
 	SCPY(p_name, portname);
 	SCPY(p_tone_dir, p_settings.tones_dir); // just to be sure
+	p_last_tv_sec = 0;
+	p_last_tv_msec = 0;
 	p_type = type;
 	p_serial = port_serial++;
 	p_debug_nothingtosend = 0;
@@ -262,25 +264,6 @@ void Port::new_state(int state)
 
 
 /*
- * find the port using h323 token
- */ 
-class Port *find_port_with_token(char *name)
-{
-	class Port *port = port_first;
-
-	while(port)
-	{
-//printf("comparing: '%s' with '%s'\n", name, p_name);
-		if ((port->p_type==PORT_TYPE_H323_IN || port->p_type==PORT_TYPE_H323_OUT) && !strcmp(port->p_name, name))
-			return(port);
-		port = port->next;
-	}
-
-	return(NULL);
-}
-
-
-/*
  * find the port with port_id
  */ 
 class Port *find_port_id(unsigned long port_id)
@@ -298,47 +281,6 @@ class Port *find_port_id(unsigned long port_id)
 	return(NULL);
 }
 
-#if 0
-/*
- * open the knock sound
- */
-void Port::set_knock(char *tones_dir_epoint)
-{
-	char filename[128], *tones_dir;
-
-	/* check if we have the epoint override the tones_dir of options.conf */
-	tones_dir = options.tones_dir;
-	if (tones_dir_epoint[0])
-	{
-		tones_dir = tones_dir_epoint;
-	}
-
-	if (p_knock_fh >= 0)
-	{
-		close(p_knock_fh);
-		p_knock_fh = -1;
-		fhuse--;
-	}
-	p_knock_fetched = NULL;
-
-	if ((p_knock_fetched=open_tone_fetched(tones_dir, "knock", &p_knock_codec, &p_knock_size, &p_knock_left)))
-	{
-		PDEBUG(DEBUG_PORT, "PORT(%s) opening fetched tone: %s\n", p_name, "knock");
-		return;
-	}
-
-	SPRINT(filename, "%s/%s/knock", INSTALL_DATA, tones_dir);
-	if ((p_knock_fh=open_tone(filename, &p_knock_codec, &p_knock_size, &p_knock_left)) >= 0)
-	{
-		PDEBUG(DEBUG_PORT, "PORT(%s) opening tone: %s\n", p_name, filename);
-		fhuse++;
-	} else
-	{
-		p_knock_fh = -1;
-	}
-}
-#endif
-
 
 /*
  * set echotest
@@ -348,6 +290,7 @@ void Port::set_echotest(int echotest)
 	p_echotest = echotest;
 }
 
+
 /*
  * set the file in the tone directory with the given name
  */
@@ -359,15 +302,6 @@ void Port::set_tone(char *dir, char *name)
 	if (name == NULL)
 		name = "";
 
-#if 0
-	/* knocking ? */
-	if (!strcmp(name, "knock"))
-	{
-		set_knock(tones_dir_epoint);
-		return;
-	}
-#endif
-
 	/* no counter, no eof, normal speed */
 	p_tone_counter = 0;
 	p_tone_eof = 0;
@@ -518,45 +452,6 @@ void Port::set_vbox_play(char *name, int offset)
 	/* seek */
 	if (p_tone_name[0])
 	{
-//printf("\n\n\n tone_codec = %d\n\n\n\n",p_tone_codec);
-#if 0
-		switch(p_tone_codec)
-		{
-			case CODEC_LAW:
-			case CODEC_8BIT:
-			lseek(p_tone_fh, offset*8000L, SEEK_SET);
-			size = p_tone_size / 8000L;
-			if (offset*8000L <= p_tone_left)
-				p_tone_left -= offset*8000L;
-			break;
-
-			case CODEC_MONO:
-			lseek(p_tone_fh, offset*16000L, SEEK_SET);
-			size = p_tone_size / 16000L;
-			if (offset*16000L <= p_tone_left)
-				p_tone_left -= offset*16000L;
-//printf("\n\n\n size = %d\n\n\n\n",size);
-			break;
-
-			case CODEC_STEREO:
-			lseek(p_tone_fh, offset*32000L, SEEK_SET);
-			size = p_tone_size / 32000L;
-			if (offset*32000L <= p_tone_left)
-				p_tone_left -= offset*32000L;
-			break;
-	
-			default:
-			PERROR("no codec specified! exitting...\n");
-			exit(-1);
-		}
-#else
-		lseek(p_tone_fh, offset*8000L, SEEK_SET);
-		size = p_tone_size / 8000L;
-		if (offset*8000L <= p_tone_left)
-			p_tone_left -= offset*8000L;
-#endif
-
-
 		/* send message with counter value */
 		if (p_tone_size>=0 && ACTIVE_EPOINT(p_epointlist))
 		{
@@ -578,274 +473,31 @@ void Port::set_vbox_speed(int speed)
 	p_tone_speed = speed;
 }
 
-/* write data to port's mixer buffer
- * it will be read by the port using read_audio
- * synchronisation is also done when writing is too fast and buffer is full
- * the mixer buffer will only mix what cannot be mixed by kernel mixer
- *
- * also write data to the record buffer. the record buffer will mix everything.
- */
-void Port::mixer(union parameter *param)
-{
-	struct mixer_relation *relation, **relationpointer;
-	int len;
-	unsigned char *data;
-	signed short *data_16;
-	int writep;
-	signed long *buffer, *record;
-	int must_mix = 1; /* set, if we need to mix (not done by kernel) */
-
-	/* we do not mix if we have audio from ourself but we need to record
-	 * unless we have a local echo enabled
-	 */
-	if (param->data.port_id==p_serial && !p_echotest)
-		must_mix = 0;
-
-	if ((param->data.port_type&PORT_CLASS_MASK)==PORT_CLASS_mISDN
-	 && (p_type&PORT_CLASS_MASK)==PORT_CLASS_mISDN)
-	{
-		must_mix = 0;
-	}
-	if (!p_record && !must_mix) /* if we do not record AND no need to mix */
-	{
-		return;
-	}
-
-	/* get the relation to the write pointer. if no relation exists
-	 * for the given source port, we create one.
-	 */
-	relation = p_mixer_rel;
-	relationpointer = &(p_mixer_rel);
-	if (!relation) /* there is no relation at all */
-	{
-		/* clear buffer to 0-volume and reset writep */
-		memset(p_mixer_buffer, 0, sizeof(p_mixer_buffer));
-		memset(p_record_buffer, 0, sizeof(p_record_buffer));
-		memset(p_stereo_buffer, 0, sizeof(p_stereo_buffer));
-	} else /* else because we do not need to run a 0-loop */
-	while(relation)
-	{
-		if (relation->port_id == param->data.port_id)
-			break;
-		relationpointer = &(relation->next);
-		relation = relation->next;
-	}
-	if (!relation)
-	{
-		relation = *relationpointer = (struct mixer_relation *)calloc(1, sizeof(struct mixer_relation));
-		if (!relation)
-		{
-			PERROR("fatal error: cannot alloc memory for port mixer relation\n");	
-			return; /* no mem */
-		}
-		pmemuse++;
-		memset(relation, 0, sizeof(struct mixer_relation));
-		relation->port_id = param->data.port_id;
-		/* put write buffer in front of read buffer */
-#ifndef BETTERDELAY
-		relation->mixer_writep = (p_mixer_readp+(PORT_BUFFER/2))%PORT_BUFFER;
-#else
-		relation->mixer_writep = p_mixer_readp;
-#endif
-#ifdef MIXER_DEBUG
-		PDEBUG(DEBUG_PORT, "PORT(%s) Adding new mixer relation from port #%d (readp=%d, writep=%d, PORT_BUFFER=%d).\n", p_name, param->data.port_id, p_mixer_readp, relation->mixer_writep, PORT_BUFFER);
-#endif
-	}
-
-	/* adding remote's audio data to our mixer_buffer / record_buffer */
-	len = param->data.len;
-	if (param->data.compressed == 0) /* in case of 16 bit data */
-		len >>= 1;
-	if (len>PORT_BUFFER)
-		PERROR("fatal error: audio data from remote port #%d is larger than mixer buffer %d>%d\n", param->data.port_id, len, PORT_BUFFER);
-	writep = relation->mixer_writep;
-	buffer = p_mixer_buffer;
-	record = p_record_buffer;
-	/* if stereo should be recorded */
-	if (param->data.port_id == p_serial)
-	if (p_record_type == CODEC_STEREO)
-		record = p_stereo_buffer;
-	/* NOTE: if read and write pointer are equal, the buffer is full */
-	if ((p_mixer_readp-writep+PORT_BUFFER)%PORT_BUFFER < len) /* we would overrun the read pointer */
-	{
-#ifdef MIXER_DEBUG
-		PERROR("PORT(%s) buffer overrun, source port #%d is sending too fast. (dropping %d samples)\n", p_name, param->data.port_id, len);
-#endif
-		// we do not resync since dropping causes slowing writepointer down anyway...
-		//relation->mixer_writep = (p_mixer_readp+(PORT_BUFFER/2))%PORT_BUFFER;
-		return;
-	}
-
-	if (!p_record && must_mix)
-	{
-		/* WE MUST MIX BUT DO NOT RECORD */
-		if (param->data.compressed)
-		{
-			/* compressed data */
-			data = param->data.data;
-			if (len+writep >= PORT_BUFFER) /* data hits the buffer end */
-			{
-				len = len+writep-PORT_BUFFER; /* rest to write in front of buffer */
-				while(writep < PORT_BUFFER) /* write till buffer end */
-					buffer[writep++] += audio_law_to_s32[*(data++)];
-				writep = 0;
-			}
-			while(len--) /* write rest */
-				buffer[writep++] += audio_law_to_s32[*(data++)];
-		} else
-		{
-			/* uncompressed data */
-			data_16 = (signed short *)param->data.data;
-			if (len+writep >= PORT_BUFFER) /* data hits the buffer end */
-			{
-				len = len+writep-PORT_BUFFER; /* rest to write in front of buffer */
-				while(writep < PORT_BUFFER) /* write till buffer end */
-					buffer[writep++] += *(data_16++);
-				writep = 0;
-			}
-			while(len--) /* write rest */
-				buffer[writep++] += *(data_16++);
-		}
-	} else /* else */
-	if (p_record && !must_mix)
-	{
-		/* WE MUST RECORD BUT DO NOT MIX */
-		if (param->data.compressed)
-		{
-			/* compressed data */
-			data = param->data.data;
-			if (len+writep >= PORT_BUFFER) /* data hits the buffer end */
-			{
-				len = len+writep-PORT_BUFFER; /* rest to write in front of buffer */
-				while(writep < PORT_BUFFER) /* write till buffer end */
-					record[writep++] += audio_law_to_s32[*(data++)];
-				writep = 0;
-			}
-			while(len--) /* write rest */
-				record[writep++] += audio_law_to_s32[*(data++)];
-		} else
-		{
-			/* uncompressed data */
-			data_16 = (signed short *)param->data.data;
-			if (len+writep >= PORT_BUFFER) /* data hits the buffer end */
-			{
-				len = len+writep-PORT_BUFFER; /* rest to write in front of buffer */
-				while(writep < PORT_BUFFER) /* write till buffer end */
-					record[writep++] += *(data_16++);
-				writep = 0;
-			}
-			while(len--) /* write rest */
-				record[writep++] += *(data_16++);
-		}
-	} else
-	{
-		/* WE MUST MIX AND MUST RECORD */
-		if (param->data.compressed)
-		{
-			/* compressed data */
-			data = param->data.data;
-			if (len+writep >= PORT_BUFFER) /* data hits the buffer end */
-			{
-				len = len+writep-PORT_BUFFER; /* rest to write in front of buffer */
-				while(writep < PORT_BUFFER) /* write till buffer end */
-				{
-					buffer[writep] += audio_law_to_s32[*data];
-					record[writep++] += audio_law_to_s32[*(data++)];
-				}
-				writep = 0;
-			}
-			while(len--) /* write rest */
-			{
-				buffer[writep] += audio_law_to_s32[*data];
-				record[writep++] += audio_law_to_s32[*(data++)];
-			}
-		} else
-		{
-			/* uncompressed data */
-			data_16 = (signed short *)param->data.data;
-			if (len+writep >= PORT_BUFFER) /* data hits the buffer end */
-			{
-				len = len+writep-PORT_BUFFER; /* rest to write in front of buffer */
-				while(writep < PORT_BUFFER) /* write till buffer end */
-				{
-					buffer[writep] += *data_16;
-					record[writep++] += *(data_16++);
-				}
-				writep = 0;
-			}
-			while(len--) /* write rest */
-			{
-				buffer[writep] += *data_16;
-				record[writep++] += *(data_16++);
-			}
-		}
-	}
-	relation->mixer_writep = writep; /* new write pointer */
-//	PDEBUG(DEBUG_PORT "written data len=%d port=%d (readp=%d, writep=%d, PORT_BUFFER=%d).\n", param->data.len, param->data.port_id, p_mixer_readp, relation->mixer_writep, PORT_BUFFER);
-}
-
-
 /*
  * read from the given file as specified in port_set_tone and return sample data
- * this data is mixed with the user space mixer (if anything mixed) and
- * filled into the buffer as many as given by length.
- * if compressed is true, the result in buffer is alaw/ulaw-compressed
- * otherwhise it is 16 bit audio. in this case the buffer size must be twice the lenght.
- * the length is the number of samples, not bytes in buffer!
+ * silence is appended if sample ends, but only the number of samples with tones are returned
  */
-int Port::read_audio(unsigned char *buffer, int length, int compressed)
+int Port::read_audio(unsigned char *buffer, int length)
 {
 	int l,len;
-	unsigned short temp_buffer[PORT_BUFFER]; /* buffer for up to 32 bit of data */
-	int codec_in; /* current codec to use */
-	unsigned char *buf_in8; /* buffer pointer for alaw/ulaw/8bit data */
-	signed short *buf_in16; /* buffer pointer for alaw/ulaw/8bit data */
-	signed short *buf_out16; /* buffer pointer for outgoing audio data */
-	signed long *mix_buffer, *mix_buffer2, sample; /* pointer to mixer buffer */
-	struct mixer_relation *relation, **relationpointer;
 	int readp;
-	int nodata=0; /* to detect 0-length files */
+	int nodata=0; /* to detect 0-length files and avoid endless reopen */
 	char filename[128];
-	signed short record_buffer[PORT_BUFFER<<1], *rec_buffer; /* buffer of recorded part which will be written (*2 for stereo) */
-	unsigned char *rec8_buffer; /* used to send 8-bit audio (wave-8bit, law) */
 	int tone_left_before; /* temp variable to determine the change in p_tone_left */
 
 	/* nothing */
 	if (length == 0)
 		return(0);
 
-	/* just in case, we get too much to do */
-	if (length > PORT_BUFFER-1)
-		length = PORT_BUFFER-1;
-
 	len = length;
-	buf_in8 = (unsigned char *)temp_buffer;
-	buf_in16 = (signed short *)temp_buffer;
-
 	codec_in = p_tone_codec;
 
 	/* if there is no tone set, use silence */
 	if (p_tone_name[0] == 0)
 	{
-		codec_in = CODEC_LAW;
 rest_is_silence:
-		switch(codec_in)
-		{
-			case CODEC_LAW:
-			memset(buf_in8, (options.law=='a')?0x2a:0xff, len); /* silence */
-			break;
-
-			case CODEC_MONO:
-			case CODEC_8BIT:
-			case CODEC_STEREO:
-			memset(buf_in16, 0, len<<1); /* silence */
-			break;
-
-			default:
-			PERROR("Software error: no codec during silence\n");
-			exit(-1);
-		}
-		goto mix_to_buffer;
+		memset(buffer, (options.law=='a')?0x2a:0xff, len); /* silence */
+		goto done;
 	}
 
 	/* if the file pointer is not open, we open it */
@@ -877,8 +529,6 @@ rest_is_silence:
 			}
 			fhuse++;
 		}
-		codec_in = p_tone_codec;
-//printf("\n\ncodec=%d\n\n\n", p_tone_codec);
 		PDEBUG(DEBUG_PORT, "PORT(%s) opening %stone: %s\n", p_name, p_tone_fetched?"fetched ":"", filename);
 	}
 
@@ -887,69 +537,19 @@ read_more:
 	tone_left_before = p_tone_left;
 	if (p_tone_fh >= 0)
 	{
-		switch(codec_in)
-		{
-			case CODEC_LAW:
-			l = read_tone(p_tone_fh, buf_in8, codec_in, len, p_tone_size, &p_tone_left, p_tone_speed);
-			if (l<0 || l>len) /* paranoia */
-				l=0;
-			buf_in8 += l;
-			len -= l;
-			break;
-
-			case CODEC_8BIT:
-			l = read_tone(p_tone_fh, buf_in16, codec_in, len, p_tone_size, &p_tone_left, p_tone_speed);
-			if (l<0 || l>len) /* paranoia */
-				l=0;
-			buf_in16 += l;
-			len -= l;
-			break;
-
-			case CODEC_MONO:
-			l = read_tone(p_tone_fh, buf_in16, codec_in, len, p_tone_size, &p_tone_left, p_tone_speed);
-			if (l<0 || l>len) /* paranoia */
-				l=0;
-			buf_in16 += l;
-			len -= l;
-			break;
-
-			case CODEC_STEREO:
-			l = read_tone(p_tone_fh, buf_in16, codec_in, len, p_tone_size, &p_tone_left, p_tone_speed);
-			if (l<0 || l>len) /* paranoia */
-				l=0;
-			buf_in16 += l;
-			len -= l;
-			break;
-
-			default:
-			PERROR("Software error: current tone reading has no codec\n");
-			exit(-1);
-		}
+		l = read_tone(p_tone_fh, buffer, p_tone_codec, len, p_tone_size, &p_tone_left, p_tone_speed);
+		if (l<0 || l>len) /* paranoia */
+			l=0;
+		buffer += l;
+		len -= l;
 	}
 	if (p_tone_fetched)
 	{
-		switch(codec_in)
-		{
-			case CODEC_LAW:
-			l = read_tone_fetched(&p_tone_fetched, buf_in8, codec_in, len, p_tone_size, &p_tone_left, p_tone_speed);
-			if (l<0 || l>len) /* paranoia */
-				l=0;
-			buf_in8 += l;
-			len -= l;
-			break;
-
-			case CODEC_MONO:
-			l = read_tone_fetched(&p_tone_fetched, buf_in16, codec_in, len, p_tone_size, &p_tone_left, p_tone_speed);
-			if (l<0 || l>len) /* paranoia */
-				l=0;
-			buf_in16 += l;
-			len -= l;
-			break;
-
-			default:
-			PERROR("Software error: current tone reading has no codec\n");
-			exit(-1);
-		}
+		l = read_tone_fetched(&p_tone_fetched, buffer, len, p_tone_size, &p_tone_left, p_tone_speed);
+		if (l<0 || l>len) /* paranoia */
+			l=0;
+		buffer += l;
+		len -= l;
 	}
 
 	/* if counter is enabled, we check if we have a change */
@@ -968,7 +568,7 @@ read_more:
 	}
 
 	if (len==0)
-		goto mix_to_buffer;
+		goto done;
 
 	if (p_tone_fh >= 0)
 	{
@@ -1031,688 +631,27 @@ try_loop:
 		}
 		fhuse++;
 	}
-	codec_in = p_tone_codec;
 	nodata++;
 	PDEBUG(DEBUG_PORT, "PORT(%s) opening %stone: %s\n", p_name, p_tone_fetched?"fetched ":"", filename);
 
 	/* now we have opened the loop */
 	goto read_more;
 
-	/* **********
-	 * now we mix
-	 * we take the buffer content and mix the mixer_buffer to what we got
-	 */ 
-mix_to_buffer:
-	/* release all writepointer which will underrun, since writing of
-	 * remote port data is too slow
-	 */
-	relation = p_mixer_rel;
-	readp = p_mixer_readp;
-	relationpointer = &(p_mixer_rel);
-	while(relation) /* if no relation, this is skipped */
-	{
-		/* NOTE: if writep and readp are equal, the distance ist max
-		 * == PORT_BUFFER
-		 */
-		if (((relation->mixer_writep-readp-1+PORT_BUFFER)%PORT_BUFFER)+1 <= length) /* underrun */
-		{
-			/* remove port relation in order to resync.
-			 * this is also caused by ports which do not transmit
-			 * anymore.
-			 */
-#ifdef MIXER_DEBUG
-			PERROR("PORT(%s) Buffer underrun, source port is sending too slow or stopped sending, removing relation. (readp=%d, writep=%d, PORT_BUFFER=%d)\n", p_name, readp, relation->mixer_writep, PORT_BUFFER);
-#endif
-			
-			*relationpointer = relation->next;
-			memset(relation, 0, sizeof(struct mixer_relation));
-			free(relation);
-			pmemuse--;
-			relation = *relationpointer;
-			continue;
-		}
-		relationpointer = &(relation->next);
-		relation = relation->next;
-	}
-
-	/* if we do recording, we write the record data and the buffer data to the record fp and increment record_count */
-	if (p_record)
-	switch (p_record_type)
-	{
-		case CODEC_MONO:
-		/* convert from mixer to uncompressed 16 bit mono audio */
-		switch(codec_in)
-		{
-			case CODEC_MONO:
-			case CODEC_STEREO:
-			case CODEC_8BIT:
-			len = length;
-			mix_buffer = p_record_buffer;
-			rec_buffer = record_buffer;
-			buf_in16 = (signed short *)temp_buffer;
-			if (len+readp >= PORT_BUFFER) /* data hits the buffer end */
-			{
-				len = len+readp-PORT_BUFFER; /* rest to read from buffer start */
-				while(readp < PORT_BUFFER)
-				{	/* mix till buffer end */
-					sample = mix_buffer[readp]+*(buf_in16++);
-					mix_buffer[readp++] = 0;
-					if (sample < -32767)
-						sample = -32767;
-					if (sample > 32767)
-						sample = 32767;
-					*(rec_buffer++) = sample;
-				}
-				readp = 0;
-			}
-			while(len--) /* write rest */
-			{	/* mix till buffer end */
-				sample = mix_buffer[readp]+*(buf_in16++);
-				mix_buffer[readp++] = 0;
-				if (sample < -32767)
-					sample = -32767;
-				if (sample > 32767)
-					sample = 32767;
-				*(rec_buffer++) = sample;
-			}
-
-			/* restore (changed) read pointer for further use */
-			readp = p_mixer_readp;
-
-			/* now write the rec_buffer to the file */
-			if (p_record_skip)
-			{
-				p_record_skip -= length;
-				if (p_record_skip < 0)
-					p_record_skip = 0;
-			} else
-			{
-				fwrite(record_buffer, (length<<1), 1, p_record);
-				p_record_length = (length<<1) + p_record_length;
-			}
-			break;
-
-			case CODEC_LAW:
-			len = length;
-			mix_buffer = p_record_buffer;
-			rec_buffer = record_buffer;
-			buf_in8 = (unsigned char *)temp_buffer;
-			if (len+readp >= PORT_BUFFER) /* data hits the buffer end */
-			{
-				len = len+readp-PORT_BUFFER; /* rest to read from buffer start */
-				while(readp < PORT_BUFFER)
-				{	/* mix till buffer end */
-					sample = mix_buffer[readp]+audio_law_to_s32[*(buf_in8++)];
-					mix_buffer[readp++] = 0;
-					if (sample < -32767)
-						sample = -32767;
-					if (sample > 32767)
-						sample = 32767;
-					*(rec_buffer++) = sample;
-				}
-				readp = 0;
-			}
-			while(len--) /* write rest */
-			{	/* mix till buffer end */
-				sample = mix_buffer[readp]+audio_law_to_s32[*(buf_in8++)];
-				mix_buffer[readp++] = 0;
-				if (sample < -32767)
-					sample = -32767;
-				if (sample > 32767)
-					sample = 32767;
-				*(rec_buffer++) = sample;
-			}
-
-			/* restore (changed) read pointer for further use */
-			readp = p_mixer_readp;
-
-			/* now write the rec_buffer to the file */
-			if (p_record_skip)
-			{
-				p_record_skip -= length;
-				if (p_record_skip < 0)
-					p_record_skip = 0;
-			} else
-			{
-				fwrite(record_buffer, (length<<1), 1, p_record);
-				p_record_length = (length<<1) + p_record_length;
-			}
-			break;
-
-		}
-		break;
-
-		case CODEC_STEREO:
-		/* convert from mixer to uncompressed 16 bit stereo audio */
-		switch(codec_in)
-		{
-			case CODEC_MONO:
-			case CODEC_STEREO:
-			case CODEC_8BIT:
-			len = length;
-			mix_buffer = p_record_buffer;
-			mix_buffer2 = p_stereo_buffer;
-			rec_buffer = record_buffer;
-			buf_in16 = (signed short *)temp_buffer;
-			if (len+readp >= PORT_BUFFER) /* data hits the buffer end */
-			{
-				len = len+readp-PORT_BUFFER; /* rest to read from buffer start */
-				while(readp < PORT_BUFFER)
-				{	/* mix till buffer end */
-					sample = mix_buffer[readp]+*(buf_in16++);
-					mix_buffer[readp] = 0;
-					if (sample < -32767)
-						sample = -32767;
-					if (sample > 32767)
-						sample = 32767;
-					*(rec_buffer++) = sample;
-
-					*(rec_buffer++) = mix_buffer2[readp];
-					mix_buffer2[readp++] = 0;
-				}
-				readp = 0;
-			}
-			while(len--) /* write rest */
-			{	/* mix till buffer end */
-				sample = mix_buffer[readp]+*(buf_in16++);
-				mix_buffer[readp] = 0;
-				if (sample < -32767)
-					sample = -32767;
-				if (sample > 32767)
-					sample = 32767;
-				*(rec_buffer++) = sample;
-				*(rec_buffer++) = mix_buffer2[readp];
-				mix_buffer2[readp++] = 0;
-			}
-
-			/* restore (changed) read pointer for further use */
-			readp = p_mixer_readp;
-
-			/* now write the rec_buffer to the file */
-			if (p_record_skip)
-			{
-				p_record_skip -= length;
-				if (p_record_skip < 0)
-					p_record_skip = 0;
-			} else
-			{
-				fwrite(record_buffer, (length<<2), 1, p_record);
-				p_record_length = (length<<2) + p_record_length;
-			}
-			break;
-
-			case CODEC_LAW:
-			len = length;
-			mix_buffer = p_record_buffer;
-			mix_buffer2 = p_stereo_buffer;
-			rec_buffer = record_buffer;
-			buf_in8 = (unsigned char *)temp_buffer;
-			if (len+readp >= PORT_BUFFER) /* data hits the buffer end */
-			{
-				len = len+readp-PORT_BUFFER; /* rest to read from buffer start */
-				while(readp < PORT_BUFFER)
-				{	/* mix till buffer end */
-					sample = mix_buffer[readp]+audio_law_to_s32[*(buf_in8++)];
-					mix_buffer[readp] = 0;
-					if (sample < -32767)
-						sample = -32767;
-					if (sample > 32767)
-						sample = 32767;
-					*(rec_buffer++) = sample;
-
-					*(rec_buffer++) = mix_buffer2[readp];
-					mix_buffer2[readp++] = 0;
-				}
-				readp = 0;
-			}
-			while(len--) /* write rest */
-			{	/* mix till buffer end */
-				sample = mix_buffer[readp]+audio_law_to_s32[*(buf_in8++)];
-				mix_buffer[readp] = 0;
-				if (sample < -32767)
-					sample = -32767;
-				if (sample > 32767)
-					sample = 32767;
-				*(rec_buffer++) = sample;
-				*(rec_buffer++) = mix_buffer2[readp];
-				mix_buffer2[readp++] = 0;
-			}
-
-			/* restore (changed) read pointer for further use */
-			readp = p_mixer_readp;
-
-			/* now write the rec_buffer to the file */
-			if (p_record_skip)
-			{
-				p_record_skip -= length;
-				if (p_record_skip < 0)
-					p_record_skip = 0;
-			} else
-			{
-				fwrite(record_buffer, (length<<2), 1, p_record);
-				p_record_length = (length<<2) + p_record_length;
-			}
-			break;
-		}
-		break;
-
-		case CODEC_8BIT:
-		/* convert from mixer to uncompressed 8 bit mono audio */
-		switch(codec_in)
-		{
-			case CODEC_MONO:
-			case CODEC_STEREO:
-			case CODEC_8BIT:
-			len = length;
-			mix_buffer = p_record_buffer;
-			rec8_buffer = (unsigned char *)record_buffer;
-			buf_in16 = (signed short *)temp_buffer;
-			if (len+readp >= PORT_BUFFER) /* data hits the buffer end */
-			{
-				len = len+readp-PORT_BUFFER; /* rest to read from buffer start */
-				while(readp < PORT_BUFFER)
-				{	/* mix till buffer end */
-					sample = mix_buffer[readp]+*(buf_in16++);
-					mix_buffer[readp++] = 0;
-					if (sample < -32767)
-						sample = -32767;
-					if (sample > 32767)
-						sample = 32767;
-					*(rec8_buffer++) = (sample>>8)+0x80;
-				}
-				readp = 0;
-			}
-			while(len--) /* write rest */
-			{	/* mix till buffer end */
-				sample = mix_buffer[readp]+*(buf_in16++);
-				mix_buffer[readp++] = 0;
-				if (sample < -32767)
-					sample = -32767;
-				if (sample > 32767)
-					sample = 32767;
-				*(rec8_buffer++) = (sample>>8)+0x80;
-			}
-
-			/* restore (changed) read pointer for further use */
-			readp = p_mixer_readp;
-
-			/* now write the rec_buffer to the file */
-			if (p_record_skip)
-			{
-				p_record_skip -= length;
-				if (p_record_skip < 0)
-					p_record_skip = 0;
-			} else
-			{
-				fwrite(record_buffer, (length), 1, p_record);
-				p_record_length = (length) + p_record_length;
-			}
-			break;
-
-			case CODEC_LAW:
-			len = length;
-			mix_buffer = p_record_buffer;
-			rec8_buffer = (unsigned char *)record_buffer;
-			buf_in8 = (unsigned char *)temp_buffer;
-			if (len+readp >= PORT_BUFFER) /* data hits the buffer end */
-			{
-				len = len+readp-PORT_BUFFER; /* rest to read from buffer start */
-				while(readp < PORT_BUFFER)
-				{	/* mix till buffer end */
-					sample = mix_buffer[readp]+audio_law_to_s32[*(buf_in8++)];
-					mix_buffer[readp++] = 0;
-					if (sample < -32767)
-						sample = -32767;
-					if (sample > 32767)
-						sample = 32767;
-					*(rec8_buffer++) = (sample>>8)+0x80;
-				}
-				readp = 0;
-			}
-			while(len--) /* write rest */
-			{	/* mix till buffer end */
-				sample = mix_buffer[readp]+audio_law_to_s32[*(buf_in8++)];
-				mix_buffer[readp++] = 0;
-				if (sample < -32767)
-					sample = -32767;
-				if (sample > 32767)
-					sample = 32767;
-				*(rec8_buffer++) = (sample>>8)+0x80;
-			}
-
-			/* restore (changed) read pointer for further use */
-			readp = p_mixer_readp;
-
-			/* now write the rec_buffer to the file */
-			if (p_record_skip)
-			{
-				p_record_skip -= length;
-				if (p_record_skip < 0)
-					p_record_skip = 0;
-			} else
-			{
-				fwrite(record_buffer, (length), 1, p_record);
-				p_record_length = (length) + p_record_length;
-			}
-			break;
-
-		}
-		break;
-
-		case CODEC_LAW:
-		case CODEC_OFF: /* if no codec is specified, the recorded data will be stored as LAW */
-		/* convert from mixer to law */
-		switch(codec_in)
-		{
-			case CODEC_MONO:
-			case CODEC_STEREO:
-			case CODEC_8BIT:
-			len = length;
-			mix_buffer = p_record_buffer;
-			rec8_buffer = (unsigned char *)record_buffer;
-			buf_in16 = (signed short *)temp_buffer;
-			if (len+readp >= PORT_BUFFER) /* data hits the buffer end */
-			{
-				len = len+readp-PORT_BUFFER; /* rest to read from buffer start */
-				while(readp < PORT_BUFFER)
-				{	/* mix till buffer end */
-					sample = mix_buffer[readp]+*(buf_in16++);
-					mix_buffer[readp++] = 0;
-					if (sample < -32767)
-						sample = -32767;
-					if (sample > 32767)
-						sample = 32767;
-					*(rec8_buffer++) = audio_s16_to_law[sample & 0xffff];
-				}
-				readp = 0;
-			}
-			while(len--) /* write rest */
-			{	/* mix till buffer end */
-				sample = mix_buffer[readp]+*(buf_in16++);
-				mix_buffer[readp++] = 0;
-				if (sample < -32767)
-					sample = -32767;
-				if (sample > 32767)
-					sample = 32767;
-				*(rec8_buffer++) = audio_s16_to_law[sample & 0xffff];
-			}
-
-			/* restore (changed) read pointer for further use */
-			readp = p_mixer_readp;
-
-			/* now write the rec_buffer to the file */
-			if (p_record_skip)
-			{
-				p_record_skip -= length;
-				if (p_record_skip < 0)
-					p_record_skip = 0;
-			} else
-			{
-				fwrite(record_buffer, (length), 1, p_record);
-				p_record_length = (length) + p_record_length;
-			}
-			break;
-
-			case CODEC_LAW:
-			len = length;
-			mix_buffer = p_record_buffer;
-			rec8_buffer = (unsigned char *)record_buffer;
-			buf_in8 = (unsigned char *)temp_buffer;
-			if (len+readp >= PORT_BUFFER) /* data hits the buffer end */
-			{
-				len = len+readp-PORT_BUFFER; /* rest to read from buffer start */
-				while(readp < PORT_BUFFER)
-				{	/* mix till buffer end */
-					sample = mix_buffer[readp]+audio_law_to_s32[*(buf_in8++)];
-					mix_buffer[readp++] = 0;
-					if (sample < -32767)
-						sample = -32767;
-					if (sample > 32767)
-						sample = 32767;
-					*(rec8_buffer++) = audio_s16_to_law[sample & 0xffff];
-				}
-				readp = 0;
-			}
-			while(len--) /* write rest */
-			{	/* mix till buffer end */
-				sample = mix_buffer[readp]+audio_law_to_s32[*(buf_in8++)];
-				mix_buffer[readp++] = 0;
-				if (sample < -32767)
-					sample = -32767;
-				if (sample > 32767)
-					sample = 32767;
-				*(rec8_buffer++) = audio_s16_to_law[sample & 0xffff];
-			}
-
-			/* restore (changed) read pointer for further use */
-			readp = p_mixer_readp;
-
-			/* now write the rec_buffer to the file */
-			if (p_record_skip)
-			{
-				p_record_skip -= length;
-				if (p_record_skip < 0)
-					p_record_skip = 0;
-			} else
-			{
-				fwrite(record_buffer, (length), 1, p_record);
-				p_record_length = (length) + p_record_length;
-			}
-			break;
-		}
-		break;
-	}
-
-	/* if we have no transmitting relation, we do not need read mixer */
-	if (!p_mixer_rel)
-	{	/* nothing mixed to(no rel), so we are just done */
-		if (compressed)
-		{
-			/* compress to law */
-			len = length;
-			buf_in8 = (unsigned char *)temp_buffer;
-			buf_in16 = (signed short *)temp_buffer;
-			buf_out16 = (signed short *)buffer;
-			switch(codec_in)
-			{
-				case CODEC_MONO:
-				case CODEC_STEREO:
-				case CODEC_8BIT:
-				while(len--)
-					*(buffer++) = audio_s16_to_law[*(buf_in16++) & 0xffff];
-				break;
-
-				case CODEC_LAW:
-				memcpy(buffer, temp_buffer, length);
-				break;
-
-				default:
-				PERROR("Software error: current tone for unmixed & uncompressed, has no codec\n");
-				exit(-1);
-			}
-		} else
-		{
-			/* uncompress law files */
-			len = length;
-			buf_in8 = (unsigned char *)temp_buffer;
-			buf_in16 = (signed short *)temp_buffer;
-			buf_out16 = (signed short *)buffer;
-			switch(codec_in)
-			{
-				case CODEC_MONO:
-				case CODEC_STEREO:
-				case CODEC_8BIT:
-				while(len--)
-					(*(buf_out16++)) = *(buf_in16++);
-				break;
-
-				case CODEC_LAW:
-				while(len--)
-					(*(buf_out16++)) = audio_law_to_s32[*(buf_in8++)];
-				break;
-
-				default:
-				PERROR("Software error: current tone for unmixed & uncompressed, has no codec\n");
-				exit(-1);
-			}
-		}
-		return(length);
-	}
-
-//	PDEBUG(DEBUG_PORT, "PORT(%s) mixing %d bytes. (readp=%d, PORT_BUFFER=%d)\n", p_name, length, readp, PORT_BUFFER);
-	/* now we got our stuff and we'll mix it baby */
-
-	len = length;
-	mix_buffer = p_mixer_buffer;
-	if (compressed)
-	{
-		/* convert from mixer to compressed law data */
-		switch(codec_in)
-		{
-			case CODEC_MONO:
-			case CODEC_STEREO:
-			case CODEC_8BIT:
-			buf_in16 = (signed short *)temp_buffer;
-			if (len+readp >= PORT_BUFFER) /* data hits the buffer end */
-			{
-				len = len+readp-PORT_BUFFER; /* rest to read from buffer start */
-				while(readp < PORT_BUFFER)
-				{	/* mix till buffer end */
-					sample = mix_buffer[readp]+*(buf_in16++);
-					mix_buffer[readp++] = 0;
-					if (sample < -32767)
-						sample = -32767;
-					if (sample > 32767)
-						sample = 32767;
-					*(buffer++) = audio_s16_to_law[sample & 0xffff];
-				}
-				readp = 0;
-			}
-			while(len--) /* write rest */
-			{	/* mix till buffer end */
-				sample = mix_buffer[readp]+*(buf_in16++);
-				mix_buffer[readp++] = 0;
-				if (sample < -32767)
-					sample = -32767;
-				if (sample > 32767)
-					sample = 32767;
-				*(buffer++) = audio_s16_to_law[sample & 0xffff];
-			}
-			break;
-
-			case CODEC_LAW:
-			buf_in8 = (unsigned char *)temp_buffer;
-			if (len+readp >= PORT_BUFFER) /* data hits the buffer end */
-			{
-				len = len+readp-PORT_BUFFER; /* rest to read from buffer start */
-				while(readp < PORT_BUFFER)
-				{	/* mix till buffer end */
-					sample = mix_buffer[readp]+audio_law_to_s32[*(buf_in8++)];
-					mix_buffer[readp++] = 0;
-					if (sample < -32767)
-						sample = -32767;
-					if (sample > 32767)
-						sample = 32767;
-					*(buffer++) = audio_s16_to_law[sample & 0xffff];
-				}
-				readp = 0;
-			}
-			while(len--) /* write rest */
-			{	/* mix till buffer end */
-				sample = mix_buffer[readp]+audio_law_to_s32[*(buf_in8++)];
-				mix_buffer[readp++] = 0;
-				if (sample < -32767)
-					sample = -32767;
-				if (sample > 32767)
-					sample = 32767;
-				*(buffer++) = audio_s16_to_law[sample & 0xffff];
-			}
-			break;
-
-			default:
-			PERROR("Software error: current tone for compressed data has no codec\n");
-			exit(-1);
-		}
-	} else
-	{
-		/* convert from mixer to uncompressed 16 bit audio */
-		switch(codec_in)
-		{
-			case CODEC_MONO:
-			case CODEC_STEREO:
-			case CODEC_8BIT:
-			buf_in16 = (signed short *)temp_buffer;
-			buf_out16 = (signed short *)buffer;
-			if (len+readp >= PORT_BUFFER) /* data hits the buffer end */
-			{
-				len = len+readp-PORT_BUFFER; /* rest to read from buffer start */
-				while(readp < PORT_BUFFER)
-				{	/* mix till buffer end */
-					sample = mix_buffer[readp]+*(buf_in16++);
-					mix_buffer[readp++] = 0;
-					if (sample < -32767)
-						sample = -32767;
-					if (sample > 32767)
-						sample = 32767;
-					*(buf_out16++) = sample;
-				}
-				readp = 0;
-			}
-			while(len--) /* write rest */
-			{	/* mix till buffer end */
-				sample = mix_buffer[readp]+*(buf_in16++);
-				mix_buffer[readp++] = 0;
-				if (sample < -32767)
-					sample = -32767;
-				if (sample > 32767)
-					sample = 32767;
-				*(buf_out16++) = sample;
-			}
-			break;
-
-			case CODEC_LAW:
-			buf_in8 = (unsigned char *)temp_buffer;
-			buf_out16 = (signed short *)buffer;
-			if (len+readp >= PORT_BUFFER) /* data hits the buffer end */
-			{
-				len = len+readp-PORT_BUFFER; /* rest to read from buffer start */
-				while(readp < PORT_BUFFER)
-				{	/* mix till buffer end */
-					sample = mix_buffer[readp]+audio_law_to_s32[*(buf_in8++)];
-					mix_buffer[readp++] = 0;
-					if (sample < -32767)
-						sample = -32767;
-					if (sample > 32767)
-						sample = 32767;
-					*(buf_out16++) = sample;
-				}
-				readp = 0;
-			}
-			while(len--) /* write rest */
-			{	/* mix till buffer end */
-				sample = mix_buffer[readp]+audio_law_to_s32[*(buf_in8++)];
-				mix_buffer[readp++] = 0;
-				if (sample < -32767)
-					sample = -32767;
-				if (sample > 32767)
-					sample = 32767;
-				*(buf_out16++) = sample;
-			}
-			break;
-
-			default:
-			PERROR("Software error: current tone for uncompressed data has no codec\n");
-			exit(-1);
-		}
-	}
+done:
+	return(length-len);
+}
 
-	p_mixer_readp = readp; /* new read pointer */
 
-	return(length);
+/*
+ * dummy for transmit function, since this must be inherited
+ */
+void Port::transmit(unsigned char *buffer, int length, int tonelength)
+{
 }
 
 
-/* dummy handler */
+/* port handler:
+ * process transmission clock */
 int Port::handler(void)
 {
 	return(0);
@@ -1733,9 +672,8 @@ int Port::message_epoint(unsigned long epoint_id, int message_id, union paramete
 		set_tone(param->tone.dir,param->tone.name);
 		return(1);
 
-		case MESSAGE_DATA:
-//printf("port=%s, epoint=%d\n",p_cardname, epoint->e_serial);
-		mixer(param);
+		case MESSAGE_DATA: /* tx-data from upper layer */
+		fromup(param->data.data, param->data.len);
 		return(1);
 
 		case MESSAGE_VBOX_TONE: /* play tone of answering machine */
@@ -1759,34 +697,6 @@ int Port::message_epoint(unsigned long epoint_id, int message_id, union paramete
 }
 
 
-/*
- * special function generate individual isdn debug logs
- */
-void Port::printisdn(char *fmt, ...)
-{
-	char buffer[4096];
-	char name[128];
-	va_list args;
-	FILE *fp;
-
-	va_start(args,fmt);
-	VUNPRINT(buffer,sizeof(buffer)-1,fmt,args);
-	buffer[sizeof(buffer)-1]=0;
-	va_end(args);
-
-	PDEBUG_RUNTIME(NULL, 0, DEBUG_PORT, "PORT(%s serial=%ld): %s\n", p_name, p_serial, buffer);
-	if (options.deb & DEBUG_LOG)
-	{
-		SPRINT(name, "%s/debug_%s.log", INSTALL_DATA, p_name);
-		if (!(fp = fopen(name, "a")))
-			return;
-	
-		fprintf(fp, "%04d.%02d.%02d %02d:%02d:%02d %s(%ld): %s", now_tm->tm_year+1900, now_tm->tm_mon+1, now_tm->tm_mday, now_tm->tm_hour, now_tm->tm_min, now_tm->tm_sec, p_name, p_serial, buffer);
-		fclose(fp);
-	}
-}
-
-
 /* wave header structure */
 struct fmt {
 	unsigned short	stereo; /* 1 = mono, 2 = stereo */
@@ -1803,18 +713,18 @@ struct fmt {
  * written before close, because we do not know the size yet)
  * type=1 record annoucement,  type=0 record audio stream, type=2 record vbox
  */
-int Port::open_record(int type, int vbox, int skip, char *terminal, int anon_ignore, char *vbox_email, int vbox_email_file)
+int Port::open_record(int type, int vbox, int skip, char *extension, int anon_ignore, char *vbox_email, int vbox_email_file)
 {
 	/* RIFFxxxxWAVEfmt xxxx(fmt-size)dataxxxx... */
 	char dummyheader[8+4+8+sizeof(fmt)+8];
 	char filename[256];
 
-	if (!terminal)
+	if (!extension)
 	{
-		PERROR("Port(%d) not a terminal\n", p_serial);
+		PERROR("Port(%d) not an extension\n", p_serial);
 		return(0);
 	}
-	SCPY(p_record_extension, terminal);
+	SCPY(p_record_extension, extension);
 	p_record_anon_ignore = anon_ignore;
 	SCPY(p_record_vbox_email, vbox_email);
 	p_record_vbox_email_file = vbox_email_file;
@@ -2064,12 +974,6 @@ void Port::close_record(int beep)
 		else
 			SPRINT(filename, "%s_%s-%s.isdn", p_record_filename, callerid, number);
 		break;
-
-		default:
-		if (p_record_vbox == 1)
-			SPRINT(filename, "%s.unknown", p_record_filename);
-		else
-			SPRINT(filename, "%s_%s-%s.unknown", p_record_filename, callerid, number);
 	}
 
 	fclose(p_record);
@@ -2113,4 +1017,256 @@ void Port::close_record(int beep)
 }
 
 
+/*
+ * recording function
+ * Records all data from down and from up into one single stream.
+ * Both streams may have gaps or jitter.
+ * A Jitter buffer for both streams is used to compensate jitter.
+ * 
+ * If one stream (dir) received packets, they are stored to a
+ * buffer to wait for the other stream (dir), so both streams can 
+ * be combined. If the buffer is full, it's read pointer is written
+ * without mixing stream.
+ * A flag is used to indicate what stream is currently in buffer.
+ *
+ * NOTE: First stereo sample (odd) is from down, second is from up.
+ */
+alle buffer initialisieren
+record nur aufrufen, wenn recorded wird.
+restlicher buffer wegschreiben beim schliessen
+void Port::record(char *data, int length, int dir_fromup)
+{
+	unsigned char write_buffer[1024], *d;
+	signed short *s;
+	int r, w;
+	signed long sample;
+
+	/* no recording */
+	if (!p_record || !length)
+		return;
+
+	free = ((p_record_buffer_readp - p_record_buffer_writep - 1) & RECORD_BUFFER_MASK);
+
+	/* the buffer stores the same data stream */
+	if (dir_fromup == p_record_buffer_dir)
+	{
+		same_again:
+
+		/* first write what we can to the buffer */
+		while(free && length)
+		{
+			p_record_buffer[p_record_buffer_writep] = audio_law_to_s32(*data++);
+			p_record_buffer_writep = (p_record_buffer_writep + 1) & RECORD_BUFFER_MASK;
+			free--;
+			length--;
+		}
+		/* all written, so we return */
+		if (!length)
+			return;
+		/* still data left, buffer is full, so we need to write to file */
+		switch(p_record_type)
+		{
+			case CODEC_MONO:
+			s = (signed short *)write_buffer;
+			i = 0;
+			while(i < 256)
+			{
+				*s++ = p_record_buffer[p_record_buffer_readp];
+				p_record_buffer_readp = (p_record_buffer_readp + 1) & RECORD_BUFFER_MASK;
+				i++;
+			}
+			fwrite(write_buffer, 512, 1, p_record);
+			break;
+
+			case CODEC_STEREO:
+			s = (signed short *)write_buffer;
+			if (p_record_buffer_dir)
+			{
+				i = 0;
+				while(i < 256)
+				{
+					*s++ = 0; /* nothing from down */
+					*s++ = p_record_buffer[p_record_buffer_readp];
+					p_record_buffer_readp = (p_record_buffer_readp + 1) & RECORD_BUFFER_MASK;
+					i++;
+				}
+			} else
+			{
+				i = 0;
+				while(i < 256)
+				{
+					*s++ = p_record_buffer[p_record_buffer_readp];
+					*s++ = 0; /* nothing from up */
+					p_record_buffer_readp = (p_record_buffer_readp + 1) & RECORD_BUFFER_MASK;
+					i++;
+				}
+			}
+			fwrite(write_buffer, 1024, 1, p_record);
+			break;
+
+			case CODEC_8BIT:
+			d = write_buffer;
+			i = 0;
+			while(i < 256)
+			{
+				*d++ = (p_record_buffer[p_record_buffer_readp]+0x8000) >> 8;
+				p_record_buffer_readp = (p_record_buffer_readp + 1) & RECORD_BUFFER_MASK;
+				i++;
+			}
+			fwrite(write_buffer, 512, 1, p_record);
+			break;
+
+			case CODEC_LAW:
+			d = write_buffer;
+			i = 0;
+			while(i < 256)
+			{
+				*d++ = audio_s16_to_law[p_record_buffer[p_record_buffer_readp] & 0xffff];
+				p_record_buffer_readp = (p_record_buffer_readp + 1) & RECORD_BUFFER_MASK;
+				i++;
+			}
+			fwrite(write_buffer, 256, 1, p_record);
+			break;
+		}
+		/* because we still have data, we write again */
+		free += sizeof(write_buffer);
+		goto same_again;
+	}
+
+	/* the buffer store the other stream */
+	different_again:
+	
+	/* if buffer empty, change it */
+	if (p_record_buffer_readp == p_record_buffer_writep)
+	{
+		p_record_buffer_dir = dir_fromup;
+		goto same_again;
+	}
+	/* how much data can we mix ? */
+	ii = (p_record_buffer_writep - p_record_buffer_readp) & RECORD_BUFFER_MASK;
+	if (length < ii)
+		ii = length;
+	/* write data mixed with the buffer */
+	switch(p_record_type)
+	{
+		case CODEC_MONO:
+		s = (signed short *)write_buffer;
+		i = 0;
+		while(i < ii)
+		{
+			sample = p_record_buffer[p_record_buffer_readp]
+				+ audio_law_to_s32(*data++);
+			p_record_buffer_readp = (p_record_buffer_readp + 1) & RECORD_BUFFER_MASK;
+			if (sample < 32767)
+				sample = -32767;
+			if (sample > 32768)
+				sample = 32768;
+			*s++ = sample;
+			i++;
+		}
+		fwrite(write_buffer, ii<<1, 1, p_record);
+		break;
+		
+		case CODEC_STEREO:
+		s = (signed short *)write_buffer;
+		if (p_record_buffer_dir)
+		{
+			i = 0;
+			while(i < ii)
+			{
+				*s++ = audio_law_to_s32(*data++);
+				*s++ = p_record_buffer[p_record_buffer_readp];
+				p_record_buffer_readp = (p_record_buffer_readp + 1) & RECORD_BUFFER_MASK;
+				i++;
+			}
+		} else
+		{
+			i = 0;
+			while(i < ii)
+			{
+				*s++ = p_record_buffer[p_record_buffer_readp];
+				*s++ = audio_law_to_s32(*data++);
+				i++;
+			}
+		}
+		fwrite(write_buffer, ii<<2, 1, p_record);
+		break;
+		
+		case CODEC_8BIT:
+		d = write_buffer;
+		i = 0;
+		while(i < ii)
+		{
+			sample = p_record_buffer[p_record_buffer_readp]
+				+ audio_law_to_s32(*data++);
+			p_record_buffer_readp = (p_record_buffer_readp + 1) & RECORD_BUFFER_MASK;
+			if (sample < 32767)
+				sample = -32767;
+			if (sample > 32768)
+				sample = 32768;
+			*d++ = (sample+0x8000) >> 8;
+			i++;
+		}
+		fwrite(write_buffer, ii, 1, p_record);
+		break;
+		
+		case CODEC_LAW:
+		d = write_buffer;
+		i = 0;
+		while(i < ii)
+		{
+			sample = p_record_buffer[p_record_buffer_readp]
+				+ audio_law_to_s32(*data++);
+			p_record_buffer_readp = (p_record_buffer_readp + 1) & RECORD_BUFFER_MASK;
+			if (sample < 32767)
+				sample = -32767;
+			if (sample > 32768)
+				sample = 32768;
+			*d++ = audio_s16_to_law[sample & 0xffff];
+			i++;
+		}
+		fwrite(write_buffer, ii, 1, p_record);
+		break;
+	}
+	length -= ii;
+	/* data, but buffer empty */
+	if (length)
+	{
+		p_record_buffer_dir = dir_fromup;
+		goto same_again;
+	}
+	/* no data (maybe buffer) */
+	return;
+
+}
+
+
+/*
+ * enque data from upper buffer
+ */
+iniialisieren der werte
+void Port::txfromup(unsigned char *data, int length)
+{
+	
+	/* no recording */
+	if (!length)
+		return;
+
+	/* get free samples in buffer */
+	free = ((p_fromup_buffer_readp - p_fromup_buffer_writep - 1) & FROMUP_BUFFER_MASK);
+	if (free < length)
+	{
+		PDEBUG(DEBUG_PORT, "Port(%d): fromup_buffer overflows, this shall not happen under normal conditions\n", p_serial);
+		return;
+	}
+
+	/* write data to buffer and return */
+	while(length)
+	{
+		p_fromup_buffer[p_fromup_buffer_writep] = *data++;
+		p_fromup_buffer_writep = (p_fromup_buffer_writep + 1) & FROMUP_BUFFER_MASK;
+		length--;
+	}
+	return; // must return, because length is 0
+}