/*
- Copyright (C) 2000 Paul Davis
+ Copyright (C) 2000 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
#include <libgnomecanvasmm/canvas.h>
#include <libgnomecanvasmm/item.h>
-#include <pbd/error.h>
+#include "pbd/error.h"
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/selector.h>
#include <gtkmm2ext/stop_signal.h>
-#include <ardour/session.h>
-#include <ardour/utils.h>
-#include <ardour/ladspa_plugin.h>
-#include <ardour/processor.h>
-#include <ardour/location.h>
+#include "ardour/session.h"
+#include "ardour/utils.h"
+#include "ardour/ladspa_plugin.h"
+#include "ardour/processor.h"
+#include "ardour/location.h"
#include "ardour_ui.h"
+#include "gui_thread.h"
#include "public_editor.h"
#include "time_axis_view.h"
#include "region_view.h"
#include "keyboard.h"
#include "rgb_macros.h"
#include "utils.h"
+#include "streamview.h"
#include "i18n.h"
+using namespace std;
using namespace Gtk;
using namespace Gdk;
-using namespace sigc;
using namespace ARDOUR;
using namespace PBD;
using namespace Editing;
using namespace ArdourCanvas;
+using Gtkmm2ext::Keyboard;
const double trim_handle_size = 6.0; /* pixels */
uint32_t TimeAxisView::hSmaller = 0;
uint32_t TimeAxisView::hSmall = 0;
bool TimeAxisView::need_size_info = true;
-
-TimeAxisView::TimeAxisView (ARDOUR::Session& sess, PublicEditor& ed, TimeAxisView* rent, Canvas& canvas)
- : AxisView (sess),
- editor (ed),
- y_position(0),
- order(0),
- controls_table (2, 8)
+int const TimeAxisView::_max_order = 512;
+PBD::Signal1<void,TimeAxisView*> TimeAxisView::CatchDeletion;
+
+TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisView* rent, Canvas& /*canvas*/)
+ : AxisView (sess),
+ controls_table (2, 8),
+ _y_position (0),
+ _editor (ed),
+ _order (0)
{
if (need_size_info) {
compute_controls_size_info ();
need_size_info = false;
}
+ _canvas_background = new Group (*ed.get_background_group (), 0.0, 0.0);
+ _canvas_display = new Group (*ed.get_trackview_group (), 0.0, 0.0);
+ _canvas_display->hide(); // reveal as needed
- canvas_display = new Group (*ed.get_trackview_group (), 0.0, 0.0);
+ selection_group = new Group (*_canvas_display);
+ selection_group->hide();
- ghost_group = new Group (*canvas_display);
- ghost_group->lower_to_bottom();
- ghost_group->show();
+ _ghost_group = new Group (*_canvas_display);
+ _ghost_group->lower_to_bottom();
+ _ghost_group->show();
- selection_group = new Group (*canvas_display);
- selection_group->hide();
-
- control_parent = 0;
+ control_parent = 0;
display_menu = 0;
size_menu = 0;
_hidden = false;
in_destructor = false;
height = 0;
- effective_height = 0;
+ _effective_height = 0;
parent = rent;
_has_state = false;
last_name_entry_key_press_event = 0;
name_packing = NamePackingBits (0);
- resize_drag_start = -1;
+ _resize_drag_start = -1;
/*
Create the standard LHS Controls
*/
name_entry.set_name ("EditorTrackNameDisplay");
- name_entry.signal_button_release_event().connect (mem_fun (*this, &TimeAxisView::name_entry_button_release));
- name_entry.signal_button_press_event().connect (mem_fun (*this, &TimeAxisView::name_entry_button_press));
- name_entry.signal_key_release_event().connect (mem_fun (*this, &TimeAxisView::name_entry_key_release));
- name_entry.signal_activate().connect (mem_fun(*this, &TimeAxisView::name_entry_activated));
- name_entry.signal_focus_in_event().connect (mem_fun (*this, &TimeAxisView::name_entry_focus_in));
- name_entry.signal_focus_out_event().connect (mem_fun (*this, &TimeAxisView::name_entry_focus_out));
+ name_entry.signal_button_release_event().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_button_release));
+ name_entry.signal_button_press_event().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_button_press));
+ name_entry.signal_key_release_event().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_key_release));
+ name_entry.signal_activate().connect (sigc::mem_fun(*this, &TimeAxisView::name_entry_activated));
+ name_entry.signal_focus_in_event().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_focus_in));
+ name_entry.signal_focus_out_event().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_focus_out));
Gtkmm2ext::set_size_request_to_display_given_text (name_entry, N_("gTortnam"), 10, 10); // just represents a short name
name_label.set_name ("TrackLabel");
name_hbox.show ();
+ controls_table.set_size_request (200);
controls_table.set_border_width (2);
controls_table.set_row_spacings (0);
controls_table.set_col_spacings (0);
resizer.set_size_request (10, 10);
resizer.set_name ("ResizeHandle");
- resizer.signal_expose_event().connect (mem_fun (*this, &TimeAxisView::resizer_expose));
- resizer.signal_button_press_event().connect (mem_fun (*this, &TimeAxisView::resizer_button_press));
- resizer.signal_button_release_event().connect (mem_fun (*this, &TimeAxisView::resizer_button_release));
- resizer.signal_motion_notify_event().connect (mem_fun (*this, &TimeAxisView::resizer_motion));
+ resizer.signal_expose_event().connect (sigc::mem_fun (*this, &TimeAxisView::resizer_expose));
+ resizer.signal_button_press_event().connect (sigc::mem_fun (*this, &TimeAxisView::resizer_button_press));
+ resizer.signal_button_release_event().connect (sigc::mem_fun (*this, &TimeAxisView::resizer_button_release));
+ resizer.signal_motion_notify_event().connect (sigc::mem_fun (*this, &TimeAxisView::resizer_motion));
resizer.set_events (Gdk::BUTTON_PRESS_MASK|
- Gdk::BUTTON_RELEASE_MASK|
- Gdk::POINTER_MOTION_MASK|
- Gdk::SCROLL_MASK);
+ Gdk::BUTTON_RELEASE_MASK|
+ Gdk::POINTER_MOTION_MASK|
+ Gdk::SCROLL_MASK);
resizer_box.pack_start (resizer, false, false);
resizer.show ();
controls_vbox.pack_end (*separator, false, false);
controls_vbox.pack_end (resizer_box, false, true);
controls_vbox.show ();
-
+
//controls_ebox.set_name ("TimeAxisViewControlsBaseUnselected");
controls_ebox.add (controls_vbox);
controls_ebox.add_events (BUTTON_PRESS_MASK|BUTTON_RELEASE_MASK|SCROLL_MASK);
controls_ebox.set_flags (CAN_FOCUS);
- controls_ebox.signal_button_release_event().connect (mem_fun (*this, &TimeAxisView::controls_ebox_button_release));
- controls_ebox.signal_scroll_event().connect (mem_fun (*this, &TimeAxisView::controls_ebox_scroll), true);
+ controls_ebox.signal_button_release_event().connect (sigc::mem_fun (*this, &TimeAxisView::controls_ebox_button_release));
+ controls_ebox.signal_scroll_event().connect (sigc::mem_fun (*this, &TimeAxisView::controls_ebox_scroll), true);
controls_hbox.pack_start (controls_ebox,true,true);
controls_hbox.show ();
- // controls_frame.add (controls_hbox);
- // controls_frame.set_name ("TimeAxisViewControlsBaseUnselected");
- // controls_vbox.set_name ("TimeAxisViewControlsBaseUnselected");
- // controls_frame.set_shadow_type (Gtk::SHADOW_ETCHED_OUT);
+ ColorsChanged.connect (sigc::mem_fun (*this, &TimeAxisView::color_handler));
- ColorsChanged.connect (mem_fun (*this, &TimeAxisView::color_handler));
+ GhostRegion::CatchDeletion.connect (*this, ui_bind (&TimeAxisView::erase_ghost, this, _1), gui_context());
}
TimeAxisView::~TimeAxisView()
delete (*i);
}
- if (selection_group) {
- delete selection_group;
- selection_group = 0;
- }
+ delete selection_group;
+ selection_group = 0;
- if (canvas_display) {
- delete canvas_display;
- canvas_display = 0;
- }
+ delete _canvas_background;
+ _canvas_background = 0;
- if (display_menu) {
- delete display_menu;
- display_menu = 0;
- }
+ delete _canvas_display;
+ _canvas_display = 0;
+
+ delete display_menu;
+ display_menu = 0;
}
+/** Display this TimeAxisView as the nth component of the parent box, at y.
+*
+* @param y y position.
+* @param nth index for this TimeAxisView, increased if this view has children.
+* @param parent parent component.
+* @return height of this TimeAxisView.
+*/
guint32
TimeAxisView::show_at (double y, int& nth, VBox *parent)
{
if (control_parent) {
control_parent->reorder_child (controls_hbox, nth);
- } else {
+ } else {
control_parent = parent;
parent->pack_start (controls_hbox, false, false);
parent->reorder_child (controls_hbox, nth);
}
- order = nth;
+ _order = nth;
- if (y_position != y) {
- /* the coordinates used here are in the system of the
- item's parent ...
- */
-
- Group* pg;
- double ix1, iy1, ix2, iy2;
- canvas_display->get_bounds (ix1, iy1, ix2, iy2);
- iy1 += editor.get_trackview_group_vertical_offset ();
- pg = canvas_display->property_parent();
- pg->i2w (ix1, iy1);
-
- if (iy1 < 0) {
- iy1 = 0;
- }
-
- canvas_display->move (0.0, y - iy1);
-
- y_position = y;
+ if (_y_position != y) {
+ _canvas_display->property_y () = y;
+ _canvas_background->property_y () = y;
+ /* silly canvas */
+ _canvas_display->move (0.0, 0.0);
+ _canvas_background->move (0.0, 0.0);
+ _y_position = y;
}
- canvas_display->raise_to_top ();
+
+ _canvas_background->raise_to_top ();
+ _canvas_display->raise_to_top ();
if (_marked_for_display) {
- canvas_display->show();
controls_hbox.show ();
controls_ebox.show ();
+ _canvas_background->show ();
}
_hidden = false;
-
- effective_height = current_height();
+
+ _effective_height = current_height ();
/* now show children */
-
+
for (Children::iterator i = children.begin(); i != children.end(); ++i) {
- if (canvas_item_visible ((*i)->canvas_display)) {
+ if (canvas_item_visible ((*i)->_canvas_display)) {
++nth;
- effective_height += (*i)->show_at (y + effective_height, nth, parent);
- }
+ _effective_height += (*i)->show_at (y + _effective_height, nth, parent);
+ }
}
- return effective_height;
+ return _effective_height;
+}
+
+void
+TimeAxisView::clip_to_viewport ()
+{
+ if (_marked_for_display) {
+ if (_y_position + _effective_height < _editor.get_trackview_group_vertical_offset () || _y_position > _editor.get_trackview_group_vertical_offset () + _canvas_display->get_canvas()->get_height()) {
+ _canvas_background->hide ();
+ _canvas_display->hide ();
+ return;
+ }
+ _canvas_background->show ();
+ _canvas_display->show ();
+ }
+ return;
}
bool
TimeAxisView::controls_ebox_scroll (GdkEventScroll* ev)
{
+ if (Keyboard::some_magic_widget_has_focus()) {
+ return false;
+ }
+
switch (ev->direction) {
case GDK_SCROLL_UP:
if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
step_height (true);
return true;
} else if (Keyboard::no_modifiers_active (ev->state)) {
- editor.scroll_tracks_up_line();
+ _editor.scroll_tracks_up_line();
return true;
}
break;
-
+
case GDK_SCROLL_DOWN:
if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
step_height (false);
return true;
} else if (Keyboard::no_modifiers_active (ev->state)) {
- editor.scroll_tracks_down_line();
+ _editor.scroll_tracks_down_line();
return true;
}
break;
void
TimeAxisView::selection_click (GdkEventButton* ev)
{
- Selection::Operation op = Keyboard::selection_type (ev->state);
- editor.set_selected_track (*this, op, false);
+ Selection::Operation op = ArdourKeyboard::selection_type (ev->state);
+ _editor.set_selected_track (*this, op, false);
}
void
return;
}
- canvas_display->hide();
- controls_hbox.hide ();
+ _canvas_display->hide ();
+ _canvas_background->hide ();
if (control_parent) {
control_parent->remove (controls_hbox);
control_parent = 0;
}
- y_position = -1;
+ _y_position = -1;
_hidden = true;
-
+
/* now hide children */
-
+
for (Children::iterator i = children.begin(); i != children.end(); ++i) {
(*i)->hide ();
}
-
+
+ /* if its hidden, it cannot be selected */
+
+ _editor.get_selection().remove (this);
+
Hiding ();
}
void
TimeAxisView::set_heights (uint32_t h)
{
- TrackSelection& ts (editor.get_selection().tracks);
+ TrackSelection& ts (_editor.get_selection().tracks);
for (TrackSelection::iterator i = ts.begin(); i != ts.end(); ++i) {
(*i)->set_height (h);
(*i)->set_height ();
}
- if (canvas_item_visible (selection_group)) {
+ if (canvas_item_visible (selection_group)) {
/* resize the selection rect */
- show_selection (editor.get_selection().time);
+ show_selection (_editor.get_selection().time);
}
reshow_feature_lines ();
bool
TimeAxisView::name_entry_key_release (GdkEventKey* ev)
{
- PublicEditor::TrackViewList *allviews = 0;
- PublicEditor::TrackViewList::iterator i;
+ TrackViewList::iterator i;
switch (ev->keyval) {
case GDK_Escape:
return true;
/* Shift+Tab Keys Pressed. Note that for Shift+Tab, GDK actually
- * generates a different ev->keyval, rather than setting
+ * generates a different ev->keyval, rather than setting
* ev->state.
*/
case GDK_ISO_Left_Tab:
case GDK_Tab:
+ {
name_entry_changed ();
- allviews = editor.get_valid_views (0);
- if (allviews != 0) {
- i = find (allviews->begin(), allviews->end(), this);
- if (ev->keyval == GDK_Tab) {
- if (i != allviews->end()) {
- do {
- if (++i == allviews->end()) { return true; }
- } while((*i)->hidden());
- }
- } else {
- if (i != allviews->begin()) {
- do {
- if (--i == allviews->begin()) { return true; }
- } while ((*i)->hidden());
- }
+ TrackViewList const & allviews = _editor.get_track_views ();
+ TrackViewList::const_iterator i = find (allviews.begin(), allviews.end(), this);
+ if (ev->keyval == GDK_Tab) {
+ if (i != allviews.end()) {
+ do {
+ if (++i == allviews.end()) {
+ return true;
+ }
+ } while((*i)->hidden());
}
-
-
- /* resize to show editable name display */
-
- if ((*i)->current_height() >= hSmall && (*i)->current_height() < hNormal) {
- (*i)->set_height (hSmaller);
+ } else {
+ if (i != allviews.begin()) {
+ do {
+ if (i == allviews.begin()) {
+ return true;
+ }
+ --i;
+ } while ((*i)->hidden());
}
-
- (*i)->name_entry.grab_focus();
}
- return true;
-
+
+
+ /* resize to show editable name display */
+
+ if ((*i)->current_height() <= hSmaller) {
+ (*i)->set_height (hSmaller);
+ }
+
+ (*i)->name_entry.grab_focus();
+ }
+ return true;
+
case GDK_Up:
case GDK_Down:
name_entry_changed ();
break;
}
-#ifdef TIMEOUT_NAME_EDIT
+#ifdef TIMEOUT_NAME_EDIT
/* adapt the timeout to reflect the user's typing speed */
guint32 name_entry_timeout;
/* wait 1 seconds and if no more keys are pressed, act as if they pressed enter */
name_entry_key_timeout.disconnect();
- name_entry_key_timeout = Glib::signal_timeout().connect (mem_fun (*this, &TimeAxisView::name_entry_key_timed_out), name_entry_timeout);
+ name_entry_key_timeout = Glib::signal_timeout().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_key_timed_out), name_entry_timeout);
#endif
return false;
}
bool
-TimeAxisView::name_entry_focus_in (GdkEventFocus* ev)
+TimeAxisView::name_entry_focus_in (GdkEventFocus*)
{
name_entry.select_region (0, -1);
name_entry.set_name ("EditorActiveTrackNameDisplay");
}
bool
-TimeAxisView::name_entry_focus_out (GdkEventFocus* ev)
+TimeAxisView::name_entry_focus_out (GdkEventFocus*)
{
/* clean up */
name_entry_key_timeout.disconnect ();
name_entry.set_name ("EditorTrackNameDisplay");
name_entry.select_region (0,0);
-
+
/* do the real stuff */
name_entry_changed ();
void
TimeAxisView::conditionally_add_to_selection ()
{
- Selection& s (editor.get_selection());
+ Selection& s (_editor.get_selection ());
if (!s.selected (this)) {
- editor.set_selected_track (*this, Selection::Set);
+ _editor.set_selected_track (*this, Selection::Set);
}
}
-
void
TimeAxisView::popup_display_menu (guint32 when)
{
}
conditionally_add_to_selection ();
- display_menu->popup (1, when);
+ display_menu->popup (1, when);
}
gint
if (yn == _selected) {
return;
}
-
+
Selectable::set_selected (yn);
if (_selected) {
controls_ebox.set_name (controls_base_selected_name);
controls_hbox.set_name (controls_base_selected_name);
controls_vbox.set_name (controls_base_selected_name);
- /* propagate any existing selection, if the mode is right */
-
- if (editor.current_mouse_mode() == Editing::MouseRange && !editor.get_selection().time.empty()) {
- show_selection (editor.get_selection().time);
- }
-
} else {
controls_ebox.set_name (controls_base_unselected_name);
controls_hbox.set_name (controls_base_unselected_name);
size_menu = new Menu;
size_menu->set_name ("ArdourContextMenu");
MenuList& items = size_menu->items();
-
- items.push_back (MenuElem (_("Largest"), bind (mem_fun (*this, &TimeAxisView::set_heights), hLargest)));
- items.push_back (MenuElem (_("Large"), bind (mem_fun (*this, &TimeAxisView::set_heights), hLarge)));
- items.push_back (MenuElem (_("Larger"), bind (mem_fun (*this, &TimeAxisView::set_heights), hLarger)));
- items.push_back (MenuElem (_("Normal"), bind (mem_fun (*this, &TimeAxisView::set_heights), hNormal)));
- items.push_back (MenuElem (_("Smaller"), bind (mem_fun (*this, &TimeAxisView::set_heights),hSmaller)));
- items.push_back (MenuElem (_("Small"), bind (mem_fun (*this, &TimeAxisView::set_heights), hSmall)));
+
+ items.push_back (MenuElem (_("Largest"), sigc::bind (sigc::mem_fun (*this, &TimeAxisView::set_heights), hLargest)));
+ items.push_back (MenuElem (_("Large"), sigc::bind (sigc::mem_fun (*this, &TimeAxisView::set_heights), hLarge)));
+ items.push_back (MenuElem (_("Larger"), sigc::bind (sigc::mem_fun (*this, &TimeAxisView::set_heights), hLarger)));
+ items.push_back (MenuElem (_("Normal"), sigc::bind (sigc::mem_fun (*this, &TimeAxisView::set_heights), hNormal)));
+ items.push_back (MenuElem (_("Smaller"), sigc::bind (sigc::mem_fun (*this, &TimeAxisView::set_heights),hSmaller)));
+ items.push_back (MenuElem (_("Small"), sigc::bind (sigc::mem_fun (*this, &TimeAxisView::set_heights), hSmall)));
}
void
{
using namespace Menu_Helpers;
+ delete display_menu;
+
display_menu = new Menu;
display_menu->set_name ("ArdourContextMenu");
list<ArdourCanvas::SimpleLine*>::iterator l;
for (i = analysis_features.begin(), l = feature_lines.begin(); i != analysis_features.end() && l != feature_lines.end(); ++i, ++l) {
- (*l)->property_x1() = editor.frame_to_pixel (*i);
- (*l)->property_x2() = editor.frame_to_pixel (*i);
+ (*l)->property_x1() = _editor.frame_to_pixel (*i);
+ (*l)->property_x2() = _editor.frame_to_pixel (*i);
}
}
selection_group->show();
selection_group->raise_to_top();
-
+
for (list<AudioRange>::iterator i = ts.begin(); i != ts.end(); ++i) {
nframes_t start, end, cnt;
cnt = end - start + 1;
rect = get_selection_rect ((*i).id);
-
- x1 = editor.frame_to_unit (start);
- x2 = editor.frame_to_unit (start + cnt - 1);
+
+ x1 = _editor.frame_to_unit (start);
+ x2 = _editor.frame_to_unit (start + cnt - 1);
y2 = current_height();
rect->rect->property_x1() = x1;
rect->rect->property_y1() = 1.0;
rect->rect->property_x2() = x2;
rect->rect->property_y2() = y2;
-
+
// trim boxes are at the top for selections
-
+
if (x2 > x1) {
rect->start_trim->property_x1() = x1;
rect->start_trim->property_y1() = 1.0;
}
selection_group->hide();
}
-
+
for (Children::iterator i = children.begin(); i != children.end(); ++i) {
(*i)->hide_selection ();
}
for (list<SelectionRect*>::iterator i = used_selection_rects.begin(); i != used_selection_rects.end(); ++i) {
if ((*i)->start_trim == item || (*i)->end_trim == item) {
-
+
/* make one trim handle be "above" the other so that if they overlap,
the top one is the one last used.
*/
-
+
(*i)->rect->raise_to_top ();
(put_start_on_top ? (*i)->start_trim : (*i)->end_trim)->raise_to_top ();
(put_start_on_top ? (*i)->end_trim : (*i)->start_trim)->raise_to_top ();
-
+
break;
}
}
}
/* no existing matching rect, so go get a new one from the free list, or create one if there are none */
-
+
if (free_selection_rects.empty()) {
rect = new SelectionRect;
rect->rect->property_y2() = 0.0;
rect->rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_SelectionRect.get();
rect->rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get();
-
+
rect->start_trim = new SimpleRect (*selection_group);
rect->start_trim->property_x1() = 0.0;
rect->start_trim->property_x2() = 0.0;
rect->start_trim->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get();
rect->start_trim->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get();
-
+
rect->end_trim = new SimpleRect (*selection_group);
rect->end_trim->property_x1() = 0.0;
rect->end_trim->property_x2() = 0.0;
free_selection_rects.push_front (rect);
- rect->rect->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_selection_rect_event), rect->rect, rect));
- rect->start_trim->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_selection_start_trim_event), rect->rect, rect));
- rect->end_trim->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_selection_end_trim_event), rect->rect, rect));
- }
+ rect->rect->signal_event().connect (sigc::bind (sigc::mem_fun (_editor, &PublicEditor::canvas_selection_rect_event), rect->rect, rect));
+ rect->start_trim->signal_event().connect (sigc::bind (sigc::mem_fun (_editor, &PublicEditor::canvas_selection_start_trim_event), rect->rect, rect));
+ rect->end_trim->signal_event().connect (sigc::bind (sigc::mem_fun (_editor, &PublicEditor::canvas_selection_end_trim_event), rect->rect, rect));
+ }
rect = free_selection_rects.front();
rect->id = id;
}
void
-TimeAxisView::get_selectables (nframes_t start, nframes_t end, double top, double bot, list<Selectable*>& result)
+TimeAxisView::get_selectables (nframes_t /*start*/, nframes_t /*end*/, double /*top*/, double /*bot*/, list<Selectable*>& /*result*/)
{
return;
}
void
-TimeAxisView::get_inverted_selectables (Selection& sel, list<Selectable*>& result)
+TimeAxisView::get_inverted_selectables (Selection& /*sel*/, list<Selectable*>& /*result*/)
{
return;
}
void
-TimeAxisView::add_ghost (RegionView* rv) {
+TimeAxisView::add_ghost (RegionView* rv)
+{
GhostRegion* gr = rv->add_ghost (*this);
-
+
if(gr) {
ghosts.push_back(gr);
- gr->GoingAway.connect (mem_fun(*this, &TimeAxisView::erase_ghost));
}
}
void
-TimeAxisView::remove_ghost (RegionView* rv) {
+TimeAxisView::remove_ghost (RegionView* rv)
+{
rv->remove_ghost_in (*this);
}
void
-TimeAxisView::erase_ghost (GhostRegion* gr) {
- if(in_destructor) {
+TimeAxisView::erase_ghost (GhostRegion* gr)
+{
+ if (in_destructor) {
return;
}
-
- list<GhostRegion*>::iterator i;
-
- for (i = ghosts.begin(); i != ghosts.end(); ++i) {
+
+ for (list<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
if ((*i) == gr) {
ghosts.erase (i);
break;
TimeAxisView::touched (double top, double bot)
{
/* remember: this is X Window - coordinate space starts in upper left and moves down.
- y_position is the "origin" or "top" of the track.
- */
+ y_position is the "origin" or "top" of the track.
+ */
- double mybot = y_position + current_height();
-
- return ((y_position <= bot && y_position >= top) ||
- ((mybot <= bot) && (top < mybot)) ||
- (mybot >= bot && y_position < top));
-}
+ double mybot = _y_position + current_height();
+
+ return ((_y_position <= bot && _y_position >= top) ||
+ ((mybot <= bot) && (top < mybot)) ||
+ (mybot >= bot && _y_position < top));
+}
void
TimeAxisView::set_parent (TimeAxisView& p)
if (parent->has_state()) {
return parent;
- }
+ }
return parent->get_parent_with_state ();
-}
+}
XMLNode&
snprintf (buf, sizeof(buf), "%u", height);
node->add_property ("height", buf);
- node->add_property ("marked_for_display", (_marked_for_display ? "1" : "0"));
+ node->add_property ("marked-for-display", (_marked_for_display ? "1" : "0"));
return *node;
}
int
-TimeAxisView::set_state (const XMLNode& node)
+TimeAxisView::set_state (const XMLNode& node, int /*version*/)
{
const XMLProperty *prop;
- if ((prop = node.property ("marked_for_display")) != 0) {
+ if ((prop = node.property ("marked-for-display")) != 0) {
_marked_for_display = (prop->value() == "1");
}
- if ((prop = node.property ("track_height")) != 0) {
+ if ((prop = node.property ("track-height")) != 0) {
if (prop->value() == "largest") {
set_height (hLargest);
} else if ((prop = node.property ("height")) != 0) {
set_height (atoi (prop->value()));
-
+
} else {
set_height (hNormal);
(*i)->set_height ((*i)->height);
}
}
-
+
void
TimeAxisView::compute_controls_size_info ()
{
}
one_row_table.attach (*buttons[0], 6, 7, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
-
+
one_row_table.show_all ();
Gtk::Requisition req(one_row_table.size_request ());
two_row_table.show_all ();
req = two_row_table.size_request ();
- cerr << "Normal height is " << req.height << " + " << extra_height << endl;
-
- // height required to show all normal buttons
+ // height required to show all normal buttons
hNormal = /*req.height*/ 48 + extra_height;
- // these heights are all just larger than normal. no more
+ // these heights are all just larger than normal. no more
// elements are visible (yet).
hLarger = hNormal + 50;
}
}
-TimeAxisView*
+/** @return Pair: TimeAxisView, layer index.
+ * TimeAxisView is non-0 if this object covers y, or one of its children does.
+ * If the covering object is a child axis, then the child is returned.
+ * TimeAxisView is 0 otherwise.
+ * Layer index is the layer number if the TimeAxisView is valid and is in stacked
+ * region display mode, otherwise 0.
+ */
+std::pair<TimeAxisView*, layer_t>
TimeAxisView::covers_y_position (double y)
{
if (hidden()) {
- return 0;
+ return std::make_pair ( (TimeAxisView *) 0, 0);
}
- cerr << name() << " check for " << y << " within " << y_position << " and + " << height << endl;
+ if (_y_position <= y && y < (_y_position + height)) {
- if (y_position <= y && y < (y_position + height)) {
- return this;
+ /* work out the layer index if appropriate */
+ layer_t l = 0;
+ if (layer_display () == Stacked && view ()) {
+ /* compute layer */
+ l = layer_t ((_y_position + height - y) / (view()->child_height ()));
+ /* clamp to max layers to be on the safe side; sometimes the above calculation
+ returns a too-high value */
+ if (l >= view()->layers ()) {
+ l = view()->layers() - 1;
+ }
+ }
+
+ return std::make_pair (this, l);
}
- for (Children::iterator i = children.begin(); i != children.end(); ++i) {
- TimeAxisView* tv;
+ for (Children::const_iterator i = children.begin(); i != children.end(); ++i) {
- if ((tv = (*i)->covers_y_position (y)) != 0) {
- return tv;
+ std::pair<TimeAxisView*, int> const r = (*i)->covers_y_position (y);
+ if (r.first) {
+ return r;
}
}
- return 0;
+ return std::make_pair ( (TimeAxisView *) 0, 0);
}
void
TimeAxisView::reshow_feature_lines ()
{
while (feature_lines.size()< analysis_features.size()) {
- ArdourCanvas::SimpleLine* l = new ArdourCanvas::SimpleLine (*canvas_display);
+ ArdourCanvas::SimpleLine* l = new ArdourCanvas::SimpleLine (*_canvas_display);
l->property_color_rgba() = (guint) ARDOUR_UI::config()->canvasvar_ZeroLine.get();
feature_lines.push_back (l);
}
list<ArdourCanvas::SimpleLine*>::iterator l;
for (i = analysis_features.begin(), l = feature_lines.begin(); i != analysis_features.end() && l != feature_lines.end(); ++i, ++l) {
- (*l)->property_x1() = editor.frame_to_pixel (*i);
- (*l)->property_x2() = editor.frame_to_pixel (*i);
+ (*l)->property_x1() = _editor.frame_to_pixel (*i);
+ (*l)->property_x2() = _editor.frame_to_pixel (*i);
(*l)->property_y1() = 0;
(*l)->property_y2() = current_height();
(*l)->show ();
bool
TimeAxisView::resizer_button_press (GdkEventButton* event)
{
- resize_drag_start = event->y_root;
- resize_idle_target = current_height();
- editor.start_resize_line_ops ();
+ _resize_drag_start = event->y_root;
return true;
}
bool
-TimeAxisView::resizer_button_release (GdkEventButton* ev)
+TimeAxisView::resizer_button_release (GdkEventButton*)
{
- resize_drag_start = -1;
- editor.end_resize_line_ops ();
+ _resize_drag_start = -1;
return true;
}
bool
TimeAxisView::resizer_motion (GdkEventMotion* ev)
{
- if (resize_drag_start < 0) {
+ if (_resize_drag_start < 0) {
return true;
}
- int32_t delta = (int32_t) floor (resize_drag_start - ev->y_root);
-
- resize_idle_target = std::max (resize_idle_target - delta, (int) hSmall);
- editor.add_to_idle_resize (this, resize_idle_target);
-
- resize_drag_start = ev->y_root;
+ int32_t const delta = (int32_t) floor (ev->y_root - _resize_drag_start);
+ _editor.add_to_idle_resize (this, delta);
+ _resize_drag_start = ev->y_root;
return true;
}
Glib::RefPtr<Gdk::GC> light (resizer.get_style()->get_bg_gc (STATE_NORMAL));
win->draw_rectangle (controls_ebox.get_style()->get_bg_gc(STATE_NORMAL),
- true,
- event->area.x,
- event->area.y,
- event->area.width,
- event->area.height);
+ true,
+ event->area.x,
+ event->area.y,
+ event->area.width,
+ event->area.height);
win->get_geometry (x, y, w, h, d);
/* handle/line #1 */
-
+
win->draw_line (dark, 0, 0, w - 2, 0);
win->draw_point (dark, 0, 1);
win->draw_line (light, 1, 1, w - 1, 1);
return true;
}
+bool
+TimeAxisView::set_visibility (bool yn)
+{
+ if (yn != marked_for_display()) {
+ if (yn) {
+ set_marked_for_display (true);
+ canvas_display()->show();
+ } else {
+ set_marked_for_display (false);
+ hide ();
+ }
+ return true; // things changed
+ }
+
+ return false;
+}
projects / ardour.git / blobdiff