From b7f8e400a0dec68393abdef87f517105c4c101a6 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sat, 26 Apr 2014 18:25:08 +0000
Subject: Hide Jack session management unless explicitly configured.

git-svn-id: http://svn.drobilla.net/lad/trunk/patchage@5370 a436a847-0d15-0410-975c-d299462d15a1
---
 src/Patchage.cpp | 5 +++--
 src/patchage.ui  | 6 ------
 wscript          | 8 ++++----
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/Patchage.cpp b/src/Patchage.cpp
index 4dec0f2..f3fc86b 100644
--- a/src/Patchage.cpp
+++ b/src/Patchage.cpp
@@ -179,7 +179,9 @@ Patchage::Patchage(int argc, char** argv)
 	_menu_save_close_session->signal_activate().connect(
 		sigc::mem_fun(this, &Patchage::show_save_close_session_dialog));
 #else
-	_menu_open_session->set_sensitive(false);
+	_menu_open_session->hide();
+	_menu_save_session->hide();
+	_menu_save_close_session->hide();
 #endif
 
 #ifdef HAVE_ALSA
@@ -837,7 +839,6 @@ Patchage::on_quit()
 	_jack_driver->detach();
 #endif
 	_main_win->hide();
-	_canvas.reset();
 }
 
 void
diff --git a/src/patchage.ui b/src/patchage.ui
index f41c938..10494cd 100644
--- a/src/patchage.ui
+++ b/src/patchage.ui
@@ -764,12 +764,6 @@ Nedko Arnaudov &lt;nedko@arnaudov.name&gt;</property>
                         <property name="use_underline">True</property>
                       </object>
                     </child>
-                    <child>
-                      <object class="GtkSeparatorMenuItem" id="menu_file_draw_sep">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                      </object>
-                    </child>
                     <child>
                       <object class="GtkMenuItem" id="menu_export_dot">
                         <property name="use_action_appearance">False</property>
diff --git a/wscript b/wscript
index 8df049e..303b910 100644
--- a/wscript
+++ b/wscript
@@ -31,8 +31,8 @@ def options(opt):
                     help='Patchage human name [Default: '' + APP_HUMAN_NAME + '']')
     opt.add_option('--jack-dbus', action='store_true', dest='jack_dbus',
                     help='Use Jack via D-Bus [Default: False (use libjack)]')
-    opt.add_option('--no-jack-session', action='store_true', dest='no_jack_session',
-                    help='Do not build JACK session support')
+    opt.add_option('--jack-session-manage', action='store_true', dest='jack_session_manage',
+                    help='Include experimental JACK session management (save/restore) support')
     opt.add_option('--no-alsa', action='store_true', dest='no_alsa',
                     help='Do not build Alsa Sequencer support')
     opt.add_option('--no-binloc', action='store_true', dest='no_binloc',
@@ -82,7 +82,7 @@ def configure(conf):
                           atleast_version='0.120.0', mandatory=False)
         if conf.is_defined('HAVE_JACK'):
             autowaf.define(conf, 'PATCHAGE_LIBJACK', 1)
-            if not Options.options.no_jack_session:
+            if Options.options.jack_session_manage:
                 autowaf.define(conf, 'PATCHAGE_JACK_SESSION', 1)
             conf.check(function_name='jack_get_property',
                        header_name='jack/metadata.h',
@@ -117,7 +117,7 @@ def configure(conf):
     autowaf.display_msg(conf, "App human name", "'" + conf.env.APP_HUMAN_NAME + "'", 'CYAN')
     autowaf.display_msg(conf, "Jack (D-Bus)", conf.is_defined('HAVE_JACK_DBUS'))
     autowaf.display_msg(conf, "Jack (libjack)", conf.is_defined('PATCHAGE_LIBJACK'))
-    autowaf.display_msg(conf, "Jack Session", conf.is_defined('PATCHAGE_JACK_SESSION'))
+    autowaf.display_msg(conf, "Jack Session Management", conf.is_defined('PATCHAGE_JACK_SESSION'))
     autowaf.display_msg(conf, "Jack Metadata", conf.is_defined('HAVE_JACK_METADATA'))
     autowaf.display_msg(conf, "Alsa Sequencer", conf.is_defined('HAVE_ALSA'))
     if Options.platform == 'darwin':
-- 
cgit v1.2.1