fixed trace bug

[lcr.git] / port.cpp

diff --git a/port.cpp b/port.cpp
index d254d0c..0bc74a2 100644 (file)
--- a/port.cpp
+++ b/port.cpp
@@ -45,15 +45,6 @@ Functions:
    
 */
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <errno.h>
-#include <math.h>
 #include "main.h"
 
 #define SHORT_MIN -32768
@@ -61,7 +52,7 @@ Functions:
 
 class Port *port_first = NULL;
 
-unsigned long port_serial = 1; /* must be 1, because 0== no port */
+unsigned int port_serial = 1; /* must be 1, because 0== no port */
 
 
 /* free epointlist relation
@@ -95,7 +86,7 @@ void Port::free_epointlist(struct epoint_list *epointlist)
 }
 
 
-void Port::free_epointid(unsigned long epoint_id)
+void Port::free_epointid(unsigned int epoint_id)
 {
        struct epoint_list *temp, **tempp;
 
@@ -126,7 +117,7 @@ void Port::free_epointid(unsigned long epoint_id)
 
 /* create new epointlist relation
  */
-struct epoint_list *Port::epointlist_new(unsigned long epoint_id)
+struct epoint_list *Port::epointlist_new(unsigned int epoint_id)
 {
        struct epoint_list *epointlist, **epointlistpointer;
 
@@ -216,7 +207,7 @@ Port::Port(int type, char *portname, struct port_settings *settings)
 Port::~Port(void)
 {
        class Port *temp, **tempp;
-       struct message *message;
+       struct lcr_msg *message;
 
        if (p_record)
                close_record(0, 0);
@@ -276,7 +267,7 @@ void Port::new_state(int state)
 /*
  * find the port with port_id
  */ 
-class Port *find_port_id(unsigned long port_id)
+class Port *find_port_id(unsigned int port_id)
 {
        class Port *port = port_first;
 
@@ -312,6 +303,17 @@ void Port::set_tone(char *dir, char *name)
        if (name == NULL)
                name = "";
 
+#if 0
+       /* if tones is jingle, store next tone */
+       if ((p_tone_fh >= 0 || p_tone_fetched)
+        && (!strcmp(p_tone_name, "left") || !strcmp(p_tone_name, "joined")))
+       {
+               SCPY(p_tone_dir, dir);
+               SCPY(p_tone_name, name);
+               return;
+       }
+#endif
+
        /* no counter, no eof, normal speed */
        p_tone_counter = 0;
        p_tone_eof = 0;
@@ -448,8 +450,8 @@ void Port::set_vbox_tone(char *dir, char *name)
  */
 void Port::set_vbox_play(char *name, int offset)
 {
-       signed long size;
-       struct message *message;
+       signed int size;
+       struct lcr_msg *message;
 
        /* use ser_box_tone() */
        set_vbox_tone("", name);
@@ -563,7 +565,7 @@ read_more:
                if (((p_tone_size-p_tone_left)/8000) != (p_tone_size-tone_left_before)/8000)
                {
 //printf("\nsize=%d left=%d\n\n",p_tone_size,p_tone_left);
-                       struct message *message;
+                       struct lcr_msg *message;
                        message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_TONE_COUNTER);
                        message->param.counter.current = (p_tone_size-p_tone_left)/8000;
                        message->param.counter.max = -1;
@@ -598,7 +600,7 @@ read_more:
 try_loop:
        if (p_tone_eof && ACTIVE_EPOINT(p_epointlist))
        {
-               struct message *message;
+               struct lcr_msg *message;
                message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_TONE_EOF);
                message_put(message);
        }
@@ -652,8 +654,8 @@ int Port::handler(void)
  * this is called by the message_epoint inherited by child classes
  * therefor a return=1 means: stop, no more processing
  */
-//extern struct message *dddebug;
-int Port::message_epoint(unsigned long epoint_id, int message_id, union parameter *param)
+//extern struct lcr_msg *dddebug;
+int Port::message_epoint(unsigned int epoint_id, int message_id, union parameter *param)
 {
        /* check if we got audio data from one remote port */
        switch(message_id)
@@ -688,8 +690,8 @@ int Port::message_epoint(unsigned long epoint_id, int message_id, union paramete
 struct fmt {
        unsigned short  stereo; /* 1 = mono, 2 = stereo */
        unsigned short  channels; /* number of channels */
-       unsigned long   sample_rate; /* sample rate */
-       unsigned long   data_rate; /* data rate */
+       unsigned int    sample_rate; /* sample rate */
+       unsigned int    data_rate; /* data rate */
        unsigned short  bytes_sample; /* bytes per sample (all channels) */
        unsigned short  bits_sample; /* bits per sample (one channel) */
 };
@@ -792,7 +794,7 @@ int Port::open_record(int type, int vbox, int skip, char *extension, int anon_ig
 void Port::close_record(int beep, int mute)
 {
        static signed short beep_mono[256];
-       unsigned long size, wsize;
+       unsigned int size, wsize;
        struct fmt fmt;
        char filename[512], indexname[512];
        FILE *fp;
@@ -810,7 +812,7 @@ void Port::close_record(int beep, int mute)
 //     apply_callerid_restriction(p_record_anon_ignore, callerinfo.id, &callerinfo.ntype, &callerinfo.present, &callerinfo.screen, callerinfo.extension, callerinfo.name);
 
        SCPY(number, p_dialinginfo.id);
-       SCPY(callerid, numberrize_callerinfo(callerinfo.id, callerinfo.ntype));
+       SCPY(callerid, numberrize_callerinfo(callerinfo.id, callerinfo.ntype, options.national, options.international));
        if (callerid[0] == '\0')
        {
                if (callerinfo.present == INFO_PRESENT_RESTRICTED)
@@ -1013,7 +1015,7 @@ void Port::record(unsigned char *data, int length, int dir_fromup)
        unsigned char write_buffer[1024], *d;
        signed short *s;
        int free, i, ii;
-       signed long sample;
+       signed int sample;
 
        /* no recording */
        if (!p_record || !length)