X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Feditor_selection_list.cc;h=3991dc5aae82c859927f0377ce1a751b2668ca84;hb=e0d0735fa2c2543c6995e9128dbd16c799f4ec8f;hp=ddf73b8e4eb08bde196e0253f0572dce50f23fb8;hpb=64dc5427e4f5339a16a018692dd94f476c53cae9;p=ardour.git diff --git a/gtk2_ardour/editor_selection_list.cc b/gtk2_ardour/editor_selection_list.cc index ddf73b8e4e..3991dc5aae 100644 --- a/gtk2_ardour/editor_selection_list.cc +++ b/gtk2_ardour/editor_selection_list.cc @@ -27,8 +27,6 @@ #include "ardour/session_selection.h" #include "ardour/playlist.h" -#include - #include "editor.h" #include "keyboard.h" #include "selection.h" @@ -39,7 +37,6 @@ #include "i18n.h" using namespace std; -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Gtk; @@ -48,15 +45,15 @@ using namespace Gtkmm2ext; void Editor::handle_new_named_selection () { - ARDOUR_UI::instance()->call_slot (sigc::mem_fun(*this, &Editor::redisplay_named_selections)); + ARDOUR_UI::instance()->call_slot (boost::bind (&Editor::redisplay_named_selections, this)); } void -Editor::add_named_selection_to_named_selection_display (NamedSelection& selection) +Editor::add_named_selection_to_named_selection_display (boost::shared_ptr selection) { TreeModel::Row row = *(named_selection_model->append()); row[named_selection_columns.text] = selection.name; - row[named_selection_columns.selection] = &selection; + row[named_selection_columns.selection] = selection; } void @@ -196,13 +193,14 @@ Editor::create_named_selection () return; } - new NamedSelection (name, thelist); // creation will add it to the model + boost::shared_ptr ns (new NamedSelection (name, thelist)); /* make the one we just added be selected */ TreeModel::Children::iterator added = named_selection_model->children().end(); --added; named_selection_display.get_selection()->select (*added); + } else { error << _("No selectable material found in the currently selected time range") << endmsg; }