#include <cmath>
#include <cassert>
#include <algorithm>
+#include <vector>
+
+#include <boost/scoped_array.hpp>
#include <gtkmm.h>
#include "evoral/Curve.hpp"
+#include "canvas/rectangle.h"
+#include "canvas/polygon.h"
+#include "canvas/poly_line.h"
+#include "canvas/line.h"
+#include "canvas/text.h"
+#include "canvas/debug.h"
+#include "canvas/utils.h"
+
#include "streamview.h"
#include "audio_region_view.h"
#include "audio_time_axis.h"
-#include "simplerect.h"
-#include "simpleline.h"
-#include "waveview.h"
#include "public_editor.h"
#include "audio_region_editor.h"
+#include "audio_streamview.h"
#include "region_gain_line.h"
#include "control_point.h"
#include "ghostregion.h"
#include "i18n.h"
-#define MUTED_ALPHA 10
+#define MUTED_ALPHA 48
using namespace std;
using namespace ARDOUR;
using namespace ArdourCanvas;
static const int32_t sync_mark_width = 9;
+static double const handle_size = 15; /* height of fade handles */
AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv, boost::shared_ptr<AudioRegion> r, double spu,
Gdk::Color const & basic_color)
: RegionView (parent, tv, r, spu, basic_color)
, sync_mark(0)
- , zero_line(0)
, fade_in_shape(0)
, fade_out_shape(0)
, fade_in_handle(0)
, fade_out_handle(0)
- , fade_position_line(0)
- , gain_line(0)
+ , start_xfade_in (0)
+ , start_xfade_out (0)
+ , start_xfade_rect (0)
+ , _start_xfade_visible (false)
+ , end_xfade_in (0)
+ , end_xfade_out (0)
+ , end_xfade_rect (0)
+ , _end_xfade_visible (false)
, _amplitude_above_axis(1.0)
- , _flags(0)
, fade_color(0)
{
+ Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&AudioRegionView::parameter_changed, this, _1), gui_context());
}
-
AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv, boost::shared_ptr<AudioRegion> r, double spu,
Gdk::Color const & basic_color, bool recording, TimeAxisViewItem::Visibility visibility)
: RegionView (parent, tv, r, spu, basic_color, recording, visibility)
, sync_mark(0)
- , zero_line(0)
- , fade_in_shape(0)
- , fade_out_shape(0)
- , fade_in_handle(0)
- , fade_out_handle(0)
- , fade_position_line(0)
- , gain_line(0)
- , _amplitude_above_axis(1.0)
- , _flags(0)
- , fade_color(0)
-{
-}
-
-
-AudioRegionView::AudioRegionView (const AudioRegionView& other)
- : sigc::trackable(other)
- , RegionView (other)
- , zero_line(0)
, fade_in_shape(0)
, fade_out_shape(0)
, fade_in_handle(0)
, fade_out_handle(0)
- , fade_position_line(0)
- , gain_line(0)
+ , start_xfade_in (0)
+ , start_xfade_out (0)
+ , start_xfade_rect (0)
+ , _start_xfade_visible (false)
+ , end_xfade_in (0)
+ , end_xfade_out (0)
+ , end_xfade_rect (0)
+ , _end_xfade_visible (false)
, _amplitude_above_axis(1.0)
- , _flags(0)
, fade_color(0)
{
- Gdk::Color c;
- int r,g,b,a;
-
- UINT_TO_RGBA (other.fill_color, &r, &g, &b, &a);
- c.set_rgb_p (r/255.0, g/255.0, b/255.0);
-
- init (c, false);
+ Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&AudioRegionView::parameter_changed, this, _1), gui_context());
}
AudioRegionView::AudioRegionView (const AudioRegionView& other, boost::shared_ptr<AudioRegion> other_region)
: RegionView (other, boost::shared_ptr<Region> (other_region))
- , zero_line(0)
, fade_in_shape(0)
, fade_out_shape(0)
, fade_in_handle(0)
, fade_out_handle(0)
- , fade_position_line(0)
- , gain_line(0)
- , _amplitude_above_axis(1.0)
- , _flags(0)
+ , start_xfade_in (0)
+ , start_xfade_out (0)
+ , start_xfade_rect (0)
+ , _start_xfade_visible (false)
+ , end_xfade_in (0)
+ , end_xfade_out (0)
+ , end_xfade_rect (0)
+ , _end_xfade_visible (false)
+ , _amplitude_above_axis (other._amplitude_above_axis)
, fade_color(0)
{
Gdk::Color c;
c.set_rgb_p (r/255.0, g/255.0, b/255.0);
init (c, true);
+
+ Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&AudioRegionView::parameter_changed, this, _1), gui_context());
}
void
RegionView::init (basic_color, wfd);
- XMLNode *node;
-
_amplitude_above_axis = 1.0;
- zero_line = 0;
- _flags = 0;
-
- if ((node = _region->extra_xml ("GUI")) != 0) {
- set_flags (node);
- } else {
- _flags = WaveformVisible;
- store_flags ();
- }
-
- /* make envelope visible if it has anything interesting in it */
- boost::shared_ptr<AutomationList> env = audio_region()->envelope ();
- if (env->size() > 2 || (env->size() == 2 && env->front()->value != env->back()->value)) {
- _flags |= EnvelopeVisible;
- }
compute_colors (basic_color);
create_waves ();
- fade_in_shape = new ArdourCanvas::Polygon (*group);
- fade_in_shape->property_fill_color_rgba() = fade_color;
+ fade_in_shape = new ArdourCanvas::PolyLine (group);
+ CANVAS_DEBUG_NAME (fade_in_shape, string_compose ("fade in shape for %1", region()->name()));
+ fade_in_shape->set_outline_color (fade_color);
fade_in_shape->set_data ("regionview", this);
- fade_out_shape = new ArdourCanvas::Polygon (*group);
- fade_out_shape->property_fill_color_rgba() = fade_color;
+ fade_out_shape = new ArdourCanvas::PolyLine (group);
+ CANVAS_DEBUG_NAME (fade_out_shape, string_compose ("fade out shape for %1", region()->name()));
+ fade_out_shape->set_outline_color (fade_color);
fade_out_shape->set_data ("regionview", this);
if (!_recregion) {
- fade_in_handle = new ArdourCanvas::SimpleRect (*group);
- fade_in_handle->property_fill_color_rgba() = UINT_RGBA_CHANGE_A (fill_color, 0);
- fade_in_handle->property_outline_pixels() = 0;
-
+ fade_in_handle = new ArdourCanvas::Rectangle (group);
+ CANVAS_DEBUG_NAME (fade_in_handle, string_compose ("fade in handle for %1", region()->name()));
+ fade_in_handle->set_outline_color (RGBA_TO_UINT (0, 0, 0, 255));
+ fade_in_handle->set_fill_color (ARDOUR_UI::config()->get_canvasvar_InactiveFadeHandle());
fade_in_handle->set_data ("regionview", this);
+ fade_in_handle->hide ();
- fade_out_handle = new ArdourCanvas::SimpleRect (*group);
- fade_out_handle->property_fill_color_rgba() = UINT_RGBA_CHANGE_A (fill_color, 0);
- fade_out_handle->property_outline_pixels() = 0;
-
+ fade_out_handle = new ArdourCanvas::Rectangle (group);
+ CANVAS_DEBUG_NAME (fade_out_handle, string_compose ("fade out handle for %1", region()->name()));
+ fade_out_handle->set_outline_color (RGBA_TO_UINT (0, 0, 0, 255));
+ fade_out_handle->set_fill_color (ARDOUR_UI::config()->get_canvasvar_InactiveFadeHandle());
fade_out_handle->set_data ("regionview", this);
-
- fade_position_line = new ArdourCanvas::SimpleLine (*group);
- fade_position_line->property_color_rgba() = 0xBBBBBBAA;
- fade_position_line->property_y1() = 7;
- fade_position_line->property_y2() = _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1;
-
- fade_position_line->hide();
+ fade_out_handle->hide ();
}
setup_fade_handle_positions ();
const string line_name = _region->name() + ":gain";
if (!Profile->get_sae()) {
- gain_line = new AudioRegionGainLine (line_name, *this, *group, audio_region()->envelope());
- }
-
- if (!(_flags & EnvelopeVisible)) {
- gain_line->hide ();
- } else {
- gain_line->show ();
+ gain_line.reset (new AudioRegionGainLine (line_name, *this, *group, audio_region()->envelope()));
}
-
+
+ update_envelope_visibility ();
gain_line->reset ();
set_height (trackview.current_height());
region_sync_changed ();
region_resized (ARDOUR::bounds_change);
- set_waveview_data_src();
+
+ for (vector<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
+ (*i)->set_duration (_region->length() / samples_per_pixel);
+ }
+
region_locked ();
envelope_active_changed ();
fade_in_active_changed ();
reset_width_dependent_items (_pixel_width);
- fade_in_shape->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_fade_in_event), fade_in_shape, this));
+ fade_in_shape->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_fade_in_event), fade_in_shape, this));
if (fade_in_handle) {
- fade_in_handle->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_fade_in_handle_event), fade_in_handle, this));
+ fade_in_handle->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_fade_in_handle_event), fade_in_handle, this));
}
- fade_out_shape->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_fade_out_event), fade_out_shape, this));
+ fade_out_shape->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_fade_out_event), fade_out_shape, this));
if (fade_out_handle) {
- fade_out_handle->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_fade_out_handle_event), fade_out_handle, this));
+ fade_out_handle->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_fade_out_handle_event), fade_out_handle, this));
}
set_colors ();
+ setup_waveform_visibility ();
+ setup_waveform_shape ();
+
+ if (frame_handle_start) {
+ frame_handle_start->raise_to_top ();
+ }
+ if (frame_handle_end) {
+ frame_handle_end->raise_to_top ();
+ }
+
/* XXX sync mark drag? */
}
RegionViewGoingAway (this); /* EMIT_SIGNAL */
- for (vector<GnomeCanvasWaveViewCache *>::iterator cache = wave_caches.begin(); cache != wave_caches.end() ; ++cache) {
- gnome_canvas_waveview_cache_destroy (*cache);
- }
-
for (vector<ScopedConnection*>::iterator i = _data_ready_connections.begin(); i != _data_ready_connections.end(); ++i) {
delete *i;
}
- for (list<std::pair<framepos_t, ArdourCanvas::SimpleLine*> >::iterator i = feature_lines.begin(); i != feature_lines.end(); ++i) {
+ for (list<std::pair<framepos_t, ArdourCanvas::Line*> >::iterator i = feature_lines.begin(); i != feature_lines.end(); ++i) {
delete ((*i).second);
}
-
- /* all waveviews etc will be destroyed when the group is destroyed */
- delete gain_line;
+ /* all waveviews etc will be destroyed when the group is destroyed */
}
boost::shared_ptr<ARDOUR::AudioRegion>
AudioRegionView::region_changed (const PropertyChange& what_changed)
{
ENSURE_GUI_THREAD (*this, &AudioRegionView::region_changed, what_changed);
- // cerr << "AudioRegionView::region_changed() called" << endl;
RegionView::region_changed (what_changed);
{
reset_fade_out_shape ();
}
+
void
AudioRegionView::fade_in_active_changed ()
{
if (audio_region()->fade_in_active()) {
- fade_in_shape->property_fill_color_rgba() = RGBA_TO_UINT(45,45,45,90); // FIXME make a themeable colour
- fade_in_shape->property_width_pixels() = 1;
+ /* XXX: make a themable colour */
+ fade_in_shape->set_outline_color (RGBA_TO_UINT (45, 45, 45, 90));
} else {
- fade_in_shape->property_fill_color_rgba() = RGBA_TO_UINT(45,45,45,20); // FIXME make a themeable colour
- fade_in_shape->property_width_pixels() = 1;
+ /* XXX: make a themable colour */
+ fade_in_shape->set_outline_color (RGBA_TO_UINT (45, 45, 45, 20));
}
}
AudioRegionView::fade_out_active_changed ()
{
if (audio_region()->fade_out_active()) {
- fade_out_shape->property_fill_color_rgba() = RGBA_TO_UINT(45,45,45,90); // FIXME make a themeable colour
- fade_out_shape->property_width_pixels() = 1;
+ /* XXX: make a themable colour */
+ fade_out_shape->set_outline_color (RGBA_TO_UINT (45, 45, 45, 90));
} else {
- fade_out_shape->property_fill_color_rgba() = RGBA_TO_UINT(45,45,45,20); // FIXME make a themeable colour
- fade_out_shape->property_width_pixels() = 1;
+ /* XXX: make a themable colour */
+ fade_out_shape->set_outline_color (RGBA_TO_UINT (45, 45, 45, 20));
}
}
void
AudioRegionView::region_scale_amplitude_changed ()
{
- ENSURE_GUI_THREAD (*this, &AudioRegionView::region_scale_amplitude_changed)
-
for (uint32_t n = 0; n < waves.size(); ++n) {
- // force a reload of the cache
- waves[n]->property_data_src() = _region.get();
+ waves[n]->gain_changed ();
}
}
interesting_stuff.add (ARDOUR::Properties::length);
if (what_changed.contains (interesting_stuff)) {
-
+
for (uint32_t n = 0; n < waves.size(); ++n) {
- waves[n]->property_region_start() = _region->start();
+ waves[n]->region_resized ();
}
for (vector<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
if ((agr = dynamic_cast<AudioGhostRegion*>(*i)) != 0) {
for (vector<WaveView*>::iterator w = agr->waves.begin(); w != agr->waves.end(); ++w) {
- (*w)->property_region_start() = _region->start();
+ (*w)->region_resized ();
}
}
}
-
+
/* hide transient lines that extend beyond the region end */
-
- list<std::pair<framepos_t, ArdourCanvas::SimpleLine*> >::iterator l;
-
+
+ list<std::pair<framepos_t, ArdourCanvas::Line*> >::iterator l;
+
for (l = feature_lines.begin(); l != feature_lines.end(); ++l) {
- if ((*l).first > _region->length()- 1){
- (*l).second->hide();
- }
- else {
- (*l).second->show();
+ if (l->first > _region->length() - 1) {
+ l->second->hide();
+ } else {
+ l->second->show();
}
}
}
RegionView::reset_width_dependent_items(pixel_width);
assert(_pixel_width == pixel_width);
- if (zero_line) {
- zero_line->property_x2() = pixel_width - 1.0;
- }
-
if (fade_in_handle) {
if (pixel_width <= 6.0 || _height < 5.0 || !trackview.session()->config.get_show_region_fades()) {
fade_in_handle->hide();
fade_out_handle->hide();
- }
- else {
- fade_in_handle->show();
- fade_out_handle->show();
+ } else {
+ //fade_in_handle->show();
+ //fade_out_handle->show();
}
}
AnalysisFeatureList analysis_features = _region->transients();
AnalysisFeatureList::const_iterator i;
- list<std::pair<framepos_t, ArdourCanvas::SimpleLine*> >::iterator l;
+
+ list<std::pair<framepos_t, ArdourCanvas::Line*> >::iterator l;
for (i = analysis_features.begin(), l = feature_lines.begin(); i != analysis_features.end() && l != feature_lines.end(); ++i, ++l) {
- (*l).second->property_x1() = trackview.editor().frame_to_pixel (*i);
- (*l).second->property_x2() = trackview.editor().frame_to_pixel (*i);
+
+ float x_pos = trackview.editor().sample_to_pixel (*i);
+
+ (*l).second->set (ArdourCanvas::Duple (x_pos, 2.0),
+ ArdourCanvas::Duple (x_pos, _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1));
+
+ (*l).first = *i;
+
+ (*l).second->set (ArdourCanvas::Duple (x_pos, 2.0),
+ ArdourCanvas::Duple (x_pos, _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1));
}
-
+
reset_fade_shapes ();
}
AudioRegionView::region_muted ()
{
RegionView::region_muted();
-
- for (uint32_t n=0; n < waves.size(); ++n) {
- if (_region->muted()) {
- waves[n]->property_wave_color() = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->canvasvar_WaveForm.get(), MUTED_ALPHA);
- } else {
- waves[n]->property_wave_color() = ARDOUR_UI::config()->canvasvar_WaveForm.get();
- }
- }
+ set_waveform_colors ();
}
void
AudioRegionView::setup_fade_handle_positions()
{
/* position of fade handle offset from the top of the region view */
- double const handle_pos = 2;
- /* height of fade handles */
- double const handle_height = 5;
+ double const handle_pos = 1.0;
if (fade_in_handle) {
- fade_in_handle->property_y1() = handle_pos;
- fade_in_handle->property_y2() = handle_pos + handle_height;
+ fade_in_handle->set_y0 (handle_pos);
+ fade_in_handle->set_y1 (handle_pos + handle_size);
}
if (fade_out_handle) {
- fade_out_handle->property_y1() = handle_pos;
- fade_out_handle->property_y2() = handle_pos + handle_height;
+ fade_out_handle->set_y0 (handle_pos);
+ fade_out_handle->set_y1 (handle_pos + handle_size);
}
}
gdouble yoff = n * (ht + 1);
- waves[n]->property_height() = ht;
- waves[n]->property_y() = yoff + 2;
+ waves[n]->set_height (ht);
+ waves[n]->set_y_position (yoff + 2);
}
if (gain_line) {
if ((height/wcnt) < NAME_HIGHLIGHT_THRESH) {
gain_line->hide ();
} else {
- if (_flags & EnvelopeVisible) {
- gain_line->show ();
- }
+ update_envelope_visibility ();
}
gain_line->set_height ((uint32_t) rint (height - NAME_HIGHLIGHT_SIZE) - 2);
}
- manage_zero_line ();
reset_fade_shapes ();
-
+
/* Update hights for any active feature lines */
- list<std::pair<framepos_t, ArdourCanvas::SimpleLine*> >::iterator l;
+ list<std::pair<framepos_t, ArdourCanvas::Line*> >::iterator l;
for (l = feature_lines.begin(); l != feature_lines.end(); ++l) {
- (*l).second->property_y2() = _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1;
- }
- if (fade_position_line) {
- if (height < NAME_HIGHLIGHT_THRESH) {
- fade_position_line->property_y2() = _height - 1;
- }
- else {
- fade_position_line->property_y2() = _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1;
- }
- }
-
- if (name_pixbuf) {
- name_pixbuf->raise_to_top();
- }
-}
+ float pos_x = trackview.editor().sample_to_pixel((*l).first);
-void
-AudioRegionView::manage_zero_line ()
-{
- if (!zero_line) {
- return;
+ if (height >= NAME_HIGHLIGHT_THRESH) {
+ (*l).second->set (ArdourCanvas::Duple (pos_x, 2.0),
+ ArdourCanvas::Duple (pos_x, _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1));
+ } else {
+ (*l).second->set (ArdourCanvas::Duple (pos_x, 2.0),
+ ArdourCanvas::Duple (pos_x, _height - 1));
+ }
}
- if (_height >= 100) {
- double const wave_midpoint = (_height - NAME_HIGHLIGHT_SIZE) / 2.0;
- zero_line->property_y1() = wave_midpoint;
- zero_line->property_y2() = wave_midpoint;
- zero_line->show();
- } else {
- zero_line->hide();
+ if (name_text) {
+ name_text->raise_to_top();
}
}
void
AudioRegionView::reset_fade_in_shape ()
{
- reset_fade_in_shape_width ((framecnt_t) audio_region()->fade_in()->back()->when);
+ reset_fade_in_shape_width (audio_region(), (framecnt_t) audio_region()->fade_in()->back()->when);
}
void
-AudioRegionView::reset_fade_in_shape_width (framecnt_t width)
+AudioRegionView::reset_fade_in_shape_width (boost::shared_ptr<AudioRegion> ar, framecnt_t width)
{
if (fade_in_handle == 0) {
return;
width = std::max ((framecnt_t) 64, width);
- Points* points;
-
/* round here to prevent little visual glitches with sub-pixel placement */
- double const pwidth = rint (width / samples_per_unit);
- uint32_t npoints = std::min (gdk_screen_width(), (int) pwidth);
- double h;
-
- if (_height < 5) {
- fade_in_shape->hide();
- fade_in_handle->hide();
- return;
- }
-
- double const handle_center = pwidth;
+ double const pwidth = rint (width / samples_per_pixel);
+ double const handle_left = pwidth;
/* Put the fade in handle so that its left side is at the end-of-fade line */
- fade_in_handle->property_x1() = handle_center;
- fade_in_handle->property_x2() = handle_center + 6;
+ fade_in_handle->set_x0 (handle_left);
+ fade_in_handle->set_x1 (handle_left + handle_size);
if (pwidth < 5) {
+ hide_start_xfade();
fade_in_shape->hide();
return;
}
fade_in_shape->show();
}
- float curve[npoints];
- audio_region()->fade_in()->curve().get_vector (0, audio_region()->fade_in()->back()->when, curve, npoints);
+ uint32_t npoints = std::min (gdk_screen_width(), (int) pwidth);
+ double effective_height;
+ std::vector<float> curve(npoints);
- points = get_canvas_points ("fade in shape", npoints + 3);
+ audio_region()->fade_in()->curve().get_vector (0, audio_region()->fade_in()->back()->when, &curve[0], npoints);
if (_height >= NAME_HIGHLIGHT_THRESH) {
- h = _height - NAME_HIGHLIGHT_SIZE - 2;
+ effective_height = _height - NAME_HIGHLIGHT_SIZE;
} else {
- h = _height;
+ effective_height = _height;
}
+ Points points;
+
+ points.assign (npoints, Duple());
+
/* points *MUST* be in anti-clockwise order */
uint32_t pi, pc;
double xdelta = pwidth/npoints;
for (pi = 0, pc = 0; pc < npoints; ++pc) {
- (*points)[pi].set_x(1 + (pc * xdelta));
- (*points)[pi++].set_y(2 + (h - (curve[pc] * h)));
+ points[pi].x = 1.0 + (pc * xdelta);
+ points[pi++].y = 1.0 + effective_height - (curve[pc] * effective_height);
}
- /* fold back */
-
- (*points)[pi].set_x(pwidth);
- (*points)[pi++].set_y(2);
-
- (*points)[pi].set_x(1);
- (*points)[pi++].set_y(2);
-
- /* connect the dots ... */
+ /* draw the line */
- (*points)[pi] = (*points)[0];
+ redraw_start_xfade_to (ar, width, points, effective_height, handle_left);
- fade_in_shape->property_points() = *points;
- delete points;
+ // fade_in_shape->set (points);
/* ensure trim handle stays on top */
if (frame_handle_start) {
frame_handle_start->raise_to_top();
}
+
}
void
AudioRegionView::reset_fade_out_shape ()
{
- reset_fade_out_shape_width ((framecnt_t) audio_region()->fade_out()->back()->when);
+ reset_fade_out_shape_width (audio_region(), (framecnt_t) audio_region()->fade_out()->back()->when);
}
void
-AudioRegionView::reset_fade_out_shape_width (framecnt_t width)
+AudioRegionView::reset_fade_out_shape_width (boost::shared_ptr<AudioRegion> ar, framecnt_t width)
{
if (fade_out_handle == 0) {
return;
width = std::max ((framecnt_t) 64, width);
- Points* points;
-
/* round here to prevent little visual glitches with sub-pixel placement */
- double const pwidth = rint (width / samples_per_unit);
- uint32_t npoints = std::min (gdk_screen_width(), (int) pwidth);
- double h;
-
- if (_height < 5) {
- fade_out_shape->hide();
- fade_out_handle->hide();
- return;
- }
+ double const pwidth = rint (width / samples_per_pixel);
- double const handle_center = (_region->length() - width) / samples_per_unit;
+ double const handle_right = (_region->length() / samples_per_pixel) - pwidth;
/* Put the fade out handle so that its right side is at the end-of-fade line;
- * it's `one out' for precise pixel accuracy.
*/
- fade_out_handle->property_x1() = handle_center - 5;
- fade_out_handle->property_x2() = handle_center + 1;
+ fade_out_handle->set_x0 (handle_right - handle_size);
+ fade_out_handle->set_x1 (handle_right);
/* don't show shape if its too small */
if (pwidth < 5) {
+ hide_end_xfade();
fade_out_shape->hide();
return;
}
fade_out_shape->show();
}
- float curve[npoints];
- audio_region()->fade_out()->curve().get_vector (0, audio_region()->fade_out()->back()->when, curve, npoints);
+ uint32_t npoints = std::min (gdk_screen_width(), (int) pwidth);
+ double effective_height;
+ std::vector<float> curve(npoints);
+
+ audio_region()->fade_out()->curve().get_vector (0, audio_region()->fade_out()->back()->when, &curve[0], npoints);
if (_height >= NAME_HIGHLIGHT_THRESH) {
- h = _height - NAME_HIGHLIGHT_SIZE - 2;
+ effective_height = _height - NAME_HIGHLIGHT_SIZE;
} else {
- h = _height;
+ effective_height = _height;
}
/* points *MUST* be in anti-clockwise order */
-
- points = get_canvas_points ("fade out shape", npoints + 3);
-
+
+ Points points;
+
uint32_t pi, pc;
double xdelta = pwidth/npoints;
+
+ points.assign (npoints, Duple ());
+
+ for (pi = 0, pc = 0; pc < npoints; ++pc, ++pi) {
+ points[pi].x = 1.0 + _pixel_width - pwidth + (pc * xdelta);
+ points[pi].y = 1.0 + effective_height - (curve[pc] * effective_height);
+ }
- for (pi = 0, pc = 0; pc < npoints; ++pc) {
- (*points)[pi].set_x(_pixel_width - pwidth + (pc * xdelta));
- (*points)[pi++].set_y(2 + (h - (curve[pc] * h)));
+ /* draw the line */
+
+ redraw_end_xfade_to (ar, width, points, effective_height, handle_right, pwidth-1);
+
+ // fade_out_shape->set (points);
+
+ /* ensure trim handle stays on top */
+ if (frame_handle_end) {
+ frame_handle_end->raise_to_top();
+ }
+
+}
+
+framepos_t
+AudioRegionView::get_fade_in_shape_width ()
+{
+ return audio_region()->fade_in()->back()->when;
+}
+
+framepos_t
+AudioRegionView::get_fade_out_shape_width ()
+{
+ return audio_region()->fade_out()->back()->when;
+}
+
+
+void
+AudioRegionView::redraw_start_xfade ()
+{
+ boost::shared_ptr<AudioRegion> ar (audio_region());
+
+ if (!ar->fade_in() || ar->fade_in()->empty()) {
+ return;
+ }
+
+ show_start_xfade();
+ reset_fade_in_shape_width (ar, ar->fade_in()->back()->when);
+}
+
+void
+AudioRegionView::redraw_start_xfade_to (boost::shared_ptr<AudioRegion> ar, framecnt_t /*width*/, Points& points, double effective_height,
+ double rect_width)
+{
+ if (points.size() < 3) {
+ return;
}
- /* fold back */
+ if (!start_xfade_in) {
+ start_xfade_in = new ArdourCanvas::PolyLine (group);
+ CANVAS_DEBUG_NAME (start_xfade_in, string_compose ("xfade start in line for %1", region()->name()));
+ start_xfade_in->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine());
+ start_xfade_in->set_outline_width (1.5);
+ }
- (*points)[pi].set_x(_pixel_width);
- (*points)[pi++].set_y(h);
+ if (!start_xfade_out) {
+ start_xfade_out = new ArdourCanvas::PolyLine (group);
+ CANVAS_DEBUG_NAME (start_xfade_out, string_compose ("xfade start out line for %1", region()->name()));
+ uint32_t col = UINT_RGBA_CHANGE_A (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine(), 128);
+ start_xfade_out->set_outline_color (col);
+ start_xfade_out->set_outline_width (2.0);
+ }
- (*points)[pi].set_x(_pixel_width);
- (*points)[pi++].set_y(2);
+ if (!start_xfade_rect) {
+ start_xfade_rect = new ArdourCanvas::Rectangle (group);
+ CANVAS_DEBUG_NAME (start_xfade_rect, string_compose ("xfade start rect for %1", region()->name()));
+ start_xfade_rect->set_fill (true);
+ start_xfade_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_ActiveCrossfade());
+ start_xfade_rect->set_outline (false);
+ start_xfade_rect->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_start_xfade_event), start_xfade_rect, this));
+ start_xfade_rect->set_data ("regionview", this);
+ }
- /* connect the dots ... */
+ start_xfade_rect->set (ArdourCanvas::Rect (1.0, 1.0, rect_width, effective_height));
+ start_xfade_rect->show ();
- (*points)[pi] = (*points)[0];
+ start_xfade_in->set (points);
+ start_xfade_in->show ();
- fade_out_shape->property_points() = *points;
- delete points;
+ /* fade out line */
- /* ensure trim handle stays on top */
- if (frame_handle_end) {
- frame_handle_end->raise_to_top();
+ boost::shared_ptr<AutomationList> inverse = ar->inverse_fade_in();
+ Points ipoints;
+ Points::size_type npoints = points.size();
+
+ ipoints.assign (npoints, Duple());
+
+ if (!inverse) {
+
+ /* no inverse curve defined, show the inverse of the normal one */
+
+ for (Points::size_type i = 0, pci = 0; i < npoints; ++i, ++pci) {
+ ArdourCanvas::Duple &p (ipoints[pci]);
+ p.x = 1.0 + i;
+ /* invert with respect to y-axis */
+ p.y = 1.0 + effective_height - points[pci].y;
+ }
+
+ } else {
+
+ std::vector<float> vec(npoints);
+ inverse->curve().get_vector (0, inverse->back()->when, &vec[0], npoints);
+
+ for (Points::size_type i = 0, pci = 0; i < npoints; ++i, ++pci) {
+ ArdourCanvas::Duple &p (ipoints[pci]);
+ p.x = 1.0 + i;
+ p.y = 1.0 + effective_height - (effective_height * vec[i]);
+ }
+ }
+
+ start_xfade_out->set (ipoints);
+ start_xfade_out->show ();
+
+ show_start_xfade();
+}
+
+void
+AudioRegionView::redraw_end_xfade ()
+{
+ boost::shared_ptr<AudioRegion> ar (audio_region());
+
+ if (!ar->fade_out() || ar->fade_out()->empty()) {
+ return;
+ }
+
+ show_end_xfade();
+
+ reset_fade_out_shape_width (ar, ar->fade_out()->back()->when);
+}
+
+void
+AudioRegionView::redraw_end_xfade_to (boost::shared_ptr<AudioRegion> ar, framecnt_t width, Points& points, double effective_height,
+ double rect_edge, double rect_width)
+{
+ if (points.size() < 3) {
+ return;
+ }
+
+ if (!end_xfade_in) {
+ end_xfade_in = new ArdourCanvas::PolyLine (group);
+ CANVAS_DEBUG_NAME (end_xfade_in, string_compose ("xfade end in line for %1", region()->name()));
+ uint32_t col UINT_RGBA_CHANGE_A (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine(), 128);
+ end_xfade_in->set_outline_color (col);
+ end_xfade_in->set_outline_width (1.5);
+ }
+
+ if (!end_xfade_out) {
+ end_xfade_out = new ArdourCanvas::PolyLine (group);
+ CANVAS_DEBUG_NAME (end_xfade_out, string_compose ("xfade end out line for %1", region()->name()));
+ end_xfade_out->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine());
+ end_xfade_out->set_outline_width (2.0);
+ }
+
+ if (!end_xfade_rect) {
+ end_xfade_rect = new ArdourCanvas::Rectangle (group);
+ CANVAS_DEBUG_NAME (end_xfade_rect, string_compose ("xfade end rect for %1", region()->name()));
+ end_xfade_rect->set_fill (true);
+ end_xfade_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_ActiveCrossfade());
+ end_xfade_rect->set_outline (0);
+ end_xfade_rect->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_end_xfade_event), end_xfade_rect, this));
+ end_xfade_rect->set_data ("regionview", this);
+ }
+
+ end_xfade_rect->set (ArdourCanvas::Rect (rect_edge, 1.0, rect_edge + rect_width + TimeAxisViewItem::RIGHT_EDGE_SHIFT, effective_height));
+ end_xfade_rect->show ();
+
+ end_xfade_in->set (points);
+ end_xfade_in->show ();
+ end_xfade_in->raise_to_top ();
+
+ /* fade in line */
+
+ boost::shared_ptr<AutomationList> inverse = ar->inverse_fade_out ();
+ Points ipoints;
+ Points::size_type npoints = points.size();
+
+ ipoints.assign (npoints, Duple());
+
+ if (!inverse) {
+
+ const double rend = trackview.editor().sample_to_pixel (_region->length() - points.back().y);
+
+ for (Points::size_type i = 0, pci = 0; i < npoints; ++i, ++pci) {
+ ArdourCanvas::Duple &p (ipoints[pci]);
+ p.x = 1.0 + rend + i;
+ p.y = 1.0 + effective_height - points[pci].y;
+ }
+
+ } else {
+
+ boost::scoped_array<float> vec (new float[npoints]);
+ inverse->curve().get_vector (inverse->front()->when, inverse->back()->when, vec.get(), npoints);
+
+ const double rend = trackview.editor().sample_to_pixel (_region->length() - width);
+
+ float* vp = vec.get();
+
+ for (Points::size_type i = 0, pci = 0; i < npoints; ++i) {
+ ArdourCanvas::Duple& p (ipoints[pci++]);
+ p.x = 1.0 + rend + i;
+ p.y = 1.0 + effective_height - (effective_height * vp[i]);
+ }
+ }
+
+ end_xfade_out->set (ipoints);
+ end_xfade_out->show ();
+ end_xfade_out->raise_to_top ();
+
+ end_xfade_rect->raise_to_top (); //this needs to be topmost so the lines don't steal mouse focus
+
+ show_end_xfade();
+}
+
+void
+AudioRegionView::hide_xfades ()
+{
+ hide_start_xfade ();
+ hide_end_xfade ();
+}
+
+void
+AudioRegionView::hide_start_xfade ()
+{
+ if (start_xfade_in) {
+ start_xfade_in->hide();
+ }
+ if (start_xfade_out) {
+ start_xfade_out->hide();
+ }
+ if (start_xfade_rect) {
+ start_xfade_rect->hide ();
+ }
+
+ _start_xfade_visible = false;
+}
+
+void
+AudioRegionView::hide_end_xfade ()
+{
+ if (end_xfade_in) {
+ end_xfade_in->hide();
+ }
+ if (end_xfade_out) {
+ end_xfade_out->hide();
+ }
+ if (end_xfade_rect) {
+ end_xfade_rect->hide ();
+ }
+
+ _end_xfade_visible = false;
+}
+
+void
+AudioRegionView::show_start_xfade ()
+{
+ if (start_xfade_in) {
+ start_xfade_in->show();
+ }
+ if (start_xfade_out) {
+ start_xfade_out->show();
+ }
+ if (start_xfade_rect) {
+ start_xfade_rect->show ();
+ }
+
+ _start_xfade_visible = true;
+}
+
+void
+AudioRegionView::show_end_xfade ()
+{
+ if (end_xfade_in) {
+ end_xfade_in->show();
+ }
+ if (end_xfade_out) {
+ end_xfade_out->show();
+ }
+ if (end_xfade_rect) {
+ end_xfade_rect->show ();
}
+
+ _end_xfade_visible = true;
}
void
-AudioRegionView::set_samples_per_unit (gdouble spu)
+AudioRegionView::set_samples_per_pixel (gdouble fpp)
{
- RegionView::set_samples_per_unit (spu);
+ RegionView::set_samples_per_pixel (fpp);
- if (_flags & WaveformVisible) {
- for (uint32_t n=0; n < waves.size(); ++n) {
- waves[n]->property_samples_per_unit() = spu;
+ if (Config->get_show_waveforms ()) {
+ for (uint32_t n = 0; n < waves.size(); ++n) {
+ waves[n]->set_samples_per_pixel (fpp);
}
}
}
void
-AudioRegionView::set_amplitude_above_axis (gdouble spp)
+AudioRegionView::set_amplitude_above_axis (gdouble a)
{
for (uint32_t n=0; n < waves.size(); ++n) {
- waves[n]->property_amplitude_above_axis() = spp;
+ waves[n]->set_amplitude_above_axis (a);
}
}
RegionView::set_colors();
if (gain_line) {
- gain_line->set_line_color (audio_region()->envelope_active() ? ARDOUR_UI::config()->canvasvar_GainLine.get() : ARDOUR_UI::config()->canvasvar_GainLineInactive.get());
+ gain_line->set_line_color (audio_region()->envelope_active() ?
+ ARDOUR_UI::config()->get_canvasvar_GainLine() :
+ ARDOUR_UI::config()->get_canvasvar_GainLineInactive());
}
- for (uint32_t n=0; n < waves.size(); ++n) {
- if (_region->muted()) {
- waves[n]->property_wave_color() = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->canvasvar_WaveForm.get(), MUTED_ALPHA);
- } else {
- waves[n]->property_wave_color() = ARDOUR_UI::config()->canvasvar_WaveForm.get();
- }
+ set_waveform_colors ();
+
+ if (start_xfade_in) {
+ start_xfade_in->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine());
+ }
+ if (start_xfade_out) {
+ uint32_t col UINT_RGBA_CHANGE_A (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine(), 128);
+ start_xfade_out->set_outline_color (col);
+ }
+ if (end_xfade_in) {
+ end_xfade_in->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine());
+ }
+ if (end_xfade_out) {
+ uint32_t col UINT_RGBA_CHANGE_A (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine(), 128);
+ end_xfade_out->set_outline_color (col);
+ }
- waves[n]->property_clip_color() = ARDOUR_UI::config()->canvasvar_WaveFormClip.get();
- waves[n]->property_zero_color() = ARDOUR_UI::config()->canvasvar_ZeroLine.get();
+ if (start_xfade_rect) {
+ start_xfade_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_ActiveCrossfade());
+ }
+ if (end_xfade_rect) {
+ end_xfade_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_ActiveCrossfade());
}
}
void
-AudioRegionView::set_waveform_visible (bool yn)
-{
- if (((_flags & WaveformVisible) != yn)) {
- if (yn) {
- for (uint32_t n=0; n < waves.size(); ++n) {
- /* make sure the zoom level is correct, since we don't update
- this when waveforms are hidden.
- */
- waves[n]->property_samples_per_unit() = samples_per_unit;
- waves[n]->show();
- }
- _flags |= WaveformVisible;
- } else {
- for (uint32_t n=0; n < waves.size(); ++n) {
- waves[n]->hide();
- }
- _flags &= ~WaveformVisible;
+AudioRegionView::setup_waveform_visibility ()
+{
+ if (Config->get_show_waveforms ()) {
+ for (uint32_t n = 0; n < waves.size(); ++n) {
+ /* make sure the zoom level is correct, since we don't update
+ this when waveforms are hidden.
+ */
+ // CAIROCANVAS
+ // waves[n]->set_samples_per_pixel (_samples_per_pixel);
+ waves[n]->show();
+ }
+ } else {
+ for (uint32_t n = 0; n < waves.size(); ++n) {
+ waves[n]->hide();
}
- store_flags ();
}
}
void
AudioRegionView::unhide_envelope ()
{
- if (gain_line && (_flags & EnvelopeVisible)) {
- gain_line->show ();
- }
+ update_envelope_visibility ();
}
void
-AudioRegionView::set_envelope_visible (bool yn)
+AudioRegionView::update_envelope_visibility ()
{
- if (gain_line && ((_flags & EnvelopeVisible) != yn)) {
- if (yn) {
- gain_line->show ();
- _flags |= EnvelopeVisible;
- } else {
- gain_line->hide ();
- _flags &= ~EnvelopeVisible;
- }
- store_flags ();
+ if (!gain_line) {
+ return;
+ }
+
+ if (Config->get_show_region_gain() || trackview.editor().current_mouse_mode() == Editing::MouseGain) {
+ gain_line->add_visibility (AutomationLine::Line);
+ } else {
+ gain_line->hide ();
}
}
break;
}
- wave_caches.push_back (WaveView::create_cache ());
-
// cerr << "\tchannel " << n << endl;
if (wait_for_data) {
gdouble yoff = which * ht;
- WaveView *wave = new WaveView(*group);
-
- wave->property_data_src() = (gpointer) _region.get();
- wave->property_cache() = wave_caches[which];
- wave->property_cache_updater() = true;
- wave->property_channel() = which;
- wave->property_length_function() = (gpointer) region_length_from_c;
- wave->property_sourcefile_length_function() = (gpointer) sourcefile_length_from_c;
- wave->property_peak_function() = (gpointer) region_read_peaks_from_c;
- wave->property_x() = 0.0;
- wave->property_y() = yoff;
- wave->property_height() = (double) ht;
- wave->property_samples_per_unit() = samples_per_unit;
- wave->property_amplitude_above_axis() = _amplitude_above_axis;
-
- if (_recregion) {
- wave->property_wave_color() = _region->muted() ? UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->canvasvar_RecWaveForm.get(), MUTED_ALPHA) : ARDOUR_UI::config()->canvasvar_RecWaveForm.get();
- wave->property_fill_color() = ARDOUR_UI::config()->canvasvar_RecWaveFormFill.get();
- } else {
- wave->property_wave_color() = _region->muted() ? UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->canvasvar_WaveForm.get(), MUTED_ALPHA) : ARDOUR_UI::config()->canvasvar_WaveForm.get();
- wave->property_fill_color() = ARDOUR_UI::config()->canvasvar_WaveFormFill.get();
- }
+ WaveView *wave = new WaveView (group, audio_region ());
+ CANVAS_DEBUG_NAME (wave, string_compose ("wave view for chn %1 of %2", which, get_item_name()));
+
+ wave->set_channel (which);
+ wave->set_y_position (yoff);
+ wave->set_height (ht);
+ wave->set_samples_per_pixel (samples_per_pixel);
+ wave->set_show_zero_line (false);
- wave->property_clip_color() = ARDOUR_UI::config()->canvasvar_WaveFormClip.get();
- wave->property_zero_color() = ARDOUR_UI::config()->canvasvar_ZeroLine.get();
- wave->property_region_start() = _region->start();
- wave->property_rectified() = (bool) (_flags & WaveformRectified);
- wave->property_logscaled() = (bool) (_flags & WaveformLogScaled);
+ switch (Config->get_waveform_shape()) {
+ case Rectified:
+ wave->set_shape (WaveView::Rectified);
+ break;
+ default:
+ wave->set_shape (WaveView::Normal);
+ }
+
+ wave->set_logscaled (Config->get_waveform_scale() == Logarithmic);
- if (!(_flags & WaveformVisible)) {
+ if (!Config->get_show_waveforms ()) {
wave->hide();
}
/* all waves created, don't hook into peaks ready anymore */
delete _data_ready_connections[which];
_data_ready_connections[which] = 0;
-
-#if 0
- if (!zero_line) {
- zero_line = new ArdourCanvas::SimpleLine (*group);
- zero_line->property_x1() = (gdouble) 1.0;
- zero_line->property_x2() = (gdouble) (_region->length() / samples_per_unit) - 1.0;
- zero_line->property_color_rgba() = (guint) ARDOUR_UI::config()->canvasvar_ZeroLine.get();
- manage_zero_line ();
- }
-#endif
}
}
void
AudioRegionView::add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *ev)
{
- if (gain_line == 0) {
+ if (!gain_line) {
return;
}
/* don't create points that can't be seen */
- set_envelope_visible (true);
+ update_envelope_visibility ();
x = ev->button.x;
y = ev->button.y;
- item->w2i (x, y);
+ item->canvas_to_item (x, y);
- framepos_t fx = trackview.editor().pixel_to_frame (x);
+ framepos_t fx = trackview.editor().pixel_to_sample (x);
if (fx > _region->length()) {
return;
gain_line->view_to_model_coord (x, y);
- /* XXX STATEFUL: can't convert to stateful diff until we
+ /* XXX STATEFUL: can't convert to stateful diff until we
can represent automation data with it.
*/
}
void
-AudioRegionView::remove_gain_point_event (ArdourCanvas::Item *item, GdkEvent */*ev*/)
+AudioRegionView::remove_gain_point_event (ArdourCanvas::Item *item, GdkEvent* /*ev*/)
{
ControlPoint *cp = reinterpret_cast<ControlPoint *> (item->get_data ("control_point"));
audio_region()->envelope()->erase (cp->model());
}
void
-AudioRegionView::store_flags()
-{
- XMLNode *node = new XMLNode ("GUI");
-
- node->add_property ("waveform-visible", (_flags & WaveformVisible) ? "yes" : "no");
- node->add_property ("envelope-visible", (_flags & EnvelopeVisible) ? "yes" : "no");
- node->add_property ("waveform-rectified", (_flags & WaveformRectified) ? "yes" : "no");
- node->add_property ("waveform-logscaled", (_flags & WaveformLogScaled) ? "yes" : "no");
-
- _region->add_extra_xml (*node);
-}
-
-void
-AudioRegionView::set_flags (XMLNode* node)
+AudioRegionView::setup_waveform_shape ()
{
- XMLProperty *prop;
-
- if ((prop = node->property ("waveform-visible")) != 0) {
- if (string_is_affirmative (prop->value())) {
- _flags |= WaveformVisible;
- }
- }
+ WaveView::Shape shape;
- if ((prop = node->property ("envelope-visible")) != 0) {
- if (string_is_affirmative (prop->value())) {
- _flags |= EnvelopeVisible;
- }
- }
-
- if ((prop = node->property ("waveform-rectified")) != 0) {
- if (string_is_affirmative (prop->value())) {
- _flags |= WaveformRectified;
- }
- }
-
- if ((prop = node->property ("waveform-logscaled")) != 0) {
- if (string_is_affirmative (prop->value())) {
- _flags |= WaveformLogScaled;
- }
- }
-}
-
-void
-AudioRegionView::set_waveform_shape (WaveformShape shape)
-{
- bool yn;
-
- /* this slightly odd approach is to leave the door open to
- other "shapes" such as spectral displays, etc.
- */
-
- switch (shape) {
+ switch (Config->get_waveform_shape()) {
case Rectified:
- yn = true;
+ shape = WaveView::Rectified;
break;
-
default:
- yn = false;
- break;
+ shape = WaveView::Normal;
}
-
- if (yn != (bool) (_flags & WaveformRectified)) {
- for (vector<WaveView *>::iterator wave = waves.begin(); wave != waves.end() ; ++wave) {
- (*wave)->property_rectified() = yn;
- }
-
- if (zero_line) {
- if (yn) {
- zero_line->hide();
- } else {
- zero_line->show();
- }
- }
-
- if (yn) {
- _flags |= WaveformRectified;
- } else {
- _flags &= ~WaveformRectified;
- }
- store_flags ();
+ for (vector<WaveView *>::iterator wave = waves.begin(); wave != waves.end() ; ++wave) {
+ (*wave)->set_shape (shape);
}
}
void
-AudioRegionView::set_waveform_scale (WaveformScale scale)
+AudioRegionView::setup_waveform_scale ()
{
- bool yn = (scale == Logarithmic);
-
- if (yn != (bool) (_flags & WaveformLogScaled)) {
- for (vector<WaveView *>::iterator wave = waves.begin(); wave != waves.end() ; ++wave) {
- (*wave)->property_logscaled() = yn;
- }
-
- if (yn) {
- _flags |= WaveformLogScaled;
- } else {
- _flags &= ~WaveformLogScaled;
- }
- store_flags ();
- }
+ WaveView::set_global_logscaled (Config->get_waveform_scale() == Logarithmic);
}
+void
+AudioRegionView::setup_waveform_clipping ()
+{
+ WaveView::set_global_show_waveform_clipping (ARDOUR_UI::config()->get_show_waveform_clipping());
+}
GhostRegion*
AudioRegionView::add_ghost (TimeAxisView& tv)
RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*>(&trackview);
assert(rtv);
- double unit_position = _region->position () / samples_per_unit;
+ double unit_position = _region->position () / samples_per_pixel;
AudioGhostRegion* ghost = new AudioGhostRegion (tv, trackview, unit_position);
uint32_t nchans;
break;
}
- WaveView *wave = new WaveView(*ghost->group);
-
- wave->property_data_src() = _region.get();
- wave->property_cache() = wave_caches[n];
- wave->property_cache_updater() = false;
- wave->property_channel() = n;
- wave->property_length_function() = (gpointer)region_length_from_c;
- wave->property_sourcefile_length_function() = (gpointer) sourcefile_length_from_c;
- wave->property_peak_function() = (gpointer) region_read_peaks_from_c;
- wave->property_x() = 0.0;
- wave->property_samples_per_unit() = samples_per_unit;
- wave->property_amplitude_above_axis() = _amplitude_above_axis;
+ WaveView *wave = new WaveView (ghost->group, audio_region());
+ CANVAS_DEBUG_NAME (wave, string_compose ("ghost wave for %1", get_item_name()));
- wave->property_region_start() = _region->start();
+ wave->set_channel (n);
+ wave->set_samples_per_pixel (samples_per_pixel);
+ wave->set_amplitude_above_axis (_amplitude_above_axis);
ghost->waves.push_back(wave);
}
ghost->set_height ();
- ghost->set_duration (_region->length() / samples_per_unit);
+ ghost->set_duration (_region->length() / samples_per_pixel);
ghost->set_colors();
ghosts.push_back (ghost);
{
trackview.editor().set_current_trimmable (_region);
trackview.editor().set_current_movable (_region);
-
- if (gain_line && _flags & EnvelopeVisible) {
- gain_line->show_all_control_points ();
+
+ if (gain_line) {
+ /* these may or may not be visible depending on mouse mode */
+ gain_line->add_visibility (AutomationLine::ControlPoints);
}
if (fade_in_handle && !internal_editing) {
- fade_in_handle->property_fill_color_rgba() = UINT_RGBA_CHANGE_A (fade_color, 255);
- fade_out_handle->property_fill_color_rgba() = UINT_RGBA_CHANGE_A (fade_color, 255);
+ fade_in_handle->show ();
+ fade_out_handle->show ();
+ fade_out_handle->raise_to_top ();
+ fade_in_handle->raise_to_top ();
}
}
trackview.editor().set_current_movable (boost::shared_ptr<Movable>());
if (gain_line) {
- gain_line->hide_all_but_selected_control_points ();
+ gain_line->remove_visibility (AutomationLine::ControlPoints);
}
if (fade_in_handle) {
- fade_in_handle->property_fill_color_rgba() = UINT_RGBA_CHANGE_A (fade_color, 0);
- fade_out_handle->property_fill_color_rgba() = UINT_RGBA_CHANGE_A (fade_color, 0);
+ fade_in_handle->hide ();
+ fade_out_handle->hide ();
}
}
AudioRegionView::envelope_active_changed ()
{
if (gain_line) {
- gain_line->set_line_color (audio_region()->envelope_active() ? ARDOUR_UI::config()->canvasvar_GainLine.get() : ARDOUR_UI::config()->canvasvar_GainLineInactive.get());
- }
-}
-
-void
-AudioRegionView::set_waveview_data_src()
-{
- AudioGhostRegion* agr;
- double unit_length= _region->length() / samples_per_unit;
-
- for (uint32_t n = 0; n < waves.size(); ++n) {
- // TODO: something else to let it know the channel
- waves[n]->property_data_src() = _region.get();
- }
-
- for (vector<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
-
- (*i)->set_duration (unit_length);
-
- if((agr = dynamic_cast<AudioGhostRegion*>(*i)) != 0) {
- for (vector<WaveView*>::iterator w = agr->waves.begin(); w != agr->waves.end(); ++w) {
- (*w)->property_data_src() = _region.get();
- }
- }
+ gain_line->set_line_color (audio_region()->envelope_active() ?
+ ARDOUR_UI::config()->get_canvasvar_GainLine() :
+ ARDOUR_UI::config()->get_canvasvar_GainLineInactive());
}
-
}
void
}
+void
+AudioRegionView::set_waveform_colors ()
+{
+ for (vector<ArdourCanvas::WaveView*>::iterator w = waves.begin(); w != waves.end(); ++w) {
+ set_one_waveform_color (*w);
+ }
+}
+
+void
+AudioRegionView::set_one_waveform_color (ArdourCanvas::WaveView* wave)
+{
+ ArdourCanvas::Color fill;
+ ArdourCanvas::Color outline;
+
+ if (_selected) {
+ if (_region->muted()) {
+ /* hide outline with zero alpha */
+ outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_SelectedWaveForm(), 0);
+ fill = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_SelectedWaveFormFill(), MUTED_ALPHA);
+ } else {
+ outline = ARDOUR_UI::config()->get_canvasvar_SelectedWaveForm();
+ fill = ARDOUR_UI::config()->get_canvasvar_SelectedWaveFormFill();
+ }
+ } else {
+ if (_recregion) {
+ outline = ARDOUR_UI::config()->get_canvasvar_RecWaveForm();
+ fill = ARDOUR_UI::config()->get_canvasvar_RecWaveFormFill();
+ } else {
+ if (_region->muted()) {
+ /* hide outline with zero alpha */
+ outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_WaveForm(), 0);
+ fill = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_WaveFormFill(), MUTED_ALPHA);
+ } else {
+ outline = ARDOUR_UI::config()->get_canvasvar_WaveForm();
+ fill = ARDOUR_UI::config()->get_canvasvar_WaveFormFill();
+ }
+ }
+ }
+
+ if (ARDOUR_UI::config()->get_color_regions_using_track_color()) {
+
+ /* just use a slightly transparent version of the selected
+ * color so that some of the track color bleeds through
+ */
+
+ double r, g, b, a;
+ ArdourCanvas::color_to_rgba (fill, r, g, b, a);
+ fill = ArdourCanvas::rgba_to_color (r, g, b, 0.85); /* magic number, not user controllable */
+ outline = ARDOUR_UI::config()->get_canvasvar_WaveForm();
+ }
+
+ wave->set_fill_color (fill);
+ wave->set_outline_color (outline);
+ wave->set_clip_color (ARDOUR_UI::config()->get_canvasvar_WaveFormClip());
+ wave->set_zero_color (ARDOUR_UI::config()->get_canvasvar_ZeroLine());
+}
+
void
AudioRegionView::set_frame_color ()
{
TimeAxisViewItem::set_frame_color ();
- if (_selected) {
- for (vector<ArdourCanvas::WaveView*>::iterator w = waves.begin(); w != waves.end(); ++w) {
- if (_region->muted()) {
- (*w)->property_wave_color() = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->canvasvar_SelectedWaveForm.get(), MUTED_ALPHA);
- } else {
- (*w)->property_wave_color() = ARDOUR_UI::config()->canvasvar_SelectedWaveForm.get();
- (*w)->property_fill_color() = ARDOUR_UI::config()->canvasvar_SelectedWaveFormFill.get();
- }
- }
- } else {
- if (_recregion) {
- for (vector<ArdourCanvas::WaveView*>::iterator w = waves.begin(); w != waves.end(); ++w) {
- if (_region->muted()) {
- (*w)->property_wave_color() = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->canvasvar_RecWaveForm.get(), MUTED_ALPHA);
- } else {
- (*w)->property_wave_color() = ARDOUR_UI::config()->canvasvar_RecWaveForm.get();
- (*w)->property_fill_color() = ARDOUR_UI::config()->canvasvar_RecWaveFormFill.get();
- }
- }
- } else {
- for (vector<ArdourCanvas::WaveView*>::iterator w = waves.begin(); w != waves.end(); ++w) {
- if (_region->muted()) {
- (*w)->property_wave_color() = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->canvasvar_WaveForm.get(), MUTED_ALPHA);
- } else {
- (*w)->property_wave_color() = ARDOUR_UI::config()->canvasvar_WaveForm.get();
- (*w)->property_fill_color() = ARDOUR_UI::config()->canvasvar_WaveFormFill.get();
- }
- }
- }
- }
+ set_waveform_colors ();
}
void
}
editor->present ();
- editor->set_position (Gtk::WIN_POS_MOUSE);
editor->show_all();
}
-
-void
-AudioRegionView::show_fade_line (framepos_t pos)
-{
- fade_position_line->property_x1() = trackview.editor().frame_to_pixel (pos);
- fade_position_line->property_x2() = trackview.editor().frame_to_pixel (pos);
- fade_position_line->show ();
- fade_position_line->raise_to_top ();
-}
-
-void
-AudioRegionView::hide_fade_line ()
-{
- fade_position_line->hide ();
-}
-
-
void
AudioRegionView::transients_changed ()
{
AnalysisFeatureList analysis_features = _region->transients();
while (feature_lines.size() < analysis_features.size()) {
- ArdourCanvas::SimpleLine* l = new ArdourCanvas::SimpleLine (*group);
- l->property_color_rgba() = (guint) ARDOUR_UI::config()->canvasvar_ZeroLine.get();
- feature_lines.push_back (make_pair(0, l));
+
+ ArdourCanvas::Line* canvas_item = new ArdourCanvas::Line(group);
+ CANVAS_DEBUG_NAME (canvas_item, string_compose ("transient group for %1", region()->name()));
+
+ canvas_item->set (ArdourCanvas::Duple (-1.0, 2.0),
+ ArdourCanvas::Duple (1.0, _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1));
+
+ canvas_item->raise_to_top ();
+ canvas_item->show ();
+
+ canvas_item->set_data ("regionview", this);
+ canvas_item->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_feature_line_event), canvas_item, this));
+
+ feature_lines.push_back (make_pair(0, canvas_item));
}
while (feature_lines.size() > analysis_features.size()) {
- ArdourCanvas::SimpleLine *line = feature_lines.back().second;
+ ArdourCanvas::Line* line = feature_lines.back().second;
feature_lines.pop_back ();
delete line;
}
AnalysisFeatureList::const_iterator i;
- list<std::pair<framepos_t, ArdourCanvas::SimpleLine*> >::iterator l;
+ list<std::pair<framepos_t, ArdourCanvas::Line*> >::iterator l;
for (i = analysis_features.begin(), l = feature_lines.begin(); i != analysis_features.end() && l != feature_lines.end(); ++i, ++l) {
+
+ float *pos = new float;
+ *pos = trackview.editor().sample_to_pixel (*i);
+
+ (*l).second->set (
+ ArdourCanvas::Duple (*pos, 2.0),
+ ArdourCanvas::Duple (*pos, _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1)
+ );
+
+ (*l).second->set_data ("position", pos);
(*l).first = *i;
- (*l).second->property_x1() = trackview.editor().frame_to_pixel (*i);
- (*l).second->property_x2() = trackview.editor().frame_to_pixel (*i);
- (*l).second->property_y1() = 2;
- (*l).second->property_y2() = _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1;
- (*l).second->set_data("regionview", this);
- (*l).second->show ();
- (*l).second->raise_to_top ();
-
- (*l).second->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_feature_line_event), (*l).second, this));
}
}
AudioRegionView::update_transient(float /*old_pos*/, float new_pos)
{
/* Find frame at old pos, calulate new frame then update region transients*/
- list<std::pair<framepos_t, ArdourCanvas::SimpleLine*> >::iterator l;
+ list<std::pair<framepos_t, ArdourCanvas::Line*> >::iterator l;
for (l = feature_lines.begin(); l != feature_lines.end(); ++l) {
- /* Simple line x1 has been updated in drag so we compare to new_pos */
- if (rint(new_pos) == rint((*l).second->property_x1())) {
-
+
+ /* Line has been updated in drag so we compare to new_pos */
+
+ float* pos = (float*) (*l).second->get_data ("position");
+
+ if (rint(new_pos) == rint(*pos)) {
+
framepos_t old_frame = (*l).first;
- framepos_t new_frame = trackview.editor().pixel_to_frame (new_pos);
+ framepos_t new_frame = trackview.editor().pixel_to_sample (new_pos);
_region->update_transient (old_frame, new_frame);
-
+
break;
}
}
AudioRegionView::remove_transient(float pos)
{
/* Find frame at old pos, calulate new frame then update region transients*/
- list<std::pair<framepos_t, ArdourCanvas::SimpleLine*> >::iterator l;
+ list<std::pair<framepos_t, ArdourCanvas::Line*> >::iterator l;
for (l = feature_lines.begin(); l != feature_lines.end(); ++l) {
- /* Simple line x1 has been updated in drag so we compare to new_pos */
- if (rint(pos) == rint((*l).second->property_x1())) {
- _region->remove_transient ((*l).first);
+
+ /* Line has been updated in drag so we compare to new_pos */
+ float *line_pos = (float*) (*l).second->get_data ("position");
+
+ if (rint(pos) == rint(*line_pos)) {
+ _region->remove_transient ((*l).first);
break;
}
}
AudioRegionView::thaw_after_trim ()
{
RegionView::thaw_after_trim ();
-
unhide_envelope ();
+ drag_end ();
+}
+
+
+void
+AudioRegionView::show_xfades ()
+{
+ show_start_xfade ();
+ show_end_xfade ();
+}
+
+void
+AudioRegionView::drag_start ()
+{
+ TimeAxisViewItem::drag_start ();
+
+ //we used to hide xfades here. I don't see the point with the new model, but we can re-implement if needed
+}
+
+void
+AudioRegionView::drag_end ()
+{
+ TimeAxisViewItem::drag_end ();
+
+ //see comment for drag_start
+}
+
+void
+AudioRegionView::parameter_changed (string const & p)
+{
+ if (p == "show-waveforms") {
+ setup_waveform_visibility ();
+ } else if (p == "waveform-scale") {
+ setup_waveform_scale ();
+ } else if (p == "waveform-shape") {
+ setup_waveform_shape ();
+ } else if (p == "show-waveform-clipping") {
+ setup_waveform_clipping ();
+ }
}
projects / ardour.git / blobdiff