#include <gtkmm.h>
-#include <gtkmm2ext/gtk_ui.h>
-
#include "ardour/playlist.h"
#include "ardour/audioregion.h"
#include "ardour/audiosource.h"
#include "evoral/Curve.hpp"
+#include "gtkmm2ext/gtk_ui.h"
+#include "gtkmm2ext/utils.h"
+#include "gtkmm2ext/colors.h"
+
#include "canvas/rectangle.h"
#include "canvas/polygon.h"
#include "canvas/poly_line.h"
#include "canvas/text.h"
#include "canvas/xfade_curve.h"
#include "canvas/debug.h"
-#include "canvas/utils.h"
-#include "canvas/colors.h"
+
+#include "waveview/debug.h"
#include "streamview.h"
#include "audio_region_view.h"
// needs to be created first, RegionView::init() calls set_height()
pending_peak_data = new ArdourCanvas::Rectangle (group);
CANVAS_DEBUG_NAME (pending_peak_data, string_compose ("pending peak rectangle for %1", region()->name()));
- pending_peak_data->set_outline_color (ArdourCanvas::rgba_to_color (0, 0, 0, 0.0));
+ pending_peak_data->set_outline_color (Gtkmm2ext::rgba_to_color (0, 0, 0, 0.0));
pending_peak_data->set_pattern (pending_peak_pattern);
pending_peak_data->set_data ("regionview", this);
pending_peak_data->hide ();
if (!_recregion) {
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 (ArdourCanvas::rgba_to_color (0, 0, 0, 1.0));
+ fade_in_handle->set_outline_color (Gtkmm2ext::rgba_to_color (0, 0, 0, 1.0));
fade_in_handle->set_fill_color (UIConfiguration::instance().color ("inactive fade handle"));
fade_in_handle->set_data ("regionview", this);
fade_in_handle->hide ();
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 (ArdourCanvas::rgba_to_color (0, 0, 0, 1.0));
+ fade_out_handle->set_outline_color (Gtkmm2ext::rgba_to_color (0, 0, 0, 1.0));
fade_out_handle->set_fill_color (UIConfiguration::instance().color ("inactive fade handle"));
fade_out_handle->set_data ("regionview", this);
fade_out_handle->hide ();
fade_in_trim_handle = new ArdourCanvas::Rectangle (group);
CANVAS_DEBUG_NAME (fade_in_handle, string_compose ("fade in trim handle for %1", region()->name()));
- fade_in_trim_handle->set_outline_color (ArdourCanvas::rgba_to_color (0, 0, 0, 1.0));
+ fade_in_trim_handle->set_outline_color (Gtkmm2ext::rgba_to_color (0, 0, 0, 1.0));
fade_in_trim_handle->set_fill_color (UIConfiguration::instance().color ("inactive fade handle"));
fade_in_trim_handle->set_data ("regionview", this);
fade_in_trim_handle->hide ();
fade_out_trim_handle = new ArdourCanvas::Rectangle (group);
CANVAS_DEBUG_NAME (fade_out_handle, string_compose ("fade out trim handle for %1", region()->name()));
- fade_out_trim_handle->set_outline_color (ArdourCanvas::rgba_to_color (0, 0, 0, 1.0));
+ fade_out_trim_handle->set_outline_color (Gtkmm2ext::rgba_to_color (0, 0, 0, 1.0));
fade_out_trim_handle->set_fill_color (UIConfiguration::instance().color ("inactive fade handle"));
fade_out_trim_handle->set_data ("regionview", this);
fade_out_trim_handle->hide ();
}
_data_ready_connections.clear ();
- for (list<std::pair<framepos_t, ArdourCanvas::Line*> >::iterator i = feature_lines.begin(); i != feature_lines.end(); ++i) {
+ for (list<std::pair<samplepos_t, ArdourCanvas::Line*> >::iterator i = feature_lines.begin(); i != feature_lines.end(); ++i) {
delete ((*i).second);
}
{
std::string str = RegionView::make_name ();
- if (audio_region()->speed_mismatch (trackview.session()->frame_rate())) {
+ if (audio_region()->speed_mismatch (trackview.session()->sample_rate())) {
str = string ("*") + str;
}
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) {
+ for (vector<ArdourWaveView::WaveView*>::iterator w = agr->waves.begin(); w != agr->waves.end(); ++w) {
(*w)->region_resized ();
}
}
}
/* hide transient lines that extend beyond the region */
- list<std::pair<framepos_t, ArdourCanvas::Line*> >::iterator l;
- framepos_t first = _region->first_frame();
- framepos_t last = _region->last_frame();
+ list<std::pair<samplepos_t, ArdourCanvas::Line*> >::iterator l;
+ samplepos_t first = _region->first_sample();
+ samplepos_t last = _region->last_sample();
for (l = feature_lines.begin(); l != feature_lines.end(); ++l) {
if (l->first < first || l->first >= last) {
return;
}
- framepos_t position = _region->position();
+ samplepos_t position = _region->position();
AnalysisFeatureList::const_iterator i;
- list<std::pair<framepos_t, ArdourCanvas::Line*> >::iterator l;
+ list<std::pair<samplepos_t, ArdourCanvas::Line*> >::iterator l;
double y1;
if (_height >= NAME_HIGHLIGHT_THRESH) {
y1 = _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1;
reset_fade_shapes ();
/* Update heights for any feature lines */
- framepos_t position = _region->position();
- list<std::pair<framepos_t, ArdourCanvas::Line*> >::iterator l;
+ samplepos_t position = _region->position();
+ list<std::pair<samplepos_t, ArdourCanvas::Line*> >::iterator l;
double y1;
if (_height >= NAME_HIGHLIGHT_THRESH) {
y1 = _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1;
void
AudioRegionView::reset_fade_in_shape ()
{
- reset_fade_in_shape_width (audio_region(), (framecnt_t) audio_region()->fade_in()->back()->when);
+ reset_fade_in_shape_width (audio_region(), (samplecnt_t) audio_region()->fade_in()->back()->when);
}
void
-AudioRegionView::reset_fade_in_shape_width (boost::shared_ptr<AudioRegion> ar, framecnt_t width, bool drag_active)
+AudioRegionView::reset_fade_in_shape_width (boost::shared_ptr<AudioRegion> ar, samplecnt_t width, bool drag_active)
{
trim_fade_in_drag_active = drag_active;
if (fade_in_handle == 0) {
return;
}
- /* smallest size for a fade is 64 frames */
+ /* smallest size for a fade is 64 samples */
- width = std::max ((framecnt_t) 64, width);
+ width = std::max ((samplecnt_t) 64, width);
/* round here to prevent little visual glitches with sub-pixel placement */
double const pwidth = floor (width / samples_per_pixel);
redraw_start_xfade_to (ar, width, points, effective_height, handle_left);
/* ensure trim handle stays on top */
- if (frame_handle_start) {
- frame_handle_start->raise_to_top();
+ if (sample_handle_start) {
+ sample_handle_start->raise_to_top();
}
}
void
AudioRegionView::reset_fade_out_shape ()
{
- reset_fade_out_shape_width (audio_region(), (framecnt_t) audio_region()->fade_out()->back()->when);
+ reset_fade_out_shape_width (audio_region(), (samplecnt_t) audio_region()->fade_out()->back()->when);
}
void
-AudioRegionView::reset_fade_out_shape_width (boost::shared_ptr<AudioRegion> ar, framecnt_t width, bool drag_active)
+AudioRegionView::reset_fade_out_shape_width (boost::shared_ptr<AudioRegion> ar, samplecnt_t width, bool drag_active)
{
trim_fade_out_drag_active = drag_active;
if (fade_out_handle == 0) {
return;
}
- /* smallest size for a fade is 64 frames */
+ /* smallest size for a fade is 64 samples */
- width = std::max ((framecnt_t) 64, width);
+ width = std::max ((samplecnt_t) 64, width);
double const pwidth = floor(trackview.editor().sample_to_pixel (width));
- /* the right edge should be right on the region frame is the pixel
+ /* the right edge should be right on the region sample is the pixel
* width is zero. Hence the additional + 1.0 at the end.
*/
redraw_end_xfade_to (ar, width, points, effective_height, handle_right, pwidth);
/* ensure trim handle stays on top */
- if (frame_handle_end) {
- frame_handle_end->raise_to_top();
+ if (sample_handle_end) {
+ sample_handle_end->raise_to_top();
}
}
-framepos_t
+samplepos_t
AudioRegionView::get_fade_in_shape_width ()
{
return audio_region()->fade_in()->back()->when;
}
-framepos_t
+samplepos_t
AudioRegionView::get_fade_out_shape_width ()
{
return audio_region()->fade_out()->back()->when;
}
void
-AudioRegionView::redraw_start_xfade_to (boost::shared_ptr<AudioRegion> ar, framecnt_t /*width*/, Points& points, double effective_height,
+AudioRegionView::redraw_start_xfade_to (boost::shared_ptr<AudioRegion> ar, samplecnt_t /*width*/, Points& points, double effective_height,
double rect_width)
{
if (points.size() < 2) {
}
void
-AudioRegionView::redraw_end_xfade_to (boost::shared_ptr<AudioRegion> ar, framecnt_t width, Points& points, double effective_height,
+AudioRegionView::redraw_end_xfade_to (boost::shared_ptr<AudioRegion> ar, samplecnt_t width, Points& points, double effective_height,
double rect_edge, double rect_width)
{
if (points.size() < 2) {
}
_data_ready_connections.clear ();
- for (vector<WaveView*>::iterator w = waves.begin(); w != waves.end(); ++w) {
+ for (vector<ArdourWaveView::WaveView*>::iterator w = waves.begin(); w != waves.end(); ++w) {
group->remove(*w);
}
waves.clear();
}
/* first waveview starts at 1.0, not 0.0 since that will overlap the
- * frame
+ * sample
*/
gdouble yoff = which * ht;
- WaveView *wave = new WaveView (group, audio_region ());
+ ArdourWaveView::WaveView *wave = new ArdourWaveView::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);
switch (UIConfiguration::instance().get_waveform_shape()) {
case Rectified:
- wave->set_shape (WaveView::Rectified);
+ wave->set_shape (ArdourWaveView::WaveView::Rectified);
break;
default:
- wave->set_shape (WaveView::Normal);
+ wave->set_shape (ArdourWaveView::WaveView::Normal);
}
wave->set_logscaled (UIConfiguration::instance().get_waveform_scale() == Logarithmic);
- vector<ArdourCanvas::WaveView*> v;
+ vector<ArdourWaveView::WaveView*> v;
v.push_back (wave);
set_some_waveform_colors (v);
/* Restore stacked coverage */
LayerDisplay layer_display;
if (trackview.get_gui_property ("layer-display", layer_display)) {
- update_coverage_frames (layer_display);
+ update_coverage_samples (layer_display);
}
}
item->canvas_to_item (mx, my);
- framecnt_t const frame_within_region = (framecnt_t) floor (mx * samples_per_pixel);
+ samplecnt_t const sample_within_region = (samplecnt_t) floor (mx * samples_per_pixel);
- if (!gain_line->control_points_adjacent (frame_within_region, before_p, after_p)) {
+ if (!gain_line->control_points_adjacent (sample_within_region, before_p, after_p)) {
/* no adjacent points */
return;
}
- /*y is in item frame */
+ /*y is in item sample */
double const bx = gain_line->nth (before_p)->get_x();
double const ax = gain_line->nth (after_p)->get_x();
double const click_ratio = (ax - mx) / (ax - bx);
/* don't create points that can't be seen */
update_envelope_visibility ();
- framepos_t rpos = region ()->position ();
- MusicFrame snap_pos (trackview.editor().pixel_to_sample (mx) + rpos, 0);
+ samplepos_t rpos = region ()->position ();
+ MusicSample snap_pos (trackview.editor().pixel_to_sample (mx) + rpos, 0);
trackview.editor ().snap_to_with_modifier (snap_pos, ev);
- framepos_t fx = snap_pos.frame - rpos;
+ samplepos_t fx = snap_pos.sample - rpos;
if (fx > _region->length()) {
return;
trackview.editor ().commit_reversible_command ();
trackview.session ()->set_dirty ();
+ } else {
+ delete region_memento;
}
}
break;
}
- WaveView *wave = new WaveView (ghost->group, audio_region());
+ ArdourWaveView::WaveView *wave = new ArdourWaveView::WaveView (ghost->group, audio_region());
CANVAS_DEBUG_NAME (wave, string_compose ("ghost wave for %1", get_item_name()));
wave->set_channel (n);
}
void
-AudioRegionView::set_some_waveform_colors (vector<ArdourCanvas::WaveView*>& waves_to_color)
+AudioRegionView::set_some_waveform_colors (vector<ArdourWaveView::WaveView*>& waves_to_color)
{
- ArdourCanvas::Color fill;
- ArdourCanvas::Color outline;
- ArdourCanvas::Color clip = UIConfiguration::instance().color ("clipped waveform");
- ArdourCanvas::Color zero = UIConfiguration::instance().color ("zero line");
+ Gtkmm2ext::Color fill;
+ Gtkmm2ext::Color outline;
+ Gtkmm2ext::Color clip = UIConfiguration::instance().color ("clipped waveform");
+ Gtkmm2ext::Color zero = UIConfiguration::instance().color ("zero line");
if (_selected) {
if (_region->muted()) {
}
}
- for (vector<ArdourCanvas::WaveView*>::iterator w = waves_to_color.begin(); w != waves_to_color.end(); ++w) {
+ for (vector<ArdourWaveView::WaveView*>::iterator w = waves_to_color.begin(); w != waves_to_color.end(); ++w) {
(*w)->set_fill_color (fill);
(*w)->set_outline_color (outline);
(*w)->set_clip_color (clip);
}
void
-AudioRegionView::set_frame_color ()
+AudioRegionView::set_sample_color ()
{
- if (!frame) {
+ if (!sample) {
return;
}
- RegionView::set_frame_color ();
+ RegionView::set_sample_color ();
set_waveform_colors ();
}
}
void
-AudioRegionView::update_coverage_frames (LayerDisplay d)
+AudioRegionView::update_coverage_samples (LayerDisplay d)
{
- RegionView::update_coverage_frames (d);
+ RegionView::update_coverage_samples (d);
if (d == Stacked) {
if (fade_in_handle) { fade_in_handle->raise_to_top (); }
{
AnalysisFeatureList analysis_features;
_region->transients (analysis_features);
- framepos_t position = _region->position();
- framepos_t first = _region->first_frame();
- framepos_t last = _region->last_frame();
+ samplepos_t position = _region->position();
+ samplepos_t first = _region->first_sample();
+ samplepos_t last = _region->last_sample();
double y1;
if (_height >= NAME_HIGHLIGHT_THRESH) {
}
AnalysisFeatureList::const_iterator i;
- list<std::pair<framepos_t, ArdourCanvas::Line*> >::iterator l;
+ list<std::pair<samplepos_t, ArdourCanvas::Line*> >::iterator l;
for (i = analysis_features.begin(), l = feature_lines.begin(); i != analysis_features.end() && l != feature_lines.end(); ++i, ++l) {
void
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::Line*> >::iterator l;
+ /* Find sample at old pos, calulate new sample then update region transients*/
+ list<std::pair<samplepos_t, ArdourCanvas::Line*> >::iterator l;
for (l = feature_lines.begin(); l != feature_lines.end(); ++l) {
float* pos = (float*) (*l).second->get_data ("position");
if (rint(new_pos) == rint(*pos)) {
- framepos_t position = _region->position();
- framepos_t old_frame = (*l).first;
- framepos_t new_frame = trackview.editor().pixel_to_sample (new_pos) + position;
- _region->update_transient (old_frame, new_frame);
+ samplepos_t position = _region->position();
+ samplepos_t old_sample = (*l).first;
+ samplepos_t new_sample = trackview.editor().pixel_to_sample (new_pos) + position;
+ _region->update_transient (old_sample, new_sample);
break;
}
}
/* this is called from Editor::remove_transient () with pos == get_data ("position")
* which is the item's x-coordinate inside the ARV.
*
- * Find frame at old pos, calulate new frame then update region transients
+ * Find sample at old pos, calulate new sample then update region transients
*/
- list<std::pair<framepos_t, ArdourCanvas::Line*> >::iterator l;
+ list<std::pair<samplepos_t, ArdourCanvas::Line*> >::iterator l;
for (l = feature_lines.begin(); l != feature_lines.end(); ++l) {
float *line_pos = (float*) (*l).second->get_data ("position");
projects / ardour.git / blobdiff