X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_layering_order_editor.cc;h=dbf3fa9dcfdd063ec7d3859d605e53b9a31e6fba;hb=a0723271459cd3124a3ded4a961fd0d90ddc3aa3;hp=f6bc74a6ffb1760ea708698c2b7a78e977aa7a68;hpb=bdb84342381310f6162418e0603e7eeaabde20bd;p=ardour.git diff --git a/gtk2_ardour/region_layering_order_editor.cc b/gtk2_ardour/region_layering_order_editor.cc index f6bc74a6ff..dbf3fa9dcf 100644 --- a/gtk2_ardour/region_layering_order_editor.cc +++ b/gtk2_ardour/region_layering_order_editor.cc @@ -1,31 +1,48 @@ +/* + Copyright (C) 2011-2012 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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + #include #include #include -#include +#include "ardour/region.h" #include "gui_thread.h" -#include "i18n.h" #include "keyboard.h" #include "public_editor.h" #include "region_layering_order_editor.h" +#include "region_view.h" #include "utils.h" +#include "i18n.h" using namespace std; using namespace Gtk; using namespace ARDOUR; RegionLayeringOrderEditor::RegionLayeringOrderEditor (PublicEditor& pe) - : ArdourDialog (pe, _("RegionLayeringOrderEditor"), false, false) - , playlist () - , position () + : ArdourWindow (_("RegionLayeringOrderEditor")) + , position (0) , in_row_change (false) , regions_at_position (0) - , layering_order_columns () , layering_order_model (Gtk::ListStore::create (layering_order_columns)) - , layering_order_display () - , clock ("layer dialog", true, "RegionLayeringOrderEditorClock", false, false, false) - , scroller () + , clock ("layer dialog", true, "", false, false, false) , editor (pe) + , _time_axis_view (0) { set_name ("RegionLayeringOrderEditorWindow"); @@ -46,7 +63,7 @@ RegionLayeringOrderEditor::RegionLayeringOrderEditor (PublicEditor& pe) scroller_table->attach (scroller, 0, 1, 0, 1); scroller_table->set_col_spacings (5); scroller_table->set_row_spacings (5); - + track_label.set_name ("RegionLayeringOrderEditorLabel"); track_label.set_text (_("Track:")); track_label.set_alignment (0, 0.5); @@ -56,7 +73,7 @@ RegionLayeringOrderEditor::RegionLayeringOrderEditor (PublicEditor& pe) track_name_label.set_name ("RegionLayeringOrderEditorNameLabel"); track_name_label.set_alignment (0, 0.5); clock.set_mode (AudioClock::BBT); - + Gtk::Table* info_table = manage (new Gtk::Table (2, 2)); info_table->set_col_spacings (5); info_table->set_row_spacings (5); @@ -64,11 +81,13 @@ RegionLayeringOrderEditor::RegionLayeringOrderEditor (PublicEditor& pe) info_table->attach (track_name_label, 1, 2, 0, 1, FILL, FILL); info_table->attach (clock_label, 0, 1, 1, 2, FILL, FILL); info_table->attach (clock, 1, 2, 1, 2, FILL, FILL); - - get_vbox()->set_spacing (12); - get_vbox()->pack_start (*info_table, false, false); - get_vbox()->pack_start (*scroller_table, true, true); - + + Gtk::VBox* vbox = Gtk::manage (new Gtk::VBox ()); + vbox->set_spacing (12); + vbox->pack_start (*info_table, false, false); + vbox->pack_start (*scroller_table, true, true); + add (*vbox); + info_table->set_name ("RegionLayeringOrderTable"); scroller_table->set_name ("RegionLayeringOrderTable"); @@ -84,10 +103,11 @@ RegionLayeringOrderEditor::RegionLayeringOrderEditor (PublicEditor& pe) RegionLayeringOrderEditor::~RegionLayeringOrderEditor () { + } void -RegionLayeringOrderEditor::row_activated (const TreeModel::Path& path, TreeViewColumn* column) +RegionLayeringOrderEditor::row_activated (const TreeModel::Path& path, TreeViewColumn*) { if (in_row_change) { return; @@ -95,40 +115,42 @@ RegionLayeringOrderEditor::row_activated (const TreeModel::Path& path, TreeViewC TreeModel::iterator iter = layering_order_model->get_iter (path); - if (iter) { - TreeModel::Row row = *iter; - boost::shared_ptr region = row[layering_order_columns.region]; - - region->raise_to_top (); + if (!iter) { + return; + } + + TreeModel::Row row = *iter; + RegionView* rv = row[layering_order_columns.region_view]; + + vector eq; + editor.get_equivalent_regions (rv, eq, Properties::edit.property_id); + + for (vector::iterator i = eq.begin(); i != eq.end(); ++i) { + (*i)->region()->raise_to_top (); } } -typedef boost::shared_ptr RegionPtr; - -struct RegionCompareByLayer { - bool operator() (RegionPtr a, RegionPtr b) const { - return a->layer() > b->layer(); - } +struct RegionViewCompareByLayer { + bool operator() (RegionView* a, RegionView* b) const { + return a->region()->layer() > b->region()->layer(); + } }; void RegionLayeringOrderEditor::refill () { + assert (_time_axis_view); + regions_at_position = 0; - - if (!playlist) { - return; - } - - typedef Playlist::RegionList RegionList; - in_row_change = true; - layering_order_model->clear (); - boost::shared_ptr region_list(playlist->regions_at (position)); + RegionSelection region_list; + TrackViewList ts; + ts.push_back (_time_axis_view); + editor.get_regions_at (region_list, position, ts); - regions_at_position = region_list->size(); + regions_at_position = region_list.size (); if (regions_at_position < 2) { playlist_modified_connection.disconnect (); @@ -137,15 +159,15 @@ RegionLayeringOrderEditor::refill () return; } - RegionCompareByLayer cmp; - region_list->sort (cmp); + RegionViewCompareByLayer cmp; + region_list.sort (cmp); - for (RegionList::const_iterator i = region_list->begin(); i != region_list->end(); ++i) { + for (RegionSelection::const_iterator i = region_list.begin(); i != region_list.end(); ++i) { TreeModel::Row newrow = *(layering_order_model->append()); - newrow[layering_order_columns.name] = (*i)->name(); - newrow[layering_order_columns.region] = *i; + newrow[layering_order_columns.name] = (*i)->region()->name(); + newrow[layering_order_columns.region_view] = *i; - if (i == region_list->begin()) { + if (i == region_list.begin()) { layering_order_display.get_selection()->select(newrow); } } @@ -154,17 +176,18 @@ RegionLayeringOrderEditor::refill () } void -RegionLayeringOrderEditor::set_context (const string& a_name, Session* s, const boost::shared_ptr & pl, framepos_t pos) +RegionLayeringOrderEditor::set_context (const string& a_name, Session* s, TimeAxisView* tav, boost::shared_ptr pl, framepos_t pos) { track_name_label.set_text (a_name); clock.set_session (s); - clock.set (pos, true, 0, 0); + clock.set (pos, true); playlist_modified_connection.disconnect (); - playlist = pl; - playlist->ContentsChanged.connect (playlist_modified_connection, invalidator (*this), boost::bind - (&RegionLayeringOrderEditor::playlist_modified, this), gui_context()); + pl->ContentsChanged.connect (playlist_modified_connection, invalidator (*this), boost::bind + (&RegionLayeringOrderEditor::playlist_modified, this), gui_context()); + + _time_axis_view = tav; position = pos; refill (); @@ -185,20 +208,20 @@ RegionLayeringOrderEditor::on_key_press_event (GdkEventKey* ev) */ if (ev->keyval == GDK_Return) { - handled = ArdourDialog::on_key_press_event (ev); + handled = ArdourWindow::on_key_press_event (ev); } - + if (!handled) { handled = key_press_focus_accelerator_handler (editor, ev); } if (!handled) { - handled = ArdourDialog::on_key_press_event (ev); + handled = ArdourWindow::on_key_press_event (ev); } - + return handled; } - + void RegionLayeringOrderEditor::maybe_present () {