aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Cox <waywardgeek@gmail.com>2011-07-16 12:09:05 -0400
committerBill Cox <waywardgeek@gmail.com>2011-07-16 12:09:05 -0400
commite720065e4d31d0ecaffb12bdfedd1b04c978c590 (patch)
treecf67caf6da992989ea0f6bea16b4437f86d86c1a
parent2e48c227bc3817ee76b92bdabcd3c3ff2b7e5b99 (diff)
downloadsonic-e720065e4d31d0ecaffb12bdfedd1b04c978c590.tar.gz
Updated license to allow easier inclusion in projects
-rw-r--r--README12
-rw-r--r--Sonic.java10
-rw-r--r--sonic.c8
3 files changed, 24 insertions, 6 deletions
diff --git a/README b/README
index f1f19fa..4cffe49 100644
--- a/README
+++ b/README
@@ -8,12 +8,18 @@ to improve their productivity with open source speech engines, like espeak.
Sonic can also be used by the sighted. For example, Sonic can improve the
experience of listening to an audio book on an Android phone.
-A native Java port of Sonic is in Sonic.java.
+A native Java port of Sonic is in Sonic.java. Main.java is a simple example of
+how to use Sonic.java. To play with it, you'll need a "talking.wav" file in the
+current directory, and you'll want to change the speed, pitch or other
+parameters manually in Main.java, in the main method.
Sonic is Copyright 2010, 2011, Bill Cox, all rights reserved. It is released as
open source under the Lesser Gnu Public License version 2.1. All files except
-main.c, Main.java and all the sound samples are LGPL. main.c and the sound
-samples in the samples directory are in the public domain.
+main.c, Main.java and all the sound samples are LGPL. main.c Main.java and the
+sound samples in the samples directory are in the public domain. As a special
+exception, you may add the source code for sonic.c or Sonic.java to your
+project, rather than linking against a libsonic or adding Sonic.jar, but any
+changes to these two files must be published according to the LGPL terms.
Performance test:
diff --git a/Sonic.java b/Sonic.java
index da53d13..cec7aee 100644
--- a/Sonic.java
+++ b/Sonic.java
@@ -16,7 +16,13 @@
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
+ 02111-1307 USA.
+
+ As a special exception, you may add the source code for this file, Sonic.java,
+ to your project, rather than linking against a libsonic or adding Sonic.jar,
+ but any changes to these two files must be published according to the LGPL
+ terms.
+*/
package sonic;
@@ -1004,4 +1010,4 @@ public class Sonic {
stream.readShortFromStream(samples, numSamples);
return numSamples;
}
-} \ No newline at end of file
+}
diff --git a/sonic.c b/sonic.c
index 36b8de3..04605ad 100644
--- a/sonic.c
+++ b/sonic.c
@@ -16,7 +16,13 @@
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
+ 02111-1307 USA.
+
+ As a special exception, you may add the source code for this file, sonic.c,
+ to your project, rather than linking against a libsonic or adding Sonic.jar,
+ but any changes to these two files must be published according to the LGPL
+ terms.
+*/
#include <stdio.h>
#include <stdlib.h>