/*
- 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
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
#include <cmath>
#include <sigc++/bind.h>
-#include <gtk--/frame.h>
-#include <gtk--/pixmap.h>
-#include <gtk--/scrolledwindow.h>
+#include <gtkmm/frame.h>
+#include <gtkmm/image.h>
+#include <gtkmm/scrolledwindow.h>
-#include <ardour/automation_event.h>
-#include <ardour/curve.h>
-#include <ardour/crossfade.h>
-#include <ardour/session.h>
-#include <ardour/auditioner.h>
-#include <ardour/audioplaylist.h>
-#include <ardour/playlist_templates.h>
+#include <libgnomecanvasmm/line.h>
-#include <gtkmmext/gtk_ui.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 <gtkmm2ext/gtk_ui.h>
#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;
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<Crossfade> xf, double my, double mxy)
+ : ArdourDialog (_("ardour: x-fade edit")),
xfade (xf),
- session (s),
clear_button (_("Clear")),
revert_button (_("Reset")),
audition_both_button (_("Fade")),
preroll_button (_("With Pre-roll")),
postroll_button (_("With Post-roll")),
-
+
miny (my),
maxy (mxy),
select_in_button (_("Fade In")),
select_out_button (_("Fade Out"))
{
- set_wmclass ("ardour_automationedit", "Ardour");
+ set_session (s);
+
+ set_wmclass (X_("ardour_automationedit"), "Ardour");
set_name ("CrossfadeEditWindow");
- set_title (_("ardour: x-fade edit"));
- set_position (GTK_WIN_POS_MOUSE);
+ set_position (Gtk::WIN_POS_MOUSE);
+
+ add_accel_group (ActionManager::ui_manager->get_accel_group());
- add (vpacker);
- add_events (GDK_KEY_PRESS_MASK|GDK_KEY_RELEASE_MASK|GDK_POINTER_MOTION_MASK);
+ 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 ();
}
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);
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);
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;
for (list<Preset*>::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);
for (list<Preset*>::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);
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");
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);
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->StateChanged.connect (sigc::mem_fun(*this, &CrossfadeEditor::xfade_changed));
- session.AuditionActive.connect (slot (*this, &CrossfadeEditor::audition_state_changed));
+ _session_connections.add_connection (_session->AuditionActive.connect (sigc::mem_fun(*this, &CrossfadeEditor::audition_state_changed)));
+ show_all_children();
}
CrossfadeEditor::~CrossfadeEditor()
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);
}
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<Point*>::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 ();
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<CrossfadeEditor*> (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 */
+
+ 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;
+}
+
+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*
{
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;
}
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 ();
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;
(*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 ();
y_coordinate ((*i)->y),
(*i)->x, (*i)->y);
}
-
+
WhichFade old_current = current;
current = In;
redraw ();
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<GtkCanvasItem*>::iterator i;
+ vector<ArdourCanvas::WaveView*>::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);
- }
-
-}
-
-gint
-CrossfadeEditor::_point_event (GtkCanvasItem* item, GdkEvent* event, gpointer data)
-{
- CrossfadeEditor* ed = static_cast<CrossfadeEditor*> (data);
- return ed->point_event (item, event);
-}
-
-gint
-CrossfadeEditor::point_event (GtkCanvasItem* item, GdkEvent* event)
-{
- Point* point = static_cast<Point*> (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;
+ (*i)->property_y() = yoff;
+ (*i)->property_height() = ht;
+ (*i)->property_samples_per_unit() = spu;
}
- return TRUE;
-}
-gint
-CrossfadeEditor::_curve_event (GtkCanvasItem* item, GdkEvent* event, gpointer data)
-{
- CrossfadeEditor* ed = static_cast<CrossfadeEditor*> (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 (Change)
{
- 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 ();
for (list<Point*>::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.
*/
/* 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<GtkCanvasItem*>::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<ArdourCanvas::WaveView*>::iterator i = fade[current].waves.begin(); i != fade[current].waves.end(); ++i) {
+ (*i)->property_gain_src() = static_cast<Evoral::Curve*>(&fade[current].gain_curve.curve());
}
}
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<Point*>::iterator i = fade[current].points.begin(); i != fade[current].points.end(); ++i) {
delete *i;
}
void
CrossfadeEditor::apply ()
{
- _apply_to (&xfade);
+ _apply_to (xfade);
}
void
-CrossfadeEditor::_apply_to (Crossfade* xf)
+CrossfadeEditor::_apply_to (boost::shared_ptr<Crossfade> 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;
/* OUT */
- the_end = out.const_end();
+ the_end = out.end();
--the_end;
firstx = (*out.begin())->when;
}
void
-CrossfadeEditor::setup (Crossfade* xfade)
+CrossfadeEditor::setup (boost::shared_ptr<Crossfade> 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
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
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)", "crossfade-in-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", "crossfade-in-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", "crossfade-in-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)", "crossfade-in-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", "crossfade-in-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", "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));
+ 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", "crossfade-in-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", "crossfade-in-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)", "crossfade-out-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", "crossfade-out-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", "crossfade-out-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)", "crossfade-out-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", "crossfade-out-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", "crossfade-out-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", "crossfade-out-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", "crossfade-out-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
if (wf == In) {
- for (vector<GtkCanvasItem*>::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<ArdourCanvas::WaveView*>::iterator i = fade[In].waves.begin(); i != fade[In].waves.end(); ++i) {
+ (*i)->property_wave_color() = ARDOUR_UI::config()->canvasvar_SelectedCrossfadeEditorWave.get();
+ (*i)->property_fill_color() = ARDOUR_UI::config()->canvasvar_SelectedCrossfadeEditorWave.get();
}
- for (vector<GtkCanvasItem*>::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<ArdourCanvas::WaveView*>::iterator i = fade[Out].waves.begin(); i != fade[Out].waves.end(); ++i) {
+ (*i)->property_wave_color() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorWave.get();
+ (*i)->property_fill_color() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorWave.get();
}
- 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<Point*>::iterator i = fade[Out].points.begin(); i != fade[Out].points.end(); ++i) {
- gtk_canvas_item_hide ((*i)->box);
+ (*i)->box->hide();
}
for (list<Point*>::iterator i = fade[In].points.begin(); i != fade[In].points.end(); ++i) {
- gtk_canvas_item_show ((*i)->box);
- }
-
- for (vector<Button*>::iterator i = fade_out_buttons.begin(); i != fade_out_buttons.end(); ++i) {
- (*i)->set_sensitive (false);
- }
-
- for (vector<Button*>::iterator i = fade_in_buttons.begin(); i != fade_in_buttons.end(); ++i) {
- (*i)->set_sensitive (true);
+ (*i)->box->show ();
}
} else {
- for (vector<GtkCanvasItem*>::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<ArdourCanvas::WaveView*>::iterator i = fade[In].waves.begin(); i != fade[In].waves.end(); ++i) {
+ (*i)->property_wave_color() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorWave.get();
+ (*i)->property_fill_color() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorWave.get();
}
- for (vector<GtkCanvasItem*>::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<ArdourCanvas::WaveView*>::iterator i = fade[Out].waves.begin(); i != fade[Out].waves.end(); ++i) {
+ (*i)->property_wave_color() = ARDOUR_UI::config()->canvasvar_SelectedCrossfadeEditorWave.get();
+ (*i)->property_fill_color() = ARDOUR_UI::config()->canvasvar_SelectedCrossfadeEditorWave.get();
}
- 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<Point*>::iterator i = fade[In].points.begin(); i != fade[In].points.end(); ++i) {
- gtk_canvas_item_hide ((*i)->box);
- }
-
- for (list<Point*>::iterator i = fade[Out].points.begin(); i != fade[Out].points.end(); ++i) {
- gtk_canvas_item_show ((*i)->box);
- }
-
- for (vector<Button*>::iterator i = fade_out_buttons.begin(); i != fade_out_buttons.end(); ++i) {
- (*i)->set_sensitive (true);
+ (*i)->box->hide();
}
- for (vector<Button*>::iterator i = fade_in_buttons.begin(); i != fade_in_buttons.end(); ++i) {
- (*i)->set_sensitive (false);
+ for (list<Point*>::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());
}
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<AudioRegion> 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 (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<AudioRegion>(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() = static_cast<Evoral::Curve*>(&fade[which].gain_curve.curve());
+ waveview->property_x() = canvas_border;
+ waveview->property_y() = yoff;
+ waveview->property_height() = ht;
+ waveview->property_samples_per_unit() = spu;
+ waveview->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<AudioRegion> wr, WhichFade which)
{
+ boost::shared_ptr<AudioRegion> 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 ..
*/
-
- make_waves (*r, which);
+ peaks_ready_connection.disconnect ();
+ 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());
+ nframes_t preroll;
+ nframes_t postroll;
+ nframes_t left_start_offset;
+ nframes_t right_length;
+ nframes_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();
+ }
- length = 0;
+ boost::shared_ptr<AudioRegion> left (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (xfade->out(), left_start_offset, left_length, "xfade out",
+ 0, Region::DefaultFlags, false)));
+ boost::shared_ptr<AudioRegion> right (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (xfade->in(), 0, right_length, "xfade in",
+ 0, Region::DefaultFlags, false)));
- if ((left_length = xfade.length()) < xfade.out().length() - left_start_offset) {
- length += postroll;
- }
+ //apply a 20ms declicking fade at the start and end of auditioning
+ left->set_fade_in_active(true);
+ left->set_fade_in_length(_session->frame_rate() / 50);
+ right->set_fade_out_active(true);
+ right->set_fade_out_length(_session->frame_rate() / 50);
- right_length = xfade.length();
+ pl.add_region (left, 0);
+ pl.add_region (right, 1 + preroll);
- if (xfade.in().length() - right_length < postroll) {
- right_length += postroll;
+ if (which == Left) {
+ right->set_scale_amplitude (0.0);
+ } else if (which == Right) {
+ left->set_scale_amplitude (0.0);
}
- 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);
-
/* there is only one ... */
+ pl.foreach_crossfade (sigc::mem_fun (*this, &CrossfadeEditor::setup));
- pl.foreach_crossfade (this, &CrossfadeEditor::setup);
+ _session->audition_playlist ();
+}
- session.audition_playlist ();
+void
+CrossfadeEditor::audition_both ()
+{
+ 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);
-
- session.audition_region (*left);
+ boost::shared_ptr<AudioRegion> left (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (xfade->out(), xfade->out()->length() - xfade->length(), xfade->length(), "xfade left",
+ 0, Region::DefaultFlags, false)));
+
+ _session->audition_region (left);
}
void
CrossfadeEditor::audition_left ()
{
- 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);
-
- pl.add_region (*left, 0);
- pl.add_region (*right, 1);
-
- right->set_muted (true);
-
- /* there is only one ... */
-
- pl.foreach_crossfade (this, &CrossfadeEditor::setup);
-
- session.audition_playlist ();
-
- /* memory leak for regions */
+ 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<AudioRegion> right (boost::dynamic_pointer_cast<AudioRegion> (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());
-
- 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);
-
- pl.add_region (*left, 0);
- pl.add_region (*right, 1);
-
- left->set_muted (true);
-
- /* there is only one ... */
-
- pl.foreach_crossfade (this, &CrossfadeEditor::setup);
-
- session.audition_playlist ();
+ audition (Right);
}
-
+
void
CrossfadeEditor::cancel_audition ()
{
- session.cancel_audition ();
+ _session->cancel_audition ();
}
void
{
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 ();
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 ();
{
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 ();
{
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 ();
{
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 {
}
}
}
+
+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;
+}
projects / ardour.git / blobdiff