shared_ptr fixes

[ardour.git] / gtk2_ardour / actions.cc

diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc
index c60fa824dd6b638c011594ad606332a3f5a59867..2197d4dc005174b19d41d78727c2ca0699bfacd5 100644 (file)
--- a/gtk2_ardour/actions.cc
+++ b/gtk2_ardour/actions.cc
@@ -19,7 +19,7 @@
 */
 
 #include <vector>
-#include <string.h>
+#include <string>
 
 #include <gtk/gtkaccelmap.h>
 #include <gtk/gtkuimanager.h>
@@ -39,12 +39,18 @@ using namespace std;
 using namespace Gtk;
 using namespace Glib;
 using namespace sigc;
+using namespace PBD;
 
 vector<RefPtr<Gtk::Action> > ActionManager::session_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::plugin_selection_sensitive_actions;
+vector<RefPtr<Gtk::Action> > ActionManager::point_selection_sensitive_actions;
+vector<RefPtr<Gtk::Action> > ActionManager::time_selection_sensitive_actions;
+vector<RefPtr<Gtk::Action> > ActionManager::line_selection_sensitive_actions;
+vector<RefPtr<Gtk::Action> > ActionManager::playlist_selection_sensitive_actions;
+
 vector<RefPtr<Gtk::Action> > ActionManager::range_sensitive_actions;
 vector<RefPtr<Gtk::Action> > ActionManager::jack_sensitive_actions;
 vector<RefPtr<Gtk::Action> > ActionManager::jack_opposite_sensitive_actions;
@@ -59,19 +65,23 @@ ActionManager::init ()
 {
        ui_manager = UIManager::create ();
        
-       std::string ui_file = Glib::getenv(X_("ARDOUR_UI"));
-    
-        if(!Glib::file_test(ui_file, Glib::FILE_TEST_EXISTS)) ui_file = ARDOUR::find_config_file("ardour.menus");
+       std::string ui_file = ARDOUR::find_config_file("ardour.menus");
 
-       std::cout << "Loading UI definition file " << ui_file << std::endl;
+       bool loaded = false;
        
        try {
                ui_manager->add_ui_from_file (ui_file);
+               loaded = true;
        } catch (Glib::MarkupError& err) {
                error << "badly formatted UI definition file" << endmsg;
        } catch (...) {
                error << "Ardour menu definition file not found" << endmsg;
        }
+
+       if (!loaded) {
+               error << "ardour will not work without a valid ardour.menus file" << endmsg;
+               exit(1);
+       }
 }
 
 RefPtr<Action>
@@ -126,7 +136,6 @@ ActionManager::register_radio_action (RefPtr<ActionGroup> group, RadioAction::Gr
        return act;
 }
 
-
 RefPtr<Action>
 ActionManager::register_toggle_action (RefPtr<ActionGroup> group, const char * name, const char * label, slot<void> sl, guint key, Gdk::ModifierType mods)
 {