Merge in a few more changes. This time the include/ directory.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@136402 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2008-08-07 14:36:59 +00:00
parent 4d0a4e7bfa
commit 4fb07fb0c1
2 changed files with 11 additions and 11 deletions

View File

@@ -255,14 +255,14 @@ static inline float callerid_getcarrier(float *cr, float *ci, int bit)
} while(0)
#define PUT_AUDIO_SAMPLE(y) do { \
int index = (short)(rint(8192.0 * (y))); \
*(buf++) = AST_LIN2X(index); \
int __sample_idx = (short)(rint(8192.0 * (y))); \
*(buf++) = AST_LIN2X(__sample_idx); \
bytes++; \
} while(0)
#define PUT_CLID_MARKMS do { \
int x; \
for (x=0;x<8;x++) \
int __clid_x; \
for (__clid_x=0;__clid_x<8;__clid_x++) \
PUT_AUDIO_SAMPLE(callerid_getcarrier(&cr, &ci, 1)); \
} while(0)