*/
#include <cmath>
-#include <cassert>
#include <algorithm>
#include <gtkmm.h>
#include <gtkmm2ext/gtk_ui.h>
#include "ardour/playlist.h"
+#include "ardour/profile.h"
#include "ardour/session.h"
+#include "gtkmm2ext/colors.h"
+
#include "canvas/polygon.h"
#include "canvas/debug.h"
#include "canvas/pixbuf.h"
#include "canvas/text.h"
#include "canvas/line.h"
-#include "ardour_ui.h"
-#include "global_signals.h"
#include "streamview.h"
#include "region_view.h"
#include "automation_region_view.h"
#include "rgb_macros.h"
#include "gui_thread.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace std;
using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
using namespace PBD;
using namespace Editing;
using namespace Gtk;
PBD::Signal1<void,RegionView*> RegionView::RegionViewGoingAway;
-RegionView::RegionView (ArdourCanvas::Group* parent,
+RegionView::RegionView (ArdourCanvas::Container* parent,
TimeAxisView& tv,
boost::shared_ptr<ARDOUR::Region> r,
double spu,
- Gdk::Color const & basic_color,
- bool automation)
+ uint32_t basic_color,
+ bool automation)
: TimeAxisViewItem (r->name(), *parent, tv, spu, basic_color, r->position(), r->length(), false, automation,
- TimeAxisViewItem::Visibility (TimeAxisViewItem::ShowNameText|
- TimeAxisViewItem::ShowNameHighlight| TimeAxisViewItem::ShowFrame))
+ (automation ? TimeAxisViewItem::ShowFrame :
+ TimeAxisViewItem::Visibility (TimeAxisViewItem::ShowNameText|
+ TimeAxisViewItem::ShowNameHighlight| TimeAxisViewItem::ShowFrame)))
, _region (r)
, sync_mark(0)
, sync_line(0)
, _pixel_width(1.0)
, in_destructor(false)
, wait_for_data(false)
- , _silence_text (0)
- , _region_relative_time_converter(r->session().tempo_map(), r->position())
- , _source_relative_time_converter(r->session().tempo_map(), r->position() - r->start())
+ , _silence_text (0)
{
- 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)
- , _region_relative_time_converter(other.region_relative_time_converter())
- , _source_relative_time_converter(other.source_relative_time_converter())
+ , _silence_text (0)
{
/* derived concrete type will call init () */
current_visible_sync_position = other.current_visible_sync_position;
valid = false;
_pixel_width = other._pixel_width;
-
- 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)
- , _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())
+ , _silence_text (0)
{
/* this is a pseudo-copy constructor used when dragging regions
around on the canvas.
current_visible_sync_position = other.current_visible_sync_position;
valid = false;
_pixel_width = other._pixel_width;
-
- GhostRegion::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&RegionView::remove_ghost, this, _1), gui_context());
}
-RegionView::RegionView (ArdourCanvas::Group* parent,
- TimeAxisView& tv,
+RegionView::RegionView (ArdourCanvas::Container* parent,
+ TimeAxisView& tv,
boost::shared_ptr<ARDOUR::Region> r,
- double spu,
- Gdk::Color const & basic_color,
- bool recording,
- TimeAxisViewItem::Visibility visibility)
+ double spu,
+ uint32_t basic_color,
+ bool recording,
+ TimeAxisViewItem::Visibility visibility)
: TimeAxisViewItem (r->name(), *parent, tv, spu, basic_color, r->position(), r->length(), recording, false, visibility)
, _region (r)
, sync_mark(0)
, _pixel_width(1.0)
, in_destructor(false)
, wait_for_data(false)
- , _silence_text (0)
- , _region_relative_time_converter(r->session().tempo_map(), r->position())
- , _source_relative_time_converter(r->session().tempo_map(), r->position() - r->start())
+ , _silence_text (0)
{
}
void
-RegionView::init (Gdk::Color const & basic_color, bool wfd)
+RegionView::init (bool wfd)
{
editor = 0;
valid = true;
sync_mark = 0;
sync_line = 0;
- compute_colors (basic_color);
-
if (name_highlight) {
name_highlight->set_data ("regionview", this);
name_highlight->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_region_view_name_highlight_event), name_highlight, this));
+ }
- if (frame_handle_start) {
- frame_handle_start->set_data ("regionview", this);
- frame_handle_start->set_data ("isleft", (void*) 1);
- frame_handle_start->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_frame_handle_event), frame_handle_start, this));
- frame_handle_start->raise_to_top();
- }
+ if (sample_handle_start) {
+ sample_handle_start->set_data ("regionview", this);
+ sample_handle_start->set_data ("isleft", (void*) 1);
+ sample_handle_start->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_sample_handle_event), sample_handle_start, this));
+ sample_handle_start->raise_to_top();
+ }
- if (frame_handle_end) {
- frame_handle_end->set_data ("regionview", this);
- frame_handle_end->set_data ("isleft", (void*) 0);
- frame_handle_end->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_frame_handle_event), frame_handle_end, this));
- frame_handle_end->raise_to_top();
- }
+ if (sample_handle_end) {
+ sample_handle_end->set_data ("regionview", this);
+ sample_handle_end->set_data ("isleft", (void*) 0);
+ sample_handle_end->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_sample_handle_event), sample_handle_end, this));
+ sample_handle_end->raise_to_top();
}
if (name_text) {
_enable_display = true;
}
- set_height (trackview.current_height());
+ /* derived class calls set_height () including RegionView::set_height() in ::init() */
+ //set_height (trackview.current_height());
_region->PropertyChanged.connect (*this, invalidator (*this), boost::bind (&RegionView::region_changed, this, _1), gui_context());
- set_colors ();
-
- ColorsChanged.connect (sigc::mem_fun (*this, &RegionView::color_handler));
+ /* derived class calls set_colors () including RegionView::set_colors() in ::init() */
+ //set_colors ();
+ UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &RegionView::color_handler));
/* XXX sync mark drag? */
}
delete *g;
}
- for (list<ArdourCanvas::Rectangle*>::iterator i = _coverage_frames.begin (); i != _coverage_frames.end (); ++i) {
+ for (list<ArdourCanvas::Rectangle*>::iterator i = _coverage_samples.begin (); i != _coverage_samples.end (); ++i) {
delete *i;
}
- drop_silent_frames ();
+ drop_silent_samples ();
delete editor;
}
bool
RegionView::canvas_group_event (GdkEvent* event)
{
- return trackview.editor().canvas_region_view_event (event, group, this);
+ if (!in_destructor) {
+ return trackview.editor().canvas_region_view_event (event, group, this);
+ }
+ return false;
}
void
-RegionView::set_silent_frames (const AudioIntervalResult& silences, double /*threshold*/)
+RegionView::set_silent_samples (const AudioIntervalResult& silences, double /*threshold*/)
{
- framecnt_t shortest = max_framecnt;
+ samplecnt_t shortest = max_samplecnt;
- /* remove old silent frames */
- drop_silent_frames ();
+ /* remove old silent samples */
+ drop_silent_samples ();
- if (silences.empty()) {
- return;
- }
+ if (silences.empty()) {
+ return;
+ }
- uint32_t const color = ARDOUR_UI::config()->get_canvasvar_Silence();
+ uint32_t const color = UIConfiguration::instance().color_mod ("silence", "silence");
for (AudioIntervalResult::const_iterator i = silences.begin(); i != silences.end(); ++i) {
ArdourCanvas::Rectangle* cr = new ArdourCanvas::Rectangle (group);
cr->set_ignore_events (true);
- _silent_frames.push_back (cr);
+ _silent_samples.push_back (cr);
/* coordinates for the rect are relative to the regionview origin */
}
/* Find shortest audible segment */
- framecnt_t shortest_audible = max_framecnt;
+ samplecnt_t shortest_audible = max_samplecnt;
- framecnt_t s = _region->start();
+ samplecnt_t s = _region->start();
for (AudioIntervalResult::const_iterator i = silences.begin(); i != silences.end(); ++i) {
- framecnt_t const dur = i->first - s;
+ samplecnt_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;
+ samplecnt_t const dur = _region->start() + _region->length() - 1 - s;
if (dur > 0) {
shortest_audible = min (shortest_audible, dur);
}
- _silence_text = new ArdourCanvas::Text (group);
+ _silence_text = new ArdourCanvas::Text (group);
_silence_text->set_ignore_events (true);
- _silence_text->set_font_description (get_font_for_style (N_("SilenceText")));
- _silence_text->set_color (ARDOUR_UI::config()->get_canvasvar_SilenceText());
+ _silence_text->set_font_description (get_font_for_style (N_("SilenceText")));
+ _silence_text->set_color (UIConfiguration::instance().color ("silence text"));
- /* both positions are relative to the region start offset in source */
+ /* both positions are relative to the region start offset in source */
- _silence_text->set_x_position (trackview.editor().sample_to_pixel (silences.front().first - _region->start()) + 10.0);
- _silence_text->set_y_position (20.0);
+ _silence_text->set_x_position (trackview.editor().sample_to_pixel (silences.front().first - _region->start()) + 10.0);
+ _silence_text->set_y_position (20.0);
- double ms = (float) shortest/_region->session().frame_rate();
+ double ms = (float) shortest/_region->session().sample_rate();
- /* ms are now in seconds */
+ /* ms are now in seconds */
- char const * sunits;
+ 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");
- }
+ 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 {
- aunits = _("secs");
- }
+ if (shortest_audible != max_samplepos) {
+ /* ms are now in seconds */
+ double ma = (float) shortest_audible / _region->session().sample_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");
+ }
text += string_compose (_("\n (shortest audible segment = %1 %2)"), ma, aunits);
}
}
void
-RegionView::hide_silent_frames ()
+RegionView::hide_silent_samples ()
{
- for (list<ArdourCanvas::Rectangle*>::iterator i = _silent_frames.begin (); i != _silent_frames.end (); ++i) {
- (*i)->hide ();
+ for (list<ArdourCanvas::Rectangle*>::iterator i = _silent_samples.begin (); i != _silent_samples.end (); ++i) {
+ (*i)->hide ();
}
- _silence_text->hide();
+ _silence_text->hide();
}
void
-RegionView::drop_silent_frames ()
+RegionView::drop_silent_samples ()
{
- for (list<ArdourCanvas::Rectangle*>::iterator i = _silent_frames.begin (); i != _silent_frames.end (); ++i) {
+ for (list<ArdourCanvas::Rectangle*>::iterator i = _silent_samples.begin (); i != _silent_samples.end (); ++i) {
delete *i;
}
- _silent_frames.clear ();
+ _silent_samples.clear ();
- delete _silence_text;
- _silence_text = 0;
+ delete _silence_text;
+ _silence_text = 0;
}
gint
if (what_changed.contains (ARDOUR::Properties::name)) {
region_renamed ();
}
+ if (what_changed.contains (ARDOUR::Properties::position_lock_style)) {
+ region_renamed ();
+ }
if (what_changed.contains (ARDOUR::Properties::sync_position)) {
region_sync_changed ();
}
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);
- _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;
void
RegionView::region_muted ()
{
- set_frame_color ();
+ set_sample_color ();
region_renamed ();
}
void
RegionView::region_opacity ()
{
- set_frame_color ();
+ set_sample_color ();
}
void
}
bool
-RegionView::set_position (framepos_t pos, void* /*src*/, double* ignored)
+RegionView::set_position (samplepos_t pos, void* /*src*/, double* ignored)
{
double delta;
bool ret;
}
bool
-RegionView::set_duration (framecnt_t frames, void *src)
+RegionView::set_duration (samplecnt_t samples, void *src)
{
- if (!TimeAxisViewItem::set_duration (frames, src)) {
+ if (!TimeAxisViewItem::set_duration (samples, src)) {
return false;
}
RegionView::set_colors ()
{
TimeAxisViewItem::set_colors ();
-
- if (sync_mark) {
- /* XXX: make these colours themable */
- sync_mark->set_fill_color (RGBA_TO_UINT (0, 255, 0, 255));
- sync_line->set_outline_color (RGBA_TO_UINT (0, 255, 0, 255));
- }
+ set_sync_mark_color ();
}
void
-RegionView::set_frame_color ()
+RegionView::set_sync_mark_color ()
{
- if (_region->opaque()) {
- fill_opacity = 130;
- } else {
- fill_opacity = 60;
+ if (sync_mark) {
+ Gtkmm2ext::Color c = UIConfiguration::instance().color ("sync mark");
+ sync_mark->set_fill_color (c);
+ sync_mark->set_outline_color (c);
+ sync_line->set_outline_color (c);
}
-
- TimeAxisViewItem::set_frame_color ();
}
-void
-RegionView::fake_set_opaque (bool yn)
+uint32_t
+RegionView::get_fill_color () const
{
- if (yn) {
- fill_opacity = 130;
- } else {
- fill_opacity = 60;
- }
+ Gtkmm2ext::Color f = TimeAxisViewItem::get_fill_color();
+ char const *modname;
+
+ if (_region->opaque() && (!ARDOUR::Profile->get_mixbus() || (!_dragging && !_region->muted ()))) {
+ modname = "opaque region base";
+ } else {
+ modname = "transparent region base";
+ }
- set_frame_color ();
+ return Gtkmm2ext::HSV(f).mod (UIConfiguration::instance().modifier (modname)).color ();
}
void
std::string str;
// XXX nice to have some good icons for this
+ if (_region->position_lock_style() == MusicTime) {
+ str += "\u266B"; // BEAMED EIGHTH NOTES
+ }
if (_region->locked()) {
- str += '>';
+ str += "\u2629"; // CROSS OF JERUSALEM
str += _region->name();
- str += '<';
} else if (_region->position_locked()) {
- str += '{';
+ str += "\u21B9"; // LEFTWARDS ARROW TO BAR OVER RIGHTWARDS ARROW TO BAR
str += _region->name();
- str += '}';
} else if (_region->video_locked()) {
str += '[';
str += _region->name();
str += ']';
} else {
- str = _region->name();
+ str += _region->name();
}
if (_region->muted()) {
set_item_name (str, this);
set_name_text (str);
- reset_width_dependent_items (_pixel_width);
}
void
RegionView::region_sync_changed ()
{
int sync_dir;
- framecnt_t sync_offset;
+ samplecnt_t sync_offset;
sync_offset = _region->sync_offset (sync_dir);
sync_mark = new ArdourCanvas::Polygon (group);
CANVAS_DEBUG_NAME (sync_mark, string_compose ("sync mark for %1", get_item_name()));
- sync_mark->set_fill_color (RGBA_TO_UINT(0,255,0,255)); // FIXME make a themeable colour
-
sync_line = new ArdourCanvas::Line (group);
CANVAS_DEBUG_NAME (sync_line, string_compose ("sync mark for %1", get_item_name()));
- sync_line->set_outline_color (RGBA_TO_UINT(0,255,0,255)); // FIXME make a themeable colour
+
+ set_sync_mark_color ();
}
/* this has to handle both a genuine change of position, a change of samples_per_pixel
return;
}
- get_canvas_group()->move (ArdourCanvas::Duple (x_delta, y_delta));
+ /* items will not prevent Item::move() moving
+ * them to a negative x-axis coordinate, which
+ * is legal, but we don't want that here.
+ */
+
+ ArdourCanvas::Item *item = get_canvas_group ();
+
+ if (item->position().x + x_delta < 0) {
+ x_delta = -item->position().x; /* move it to zero */
+ }
+
+ item->move (ArdourCanvas::Duple (x_delta, y_delta));
/* note: ghosts never leave their tracks so y_delta for them is always zero */
}
}
-uint32_t
-RegionView::get_fill_color ()
-{
- return fill_color;
-}
-
void
RegionView::set_height (double h)
{
if (sync_line) {
Points points;
int sync_dir;
- framecnt_t sync_offset;
+ samplecnt_t sync_offset;
sync_offset = _region->sync_offset (sync_dir);
double offset = sync_offset / samples_per_pixel;
);
}
- for (list<ArdourCanvas::Rectangle*>::iterator i = _coverage_frames.begin(); i != _coverage_frames.end(); ++i) {
+ for (list<ArdourCanvas::Rectangle*>::iterator i = _coverage_samples.begin(); i != _coverage_samples.end(); ++i) {
(*i)->set_y1 (h + 1);
}
- for (list<ArdourCanvas::Rectangle*>::iterator i = _silent_frames.begin(); i != _silent_frames.end(); ++i) {
+ for (list<ArdourCanvas::Rectangle*>::iterator i = _silent_samples.begin(); i != _silent_samples.end(); ++i) {
(*i)->set_y1 (h + 1);
}
}
-/** Remove old coverage frames and make new ones, if we're in a LayerDisplay mode
+/** Remove old coverage samples and make new ones, if we're in a LayerDisplay mode
* which uses them. */
void
-RegionView::update_coverage_frames (LayerDisplay d)
+RegionView::update_coverage_samples (LayerDisplay d)
{
- /* remove old coverage frames */
- for (list<ArdourCanvas::Rectangle*>::iterator i = _coverage_frames.begin (); i != _coverage_frames.end (); ++i) {
+ /* remove old coverage samples */
+ for (list<ArdourCanvas::Rectangle*>::iterator i = _coverage_samples.begin (); i != _coverage_samples.end (); ++i) {
delete *i;
}
- _coverage_frames.clear ();
+ _coverage_samples.clear ();
if (d != Stacked) {
- /* don't do coverage frames unless we're in stacked mode */
+ /* don't do coverage samples unless we're in stacked mode */
return;
}
return;
}
- framepos_t const position = _region->first_frame ();
- framepos_t t = position;
- framepos_t const end = _region->last_frame ();
+ samplepos_t const position = _region->first_sample ();
+ samplepos_t t = position;
+ samplepos_t const end = _region->last_sample ();
ArdourCanvas::Rectangle* cr = 0;
bool me = false;
/* 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()->get_canvasvar_CoveredRegion ();
+ uint32_t const non_playing_color = UIConfiguration::instance().color_mod ("covered region", "covered region base");
+
while (t < end) {
/* is this region is on top at time t? */
bool const new_me = (pl->top_unmuted_region_at (t) == _region);
-
/* finish off any old rect, if required */
if (cr && me != new_me) {
cr->set_x1 (trackview.editor().sample_to_pixel (t - position));
/* start off any new rect, if required */
if (cr == 0 || me != new_me) {
cr = new ArdourCanvas::Rectangle (group);
- _coverage_frames.push_back (cr);
+ _coverage_samples.push_back (cr);
cr->set_x0 (trackview.editor().sample_to_pixel (t - position));
cr->set_y0 (1);
cr->set_y1 (_height + 1);
cr->set_fill_color (non_playing_color);
}
}
-
t = pl->find_next_region_boundary (t, 1);
+ if (t < 0) {
+ break;
+ }
me = new_me;
}
+ t = pl->find_next_region_boundary (t, 1);
+
if (cr) {
/* finish off the last rectangle */
cr->set_x1 (trackview.editor().sample_to_pixel (end - position));
}
- if (frame_handle_start) {
- frame_handle_start->raise_to_top ();
+ if (sample_handle_start) {
+ sample_handle_start->raise_to_top ();
}
- if (frame_handle_end) {
- frame_handle_end->raise_to_top ();
+ if (sample_handle_end) {
+ sample_handle_end->raise_to_top ();
}
if (name_highlight) {
}
bool
-RegionView::trim_front (framepos_t new_bound, bool no_overlap)
+RegionView::trim_front (samplepos_t new_bound, bool no_overlap, const int32_t sub_num)
{
if (_region->locked()) {
return false;
}
- RouteTimeAxisView& rtv = dynamic_cast<RouteTimeAxisView&> (trackview);
- double const speed = rtv.track()->speed ();
+ samplepos_t const pre_trim_first_sample = _region->first_sample();
- framepos_t const pre_trim_first_frame = _region->first_frame();
+ if (_region->position() == new_bound) {
+ return false;
+ }
- _region->trim_front ((framepos_t) (new_bound * speed));
+ _region->trim_front (new_bound, sub_num);
if (no_overlap) {
// Get the next region on the left of this region and shrink/expand it.
boost::shared_ptr<Playlist> playlist (_region->playlist());
- boost::shared_ptr<Region> region_left = playlist->find_next_region (pre_trim_first_frame, End, 0);
+ boost::shared_ptr<Region> region_left = playlist->find_next_region (pre_trim_first_sample, End, 0);
bool regions_touching = false;
- if (region_left != 0 && (pre_trim_first_frame == region_left->last_frame() + 1)) {
+ if (region_left != 0 && (pre_trim_first_sample == region_left->last_sample() + 1)) {
regions_touching = true;
}
- // 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);
+ // Only trim region on the left if the first sample has gone beyond the left region's last sample.
+ if (region_left != 0 && (region_left->last_sample() > _region->first_sample() || regions_touching)) {
+ region_left->trim_end (_region->first_sample() - 1);
}
}
region_changed (ARDOUR::bounds_change);
- return (pre_trim_first_frame != _region->first_frame()); //return true if we actually changed something
+ return (pre_trim_first_sample != _region->first_sample()); //return true if we actually changed something
}
bool
-RegionView::trim_end (framepos_t new_bound, bool no_overlap)
+RegionView::trim_end (samplepos_t new_bound, bool no_overlap, const int32_t sub_num)
{
if (_region->locked()) {
return false;
}
- RouteTimeAxisView& rtv = dynamic_cast<RouteTimeAxisView&> (trackview);
- double const speed = rtv.track()->speed ();
-
- framepos_t const pre_trim_last_frame = _region->last_frame();
+ samplepos_t const pre_trim_last_sample = _region->last_sample();
- _region->trim_end ((framepos_t) (new_bound * speed));
+ _region->trim_end (new_bound, sub_num);
if (no_overlap) {
// Get the next region on the right of this region and shrink/expand it.
boost::shared_ptr<Playlist> playlist (_region->playlist());
- boost::shared_ptr<Region> region_right = playlist->find_next_region (pre_trim_last_frame, Start, 1);
+ boost::shared_ptr<Region> region_right = playlist->find_next_region (pre_trim_last_sample, Start, 1);
bool regions_touching = false;
- if (region_right != 0 && (pre_trim_last_frame == region_right->first_frame() - 1)) {
+ if (region_right != 0 && (pre_trim_last_sample == region_right->first_sample() - 1)) {
regions_touching = true;
}
- // 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);
+ // Only trim region on the right if the last sample has gone beyond the right region's first sample.
+ if (region_right != 0 && (region_right->first_sample() < _region->last_sample() || regions_touching)) {
+ region_right->trim_front (_region->last_sample() + 1, sub_num);
}
region_changed (ARDOUR::bounds_change);
region_changed (PropertyChange (ARDOUR::Properties::length));
}
- return (pre_trim_last_frame != _region->last_frame()); //return true if we actually changed something
+ return (pre_trim_last_sample != _region->last_sample()); //return true if we actually changed something
}
void
-RegionView::move_contents (frameoffset_t distance)
+RegionView::move_contents (sampleoffset_t distance)
{
if (_region->locked()) {
return;
region_changed (PropertyChange (ARDOUR::Properties::start));
}
-/** Snap a frame offset within our region using the current snap settings.
+/** Snap a sample 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.
+ * @param ensure_snap whether to ignore snap_mode (in the case of SnapOff) and magnetic snap.
+ * Used when inverting snap mode logic with key modifiers, or snap distance calculation.
+ * @return Snapped sample offset from this region's position.
*/
-frameoffset_t
-RegionView::snap_frame_to_frame (frameoffset_t x) const
+MusicSample
+RegionView::snap_sample_to_sample (sampleoffset_t x, bool ensure_snap) const
{
PublicEditor& editor = trackview.editor();
-
- /* x is region relative, convert it to global absolute frames */
- framepos_t const session_frame = x + _region->position();
+ /* x is region relative, convert it to global absolute samples */
+ samplepos_t const session_sample = x + _region->position();
/* try a snap in either direction */
- framepos_t frame = session_frame;
- editor.snap_to (frame, 0);
+ MusicSample sample (session_sample, 0);
+ editor.snap_to (sample, RoundNearest, SnapToAny_Visual, ensure_snap);
/* if we went off the beginning of the region, snap forwards */
- if (frame < _region->position ()) {
- frame = session_frame;
- editor.snap_to (frame, 1);
+ if (sample.sample < _region->position ()) {
+ sample.sample = session_sample;
+ editor.snap_to (sample, RoundUpAlways, SnapToAny_Visual, ensure_snap);
}
- /* back to region relative */
- return frame - _region->position();
+ /* back to region relative, keeping the relevant divisor */
+ return MusicSample (sample.sample - _region->position(), sample.division);
}
projects / ardour.git / blobdiff