#include <cassert>
#include <algorithm>
+#include <boost/scoped_ptr.hpp>
+
#include <gtkmm.h>
#include <gtkmm2ext/gtk_ui.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"
using namespace ArdourCanvas;
static const int32_t sync_mark_width = 9;
+static double const handle_size = 6; /* 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)
+ , 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)
{
-}
-
-
-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)
- , _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);
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->property_outline_color_rgba() = RGBA_TO_UINT (0, 0, 0, 0);
fade_in_handle->set_data ("regionview", this);
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->property_outline_color_rgba() = RGBA_TO_UINT (0, 0, 0, 0);
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;
const string line_name = _region->name() + ":gain";
if (!Profile->get_sae()) {
- gain_line = new AudioRegionGainLine (line_name, *this, *group, audio_region()->envelope());
+ gain_line.reset (new AudioRegionGainLine (line_name, *this, *group, audio_region()->envelope()));
}
-
- if (!(_flags & EnvelopeVisible)) {
- gain_line->hide ();
- } else {
- gain_line->show ();
- }
-
+
+ update_envelope_visibility ();
gain_line->reset ();
set_height (trackview.current_height());
set_colors ();
+ setup_waveform_visibility ();
+ setup_waveform_shape ();
+ setup_waveform_scale ();
+
/* XXX sync mark drag? */
}
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;
+ cerr << "AudioRegionView::region_changed() called" << endl;
RegionView::region_changed (what_changed);
region_scale_amplitude_changed ();
}
if (what_changed.contains (ARDOUR::Properties::fade_in)) {
- fade_in_changed ();
+ cerr << region()->name() << " in changed\n";
+ stacktrace (cerr, 40);
+ fade_in_changed ();
}
if (what_changed.contains (ARDOUR::Properties::fade_out)) {
+ cerr << region()->name() << " out changed\n";
fade_out_changed ();
}
if (what_changed.contains (ARDOUR::Properties::fade_in_active)) {
+ cerr << region()->name() << " in active changed\n";
fade_in_active_changed ();
}
if (what_changed.contains (ARDOUR::Properties::fade_out_active)) {
+ cerr << region()->name() << " out active changed\n";
fade_out_active_changed ();
}
+ if (what_changed.contains (ARDOUR::Properties::fade_in_is_xfade)) {
+ cerr << region()->name() << " in is xfade changed\n";
+ fade_in_changed ();
+ }
+ if (what_changed.contains (ARDOUR::Properties::fade_out_is_xfade)) {
+ cerr << region()->name() << " out is xfade changed\n";
+ fade_out_changed ();
+ }
if (what_changed.contains (ARDOUR::Properties::envelope_active)) {
envelope_active_changed ();
}
{
reset_fade_out_shape ();
}
+
void
AudioRegionView::fade_in_active_changed ()
{
}
}
}
-
+
/* 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();
}
else {
fade_in_handle->show();
- fade_out_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().frame_to_pixel (*i);
+
+ ArdourCanvas::Points points;
+ points.push_back(Gnome::Art::Point(x_pos, 2.0)); // first x-coord needs to be a non-normal value
+ points.push_back(Gnome::Art::Point(x_pos, _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1));
+
+ (*l).first = *i;
+ (*l).second->property_points() = points;
}
-
+
reset_fade_shapes ();
}
{
/* 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;
if (fade_in_handle) {
fade_in_handle->property_y1() = handle_pos;
- fade_in_handle->property_y2() = handle_pos + handle_height;
+ fade_in_handle->property_y2() = 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->property_y2() = handle_pos + handle_size;
}
}
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;
- }
+
+ float pos_x = trackview.editor().frame_to_pixel((*l).first);
+
+ ArdourCanvas::Points points;
+
+ points.push_back(Gnome::Art::Point(pos_x, 2.0)); // first x-coord needs to be a non-normal value
+ points.push_back(Gnome::Art::Point(pos_x, _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1));
+
+ (*l).second->property_points() = points;
+ }
if (fade_position_line) {
+
if (height < NAME_HIGHLIGHT_THRESH) {
fade_position_line->property_y2() = _height - 1;
}
}
}
-void
-AudioRegionView::manage_zero_line ()
-{
- if (!zero_line) {
- return;
- }
-
- 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();
- }
-}
-
void
AudioRegionView::reset_fade_shapes ()
{
void
AudioRegionView::reset_fade_in_shape ()
{
- reset_fade_in_shape_width ((nframes_t) audio_region()->fade_in()->back()->when);
+ reset_fade_in_shape_width ((framecnt_t) audio_region()->fade_in()->back()->when);
}
void
-AudioRegionView::reset_fade_in_shape_width (nframes_t width)
+AudioRegionView::reset_fade_in_shape_width (framecnt_t width)
{
+ if (dragging()) {
+ return;
+ }
+
+ if (audio_region()->fade_in_is_xfade()) {
+ if (fade_in_handle) {
+ fade_in_handle->hide ();
+ fade_in_shape->hide ();
+ }
+ redraw_start_xfade ();
+ return;
+ } else {
+ if (start_xfade_in) {
+ start_xfade_in->hide ();
+ start_xfade_out->hide ();
+ start_xfade_rect->hide ();
+ _start_xfade_visible = false;
+ }
+ }
+
if (fade_in_handle == 0) {
return;
}
+ fade_in_handle->show ();
+
/* smallest size for a fade is 64 frames */
- width = std::max ((nframes_t) 64, width);
+ width = std::max ((framecnt_t) 64, width);
Points* points;
-
- double pwidth = width / samples_per_unit;
+
+ /* 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;
return;
}
- double handle_center;
- handle_center = pwidth;
-
- if (handle_center > 7.0) {
- handle_center -= 2.0;
- } else {
- handle_center = 3.0;
- }
+ double const handle_center = pwidth;
- fade_in_handle->property_x1() = handle_center - 3.0;
- fade_in_handle->property_x2() = handle_center + 3.0;
+ /* 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 + handle_size;
if (pwidth < 5) {
fade_in_shape->hide();
void
AudioRegionView::reset_fade_out_shape ()
{
- reset_fade_out_shape_width ((nframes_t) audio_region()->fade_out()->back()->when);
+ reset_fade_out_shape_width ((framecnt_t) audio_region()->fade_out()->back()->when);
}
void
-AudioRegionView::reset_fade_out_shape_width (nframes_t width)
+AudioRegionView::reset_fade_out_shape_width (framecnt_t width)
{
+ if (dragging() && audio_region()->fade_out_is_xfade()) {
+ /* we hide xfades while dragging regions */
+ return;
+ }
+
+ if (audio_region()->fade_out_is_xfade()) {
+ if (fade_out_handle) {
+ fade_out_handle->hide ();
+ fade_out_shape->hide ();
+ }
+ redraw_end_xfade ();
+ return;
+ } else {
+ if (end_xfade_in) {
+ end_xfade_in->hide ();
+ end_xfade_out->hide ();
+ end_xfade_rect->hide ();
+ _end_xfade_visible = false;
+ }
+ }
+
if (fade_out_handle == 0) {
return;
}
+ fade_out_handle->show ();
+
/* smallest size for a fade is 64 frames */
- width = std::max ((nframes_t) 64, width);
+ width = std::max ((framecnt_t) 64, width);
Points* points;
- double pwidth = width / samples_per_unit;
+
+ /* 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;
return;
}
- double handle_center;
- handle_center = (_region->length() - width) / samples_per_unit;
-
- if (handle_center > 7.0) {
- handle_center -= 2.0;
- } else {
- handle_center = 3.0;
- }
+ double const handle_center = (_region->length() - width) / samples_per_unit;
- fade_out_handle->property_x1() = handle_center - 3.0;
- fade_out_handle->property_x2() = handle_center + 3.0;
+ /* 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;
/* don't show shape if its too small */
{
RegionView::set_samples_per_unit (spu);
- if (_flags & WaveformVisible) {
- for (uint32_t n=0; n < waves.size(); ++n) {
+ if (Config->get_show_waveforms ()) {
+ for (uint32_t n = 0; n < waves.size(); ++n) {
waves[n]->property_samples_per_unit() = spu;
}
}
}
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.
+ */
+ waves[n]->property_samples_per_unit() = samples_per_unit;
+ 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 ();
}
}
wave->property_clip_color() = ARDOUR_UI::config()->canvasvar_WaveFormClip.get();
wave->property_zero_color() = ARDOUR_UI::config()->canvasvar_ZeroLine.get();
+ wave->property_zero_line() = true;
wave->property_region_start() = _region->start();
- wave->property_rectified() = (bool) (_flags & WaveformRectified);
- wave->property_logscaled() = (bool) (_flags & WaveformLogScaled);
+ wave->property_rectified() = Config->get_waveform_shape() == Rectified;
+ wave->property_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);
- nframes_t fx = trackview.editor().pixel_to_frame (x);
+ framepos_t fx = trackview.editor().pixel_to_frame (x);
if (fx > _region->length()) {
return;
gain_line->view_to_model_coord (x, y);
- /* XXX STATEFUL: can't convert to stateful diff until we
- can represent automation data with it.
- */
+ /* XXX STATEFUL: can't convert to stateful diff until we
+ can represent automation data with it.
+ */
trackview.session()->begin_reversible_command (_("add gain control point"));
XMLNode &before = audio_region()->envelope()->get_state();
}
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;
- }
- }
-
- 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;
- }
+ for (vector<WaveView *>::iterator wave = waves.begin(); wave != waves.end() ; ++wave) {
+ (*wave)->property_rectified() = Config->get_waveform_shape() == Rectified;
}
}
void
-AudioRegionView::set_waveform_shape (WaveformShape shape)
+AudioRegionView::setup_waveform_scale ()
{
- bool yn;
-
- /* this slightly odd approach is to leave the door open to
- other "shapes" such as spectral displays, etc.
- */
-
- switch (shape) {
- case Rectified:
- yn = true;
- break;
-
- default:
- yn = false;
- break;
- }
-
- 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 ();
- }
-}
-
-void
-AudioRegionView::set_waveform_scale (WaveformScale 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 ();
+ for (vector<WaveView *>::iterator wave = waves.begin(); wave != waves.end() ; ++wave) {
+ (*wave)->property_logscaled() = Config->get_waveform_scale() == Logarithmic;
}
}
void
AudioRegionView::entered (bool internal_editing)
{
- trackview.editor().set_current_trimmable (_region);
- trackview.editor().set_current_movable (_region);
-
- if (gain_line && _flags & EnvelopeVisible) {
- gain_line->show_all_control_points ();
+ trackview.editor().set_current_trimmable (_region);
+ trackview.editor().set_current_movable (_region);
+
+ if (gain_line && trackview.editor().current_mouse_mode() == Editing::MouseGain) {
+ gain_line->add_visibility (AutomationLine::ControlPoints);
}
if (fade_in_handle && !internal_editing) {
+ fade_in_handle->property_outline_color_rgba() = RGBA_TO_UINT (0, 0, 0, 255);
fade_in_handle->property_fill_color_rgba() = UINT_RGBA_CHANGE_A (fade_color, 255);
+ fade_out_handle->property_outline_color_rgba() = RGBA_TO_UINT (0, 0, 0, 255);
fade_out_handle->property_fill_color_rgba() = UINT_RGBA_CHANGE_A (fade_color, 255);
}
}
void
AudioRegionView::exited ()
{
- trackview.editor().set_current_trimmable (boost::shared_ptr<Trimmable>());
- trackview.editor().set_current_movable (boost::shared_ptr<Movable>());
+ trackview.editor().set_current_trimmable (boost::shared_ptr<Trimmable>());
+ trackview.editor().set_current_movable (boost::shared_ptr<Movable>());
- if (gain_line) {
- gain_line->hide_all_but_selected_control_points ();
+ if (gain_line && trackview.editor().current_mouse_mode() == Editing::MouseGain) {
+ gain_line->remove_visibility (AutomationLine::ControlPoints);
}
if (fade_in_handle) {
+ fade_in_handle->property_outline_color_rgba() = RGBA_TO_UINT (0, 0, 0, 0);
fade_in_handle->property_fill_color_rgba() = UINT_RGBA_CHANGE_A (fade_color, 0);
+ fade_out_handle->property_outline_color_rgba() = RGBA_TO_UINT (0, 0, 0, 0);
fade_out_handle->property_fill_color_rgba() = UINT_RGBA_CHANGE_A (fade_color, 0);
}
}
fill_opacity = 0;
}
- if (_selected && should_show_selection) {
- if (fill_opacity) {
- frame->property_fill_color_rgba() = UINT_RGBA_CHANGE_A (ARDOUR_UI::config()->canvasvar_SelectedFrameBase.get(), fill_opacity);
- } else {
- frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_SelectedFrameBase.get();
- }
+ TimeAxisViewItem::set_frame_color ();
- 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();
- }
- }
+ uint32_t wc;
+ uint32_t fc;
+
+ if (_selected) {
+ if (_region->muted()) {
+ wc = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->canvasvar_SelectedWaveForm.get(), MUTED_ALPHA);
+ } else {
+ wc = ARDOUR_UI::config()->canvasvar_SelectedWaveForm.get();
+ }
+ fc = ARDOUR_UI::config()->canvasvar_SelectedWaveFormFill.get();
} else {
if (_recregion) {
- frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_RecordingRect.get();
-
- 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();
- }
- }
+ if (_region->muted()) {
+ wc = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->canvasvar_RecWaveForm.get(), MUTED_ALPHA);
+ } else {
+ wc = ARDOUR_UI::config()->canvasvar_RecWaveForm.get();
+ }
+ fc = ARDOUR_UI::config()->canvasvar_RecWaveFormFill.get();
} else {
- if (fill_opacity) {
- frame->property_fill_color_rgba() = UINT_RGBA_CHANGE_A (ARDOUR_UI::config()->canvasvar_FrameBase.get(), fill_opacity);
- } else {
- frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_FrameBase.get();
- }
-
- 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();
- }
- }
+ if (_region->muted()) {
+ wc = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->canvasvar_WaveForm.get(), MUTED_ALPHA);
+ } else {
+ wc = ARDOUR_UI::config()->canvasvar_WaveForm.get();
+ }
+ fc = ARDOUR_UI::config()->canvasvar_WaveFormFill.get();
}
}
+
+ for (vector<ArdourCanvas::WaveView*>::iterator w = waves.begin(); w != waves.end(); ++w) {
+ if (_region->muted()) {
+ (*w)->property_wave_color() = wc;
+ } else {
+ (*w)->property_wave_color() = wc;
+ (*w)->property_fill_color() = fc;
+ }
+ }
}
void
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);
+
+ ArdourCanvas::Points points;
+
+ points.push_back(Gnome::Art::Point(-1.0, 2.0)); // first x-coord needs to be a non-normal value
+ points.push_back(Gnome::Art::Point(1.0, _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1));
+
+ canvas_item->property_points() = points;
+ canvas_item->property_width_pixels() = 1;
+ canvas_item->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_ZeroLine.get();
+ canvas_item->property_first_arrowhead() = TRUE;
+ canvas_item->property_last_arrowhead() = TRUE;
+ canvas_item->property_arrow_shape_a() = 11.0;
+ canvas_item->property_arrow_shape_b() = 0.0;
+ canvas_item->property_arrow_shape_c() = 4.0;
+
+ canvas_item->raise_to_top ();
+ canvas_item->show ();
+
+ canvas_item->set_data ("regionview", this);
+ canvas_item->signal_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) {
+
+ ArdourCanvas::Points points;
+
+ float *pos = new float;
+ *pos = trackview.editor().frame_to_pixel (*i);
+
+ points.push_back(Gnome::Art::Point(*pos, 2.0)); // first x-coord needs to be a non-normal value
+ points.push_back(Gnome::Art::Point(*pos, _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1));
+
+ (*l).second->property_points() = points;
+ (*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);
_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::redraw_start_xfade ()
+{
+ boost::shared_ptr<AudioRegion> ar (audio_region());
+
+ if (!ar->fade_in() || ar->fade_in()->empty()) {
+ return;
+ }
+
+ if (!ar->fade_in_is_xfade()) {
+ if (start_xfade_in) {
+ start_xfade_in->hide ();
+ start_xfade_out->hide ();
+ start_xfade_rect->hide ();
+ _start_xfade_visible = false;
+ }
+ return;
+ }
+
+ redraw_start_xfade_to (ar, ar->fade_in()->back()->when);
+}
+
+void
+AudioRegionView::redraw_start_xfade_to (boost::shared_ptr<AudioRegion> ar, framecnt_t len)
+{
+ int32_t const npoints = trackview.editor().frame_to_pixel (len);
+
+ if (npoints < 3) {
+ return;
+ }
+
+ if (!start_xfade_in) {
+ start_xfade_in = new ArdourCanvas::Line (*group);
+ start_xfade_in->property_width_pixels() = 1;
+ start_xfade_in->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_GainLine.get();
+ }
+
+ if (!start_xfade_out) {
+ start_xfade_out = new ArdourCanvas::Line (*group);
+ start_xfade_out->property_width_pixels() = 1;
+ uint32_t col = UINT_RGBA_CHANGE_A (ARDOUR_UI::config()->canvasvar_GainLine.get(), 125);
+ start_xfade_out->property_fill_color_rgba() = col;
+ }
+
+ if (!start_xfade_rect) {
+ start_xfade_rect = new ArdourCanvas::SimpleRect (*group);
+ start_xfade_rect->property_draw() = true;
+ start_xfade_rect->property_fill() = true;;
+ start_xfade_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_ActiveCrossfade.get();
+ start_xfade_rect->property_outline_pixels() = 0;
+ start_xfade_rect->signal_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);
+ }
+
+ Points* points = get_canvas_points ("xfade edit redraw", npoints);
+ boost::scoped_ptr<float> vec (new float[npoints]);
+ double effective_height = _height - NAME_HIGHLIGHT_SIZE - 1.0;
+
+ ar->fade_in()->curve().get_vector (0, ar->fade_in()->back()->when, vec.get(), npoints);
+
+ for (int i = 0, pci = 0; i < npoints; ++i) {
+ Gnome::Art::Point &p ((*points)[pci++]);
+ p.set_x (i);
+ p.set_y (1.0 + effective_height - (effective_height * vec.get()[i]));
+ }
+
+ start_xfade_rect->property_x1() = ((*points)[0]).get_x();
+ start_xfade_rect->property_y1() = 1.0;
+ start_xfade_rect->property_x2() = ((*points)[npoints-1]).get_x();
+ start_xfade_rect->property_y2() = effective_height;
+ start_xfade_rect->show ();
+ start_xfade_rect->raise_to_top ();
+
+ start_xfade_in->property_points() = *points;
+ start_xfade_in->show ();
+ start_xfade_in->raise_to_top ();
+
+ /* fade out line */
+
+ boost::shared_ptr<AutomationList> inverse = ar->inverse_fade_in();
+
+ if (!inverse) {
+
+ for (int i = 0, pci = 0; i < npoints; ++i) {
+ Gnome::Art::Point &p ((*points)[pci++]);
+ p.set_x (i);
+ p.set_y (1.0 + effective_height - (effective_height * (1.0 - vec.get()[i])));
+ }
+
+ } else {
+
+ inverse->curve().get_vector (0, inverse->back()->when, vec.get(), npoints);
+
+ for (int i = 0, pci = 0; i < npoints; ++i) {
+ Gnome::Art::Point &p ((*points)[pci++]);
+ p.set_x (i);
+ p.set_y (1.0 + effective_height - (effective_height * vec.get()[i]));
+ }
+ }
+
+ start_xfade_out->property_points() = *points;
+ start_xfade_out->show ();
+ start_xfade_out->raise_to_top ();
+
+ _start_xfade_visible = true;
+
+ delete points;
+}
+
+void
+AudioRegionView::redraw_end_xfade ()
+{
+ boost::shared_ptr<AudioRegion> ar (audio_region());
+
+ if (!ar->fade_out() || ar->fade_out()->empty()) {
+ return;
+ }
+
+ if (!ar->fade_out_is_xfade()) {
+ if (end_xfade_in) {
+ end_xfade_in->hide ();
+ end_xfade_out->hide ();
+ end_xfade_rect->hide ();
+ _end_xfade_visible = false;
+ }
+ return;
+ }
+
+ redraw_end_xfade_to (ar, ar->fade_out()->back()->when);
+}
+
+void
+AudioRegionView::redraw_end_xfade_to (boost::shared_ptr<AudioRegion> ar, framecnt_t len)
+{
+ int32_t const npoints = trackview.editor().frame_to_pixel (len);
+
+ if (npoints < 3) {
+ return;
+ }
+
+ if (!end_xfade_in) {
+ end_xfade_in = new ArdourCanvas::Line (*group);
+ end_xfade_in->property_width_pixels() = 1;
+ end_xfade_in->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_GainLine.get();
+ }
+
+ if (!end_xfade_out) {
+ end_xfade_out = new ArdourCanvas::Line (*group);
+ end_xfade_out->property_width_pixels() = 1;
+ uint32_t col UINT_RGBA_CHANGE_A (ARDOUR_UI::config()->canvasvar_GainLine.get(), 125);
+ end_xfade_out->property_fill_color_rgba() = col;
+ }
+
+ if (!end_xfade_rect) {
+ end_xfade_rect = new ArdourCanvas::SimpleRect (*group);
+ end_xfade_rect->property_draw() = true;
+ end_xfade_rect->property_fill() = true;;
+ end_xfade_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_ActiveCrossfade.get();
+ end_xfade_rect->property_outline_pixels() = 0;
+ end_xfade_rect->signal_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);
+ }
+
+ Points* points = get_canvas_points ("xfade edit redraw", npoints);
+ boost::scoped_ptr<float> vec (new float[npoints]);
+
+ ar->fade_out()->curve().get_vector (0, ar->fade_out()->back()->when, vec.get(), npoints);
+
+ double rend = trackview.editor().frame_to_pixel (_region->length() - len);
+ double effective_height = _height - NAME_HIGHLIGHT_SIZE - 1;
+
+ for (int i = 0, pci = 0; i < npoints; ++i) {
+ Gnome::Art::Point &p ((*points)[pci++]);
+ p.set_x (rend + i);
+ p.set_y (1.0 + effective_height - (effective_height * vec.get()[i]));
+ }
+
+ end_xfade_rect->property_x1() = ((*points)[0]).get_x();
+ end_xfade_rect->property_y1() = 1;
+ end_xfade_rect->property_x2() = ((*points)[npoints-1]).get_x();
+ end_xfade_rect->property_y2() = effective_height;
+ end_xfade_rect->show ();
+ end_xfade_rect->raise_to_top ();
+
+ end_xfade_in->property_points() = *points;
+ end_xfade_in->show ();
+ end_xfade_in->raise_to_top ();
+
+ /* fade in line */
+
+ boost::shared_ptr<AutomationList> inverse = ar->inverse_fade_out ();
+
+ if (!inverse) {
+
+ for (int i = 0, pci = 0; i < npoints; ++i) {
+ Gnome::Art::Point &p ((*points)[pci++]);
+ p.set_x (rend + i);
+ p.set_y (1.0 + effective_height - (effective_height * (1.0 - vec.get()[i])));
+ }
+
+ } else {
+
+ inverse->curve().get_vector (inverse->front()->when, inverse->back()->when, vec.get(), npoints);
+
+ for (int i = 0, pci = 0; i < npoints; ++i) {
+ Gnome::Art::Point &p ((*points)[pci++]);
+ p.set_x (rend + i);
+ p.set_y (1.0 + effective_height - (effective_height * vec.get()[i]));
+ }
+ }
+
+ end_xfade_out->property_points() = *points;
+ end_xfade_out->show ();
+ end_xfade_out->raise_to_top ();
+
+ _end_xfade_visible = true;
+
+ delete points;
+}
+
+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::show_xfades ()
+{
+ show_start_xfade ();
+ show_end_xfade ();
+}
+
+void
+AudioRegionView::drag_start ()
+{
+ TimeAxisViewItem::drag_start ();
+ AudioTimeAxisView* atav = dynamic_cast<AudioTimeAxisView*> (&trackview);
+
+ if (atav) {
+ AudioStreamView* av = atav->audio_view();
+ if (av) {
+ /* this will hide our xfades too */
+ _hidden_xfades = av->hide_xfades_with (audio_region());
+ }
+ }
+}
+
+void
+AudioRegionView::drag_end ()
+{
+ TimeAxisViewItem::drag_end ();
+
+ for (list<AudioRegionView*>::iterator i = _hidden_xfades.first.begin(); i != _hidden_xfades.first.end(); ++i) {
+ (*i)->show_start_xfade ();
+ }
+
+ for (list<AudioRegionView*>::iterator i = _hidden_xfades.second.begin(); i != _hidden_xfades.second.end(); ++i) {
+ (*i)->show_end_xfade ();
+ }
+
+ _hidden_xfades.first.clear ();
+ _hidden_xfades.second.clear ();
+}
+
+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 ();
+ }
}
projects / ardour.git / blobdiff