X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_region_list.cc;h=5bf704f649851d70c0d9382984eec669387c0aaa;hb=f9f5ec85fbfd15d0008f70d4185a84eeadfd3891;hp=04f59944b8aa4dccd924cb1ab356b48f2fe43f17;hpb=2fcdf14e2b63753be7b9cd74a442fa5aefbfb401;p=ardour.git diff --git a/gtk2_ardour/editor_region_list.cc b/gtk2_ardour/editor_region_list.cc index 04f59944b8..5bf704f649 100644 --- a/gtk2_ardour/editor_region_list.cc +++ b/gtk2_ardour/editor_region_list.cc @@ -26,6 +26,7 @@ #include #include +#include #include #include @@ -41,28 +42,37 @@ using namespace sigc; using namespace ARDOUR; +using namespace PBD; using namespace Gtk; using namespace Glib; using namespace Editing; 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)); @@ -70,7 +80,7 @@ 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; @@ -91,7 +101,8 @@ 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 { @@ -99,7 +110,8 @@ Editor::add_audio_region_to_region_display (AudioRegion *region) parent = *(region_list_model->insert(iter)); 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; @@ -112,15 +124,22 @@ 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); + 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()) { str = ".../"; - str += PBD::basename_nosuffix (region->source().name()); - + + boost::shared_ptr afs = boost::dynamic_pointer_cast(region->source()); + + if (afs) { + str += region_name_from_path (afs->path(), region->n_channels() > 1); + } else { + str += region->source()->name(); + } + } else { str = region->name(); } @@ -146,11 +165,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; @@ -195,20 +214,20 @@ Editor::region_list_selection_changed() */ if ((iter = region_list_model->get_iter (*i))) { - set_selected_regionview_from_region_list (*((*iter)[region_list_columns.region]), false); + set_selected_regionview_from_region_list (((*iter)[region_list_columns.region]), 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); } } @@ -224,23 +243,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 () { @@ -318,7 +332,7 @@ 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; @@ -331,25 +345,20 @@ Editor::region_list_display_button_press (GdkEventButton *ev) } } - 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; @@ -357,7 +366,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; @@ -377,7 +386,7 @@ Editor::region_list_display_button_release (GdkEventButton *ev) TreeViewColumn* column; int cellx; int celly; - Region* region = 0; + 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))) { @@ -386,7 +395,7 @@ Editor::region_list_display_button_release (GdkEventButton *ev) } if (region && Keyboard::is_delete_event (ev)) { - session->remove_region_from_region_list (*region); + session->remove_region_from_region_list (region); return true; } @@ -394,9 +403,9 @@ Editor::region_list_display_button_release (GdkEventButton *ev) } 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 (); @@ -410,7 +419,7 @@ Editor::consider_auditioning (Region& region) } } - session->audition_region (*r); + session->audition_region (r); last_audition_region = r; } @@ -419,8 +428,8 @@ Editor::region_list_sorter (TreeModel::iterator a, TreeModel::iterator b) { int cmp = 0; - Region* r1 = (*a)[region_list_columns.region]; - Region* r2 = (*b)[region_list_columns.region]; + boost::shared_ptr r1 = (*a)[region_list_columns.region]; + boost::shared_ptr r2 = (*b)[region_list_columns.region]; /* handle rows without regions, like "Hidden" */ @@ -432,8 +441,8 @@ Editor::region_list_sorter (TreeModel::iterator a, TreeModel::iterator b) 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; @@ -462,7 +471,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: @@ -474,22 +483,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; } @@ -519,7 +528,7 @@ Editor::reset_region_list_sort_direction (bool up) } 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 (); @@ -533,20 +542,21 @@ Editor::region_list_selection_mapover (slot sl) TreeIter iter; if ((iter = region_list_model->get_iter (*i))) { - sl (*((*iter)[region_list_columns.region])); + sl (((*iter)[region_list_columns.region])); } } } 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); } @@ -565,6 +575,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)); } @@ -574,10 +585,11 @@ 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); } } @@ -587,5 +599,7 @@ Editor::region_list_selection_filter (const RefPtr& model, const Tree { /* not possible to select rows that do not represent regions, like "Hidden" */ - return (*(model->get_iter (path)))[region_list_columns.region] != 0; + /// XXXX FIXME boost::shared_ptr r = ((model->get_iter (path)))[region_list_columns.region]; + /// return r != 0; + return true; }