just make this version of teletone bsd too

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@603 a93c3328-9c30-0410-af19-c9cd2b2d52af

diff --git a/libs/freetdm/src/include/libteletone_detect.h b/libs/freetdm/src/include/libteletone_detect.h
index 414bbf2b3505b160fdcf3a1501e79fc965e1b622..3c44d480eee1dd4da86c7628e7058e9bba8fbbcf 100644 (file)
--- a/libs/freetdm/src/include/libteletone_detect.h
+++ b/libs/freetdm/src/include/libteletone_detect.h
@@ -2,55 +2,8 @@
  * libteletone
  * Copyright (C) 2005/2006, Anthony Minessale II <anthmct@yahoo.com>
  *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is tone_detect.c - General telephony tone detection, and specific detection of DTMF.
- *
- *
- * The Initial Developer of the Original Code is
- * Stephen Underwood <steveu@coppice.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * 
- * The the original interface designed by Steve Underwood was preserved to retain 
- *the optimizations when considering DTMF tones though the names were changed in the interest 
- * of namespace.
- *
- * Much less efficient expansion interface was added to allow for the detection of 
- * a single arbitrary tone combination which may also exceed 2 simultaneous tones.
- * (controlled by compile time constant TELETONE_MAX_TONES)
- *
- * Copyright (C) 2006 Anthony Minessale II <anthmct@yahoo.com>
- *
- *
  * libteletone_detect.c Tone Detection Code
  *
- *
- ********************************************************************************* 
- *
- * Derived from tone_detect.h - General telephony tone detection, and specific
- * detection of DTMF.
- *
- * Copyright (C) 2001  Steve Underwood <steveu@coppice.org>
- *
- * Despite my general liking of the GPL, I place this code in the
- * public domain for the benefit of all mankind - even the slimy
- * ones who might try to proprietize my work and use it to my
- * detriment.
- *
- *
  * Exception:
  * The author hereby grants the use of this source code under the 
  * following license if and only if the source code is distributed
@@ -88,6 +41,20 @@
  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ********************************************************************************* 
+ *
+ * Derived from tone_detect.h - General telephony tone detection, and specific
+ * detection of DTMF.
+ *
+ * Copyright (C) 2001  Steve Underwood <steveu@coppice.org>
+ *
+ * Despite my general liking of the GPL, I place this code in the
+ * public domain for the benefit of all mankind - even the slimy
+ * ones who might try to proprietize my work and use it to my
+ * detriment.
+ *
+ *
  */
 
 #ifndef LIBTELETONE_DETECT_H

diff --git a/libs/freetdm/src/include/libteletone_generate.h b/libs/freetdm/src/include/libteletone_generate.h
index addd1ebea915e42e7732cbae8e9cd9a783231d4a..d538fdc90a9a4f1645c33437da4defad7b85d28d 100644 (file)
--- a/libs/freetdm/src/include/libteletone_generate.h
+++ b/libs/freetdm/src/include/libteletone_generate.h
@@ -2,41 +2,6 @@
  * libteletone
  * Copyright (C) 2005/2006, Anthony Minessale II <anthmct@yahoo.com>
  *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is libteletone
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthmct@yahoo.com>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * 
- * Anthony Minessale II <anthmct@yahoo.com>
- *
- *
- * libteletone.h -- Tone Generator
- *
- *
- *
- * Exception:
- * The author hereby grants the use of this source code under the 
- * following license if and only if the source code is distributed
- * as part of the openzap library.     Any use or distribution of this
- * source code outside the scope of the openzap library will nullify the
- * following license and reinact the MPL 1.1 as stated above.
- *
  * Copyright (c) 2007, Anthony Minessale II
  * All rights reserved.
  * 

diff --git a/libs/freetdm/src/libteletone_detect.c b/libs/freetdm/src/libteletone_detect.c
index 55cfcf60cdb4248aac16a6691012d30d760af1b0..c85ac591610cacfae7c75808ff04c9c48e2f6bf5 100644 (file)
--- a/libs/freetdm/src/libteletone_detect.c
+++ b/libs/freetdm/src/libteletone_detect.c
@@ -2,62 +2,14 @@
  * libteletone
  * Copyright (C) 2005/2006, Anthony Minessale II <anthmct@yahoo.com>
  *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is tone_detect.c - General telephony tone detection, and specific detection of DTMF.
- *
- *
- * The Initial Developer of the Original Code is
- * Stephen Underwood <steveu@coppice.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * 
- * The the original interface designed by Steve Underwood was preserved to retain 
- *the optimizations when considering DTMF tones though the names were changed in the interest 
- * of namespace.
- *
  * Much less efficient expansion interface was added to allow for the detection of 
  * a single arbitrary tone combination which may also exceed 2 simultaneous tones.
  * (controlled by compile time constant TELETONE_MAX_TONES)
  *
  * Copyright (C) 2006 Anthony Minessale II <anthmct@yahoo.com>
  *
- *
  * libteletone_detect.c Tone Detection Code
  *
- *
- ********************************************************************************* 
- *
- * Derived from tone_detect.c - General telephony tone detection, and specific
- * detection of DTMF.
- *
- * Copyright (C) 2001  Steve Underwood <steveu@coppice.org>
- *
- * Despite my general liking of the GPL, I place this code in the
- * public domain for the benefit of all mankind - even the slimy
- * ones who might try to proprietize my work and use it to my
- * detriment.
- *
- *
- * Exception:
- * The author hereby grants the use of this source code under the 
- * following license if and only if the source code is distributed
- * as part of the openzap library.     Any use or distribution of this
- * source code outside the scope of the openzap library will nullify the
- * following license and reinact the MPL 1.1 as stated above.
- *
  * Copyright (c) 2007, Anthony Minessale II
  * All rights reserved.
  * 
@@ -88,6 +40,21 @@
  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ********************************************************************************* 
+ *
+ * Derived from tone_detect.c - General telephony tone detection, and specific
+ * detection of DTMF.
+ *
+ * Copyright (C) 2001  Steve Underwood <steveu@coppice.org>
+ *
+ * Despite my general liking of the GPL, I place this code in the
+ * public domain for the benefit of all mankind - even the slimy
+ * ones who might try to proprietize my work and use it to my
+ * detriment.
+ *
+ *
+ *
  */
 
 #include <libteletone_detect.h>

diff --git a/libs/freetdm/src/libteletone_generate.c b/libs/freetdm/src/libteletone_generate.c
index 7771188c466f237621afba323a83d2aa125db08e..4a723fec6fa32be5002cd12ae76b8cfb1297766a 100644 (file)
--- a/libs/freetdm/src/libteletone_generate.c
+++ b/libs/freetdm/src/libteletone_generate.c
@@ -1,41 +1,5 @@
 /* 
- * libteletone
- * Copyright (C) 2005/2006, Anthony Minessale II <anthmct@yahoo.com>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is libteletone
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthmct@yahoo.com>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * 
- * Anthony Minessale II <anthmct@yahoo.com>
- *
- *
- * libteletone.c -- Tone Generator
- *
- *
- *
- * Exception:
- * The author hereby grants the use of this source code under the 
- * following license if and only if the source code is distributed
- * as part of the openzap library.     Any use or distribution of this
- * source code outside the scope of the openzap library will nullify the
- * following license and reinact the MPL 1.1 as stated above.
+ * libteletone_generate.c -- Tone Generator
  *
  * Copyright (c) 2007, Anthony Minessale II
  * All rights reserved.