backup

[lcr.git] / main.h

diff --git a/main.h b/main.h
index d09239e..3398cdf 100644 (file)
--- a/main.h
+++ b/main.h
@@ -40,8 +40,6 @@ void _printerror(const char *function, int line, const char *fmt, ...);
 #define DEBUG_BCHANNEL         0x0008
 #define DEBUG_PORT     0x0100
 #define DEBUG_ISDN     0x0110
-#define DEBUG_OPAL     0x0120 
-#define DEBUG_H323     0x0130 
 //#define DEBUG_KNOCK  0x0140
 #define DEBUG_VBOX     0x0180
 #define DEBUG_EPOINT   0x0200
@@ -60,30 +58,16 @@ void _printerror(const char *function, int line, const char *fmt, ...);
  */
 #define DEBUG_LOG      0x7fff
 
-/* audio buffer for mixer and recording.
- * all partys within a call (most time two endpoints) write audio data to the buffer. this is used because
- * the buffer experience jitter. if the buffer is too small, jitter will cause drops and gaps.
- * if the buffer is too large, the delay is large. 768 is a good value to start with.
+/*
+ * preload transmit buffer to avoid gaps at the beginning due to jitter
+ * this is also the maximum load that will be kept in tx-buffer
  */
-#ifdef VOIP
-#warning to be removed soon
-#endif
-#define PORT_BUFFER    768
-
-/* keep this 0 for minimum delay */
-#ifdef VOIP
-#warning to be removed soon
-#endif
-#define ISDN_PRELOAD   0
+#define ISDN_PRELOAD   128 // 1024 samples
 
-/* the jitterlimit specifies the number of samples received too fast, before
- * it recognizes a stalling process.
- * but should NOT be less 256.
+/* 
+ * interval for refreshing transmit buffer
  */
-#ifdef VOIP
-#warning to be removed soon
-#endif
-#define ISDN_JITTERLIMIT 512   /* maximum samples received before dropping */
+#define ISDN_TRANSMIT  32 // 256 samples
 
 /* give sendmail program. if not inside $PATH, give absolute path here (e.g. "/usr/sbin/sendmail")
  */
@@ -118,28 +102,6 @@ void _printerror(const char *function, int line, const char *fmt, ...);
  #define BUDETECT      ;
 #endif
 
-#ifdef H323
-#define VOIP
-#ifdef OPAL
-#error    It is not allowed to use H323 and OPAL. Please disable H323, because it is included in OPAL.
-#endif
-#endif
-#ifdef OPAL
-#define VOIP
-#endif
-
-#ifdef H323INCLUDE
-#define NO_VIDEO_CAPTURE
-//#include <vector>
-//#include <string>
-#include <ptlib.h>
-#include <h225.h>
-#include <h323.h>
-#include <h323pdu.h>
-#include <h323caps.h>
-#include <q931.h>
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -151,14 +113,13 @@ void _printerror(const char *function, int line, const char *fmt, ...);
 extern "C" {
 #endif
 #include <isdn_net.h>
-#include <net_l3.h>
+#include <../i4lnet/net_l3.h>
 #ifdef __cplusplus
 }
 #endif
 #include "save.h"
 #include "options.h"
 #include "interface.h"
-#include "h323conf.h"
 #include "extension.h"
 #include "message.h"
 #include "endpoint.h"
@@ -168,12 +129,6 @@ extern "C" {
 #include "port.h"
 #include "mISDN.h"
 #include "dss1.h"
-#ifdef H323
-#include "h323.h"
-#endif
-#ifdef OPAL
-#include "opal.h"
-#endif
 #include "vbox.h"
 #include "call.h"
 #include "callpbx.h"
@@ -183,6 +138,7 @@ extern "C" {
 #include "tones.h"
 #include "crypt.h"
 #include "admin_server.h"
+#include "trace.h"
 
 extern double now_d;
 extern time_t now;
@@ -190,13 +146,8 @@ extern struct tm *now_tm;
 extern struct timeval now_tv;
 extern struct timezone now_tz;
 
+#define DIRECTION_NONE 0
+#define DIRECTION_OUT  1
+#define DIRECTION_IN   2
 
-#ifdef H323INCLUDE
-#include "h323_ep.h"
-#include "h323_con.h"
-#include "h323_chan.h"
-
-extern PMutex mutex_h323; // mutual exclude for synchroniszing threads 
-extern H323_ep *h323_ep;
-#endif