*/
#include <cmath>
-#include <cassert>
#include <algorithm>
#include <gtkmm.h>
#include "canvas/text.h"
#include "canvas/line.h"
#include "canvas/utils.h"
+#include "canvas/colors.h"
#include "ardour_ui.h"
#include "global_signals.h"
PBD::Signal1<void,RegionView*> RegionView::RegionViewGoingAway;
-RegionView::RegionView (ArdourCanvas::Container* parent,
+RegionView::RegionView (ArdourCanvas::Container* parent,
TimeAxisView& tv,
boost::shared_ptr<ARDOUR::Region> r,
double spu,
uint32_t basic_color,
- bool automation)
+ bool automation)
: TimeAxisViewItem (r->name(), *parent, tv, spu, basic_color, r->position(), r->length(), false, automation,
(automation ? TimeAxisViewItem::ShowFrame :
TimeAxisViewItem::Visibility (TimeAxisViewItem::ShowNameText|
, _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 () */
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.
GhostRegion::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&RegionView::remove_ghost, this, _1), gui_context());
}
-RegionView::RegionView (ArdourCanvas::Container* parent,
- TimeAxisView& tv,
+RegionView::RegionView (ArdourCanvas::Container* parent,
+ TimeAxisView& tv,
boost::shared_ptr<ARDOUR::Region> r,
- double spu,
- uint32_t 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)
{
}
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
return;
}
- uint32_t const color = ARDOUR_UI::config()->get_canvasvar_Silence();
+ uint32_t const color = ARDOUR_UI::config()->color_mod ("silence", "silence");
for (AudioIntervalResult::const_iterator i = silences.begin(); i != silences.end(); ++i) {
_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_color (ARDOUR_UI::config()->color ("silence text"));
/* both positions are relative to the region start offset in source */
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;
return true;
}
-uint32_t
-RegionView::fill_opacity () const
-{
- if (!_region->opaque()) {
- return 60;
- }
-
- uint32_t normal_tavi_opacity = TimeAxisViewItem::fill_opacity ();
-
- return normal_tavi_opacity;
-}
-
void
RegionView::set_colors ()
{
TimeAxisViewItem::set_colors ();
+ set_sync_mark_color ();
+}
+void
+RegionView::set_sync_mark_color ()
+{
if (sync_mark) {
- /* XXX: make these colours themable */
- sync_mark->set_fill_color (ArdourCanvas::rgba_to_color (0, 1.0, 0, 1.0));
- sync_line->set_outline_color (ArdourCanvas::rgba_to_color (0, 1.0, 0, 1.0));
+ ArdourCanvas::Color c = ARDOUR_UI::config()->color ("sync mark");
+ sync_mark->set_fill_color (c);
+ sync_mark->set_outline_color (c);
+ sync_line->set_outline_color (c);
}
}
-void
-RegionView::set_frame_color ()
+uint32_t
+RegionView::get_fill_color () const
{
- TimeAxisViewItem::set_frame_color ();
+ ArdourCanvas::Color f = TimeAxisViewItem::get_fill_color();
+ char const *modname;
+
+ if (_region->opaque()) {
+ modname = "opaque region base";
+ } else {
+ modname = "transparent region base";
+ }
+
+ return HSV(f).mod (ARDOUR_UI::config()->modifier (modname)).color ();
}
void
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 (ArdourCanvas::rgba_to_color (0, 1.0, 0, 1.0)); // 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 (ArdourCanvas::rgba_to_color (0, 1.0, 0, 1.0)); // 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
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 = ARDOUR_UI::config()->color_mod ("covered region", "covered region base");
while (t < end) {
/** Snap a frame offset within our region using the current snap settings.
* @param x 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 frame offset from this region's position.
*/
frameoffset_t
-RegionView::snap_frame_to_frame (frameoffset_t x) const
+RegionView::snap_frame_to_frame (frameoffset_t x, bool ensure_snap) const
{
PublicEditor& editor = trackview.editor();
/* try a snap in either direction */
framepos_t frame = session_frame;
- editor.snap_to (frame, 0);
+ editor.snap_to (frame, RoundNearest, false, 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);
+ editor.snap_to (frame, RoundUpAlways, false, ensure_snap);
}
/* back to region relative */
projects / ardour.git / blobdiff