Added processing of second caller id.

[lcr.git] / port.cpp

diff --git a/port.cpp b/port.cpp
index 34ca010..3867464 100644 (file)
--- a/port.cpp
+++ b/port.cpp
@@ -361,13 +361,13 @@ void Port::set_tone(const char *dir, const char *name)
                p_tone_fetched = NULL;
                return;
        }
-       SPRINT(filename, "%s/%s/%s", INSTALL_DATA, p_tone_dir, p_tone_name);
+       SPRINT(filename, "%s/%s/%s", SHARE_DATA, p_tone_dir, p_tone_name);
        if ((fh=open_tone(filename, &p_tone_codec, 0, 0)) >= 0)
        {
                close(fh);
                return;
        }
-       SPRINT(filename, "%s/%s/%s_loop", INSTALL_DATA, p_tone_dir, p_tone_name);
+       SPRINT(filename, "%s/%s/%s_loop", SHARE_DATA, p_tone_dir, p_tone_name);
        if ((fh=open_tone(filename, &p_tone_codec, 0, 0)) >= 0)
        {
                close(fh);
@@ -423,7 +423,7 @@ void Port::set_vbox_tone(const char *dir, const char *name)
                        PDEBUG(DEBUG_PORT, "PORT(%s) opening fetched tone: %s\n", p_name, p_tone_name);
                        return;
                }
-               SPRINT(filename, "%s/%s/%s", INSTALL_DATA, p_tone_dir, p_tone_name);
+               SPRINT(filename, "%s/%s/%s", SHARE_DATA, p_tone_dir, p_tone_name);
                if ((p_tone_fh=open_tone(filename, &p_tone_codec, &p_tone_size, &p_tone_left)) >= 0)
                {
                        fhuse++;
@@ -450,7 +450,6 @@ void Port::set_vbox_tone(const char *dir, const char *name)
  */
 void Port::set_vbox_play(const char *name, int offset)
 {
-       signed int size;
        struct lcr_msg *message;
 
        /* use ser_box_tone() */
@@ -469,7 +468,7 @@ void Port::set_vbox_play(const char *name, int offset)
                {
                        message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_TONE_COUNTER);
                        message->param.counter.current = offset;
-                       message->param.counter.max = size;
+                       message->param.counter.max = p_tone_size;
                        message_put(message);
                }
        }
@@ -491,7 +490,7 @@ void Port::set_vbox_speed(int speed)
  */
 int Port::read_audio(unsigned char *buffer, int length)
 {
-       int l,len;
+       int l = 0,len;
        int nodata=0; /* to detect 0-length files and avoid endless reopen */
        char filename[128];
        int tone_left_before; /* temp variable to determine the change in p_tone_left */
@@ -515,7 +514,7 @@ int Port::read_audio(unsigned char *buffer, int length)
                        /* if file does not exist */
                        if (!(p_tone_fetched=open_tone_fetched(p_tone_dir, filename, &p_tone_codec, &p_tone_size, &p_tone_left)))
                        {
-                               SPRINT(filename, "%s/%s/%s", INSTALL_DATA, p_tone_dir, p_tone_name);
+                               SPRINT(filename, "%s/%s/%s", SHARE_DATA, p_tone_dir, p_tone_name);
                                /* if file does not exist */
                                if ((p_tone_fh=open_tone(filename, &p_tone_codec, &p_tone_size, &p_tone_left)) < 0)
                                {
@@ -611,7 +610,7 @@ try_loop:
                SPRINT(filename, "%s_loop", p_tone_name);
                if (!(p_tone_fetched=open_tone_fetched(p_tone_dir, filename, &p_tone_codec, &p_tone_size, &p_tone_left)))
                {
-                       SPRINT(filename, "%s/%s/%s_loop", INSTALL_DATA, p_tone_dir, p_tone_name);
+                       SPRINT(filename, "%s/%s/%s_loop", SHARE_DATA, p_tone_dir, p_tone_name);
                        /* if file does not exist */
                        if ((p_tone_fh=open_tone(filename, &p_tone_codec, &p_tone_size, &p_tone_left)) < 0)
                        {
@@ -725,9 +724,9 @@ int Port::open_record(int type, int vbox, int skip, char *extension, int anon_ig
        }
 
        if (vbox != 0)
-               SPRINT(filename, "%s/%s/%s/vbox", INSTALL_DATA, options.extensions_dir, p_record_extension);
+               SPRINT(filename, "%s/%s/vbox", EXTENSION_DATA, p_record_extension);
        else
-               SPRINT(filename, "%s/%s/%s/recordings", INSTALL_DATA, options.extensions_dir, p_record_extension);
+               SPRINT(filename, "%s/%s/recordings", EXTENSION_DATA, p_record_extension);
        if (mkdir(filename, 0755) < 0)
        {
                if (errno != EEXIST)
@@ -794,7 +793,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 int size, wsize;
+       unsigned int size = 0, wsize = 0;
        struct fmt fmt;
        char filename[512], indexname[512];
        FILE *fp;
@@ -969,7 +968,7 @@ void Port::close_record(int beep, int mute)
 
        if (p_record_vbox == 2)
        {
-               SPRINT(indexname, "%s/%s/%s/vbox/index", INSTALL_DATA, options.extensions_dir, p_record_extension);
+               SPRINT(indexname, "%s/%s/vbox/index", EXTENSION_DATA, p_record_extension);
                if ((fp = fopen(indexname,"a")))
                {
                        fduse++;