From e99b008ba4ea7cc3adc708f50e2b66780ad9f3c4 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 7 Jul 2011 19:22:16 +0000 Subject: Add stub persist extension support (not yet functional) git-svn-id: http://svn.drobilla.net/lad/trunk/jalv@3419 a436a847-0d15-0410-975c-d299462d15a1 --- src/jalv.c | 5 +++-- src/jalv_internal.h | 5 +++++ wscript | 16 +++++++++------- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/jalv.c b/src/jalv.c index 2f9d541..56f1c01 100644 --- a/src/jalv.c +++ b/src/jalv.c @@ -283,12 +283,13 @@ jack_session_cb(jack_session_event_t* event, void* arg) switch (event->type) { case JackSessionSave: + case JackSessionSaveTemplate: + jalv_save(host, event->session_dir); break; case JackSessionSaveAndQuit: + jalv_save(host, event->session_dir); sem_post(&exit_sem); break; - case JackSessionSaveTemplate: - break; } jack_session_event_free(event); diff --git a/src/jalv_internal.h b/src/jalv_internal.h index 950d1b7..8c4743b 100644 --- a/src/jalv_internal.h +++ b/src/jalv_internal.h @@ -72,6 +72,11 @@ jalv_open_ui(Jalv* jalv, bool jalv_emit_ui_events(Jalv* jalv); +void +jalv_save(Jalv* jalv, const char* dir); + +void +jalv_restore(Jalv* jalv, const char* dir); #ifdef __cplusplus } // extern "C" diff --git a/wscript b/wscript index 343ccbc..c74c5a2 100644 --- a/wscript +++ b/wscript @@ -43,10 +43,10 @@ def configure(conf): autowaf.check_pkg(conf, 'QtGui', uselib_store='QT4', atleast_version='4.0.0', mandatory=False) - autowaf.check_header(conf, 'lv2/lv2plug.in/ns/lv2core/lv2.h') - autowaf.check_header(conf, 'lv2/lv2plug.in/ns/ext/event/event.h') - autowaf.check_header(conf, 'lv2/lv2plug.in/ns/ext/event/event-helpers.h') - autowaf.check_header(conf, 'lv2/lv2plug.in/ns/ext/uri-map/uri-map.h') + autowaf.check_header(conf, 'c', 'lv2/lv2plug.in/ns/lv2core/lv2.h') + autowaf.check_header(conf, 'c', 'lv2/lv2plug.in/ns/ext/event/event.h') + autowaf.check_header(conf, 'c', 'lv2/lv2plug.in/ns/ext/event/event-helpers.h') + autowaf.check_header(conf, 'c', 'lv2/lv2plug.in/ns/ext/uri-map/uri-map.h') if not Options.options.no_jack_session: autowaf.define(conf, 'JALV_JACK_SESSION', 1) @@ -65,9 +65,11 @@ def configure(conf): def build(bld): libs = 'LILV SUIL JACK' + source = 'src/jalv.c src/symap.c src/persist.c' + # Non-GUI version obj = bld(features = 'c cprogram', - source = 'src/jalv.c src/symap.c src/jalv_console.c', + source = source + ' src/jalv_console.c', target = 'jalv', includes = ['.'], install_path = '${BINDIR}') @@ -76,7 +78,7 @@ def build(bld): # Gtk version if bld.is_defined('HAVE_GTK2'): obj = bld(features = 'c cprogram', - source = 'src/jalv.c src/symap.c src/jalv_gtk2.c', + source = source + ' src/jalv_gtk2.c', target = 'jalv.gtk', includes = ['.'], install_path = '${BINDIR}') @@ -85,7 +87,7 @@ def build(bld): # Qt version if bld.is_defined('HAVE_QT4'): obj = bld(features = 'c cxx cxxprogram', - source = 'src/jalv.c src/symap.c src/jalv_qt4.cpp', + source = source + ' src/jalv_qt4.cpp', target = 'jalv.qt', includes = ['.'], install_path = '${BINDIR}') -- cgit v1.2.1