From e78131ccbbcb81da94e5992f788c6ea291a2050d Mon Sep 17 00:00:00 2001
From: Florian Jung <flo@thinkpad.(none)>
Date: Thu, 6 Jan 2011 20:16:19 +0100
Subject: The synthesizer can now load the compiled notes

There are still issues:
 - filtertest.prog.so: output_note-message which is not true
 - huge size of the .so (48K are too much!)
---
 synth/main.cpp | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

(limited to 'synth/main.cpp')

diff --git a/synth/main.cpp b/synth/main.cpp
index ae2e0d8..56c47b9 100644
--- a/synth/main.cpp
+++ b/synth/main.cpp
@@ -12,6 +12,7 @@
 #include "programs.h"
 #include "defines.h"
 #include "globals.h"
+#include "note_loader.h"
 
 using namespace std;
 
@@ -104,6 +105,24 @@ int main(int argc, char** argv)
 				try
 				{
 					program_settings[i]=parse(programfile[i]);
+					
+					// try to load the appropriate .so file
+					if (access(  (programfile[i]+".so").c_str(), R_OK ) == 0)
+					{
+						try
+						{
+							cout << "trying to load..."<<endl;
+							load_note_from_so(programfile[i]+".so", program_settings[i]);
+						}
+						catch (string err)
+						{
+							output_note("NOTE: could not load shared object '"+programfile[i]+".so"+"':\n"
+							            "  "+err+"\n"
+							            "  this is not fatal, the note has been loaded properly, but generic\n"
+							            "  unoptimized (slow) code will be used.");
+						}        
+					}
+					
 				}
 				catch (string err)
 				{
@@ -119,7 +138,9 @@ int main(int argc, char** argv)
 			}
 		}
 		
-				
+		for (i=0;i<N_WAVEFORMS;i++)
+			wave[i]=new fixed_t[WAVE_RES];
+			
 		for (i=0;i<WAVE_RES;i++)
 		{
 			wave[0][i]=sin(i*2.0*3.141592654/WAVE_RES)*ONE;
-- 
cgit v1.2.3