Merge remote-tracking branch 'origin/v1.2.stable' into v1.2.stable-ftdm_em_playback

This commit is contained in:
Moises Silva
2013-08-14 14:28:59 -04:00
269 changed files with 6997 additions and 5878 deletions

View File

@@ -382,9 +382,12 @@ TELETONE_API(int) teletone_run(teletone_generation_session_t *ts, const char *cm
break;
case 'L':
if (!LOOPING) {
ts->LOOPS = atoi(cur + 2);
int L;
if ((L = atoi(cur + 2)) > 0) {
ts->LOOPS = L;
LOOPING++;
}
}
LOOPING++;
break;
}
} else {
@@ -480,6 +483,7 @@ TELETONE_API(int) teletone_run(teletone_generation_session_t *ts, const char *cm
bottom:
free(data);
data = NULL;
if (ts->LOOPS > 0) {
ts->LOOPS--;
}