#include <gtkmm2ext/gtk_ui.h>
#include "ardour/playlist.h"
-#include "ardour/audioregion.h"
-#include "ardour/audiosource.h"
-#include "ardour/audio_diskstream.h"
#include "ardour/session.h"
#include "ardour_ui.h"
#include "global_signals.h"
#include "canvas-noevent-text.h"
+#include "canvas-noevent-rect.h"
#include "streamview.h"
#include "region_view.h"
#include "automation_region_view.h"
, in_destructor(false)
, wait_for_data(false)
, _silence_text (0)
- , _time_converter(r->session().tempo_map(), r->position())
+ , _region_relative_time_converter(r->session().tempo_map(), r->position())
+ , _source_relative_time_converter(r->session().tempo_map(), r->position() - r->start())
{
- GhostRegion::CatchDeletion.connect (*this, invalidator (*this), ui_bind (&RegionView::remove_ghost, this, _1), gui_context());
+ GhostRegion::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&RegionView::remove_ghost, this, _1), gui_context());
}
RegionView::RegionView (const RegionView& other)
: sigc::trackable(other)
, TimeAxisViewItem (other)
, _silence_text (0)
- , _time_converter(other._time_converter)
+ , _region_relative_time_converter(other.region_relative_time_converter())
+ , _source_relative_time_converter(other.source_relative_time_converter())
{
/* derived concrete type will call init () */
valid = false;
_pixel_width = other._pixel_width;
- GhostRegion::CatchDeletion.connect (*this, invalidator (*this), ui_bind (&RegionView::remove_ghost, this, _1), gui_context());
+ GhostRegion::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&RegionView::remove_ghost, this, _1), gui_context());
}
RegionView::RegionView (const RegionView& other, boost::shared_ptr<Region> other_region)
: sigc::trackable(other)
, TimeAxisViewItem (other)
, _silence_text (0)
- , _time_converter(other._time_converter)
+ , _region_relative_time_converter(other_region->session().tempo_map(), other_region->position())
+ , _source_relative_time_converter(other_region->session().tempo_map(), other_region->position() - other_region->start())
{
/* this is a pseudo-copy constructor used when dragging regions
around on the canvas.
valid = false;
_pixel_width = other._pixel_width;
- GhostRegion::CatchDeletion.connect (*this, invalidator (*this), ui_bind (&RegionView::remove_ghost, this, _1), gui_context());
+ GhostRegion::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&RegionView::remove_ghost, this, _1), gui_context());
}
RegionView::RegionView (ArdourCanvas::Group* parent,
, in_destructor(false)
, wait_for_data(false)
, _silence_text (0)
- , _time_converter(r->session().tempo_map(), r->position())
+ , _region_relative_time_converter(r->session().tempo_map(), r->position())
+ , _source_relative_time_converter(r->session().tempo_map(), r->position() - r->start())
{
}
set_height (trackview.current_height());
- _region->PropertyChanged.connect (*this, invalidator (*this), ui_bind (&RegionView::region_changed, this, _1), gui_context());
+ _region->PropertyChanged.connect (*this, invalidator (*this), boost::bind (&RegionView::region_changed, this, _1), gui_context());
group->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_region_view_event), group, this));
}
void
-RegionView::set_silent_frames (const AudioIntervalResult& silences, double threshold)
+RegionView::set_silent_frames (const AudioIntervalResult& silences, double /*threshold*/)
{
framecnt_t shortest = max_framecnt;
for (AudioIntervalResult::const_iterator i = silences.begin(); i != silences.end(); ++i) {
- ArdourCanvas::SimpleRect* cr = new ArdourCanvas::SimpleRect (*group);
+ ArdourCanvas::SimpleRect* cr = new ArdourCanvas::NoEventSimpleRect (*group);
_silent_frames.push_back (cr);
/* coordinates for the rect are relative to the regionview origin */
if (what_changed.contains (ARDOUR::Properties::position)) {
set_position (_region->position(), 0);
- _time_converter.set_origin_b (_region->position());
+ _region_relative_time_converter.set_origin_b (_region->position());
+ }
+
+ if (what_changed.contains (ARDOUR::Properties::start) || what_changed.contains (ARDOUR::Properties::position)) {
+ _source_relative_time_converter.set_origin_b (_region->position() - _region->start());
}
PropertyChange s_and_l;
ArdourCanvas::SimpleRect* cr = 0;
bool me = false;
- uint32_t const color = frame->property_fill_color_rgba ();
- uint32_t const base_alpha = UINT_RGBA_A (color);
+ /* the color that will be used to show parts of regions that will not be heard */
+ uint32_t const non_playing_color = ARDOUR_UI::config()->canvasvar_CoveredRegion.get ();
while (t < end) {
/* start off any new rect, if required */
if (cr == 0 || me != new_me) {
- cr = new ArdourCanvas::SimpleRect (*group);
+ cr = new ArdourCanvas::NoEventSimpleRect (*group);
_coverage_frames.push_back (cr);
cr->property_x1() = trackview.editor().frame_to_pixel (t - position);
cr->property_y1() = 1;
cr->property_y2() = _height + 1;
cr->property_outline_pixels() = 0;
- /* areas that will be played get a lower alpha */
- uint32_t alpha = base_alpha;
if (new_me) {
- alpha /= 2;
+ cr->property_fill_color_rgba () = UINT_RGBA_CHANGE_A (non_playing_color, 0);
+ } else {
+ cr->property_fill_color_rgba () = non_playing_color;
}
- cr->property_fill_color_rgba () = UINT_RGBA_CHANGE_A (color, alpha);
}
t = pl->find_next_region_boundary (t, 1);
region_changed (PropertyChange (ARDOUR::Properties::start));
}
+/** Snap a frame offset within our region using the current snap settings.
+ * @param x Frame offset from this region's position.
+ * @return Snapped frame offset from this region's position.
+ */
+frameoffset_t
+RegionView::snap_frame_to_frame (frameoffset_t x) const
+{
+ PublicEditor& editor = trackview.editor();
+
+ /* x is region relative, convert it to global absolute frames */
+ framepos_t const session_frame = x + _region->position();
+
+ /* try a snap in either direction */
+ framepos_t frame = session_frame;
+ editor.snap_to (frame, 0);
+
+ /* if we went off the beginning of the region, snap forwards */
+ if (frame < _region->position ()) {
+ frame = session_frame;
+ editor.snap_to (frame, 1);
+ }
+
+ /* back to region relative */
+ return frame - _region->position();
+}
projects / ardour.git / blobdiff