X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fcrossfade_edit.cc;h=aaea3a224274666a2b0af6fc984853503b2cc444;hb=7e3282486d9638b6cfa1cd727a793df949270091;hp=7667de3134d7fe5181faca601890728529db95eb;hpb=209d967b1bb80a9735d690d8f4f0455ecb9970ca;p=ardour.git diff --git a/gtk2_ardour/crossfade_edit.cc b/gtk2_ardour/crossfade_edit.cc index 7667de3134..aaea3a2242 100644 --- a/gtk2_ardour/crossfade_edit.cc +++ b/gtk2_ardour/crossfade_edit.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 Paul Davis + Copyright (C) 2004 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,42 +15,51 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #include #include -#include -#include -#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include +#include -#include +#include "pbd/memento_command.h" +#include "ardour/automation_list.h" +#include "evoral/Curve.hpp" +#include "ardour/crossfade.h" +#include "ardour/session.h" +#include "ardour/auditioner.h" +#include "ardour/audioplaylist.h" +#include "ardour/audiosource.h" +#include "ardour/region_factory.h" +#include "ardour/profile.h" +#include "ardour/crossfade_binder.h" + +#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" +#include "actions.h" using namespace std; using namespace ARDOUR; +using namespace PBD; using namespace Gtk; -using namespace SigC; using namespace Editing; +using Gtkmm2ext::Keyboard; + #include "i18n.h" const int32_t CrossfadeEditor::Point::size = 7; @@ -58,21 +67,16 @@ 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) + : line (0) + , normative_curve (Evoral::Parameter(GainAutomation)) + , gain_curve (Evoral::Parameter(GainAutomation)) { } -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 (_("Edit Crossfade")), xfade (xf), - session (s), clear_button (_("Clear")), revert_button (_("Reset")), audition_both_button (_("Fade")), @@ -83,7 +87,7 @@ CrossfadeEditor::CrossfadeEditor (Session& s, Crossfade& xf, double my, double m preroll_button (_("With Pre-roll")), postroll_button (_("With Post-roll")), - + miny (my), maxy (mxy), @@ -91,20 +95,31 @@ CrossfadeEditor::CrossfadeEditor (Session& s, Crossfade& xf, double my, double m fade_out_table (3, 3), select_in_button (_("Fade In")), - select_out_button (_("Fade Out")) + select_out_button (_("Fade Out")), + + _peaks_ready_connection (0) + { - set_wmclass ("ardour_automationedit", "Ardour"); + set_session (s); + + set_wmclass (X_("ardour_automationedit"), PROGRAM_NAME); 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); + add_accel_group (ActionManager::ui_manager->get_accel_group()); - select_out_button.set_group (select_in_button.group()); + add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::POINTER_MOTION_MASK); + + 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,80 +127,47 @@ CrossfadeEditor::CrossfadeEditor (Session& s, Crossfade& xf, double my, double m point_grabbed = false; toplevel = 0; - _canvas = gtk_canvas_new_aa (); - - canvas = wrap (_canvas); - canvas->size_allocate.connect (slot (*this, &CrossfadeEditor::canvas_allocation)); - canvas->set_usize (425, 200); - - toplevel = gtk_canvas_item_new (gtk_canvas_root (GTK_CANVAS(_canvas)), - gtk_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 = gtk_canvas_item_new (gtk_canvas_root (GTK_CANVAS(_canvas)), - gtk_canvas_line_get_type (), - "width_pixels", (guint) 1, - "fill_color_rgba", color_map[cCrossfadeEditorLine], - NULL); - - fade[Out].shading = gtk_canvas_item_new (gtk_canvas_root (GTK_CANVAS(_canvas)), - gtk_canvas_polygon_get_type(), - "fill_color_rgba", color_map[cCrossfadeEditorLineShading], - NULL); - - fade[In].line = gtk_canvas_item_new (gtk_canvas_root (GTK_CANVAS(_canvas)), - gtk_canvas_line_get_type (), - "width_pixels", (guint) 1, - "fill_color_rgba", color_map[cCrossfadeEditorLine], - NULL); - - fade[In].shading = gtk_canvas_item_new (gtk_canvas_root (GTK_CANVAS(_canvas)), - gtk_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); + canvas = new ArdourCanvas::CanvasAA (); + 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)); + + 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 (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)); select_in_button.set_name (X_("CrossfadeEditCurveButton")); select_out_button.set_name (X_("CrossfadeEditCurveButton")); - select_in_button.clicked.connect (bind (slot (this, &CrossfadeEditor::curve_select_clicked), In)); - select_out_button.clicked.connect (bind (slot (this, &CrossfadeEditor::curve_select_clicked), Out)); + select_in_button.signal_clicked().connect (sigc::bind (sigc::mem_fun (*this, &CrossfadeEditor::curve_select_clicked), In)); + select_out_button.signal_clicked().connect (sigc::bind (sigc::mem_fun (*this, &CrossfadeEditor::curve_select_clicked), Out)); HBox* acbox = manage (new HBox); - + audition_box.set_border_width (7); audition_box.set_spacing (5); audition_box.set_homogeneous (false); @@ -196,7 +178,7 @@ CrossfadeEditor::CrossfadeEditor (Session& s, Crossfade& xf, double my, double m audition_box.pack_start (audition_right_dry_button, false, false); Frame* audition_frame = manage (new Frame (_("Audition"))); - + audition_frame->set_name (X_("CrossfadeEditFrame")); audition_frame->add (audition_box); @@ -204,12 +186,12 @@ CrossfadeEditor::CrossfadeEditor (Session& s, Crossfade& xf, double my, double m Frame* canvas_frame = manage (new Frame); canvas_frame->add (*canvas); - canvas_frame->set_shadow_type (GTK_SHADOW_IN); + canvas_frame->set_shadow_type (Gtk::SHADOW_IN); - 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); + 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 +201,12 @@ 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->clicked.connect (bind (slot (*this, &CrossfadeEditor::apply_preset), *i)); + pbutton->signal_clicked().connect (sigc::bind (sigc::mem_fun(*this, &CrossfadeEditor::apply_preset), *i)); + ARDOUR_UI::instance()->set_tip (pbutton, (*i)->name, ""); fade_in_table.attach (*pbutton, col, col+1, row, row+1); fade_in_buttons.push_back (pbutton); @@ -240,11 +223,12 @@ 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->clicked.connect (bind (slot (*this, &CrossfadeEditor::apply_preset), *i)); + pbutton->signal_clicked().connect (sigc::bind (sigc::mem_fun(*this, &CrossfadeEditor::apply_preset), *i)); + ARDOUR_UI::instance()->set_tip (pbutton, (*i)->name, ""); fade_out_table.attach (*pbutton, col, col+1, row, row+1); fade_out_buttons.push_back (pbutton); @@ -258,8 +242,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"); @@ -268,28 +252,13 @@ CrossfadeEditor::CrossfadeEditor (Session& s, Crossfade& xf, double my, double m audition_right_dry_button.set_name ("CrossfadeEditAuditionButton"); audition_right_button.set_name ("CrossfadeEditAuditionButton"); - clear_button.clicked.connect (slot (*this, &CrossfadeEditor::clear)); - revert_button.clicked.connect (slot (*this, &CrossfadeEditor::reset)); - audition_both_button.toggled.connect (slot (*this, &CrossfadeEditor::audition_toggled)); - audition_right_button.toggled.connect (slot (*this, &CrossfadeEditor::audition_right_toggled)); - audition_right_dry_button.toggled.connect (slot (*this, &CrossfadeEditor::audition_right_dry_toggled)); - audition_left_button.toggled.connect (slot (*this, &CrossfadeEditor::audition_left_toggled)); - audition_left_dry_button.toggled.connect (slot (*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); + clear_button.signal_clicked().connect (sigc::mem_fun(*this, &CrossfadeEditor::clear)); + revert_button.signal_clicked().connect (sigc::mem_fun(*this, &CrossfadeEditor::reset)); + audition_both_button.signal_toggled().connect (sigc::mem_fun(*this, &CrossfadeEditor::audition_toggled)); + audition_right_button.signal_toggled().connect (sigc::mem_fun(*this, &CrossfadeEditor::audition_right_toggled)); + audition_right_dry_button.signal_toggled().connect (sigc::mem_fun(*this, &CrossfadeEditor::audition_right_dry_toggled)); + audition_left_button.signal_toggled().connect (sigc::mem_fun(*this, &CrossfadeEditor::audition_left_toggled)); + audition_left_dry_button.signal_toggled().connect (sigc::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,35 +272,33 @@ 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 */ // Button* foobut = manage (new Button ("dump")); -// foobut->clicked.connect (slot (*this, &CrossfadeEditor::dump)); +// foobut-.signal_clicked().connect (sigc::mem_fun(*this, &CrossfadeEditor::dump)); // 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 (slot (*this, &CrossfadeEditor::xfade_changed)); + xfade->PropertyChanged.connect (state_connection, invalidator (*this), boost::bind (&CrossfadeEditor::xfade_changed, this, _1), gui_context()); - session.AuditionActive.connect (slot (*this, &CrossfadeEditor::audition_state_changed)); + _session->AuditionActive.connect (_session_connections, invalidator (*this), boost::bind (&CrossfadeEditor::audition_state_changed, this, _1), gui_context()); + show_all_children(); } CrossfadeEditor::~CrossfadeEditor() @@ -345,6 +312,8 @@ CrossfadeEditor::~CrossfadeEditor() for (list::iterator i = fade[Out].points.begin(); i != fade[Out].points.end(); ++i) { delete *i; } + + delete _peaks_ready_connection; } void @@ -358,7 +327,7 @@ CrossfadeEditor::dump () void CrossfadeEditor::audition_state_changed (bool yn) { - ENSURE_GUI_THREAD (bind (slot (*this, &CrossfadeEditor::audition_state_changed), yn)); + ENSURE_GUI_THREAD (*this, &CrossfadeEditor::audition_state_changed, yn) if (!yn) { audition_both_button.set_active (false); @@ -370,15 +339,15 @@ 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; } - + fade[which].points.clear (); fade[which].gain_curve.clear (); fade[which].normative_curve.clear (); @@ -386,60 +355,109 @@ CrossfadeEditor::set (const ARDOUR::Curve& curve, WhichFade which) if (curve.empty()) { goto out; } - - the_end = curve.const_end(); + + the_end = curve.end(); --the_end; - - firstx = (*curve.const_begin())->when; + + firstx = (*curve.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.begin(); i != curve.end(); ++i) { + double xfract = ((*i)->when - firstx) / (endx - firstx); double yfract = ((*i)->value - miny) / (maxy - miny); - + Point* p = make_point (); p->move_to (x_coordinate (xfract), y_coordinate (yfract), xfract, yfract); - + fade[which].points.push_back (p); } /* no need to sort because curve is already time-ordered */ out: - + swap (which, current); redraw (); swap (which, current); } -gint -CrossfadeEditor::_canvas_event (GtkCanvasItem* item, GdkEvent* event, gpointer data) +bool +CrossfadeEditor::curve_event (GdkEvent* event) { - CrossfadeEditor* ed = static_cast (data); - return ed->canvas_event (item, event); + /* treat it like a toplevel event */ + + return canvas_event (event); } -gint -CrossfadeEditor::canvas_event (GtkCanvasItem* item, GdkEvent* event) +bool +CrossfadeEditor::point_event (GdkEvent* event, Point* 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 or vertically */ + + if (point == fade[current].points.front() || point == fade[current].points.back()) { + new_x = point->x; + new_y = point->y; + } 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; +} + +bool +CrossfadeEditor::canvas_event (GdkEvent* event) { switch (event->type) { case GDK_BUTTON_PRESS: add_control_point ((event->button.x - canvas_border)/effective_width(), 1.0 - ((event->button.y - canvas_border)/effective_height())); - return TRUE; + return true; break; default: break; } - return FALSE; + return false; } CrossfadeEditor::Point::~Point() { - gtk_object_destroy (GTK_OBJECT(box)); + delete box; } CrossfadeEditor::Point* @@ -447,21 +465,16 @@ CrossfadeEditor::make_point () { Point* p = new Point; - p->box = gtk_canvas_item_new (gtk_canvas_root (GTK_CANVAS(_canvas)), - gtk_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 (sigc::bind (sigc::mem_fun (*this, &CrossfadeEditor::point_event), p)); + return p; } @@ -471,12 +484,12 @@ CrossfadeEditor::add_control_point (double x, double y) PointSorter cmp; /* enforce end point x location */ - + if (fade[current].points.empty()) { x = 0.0; } else if (fade[current].points.size() == 1) { x = 1.0; - } + } Point* p = make_point (); @@ -491,35 +504,45 @@ CrossfadeEditor::add_control_point (double x, double y) void CrossfadeEditor::Point::move_to (double nx, double ny, double xfract, double yfract) { + if ( xfract < 0.0 ) { + xfract = 0.0; + } else if ( xfract > 1.0 ) { + xfract = 1.0; + } + + if ( yfract < 0.0 ) { + yfract = 0.0; + } else if ( yfract > 1.0 ) { + yfract = 1.0; + } + const double half_size = rint(size/2.0); double x1 = nx - half_size; double x2 = nx + half_size; - gtk_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) { - gtk_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; } - gtk_canvas_set_scroll_region (GTK_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; @@ -545,9 +568,9 @@ CrossfadeEditor::canvas_allocation (GtkAllocation *alloc) (*i)->move_to (x_coordinate((*i)->x), y_coordinate((*i)->y), (*i)->x, (*i)->y); } - + end = make_point (); - + if (fade[Out].points.size() > 1) { Point* old_end = fade[Out].points.back(); fade[Out].points.pop_back (); @@ -570,7 +593,7 @@ CrossfadeEditor::canvas_allocation (GtkAllocation *alloc) y_coordinate ((*i)->y), (*i)->x, (*i)->y); } - + WhichFade old_current = current; current = In; redraw (); @@ -578,151 +601,92 @@ 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; - gtk_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; - gtk_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 (GtkCanvasItem* item, GdkEvent* event, gpointer data) -{ - CrossfadeEditor* ed = static_cast (data); - return ed->point_event (item, event); -} - -gint -CrossfadeEditor::point_event (GtkCanvasItem* 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 (GtkCanvasItem* item, GdkEvent* event, gpointer data) -{ - CrossfadeEditor* ed = static_cast (data); - return ed->curve_event (item, event); -} - -gint -CrossfadeEditor::curve_event (GtkCanvasItem* item, GdkEvent* event) -{ - /* treat it like a toplevel event */ - - return canvas_event (item, event); -} void -CrossfadeEditor::xfade_changed (Change ignored) +CrossfadeEditor::xfade_changed (const PropertyChange&) { - 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 (); + framecnt_t len = xfade->length (); fade[current].normative_curve.clear (); fade[current].gain_curve.clear (); for (list::iterator i = fade[current].points.begin(); i != fade[current].points.end(); ++i) { fade[current].normative_curve.add ((*i)->x, (*i)->y); - fade[current].gain_curve.add (((*i)->x * len), (*i)->y); + double offset; + if (current==In) + offset = xfade->in()->start(); + else + offset = xfade->out()->start()+xfade->out()->length()-xfade->length(); + fade[current].gain_curve.add (((*i)->x * len) + offset, (*i)->y); } + size_t npoints = (size_t) effective_width(); float vec[npoints]; - fade[current].normative_curve.get_vector (0, 1.0, vec, npoints); - - GtkCanvasPoints* pts = get_canvas_points ("xfade edit1", npoints); - GtkCanvasPoints* spts = get_canvas_points ("xfade edit2", npoints + 3); + fade[current].normative_curve.curve().get_vector (0, 1.0, vec, npoints); + + 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 +695,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); - spts->coords[last_spt - (i*2)] = canvas_border + i; - spts->coords[last_spt - (i*2) + 1] = pts->coords[(i*2)+1]; - } + pts[i].set_x (canvas_border + i); + pts[i].set_y (y_coordinate (y)); - gtk_canvas_item_set (fade[current].line, "points", pts, NULL); - gtk_canvas_item_set (fade[current].shading, "points", spts, NULL); + spts[last_spt - i].set_x (canvas_border + i); + spts[last_spt - i].set_y (pts[i].get_y()); + } - gtk_canvas_points_unref (pts); - gtk_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) { - gtk_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() = static_cast(&fade[current].gain_curve.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,25 +785,36 @@ CrossfadeEditor::apply_preset (Preset *preset) void CrossfadeEditor::apply () { - _apply_to (&xfade); + _session->begin_reversible_command (_("Edit crossfade")); + + XMLNode& before = xfade->get_state (); + + _apply_to (xfade); + + _session->add_command ( + new MementoCommand ( + new ARDOUR::CrossfadeBinder (_session->playlists, xfade->id ()), + &before, &xfade->get_state () + ) + ); + + _session->commit_reversible_command (); } 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.end(); --the_end; double firstx = (*in.begin())->when; double endx = (*the_end)->when; - double miny = in.get_min_y (); - double maxy = in.get_max_y (); in.freeze (); in.clear (); @@ -836,19 +822,17 @@ CrossfadeEditor::_apply_to (Crossfade* xf) for (list::iterator i = fade[In].points.begin(); i != fade[In].points.end(); ++i) { double when = firstx + ((*i)->x * (endx - firstx)); - double value = (*i)->y; // miny + ((*i)->y * (maxy - miny)); + double value = (*i)->y; in.add (when, value); } /* OUT */ - the_end = out.const_end(); + the_end = out.end(); --the_end; firstx = (*out.begin())->when; endx = (*the_end)->when; - miny = out.get_min_y (); - maxy = out.get_max_y (); out.freeze (); out.clear (); @@ -856,7 +840,7 @@ CrossfadeEditor::_apply_to (Crossfade* xf) for (list::iterator i = fade[Out].points.begin(); i != fade[Out].points.end(); ++i) { double when = firstx + ((*i)->x * (endx - firstx)); - double value = (*i)->y; // miny + ((*i)->y * (maxy - miny)); + double value = (*i)->y; out.add (when, value); } @@ -865,12 +849,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 +872,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 @@ -900,99 +886,179 @@ CrossfadeEditor::build_presets () fade_in_presets = new Presets; fade_out_presets = new Presets; - /* FADE OUT */ + /* FADE IN */ - p = new Preset (hiin_xpm); - p->push_back (PresetPoint (0, 0)); - p->push_back (PresetPoint (0.0207373, 0.197222)); - p->push_back (PresetPoint (0.0645161, 0.525)); - p->push_back (PresetPoint (0.152074, 0.802778)); - p->push_back (PresetPoint (0.276498, 0.919444)); - p->push_back (PresetPoint (0.481567, 0.980556)); - p->push_back (PresetPoint (0.767281, 1)); - p->push_back (PresetPoint (1, 1)); - fade_in_presets->push_back (p); - - p = new Preset (loin_xpm); + p = new Preset ("Linear (-6dB)", "fadein-linear"); p->push_back (PresetPoint (0, 0)); - p->push_back (PresetPoint (0.389401, 0.0333333)); - p->push_back (PresetPoint (0.629032, 0.0861111)); - p->push_back (PresetPoint (0.829493, 0.233333)); - p->push_back (PresetPoint (0.9447, 0.483333)); - p->push_back (PresetPoint (0.976959, 0.697222)); - p->push_back (PresetPoint (1, 1)); + p->push_back (PresetPoint (0.000000, 0.000000)); + p->push_back (PresetPoint (0.166667, 0.166366)); + p->push_back (PresetPoint (0.333333, 0.332853)); + p->push_back (PresetPoint (0.500000, 0.499459)); + p->push_back (PresetPoint (0.666667, 0.666186)); + p->push_back (PresetPoint (0.833333, 0.833033)); + p->push_back (PresetPoint (1.000000, 1.000000)); fade_in_presets->push_back (p); - p = new Preset (regin_xpm); + p = new Preset ("S(1)-curve", "fadein-S1"); p->push_back (PresetPoint (0, 0)); - p->push_back (PresetPoint (0.0737327, 0.308333)); - p->push_back (PresetPoint (0.246544, 0.658333)); - p->push_back (PresetPoint (0.470046, 0.886111)); - p->push_back (PresetPoint (0.652074, 0.972222)); - p->push_back (PresetPoint (0.771889, 0.988889)); + 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); - p = new Preset (regin2_xpm); - p->push_back (PresetPoint (0, 0)); - p->push_back (PresetPoint (0.304147, 0.0694444)); - p->push_back (PresetPoint (0.529954, 0.152778)); - p->push_back (PresetPoint (0.725806, 0.333333)); - p->push_back (PresetPoint (0.847926, 0.558333)); - p->push_back (PresetPoint (0.919355, 0.730556)); - p->push_back (PresetPoint (1, 1)); + p = new Preset ("S(2)-curve", "fadein-S2"); + p->push_back (PresetPoint (0.0, 0.0)); + p->push_back (PresetPoint (0.055, 0.222)); + p->push_back (PresetPoint (0.163, 0.35)); + p->push_back (PresetPoint (0.837, 0.678)); + p->push_back (PresetPoint (0.945, 0.783)); + p->push_back (PresetPoint (1.0, 1.0)); fade_in_presets->push_back (p); - p = new Preset (linin_xpm); - p->push_back (PresetPoint (0, 0)); - p->push_back (PresetPoint (1, 1)); + p = new Preset ("Constant power (-3dB)", "fadein-constant-power"); + + p->push_back (PresetPoint (0.000000, 0.000000)); + p->push_back (PresetPoint (0.166667, 0.282192)); + p->push_back (PresetPoint (0.333333, 0.518174)); + p->push_back (PresetPoint (0.500000, 0.707946)); + p->push_back (PresetPoint (0.666667, 0.851507)); + p->push_back (PresetPoint (0.833333, 0.948859)); + p->push_back (PresetPoint (1.000000, 1.000000)); + fade_in_presets->push_back (p); + if (!Profile->get_sae()) { + + p = new Preset ("Short cut", "fadein-short-cut"); + p->push_back (PresetPoint (0, 0)); + p->push_back (PresetPoint (0.389401, 0.0333333)); + p->push_back (PresetPoint (0.629032, 0.0861111)); + p->push_back (PresetPoint (0.829493, 0.233333)); + p->push_back (PresetPoint (0.9447, 0.483333)); + p->push_back (PresetPoint (0.976959, 0.697222)); + p->push_back (PresetPoint (1, 1)); + fade_in_presets->push_back (p); + + p = new Preset ("Slow cut", "fadein-slow-cut"); + p->push_back (PresetPoint (0, 0)); + p->push_back (PresetPoint (0.304147, 0.0694444)); + p->push_back (PresetPoint (0.529954, 0.152778)); + p->push_back (PresetPoint (0.725806, 0.333333)); + p->push_back (PresetPoint (0.847926, 0.558333)); + p->push_back (PresetPoint (0.919355, 0.730556)); + p->push_back (PresetPoint (1, 1)); + fade_in_presets->push_back (p); + + p = new Preset ("Fast cut", "fadein-fast-cut"); + p->push_back (PresetPoint (0, 0)); + p->push_back (PresetPoint (0.0737327, 0.308333)); + p->push_back (PresetPoint (0.246544, 0.658333)); + p->push_back (PresetPoint (0.470046, 0.886111)); + p->push_back (PresetPoint (0.652074, 0.972222)); + p->push_back (PresetPoint (0.771889, 0.988889)); + p->push_back (PresetPoint (1, 1)); + fade_in_presets->push_back (p); + + p = new Preset ("Long cut", "fadein-long-cut"); + p->push_back (PresetPoint (0, 0)); + p->push_back (PresetPoint (0.0207373, 0.197222)); + p->push_back (PresetPoint (0.0645161, 0.525)); + p->push_back (PresetPoint (0.152074, 0.802778)); + p->push_back (PresetPoint (0.276498, 0.919444)); + p->push_back (PresetPoint (0.481567, 0.980556)); + p->push_back (PresetPoint (0.767281, 1)); + p->push_back (PresetPoint (1, 1)); + fade_in_presets->push_back (p); + } + /* FADE OUT */ - p = new Preset (hiout_xpm); - p->push_back (PresetPoint (0, 1)); - p->push_back (PresetPoint (0.305556, 1)); - p->push_back (PresetPoint (0.548611, 0.991736)); - p->push_back (PresetPoint (0.759259, 0.931129)); - p->push_back (PresetPoint (0.918981, 0.68595)); - p->push_back (PresetPoint (0.976852, 0.22865)); - 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 ("Linear (-6dB cut)", "fadeout-linear"); p->push_back (PresetPoint (0, 1)); - p->push_back (PresetPoint (0.228111, 0.988889)); - p->push_back (PresetPoint (0.347926, 0.972222)); - p->push_back (PresetPoint (0.529954, 0.886111)); - p->push_back (PresetPoint (0.753456, 0.658333)); - p->push_back (PresetPoint (0.9262673, 0.308333)); - p->push_back (PresetPoint (1, 0)); + p->push_back (PresetPoint (0.000000, 1.000000)); + p->push_back (PresetPoint (0.166667, 0.833033)); + p->push_back (PresetPoint (0.333333, 0.666186)); + p->push_back (PresetPoint (0.500000, 0.499459)); + p->push_back (PresetPoint (0.666667, 0.332853)); + p->push_back (PresetPoint (0.833333, 0.166366)); + p->push_back (PresetPoint (1.000000, 0.000000)); fade_out_presets->push_back (p); - p = new Preset (loout_xpm); + p = new Preset ("S(1)-Curve", "fadeout-S1"); p->push_back (PresetPoint (0, 1)); - p->push_back (PresetPoint (0.023041, 0.697222)); - p->push_back (PresetPoint (0.0553, 0.483333)); - p->push_back (PresetPoint (0.170507, 0.233333)); - p->push_back (PresetPoint (0.370968, 0.0861111)); - p->push_back (PresetPoint (0.610599, 0.0333333)); + 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); - p = new Preset (regout2_xpm); - p->push_back (PresetPoint (0, 1)); - p->push_back (PresetPoint (0.080645, 0.730556)); - p->push_back (PresetPoint (0.277778, 0.289256)); - p->push_back (PresetPoint (0.470046, 0.152778)); - p->push_back (PresetPoint (0.695853, 0.0694444)); - p->push_back (PresetPoint (1, 0)); + p = new Preset ("S(2)-Curve", "fadeout-S2"); + p->push_back (PresetPoint (0.0, 1.0)); + p->push_back (PresetPoint (0.163, 0.678)); + p->push_back (PresetPoint (0.055, 0.783)); + p->push_back (PresetPoint (0.837, 0.35)); + p->push_back (PresetPoint (0.945, 0.222)); + p->push_back (PresetPoint (1.0, 0.0)); fade_out_presets->push_back (p); - p = new Preset (linout_xpm); - p->push_back (PresetPoint (0, 1)); - p->push_back (PresetPoint (1, 0)); + // p = new Preset ("linout.xpm"); + p = new Preset ("Constant power (-3dB cut)", "fadeout-constant-power"); + p->push_back (PresetPoint (0.000000, 1.000000)); + p->push_back (PresetPoint (0.166667, 0.948859)); + p->push_back (PresetPoint (0.333333, 0.851507)); + p->push_back (PresetPoint (0.500000, 0.707946)); + p->push_back (PresetPoint (0.666667, 0.518174)); + p->push_back (PresetPoint (0.833333, 0.282192)); + p->push_back (PresetPoint (1.000000, 0.000000)); fade_out_presets->push_back (p); + + if (!Profile->get_sae()) { + // p = new Preset ("hiout.xpm"); + p = new Preset ("Short cut", "fadeout-short-cut"); + p->push_back (PresetPoint (0, 1)); + p->push_back (PresetPoint (0.305556, 1)); + p->push_back (PresetPoint (0.548611, 0.991736)); + p->push_back (PresetPoint (0.759259, 0.931129)); + p->push_back (PresetPoint (0.918981, 0.68595)); + p->push_back (PresetPoint (0.976852, 0.22865)); + p->push_back (PresetPoint (1, 0)); + fade_out_presets->push_back (p); + + p = new Preset ("Slow cut", "fadeout-slow-cut"); + p->push_back (PresetPoint (0, 1)); + p->push_back (PresetPoint (0.228111, 0.988889)); + p->push_back (PresetPoint (0.347926, 0.972222)); + p->push_back (PresetPoint (0.529954, 0.886111)); + p->push_back (PresetPoint (0.753456, 0.658333)); + p->push_back (PresetPoint (0.9262673, 0.308333)); + p->push_back (PresetPoint (1, 0)); + fade_out_presets->push_back (p); + + p = new Preset ("Fast cut", "fadeout-fast-cut"); + p->push_back (PresetPoint (0, 1)); + p->push_back (PresetPoint (0.080645, 0.730556)); + p->push_back (PresetPoint (0.277778, 0.289256)); + p->push_back (PresetPoint (0.470046, 0.152778)); + p->push_back (PresetPoint (0.695853, 0.0694444)); + p->push_back (PresetPoint (1, 0)); + fade_out_presets->push_back (p); + + // p = new Preset ("loout.xpm"); + p = new Preset ("Long cut", "fadeout-long-cut"); + p->push_back (PresetPoint (0, 1)); + p->push_back (PresetPoint (0.023041, 0.697222)); + p->push_back (PresetPoint (0.0553, 0.483333)); + p->push_back (PresetPoint (0.170507, 0.233333)); + p->push_back (PresetPoint (0.370968, 0.0861111)); + p->push_back (PresetPoint (0.610599, 0.0333333)); + p->push_back (PresetPoint (1, 0)); + fade_out_presets->push_back (p); + + } } void @@ -1002,75 +1068,63 @@ CrossfadeEditor::curve_select_clicked (WhichFade wf) if (wf == In) { - for (vector::iterator i = fade[In].waves.begin(); i != fade[In].waves.end(); ++i) { - gtk_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(); + (*i)->property_fill_color() = ARDOUR_UI::config()->canvasvar_SelectedCrossfadeEditorWave.get(); } - for (vector::iterator i = fade[Out].waves.begin(); i != fade[Out].waves.end(); ++i) { - gtk_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(); + (*i)->property_fill_color() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorWave.get(); } - gtk_canvas_item_set (fade[In].line, "fill_color_rgba", color_map[cSelectedCrossfadeEditorLine], NULL); - gtk_canvas_item_set (fade[Out].line, "fill_color_rgba", color_map[cCrossfadeEditorLine], NULL); - gtk_canvas_item_hide (fade[Out].shading); - gtk_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) { - gtk_canvas_item_hide ((*i)->box); + (*i)->box->hide(); } for (list::iterator i = fade[In].points.begin(); i != fade[In].points.end(); ++i) { - gtk_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) { - gtk_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(); + (*i)->property_fill_color() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorWave.get(); } - for (vector::iterator i = fade[Out].waves.begin(); i != fade[Out].waves.end(); ++i) { - gtk_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(); + (*i)->property_fill_color() = ARDOUR_UI::config()->canvasvar_SelectedCrossfadeEditorWave.get(); } - gtk_canvas_item_set (fade[Out].line, "fill_color_rgba", color_map[cSelectedCrossfadeEditorLine], NULL); - gtk_canvas_item_set (fade[In].line, "fill_color_rgba", color_map[cCrossfadeEditorLine], NULL); - gtk_canvas_item_hide (fade[In].shading); - gtk_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) { - gtk_canvas_item_hide ((*i)->box); - } - - for (list::iterator i = fade[Out].points.begin(); i != fade[Out].points.end(); ++i) { - gtk_canvas_item_show ((*i)->box); - } - - for (vector::iterator i = fade_out_buttons.begin(); i != fade_out_buttons.end(); ++i) { - (*i)->set_sensitive (true); + (*i)->box->hide(); } - for (vector::iterator i = fade_in_buttons.begin(); i != fade_in_buttons.end(); ++i) { - (*i)->set_sensitive (false); + for (list::iterator i = fade[Out].points.begin(); i != fade[Out].points.end(); ++i) { + (*i)->box->show(); } } } -double +double CrossfadeEditor::x_coordinate (double& xfract) const { xfract = min (1.0, xfract); xfract = max (0.0, xfract); - + return canvas_border + (xfract * effective_width()); } @@ -1080,191 +1134,221 @@ 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(); + + delete _peaks_ready_connection; + _peaks_ready_connection = 0; for (uint32_t n = 0; n < nchans; ++n) { - + gdouble yoff = n * ht; - - if (region.source(n).peaks_ready (bind (slot (*this, &CrossfadeEditor::peaks_ready), ®ion, which))) { - - GtkCanvasItem *wave = gtk_canvas_item_new (gtk_canvas_root (GTK_CANVAS(_canvas)), - gtk_canvas_waveview_get_type (), - "data_src", (gpointer) ®ion, - "cache_updater", (gboolean) TRUE, - "cache", gtk_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); - - gtk_canvas_item_lower_to_bottom (wave); - fade[which].waves.push_back (wave); + + if (region->audio_source(n)->peaks_ready (boost::bind (&CrossfadeEditor::peaks_ready, this, boost::weak_ptr(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; + waveview->property_gain_function() = (void*) curve_get_vector_from_c; + waveview->property_gain_src() = static_cast(&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->property_amplitude_above_axis() = 2.0; + waveview->property_wave_color() = color; + waveview->property_fill_color() = color; + + if (which==In) + waveview->property_region_start() = region->start(); + else + waveview->property_region_start() = region->start()+region->length()-xfade->length(); + + waveview->lower_to_bottom(); + fade[which].waves.push_back (waveview); } } - gtk_canvas_item_lower_to_bottom (toplevel); + toplevel->lower_to_bottom(); } void -CrossfadeEditor::peaks_ready (AudioRegion* r, WhichFade which) +CrossfadeEditor::peaks_ready (boost::weak_ptr wr, WhichFade which) { + boost::shared_ptr r (wr.lock()); + + if (!r) { + return; + } + /* 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 .. */ + delete _peaks_ready_connection; + _peaks_ready_connection = 0; - make_waves (*r, which); + make_waves (r, which); } void -CrossfadeEditor::audition_both () +CrossfadeEditor::audition (Audition which) { - 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; - - if (preroll_button.get_active()) { - preroll = ARDOUR_UI::instance()->preroll_clock.current_duration (); + AudioPlaylist& pl (_session->the_auditioner()->prepare_playlist()); + framecnt_t preroll; + framecnt_t postroll; + framecnt_t left_start_offset; + framecnt_t right_length; + framecnt_t left_length; + + if (which != Right && preroll_button.get_active()) { + preroll = _session->frame_rate() * 2; //2 second hardcoded preroll for now } else { preroll = 0; } - if (postroll_button.get_active()) { - postroll = ARDOUR_UI::instance()->postroll_clock.current_duration (); + if (which != Left && postroll_button.get_active()) { + postroll = _session->frame_rate() * 2; //2 second hardcoded postroll for now } else { postroll = 0; } - if ((left_start_offset = xfade.out().length() - xfade.length()) >= preroll) { - left_start_offset -= preroll; - } + // Is there enough data for the whole preroll? + left_length = xfade->length(); + if ((left_start_offset = xfade->out()->length() - xfade->length()) > preroll) { + left_start_offset -= preroll; + } else { + preroll = left_start_offset; + left_start_offset = 0; + } + left_length += preroll; + + // Is there enough data for the whole postroll? + right_length = xfade->length(); + if ((xfade->in()->length() - right_length) > postroll) { + right_length += postroll; + } else { + right_length = xfade->in()->length(); + } + + PropertyList left_plist; + PropertyList right_plist; - length = 0; - if ((left_length = xfade.length()) < xfade.out().length() - left_start_offset) { - length += postroll; - } + left_plist.add (ARDOUR::Properties::start, left_start_offset); + left_plist.add (ARDOUR::Properties::length, left_length); + left_plist.add (ARDOUR::Properties::name, string ("xfade out")); + left_plist.add (ARDOUR::Properties::layer, 0); + left_plist.add (ARDOUR::Properties::fade_in_active, true); - right_length = xfade.length(); + right_plist.add (ARDOUR::Properties::start, 0); + right_plist.add (ARDOUR::Properties::length, right_length); + right_plist.add (ARDOUR::Properties::name, string("xfade in")); + right_plist.add (ARDOUR::Properties::layer, 0); + right_plist.add (ARDOUR::Properties::fade_out_active, true); - if (xfade.in().length() - right_length < postroll) { - right_length += postroll; + if (which == Left) { + right_plist.add (ARDOUR::Properties::scale_amplitude, 0.0f); + } else if (which == Right) { + left_plist.add (ARDOUR::Properties::scale_amplitude, 0.0f); } - 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); - - pl.add_region (*left, 0); - pl.add_region (*right, 1+preroll); + boost::shared_ptr left (boost::dynamic_pointer_cast + (RegionFactory::create (xfade->out(), left_plist, false))); + boost::shared_ptr right (boost::dynamic_pointer_cast + (RegionFactory::create (xfade->in(), right_plist, false))); - /* there is only one ... */ + // apply a 20ms declicking fade at the start and end of auditioning + // XXX this should really be a property - pl.foreach_crossfade (this, &CrossfadeEditor::setup); + left->set_fade_in_length (_session->frame_rate() / 50); + right->set_fade_out_length (_session->frame_rate() / 50); - session.audition_playlist (); + pl.add_region (left, 0); + pl.add_region (right, 1 + preroll); + + /* there is only one ... */ + pl.foreach_crossfade (sigc::mem_fun (*this, &CrossfadeEditor::setup)); + + _session->audition_playlist (); } void -CrossfadeEditor::audition_left_dry () +CrossfadeEditor::audition_both () { - AudioRegion* left = new AudioRegion (xfade.out(), xfade.out().length() - xfade.length(), xfade.length(), "xfade left", - 0, Region::DefaultFlags, false); - - session.audition_region (*left); + audition (Both); } void -CrossfadeEditor::audition_left () +CrossfadeEditor::audition_left_dry () { - 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); + PropertyList plist; - pl.add_region (*left, 0); - pl.add_region (*right, 1); + plist.add (ARDOUR::Properties::start, xfade->out()->length() - xfade->length()); + plist.add (ARDOUR::Properties::length, xfade->length()); + plist.add (ARDOUR::Properties::name, string("xfade left")); + plist.add (ARDOUR::Properties::layer, 0); - right->set_muted (true); + boost::shared_ptr left (boost::dynamic_pointer_cast + (RegionFactory::create (xfade->out(), plist, false))); - /* there is only one ... */ - - pl.foreach_crossfade (this, &CrossfadeEditor::setup); - - session.audition_playlist (); - - /* memory leak for regions */ + _session->audition_region (left); } void -CrossfadeEditor::audition_right_dry () +CrossfadeEditor::audition_left () { - AudioRegion* right = new AudioRegion (xfade.in(), 0, xfade.length(), "xfade in", - 0, Region::DefaultFlags, false); - session.audition_region (*right); + audition (Left); } void -CrossfadeEditor::audition_right () +CrossfadeEditor::audition_right_dry () { - AudioPlaylist& pl (session.the_auditioner().prepare_playlist()); + PropertyList plist; - 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); + plist.add (ARDOUR::Properties::start, 0); + plist.add (ARDOUR::Properties::length, xfade->length()); + plist.add (ARDOUR::Properties::name, string ("xfade right")); + plist.add (ARDOUR::Properties::layer, 0); - pl.add_region (*left, 0); - pl.add_region (*right, 1); - - left->set_muted (true); + boost::shared_ptr right (boost::dynamic_pointer_cast + (RegionFactory::create (xfade->in(), plist, false))); - /* there is only one ... */ - - pl.foreach_crossfade (this, &CrossfadeEditor::setup); + _session->audition_region (right); +} - session.audition_playlist (); +void +CrossfadeEditor::audition_right () +{ + audition (Right); } - + void CrossfadeEditor::cancel_audition () { - session.cancel_audition (); + _session->cancel_audition (); } void @@ -1272,7 +1356,7 @@ CrossfadeEditor::audition_toggled () { bool x; - if ((x = audition_both_button.get_active ()) != session.is_auditioning()) { + if ((x = audition_both_button.get_active ()) != _session->is_auditioning()) { if (x) { audition_both (); @@ -1286,8 +1370,8 @@ void CrossfadeEditor::audition_right_toggled () { bool x; - - if ((x = audition_right_button.get_active ()) != session.is_auditioning()) { + + if ((x = audition_right_button.get_active ()) != _session->is_auditioning()) { if (x) { audition_right (); @@ -1302,7 +1386,7 @@ CrossfadeEditor::audition_right_dry_toggled () { bool x; - if ((x = audition_right_dry_button.get_active ()) != session.is_auditioning()) { + if ((x = audition_right_dry_button.get_active ()) != _session->is_auditioning()) { if (x) { audition_right_dry (); @@ -1317,7 +1401,7 @@ CrossfadeEditor::audition_left_toggled () { bool x; - if ((x = audition_left_button.get_active ()) != session.is_auditioning()) { + if ((x = audition_left_button.get_active ()) != _session->is_auditioning()) { if (x) { audition_left (); @@ -1332,8 +1416,8 @@ CrossfadeEditor::audition_left_dry_toggled () { bool x; - if ((x = audition_left_dry_button.get_active ()) != session.is_auditioning()) { - + if ((x = audition_left_dry_button.get_active ()) != _session->is_auditioning()) { + if (x) { audition_left_dry (); } else { @@ -1341,3 +1425,44 @@ CrossfadeEditor::audition_left_dry_toggled () } } } + +bool +CrossfadeEditor::on_key_press_event (GdkEventKey */*ev*/) +{ + return true; +} + +bool +CrossfadeEditor::on_key_release_event (GdkEventKey* ev) +{ + switch (ev->keyval) { + case GDK_Right: + if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { + audition_right_dry_button.set_active (!audition_right_dry_button.get_active()); + } else { + audition_right_button.set_active (!audition_right_button.get_active()); + } + break; + + case GDK_Left: + if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { + audition_left_dry_button.set_active (!audition_left_dry_button.get_active()); + } else { + audition_left_button.set_active (!audition_left_button.get_active()); + } + break; + + case GDK_space: + if (_session->is_auditioning()) { + cancel_audition (); + } else { + audition_both_button.set_active (!audition_both_button.get_active()); + } + break; + + default: + break; + } + + return true; +}