/*
- Copyright (C) 2001, 2006 Paul Davis
+ Copyright (C) 2001, 2006 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 "ardour/source.h"
#include "ardour/diskstream.h"
#include "ardour/track.h"
+#include "ardour/session.h"
#include "streamview.h"
#include "region_view.h"
#include "gui_thread.h"
#include "utils.h"
+using namespace std;
using namespace ARDOUR;
using namespace PBD;
using namespace Editing;
canvas_rect->property_y2() = (double) tv.current_height();
canvas_rect->raise(1); // raise above tempo lines
- canvas_rect->property_outline_what() = (guint32) (0x2|0x8); // outline RHS and bottom
+ canvas_rect->property_outline_what() = (guint32) (0x2|0x8); // outline RHS and bottom
- canvas_rect->signal_event().connect (bind (
- mem_fun (_trackview.editor(), &PublicEditor::canvas_stream_view_event),
+ canvas_rect->signal_event().connect (sigc::bind (
+ sigc::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));
- }
+ _trackview.track()->DiskstreamChanged.connect (*this, boost::bind (&StreamView::diskstream_changed, this), gui_context());
+ _trackview.get_diskstream()->RecordEnableChanged.connect (*this, boost::bind (&StreamView::rec_enable_changed, this), gui_context());
+
+ _trackview.session()->TransportStateChange.connect (*this, boost::bind (&StreamView::transport_changed, this), gui_context());
+ _trackview.session()->TransportLooped.connect (*this, boost::bind (&StreamView::transport_looped, this), gui_context());
+ _trackview.session()->RecordStateChanged.connect (*this, boost::bind (&StreamView::sess_rec_enable_changed, this), gui_context());
+ }
- ColorsChanged.connect (mem_fun (*this, &StreamView::color_handler));
+ ColorsChanged.connect (sigc::mem_fun (*this, &StreamView::color_handler));
}
StreamView::~StreamView ()
{
undisplay_diskstream ();
-
+
delete canvas_rect;
-
+
if (owns_canvas_group) {
delete canvas_group;
}
}
height = h;
+ canvas_rect->property_y2() = height;
update_contents_height ();
+
+ HeightChanged ();
+
return 0;
}
-int
+int
StreamView::set_samples_per_unit (gdouble spp)
{
RegionViewList::iterator i;
for (vector<RecBoxInfo>::iterator xi = rec_rects.begin(); xi != rec_rects.end(); ++xi) {
RecBoxInfo &recbox = (*xi);
-
+
gdouble xstart = _trackview.editor().frame_to_pixel (recbox.start);
gdouble xend = _trackview.editor().frame_to_pixel (recbox.start + recbox.length);
return 0;
}
+void
+StreamView::add_region_view_weak (boost::weak_ptr<Region> r)
+{
+ boost::shared_ptr<Region> sp (r.lock());
+
+ if (sp) {
+ add_region_view (sp);
+ }
+}
+
+
void
StreamView::add_region_view (boost::shared_ptr<Region> r)
{
- // ENSURE_GUI_THREAD (bind (mem_fun (*this, &AudioStreamView::add_region_view), r));
+ ENSURE_GUI_THREAD (*this, &StreamView::add_region_view_weak, boost::weak_ptr<Region>(r));
add_region_view_internal (r, true);
- update_contents_height ();
+
+ if (_layer_display == Stacked) {
+ update_contents_height ();
+ }
}
void
StreamView::remove_region_view (boost::weak_ptr<Region> weak_r)
{
- ENSURE_GUI_THREAD (bind (mem_fun (*this, &StreamView::remove_region_view), weak_r));
+ ENSURE_GUI_THREAD (*this, &StreamView::remove_region_view, weak_r)
boost::shared_ptr<Region> r (weak_r.lock());
if (((*i)->region()) == r) {
RegionView* rv = *i;
region_views.erase (i);
+ cerr << "Deleting RV for " << r->name() << " @ " << r << endl;
delete rv;
break;
}
{
playlist_change_connection.disconnect();
playlist_changed (ds);
- playlist_change_connection = ds->PlaylistChanged.connect (bind (
- mem_fun (*this, &StreamView::playlist_changed_weak),
- boost::weak_ptr<Diskstream> (ds)));
+ ds->PlaylistChanged.connect (playlist_change_connection, boost::bind (&StreamView::playlist_changed_weak, this, boost::weak_ptr<Diskstream> (ds)), gui_context());
}
void
i = tmp;
}
- // Fix canvas layering by raising each in the sorted list order
+ // Fix canvas layering by raising each to the top in the sorted order.
for (RegionViewList::iterator i = copy.begin(); i != copy.end(); ++i) {
- region_layered (*i);
+ (*i)->get_canvas_group()->raise_to_top ();
}
}
StreamView::playlist_modified_weak (boost::weak_ptr<Diskstream> ds)
{
boost::shared_ptr<Diskstream> sp (ds.lock());
+
if (sp) {
playlist_modified (sp);
}
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));
+ ENSURE_GUI_THREAD (*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;
+ }
+
+ if (_layer_display == Stacked) {
update_contents_height ();
update_coverage_frames ();
- redisplay_diskstream ();
- }
+ } else {
+ /* layering has probably been modified. reflect this in the canvas. */
+ layer_regions();
+ }
}
void
void
StreamView::playlist_changed (boost::shared_ptr<Diskstream> ds)
{
- ENSURE_GUI_THREAD (bind (
- mem_fun (*this, &StreamView::playlist_changed_weak),
- boost::weak_ptr<Diskstream> (ds)));
+ ENSURE_GUI_THREAD (*this, &StreamView::playlist_changed_weak, boost::weak_ptr<Diskstream> (ds));
/* disconnect from old playlist */
- for (vector<sigc::connection>::iterator i = playlist_connections.begin();
- i != playlist_connections.end(); ++i) {
- (*i).disconnect();
- }
-
- playlist_connections.clear();
+ playlist_connections.drop_connections ();
undisplay_diskstream ();
/* update layers count and the y positions and heights of our regions */
_layers = ds->playlist()->top_layer() + 1;
update_contents_height ();
-
update_coverage_frames ();
-
+
+ ds->playlist()->set_explicit_relayering (_layer_display == Stacked);
+
/* draw it */
+
redisplay_diskstream ();
/* catch changes */
- playlist_connections.push_back (ds->playlist()->Modified.connect (bind (
- mem_fun (*this, &StreamView::playlist_modified_weak),
- ds)));
+ ds->playlist()->Modified.connect (playlist_connections, boost::bind (&StreamView::playlist_modified_weak, this, ds), gui_context());
+ ds->playlist()->RegionAdded.connect (playlist_connections, ui_bind (&StreamView::add_region_view_weak, this, _1), gui_context());
+ ds->playlist()->RegionRemoved.connect (playlist_connections, ui_bind (&StreamView::remove_region_view, this, _1), gui_context());
}
void
boost::shared_ptr<Track> t;
if ((t = _trackview.track()) != 0) {
- Gtkmm2ext::UI::instance()->call_slot (bind (
- mem_fun (*this, &StreamView::display_diskstream),
- t->diskstream()));
+ Gtkmm2ext::UI::instance()->call_slot (boost::bind (&StreamView::display_diskstream, this, t->diskstream()));
} else {
- Gtkmm2ext::UI::instance()->call_slot (mem_fun (*this, &StreamView::undisplay_diskstream));
+ Gtkmm2ext::UI::instance()->call_slot (boost::bind (&StreamView::undisplay_diskstream, this));
}
}
(*i)->set_color (region_color);
}
break;
-
+
case StreamBaseColor:
stream_base_color = RGBA_TO_UINT (
color.get_red_p(), color.get_green_p(), color.get_blue_p(), 255);
void
StreamView::rec_enable_changed ()
{
- Gtkmm2ext::UI::instance()->call_slot (mem_fun (*this, &StreamView::setup_rec_box));
+ Gtkmm2ext::UI::instance()->call_slot (boost::bind (&StreamView::setup_rec_box, this));
}
void
StreamView::sess_rec_enable_changed ()
{
- Gtkmm2ext::UI::instance()->call_slot (mem_fun (*this, &StreamView::setup_rec_box));
+ Gtkmm2ext::UI::instance()->call_slot (boost::bind (&StreamView::setup_rec_box, this));
}
void
StreamView::transport_changed()
{
- Gtkmm2ext::UI::instance()->call_slot (mem_fun (*this, &StreamView::setup_rec_box));
+ Gtkmm2ext::UI::instance()->call_slot (boost::bind (&StreamView::setup_rec_box, this));
}
void
{
// to force a new rec region
rec_active = false;
- Gtkmm2ext::UI::instance()->call_slot (mem_fun (*this, &StreamView::setup_rec_box));
+ Gtkmm2ext::UI::instance()->call_slot (boost::bind (&StreamView::setup_rec_box, this));
}
void
nframes_t at = _trackview.get_diskstream()->current_capture_end();
double xstart;
double xend;
-
+
switch (_trackview.track()->mode()) {
+
+ case NonLayered:
case Normal:
rect.length = at - rect.start;
xstart = _trackview.editor().frame_to_pixel (rect.start);
xend = _trackview.editor().frame_to_pixel (at);
break;
-
+
case Destructive:
rect.length = 2;
xstart = _trackview.editor().frame_to_pixel (_trackview.get_diskstream()->current_capture_start());
xend = _trackview.editor().frame_to_pixel (at);
break;
}
-
+
rect.rectangle->property_x1() = xstart;
rect.rectangle->property_x2() = xend;
}
}
-
+
RegionView*
StreamView::find_view (boost::shared_ptr<const Region> region)
{
}
return 0;
}
-
+
void
StreamView::foreach_regionview (sigc::slot<void,RegionView*> slot)
{
bool selected;
for (list<RegionView*>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
-
+
selected = false;
-
+
for (RegionSelection::iterator ii = regions.begin(); ii != regions.end(); ++ii) {
if (*i == *ii) {
selected = true;
}
void
-StreamView::get_selectables (nframes_t start, nframes_t end, list<Selectable*>& results)
+StreamView::get_selectables (nframes_t start, nframes_t end, double top, double bottom, list<Selectable*>& results)
{
+ layer_t min_layer = 0;
+ layer_t max_layer = 0;
+
+ 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);
+ }
+
for (list<RegionView*>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
- if ((*i)->region()->coverage(start, end) != OverlapNone) {
+
+ bool layer_ok = true;
+
+ if (_layer_display == Stacked) {
+ layer_t const l = (*i)->region()->layer ();
+ layer_ok = (min_layer <= l && l <= max_layer);
+ }
+
+ if ((*i)->region()->coverage (start, end) != OverlapNone && layer_ok) {
results.push_back (*i);
}
}
if (_layer_display == Stacked) {
return height / _layers;
}
-
+
return height;
}
void
StreamView::update_contents_height ()
{
- canvas_rect->property_y2() = height;
-
const double h = child_height ();
for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) {
_layer_display = d;
update_contents_height ();
update_coverage_frames ();
+ _trackview.get_diskstream()->playlist()->set_explicit_relayering (_layer_display == Stacked);
}
void
projects / ardour.git / blobdiff