#include <gtkmm.h>
#include <gtkmm2ext/gtk_ui.h>
+#include <gtkmm2ext/utils.h>
#include "ardour/playlist.h"
#include "ardour/region.h"
#include "ardour/session.h"
#include "streamview.h"
+#include "global_signals.h"
#include "region_view.h"
#include "route_time_axis.h"
#include "canvas-waveview.h"
using namespace PBD;
using namespace Editing;
-StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Group* group)
+StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Group* background_group, ArdourCanvas::Group* canvas_group)
: _trackview (tv)
- , owns_canvas_group(group == 0)
- , _background_group (new ArdourCanvas::Group (*_trackview.canvas_background()))
- , canvas_group(group ? group : new ArdourCanvas::Group(*_trackview.canvas_display()))
+ , owns_background_group (background_group == 0)
+ , owns_canvas_group (canvas_group == 0)
+ , _background_group (background_group ? background_group : new ArdourCanvas::Group (*_trackview.canvas_background()))
+ , _canvas_group (canvas_group ? canvas_group : new ArdourCanvas::Group(*_trackview.canvas_display()))
, _samples_per_unit (_trackview.editor().get_current_zoom ())
, rec_updating(false)
, rec_active(false)
{
/* set_position() will position the group */
- canvas_rect = new ArdourCanvas::SimpleRect (*canvas_group);
+ canvas_rect = new ArdourCanvas::SimpleRect (*_background_group);
canvas_rect->property_x1() = 0.0;
canvas_rect->property_y1() = 0.0;
- canvas_rect->property_x2() = _trackview.editor().get_physical_screen_width ();
+ canvas_rect->property_x2() = Gtkmm2ext::physical_screen_width (_trackview.editor().get_window());
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_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),
delete canvas_rect;
+ if (owns_background_group) {
+ delete _background_group;
+ }
+
if (owns_canvas_group) {
- delete canvas_group;
+ delete _canvas_group;
}
}
int
StreamView::set_position (gdouble x, gdouble y)
{
- canvas_group->property_x() = x;
- canvas_group->property_y() = y;
+ _canvas_group->property_x() = x;
+ _canvas_group->property_y() = y;
return 0;
}
canvas_rect->property_y2() = height;
update_contents_height ();
- HeightChanged ();
-
return 0;
}
break;
}
}
+
+ RegionViewRemoved (); /* EMIT SIGNAL */
}
void
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());
- // ds->playlist()->ContentsChanged.connect (playlist_connections, invalidator (*this), boost::bind (&StreamView::redisplay_diskstream, this), gui_context());
+ tr->playlist()->ContentsChanged.connect (playlist_connections, invalidator (*this), ui_bind (&StreamView::update_coverage_frames, this), gui_context());
}
void
if (rec_active && rec_rects.size() > 0) {
/* only update the last box */
RecBoxInfo & rect = rec_rects.back();
- nframes_t at = _trackview.track()->current_capture_end();
+ framepos_t const at = _trackview.track()->current_capture_end ();
double xstart;
double xend;
}
}
+
+/** Get selectable things within a given range.
+ * @param start Start time in session frames.
+ * @param end End time in session frames.
+ * @param top Top y range, in trackview coordinates (ie 0 is the top of the track view)
+ * @param bot Bottom y range, in trackview coordinates (ie 0 is the top of the track view)
+ * @param result Filled in with selectable things.
+ */
+
void
-StreamView::get_selectables (nframes_t start, nframes_t end, double top, double bottom, list<Selectable*>& results)
+StreamView::get_selectables (framepos_t start, framepos_t end, double top, double bottom, list<Selectable*>& results)
{
layer_t min_layer = 0;
layer_t max_layer = 0;
}
for (vector<RecBoxInfo>::iterator i = rec_rects.begin(); i != rec_rects.end(); ++i) {
- i->rectangle->property_y2() = height - 1.0;
+ switch (_layer_display) {
+ case Overlaid:
+ i->rectangle->property_y2() = height;
+ break;
+ case Stacked:
+ /* In stacked displays, the recregion is always at the top */
+ i->rectangle->property_y1() = 0;
+ i->rectangle->property_y2() = h;
+ break;
+ }
}
}
(*i)->update_coverage_frames (_layer_display);
}
}
+
+void
+StreamView::check_record_layers (boost::shared_ptr<Region> region, framepos_t to)
+{
+ if (_new_rec_layer_time < to) {
+ /* The region being recorded has overlapped the start of a top-layered region, so
+ `fake' a new visual layer for the recording. This is only a visual thing for now,
+ as the proper layering will get sorted out when the recorded region is added to
+ its playlist.
+ */
+
+ /* 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 ();
+ }
+}
+
+void
+StreamView::setup_new_rec_layer_time (boost::shared_ptr<Region> region)
+{
+ /* If we are in Stacked mode, we may need to (visually) create a new layer to put the
+ recorded region in. To work out where this needs to happen, find the start of the next
+ top-layered region after the start of the region we are recording and make a note of it.
+ */
+ if (_layer_display == Stacked) {
+ _new_rec_layer_time = _trackview.track()->playlist()->find_next_top_layer_position (region->start());
+ } else {
+ _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