#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));
set_colors ();
}
void
-RegionView::set_silent_frames (const AudioIntervalResult& silences)
+RegionView::set_silent_frames (const AudioIntervalResult& silences, double /*threshold*/)
{
framecnt_t shortest = max_framecnt;
- framecnt_t shortest_audible = max_framecnt;
- bool seen_audible = false;
/* remove old silent frames */
drop_silent_frames ();
- if (!silences.empty()) {
+ if (silences.empty()) {
+ return;
+ }
- uint32_t const color = ARDOUR_UI::config()->canvasvar_Silence.get();
- framecnt_t last_end;
+ uint32_t const color = ARDOUR_UI::config()->canvasvar_Silence.get();
- if (silences.front().first != 0) {
- /* use initial non-silent segment as shortest */
- shortest_audible = silences.front().first;
- seen_audible = true;
- }
-
- for (AudioIntervalResult::const_iterator i = silences.begin(); i != silences.end(); ++i) {
+ for (AudioIntervalResult::const_iterator i = silences.begin(); i != silences.end(); ++i) {
- if ((*i).first > last_end) {
- /* (audible) gap between the end of the last interval and this one */
- shortest_audible = min (shortest_audible, (*i).first - last_end);
- seen_audible = true;
- }
+ ArdourCanvas::SimpleRect* cr = new ArdourCanvas::NoEventSimpleRect (*group);
+ _silent_frames.push_back (cr);
-
- ArdourCanvas::SimpleRect* cr = new ArdourCanvas::SimpleRect (*group);
- _silent_frames.push_back (cr);
+ /* coordinates for the rect are relative to the regionview origin */
- /* coordinates for the rect are relative to the regionview origin */
+ cr->property_x1() = trackview.editor().frame_to_pixel (i->first - _region->start());
+ cr->property_x2() = trackview.editor().frame_to_pixel (i->second - _region->start());
+ cr->property_y1() = 1;
+ cr->property_y2() = _height - 2;
+ cr->property_outline_pixels() = 0;
+ cr->property_fill_color_rgba () = color;
- cr->property_x1() = trackview.editor().frame_to_pixel ((*i).first - _region->start());
- cr->property_y1() = 1;
- cr->property_y2() = _height - 2;
- cr->property_outline_pixels() = 0;
- cr->property_fill_color_rgba () = color;
+ shortest = min (shortest, i->second - i->first);
+ }
- last_end = (*i).second;
+ /* Find shortest audible segment */
+ framecnt_t shortest_audible = max_framecnt;
- cr->property_x2() = trackview.editor().frame_to_pixel ((*i).second - _region->start());
+ framecnt_t s = _region->start();
+ for (AudioIntervalResult::const_iterator i = silences.begin(); i != silences.end(); ++i) {
+ framecnt_t const dur = i->first - s;
+ if (dur > 0) {
+ shortest_audible = min (shortest_audible, dur);
+ }
- if (((*i).second - (*i).first) < shortest) {
- shortest= (*i).second;
- }
- }
-
- if (last_end != _region->length()) {
- shortest_audible = min (shortest_audible, _region->last_frame() - last_end);
- seen_audible = true;
- }
+ s = i->second;
+ }
- _silence_text = new ArdourCanvas::NoEventText (*group);
- _silence_text->property_font_desc() = *(get_font_for_style (N_("VerboseCanvasCusor")));
- _silence_text->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_SilenceText.get();
- _silence_text->property_anchor() = ANCHOR_NW;
-
- /* both positions are relative to the region start offset in source */
-
- _silence_text->property_x() = trackview.editor().frame_to_pixel (silences.front().first - _region->start()) + 10.0;
- _silence_text->property_y() = 20.0;
-
- double ms;
- char const * sunits;
- char const * noun;
-
- if (silences.size() > 1) {
- noun = _("silent segments");
- } else {
- noun = _("silent segment");
- }
+ framecnt_t const dur = _region->start() + _region->length() - 1 - s;
+ if (dur > 0) {
+ shortest_audible = min (shortest_audible, dur);
+ }
- ms = (float) shortest/_region->session().frame_rate();
-
- /* ms are now in seconds */
+ _silence_text = new ArdourCanvas::NoEventText (*group);
+ _silence_text->property_font_desc() = get_font_for_style (N_("SilenceText"));
+ _silence_text->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_SilenceText.get();
+ _silence_text->property_anchor() = ANCHOR_NW;
- if (ms >= 60.0) {
- sunits = _("minutes");
- ms /= 60.0;
- } else if (ms < 1.0) {
- sunits = _("msecs");
- ms *= 1000.0;
- } else {
- sunits = _("secs");
- }
+ /* both positions are relative to the region start offset in source */
- if (seen_audible) {
- /* ms are now in seconds */
- double ma = shortest_audible / _region->session().frame_rate();
- char const * aunits;
-
- if (ma >= 60.0) {
- aunits = _("minutes");
- ma /= 60.0;
- } else if (ma < 1.0) {
- aunits = _("msecs");
- ma *= 1000.0;
- } else {
- aunits = _("secs");
- }
-
- _silence_text->property_text() = string_compose (_("%1 %2, shortest = %3 %4\n (shortest audible segment = %5 %6)"),
- silences.size(), noun,
- ms, sunits, ma, aunits).c_str();
+ _silence_text->property_x() = trackview.editor().frame_to_pixel (silences.front().first - _region->start()) + 10.0;
+ _silence_text->property_y() = 20.0;
+
+ double ms = (float) shortest/_region->session().frame_rate();
+
+ /* ms are now in seconds */
+
+ char const * sunits;
+
+ if (ms >= 60.0) {
+ sunits = _("minutes");
+ ms /= 60.0;
+ } else if (ms < 1.0) {
+ sunits = _("msecs");
+ ms *= 1000.0;
+ } else {
+ sunits = _("secs");
+ }
+
+ string text = string_compose (ngettext ("%1 silent segment", "%1 silent segments", silences.size()), silences.size())
+ + ", "
+ + string_compose (_("shortest = %1 %2"), ms, sunits);
+
+ if (shortest_audible != max_framepos) {
+ /* ms are now in seconds */
+ double ma = (float) shortest_audible / _region->session().frame_rate();
+ char const * aunits;
+
+ if (ma >= 60.0) {
+ aunits = _("minutes");
+ ma /= 60.0;
+ } else if (ma < 1.0) {
+ aunits = _("msecs");
+ ma *= 1000.0;
} else {
- _silence_text->property_text() = string_compose (_("%1 %2, shortest = %3 %4"),
- silences.size(), noun, ms, sunits).c_str();
+ aunits = _("secs");
}
- }
+
+ text += string_compose (_("\n (shortest audible segment = %1 %2)"), ma, aunits);
+ }
+
+ _silence_text->property_text() = text.c_str ();
}
void
_silence_text = 0;
}
-void
-RegionView::show_silent_frames ()
-{
- for (list<ArdourCanvas::SimpleRect*>::iterator i = _silent_frames.begin (); i != _silent_frames.end (); ++i) {
- (*i)->show ();
- }
- _silence_text->show ();
-}
-
gint
RegionView::_lock_toggle (ArdourCanvas::Item*, GdkEvent* ev, void* arg)
{
if (what_changed.contains (ARDOUR::Properties::locked)) {
region_locked ();
}
+ if (what_changed.contains (ARDOUR::Properties::locked)) {
+ /* name will show locked status */
+ region_renamed ();
+ }
}
void
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;
str += '{';
str += _region->name();
str += '}';
+ } else if (_region->video_locked()) {
+ str += '[';
+ str += _region->name();
+ str += ']';
} else {
str = _region->name();
}
sync_mark->property_fill_color_rgba() = RGBA_TO_UINT(0,255,0,255); // fill_color; // FIXME make a themeable colour
sync_line = new ArdourCanvas::Line (*group);
- sync_line->property_fill_color_rgba() = RGBA_TO_UINT(0,255,0,255); // fill_color; // FIXME make a themeable colour
+ sync_line->property_fill_color_rgba() = RGBA_TO_UINT(0,255,0,255); // fill_color; // FIXME make a themeable colour
sync_line->property_width_pixels() = 1;
}
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);
}
}
-void
+bool
RegionView::trim_front (framepos_t new_bound, bool no_overlap)
{
if (_region->locked()) {
- return;
+ return false;
}
RouteTimeAxisView& rtv = dynamic_cast<RouteTimeAxisView&> (trackview);
framepos_t const pre_trim_first_frame = _region->first_frame();
- _region->trim_front ((framepos_t) (new_bound * speed), this);
+ _region->trim_front ((framepos_t) (new_bound * speed));
if (no_overlap) {
// Get the next region on the left of this region and shrink/expand it.
// Only trim region on the left if the first frame has gone beyond the left region's last frame.
if (region_left != 0 && (region_left->last_frame() > _region->first_frame() || regions_touching)) {
- region_left->trim_end (_region->first_frame() - 1, this);
+ region_left->trim_end (_region->first_frame() - 1);
}
}
region_changed (ARDOUR::bounds_change);
+
+ return (pre_trim_first_frame != _region->first_frame()); //return true if we actually changed something
}
-void
+bool
RegionView::trim_end (framepos_t new_bound, bool no_overlap)
{
if (_region->locked()) {
- return;
+ return false;
}
RouteTimeAxisView& rtv = dynamic_cast<RouteTimeAxisView&> (trackview);
framepos_t const pre_trim_last_frame = _region->last_frame();
- _region->trim_end ((framepos_t) (new_bound * speed), this);
+ _region->trim_end ((framepos_t) (new_bound * speed));
if (no_overlap) {
// Get the next region on the right of this region and shrink/expand it.
// Only trim region on the right if the last frame has gone beyond the right region's first frame.
if (region_right != 0 && (region_right->first_frame() < _region->last_frame() || regions_touching)) {
- region_right->trim_front (_region->last_frame() + 1, this);
+ region_right->trim_front (_region->last_frame() + 1);
}
region_changed (ARDOUR::bounds_change);
-
+
} else {
region_changed (PropertyChange (ARDOUR::Properties::length));
}
+
+ return (pre_trim_last_frame != _region->last_frame()); //return true if we actually changed something
}
}
}
- _region->trim_start ((framepos_t) (new_bound * speed), this);
+ _region->trim_start ((framepos_t) (new_bound * speed));
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