*/
#include <cmath>
-#include <cassert>
#include <algorithm>
#include <gtkmm.h>
#include "canvas/pixbuf.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"
#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,
(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 () */
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 (frame_handle_end) {
frame_handle_end->set_data ("regionview", this);
frame_handle_end->set_data ("isleft", (void*) 0);
_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? */
}
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 = UIConfiguration::instance().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 (UIConfiguration::instance().color ("silence text"));
/* both positions are relative to the region start offset in source */
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;
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 (RGBA_TO_UINT (0, 255, 0, 255));
- sync_line->set_outline_color (RGBA_TO_UINT (0, 255, 0, 255));
+ ArdourCanvas::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);
}
}
-void
-RegionView::set_frame_color ()
+uint32_t
+RegionView::get_fill_color () const
{
+ ArdourCanvas::Color f = TimeAxisViewItem::get_fill_color();
+ char const *modname;
+
if (_region->opaque()) {
- fill_opacity = 130;
+ modname = "opaque region base";
} else {
- fill_opacity = 60;
+ modname = "transparent region base";
}
- TimeAxisViewItem::set_frame_color ();
-}
-
-void
-RegionView::fake_set_opaque (bool yn)
-{
- if (yn) {
- fill_opacity = 130;
- } else {
- fill_opacity = 60;
- }
-
- set_frame_color ();
+ return HSV(f).mod (UIConfiguration::instance().modifier (modname)).color ();
}
void
set_item_name (str, this);
set_name_text (str);
- reset_width_dependent_items (_pixel_width);
}
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 (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
*/
ArdourCanvas::Item *item = get_canvas_group ();
-
+
if (item->position().x + x_delta < 0) {
x_delta = -item->position().x; /* move it to zero */
}
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));
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));
}
bool
-RegionView::trim_front (framepos_t new_bound, bool no_overlap)
+RegionView::trim_front (framepos_t new_bound, bool no_overlap, const int32_t sub_num)
{
if (_region->locked()) {
return false;
framepos_t const pre_trim_first_frame = _region->first_frame();
- _region->trim_front ((framepos_t) (new_bound * speed));
+ const framepos_t speed_bound = (framepos_t) (new_bound * speed);
+
+ if (_region->position() == speed_bound) {
+ return false;
+ }
+
+ _region->trim_front (speed_bound, sub_num);
if (no_overlap) {
// Get the next region on the left of this region and shrink/expand it.
}
bool
-RegionView::trim_end (framepos_t new_bound, bool no_overlap)
+RegionView::trim_end (framepos_t new_bound, bool no_overlap, const int32_t sub_num)
{
if (_region->locked()) {
return false;
framepos_t const pre_trim_last_frame = _region->last_frame();
- _region->trim_end ((framepos_t) (new_bound * speed));
+ _region->trim_end ((framepos_t) (new_bound * speed), sub_num);
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);
+ region_right->trim_front (_region->last_frame() + 1, sub_num);
}
region_changed (ARDOUR::bounds_change);
/** 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