From: Anthony Minessale <anthm@freeswitch.org>
Date: Tue, 2 Jul 2013 13:44:47 +0000 (-0500)
Subject: FS-5568 --resolve the real problem is that L=-1 is not valid because the L param... 
X-Git-Tag: v1.2.12~87
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c5b8d3ee9ba61d2c1794612d34ae95d05477d1e5;p=thirdparty%2Ffreeswitch.git

FS-5568 --resolve the real problem is that L=-1 is not valid because the L param is about how many times to generate the output while generating the tone so -1 is impossible because it can never end to let you hear it.  The real fix is to not allow -1 loops=-1 is the correct way to do this because that is parsed after the tone is generated and repeats the entire thing.  Doing something like L=100 actually generates the whole slinear audio 100 times into memore where loops=100 only generates the little snippet and repeats it after it was generated.
---

diff --git a/libs/freetdm/src/libteletone_generate.c b/libs/freetdm/src/libteletone_generate.c
index 3654d1ec34..ef7a7e03ec 100644
--- a/libs/freetdm/src/libteletone_generate.c
+++ b/libs/freetdm/src/libteletone_generate.c
@@ -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--;
 		}
diff --git a/libs/libteletone/src/libteletone_generate.c b/libs/libteletone/src/libteletone_generate.c
index 3654d1ec34..ef7a7e03ec 100644
--- a/libs/libteletone/src/libteletone_generate.c
+++ b/libs/libteletone/src/libteletone_generate.c
@@ -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--;
 		}