now chan_lcr.so is moved to asterisk' modules directory when installing.

[lcr.git] / port.cpp

diff --git a/port.cpp b/port.cpp
index 0bc74a2..934a4cc 100644 (file)
--- a/port.cpp
+++ b/port.cpp
@@ -146,7 +146,7 @@ struct epoint_list *Port::epointlist_new(unsigned int epoint_id)
 /*
  * port constructor
  */
-Port::Port(int type, char *portname, struct port_settings *settings)
+Port::Port(int type, const char *portname, struct port_settings *settings)
 {
        class Port *temp, **tempp;
 
@@ -295,7 +295,7 @@ void Port::set_echotest(int echotest)
 /*
  * set the file in the tone directory with the given name
  */
-void Port::set_tone(char *dir, char *name)
+void Port::set_tone(const char *dir, const char *name)
 {
        int fh;
        char filename[128];
@@ -361,13 +361,13 @@ void Port::set_tone(char *dir, 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);
@@ -395,7 +395,7 @@ void Port::set_tone(char *dir, char *name)
  * set the file in the tone directory for vbox playback
  * also set the play_eof-flag
  */
-void Port::set_vbox_tone(char *dir, char *name)
+void Port::set_vbox_tone(const char *dir, const char *name)
 {
        char filename[256];
 
@@ -423,7 +423,7 @@ void Port::set_vbox_tone(char *dir, 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++;
@@ -448,7 +448,7 @@ void Port::set_vbox_tone(char *dir, char *name)
  * also set the eof-flag
  * also set the counter-flag
  */
-void Port::set_vbox_play(char *name, int offset)
+void Port::set_vbox_play(const char *name, int offset)
 {
        signed int size;
        struct lcr_msg *message;
@@ -515,7 +515,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 +611,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)
                        {
@@ -702,7 +702,7 @@ 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 *extension, 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, const char *vbox_email, int vbox_email_file)
 {
        /* RIFFxxxxWAVEfmt xxxx(fmt-size)dataxxxx... */
        char dummyheader[8+4+8+sizeof(fmt)+8];
@@ -725,9 +725,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)
@@ -802,7 +802,7 @@ void Port::close_record(int beep, int mute)
        char number[256], callerid[256];
        char *p;
        struct caller_info callerinfo;
-       char *valid_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890_.-!$%&/()=+*;~";
+       const char *valid_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890_.-!$%&/()=+*;~";
 
        if (!p_record)
                return;
@@ -904,7 +904,7 @@ void Port::close_record(int beep, int mute)
                fprintf(p_record, "WAVE");
 
                /* fmt */
-               fprintf(p_record, "fmt %c%c%c%c", sizeof(fmt), 0, 0, 0);
+               fprintf(p_record, "fmt %c%c%c%c", (unsigned int)sizeof(fmt), 0, 0, 0);
                switch(p_record_type)
                {
                        case CODEC_MONO:
@@ -969,7 +969,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++;