Stop crossfades disappearing on region view drags.

[ardour.git] / gtk2_ardour / editor_snapshots.cc

diff --git a/gtk2_ardour/editor_snapshots.cc b/gtk2_ardour/editor_snapshots.cc
index 92fa6d76d658d32edb5ce0834591ad803dc0a91b..e7bd89f6043235eecfbbc2651cd4bb814e8dc325 100644 (file)
--- a/gtk2_ardour/editor_snapshots.cc
+++ b/gtk2_ardour/editor_snapshots.cc
@@ -30,7 +30,6 @@
 #include "prompter.h"
 
 using namespace std;
-using namespace sigc;
 using namespace PBD;
 using namespace Gtk;
 using namespace ARDOUR;
@@ -48,14 +47,14 @@ EditorSnapshots::EditorSnapshots (Editor* e)
        _scroller.add (_display);
        _scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
 
-       _display.get_selection()->signal_changed().connect (mem_fun(*this, &EditorSnapshots::selection_changed));
-       _display.signal_button_press_event().connect (mem_fun (*this, &EditorSnapshots::button_press), false);
+       _display.get_selection()->signal_changed().connect (sigc::mem_fun(*this, &EditorSnapshots::selection_changed));
+       _display.signal_button_press_event().connect (sigc::mem_fun (*this, &EditorSnapshots::button_press), false);
 }
 
 void
-EditorSnapshots::connect_to_session (Session* s)
+EditorSnapshots::set_session (Session* s)
 {
-       EditorComponent::connect_to_session (s);
+       EditorComponent::set_session (s);
 
        redisplay ();
 }
@@ -121,9 +120,9 @@ EditorSnapshots::popup_context_menu (int button, int32_t time, Glib::ustring sna
 
        const bool modification_allowed = (_session->snap_name() != snapshot_name && _session->name() != snapshot_name);
 
-       add_item_with_sensitivity (items, MenuElem (_("Remove"), bind (mem_fun (*this, &EditorSnapshots::remove), snapshot_name)), modification_allowed);
+       add_item_with_sensitivity (items, MenuElem (_("Remove"), sigc::bind (sigc::mem_fun (*this, &EditorSnapshots::remove), snapshot_name)), modification_allowed);
 
-       add_item_with_sensitivity (items, MenuElem (_("Rename"), bind (mem_fun (*this, &EditorSnapshots::rename), snapshot_name)), modification_allowed);
+       add_item_with_sensitivity (items, MenuElem (_("Rename"), sigc::bind (sigc::mem_fun (*this, &EditorSnapshots::rename), snapshot_name)), modification_allowed);
 
        _menu.popup (button, time);
 }
@@ -155,12 +154,12 @@ EditorSnapshots::remove (Glib::ustring name)
 {
        vector<string> choices;
 
-       std::string prompt = string_compose (_("Do you really want to remove snapshot \"%1\" ?\n(cannot be undone)"), name);
+       std::string prompt = string_compose (_("Do you really want to remove snapshot \"%1\" ?\n(which cannot be undone)"), name);
 
        choices.push_back (_("No, do nothing."));
        choices.push_back (_("Yes, remove it."));
 
-       Gtkmm2ext::Choice prompter (prompt, choices);
+       Gtkmm2ext::Choice prompter (_("Remove snapshot"), prompt, choices);
 
        if (prompter.run () == 1) {
                _session->remove_state (name);