Mercurial > hg > ishara

changeset 46:63cefb01cbab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Creating Java build process (incomplete)
author samer
date Sat, 17 Jan 2015 14:13:07 +0000
parents 1ff748470e1d
children 82075c94eed1
files audio/@linein/linein.m audio/@lineout/lineout.m audio/@sndstream/sndstream.m audio/@wavsink/wavsink.m audio/java/AudioSink.java audio/java/AudioSource.java audio/java/LineSink.java audio/java/LineSource.java audio/java/Makefile audio/java/StreamSink.java audio/java/StreamSource.java audio/java/TestLine.java audio/java/Util.java audio/java/ishara_audio.jar audio/setup_ishara_java.m general/funutils/README.txt
diffstat 16 files changed, 54 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/audio/@linein/linein.m	Tue Jan 13 14:05:08 2015 +0000
+++ b/audio/@linein/linein.m	Sat Jan 17 14:13:07 2015 +0000
@@ -20,7 +20,7 @@
 
 		function s=construct(sig)
 			import javax.sound.sampled.*;
-			import samer.audio.alt.*;
+			import ishara.audio.*;
 
 			src=LineSource(audio_format(sig.channels,sig.rate,sig.opts.bits),sig.opts.bufsize);
 			ref=disposables('reg',src);
--- a/audio/@lineout/lineout.m	Tue Jan 13 14:05:08 2015 +0000
+++ b/audio/@lineout/lineout.m	Sat Jan 17 14:13:07 2015 +0000
@@ -24,7 +24,7 @@
 		function c=channels(s), c=s.chans; end
 		function c=rate(s), c=s.fs; end
 		function s=construct(sig)
-			import samer.audio.alt.*;
+			import ishara.audio.*;
 
 			snk=LineSink(audio_format(sig.chans,sig.fs,sig.opts.bits),sig.opts.bufsize);
 			snk.setScale(0.999);
--- a/audio/@sndstream/sndstream.m	Tue Jan 13 14:05:08 2015 +0000
+++ b/audio/@sndstream/sndstream.m	Sat Jan 17 14:13:07 2015 +0000
@@ -1,4 +1,4 @@
-% sndstream - file reader implementation using samer.audio.alt.FileSource
+% sndstream - file reader implementation using ishara.audio.StreamSource
 %
 % sndstream ::
 %    (unit -> (AudioInputStream, unit -> unit)) ~'function to open stream',
@@ -47,7 +47,7 @@
 
 		function s=construct(sig)
 			[str,cleanup]=sig.streamfn(false);
-			src=samer.audio.alt.StreamSource(str,sig.format);
+			src=ishara.audio.StreamSource(str,sig.format);
 			ref=disposables('reg',src);
 			s.start = @()src.start();
 			s.stop = @()src.stop();
--- a/audio/@wavsink/wavsink.m	Tue Jan 13 14:05:08 2015 +0000
+++ b/audio/@wavsink/wavsink.m	Sat Jan 17 14:13:07 2015 +0000
@@ -1,4 +1,4 @@
-% wavsink - file reader implementation using samer.audio.alt.StreamSink
+% wavsink - file reader implementation using ishara.audio.StreamSink
 %
 % wavsink ::
 %    (unit -> (InputStream, unit -> unit)) ~'function to open stream',
@@ -33,7 +33,7 @@
 		function c=channels(s), c=s.format.getChannels(); end
 		function r=rate(s), r=s.format.getSampleRate(); end
 		function s=construct(sig)
-			import  samer.audio.alt.*;
+			import  ishara.audio.*;
 
 			[str,cleanup]=sig.streamfn();
 			snk=StreamSink(StreamSink.wavOutputStream(str, sig.format));
--- a/audio/java/AudioSink.java	Tue Jan 13 14:05:08 2015 +0000
+++ b/audio/java/AudioSink.java	Sat Jan 17 14:13:07 2015 +0000
@@ -9,7 +9,7 @@
  *	FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-package samer.audio.alt;
+package ishara.audio;
 import  javax.sound.sampled.AudioFormat;
 
 /**
--- a/audio/java/AudioSource.java	Tue Jan 13 14:05:08 2015 +0000
+++ b/audio/java/AudioSource.java	Sat Jan 17 14:13:07 2015 +0000
@@ -9,7 +9,7 @@
  *	FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-package samer.audio.alt;
+package ishara.audio;
 import  javax.sound.sampled.AudioFormat;
 
 public abstract class AudioSource
--- a/audio/java/LineSink.java	Tue Jan 13 14:05:08 2015 +0000
+++ b/audio/java/LineSink.java	Sat Jan 17 14:13:07 2015 +0000
@@ -9,7 +9,7 @@
  *	FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-package samer.audio.alt;
+package ishara.audio;
 import  javax.sound.sampled.*;
 
 /**
@@ -18,7 +18,7 @@
 	<p> Object is a Viewable, and is called "lineout".
 	Reads property "scale" from current environment, but scale
 	can be adjusted afterwards.
-	@see samer.audio.AudioSink
+	@see ishara.audio.AudioSink
 */
 
 public class LineSink extends AudioSink
