#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"
, 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());
}
: 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 () */
: 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.
, 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());
-
+
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, double threshold)
+RegionView::set_silent_frames (const AudioIntervalResult& silences, double /*threshold*/)
{
framecnt_t shortest = max_framecnt;
- framecnt_t shortest_audible = max_framecnt;
/* remove old silent frames */
drop_silent_frames ();
return;
}
- framepos_t start;
- framepos_t end;
- bool in_silence;
- bool seen_audible = false;
- AudioIntervalResult::const_iterator s;
uint32_t const color = ARDOUR_UI::config()->canvasvar_Silence.get();
- start = _region->start();
- s = silences.begin();
+ for (AudioIntervalResult::const_iterator i = silences.begin(); i != silences.end(); ++i) {
- if (s->first == start) {
- /* segment starting at zero is silent */
- end = s->second;
- in_silence = true;
- } else {
- /* segment starting at zero is audible, and begins at the start of the region in the source */
- end = s->first;
- in_silence = false;
- }
+ ArdourCanvas::SimpleRect* cr = new ArdourCanvas::SimpleRect (*group);
+ _silent_frames.push_back (cr);
- while (start < _region->start() + _region->length()) {
-
- framecnt_t interval_duration = end - start;
-
- if (interval_duration > 0) {
- if (in_silence) {
-
- ArdourCanvas::SimpleRect* cr = new ArdourCanvas::SimpleRect (*group);
- _silent_frames.push_back (cr);
-
- /* coordinates for the rect are relative to the regionview origin */
-
- cr->property_x1() = trackview.editor().frame_to_pixel (s->first - _region->start());
- cr->property_x2() = trackview.editor().frame_to_pixel (s->second - _region->start());
- cr->property_y1() = 1;
- cr->property_y2() = _height - 2;
- cr->property_outline_pixels() = 0;
- cr->property_fill_color_rgba () = color;
-
- if (interval_duration < shortest) {
- shortest = interval_duration;
- }
-
- } else if (interval_duration > 0) {
- seen_audible = true;
- if (interval_duration < shortest_audible) {
- shortest_audible = interval_duration;
- }
- }
-
- start = end;
- in_silence = !in_silence;
- ++s;
-
- if (s == silences.end()) {
- end = _region->start() + _region->length();
- } else {
- end = s->first;
- }
- }
- }
+ /* 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;
+
+ shortest = min (shortest, i->second - i->first);
+ }
+
+ /* Find shortest audible segment */
+ framecnt_t shortest_audible = max_framecnt;
+
+ 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);
+ }
+
+ s = i->second;
+ }
+ framecnt_t const dur = _region->start() + _region->length() - 1 - s;
+ if (dur > 0) {
+ shortest_audible = min (shortest_audible, dur);
+ }
_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_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;
-
+
/* 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");
- }
-
- ms = (float) shortest/_region->session().frame_rate();
-
+
+ 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 {
sunits = _("secs");
}
-
- if (seen_audible) {
+
+ 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 = shortest_audible / _region->session().frame_rate();
+ double ma = (float) shortest_audible / _region->session().frame_rate();
char const * aunits;
-
+
if (ma >= 60.0) {
aunits = _("minutes");
ma /= 60.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();
- } else {
- _silence_text->property_text() = string_compose (_("%1 %2, shortest = %3 %4"),
- silences.size(), noun, ms, sunits).c_str();
- }
-}
+
+ text += string_compose (_("\n (shortest audible segment = %1 %2)"), ma, aunits);
+ }
+
+ _silence_text->property_text() = text.c_str ();
+}
void
RegionView::hide_silent_frames ()
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;
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;
}
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);
}
}
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));
}
}
}
- _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