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 673d5c22a1b6ab4169d17a2c3d76785925a8fc5c..e7bd89f6043235eecfbbc2651cd4bb814e8dc325 100644 (file)
--- a/gtk2_ardour/editor_snapshots.cc
+++ b/gtk2_ardour/editor_snapshots.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2009 Paul Davis 
+    Copyright (C) 2000-2009 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@
 
 #include <gtkmm/liststore.h>
 #include "gtkmm2ext/choice.h"
+#include "ardour/session.h"
 #include "ardour/session_state_utils.h"
 #include "ardour/session_directory.h"
 #include "editor_snapshots.h"
@@ -29,7 +30,6 @@
 #include "prompter.h"
 
 using namespace std;
-using namespace sigc;
 using namespace PBD;
 using namespace Gtk;
 using namespace ARDOUR;
@@ -47,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 ();
 }
@@ -67,17 +67,17 @@ EditorSnapshots::selection_changed ()
        if (_display.get_selection()->count_selected_rows() > 0) {
 
                TreeModel::iterator i = _display.get_selection()->get_selected();
-               
+
                Glib::ustring snap_name = (*i)[_columns.real_name];
 
                if (snap_name.length() == 0) {
                        return;
                }
-               
+
                if (_session->snap_name() == snap_name) {
                        return;
                }
-               
+
                ARDOUR_UI::instance()->load_session (_session->path(), string (snap_name));
        }
 }
@@ -120,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);
 }
@@ -138,7 +138,7 @@ EditorSnapshots::rename (Glib::ustring old_name)
        prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
        prompter.set_prompt (_("New name of snapshot"));
        prompter.set_initial_text (old_name);
-       
+
        if (prompter.run() == RESPONSE_ACCEPT) {
                prompter.get_result (new_name);
                if (new_name.length()) {
@@ -154,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);
@@ -191,18 +191,18 @@ EditorSnapshots::redisplay ()
        {
                string statename = (*i);
                TreeModel::Row row = *(_model->append());
-               
+
                /* this lingers on in case we ever want to change the visible
                   name of the snapshot.
                */
-               
+
                string display_name;
                display_name = statename;
 
                if (statename == _session->snap_name()) {
                        _display.get_selection()->select(row);
-               } 
-               
+               }
+
                row[_columns.visible_name] = display_name;
                row[_columns.real_name] = statename;
        }