[SCM] calf/master: + JACK host: improve detection of new LASH API, uncomment the use of lash_client_is_being_restored

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a42ee81ef3b15a604c1264813badee905d73bc56
Author: Juuso Alasuutari <juuso.alasuutari at gmail.com>
Date:   Sat Mar 7 22:21:59 2009 +0000

    + JACK host: improve detection of new LASH API, uncomment the use of lash_client_is_being_restored

diff --git a/configure.ac b/configure.ac
index 074dd3d..0769ccd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,7 +60,9 @@ AC_SUBST(FLUIDSYNTH_DEPS_CFLAGS)
 AC_SUBST(FLUIDSYNTH_DEPS_LIBS)
 
 PKG_CHECK_MODULES(LV2_DEPS, lv2core >= 1, LV2_ENABLED="yes", LV2_ENABLED="no")
-PKG_CHECK_MODULES(LASH_DEPS, lash-1.0 >= 0.6.0, LASH_0_6_ENABLED="yes", LASH_0_6_ENABLED="no")
+PKG_CHECK_MODULES(LASH_DEPS, lash-1.0 >= 0.6.0,
+  AC_CHECK_LIB([lash], [lash_client_is_being_restored], LASH_0_6_ENABLED="yes", LASH_0_6_ENABLED="no"),
+  LASH_0_6_ENABLED="no")
 if test "$LASH_0_6_ENABLED" = "yes"; then
   LASH_ENABLED="yes"
 else
diff --git a/src/jackhost.cpp b/src/jackhost.cpp
index 117bf25..41243e3 100644
--- a/src/jackhost.cpp
+++ b/src/jackhost.cpp
@@ -740,7 +740,7 @@ int main(int argc, char *argv[])
     sess.lash_client = lash_init(sess.lash_args, PACKAGE_NAME, LASH_Config_Data_Set, LASH_PROTOCOL(2, 0));
 # else
     sess.lash_client = lash_client_open(PACKAGE_NAME, LASH_Config_Data_Set, argc, argv);
-    sess.restoring_session = false; // lash_client_is_being_restored(sess.lash_client);
+    sess.restoring_session = lash_client_is_being_restored(sess.lash_client);
     lash_set_save_data_set_callback(sess.lash_client, save_data_set_cb, &sess);
     lash_set_load_data_set_callback(sess.lash_client, load_data_set_cb, &sess);
     lash_set_quit_callback(sess.lash_client, quit_cb, NULL);

-- 
calf audio plugins packaging