X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fcrossfade_edit.cc;h=8e9c4f07dd15b9b362dce7539922e1e5e85f704d;hb=078151e4d43d83e13bad142d6b609db6ce6c5f8f;hp=5c9485fef244767fa685fc3e5c7717b901f1a48e;hpb=14d43ca9fe28a8309b4a52fa85e2b0c64a92248b;p=ardour.git diff --git a/gtk2_ardour/crossfade_edit.cc b/gtk2_ardour/crossfade_edit.cc index 5c9485fef2..8e9c4f07dd 100644 --- a/gtk2_ardour/crossfade_edit.cc +++ b/gtk2_ardour/crossfade_edit.cc @@ -15,7 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #include @@ -23,30 +22,36 @@ #include #include -#include +#include #include +#include + #include #include #include #include #include #include +#include #include +#include #include #include "ardour_ui.h" #include "crossfade_edit.h" #include "rgb_macros.h" -#include "canvas-simplerect.h" -#include "canvas-waveview.h" #include "keyboard.h" #include "utils.h" #include "gui_thread.h" +#include "canvas_impl.h" +#include "simplerect.h" +#include "waveview.h" using namespace std; using namespace ARDOUR; +using namespace PBD; using namespace Gtk; using namespace sigc; using namespace Editing; @@ -58,19 +63,15 @@ const double CrossfadeEditor::canvas_border = 10; CrossfadeEditor::Presets* CrossfadeEditor::fade_in_presets = 0; CrossfadeEditor::Presets* CrossfadeEditor::fade_out_presets = 0; -#include "crossfade_xpms.h" - CrossfadeEditor::Half::Half () : line (0), - normative_curve (0.0, 1.0, 1.0, true), - gain_curve (0.0, 2.0, 1.0, true) + normative_curve (Parameter(GainAutomation), 0.0, 1.0, 1.0), // FIXME: GainAutomation? + gain_curve (Parameter(GainAutomation), 0.0, 2.0, 1.0) { } -CrossfadeEditor::CrossfadeEditor (Session& s, Crossfade& xf, double my, double mxy) - : ArdourDialog (_("crossfade editor")), - cancel_button (_("Cancel")), - ok_button (_("OK")), +CrossfadeEditor::CrossfadeEditor (Session& s, boost::shared_ptr xf, double my, double mxy) + : ArdourDialog (_("ardour: x-fade edit")), xfade (xf), session (s), clear_button (_("Clear")), @@ -93,18 +94,23 @@ CrossfadeEditor::CrossfadeEditor (Session& s, Crossfade& xf, double my, double m select_in_button (_("Fade In")), select_out_button (_("Fade Out")) { - set_wmclass ("ardour_automationedit", "Ardour"); + set_wmclass (X_("ardour_automationedit"), "Ardour"); set_name ("CrossfadeEditWindow"); - set_title (_("ardour: x-fade edit")); set_position (Gtk::WIN_POS_MOUSE); - add (vpacker); add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::POINTER_MOTION_MASK); - select_out_button.set_group (select_in_button.group()); + RadioButtonGroup sel_but_group = select_in_button.get_group(); + select_out_button.set_group (sel_but_group); select_out_button.set_mode (false); select_in_button.set_mode (false); + get_action_area()->set_layout(BUTTONBOX_SPREAD); + get_action_area()->pack_start(clear_button); + get_action_area()->pack_start(revert_button); + cancel_button = add_button ("Cancel", RESPONSE_CANCEL); + ok_button = add_button ("OK", RESPONSE_ACCEPT); + if (fade_in_presets == 0) { build_presets (); } @@ -112,71 +118,38 @@ CrossfadeEditor::CrossfadeEditor (Session& s, Crossfade& xf, double my, double m point_grabbed = false; toplevel = 0; - _canvas = gnome_canvas_new_aa (); - - canvas = wrap (_canvas); - canvas->size_allocate.connect (mem_fun(*this, &CrossfadeEditor::canvas_allocation)); + canvas = new ArdourCanvas::CanvasAA (); + canvas->signal_size_allocate().connect (mem_fun(*this, &CrossfadeEditor::canvas_allocation)); canvas->set_size_request (425, 200); - - toplevel = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS(_canvas)), - gnome_canvas_simplerect_get_type(), - "x1", 0.0, - "y1", 0.0, - "x2", 10.0, - "y2", 10.0, - "fill", (gboolean) TRUE, - "fill_color_rgba", (guint32) color_map[cCrossfadeEditorBase], - "outline_pixels", 0, - NULL); - - gtk_signal_connect (GTK_OBJECT(toplevel), - "event", - (GtkSignalFunc) _canvas_event, - this); - - fade[Out].line = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS(_canvas)), - gnome_canvas_line_get_type (), - "width_pixels", (guint) 1, - "fill_color_rgba", color_map[cCrossfadeEditorLine], - NULL); - - fade[Out].shading = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS(_canvas)), - gnome_canvas_polygon_get_type(), - "fill_color_rgba", color_map[cCrossfadeEditorLineShading], - NULL); - fade[In].line = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS(_canvas)), - gnome_canvas_line_get_type (), - "width_pixels", (guint) 1, - "fill_color_rgba", color_map[cCrossfadeEditorLine], - NULL); + 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 (mem_fun (*this, &CrossfadeEditor::canvas_event)); - fade[In].shading = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS(_canvas)), - gnome_canvas_polygon_get_type(), - "fill_color_rgba", color_map[cCrossfadeEditorLineShading], - NULL); - - gtk_signal_connect (GTK_OBJECT(fade[In].shading), - "event", - (GtkSignalFunc) _canvas_event, - this); - - - gtk_signal_connect (GTK_OBJECT(fade[Out].shading), - "event", - (GtkSignalFunc) _canvas_event, - this); - - gtk_signal_connect (GTK_OBJECT(fade[In].line), - "event", - (GtkSignalFunc) _curve_event, - this); - - gtk_signal_connect (GTK_OBJECT(fade[Out].line), - "event", - (GtkSignalFunc) _curve_event, - this); + 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].shading = new ArdourCanvas::Polygon (*(canvas->root())); + fade[Out].shading->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorLineShading.get(); + 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].shading = new ArdourCanvas::Polygon (*(canvas->root())); + fade[In].shading->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorLineShading.get(); + + fade[In].shading->signal_event().connect (mem_fun (*this, &CrossfadeEditor::canvas_event)); + fade[In].line->signal_event().connect (mem_fun (*this, &CrossfadeEditor::curve_event)); + fade[Out].shading->signal_event().connect (mem_fun (*this, &CrossfadeEditor::canvas_event)); + fade[Out].line->signal_event().connect (mem_fun (*this, &CrossfadeEditor::curve_event)); select_in_button.set_name (X_("CrossfadeEditCurveButton")); select_out_button.set_name (X_("CrossfadeEditCurveButton")); @@ -209,7 +182,7 @@ CrossfadeEditor::CrossfadeEditor (Session& s, Crossfade& xf, double my, double m fade_in_table.attach (select_in_button, 0, 2, 0, 1, Gtk::FILL|Gtk::EXPAND); fade_out_table.attach (select_out_button, 0, 2, 0, 1, Gtk::FILL|Gtk::EXPAND); - Pixmap *pxmap; + Image *pxmap; Button* pbutton; int row; int col; @@ -219,11 +192,11 @@ CrossfadeEditor::CrossfadeEditor (Session& s, Crossfade& xf, double my, double m for (list::iterator i = fade_in_presets->begin(); i != fade_in_presets->end(); ++i) { - pxmap = manage (new Pixmap ((*i)->xpm)); + pxmap = manage (new Image (::get_icon ((*i)->image_name))); pbutton = manage (new Button); pbutton->add (*pxmap); pbutton->set_name ("CrossfadeEditButton"); - pbutton-.signal_clicked().connect (bind (mem_fun(*this, &CrossfadeEditor::apply_preset), *i)); + pbutton->signal_clicked().connect (bind (mem_fun(*this, &CrossfadeEditor::apply_preset), *i)); fade_in_table.attach (*pbutton, col, col+1, row, row+1); fade_in_buttons.push_back (pbutton); @@ -240,11 +213,11 @@ CrossfadeEditor::CrossfadeEditor (Session& s, Crossfade& xf, double my, double m for (list::iterator i = fade_out_presets->begin(); i != fade_out_presets->end(); ++i) { - pxmap = manage (new Pixmap ((*i)->xpm)); + pxmap = manage (new Image (::get_icon ((*i)->image_name))); pbutton = manage (new Button); pbutton->add (*pxmap); pbutton->set_name ("CrossfadeEditButton"); - pbutton-.signal_clicked().connect (bind (mem_fun(*this, &CrossfadeEditor::apply_preset), *i)); + pbutton->signal_clicked().connect (bind (mem_fun(*this, &CrossfadeEditor::apply_preset), *i)); fade_out_table.attach (*pbutton, col, col+1, row, row+1); fade_out_buttons.push_back (pbutton); @@ -258,8 +231,8 @@ CrossfadeEditor::CrossfadeEditor (Session& s, Crossfade& xf, double my, double m clear_button.set_name ("CrossfadeEditButton"); revert_button.set_name ("CrossfadeEditButton"); - ok_button.set_name ("CrossfadeEditButton"); - cancel_button.set_name ("CrossfadeEditButton"); + ok_button->set_name ("CrossfadeEditButton"); + cancel_button->set_name ("CrossfadeEditButton"); preroll_button.set_name ("CrossfadeEditButton"); postroll_button.set_name ("CrossfadeEditButton"); audition_both_button.set_name ("CrossfadeEditAuditionButton"); @@ -270,26 +243,11 @@ CrossfadeEditor::CrossfadeEditor (Session& s, Crossfade& xf, double my, double m clear_button.signal_clicked().connect (mem_fun(*this, &CrossfadeEditor::clear)); revert_button.signal_clicked().connect (mem_fun(*this, &CrossfadeEditor::reset)); - audition_both_button.toggled.connect (mem_fun(*this, &CrossfadeEditor::audition_toggled)); - audition_right_button.toggled.connect (mem_fun(*this, &CrossfadeEditor::audition_right_toggled)); - audition_right_dry_button.toggled.connect (mem_fun(*this, &CrossfadeEditor::audition_right_dry_toggled)); - audition_left_button.toggled.connect (mem_fun(*this, &CrossfadeEditor::audition_left_toggled)); - audition_left_dry_button.toggled.connect (mem_fun(*this, &CrossfadeEditor::audition_left_dry_toggled)); - - action_box.set_border_width (7); - action_box.set_spacing (5); - action_box.set_homogeneous (false); - action_box.pack_end (cancel_button, false, false); - action_box.pack_end (ok_button, false, false); - action_box.pack_end (revert_button, false, false); - action_box.pack_end (clear_button, false, false); - - Frame* edit_frame = manage (new Frame (_("Edit"))); - edit_frame->set_name (X_("CrossfadeEditFrame")); - edit_frame->add (action_box); - - Gtk::HBox* action_center_box = manage (new HBox); - action_center_box->pack_start (*edit_frame, true, false); + audition_both_button.signal_toggled().connect (mem_fun(*this, &CrossfadeEditor::audition_toggled)); + audition_right_button.signal_toggled().connect (mem_fun(*this, &CrossfadeEditor::audition_right_toggled)); + audition_right_dry_button.signal_toggled().connect (mem_fun(*this, &CrossfadeEditor::audition_right_dry_toggled)); + audition_left_button.signal_toggled().connect (mem_fun(*this, &CrossfadeEditor::audition_left_toggled)); + audition_left_dry_button.signal_toggled().connect (mem_fun(*this, &CrossfadeEditor::audition_left_dry_toggled)); roll_box.pack_start (preroll_button, false, false); roll_box.pack_start (postroll_button, false, false); @@ -303,17 +261,14 @@ CrossfadeEditor::CrossfadeEditor (Session& s, Crossfade& xf, double my, double m vpacker2->set_spacing (7); vpacker2->pack_start (*acbox, false, false); vpacker2->pack_start (*rcenter_box, false, false); - vpacker2->pack_start (*action_center_box, false, false); curve_button_box.set_spacing (7); curve_button_box.pack_start (fade_out_table, false, false, 12); curve_button_box.pack_start (*vpacker2, false, false, 12); curve_button_box.pack_start (fade_in_table, false, false, 12); - vpacker.set_border_width (12); - vpacker.set_spacing (5); - vpacker.pack_start (*canvas_frame, true, true); - vpacker.pack_start (curve_button_box, false, false); + get_vbox()->pack_start (*canvas_frame, true, true); + get_vbox()->pack_start (curve_button_box, false, false); /* button to allow hackers to check the actual curve values */ @@ -322,16 +277,17 @@ CrossfadeEditor::CrossfadeEditor (Session& s, Crossfade& xf, double my, double m // vpacker.pack_start (*foobut, false, false); current = In; - set (xfade.fade_in(), In); + set (xfade->fade_in(), In); current = Out; - set (xfade.fade_out(), Out); + set (xfade->fade_out(), Out); curve_select_clicked (In); - xfade.StateChanged.connect (mem_fun(*this, &CrossfadeEditor::xfade_changed)); + xfade->StateChanged.connect (mem_fun(*this, &CrossfadeEditor::xfade_changed)); session.AuditionActive.connect (mem_fun(*this, &CrossfadeEditor::audition_state_changed)); + show_all_children(); } CrossfadeEditor::~CrossfadeEditor() @@ -370,10 +326,10 @@ CrossfadeEditor::audition_state_changed (bool yn) } void -CrossfadeEditor::set (const ARDOUR::Curve& curve, WhichFade which) +CrossfadeEditor::set (const ARDOUR::AutomationList& curve, WhichFade which) { double firstx, endx; - ARDOUR::Curve::const_iterator the_end; + ARDOUR::AutomationList::const_iterator the_end; for (list::iterator i = fade[which].points.begin(); i != fade[which].points.end(); ++i) { delete *i; @@ -393,7 +349,7 @@ CrossfadeEditor::set (const ARDOUR::Curve& curve, WhichFade which) firstx = (*curve.const_begin())->when; endx = (*the_end)->when; - for (ARDOUR::Curve::const_iterator i = curve.const_begin(); i != curve.const_end(); ++i) { + for (ARDOUR::AutomationList::const_iterator i = curve.const_begin(); i != curve.const_end(); ++i) { double xfract = ((*i)->when - firstx) / (endx - firstx); double yfract = ((*i)->value - miny) / (maxy - miny); @@ -415,15 +371,63 @@ CrossfadeEditor::set (const ARDOUR::Curve& curve, WhichFade which) swap (which, current); } -gint -CrossfadeEditor::_canvas_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) +bool +CrossfadeEditor::curve_event (GdkEvent* event) +{ + /* treat it like a toplevel event */ + + return canvas_event (event); +} + +bool +CrossfadeEditor::point_event (GdkEvent* event, Point* point) { - CrossfadeEditor* ed = static_cast (data); - return ed->canvas_event (item, event); + + if (point->curve != fade[current].line) { + return FALSE; + } + + switch (event->type) { + case GDK_BUTTON_PRESS: + point_grabbed = true; + break; + case GDK_BUTTON_RELEASE: + point_grabbed = false; + + if (Keyboard::is_delete_event (&event->button)) { + fade[current].points.remove (point); + delete point; + } + + redraw (); + break; + + case GDK_MOTION_NOTIFY: + if (point_grabbed) { + double new_x, new_y; + + /* can't drag first or last points horizontally */ + + if (point == fade[current].points.front() || point == fade[current].points.back()) { + new_x = point->x; + } else { + new_x = (event->motion.x - canvas_border)/effective_width(); + } + + new_y = 1.0 - ((event->motion.y - canvas_border)/effective_height()); + point->move_to (x_coordinate (new_x), y_coordinate (new_y), + new_x, new_y); + redraw (); + } + break; + default: + break; + } + return TRUE; } -gint -CrossfadeEditor::canvas_event (GnomeCanvasItem* item, GdkEvent* event) +bool +CrossfadeEditor::canvas_event (GdkEvent* event) { switch (event->type) { case GDK_BUTTON_PRESS: @@ -439,7 +443,7 @@ CrossfadeEditor::canvas_event (GnomeCanvasItem* item, GdkEvent* event) CrossfadeEditor::Point::~Point() { - gtk_object_destroy (GTK_OBJECT(box)); + delete box; } CrossfadeEditor::Point* @@ -447,20 +451,15 @@ CrossfadeEditor::make_point () { Point* p = new Point; - p->box = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS(_canvas)), - gnome_canvas_simplerect_get_type(), - "fill", (gboolean) TRUE, - "fill_color_rgba", color_map[cCrossfadeEditorPointFill], - "outline_color_rgba", color_map[cCrossfadeEditorPointOutline], - "outline_pixels", (gint) 1, - NULL); + 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->curve = fade[current].line; - gtk_object_set_data (GTK_OBJECT(p->box), "point", p); - gtk_signal_connect (GTK_OBJECT(p->box), "event", - (GtkSignalFunc) _point_event, - this); + p->box->signal_event().connect (bind (mem_fun (*this, &CrossfadeEditor::point_event), p)); return p; } @@ -495,31 +494,29 @@ CrossfadeEditor::Point::move_to (double nx, double ny, double xfract, double yfr double x1 = nx - half_size; double x2 = nx + half_size; - gnome_canvas_item_set (box, - "x1", x1, - "x2", x2, - "y1", ny - half_size, - "y2", ny + half_size, - NULL); + box->property_x1() = x1; + box->property_x2() = x2; + + box->property_y1() = ny - half_size; + box->property_y2() = ny + half_size; + x = xfract; y = yfract; } void -CrossfadeEditor::canvas_allocation (GtkAllocation *alloc) +CrossfadeEditor::canvas_allocation (Gtk::Allocation& alloc) { if (toplevel) { - gnome_canvas_item_set (toplevel, - "x1", 0.0, - "y1", 0.0, - "x2", (double) _canvas->allocation.width + canvas_border, - "y2", (double) _canvas->allocation.height + canvas_border, - NULL); + 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; } - - gnome_canvas_set_scroll_region (GNOME_CANVAS(_canvas), 0.0, 0.0, - _canvas->allocation.width, - _canvas->allocation.height); + + canvas->set_scroll_region (0.0, 0.0, + canvas->get_allocation().get_width(), + canvas->get_allocation().get_height()); Point* end = make_point (); PointSorter cmp; @@ -578,135 +575,62 @@ CrossfadeEditor::canvas_allocation (GtkAllocation *alloc) redraw (); current = old_current; - double spu = xfade.length() / (double) effective_width(); + double spu = xfade->length() / (double) effective_width(); if (fade[In].waves.empty()) { - make_waves (xfade.in(), In); + make_waves (xfade->in(), In); } if (fade[Out].waves.empty()) { - make_waves (xfade.out(), Out); + make_waves (xfade->out(), Out); } double ht; - vector::iterator i; + vector::iterator i; uint32_t n; - ht = _canvas->allocation.height / xfade.in().n_channels(); + ht = canvas->get_allocation().get_height() / xfade->in()->n_channels(); for (n = 0, i = fade[In].waves.begin(); i != fade[In].waves.end(); ++i, ++n) { double yoff; yoff = n * ht; - gnome_canvas_item_set ((*i), - "y", yoff, - "height", ht, - "samples_per_unit", spu, - NULL); + (*i)->property_y() = yoff; + (*i)->property_height() = ht; + (*i)->property_samples_per_unit() = spu; } - ht = _canvas->allocation.height / xfade.out().n_channels(); + ht = canvas->get_allocation().get_height() / xfade->out()->n_channels(); for (n = 0, i = fade[Out].waves.begin(); i != fade[Out].waves.end(); ++i, ++n) { double yoff; yoff = n * ht; - gnome_canvas_item_set ((*i), - "y", yoff, - "height", ht, - "samples_per_unit", spu, - NULL); + (*i)->property_y() = yoff; + (*i)->property_height() = ht; + (*i)->property_samples_per_unit() = spu; } } -gint -CrossfadeEditor::_point_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) -{ - CrossfadeEditor* ed = static_cast (data); - return ed->point_event (item, event); -} - -gint -CrossfadeEditor::point_event (GnomeCanvasItem* item, GdkEvent* event) -{ - Point* point = static_cast (gtk_object_get_data (GTK_OBJECT (item), "point")); - - if (point->curve != fade[current].line) { - return FALSE; - } - - switch (event->type) { - case GDK_BUTTON_PRESS: - point_grabbed = true; - break; - case GDK_BUTTON_RELEASE: - point_grabbed = false; - - if (Keyboard::is_delete_event (&event->button)) { - fade[current].points.remove (point); - delete point; - } - - redraw (); - break; - - case GDK_MOTION_NOTIFY: - if (point_grabbed) { - double new_x, new_y; - - /* can't drag first or last points horizontally */ - - if (point == fade[current].points.front() || point == fade[current].points.back()) { - new_x = point->x; - } else { - new_x = (event->motion.x - canvas_border)/effective_width(); - } - - new_y = 1.0 - ((event->motion.y - canvas_border)/effective_height()); - point->move_to (x_coordinate (new_x), y_coordinate (new_y), - new_x, new_y); - redraw (); - } - break; - default: - break; - } - return TRUE; -} - -gint -CrossfadeEditor::_curve_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) -{ - CrossfadeEditor* ed = static_cast (data); - return ed->curve_event (item, event); -} - -gint -CrossfadeEditor::curve_event (GnomeCanvasItem* item, GdkEvent* event) -{ - /* treat it like a toplevel event */ - - return canvas_event (item, event); -} void CrossfadeEditor::xfade_changed (Change ignored) { - set (xfade.fade_in(), In); - set (xfade.fade_out(), Out); + set (xfade->fade_in(), In); + set (xfade->fade_out(), Out); } void CrossfadeEditor::redraw () { - if (_canvas->allocation.width < 2) { + if (canvas->get_allocation().get_width() < 2) { return; } - jack_nframes_t len = xfade.length (); + nframes_t len = xfade->length (); fade[current].normative_curve.clear (); fade[current].gain_curve.clear (); @@ -719,10 +643,18 @@ CrossfadeEditor::redraw () size_t npoints = (size_t) effective_width(); float vec[npoints]; - fade[current].normative_curve.get_vector (0, 1.0, vec, npoints); + fade[current].normative_curve.curve().get_vector (0, 1.0, vec, npoints); - GnomeCanvasPoints* pts = get_canvas_points ("xfade edit1", npoints); - GnomeCanvasPoints* spts = get_canvas_points ("xfade edit2", npoints + 3); + ArdourCanvas::Points pts; + ArdourCanvas::Points spts; + + while (pts.size() < npoints) { + pts.push_back (Gnome::Art::Point (0,0)); + } + + while (spts.size() < npoints + 3) { + spts.push_back (Gnome::Art::Point (0,0)); + } /* the shade coordinates *MUST* be in anti-clockwise order. */ @@ -731,66 +663,77 @@ CrossfadeEditor::redraw () /* lower left */ - spts->coords[0] = canvas_border; - spts->coords[1] = effective_height() + canvas_border; + spts[0].set_x (canvas_border); + spts[0].set_y (effective_height() + canvas_border); /* lower right */ - spts->coords[2] = effective_width() + canvas_border; - spts->coords[3] = effective_height() + canvas_border; + spts[1].set_x (effective_width() + canvas_border); + spts[1].set_y (effective_height() + canvas_border); /* upper right */ - spts->coords[4] = effective_width() + canvas_border; - spts->coords[5] = canvas_border; + spts[2].set_x (effective_width() + canvas_border); + spts[2].set_y (canvas_border); } else { /* upper left */ - spts->coords[0] = canvas_border; - spts->coords[1] = canvas_border; + spts[0].set_x (canvas_border); + spts[0].set_y (canvas_border); /* lower left */ - spts->coords[2] = canvas_border; - spts->coords[3] = effective_height() + canvas_border; + spts[1].set_x (canvas_border); + spts[1].set_y (effective_height() + canvas_border); /* lower right */ - spts->coords[4] = effective_width() + canvas_border; - spts->coords[5] = effective_height() + canvas_border; + spts[2].set_x (effective_width() + canvas_border); + spts[2].set_y (effective_height() + canvas_border); } - size_t last_spt = ((npoints + 3) * 2) - 2; + size_t last_spt = (npoints + 3) - 1; for (size_t i = 0; i < npoints; ++i) { double y = vec[i]; - pts->coords[i*2] = canvas_border + i; - pts->coords[(i*2)+1] = y_coordinate (y); + pts[i].set_x (canvas_border + i); + pts[i].set_y (y_coordinate (y)); - spts->coords[last_spt - (i*2)] = canvas_border + i; - spts->coords[last_spt - (i*2) + 1] = pts->coords[(i*2)+1]; + spts[last_spt - i].set_x (canvas_border + i); + spts[last_spt - i].set_y (pts[i].get_y()); } - gnome_canvas_item_set (fade[current].line, "points", pts, NULL); - gnome_canvas_item_set (fade[current].shading, "points", spts, NULL); - - gnome_canvas_points_unref (pts); - gnome_canvas_points_unref (spts); + fade[current].line->property_points() = pts; + fade[current].shading->property_points() = spts; - for (vector::iterator i = fade[current].waves.begin(); i != fade[current].waves.end(); ++i) { - gnome_canvas_item_set ((*i), "gain_src", &fade[current].gain_curve, NULL); + for (vector::iterator i = fade[current].waves.begin(); i != fade[current].waves.end(); ++i) { + (*i)->property_gain_src() = &fade[current].gain_curve; } } void CrossfadeEditor::apply_preset (Preset *preset) { + + WhichFade wf = find(fade_in_presets->begin(), fade_in_presets->end(), preset) != fade_in_presets->end() ? In : Out; + + if (current != wf) { + + if (wf == In) { + select_in_button.clicked(); + } else { + select_out_button.clicked(); + } + + curve_select_clicked (wf); + } + for (list::iterator i = fade[current].points.begin(); i != fade[current].points.end(); ++i) { delete *i; } @@ -810,19 +753,19 @@ CrossfadeEditor::apply_preset (Preset *preset) void CrossfadeEditor::apply () { - _apply_to (&xfade); + _apply_to (xfade); } void -CrossfadeEditor::_apply_to (Crossfade* xf) +CrossfadeEditor::_apply_to (boost::shared_ptr xf) { - ARDOUR::Curve& in (xf->fade_in()); - ARDOUR::Curve& out (xf->fade_out()); + ARDOUR::AutomationList& in (xf->fade_in()); + ARDOUR::AutomationList& out (xf->fade_out()); /* IN */ - ARDOUR::Curve::const_iterator the_end = in.const_end(); + ARDOUR::AutomationList::const_iterator the_end = in.const_end(); --the_end; double firstx = (*in.begin())->when; @@ -865,12 +808,12 @@ CrossfadeEditor::_apply_to (Crossfade* xf) } void -CrossfadeEditor::setup (Crossfade* xfade) +CrossfadeEditor::setup (boost::shared_ptr xfade) { _apply_to (xfade); xfade->set_active (true); - xfade->fade_in().solve (); - xfade->fade_out().solve (); + xfade->fade_in().curve().solve (); + xfade->fade_out().curve().solve (); } void @@ -888,8 +831,10 @@ CrossfadeEditor::clear () void CrossfadeEditor::reset () { - set (xfade.fade_in(), In); - set (xfade.fade_out(), Out); + set (xfade->fade_in(), In); + set (xfade->fade_out(), Out); + + curve_select_clicked (current); } void @@ -901,8 +846,8 @@ CrossfadeEditor::build_presets () fade_out_presets = new Presets; /* FADE OUT */ - - p = new Preset (hiin_xpm); + // p = new Preset ("hiin.xpm"); + p = new Preset ("crossfade_in_fast-cut"); p->push_back (PresetPoint (0, 0)); p->push_back (PresetPoint (0.0207373, 0.197222)); p->push_back (PresetPoint (0.0645161, 0.525)); @@ -913,7 +858,8 @@ CrossfadeEditor::build_presets () p->push_back (PresetPoint (1, 1)); fade_in_presets->push_back (p); - p = new Preset (loin_xpm); + // p = new Preset ("loin.xpm"); + p = new Preset ("crossfade_in_transition"); p->push_back (PresetPoint (0, 0)); p->push_back (PresetPoint (0.389401, 0.0333333)); p->push_back (PresetPoint (0.629032, 0.0861111)); @@ -923,7 +869,8 @@ CrossfadeEditor::build_presets () p->push_back (PresetPoint (1, 1)); fade_in_presets->push_back (p); - p = new Preset (regin_xpm); + // p = new Preset ("regin.xpm"); + p = new Preset ("crossfade_in_constant"); p->push_back (PresetPoint (0, 0)); p->push_back (PresetPoint (0.0737327, 0.308333)); p->push_back (PresetPoint (0.246544, 0.658333)); @@ -933,7 +880,8 @@ CrossfadeEditor::build_presets () p->push_back (PresetPoint (1, 1)); fade_in_presets->push_back (p); - p = new Preset (regin2_xpm); + // p = new Preset ("regin2.xpm"); + p = new Preset ("crossfade_in_slow-cut"); p->push_back (PresetPoint (0, 0)); p->push_back (PresetPoint (0.304147, 0.0694444)); p->push_back (PresetPoint (0.529954, 0.152778)); @@ -943,14 +891,25 @@ CrossfadeEditor::build_presets () p->push_back (PresetPoint (1, 1)); fade_in_presets->push_back (p); - p = new Preset (linin_xpm); + // p = new Preset ("linin.xpm"); + p = new Preset ("crossfade_in_dipped"); p->push_back (PresetPoint (0, 0)); p->push_back (PresetPoint (1, 1)); fade_in_presets->push_back (p); + p = new Preset ("crossfade_in_default"); + p->push_back (PresetPoint (0, 0)); + p->push_back (PresetPoint (0.1, 0.01)); + p->push_back (PresetPoint (0.2, 0.03)); + p->push_back (PresetPoint (0.8, 0.97)); + p->push_back (PresetPoint (0.9, 0.99)); + p->push_back (PresetPoint (1, 1)); + fade_in_presets->push_back (p); + /* FADE OUT */ - p = new Preset (hiout_xpm); + // p = new Preset ("hiout.xpm"); + p = new Preset ("crossfade_out_fast-cut"); p->push_back (PresetPoint (0, 1)); p->push_back (PresetPoint (0.305556, 1)); p->push_back (PresetPoint (0.548611, 0.991736)); @@ -960,7 +919,8 @@ CrossfadeEditor::build_presets () p->push_back (PresetPoint (1, 0)); fade_out_presets->push_back (p); - p = new Preset (regout_xpm); + // p = new Preset ("regout.xpm"); + p = new Preset ("crossfade_out_constant"); p->push_back (PresetPoint (0, 1)); p->push_back (PresetPoint (0.228111, 0.988889)); p->push_back (PresetPoint (0.347926, 0.972222)); @@ -970,7 +930,8 @@ CrossfadeEditor::build_presets () p->push_back (PresetPoint (1, 0)); fade_out_presets->push_back (p); - p = new Preset (loout_xpm); + // p = new Preset ("loout.xpm"); + p = new Preset ("crossfade_out_transition"); p->push_back (PresetPoint (0, 1)); p->push_back (PresetPoint (0.023041, 0.697222)); p->push_back (PresetPoint (0.0553, 0.483333)); @@ -980,7 +941,8 @@ CrossfadeEditor::build_presets () p->push_back (PresetPoint (1, 0)); fade_out_presets->push_back (p); - p = new Preset (regout2_xpm); + // p = new Preset ("regout2.xpm"); + p = new Preset ("crossfade_out_slow-fade"); p->push_back (PresetPoint (0, 1)); p->push_back (PresetPoint (0.080645, 0.730556)); p->push_back (PresetPoint (0.277778, 0.289256)); @@ -989,8 +951,18 @@ CrossfadeEditor::build_presets () p->push_back (PresetPoint (1, 0)); fade_out_presets->push_back (p); - p = new Preset (linout_xpm); + // p = new Preset ("linout.xpm"); + p = new Preset ("crossfade_out_dipped"); + p->push_back (PresetPoint (0, 1)); + p->push_back (PresetPoint (1, 0)); + fade_out_presets->push_back (p); + + p = new Preset ("crossfade_out_default"); p->push_back (PresetPoint (0, 1)); + p->push_back (PresetPoint (0.1, 0.99)); + p->push_back (PresetPoint (0.2, 0.97)); + p->push_back (PresetPoint (0.8, 0.03)); + p->push_back (PresetPoint (0.9, 0.01)); p->push_back (PresetPoint (1, 0)); fade_out_presets->push_back (p); } @@ -999,67 +971,51 @@ void CrossfadeEditor::curve_select_clicked (WhichFade wf) { current = wf; - + if (wf == In) { - - for (vector::iterator i = fade[In].waves.begin(); i != fade[In].waves.end(); ++i) { - gnome_canvas_item_set ((*i), "wave_color", color_map[cSelectedCrossfadeEditorWave], NULL); + + for (vector::iterator i = fade[In].waves.begin(); i != fade[In].waves.end(); ++i) { + (*i)->property_wave_color() = ARDOUR_UI::config()->canvasvar_SelectedCrossfadeEditorWave.get(); } - for (vector::iterator i = fade[Out].waves.begin(); i != fade[Out].waves.end(); ++i) { - gnome_canvas_item_set ((*i), "wave_color", color_map[cCrossfadeEditorWave], NULL); + for (vector::iterator i = fade[Out].waves.begin(); i != fade[Out].waves.end(); ++i) { + (*i)->property_wave_color() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorWave.get(); } - gnome_canvas_item_set (fade[In].line, "fill_color_rgba", color_map[cSelectedCrossfadeEditorLine], NULL); - gnome_canvas_item_set (fade[Out].line, "fill_color_rgba", color_map[cCrossfadeEditorLine], NULL); - gnome_canvas_item_hide (fade[Out].shading); - gnome_canvas_item_show (fade[In].shading); + 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[Out].shading->hide(); + fade[In].shading->show(); for (list::iterator i = fade[Out].points.begin(); i != fade[Out].points.end(); ++i) { - gnome_canvas_item_hide ((*i)->box); + (*i)->box->hide(); } for (list::iterator i = fade[In].points.begin(); i != fade[In].points.end(); ++i) { - gnome_canvas_item_show ((*i)->box); - } - - for (vector::iterator i = fade_out_buttons.begin(); i != fade_out_buttons.end(); ++i) { - (*i)->set_sensitive (false); - } - - for (vector::iterator i = fade_in_buttons.begin(); i != fade_in_buttons.end(); ++i) { - (*i)->set_sensitive (true); + (*i)->box->show (); } } else { - for (vector::iterator i = fade[In].waves.begin(); i != fade[In].waves.end(); ++i) { - gnome_canvas_item_set ((*i), "wave_color", color_map[cCrossfadeEditorWave], NULL); + for (vector::iterator i = fade[In].waves.begin(); i != fade[In].waves.end(); ++i) { + (*i)->property_wave_color() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorWave.get(); } - for (vector::iterator i = fade[Out].waves.begin(); i != fade[Out].waves.end(); ++i) { - gnome_canvas_item_set ((*i), "wave_color", color_map[cSelectedCrossfadeEditorWave], NULL); + for (vector::iterator i = fade[Out].waves.begin(); i != fade[Out].waves.end(); ++i) { + (*i)->property_wave_color() = ARDOUR_UI::config()->canvasvar_SelectedCrossfadeEditorWave.get(); } - gnome_canvas_item_set (fade[Out].line, "fill_color_rgba", color_map[cSelectedCrossfadeEditorLine], NULL); - gnome_canvas_item_set (fade[In].line, "fill_color_rgba", color_map[cCrossfadeEditorLine], NULL); - gnome_canvas_item_hide (fade[In].shading); - gnome_canvas_item_show (fade[Out].shading); + 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[In].shading->hide(); + fade[Out].shading->show(); for (list::iterator i = fade[In].points.begin(); i != fade[In].points.end(); ++i) { - gnome_canvas_item_hide ((*i)->box); + (*i)->box->hide(); } for (list::iterator i = fade[Out].points.begin(); i != fade[Out].points.end(); ++i) { - gnome_canvas_item_show ((*i)->box); - } - - for (vector::iterator i = fade_out_buttons.begin(); i != fade_out_buttons.end(); ++i) { - (*i)->set_sensitive (true); - } - - for (vector::iterator i = fade_in_buttons.begin(); i != fade_in_buttons.end(); ++i) { - (*i)->set_sensitive (false); + (*i)->box->show(); } } @@ -1080,80 +1036,78 @@ CrossfadeEditor::y_coordinate (double& yfract) const yfract = min (1.0, yfract); yfract = max (0.0, yfract); - return (_canvas->allocation.height - (canvas_border)) - (yfract * effective_height()); + return (canvas->get_allocation().get_height() - (canvas_border)) - (yfract * effective_height()); } void -CrossfadeEditor::make_waves (AudioRegion& region, WhichFade which) +CrossfadeEditor::make_waves (boost::shared_ptr region, WhichFade which) { gdouble ht; - uint32_t nchans = region.n_channels(); + uint32_t nchans = region->n_channels(); guint32 color; double spu; if (which == In) { - color = color_map[cSelectedCrossfadeEditorWave]; + color = ARDOUR_UI::config()->canvasvar_SelectedCrossfadeEditorWave.get(); } else { - color = color_map[cCrossfadeEditorWave]; + color = ARDOUR_UI::config()->canvasvar_CrossfadeEditorWave.get(); } - ht = _canvas->allocation.height / (double) nchans; - spu = xfade.length() / (double) effective_width(); + ht = canvas->get_allocation().get_height() / (double) nchans; + spu = xfade->length() / (double) effective_width(); for (uint32_t n = 0; n < nchans; ++n) { gdouble yoff = n * ht; - if (region.source(n).peaks_ready (bind (mem_fun(*this, &CrossfadeEditor::peaks_ready), ®ion, which))) { + if (region->audio_source(n)->peaks_ready (bind (mem_fun(*this, &CrossfadeEditor::peaks_ready), region, which), peaks_ready_connection)) { + 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; + waveview->property_gain_function() = (void*) curve_get_vector_from_c; + waveview->property_gain_src() = &fade[which].gain_curve; + waveview->property_x() = canvas_border; + waveview->property_y() = yoff; + waveview->property_height() = ht; + waveview->property_samples_per_unit() = spu; + waveview->property_amplitude_above_axis() = 2.0; + waveview->property_wave_color() = color; - GnomeCanvasItem *wave = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS(_canvas)), - gnome_canvas_waveview_get_type (), - "data_src", (gpointer) ®ion, - "cache_updater", (gboolean) TRUE, - "cache", gnome_canvas_waveview_cache_new (), - "channel", (guint32) n, - "length_function", (gpointer) region_length_from_c, - "sourcefile_length_function", (gpointer) sourcefile_length_from_c, - "peak_function", (gpointer) region_read_peaks_from_c, - "gain_function", (gpointer) curve_get_vector_from_c, - "gain_src", &fade[which].gain_curve, - "x", (double) canvas_border, - "y", yoff, - "height", ht, - "samples_per_unit", spu, - "amplitude_above_axis", 2.0, - "wave_color", color, - NULL); - - gnome_canvas_item_lower_to_bottom (wave); - fade[which].waves.push_back (wave); + waveview->lower_to_bottom(); + fade[which].waves.push_back (waveview); } } - gnome_canvas_item_lower_to_bottom (toplevel); + toplevel->lower_to_bottom(); } void -CrossfadeEditor::peaks_ready (AudioRegion* r, WhichFade which) +CrossfadeEditor::peaks_ready (boost::shared_ptr r, WhichFade which) { /* this should never be called, because the peak files for an xfade will be ready by the time we want them. but our API forces us to provide this, so .. */ - - make_waves (*r, which); + peaks_ready_connection.disconnect (); + make_waves (r, which); } void CrossfadeEditor::audition_both () { - AudioPlaylist& pl (session.the_auditioner().prepare_playlist()); - jack_nframes_t preroll; - jack_nframes_t postroll; - jack_nframes_t length; - jack_nframes_t left_start_offset; - jack_nframes_t right_length; - jack_nframes_t left_length; + AudioPlaylist& pl (session.the_auditioner()->prepare_playlist()); + nframes_t preroll; + nframes_t postroll; + nframes_t length; + nframes_t left_start_offset; + nframes_t right_length; + nframes_t left_length; if (preroll_button.get_active()) { preroll = ARDOUR_UI::instance()->preroll_clock.current_duration (); @@ -1167,29 +1121,29 @@ CrossfadeEditor::audition_both () postroll = 0; } - if ((left_start_offset = xfade.out().length() - xfade.length()) >= preroll) { + if ((left_start_offset = xfade->out()->length() - xfade->length()) >= preroll) { left_start_offset -= preroll; } length = 0; - if ((left_length = xfade.length()) < xfade.out().length() - left_start_offset) { + if ((left_length = xfade->length()) < xfade->out()->length() - left_start_offset) { length += postroll; } - right_length = xfade.length(); + right_length = xfade->length(); - if (xfade.in().length() - right_length < postroll) { + if (xfade->in()->length() - right_length < postroll) { right_length += postroll; } - AudioRegion* left = new AudioRegion (xfade.out(), left_start_offset, left_length, "xfade out", - 0, Region::DefaultFlags, false); - AudioRegion* right = new AudioRegion (xfade.in(), 0, right_length, "xfade in", - 0, Region::DefaultFlags, false); + boost::shared_ptr left (boost::dynamic_pointer_cast (RegionFactory::create (xfade->out(), left_start_offset, left_length, "xfade out", + 0, Region::DefaultFlags, false))); + boost::shared_ptr right (boost::dynamic_pointer_cast (RegionFactory::create (xfade->in(), 0, right_length, "xfade in", + 0, Region::DefaultFlags, false))); - pl.add_region (*left, 0); - pl.add_region (*right, 1+preroll); + pl.add_region (left, 0); + pl.add_region (right, 1+preroll); /* there is only one ... */ @@ -1201,24 +1155,24 @@ CrossfadeEditor::audition_both () void CrossfadeEditor::audition_left_dry () { - AudioRegion* left = new AudioRegion (xfade.out(), xfade.out().length() - xfade.length(), xfade.length(), "xfade left", - 0, Region::DefaultFlags, false); + boost::shared_ptr left (boost::dynamic_pointer_cast (RegionFactory::create (xfade->out(), xfade->out()->length() - xfade->length(), xfade->length(), "xfade left", + 0, Region::DefaultFlags, false))); - session.audition_region (*left); + session.audition_region (left); } void CrossfadeEditor::audition_left () { - AudioPlaylist& pl (session.the_auditioner().prepare_playlist()); + AudioPlaylist& pl (session.the_auditioner()->prepare_playlist()); - AudioRegion* left = new AudioRegion (xfade.out(), xfade.out().length() - xfade.length(), xfade.length(), "xfade left", - 0, Region::DefaultFlags, false); - AudioRegion* right = new AudioRegion (xfade.in(), 0, xfade.length(), "xfade in", - 0, Region::DefaultFlags, false); + boost::shared_ptr left (boost::dynamic_pointer_cast (RegionFactory::create (xfade->out(), xfade->out()->length() - xfade->length(), xfade->length(), "xfade left", + 0, Region::DefaultFlags, false))); + boost::shared_ptr right (boost::dynamic_pointer_cast (RegionFactory::create (xfade->in(), 0, xfade->length(), "xfade in", + 0, Region::DefaultFlags, false))); - pl.add_region (*left, 0); - pl.add_region (*right, 1); + pl.add_region (left, 0); + pl.add_region (right, 1); right->set_muted (true); @@ -1234,23 +1188,23 @@ CrossfadeEditor::audition_left () void CrossfadeEditor::audition_right_dry () { - AudioRegion* right = new AudioRegion (xfade.in(), 0, xfade.length(), "xfade in", - 0, Region::DefaultFlags, false); - session.audition_region (*right); + boost::shared_ptr right (boost::dynamic_pointer_cast (RegionFactory::create (xfade->in(), 0, xfade->length(), "xfade in", + 0, Region::DefaultFlags, false))); + session.audition_region (right); } void CrossfadeEditor::audition_right () { - AudioPlaylist& pl (session.the_auditioner().prepare_playlist()); + AudioPlaylist& pl (session.the_auditioner()->prepare_playlist()); - AudioRegion* left = new AudioRegion (xfade.out(), xfade.out().length() - xfade.length(), xfade.length(), "xfade out", - 0, Region::DefaultFlags, false); - AudioRegion* right = new AudioRegion (xfade.out(), 0, xfade.length(), "xfade out", - 0, Region::DefaultFlags, false); + boost::shared_ptr left (boost::dynamic_pointer_cast (RegionFactory::create (xfade->out(), xfade->out()->length() - xfade->length(), xfade->length(), "xfade out", + 0, Region::DefaultFlags, false))); + boost::shared_ptr right (boost::dynamic_pointer_cast (RegionFactory::create (xfade->out(), 0, xfade->length(), "xfade out", + 0, Region::DefaultFlags, false))); - pl.add_region (*left, 0); - pl.add_region (*right, 1); + pl.add_region (left, 0); + pl.add_region (right, 1); left->set_muted (true);