--- a/audio/java/LineSource.java	Tue Jan 13 14:05:08 2015 +0000
+++ b/audio/java/LineSource.java	Sat Jan 17 14:13:07 2015 +0000
@@ -9,7 +9,7 @@
  *	FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-package samer.audio.alt;
+package ishara.audio;
 import javax.sound.sampled.*;
 import java.io.*;
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/java/Makefile	Sat Jan 17 14:13:07 2015 +0000
@@ -0,0 +1,24 @@
+# Makefile to build ishara audio java components
+# This will build ishara_audio.jar and move it into the
+# parent directory.
+
+# change this if your tritonus jar files are somewhere else.
+# This is where Debian based linux distributions put them
+EXTDIRS=-Djava.ext.dirs=/usr/share/java
+
+# On Mac OS X, there are already several directories where 
+# extension jars can go - eg, ~/Library/Java/Extensions
+# or /Library/Java/Extensions. In this case, you can put
+# the tritonus jars in any of those directories and
+# set EXTDIRS empty like this:
+#EXTDIRS=
+
+SRCS=AudioSink.java LineSink.java StreamSink.java TestLine.java AudioSource.java LineSource.java StreamSource.java Util.java
+
+ishara_audio.jar: $(SRCS)
+	javac -d . $(EXTDIRS) $(SRCS)
+	jar cf ishara_audio.jar ishara
+
+clean:
+	rm -rf ishara
+
--- a/audio/java/StreamSink.java	Tue Jan 13 14:05:08 2015 +0000
+++ b/audio/java/StreamSink.java	Sat Jan 17 14:13:07 2015 +0000
@@ -9,7 +9,7 @@
  *	FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-package samer.audio.alt;
+package ishara.audio;
 
 import  javax.sound.sampled.*;
 import  java.io.*;
--- a/audio/java/StreamSource.java	Tue Jan 13 14:05:08 2015 +0000
+++ b/audio/java/StreamSource.java	Sat Jan 17 14:13:07 2015 +0000
@@ -9,7 +9,7 @@
  *	FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-package samer.audio.alt;
+package ishara.audio;
 import  javax.sound.sampled.*;
 import  java.io.*;
 
--- a/audio/java/TestLine.java	Tue Jan 13 14:05:08 2015 +0000
+++ b/audio/java/TestLine.java	Sat Jan 17 14:13:07 2015 +0000
@@ -1,4 +1,4 @@
-package samer.audio.alt;
+package ishara.audio;
 import javax.sound.sampled.*;
 
 
--- a/audio/java/Util.java	Tue Jan 13 14:05:08 2015 +0000
+++ b/audio/java/Util.java	Sat Jan 17 14:13:07 2015 +0000
@@ -9,7 +9,7 @@
  *	FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-package samer.audio.alt;
+package ishara.audio;
 
 public class Util
 {
Binary file audio/java/ishara_audio.jar has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/setup_ishara_java.m	Sat Jan 17 14:13:07 2015 +0000
@@ -0,0 +1,14 @@
+% ishara_java_cp - Set Java classpath for audio support components
+function setup_ishara_java(kind)
+
+Jar=[fileparts(which('setup_ishara_java')),'/java/ishara_audio.jar'];
+switch kind
+	case 'dynamic'
+		javaaddpath(Jar);
+		fprintf('Added %s to DYNAMIC Java classpath.\n',Jar);
+	case 'static'
+		system(sprintf('echo "%s" >> "%s"/javaclasspath.txt',Jar,prefdir));
+	otherwise
+		error('Unrecognised argument: must ''static'' or ''dynamic'',');
+end
+
--- a/general/funutils/README.txt	Tue Jan 13 14:05:08 2015 +0000
+++ b/general/funutils/README.txt	Sat Jan 17 14:13:07 2015 +0000
@@ -33,7 +33,7 @@
 
   bind1   - same as rdivide or ./
   flip    - same as ctranspose or '
-  apply   - samer as mpower  or   .^
+  apply   - same as mpower  or   .^
   compose - same as ctranspose(@mtimes)
 
   doreturn(f,x,y,...) ==  feval([f<[];@deal],x,y,...)