diff --git a/Makefile b/Makefile index 8bf680e..6a30249 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,16 @@ +prefix := /usr/local + VERSION := 0.5.0 -FLTK_LIBS := `fltk-config --ldflags` +FLTK_LIBS := `fltk-config --use-images --ldflags` JACK_LIBS := `pkg-config --libs jack` SNDFILE_LIBS := `pkg-config --libs sndfile` LASH_LIBS := `pkg-config --libs lash-1.0` LASH_CFLAGS := `pkg-config --cflags lash-1.0` -CXXFLAGS := $(LASH_CFLAGS) -DVERSION=\"$(VERSION)\" -ggdb -Wextra -Wno-missing-field-initializers -O0 -fno-rtti -fno-exceptions +CXXFLAGS := $(LASH_CFLAGS) -DINSTALL_PREFIX=\"$(prefix)\" -DVERSION=\"$(VERSION)\" -ggdb -Wextra -Wno-missing-field-initializers -O0 -fno-rtti -fno-exceptions all: makedepend FL Timeline Mixer diff --git a/Timeline/TLE.fl b/Timeline/TLE.fl index 070da02..1812f4a 100644 --- a/Timeline/TLE.fl +++ b/Timeline/TLE.fl @@ -35,6 +35,8 @@ decl {\#include } {} decl {\#include } {} +decl {\#include } {} + decl {extern char project_display_name[256];} {global } @@ -619,8 +621,7 @@ else } m->redraw(); -project_name->redraw();} {selected - } +project_name->redraw();} {} } Function {update_progress( Fl_Progress *p, char *s, float v )} {open private return_type {static void} } { @@ -695,7 +696,8 @@ with fast, light, reliable alternatives.} } Fl_Box {} { label {the Non-DAW (Digital Audio Workstation)} - image {../logo-small.png} xywh {-1 1 499 115} align 16 + xywh {-1 1 499 115} align 16 + code0 {o->image( new Fl_PNG_Image( INSTALL_PREFIX "/share/pixmaps/non-daw/logo.png" ) );} } } } diff --git a/Timeline/main.C b/Timeline/main.C index 2deb875..f1444e4 100644 --- a/Timeline/main.C +++ b/Timeline/main.C @@ -95,9 +95,14 @@ lash_cb ( void *arg ) Fl::repeat_timeout( lash_poll_interval, lash_cb, 0 ); } +#include + int main ( int argc, char **argv ) { + + fl_register_images(); + /* welcome to C++ */ LOG_REGISTER_CREATE( Annotation_Point ); LOG_REGISTER_CREATE( Annotation_Region ); diff --git a/pixmaps/logo.png b/pixmaps/logo.png new file mode 100644 index 0000000..bc02925 Binary files /dev/null and b/pixmaps/logo.png differ diff --git a/pixmaps/logo.svg b/pixmaps/logo.svg new file mode 100644 index 0000000..c71f781 --- /dev/null +++ b/pixmaps/logo.svg @@ -0,0 +1,339 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Non + DAW + + + + + + + + diff --git a/pixmaps/logo2.png b/pixmaps/logo2.png new file mode 100644 index 0000000..d1605f8 Binary files /dev/null and b/pixmaps/logo2.png differ diff --git a/pixmaps/logo2.svg b/pixmaps/logo2.svg new file mode 100644 index 0000000..2a3da6a --- /dev/null +++ b/pixmaps/logo2.svg @@ -0,0 +1,207 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + Non + DAW + + + + + + +