From f6fdd8dcbf41f864e9f0cc32dabe81fe3533ddfe Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 17 Dec 2009 18:24:23 +0000 Subject: switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/location_importer.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libs/ardour/location_importer.cc') diff --git a/libs/ardour/location_importer.cc b/libs/ardour/location_importer.cc index 6fb9f7b7db..655a8f1a84 100644 --- a/libs/ardour/location_importer.cc +++ b/libs/ardour/location_importer.cc @@ -143,7 +143,7 @@ LocationImporter::_prepare_move () std::pair rename_pair; if (location->is_auto_punch()) { - rename_pair = Rename (_("The location is the Punch range. It will be imported as a normal range.\nYou may rename the imported location:"), name); + rename_pair = *Rename (_("The location is the Punch range. It will be imported as a normal range.\nYou may rename the imported location:"), name); if (!rename_pair.first) { return false; } @@ -154,7 +154,7 @@ LocationImporter::_prepare_move () } if (location->is_auto_loop()) { - rename_pair = Rename (_("The location is a Loop range. It will be imported as a normal range.\nYou may rename the imported location:"), name); + rename_pair = *Rename (_("The location is a Loop range. It will be imported as a normal range.\nYou may rename the imported location:"), name); if (!rename_pair.first) { return false; } location->set_auto_loop (false, this); @@ -165,7 +165,7 @@ LocationImporter::_prepare_move () Locations::LocationList const & locations(session.locations()->list()); for (Locations::LocationList::const_iterator it = locations.begin(); it != locations.end(); ++it) { if (!((*it)->name().compare (location->name())) || !handler.check_name (location->name())) { - rename_pair = Rename (_("A location with that name already exists.\nYou may rename the imported location:"), name); + rename_pair = *Rename (_("A location with that name already exists.\nYou may rename the imported location:"), name); if (!rename_pair.first) { return false; } name = rename_pair.second; } -- cgit v1.2.3