X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_region_list.cc;h=8a50332193400448173cfba7c0b5392dae996abe;hb=376c5381edca72ce25a04d449e7df39ecbc0d4d0;hp=431c436acdef95fd4779f78a295be56d5b838234;hpb=1f89cd52f0ad19ca9f8174c29d2c3873d3b89d62;p=ardour.git diff --git a/gtk2_ardour/editor_region_list.cc b/gtk2_ardour/editor_region_list.cc index 431c436acd..8a50332193 100644 --- a/gtk2_ardour/editor_region_list.cc +++ b/gtk2_ardour/editor_region_list.cc @@ -15,23 +15,26 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #include #include #include #include +#include #include #include +#include +#include #include #include #include "editor.h" #include "editing.h" +#include "keyboard.h" #include "ardour_ui.h" #include "gui_thread.h" #include "actions.h" @@ -41,164 +44,37 @@ using namespace sigc; using namespace ARDOUR; +using namespace PBD; using namespace Gtk; using namespace Glib; using namespace Editing; -#define wave_cursor_width 43 -#define wave_cursor_height 61 -#define wave_cursor_x_hot 0 -#define wave_cursor_y_hot 25 -static const gchar wave_cursor_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, - 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00, -0x00, - 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, -0x00, - 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, -0x00, - 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 0xff, -0x03, - 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, -0x02, - 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, -0x02, - 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, -0x02, - 0x02, 0x04, 0x00, 0x00, 0x00, 0x02, 0x02, 0x04, 0x00, 0x04, 0x00, -0x02, - 0x02, 0x04, 0x00, 0x04, 0x00, 0x02, 0x02, 0x0c, 0x08, 0x0c, 0x00, -0x02, - 0x02, 0x1c, 0x08, 0x0c, 0x00, 0x02, 0x02, 0x1c, 0x08, 0x0c, 0x04, -0x02, - 0x02, 0x3c, 0x18, 0x0c, 0x04, 0x02, 0x02, 0x7c, 0x18, 0x1c, 0x0c, -0x02, - 0x82, 0xfc, 0x38, 0x1c, 0x0c, 0x02, 0xc2, 0xfc, 0x78, 0x3c, 0x1c, -0x02, - 0xe2, 0xfd, 0xf9, 0x7d, 0x1c, 0x02, 0xf2, 0xff, 0xfb, 0xff, 0x1c, -0x02, - 0xfa, 0xff, 0xfb, 0xff, 0x3f, 0x02, 0xfe, 0xff, 0xff, 0xff, 0xff, -0x03, - 0xfe, 0xff, 0xff, 0xff, 0xff, 0x03, 0xfa, 0xff, 0xff, 0xff, 0x3f, -0x02, - 0xf2, 0xff, 0xfb, 0xfd, 0x3c, 0x02, 0xe2, 0xfd, 0x7b, 0x7c, 0x1c, -0x02, - 0xc2, 0xfc, 0x39, 0x3c, 0x1c, 0x02, 0x82, 0xfc, 0x18, 0x1c, 0x1c, -0x02, - 0x02, 0xfc, 0x18, 0x1c, 0x0c, 0x02, 0x02, 0x7c, 0x18, 0x0c, 0x0c, -0x02, - 0x02, 0x3c, 0x08, 0x0c, 0x04, 0x02, 0x02, 0x1c, 0x08, 0x0c, 0x04, -0x02, - 0x02, 0x1c, 0x08, 0x0c, 0x00, 0x02, 0x02, 0x0c, 0x00, 0x04, 0x00, -0x02, - 0x02, 0x04, 0x00, 0x04, 0x00, 0x02, 0x02, 0x04, 0x00, 0x00, 0x00, -0x02, - 0x02, 0x04, 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, -0x02, - 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, -0x02, - 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, -0x02, - 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0xfe, 0xff, 0xff, 0xff, 0xff, -0x03, - 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, -0x00, - 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, -0x00, - 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00, -0x00, - 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; - -#define wave_cursor_mask_width 43 -#define wave_cursor_mask_height 61 -#define wave_cursor_mask_x_hot 0 -#define wave_cursor_mask_y_hot 25 -static const gchar wave_cursor_mask_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, - 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x04, 0x00, -0x00, - 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x0c, 0x08, 0x0c, 0x00, -0x00, - 0x00, 0x1c, 0x08, 0x0c, 0x00, 0x00, 0x00, 0x1c, 0x08, 0x0c, 0x04, -0x00, - 0x00, 0x3c, 0x18, 0x0c, 0x04, 0x00, 0x00, 0x7c, 0x18, 0x1c, 0x0c, -0x00, - 0x80, 0xfc, 0x38, 0x1c, 0x0c, 0x00, 0xc0, 0xfc, 0x78, 0x3c, 0x1c, -0x00, - 0xe0, 0xfd, 0xf9, 0x7d, 0x1c, 0x00, 0xf0, 0xff, 0xfb, 0xff, 0x1c, -0x00, - 0xf8, 0xff, 0xfb, 0xff, 0x3f, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, -0x07, - 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0xf8, 0xff, 0xff, 0xff, 0x3f, -0x00, - 0xf0, 0xff, 0xfb, 0xfd, 0x3c, 0x00, 0xe0, 0xfd, 0x7b, 0x7c, 0x1c, -0x00, - 0xc0, 0xfc, 0x39, 0x3c, 0x1c, 0x00, 0x80, 0xfc, 0x18, 0x1c, 0x1c, -0x00, - 0x00, 0xfc, 0x18, 0x1c, 0x0c, 0x00, 0x00, 0x7c, 0x18, 0x0c, 0x0c, -0x00, - 0x00, 0x3c, 0x08, 0x0c, 0x04, 0x00, 0x00, 0x1c, 0x08, 0x0c, 0x04, -0x00, - 0x00, 0x1c, 0x08, 0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x04, 0x00, -0x00, - 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, -0x00, - 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; - -GdkCursor *wave_cursor = 0; - void -Editor::handle_audio_region_removed (AudioRegion* ignored) +Editor::handle_region_removed (boost::weak_ptr wregion) { + ENSURE_GUI_THREAD (mem_fun (*this, &Editor::redisplay_regions)); redisplay_regions (); } void -Editor::handle_new_audio_region (AudioRegion *region) +Editor::handle_new_region (boost::weak_ptr wregion) { + ENSURE_GUI_THREAD (bind (mem_fun (*this, &Editor::handle_new_region), wregion)); + /* don't copy region - the one we are being notified about belongs to the session, and so it will never be edited. */ - add_audio_region_to_region_display (region); + + boost::shared_ptr region (wregion.lock()); + + if (region) { + add_region_to_region_display (region); + } } void -Editor::region_hidden (Region* r) +Editor::region_hidden (boost::shared_ptr r) { ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::region_hidden), r)); @@ -206,11 +82,14 @@ Editor::region_hidden (Region* r) } void -Editor::add_audio_region_to_region_display (AudioRegion *region) +Editor::add_region_to_region_display (boost::shared_ptr region) { string str; TreeModel::Row row; Gdk::Color c; + bool missing_source; + + missing_source = boost::dynamic_pointer_cast(region->source()); if (!show_automatic_regions_in_region_list && region->automatic()) { return; @@ -218,7 +97,7 @@ Editor::add_audio_region_to_region_display (AudioRegion *region) if (region->hidden()) { - TreeModel::iterator iter = region_list_model->get_iter (_("/Hidden")); + TreeModel::iterator iter = region_list_model->get_iter ("0"); TreeModel::Row parent; TreeModel::Row child; @@ -227,9 +106,22 @@ Editor::add_audio_region_to_region_display (AudioRegion *region) parent = *(region_list_model->append()); parent[region_list_columns.name] = _("Hidden"); - parent[region_list_columns.region] = 0; + boost::shared_ptr proxy = parent[region_list_columns.region]; + proxy.reset (); + } else { - parent = *iter; + + if ((*iter)[region_list_columns.name] != _("Hidden")) { + + parent = *(region_list_model->insert(iter)); + parent[region_list_columns.name] = _("Hidden"); + boost::shared_ptr proxy = parent[region_list_columns.region]; + proxy.reset (); + + } else { + parent = *iter; + } + } row = *(region_list_model->append (parent.children())); @@ -237,15 +129,27 @@ Editor::add_audio_region_to_region_display (AudioRegion *region) } else if (region->whole_file()) { row = *(region_list_model->append()); - set_color(c, 65535, 0, 0); + if (missing_source) { + c.set_rgb(65535,0,0); // FIXME: error color from style + } else { + set_color(c, rgba_from_style ("RegionListWholeFile", 0xff, 0, 0, 0, "fg", Gtk::STATE_NORMAL, false )); + } row[region_list_columns.color_] = c; - if (region->source().name()[0] == '/') { // external file + if (region->source()->name()[0] == '/') { // external file if (region->whole_file()) { + + boost::shared_ptr afs = boost::dynamic_pointer_cast(region->source()); + str = ".../"; - str += PBD::basename_nosuffix (region->source().name()); - + + if (afs) { + str = region_name_from_path (afs->path(), region->n_channels() > 1); + } else { + str += region->source()->name(); + } + } else { str = region->name(); } @@ -256,6 +160,18 @@ Editor::add_audio_region_to_region_display (AudioRegion *region) } + if (region->n_channels() > 1) { + std::stringstream foo; + foo << region->n_channels (); + str += " ["; + str += foo.str(); + str += ']'; + } + + if (missing_source) { + str += _(" (MISSING)"); + } + row[region_list_columns.name] = str; row[region_list_columns.region] = region; @@ -271,11 +187,11 @@ Editor::add_audio_region_to_region_display (AudioRegion *region) for (i = rows.begin(); i != rows.end(); ++i) { - Region* rr = (*i)[region_list_columns.region]; - AudioRegion* r = dynamic_cast(rr); + boost::shared_ptr rr = (*i)[region_list_columns.region]; + boost::shared_ptr r = boost::dynamic_pointer_cast(rr); if (r && r->whole_file()) { - if (region->source_equivalent (*r)) { + if (region->source_equivalent (r)) { row = *(region_list_model->append ((*i).children())); found_parent = true; break; @@ -315,25 +231,32 @@ Editor::region_list_selection_changed() TreeView::Selection::ListHandle_Path::iterator i = rows.begin(); TreeIter iter; - /* just set the first selected region (in fact, the selection model might be SINGLE, which - means there can only be one. - */ - if ((iter = region_list_model->get_iter (*i))) { - set_selected_regionview_from_region_list (*((*iter)[region_list_columns.region]), false); + boost::shared_ptr r = (*iter)[region_list_columns.region]; + + /* they could have clicked on a row that is just a placeholder, like "Hidden" */ + + if (r) { + + /* just set the first selected region (in fact, the selection model might be SINGLE, which + means there can only be one. + */ + + set_selected_regionview_from_region_list (r, Selection::Set); + } } } } void -Editor::insert_into_tmp_audio_regionlist(AudioRegion* region) +Editor::insert_into_tmp_regionlist(boost::shared_ptr region) { /* keep all whole files at the beginning */ if (region->whole_file()) { - tmp_audio_region_list.push_front (region); + tmp_region_list.push_front (region); } else { - tmp_audio_region_list.push_back (region); + tmp_region_list.push_back (region); } } @@ -349,23 +272,18 @@ Editor::redisplay_regions () sorting. */ - tmp_audio_region_list.clear(); - session->foreach_audio_region (this, &Editor::insert_into_tmp_audio_regionlist); + tmp_region_list.clear(); + session->foreach_region (this, &Editor::insert_into_tmp_regionlist); - for (list::iterator r = tmp_audio_region_list.begin(); r != tmp_audio_region_list.end(); ++r) { - add_audio_region_to_region_display (*r); + for (list >::iterator r = tmp_region_list.begin(); r != tmp_region_list.end(); ++r) { + add_region_to_region_display (*r); } + tmp_region_list.clear(); region_list_display.set_model (region_list_model); } } -void -Editor::region_list_clear () -{ - region_list_model->clear(); -} - void Editor::build_region_list_menu () { @@ -373,21 +291,30 @@ Editor::build_region_list_menu () /* now grab specific menu items that we need */ - toggle_full_region_list_action = ActionManager::get_action (X_("RegionList"), X_("rlShowAll")); + Glib::RefPtr act; + + act = ActionManager::get_action (X_("RegionList"), X_("rlShowAll")); + if (act) { + toggle_full_region_list_action = Glib::RefPtr::cast_dynamic (act); + } + + act = ActionManager::get_action (X_("RegionList"), X_("rlShowAuto")); + if (act) { + toggle_show_auto_regions_action = Glib::RefPtr::cast_dynamic (act); + } } void Editor::toggle_show_auto_regions () { - //show_automatic_regions_in_region_list = toggle_auto_regions_item->get_active(); - show_automatic_regions_in_region_list = true; + show_automatic_regions_in_region_list = toggle_show_auto_regions_action->get_active(); redisplay_regions (); } void Editor::toggle_full_region_list () { - if (toggle_full_region_list_item->get_active()) { + if (toggle_full_region_list_action->get_active()) { region_list_display.expand_all (); } else { region_list_display.collapse_all (); @@ -434,40 +361,33 @@ Editor::region_list_display_key_release (GdkEventKey* ev) bool Editor::region_list_display_button_press (GdkEventButton *ev) { - Region* region; + boost::shared_ptr region; TreeIter iter; TreeModel::Path path; TreeViewColumn* column; int cellx; int celly; - cerr << "RL button press\n"; - if (region_list_display.get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly)) { if ((iter = region_list_model->get_iter (path))) { region = (*iter)[region_list_columns.region]; } } - if (region == 0) { - return false; - } - - if (Keyboard::is_delete_event (ev)) { - session->remove_region_from_region_list (*region); - return true; - } - if (Keyboard::is_context_menu_event (ev)) { show_region_list_display_context_menu (ev->button, ev->time); return true; } + if (region == 0) { + return false; + } + switch (ev->button) { case 1: /* audition on double click */ if (ev->type == GDK_2BUTTON_PRESS) { - consider_auditioning (*region); + consider_auditioning (region); return true; } return false; @@ -475,7 +395,7 @@ Editor::region_list_display_button_press (GdkEventButton *ev) case 2: if (!Keyboard::modifier_state_equals (ev->state, Keyboard::Control)) { - consider_auditioning (*region); + consider_auditioning (region); } return true; break; @@ -495,9 +415,7 @@ Editor::region_list_display_button_release (GdkEventButton *ev) TreeViewColumn* column; int cellx; int celly; - Region* region; - - cerr << "RL button release\n"; + boost::shared_ptr region; if (region_list_display.get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly)) { if ((iter = region_list_model->get_iter (path))) { @@ -505,31 +423,18 @@ Editor::region_list_display_button_release (GdkEventButton *ev) } } - if (Keyboard::is_delete_event (ev)) { - session->remove_region_from_region_list (*region); + if (region && Keyboard::is_delete_event (ev)) { + session->remove_region_from_region_list (region); return true; } - switch (ev->button) { - case 1: - return false; - break; - - case 3: - return false; - break; - - default: - break; - } - return false; } void -Editor::consider_auditioning (Region& region) +Editor::consider_auditioning (boost::shared_ptr region) { - AudioRegion* r = dynamic_cast (®ion); + boost::shared_ptr r = boost::dynamic_pointer_cast (region); if (r == 0) { session->cancel_audition (); @@ -543,20 +448,30 @@ Editor::consider_auditioning (Region& region) } } - session->audition_region (*r); + session->audition_region (r); last_audition_region = r; } int Editor::region_list_sorter (TreeModel::iterator a, TreeModel::iterator b) { - int cmp; + int cmp = 0; + + boost::shared_ptr r1 = (*a)[region_list_columns.region]; + boost::shared_ptr r2 = (*b)[region_list_columns.region]; + + /* handle rows without regions, like "Hidden" */ + + if (r1 == 0) { + return -1; + } - Region* r1 = (*a)[region_list_columns.region]; - Region* r2 = (*b)[region_list_columns.region]; + if (r2 == 0) { + return 1; + } - AudioRegion* region1 = dynamic_cast (r1); - AudioRegion* region2 = dynamic_cast (r2); + boost::shared_ptr region1 = boost::dynamic_pointer_cast (r1); + boost::shared_ptr region2 = boost::dynamic_pointer_cast (r2); if (region1 == 0 || region2 == 0) { Glib::ustring s1; @@ -585,7 +500,7 @@ Editor::region_list_sorter (TreeModel::iterator a, TreeModel::iterator b) break; case ByTimestamp: - cmp = region1->source().timestamp() - region2->source().timestamp(); + cmp = region1->source()->timestamp() - region2->source()->timestamp(); break; case ByStartInFile: @@ -597,22 +512,22 @@ Editor::region_list_sorter (TreeModel::iterator a, TreeModel::iterator b) break; case BySourceFileName: - cmp = strcasecmp (region1->source().name().c_str(), region2->source().name().c_str()); + cmp = strcasecmp (region1->source()->name().c_str(), region2->source()->name().c_str()); break; case BySourceFileLength: - cmp = region1->source().length() - region2->source().length(); + cmp = region1->source()->length() - region2->source()->length(); break; case BySourceFileCreationDate: - cmp = region1->source().timestamp() - region2->source().timestamp(); + cmp = region1->source()->timestamp() - region2->source()->timestamp(); break; case BySourceFileFS: - if (region1->source().name() == region2->source().name()) { + if (region1->source()->name() == region2->source()->name()) { cmp = strcasecmp (region1->name().c_str(), region2->name().c_str()); } else { - cmp = strcasecmp (region1->source().name().c_str(), region2->source().name().c_str()); + cmp = strcasecmp (region1->source()->name().c_str(), region2->source()->name().c_str()); } break; } @@ -631,18 +546,18 @@ Editor::reset_region_list_sort_type (RegionListSortType type) { if (type != region_list_sort_type) { region_list_sort_type = type; - region_list_sort_model->set_sort_func (0, mem_fun (*this, &Editor::region_list_sorter)); + region_list_model->set_sort_func (0, (mem_fun (*this, &Editor::region_list_sorter))); } } void Editor::reset_region_list_sort_direction (bool up) { - // region_list_display.set_sort_type (up ? GTK_SORT_ASCENDING : GTK_SORT_DESCENDING); + region_list_model->set_sort_column (0, up ? SORT_ASCENDING : SORT_DESCENDING); } void -Editor::region_list_selection_mapover (slot sl) +Editor::region_list_selection_mapover (slot > sl) { Glib::RefPtr selection = region_list_display.get_selection(); TreeView::Selection::ListHandle_Path rows = selection->get_selected_rows (); @@ -656,20 +571,30 @@ Editor::region_list_selection_mapover (slot sl) TreeIter iter; if ((iter = region_list_model->get_iter (*i))) { - sl (*((*iter)[region_list_columns.region])); + + /* some rows don't have a region associated with them, but can still be + selected (XXX maybe prevent them from being selected) + */ + + boost::shared_ptr r = (*iter)[region_list_columns.region]; + + if (r) { + sl (r); + } } } } void -Editor::hide_a_region (Region& r) +Editor::hide_a_region (boost::shared_ptr r) { - r.set_hidden (true); + r->set_hidden (true); } void -Editor::remove_a_region (Region& r) +Editor::remove_a_region (boost::shared_ptr r) { + cerr << "remove " << r->name(); session->remove_region_from_region_list (r); } @@ -688,6 +613,7 @@ Editor::hide_region_from_region_list () void Editor::remove_region_from_region_list () { + cerr << "Mapping remove over region selection\n"; region_list_selection_mapover (mem_fun (*this, &Editor::remove_a_region)); } @@ -697,11 +623,21 @@ Editor::region_list_display_drag_data_received (const RefPtr& const SelectionData& data, guint info, guint time) { - vector paths; + vector paths; if (convert_drop_to_paths (paths, context, x, y, data, info, time) == 0) { - do_embed_sndfiles (paths, false); + nframes_t pos = 0; + do_embed (paths, false, ImportAsRegion, 0, pos, true); context->drag_finish (true, false, time); } } +bool +Editor::region_list_selection_filter (const RefPtr& model, const TreeModel::Path& path, bool yn) +{ + /* not possible to select rows that do not represent regions, like "Hidden" */ + + /// XXXX FIXME boost::shared_ptr r = ((model->get_iter (path)))[region_list_columns.region]; + /// return r != 0; + return true; +}