diff options
Diffstat (limited to 'gtk2_ardour/crossfade_edit.cc')
-rw-r--r-- | gtk2_ardour/crossfade_edit.cc | 199 |
1 files changed, 94 insertions, 105 deletions
diff --git a/gtk2_ardour/crossfade_edit.cc b/gtk2_ardour/crossfade_edit.cc index aaea3a2242..c545a02b46 100644 --- a/gtk2_ardour/crossfade_edit.cc +++ b/gtk2_ardour/crossfade_edit.cc @@ -25,7 +25,6 @@ #include <gtkmm/image.h> #include <gtkmm/scrolledwindow.h> -#include <libgnomecanvasmm/line.h> #include "pbd/memento_command.h" #include "ardour/automation_list.h" @@ -41,15 +40,17 @@ #include <gtkmm2ext/gtk_ui.h> +#include "canvas/rectangle.h" +#include "canvas/wave_view.h" +#include "canvas/line.h" +#include "canvas/polygon.h" + #include "ardour_ui.h" #include "crossfade_edit.h" #include "rgb_macros.h" #include "keyboard.h" #include "utils.h" #include "gui_thread.h" -#include "canvas_impl.h" -#include "simplerect.h" -#include "waveview.h" #include "actions.h" using namespace std; @@ -127,38 +128,33 @@ CrossfadeEditor::CrossfadeEditor (Session* s, boost::shared_ptr<Crossfade> xf, d point_grabbed = false; toplevel = 0; - canvas = new ArdourCanvas::CanvasAA (); + canvas = new ArdourCanvas::GtkCanvas (); canvas->signal_size_allocate().connect (sigc::mem_fun(*this, &CrossfadeEditor::canvas_allocation)); canvas->set_size_request (425, 200); - toplevel = new ArdourCanvas::SimpleRect (*(canvas->root())); - toplevel->property_x1() = 0.0; - toplevel->property_y1() = 0.0; - toplevel->property_x2() = 10.0; - toplevel->property_y2() = 10.0; - toplevel->property_fill() = true; - toplevel->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorBase.get(); - toplevel->property_outline_pixels() = 0; - toplevel->signal_event().connect (sigc::mem_fun (*this, &CrossfadeEditor::canvas_event)); + toplevel = new ArdourCanvas::Rectangle (canvas->root()); + toplevel->set (ArdourCanvas::Rect (0, 0, 10, 10)); + toplevel->set_fill (true); + toplevel->set_fill_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorBase()); + toplevel->set_outline (false); + toplevel->Event.connect (sigc::mem_fun (*this, &CrossfadeEditor::canvas_event)); - fade[Out].line = new ArdourCanvas::Line (*(canvas->root())); - fade[Out].line->property_width_pixels() = 1; - fade[Out].line->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorLine.get(); + fade[Out].line = new ArdourCanvas::PolyLine (canvas->root()); + fade[Out].line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorLine()); - fade[Out].shading = new ArdourCanvas::Polygon (*(canvas->root())); - fade[Out].shading->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorLineShading.get(); + fade[Out].shading = new ArdourCanvas::Polygon (canvas->root()); + fade[Out].shading->set_fill_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorLineShading()); - fade[In].line = new ArdourCanvas::Line (*(canvas->root())); - fade[In].line->property_width_pixels() = 1; - fade[In].line->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorLine.get(); + fade[In].line = new ArdourCanvas::PolyLine (canvas->root()); + fade[In].line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorLine()); - fade[In].shading = new ArdourCanvas::Polygon (*(canvas->root())); - fade[In].shading->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorLineShading.get(); + fade[In].shading = new ArdourCanvas::Polygon (canvas->root()); + fade[In].shading->set_fill_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorLineShading()); - fade[In].shading->signal_event().connect (sigc::mem_fun (*this, &CrossfadeEditor::canvas_event)); - fade[In].line->signal_event().connect (sigc::mem_fun (*this, &CrossfadeEditor::curve_event)); - fade[Out].shading->signal_event().connect (sigc::mem_fun (*this, &CrossfadeEditor::canvas_event)); - fade[Out].line->signal_event().connect (sigc::mem_fun (*this, &CrossfadeEditor::curve_event)); + fade[In].shading->Event.connect (sigc::mem_fun (*this, &CrossfadeEditor::canvas_event)); + fade[In].line->Event.connect (sigc::mem_fun (*this, &CrossfadeEditor::curve_event)); + fade[Out].shading->Event.connect (sigc::mem_fun (*this, &CrossfadeEditor::canvas_event)); + fade[Out].line->Event.connect (sigc::mem_fun (*this, &CrossfadeEditor::curve_event)); select_in_button.set_name (X_("CrossfadeEditCurveButton")); select_out_button.set_name (X_("CrossfadeEditCurveButton")); @@ -465,15 +461,14 @@ CrossfadeEditor::make_point () { Point* p = new Point; - p->box = new ArdourCanvas::SimpleRect (*(canvas->root())); - p->box->property_fill() = true; - p->box->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorPointFill.get(); - p->box->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorPointOutline.get(); - p->box->property_outline_pixels() = 1; + p->box = new ArdourCanvas::Rectangle (canvas->root()); + p->box->set_fill (true); + p->box->set_fill_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorPointFill()); + p->box->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorPointOutline()); p->curve = fade[current].line; - p->box->signal_event().connect (sigc::bind (sigc::mem_fun (*this, &CrossfadeEditor::point_event), p)); + p->box->Event.connect (sigc::bind (sigc::mem_fun (*this, &CrossfadeEditor::point_event), p)); return p; } @@ -520,11 +515,7 @@ CrossfadeEditor::Point::move_to (double nx, double ny, double xfract, double yfr double x1 = nx - half_size; double x2 = nx + half_size; - box->property_x1() = x1; - box->property_x2() = x2; - - box->property_y1() = ny - half_size; - box->property_y2() = ny + half_size; + box->set (ArdourCanvas::Rect (x1, ny - half_size, x2, ny + half_size)); x = xfract; y = yfract; @@ -534,15 +525,20 @@ void CrossfadeEditor::canvas_allocation (Gtk::Allocation& /*alloc*/) { if (toplevel) { - toplevel->property_x1() = 0.0; - toplevel->property_y1() = 0.0; - toplevel->property_x2() = (double) canvas->get_allocation().get_width() + canvas_border; - toplevel->property_y2() = (double) canvas->get_allocation().get_height() + canvas_border; + toplevel->set ( + ArdourCanvas::Rect ( + 0, + 0, + canvas->get_allocation().get_width() + canvas_border, + canvas->get_allocation().get_height() + canvas_border + ) + ); } - canvas->set_scroll_region (0.0, 0.0, - canvas->get_allocation().get_width(), - canvas->get_allocation().get_height()); + /* XXX: CANVAS */ +// canvas->set_scroll_region (0.0, 0.0, +// canvas->get_allocation().get_width(), +// canvas->get_allocation().get_height()); Point* end = make_point (); PointSorter cmp; @@ -622,9 +618,9 @@ CrossfadeEditor::canvas_allocation (Gtk::Allocation& /*alloc*/) yoff = n * ht; - (*i)->property_y() = yoff; - (*i)->property_height() = ht; - (*i)->property_samples_per_unit() = spu; + (*i)->set_y_position (yoff); + (*i)->set_height (ht); + (*i)->set_samples_per_pixel (spu); } ht = canvas->get_allocation().get_height() / xfade->out()->n_channels(); @@ -634,9 +630,9 @@ CrossfadeEditor::canvas_allocation (Gtk::Allocation& /*alloc*/) yoff = n * ht; - (*i)->property_y() = yoff; - (*i)->property_height() = ht; - (*i)->property_samples_per_unit() = spu; + (*i)->set_y_position (yoff); + (*i)->set_height (ht); + (*i)->set_samples_per_pixel (spu); } } @@ -681,11 +677,11 @@ CrossfadeEditor::redraw () ArdourCanvas::Points spts; while (pts.size() < npoints) { - pts.push_back (Gnome::Art::Point (0,0)); + pts.push_back (ArdourCanvas::Duple (0,0)); } while (spts.size() < npoints + 3) { - spts.push_back (Gnome::Art::Point (0,0)); + spts.push_back (ArdourCanvas::Duple (0,0)); } /* the shade coordinates *MUST* be in anti-clockwise order. @@ -695,36 +691,36 @@ CrossfadeEditor::redraw () /* lower left */ - spts[0].set_x (canvas_border); - spts[0].set_y (effective_height() + canvas_border); + spts[0].x = canvas_border; + spts[0].y = effective_height() + canvas_border; /* lower right */ - spts[1].set_x (effective_width() + canvas_border); - spts[1].set_y (effective_height() + canvas_border); + spts[1].x = effective_width() + canvas_border; + spts[1].y = effective_height() + canvas_border; /* upper right */ - spts[2].set_x (effective_width() + canvas_border); - spts[2].set_y (canvas_border); + spts[2].x = effective_width() + canvas_border; + spts[2].y = canvas_border; } else { /* upper left */ - spts[0].set_x (canvas_border); - spts[0].set_y (canvas_border); + spts[0].x = canvas_border; + spts[0].y = canvas_border; /* lower left */ - spts[1].set_x (canvas_border); - spts[1].set_y (effective_height() + canvas_border); + spts[1].x = canvas_border; + spts[1].y = effective_height() + canvas_border; /* lower right */ - spts[2].set_x (effective_width() + canvas_border); - spts[2].set_y (effective_height() + canvas_border); + spts[2].x = effective_width() + canvas_border; + spts[2].y = effective_height() + canvas_border; } @@ -734,15 +730,15 @@ CrossfadeEditor::redraw () double y = vec[i]; - pts[i].set_x (canvas_border + i); - pts[i].set_y (y_coordinate (y)); + pts[i].x = canvas_border + i; + pts[i].y = y_coordinate (y); - spts[last_spt - i].set_x (canvas_border + i); - spts[last_spt - i].set_y (pts[i].get_y()); + spts[last_spt - i].x = canvas_border + i; + spts[last_spt - i].y = pts[i].y; } - fade[current].line->property_points() = pts; - fade[current].shading->property_points() = spts; + fade[current].line->set (pts); + fade[current].shading->set (pts); for (vector<ArdourCanvas::WaveView*>::iterator i = fade[current].waves.begin(); i != fade[current].waves.end(); ++i) { (*i)->property_gain_src() = static_cast<Evoral::Curve*>(&fade[current].gain_curve.curve()); @@ -1069,17 +1065,17 @@ CrossfadeEditor::curve_select_clicked (WhichFade wf) if (wf == In) { for (vector<ArdourCanvas::WaveView*>::iterator i = fade[In].waves.begin(); i != fade[In].waves.end(); ++i) { - (*i)->property_wave_color() = ARDOUR_UI::config()->canvasvar_SelectedCrossfadeEditorWave.get(); - (*i)->property_fill_color() = ARDOUR_UI::config()->canvasvar_SelectedCrossfadeEditorWave.get(); + (*i)->set_outline_color (ARDOUR_UI::config()->get_canvasvar_SelectedCrossfadeEditorWave()); + (*i)->set_fill_color (ARDOUR_UI::config()->get_canvasvar_SelectedCrossfadeEditorWave()); } for (vector<ArdourCanvas::WaveView*>::iterator i = fade[Out].waves.begin(); i != fade[Out].waves.end(); ++i) { - (*i)->property_wave_color() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorWave.get(); - (*i)->property_fill_color() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorWave.get(); + (*i)->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorWave()); + (*i)->set_fill_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorWave()); } - fade[In].line->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_SelectedCrossfadeEditorLine.get(); - fade[Out].line->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorLine.get(); + fade[In].line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_SelectedCrossfadeEditorLine()); + fade[Out].line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorLine()); fade[Out].shading->hide(); fade[In].shading->show(); @@ -1094,17 +1090,17 @@ CrossfadeEditor::curve_select_clicked (WhichFade wf) } else { for (vector<ArdourCanvas::WaveView*>::iterator i = fade[In].waves.begin(); i != fade[In].waves.end(); ++i) { - (*i)->property_wave_color() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorWave.get(); - (*i)->property_fill_color() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorWave.get(); + (*i)->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorWave()); + (*i)->set_fill_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorWave()); } for (vector<ArdourCanvas::WaveView*>::iterator i = fade[Out].waves.begin(); i != fade[Out].waves.end(); ++i) { - (*i)->property_wave_color() = ARDOUR_UI::config()->canvasvar_SelectedCrossfadeEditorWave.get(); - (*i)->property_fill_color() = ARDOUR_UI::config()->canvasvar_SelectedCrossfadeEditorWave.get(); + (*i)->set_outline_color (ARDOUR_UI::config()->get_canvasvar_SelectedCrossfadeEditorWave()); + (*i)->set_fill_color (ARDOUR_UI::config()->get_canvasvar_SelectedCrossfadeEditorWave()); } - fade[Out].line->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_SelectedCrossfadeEditorLine.get(); - fade[In].line->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorLine.get(); + fade[Out].line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_SelectedCrossfadeEditorLine()); + fade[In].line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorLine()); fade[In].shading->hide(); fade[Out].shading->show(); @@ -1146,9 +1142,9 @@ CrossfadeEditor::make_waves (boost::shared_ptr<AudioRegion> region, WhichFade wh double spu; if (which == In) { - color = ARDOUR_UI::config()->canvasvar_SelectedCrossfadeEditorWave.get(); + color = ARDOUR_UI::config()->get_canvasvar_SelectedCrossfadeEditorWave(); } else { - color = ARDOUR_UI::config()->canvasvar_CrossfadeEditorWave.get(); + color = ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorWave(); } ht = canvas->get_allocation().get_height() / (double) nchans; @@ -1162,29 +1158,22 @@ CrossfadeEditor::make_waves (boost::shared_ptr<AudioRegion> region, WhichFade wh gdouble yoff = n * ht; if (region->audio_source(n)->peaks_ready (boost::bind (&CrossfadeEditor::peaks_ready, this, boost::weak_ptr<AudioRegion>(region), which), &_peaks_ready_connection, gui_context())) { - WaveView* waveview = new WaveView (*(canvas->root())); - - waveview->property_data_src() = region.get(); - waveview->property_cache_updater() = true; - waveview->property_cache() = WaveView::create_cache(); - waveview->property_channel() = n; - waveview->property_length_function() = (void*) region_length_from_c; - waveview->property_sourcefile_length_function() = (void*) sourcefile_length_from_c; - waveview->property_peak_function() = (void*) region_read_peaks_from_c; + ArdourCanvas::WaveView* waveview = new ArdourCanvas::WaveView (canvas->root(), region); + + waveview->set_channel (n); waveview->property_gain_function() = (void*) curve_get_vector_from_c; waveview->property_gain_src() = static_cast<Evoral::Curve*>(&fade[which].gain_curve.curve()); - waveview->property_x() = canvas_border; - waveview->property_y() = yoff; - waveview->property_height() = ht; - waveview->property_samples_per_unit() = spu; + waveview->set_x_position (canvas_border); + waveview->set_y_position (yoff); + waveview->set_height (ht); + waveview->set_samples_per_pixel (spu); waveview->property_amplitude_above_axis() = 2.0; - waveview->property_wave_color() = color; - waveview->property_fill_color() = color; + waveview->set_outline_color (color); + waveview->set_fill_color (color); - if (which==In) - waveview->property_region_start() = region->start(); - else - waveview->property_region_start() = region->start()+region->length()-xfade->length(); + if (which != In) { + waveview->set_region_start (region->start() + region->length() - xfade->length()); + } waveview->lower_to_bottom(); fade[which].waves.push_back (waveview); |