diff options
| author | Florian Jung <flo@thinkpad.(none)> | 2010-12-31 16:33:17 +0100 |
|---|---|---|
| committer | Florian Jung <flo@thinkpad.(none)> | 2010-12-31 16:33:17 +0100 |
| commit | ff2f14ab35cf1cb2ded11b4ae86d24dda738b445 (patch) | |
| tree | 3e35d112243bf987f66359a53e4ff9261bdc6d1b /synth | |
| parent | d46f6ee0a6298ff58c6f4f0647d49fb4a76f9ea9 (diff) | |
Add initial code for the note-compiler
The note-compiler now has a Parser class which knows about possible
parameter changes (by controller, velocity or simply user definition).
Furthermore, several files were adapted (by stripping unneeded code,
adding the bool foo_const variables etc.).
Small fix in util.c which causes extract_var("foo") to return "foo"
instead of "".
Fixes in both Makefiles.
Diffstat (limited to 'synth')
| -rw-r--r-- | synth/Makefile | 3 | ||||
| -rw-r--r-- | synth/util.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/synth/Makefile b/synth/Makefile index 7146da2..f84441c 100644 --- a/synth/Makefile +++ b/synth/Makefile @@ -1,5 +1,6 @@ CXX=g++ -CXXFLAGS=-Wall -g +CFLAGS=-Wall -g +CXXFLAGS=$(CFLAGS) LDFLAGS=-lm `pkg-config --cflags --libs jack` OBJ=channel.o cli.o defines.o envelope.o filter.o globals.o jack.o load.o main.o note.o note_skel.o parser.o programs.o readwave.o util.o diff --git a/synth/util.cpp b/synth/util.cpp index ca213fd..51e6fda 100644 --- a/synth/util.cpp +++ b/synth/util.cpp @@ -192,7 +192,7 @@ string extract_val(string s) if (p!=string::npos) return s.substr(p+1); else - return ""; + return s; } string fileext(string f) |