Use LV2_SUPPORT define instead of HAVE_SLV2.

[ardour.git] / gtk2_ardour / actions.cc

diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc
index 5836a4c2011579671494d4f47d566aba6b880f86..41bc30266fbc294ac22d56e9f601271b8735e275 100644 (file)
--- a/gtk2_ardour/actions.cc
+++ b/gtk2_ardour/actions.cc
@@ -51,7 +51,6 @@ vector<RefPtr<Gtk::Action> > ActionManager::session_sensitive_actions;
 vector<RefPtr<Gtk::Action> > ActionManager::write_sensitive_actions;
 vector<RefPtr<Gtk::Action> > ActionManager::region_list_selection_sensitive_actions;
 vector<RefPtr<Gtk::Action> > ActionManager::plugin_selection_sensitive_actions;
-vector<RefPtr<Gtk::Action> > ActionManager::region_selection_sensitive_actions;
 vector<RefPtr<Gtk::Action> > ActionManager::track_selection_sensitive_actions;
 vector<RefPtr<Gtk::Action> > ActionManager::point_selection_sensitive_actions;
 vector<RefPtr<Gtk::Action> > ActionManager::time_selection_sensitive_actions;
@@ -87,12 +86,12 @@ ActionManager::init ()
                error << string_compose (_("badly formatted UI definition file: %1"), err.what()) << endmsg;
                cerr << string_compose (_("badly formatted UI definition file: %1"), err.what()) << endl;
        } catch (...) {
-               error << _("Ardour menu definition file not found") << endmsg;
+               error << string_compose (_("%1 menu definition file not found"), PROGRAM_NAME) << endmsg;
        }
 
        if (!loaded) {
-               cerr << _("ardour will not work without a valid ardour.menus file") << endl;
-               error << _("ardour will not work without a valid ardour.menus file") << endmsg;
+               cerr << string_compose (_("%1 will not work without a valid ardour.menus file"), PROGRAM_NAME) << endl;
+               error << string_compose (_("%1 will not work without a valid ardour.menus file"), PROGRAM_NAME) << endmsg;
                exit(1);
        }
 }
@@ -186,16 +185,3 @@ ActionManager::map_some_state (const char* group, const char* action, sigc::slot
        }
 }
 
-string
-ActionManager::get_key_representation (const string& accel_path, AccelKey& key)
-{
-       bool known = lookup_entry (accel_path, key);
-       
-       if (known) {
-               uint32_t k = possibly_translate_legal_accelerator_to_real_key (key.get_key());
-               key = AccelKey (k, Gdk::ModifierType (key.get_mod()));
-               return ui_manager->get_accel_group()->name (key.get_key(), Gdk::ModifierType (key.get_mod()));
-       } 
-       
-       return unbound_string;
-}