#include "rgb_macros.h"
#include "gui_thread.h"
#include "utils.h"
-#include "color.h"
using namespace ARDOUR;
using namespace PBD;
using namespace Editing;
-StreamView::StreamView (RouteTimeAxisView& tv)
+StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Group* group)
: _trackview (tv)
- , canvas_group(new ArdourCanvas::Group(*_trackview.canvas_display))
+ , owns_canvas_group(group == 0)
+ , canvas_group(group ? group : new ArdourCanvas::Group(*_trackview.canvas_display))
, canvas_rect(new ArdourCanvas::SimpleRect (*canvas_group))
, _samples_per_unit(_trackview.editor.get_current_zoom())
, rec_updating(false)
, use_rec_regions(tv.editor.show_waveforms_recording())
, region_color(_trackview.color())
, stream_base_color(0xFFFFFFFF)
+ , layers(1)
+ , height(tv.height)
+ , layer_display(Overlaid)
+ , last_rec_data_frame(0)
{
/* set_position() will position the group */
- canvas_rect = new ArdourCanvas::SimpleRect (*canvas_group);
canvas_rect->property_x1() = 0.0;
canvas_rect->property_y1() = 0.0;
- canvas_rect->property_x2() = 1000000.0;
+ canvas_rect->property_x2() = _trackview.editor.frame_to_pixel (max_frames);
canvas_rect->property_y2() = (double) tv.height;
- canvas_rect->property_outline_what() = (guint32) (0x1|0x2|0x8); // outline ends and bottom
+ canvas_rect->property_outline_what() = (guint32) (0x2|0x8); // outline RHS and bottom
// (Fill/Outline colours set in derived classes)
canvas_rect->signal_event().connect (bind (mem_fun (_trackview.editor, &PublicEditor::canvas_stream_view_event), canvas_rect, &_trackview));
if (_trackview.is_track()) {
_trackview.track()->DiskstreamChanged.connect (mem_fun (*this, &StreamView::diskstream_changed));
_trackview.session().TransportStateChange.connect (mem_fun (*this, &StreamView::transport_changed));
+ _trackview.session().TransportLooped.connect (mem_fun (*this, &StreamView::transport_looped));
_trackview.get_diskstream()->RecordEnableChanged.connect (mem_fun (*this, &StreamView::rec_enable_changed));
_trackview.session().RecordStateChanged.connect (mem_fun (*this, &StreamView::sess_rec_enable_changed));
}
- ColorChanged.connect (mem_fun (*this, &StreamView::color_handler));
+ ColorsChanged.connect (mem_fun (*this, &StreamView::color_handler));
}
StreamView::~StreamView ()
{
undisplay_diskstream ();
- delete canvas_group;
+
+ delete canvas_rect;
+
+ if (owns_canvas_group) {
+ delete canvas_group;
+ }
}
void
int
StreamView::set_position (gdouble x, gdouble y)
-
{
canvas_group->property_x() = x;
canvas_group->property_y() = y;
}
int
-StreamView::set_height (gdouble h)
+StreamView::set_height (double h)
{
/* limit the values to something sane-ish */
-
if (h < 10.0 || h > 1000.0) {
return -1;
}
- canvas_rect->property_y2() = h;
-
- for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) {
- (*i)->set_height (h);
- }
-
- /*for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
- (*i)->set_height (h);
- }*/
-
- for (vector<RecBoxInfo>::iterator i = rec_rects.begin(); i != rec_rects.end(); ++i) {
- RecBoxInfo &recbox = (*i);
- recbox.rectangle->property_y2() = h - 1.0;
+ if (canvas_rect->property_y2() == h) {
+ return 0;
}
+ height = h;
+ update_contents_y_position_and_height ();
return 0;
}
void
StreamView::add_region_view (boost::shared_ptr<Region> r)
{
+ // ENSURE_GUI_THREAD (bind (mem_fun (*this, &AudioStreamView::add_region_view), r));
+
add_region_view_internal (r, true);
}
void
-StreamView::remove_region_view (boost::shared_ptr<Region> r)
+StreamView::remove_region_view (boost::weak_ptr<Region> weak_r)
{
- ENSURE_GUI_THREAD (bind (mem_fun (*this, &StreamView::remove_region_view), r));
+ ENSURE_GUI_THREAD (bind (mem_fun (*this, &StreamView::remove_region_view), weak_r));
+
+ boost::shared_ptr<Region> r (weak_r.lock());
+
+ if (!r) {
+ return;
+ }
for (list<RegionView *>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
if (((*i)->region()) == r) {
- delete *i;
+ RegionView* rv = *i;
region_views.erase (i);
+ delete rv;
break;
}
}
}
-#if 0
-(unused)
-void
-StreamView::remove_rec_region (boost::shared_ptr<Region> r)
-{
- ENSURE_GUI_THREAD(bind (mem_fun (*this, &StreamView::remove_rec_region), r));
-
- if (!Gtkmm2ext::UI::instance()->caller_is_ui_thread()) {
- fatal << "region deleted from non-GUI thread!" << endmsg;
- /*NOTREACHED*/
- }
-
- for (list<boost::shared_ptr<Region> >::iterator i = rec_regions.begin(); i != rec_regions.end(); ++i) {
- if (*i == r) {
- rec_regions.erase (i);
- break;
- }
- }
-}
-#endif
-
void
StreamView::undisplay_diskstream ()
{
- for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) {
+ for (RegionViewList::iterator i = region_views.begin(); i != region_views.end() ; ) {
+ RegionViewList::iterator next = i;
+ ++next;
delete *i;
+ i = next;
}
region_views.clear();
}
void
-StreamView::playlist_modified ()
+StreamView::playlist_modified_weak (boost::weak_ptr<Diskstream> ds)
{
- ENSURE_GUI_THREAD (mem_fun (*this, &StreamView::playlist_modified));
+ boost::shared_ptr<Diskstream> sp (ds.lock());
+ if (!sp) {
+ return;
+ }
- for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) {
- region_layered (*i);
+ playlist_modified (sp);
+}
+
+void
+StreamView::playlist_modified (boost::shared_ptr<Diskstream> ds)
+{
+ /* we do not allow shared_ptr<T> to be bound to slots */
+ ENSURE_GUI_THREAD (bind (mem_fun (*this, &StreamView::playlist_modified_weak), ds));
+
+ /* update layers count and the y positions and heights of our regions */
+ if (ds->playlist()) {
+ layers = ds->playlist()->top_layer() + 1;
+ update_contents_y_position_and_height ();
+ redisplay_diskstream ();
}
}
void
StreamView::playlist_changed (boost::shared_ptr<Diskstream> ds)
{
+ /* XXX: binding to a shared_ptr, is this ok? */
ENSURE_GUI_THREAD (bind (mem_fun (*this, &StreamView::playlist_changed), ds));
/* disconnect from old playlist */
playlist_connections.clear();
undisplay_diskstream ();
+ /* update layers count and the y positions and heights of our regions */
+ layers = ds->playlist()->top_layer() + 1;
+ update_contents_y_position_and_height ();
+
/* draw it */
-
redisplay_diskstream ();
/* catch changes */
- playlist_connections.push_back (ds->playlist()->RegionAdded.connect (mem_fun (*this, &StreamView::add_region_view)));
- playlist_connections.push_back (ds->playlist()->RegionRemoved.connect (mem_fun (*this, &StreamView::remove_region_view)));
- playlist_connections.push_back (ds->playlist()->StateChanged.connect (mem_fun (*this, &StreamView::playlist_state_changed)));
- playlist_connections.push_back (ds->playlist()->Modified.connect (mem_fun (*this, &StreamView::playlist_modified)));
-}
-
-void
-StreamView::playlist_state_changed (Change ignored)
-{
- ENSURE_GUI_THREAD (bind (mem_fun (*this, &StreamView::playlist_state_changed), ignored));
-
- redisplay_diskstream ();
+ playlist_connections.push_back (ds->playlist()->Modified.connect (bind (mem_fun (*this, &StreamView::playlist_modified_weak), ds)));
}
void
StreamView::diskstream_changed ()
{
- Track *t;
+ boost::shared_ptr<Track> t;
if ((t = _trackview.track()) != 0) {
Gtkmm2ext::UI::instance()->call_slot (bind (mem_fun (*this, &StreamView::display_diskstream), t->diskstream()));
void
StreamView::region_layered (RegionView* rv)
{
- rv->get_canvas_group()->lower_to_bottom();
- /* don't ever leave it at the bottom, since then it doesn't
- get events - the parent group does instead ...
- */
-
- /* this used to be + 1, but regions to the left ended up below
- ..something.. and couldn't receive events. why? good question.
- */
- rv->get_canvas_group()->raise (rv->region()->layer() + 2);
+ /*
+ Currently 'layer' has nothing to do with the desired canvas layer.
+ For now, ensure that multiple regionviews passed here in groups are
+ ordered by 'layer' (lowest to highest).
+
+ (see AudioStreamView::redisplay_diskstream ()).
+
+ We move them to the top layer as they arrive.
+ */
+
+ rv->get_canvas_group()->raise_to_top();
}
void
Gtkmm2ext::UI::instance()->call_slot (mem_fun (*this, &StreamView::setup_rec_box));
}
+void
+StreamView::transport_looped()
+{
+ // to force a new rec region
+ rec_active = false;
+ Gtkmm2ext::UI::instance()->call_slot (mem_fun (*this, &StreamView::setup_rec_box));
+}
+
void
StreamView::update_rec_box ()
{
{
bool selected;
- // cerr << _trackview.name() << " (selected = " << regions.size() << ")" << endl;
for (list<RegionView*>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
selected = false;
selected = true;
}
}
-
- // cerr << "\tregion " << (*i)->region().name() << " selected = " << selected << endl;
+
(*i)->set_selected (selected);
}
}
}
}
+void
+StreamView::update_contents_y_position_and_height ()
+{
+ canvas_rect->property_y2() = height;
+
+ const double lh = height / layers;
+
+ for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) {
+ switch (layer_display) {
+ case Overlaid:
+ (*i)->set_y_position_and_height (0, height);
+ break;
+ case Stacked:
+ double const y = (*i)->region()->layer() * lh;
+ (*i)->set_y_position_and_height (y, lh);
+ break;
+ }
+ }
+
+ for (vector<RecBoxInfo>::iterator i = rec_rects.begin(); i != rec_rects.end(); ++i) {
+ i->rectangle->property_y2() = height - 1.0;
+ }
+}
+
+void
+StreamView::set_layer_display (LayerDisplay d)
+{
+ layer_display = d;
+ update_contents_y_position_and_height ();
+}
projects / ardour.git / blobdiff