diff --git a/Processing/Processing.pde b/Processing/Processing.pde index d194e26..7f8e19c 100644 --- a/Processing/Processing.pde +++ b/Processing/Processing.pde @@ -1,8 +1,9 @@ import processing.serial.*; -import processing.sound.*; import gohai.glvideo.*; +import ddf.minim.*; -SoundFile[] soundfile = {null,null,null,null,null,null,null}; +Minim minim; +AudioPlayer[] soundfile = {null,null,null,null,null,null,null}; GLMovie video; Serial myPort; @@ -14,11 +15,13 @@ int ms = 0; String[] langs = {"NONE","Italian","English","Spanish","German","French","Russian"}; void setup() { - size(1920, 1080, P2D); - + size(1024, 768, P2D); + + minim = new Minim(this); + for(int i=0; i "+currentLang); } diff --git a/Processing/data/English.aiff b/Processing/data/English.aiff index 8f2f8a8..1b9ad93 100644 Binary files a/Processing/data/English.aiff and b/Processing/data/English.aiff differ diff --git a/Processing/data/English.mp3 b/Processing/data/English.mp3 index 93c5038..9c43466 100644 Binary files a/Processing/data/English.mp3 and b/Processing/data/English.mp3 differ diff --git a/Processing/data/French.aiff b/Processing/data/French.aiff index 89d0f6b..1059289 100644 Binary files a/Processing/data/French.aiff and b/Processing/data/French.aiff differ diff --git a/Processing/data/French.mp3 b/Processing/data/French.mp3 index f80396f..6d42988 100644 Binary files a/Processing/data/French.mp3 and b/Processing/data/French.mp3 differ diff --git a/Processing/data/German.aiff b/Processing/data/German.aiff index cef6ee1..462b0d5 100644 Binary files a/Processing/data/German.aiff and b/Processing/data/German.aiff differ diff --git a/Processing/data/German.mp3 b/Processing/data/German.mp3 index 0f83052..dbd77c6 100644 Binary files a/Processing/data/German.mp3 and b/Processing/data/German.mp3 differ diff --git a/Processing/data/Italian.aiff b/Processing/data/Italian.aiff index 7e17b69..26db757 100644 Binary files a/Processing/data/Italian.aiff and b/Processing/data/Italian.aiff differ diff --git a/Processing/data/Italian.mp3 b/Processing/data/Italian.mp3 index 452359f..768e522 100644 Binary files a/Processing/data/Italian.mp3 and b/Processing/data/Italian.mp3 differ diff --git a/Processing/data/NONE.mp3 b/Processing/data/NONE.mp3 index f4d47f1..4f7c1e4 100644 Binary files a/Processing/data/NONE.mp3 and b/Processing/data/NONE.mp3 differ diff --git a/Processing/data/Russian.aiff b/Processing/data/Russian.aiff index 5fb154f..3cd345f 100644 Binary files a/Processing/data/Russian.aiff and b/Processing/data/Russian.aiff differ diff --git a/Processing/data/Russian.mp3 b/Processing/data/Russian.mp3 index df62714..f4ad5cb 100644 Binary files a/Processing/data/Russian.mp3 and b/Processing/data/Russian.mp3 differ diff --git a/Processing/data/Spanish.aiff b/Processing/data/Spanish.aiff index ac70798..521f8db 100644 Binary files a/Processing/data/Spanish.aiff and b/Processing/data/Spanish.aiff differ diff --git a/Processing/data/Spanish.mp3 b/Processing/data/Spanish.mp3 index a7158f1..e5bba0b 100644 Binary files a/Processing/data/Spanish.mp3 and b/Processing/data/Spanish.mp3 differ diff --git a/Processing/data/vibraphon.aiff b/Processing/data/vibraphon.aiff deleted file mode 100644 index b4e95a3..0000000 Binary files a/Processing/data/vibraphon.aiff and /dev/null differ