X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=main.h;h=d571c4bd7221ea75c94461c7be63e9adf7966783;hp=a0295b595c35a7aa648b560bce68999ce3270cde;hb=acaf278f7f616d264afe480e4f9c64768540941b;hpb=863bc6421940efe897dfd6d610e1f86ed9992cf6

diff --git a/main.h b/main.h
index a0295b5..d571c4b 100644
--- a/main.h
+++ b/main.h
@@ -32,8 +32,6 @@
 
 #define NAME		"LCR"
 
-#define DEFAULT_ENDPOINT_APP EndpointAppPBX
-
 #define VERSION_STRING	VERSION
 
 extern int memuse;
@@ -51,14 +49,14 @@ extern int fhuse;
 
 extern FILE *debug_fp;
 
-#define PDEBUG(mask, fmt, arg...) _printdebug(__FUNCTION__, __LINE__, mask, fmt, ## arg)
-#define PERROR(fmt, arg...) _printerror(__FUNCTION__, __LINE__, fmt, ## arg)
-#define PDEBUG_RUNTIME(mask, fmt, arg...) _printdebug(NULL, 0, mask, fmt, ## arg)
-#define PERROR_RUNTIME(fmt, arg...) _printerror(NULL, 0, fmt, ## arg)
-void _printdebug(const char *function, int line, unsigned int mask, const char *fmt, ...);
-void _printerror(const char *function, int line, const char *fmt, ...);
+#define PDEBUG(mask, fmt, arg...) _printdebug(__FILE__, __FUNCTION__, __LINE__, mask, fmt, ## arg)
+#define PERROR(fmt, arg...) _printerror(__FILE__, __FUNCTION__, __LINE__, fmt, ## arg)
+#define PDEBUG_RUNTIME(mask, fmt, arg...) _printdebug(NULL, NULL, 0, mask, fmt, ## arg)
+#define PERROR_RUNTIME(fmt, arg...) _printerror(NULL, NULL, 0, fmt, ## arg)
+void _printdebug(const char *file, const char *function, int line, unsigned int mask, const char *fmt, ...);
+void _printerror(const char *file, const char *function, int line, const char *fmt, ...);
 #define DEBUG_FUNC
-void debug(const char *function, int line, const char *prefix, char *buffer);
+void debug(const char *file, const char *function, int line, const char *prefix, char *buffer);
 
 #define DEBUG_CONFIG	0x0001
 #define DEBUG_MSG 	0x0002
@@ -87,11 +85,8 @@ void debug(const char *function, int line, const char *prefix, char *buffer);
 
 /*
  * load transmit buffer to avoid gaps at the beginning due to jitter
- * also the maximum load that will be kept in tx-buffer
- * also the (minimum) number of data to transmit in a frame
  */
 #define ISDN_LOAD	1024 // samples
-#define ISDN_MAXLOAD	2048 // samples
 
 /* give sendmail program. if not inside $PATH, give absolute path here (e.g. "/usr/sbin/sendmail")
  */
@@ -120,6 +115,8 @@ void debug(const char *function, int line, const char *prefix, char *buffer);
  */
 //#define BUDETECT_DEF
 
+/* internal limit of payload type in a message */
+
 #ifdef BUDETECT_DEF
  #define BUDETECT	budetect(__FILE__, __LINE__, __FUNCTION__);
  void budetect(const char *file, int line, const char *function);
@@ -127,12 +124,14 @@ void debug(const char *function, int line, const char *prefix, char *buffer);
  #define BUDETECT	;
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <mISDN/mbuffer.h>
-#ifdef __cplusplus
-}
+#ifdef WITH_MISDN
+ #ifdef __cplusplus
+  extern "C" {
+ #endif
+ #include <mISDN/mbuffer.h>
+ #ifdef __cplusplus
+  }
+ #endif
 #endif
 #include "macro.h"
 #include "select.h"
@@ -143,13 +142,16 @@ extern "C" {
 #include "endpoint.h"
 #include "endpointapp.h"
 #include "apppbx.h"
+#include "appbridge.h"
 #include "callerid.h"
 #include "route.h"
 #include "port.h"
+#include "remote.h"
+#ifdef WITH_MISDN
 #include "mISDN.h"
 #include "dss1.h"
-#include "loop.h"
-#include "remote.h"
+#include "fxs.h"
+#endif
 #if defined WITH_GSM_BS || defined WITH_GSM_MS
 #include "gsm.h"
 #endif
@@ -170,7 +172,6 @@ extern "C" {
 #include "vbox.h"
 #include "join.h"
 #include "joinpbx.h"
-#include "joinremote.h"
 #include "cause.h"
 #include "alawulaw.h"
 #include "tones.h"