#include "ardour/playlist.h"
#include "ardour/region.h"
-#include "ardour/source.h"
#include "ardour/track.h"
#include "ardour/session.h"
, _samples_per_unit (_trackview.editor().get_current_zoom ())
, rec_updating(false)
, rec_active(false)
- , region_color(_trackview.color())
, stream_base_color(0xFFFFFFFF)
, _layers (1)
, _layer_display (Overlaid)
canvas_rect->raise(1); // raise above tempo lines
canvas_rect->property_outline_what() = (guint32) (0x2|0x8); // outline RHS and bottom
+ canvas_rect->property_outline_color_rgba() = RGBA_TO_UINT (0, 0, 0, 255);
canvas_rect->signal_event().connect (sigc::bind (
sigc::mem_fun (_trackview.editor(), &PublicEditor::canvas_stream_view_event),
if (owns_background_group) {
delete _background_group;
}
-
+
if (owns_canvas_group) {
delete _canvas_group;
}
add_region_view_internal (r, true);
- if (_layer_display == Stacked) {
+ if (_layer_display == Stacked || _layer_display == Expanded) {
update_contents_height ();
}
}
} else {
/* layering has probably been modified. reflect this in the canvas. */
layer_regions();
- }
+ }
}
void
playlist_connections.drop_connections ();
undisplay_track ();
+ /* draw it */
+
+ redisplay_track ();
+
/* update layers count and the y positions and heights of our regions */
_layers = tr->playlist()->top_layer() + 1;
update_contents_height ();
update_coverage_frames ();
- tr->playlist()->set_explicit_relayering (_layer_display == Stacked);
-
- /* draw it */
-
- redisplay_track ();
-
/* catch changes */
tr->playlist()->LayeringChanged.connect (playlist_connections, invalidator (*this), boost::bind (&StreamView::playlist_layered, this, boost::weak_ptr<Track> (tr)), gui_context());
- tr->playlist()->RegionAdded.connect (playlist_connections, invalidator (*this), ui_bind (&StreamView::add_region_view, this, _1), gui_context());
- tr->playlist()->RegionRemoved.connect (playlist_connections, invalidator (*this), ui_bind (&StreamView::remove_region_view, this, _1), gui_context());
- tr->playlist()->ContentsChanged.connect (playlist_connections, invalidator (*this), ui_bind (&StreamView::update_coverage_frames, this), gui_context());
+ tr->playlist()->RegionAdded.connect (playlist_connections, invalidator (*this), boost::bind (&StreamView::add_region_view, this, _1), gui_context());
+ tr->playlist()->RegionRemoved.connect (playlist_connections, invalidator (*this), boost::bind (&StreamView::remove_region_view, this, _1), gui_context());
+ tr->playlist()->ContentsChanged.connect (playlist_connections, invalidator (*this), boost::bind (&StreamView::update_coverage_frames, this), gui_context());
}
+
void
StreamView::diskstream_changed ()
{
boost::shared_ptr<Track> t;
-
+
if ((t = _trackview.track()) != 0) {
Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&StreamView::display_track, this, t));
} else {
}
void
-StreamView::apply_color (Gdk::Color& color, ColorTarget target)
+StreamView::apply_color (Gdk::Color color, ColorTarget target)
{
list<RegionView *>::iterator i;
if (_layer_display == Stacked) {
double const c = child_height ();
- min_layer = _layers - ((bottom - _trackview.y_position()) / c);
- max_layer = _layers - ((top - _trackview.y_position()) / c);
+
+ int const mi = _layers - ((bottom - _trackview.y_position()) / c);
+ if (mi < 0) {
+ min_layer = 0;
+ } else {
+ min_layer = mi;
+ }
+
+ int const ma = _layers - ((top - _trackview.y_position()) / c);
+ if (ma > (int) _layers) {
+ max_layer = _layers - 1;
+ } else {
+ max_layer = ma;
+ }
+
}
for (list<RegionView*>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
layer_ok = (min_layer <= l && l <= max_layer);
}
- if ((*i)->region()->coverage (start, end) != OverlapNone && layer_ok) {
+ if ((*i)->region()->coverage (start, end) != Evoral::OverlapNone && layer_ok) {
results.push_back (*i);
}
}
double
StreamView::child_height () const
{
- if (_layer_display == Stacked) {
+ switch (_layer_display) {
+ case Overlaid:
+ return height;
+ case Stacked:
return height / _layers;
+ case Expanded:
+ return height / (_layers * 2 + 1);
}
-
+
+ /* NOTREACHED */
return height;
}
case Stacked:
(*i)->set_y (height - ((*i)->region()->layer() + 1) * h);
break;
+ case Expanded:
+ (*i)->set_y (height - ((*i)->region()->layer() + 1) * 2 * h);
+ break;
}
(*i)->set_height (h);
i->rectangle->property_y2() = height;
break;
case Stacked:
+ case Expanded:
/* In stacked displays, the recregion is always at the top */
i->rectangle->property_y1() = 0;
i->rectangle->property_y2() = h;
break;
}
}
+
+ ContentsHeightChanged (); /* EMIT SIGNAL */
}
void
StreamView::set_layer_display (LayerDisplay d)
{
_layer_display = d;
+
+ if (_layer_display == Overlaid) {
+ layer_regions ();
+ }
+
update_contents_height ();
update_coverage_frames ();
- _trackview.track()->playlist()->set_explicit_relayering (_layer_display == Stacked);
}
void
/* Stop this happening again */
_new_rec_layer_time = max_framepos;
-
+
/* Make space in the view for the new layer */
++_layers;
-
+
/* Set the temporary region to the correct layer so that it gets drawn correctly */
region->set_layer (_layers - 1);
-
+
/* and reset the view */
update_contents_height ();
}
_new_rec_layer_time = max_framepos;
}
}
+
+void
+StreamView::enter_internal_edit_mode ()
+{
+ for (list<RegionView*>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
+ (*i)->hide_rect ();
+ }
+}
+
+void
+StreamView::leave_internal_edit_mode ()
+{
+ for (list<RegionView*>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
+ (*i)->show_rect ();
+ }
+}
projects / ardour.git / blobdiff