summaryrefslogtreecommitdiffstats
path: root/tones.c
diff options
context:
space:
mode:
authorSuper User2008-07-29 19:00:12 +0200
committerSuper User2008-07-29 19:00:12 +0200
commitde8f81a69bac7db90856ddb639c4bfa62fa80150 (patch)
tree021bfad67f82e217c37b0e92163a5f67f975875e /tones.c
parentfixed problem with "Answer" after extension matches. (diff)
downloadlcr-de8f81a69bac7db90856ddb639c4bfa62fa80150.tar.gz
lcr-de8f81a69bac7db90856ddb639c4bfa62fa80150.tar.xz
lcr-de8f81a69bac7db90856ddb639c4bfa62fa80150.zip
make compile with gcc 4.* without warnings. (hopefully with all versions)
modified: Makefile modified: bchannel.c modified: chan_lcr.h modified: extension.c modified: gentones.c modified: genwave.c modified: joinpbx.cpp modified: tones.c
Diffstat (limited to 'tones.c')
-rw-r--r--tones.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/tones.c b/tones.c
index fd85529..48625bb 100644
--- a/tones.c
+++ b/tones.c
@@ -342,7 +342,8 @@ int read_tone(int fh, unsigned char *buffer, int codec, int len, signed int size
l = l>>2;
while(i < l)
{
- sample = (*buf32++) + (*buf32++);
+ sample = (*buf32++);
+ sample += (*buf32++);
if (sample < -32767)
sample = -32767;
if (sample > 32767)
@@ -534,7 +535,7 @@ int fetch_tones(void)
p = p_next;
}
- printf("PBX: Memory used for tones: %ld bytes (%d samples)\n", memory, samples);
+ printf("PBX: Memory used for tones: %d bytes (%d samples)\n", memory, samples);
PDEBUG(DEBUG_PORT, "Memory used for tones: %ld bytes (%d samples)\n", memory, samples);
return(1);