#include <gtkmm/image.h>
#include <gtkmm/scrolledwindow.h>
+#include <libgnomecanvasmm/line.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/audiosource.h>
#include <ardour/playlist_templates.h>
+#include <ardour/region_factory.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 "color.h"
using namespace std;
using namespace ARDOUR;
+using namespace PBD;
using namespace Gtk;
using namespace sigc;
using namespace Editing;
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),
}
CrossfadeEditor::CrossfadeEditor (Session& s, Crossfade& xf, double my, double mxy)
- : ArdourDialog (_("crossfade editor")),
- cancel_button (_("Cancel")),
- ok_button (_("OK")),
+ : ArdourDialog (_("ardour: x-fade edit")),
xfade (xf),
session (s),
clear_button (_("Clear")),
{
set_wmclass ("ardour_automationedit", "Ardour");
set_name ("CrossfadeEditWindow");
- set_title (_("ardour: x-fade edit"));
set_position (Gtk::WIN_POS_MOUSE);
- add (vpacker);
add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::POINTER_MOTION_MASK);
RadioButtonGroup sel_but_group = select_in_button.get_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 = gnome_canvas_new_aa ();
-
- canvas = Glib::wrap (_canvas);
+ canvas = new ArdourCanvas::CanvasAA ();
canvas->signal_size_allocate().connect (mem_fun(*this, &CrossfadeEditor::canvas_allocation));
canvas->set_size_request (425, 200);
-
- toplevel = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS(_canvas)),
- gnome_canvas_simplerect_get_type(),
- "x1", 0.0,
- "y1", 0.0,
- "x2", 10.0,
- "y2", 10.0,
- "fill", (gboolean) TRUE,
- "fill_color_rgba", (guint32) color_map[cCrossfadeEditorBase],
- "outline_pixels", 0,
- NULL);
-
- gtk_signal_connect (GTK_OBJECT(toplevel),
- "event",
- (GtkSignalFunc) _canvas_event,
- this);
-
- fade[Out].line = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS(_canvas)),
- gnome_canvas_line_get_type (),
- "width_pixels", (guint) 1,
- "fill_color_rgba", color_map[cCrossfadeEditorLine],
- NULL);
-
- fade[Out].shading = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS(_canvas)),
- gnome_canvas_polygon_get_type(),
- "fill_color_rgba", color_map[cCrossfadeEditorLineShading],
- NULL);
- fade[In].line = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS(_canvas)),
- gnome_canvas_line_get_type (),
- "width_pixels", (guint) 1,
- "fill_color_rgba", color_map[cCrossfadeEditorLine],
- NULL);
+ toplevel = new ArdourCanvas::SimpleRect (*(canvas->root()));
+ toplevel->property_x1() = 0.0;
+ toplevel->property_y1() = 0.0;
+ toplevel->property_x2() = 10.0;
+ toplevel->property_y2() = 10.0;
+ toplevel->property_fill() = true;
+ toplevel->property_fill_color_rgba() = color_map[cCrossfadeEditorBase];
+ toplevel->property_outline_pixels() = 0;
+ toplevel->signal_event().connect (mem_fun (*this, &CrossfadeEditor::canvas_event));
- fade[In].shading = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS(_canvas)),
- gnome_canvas_polygon_get_type(),
- "fill_color_rgba", color_map[cCrossfadeEditorLineShading],
- NULL);
-
- gtk_signal_connect (GTK_OBJECT(fade[In].shading),
- "event",
- (GtkSignalFunc) _canvas_event,
- this);
-
-
- gtk_signal_connect (GTK_OBJECT(fade[Out].shading),
- "event",
- (GtkSignalFunc) _canvas_event,
- this);
-
- gtk_signal_connect (GTK_OBJECT(fade[In].line),
- "event",
- (GtkSignalFunc) _curve_event,
- this);
-
- gtk_signal_connect (GTK_OBJECT(fade[Out].line),
- "event",
- (GtkSignalFunc) _curve_event,
- this);
+ fade[Out].line = new ArdourCanvas::Line (*(canvas->root()));
+ fade[Out].line->property_width_pixels() = 1;
+ fade[Out].line->property_fill_color_rgba() = color_map[cCrossfadeEditorLine];
+
+ fade[Out].shading = new ArdourCanvas::Polygon (*(canvas->root()));
+ fade[Out].shading->property_fill_color_rgba() = color_map[cCrossfadeEditorLineShading];
+ fade[In].line = new ArdourCanvas::Line (*(canvas->root()));
+ fade[In].line->property_width_pixels() = 1;
+ fade[In].line->property_fill_color_rgba() = color_map[cCrossfadeEditorLine];
+
+ fade[In].shading = new ArdourCanvas::Polygon (*(canvas->root()));
+ fade[In].shading->property_fill_color_rgba() = color_map[cCrossfadeEditorLineShading];
+
+ fade[In].shading->signal_event().connect (mem_fun (*this, &CrossfadeEditor::canvas_event));
+ fade[In].line->signal_event().connect (mem_fun (*this, &CrossfadeEditor::curve_event));
+ fade[Out].shading->signal_event().connect (mem_fun (*this, &CrossfadeEditor::canvas_event));
+ fade[Out].line->signal_event().connect (mem_fun (*this, &CrossfadeEditor::curve_event));
select_in_button.set_name (X_("CrossfadeEditCurveButton"));
select_out_button.set_name (X_("CrossfadeEditCurveButton"));
for (list<Preset*>::iterator i = fade_in_presets->begin(); i != fade_in_presets->end(); ++i) {
- pxmap = manage (new Image (Gdk::Pixbuf::create_from_xpm_data((*i)->xpm)));
+ pxmap = manage (new Image (get_xpm((*i)->xpm)));
pbutton = manage (new Button);
pbutton->add (*pxmap);
pbutton->set_name ("CrossfadeEditButton");
for (list<Preset*>::iterator i = fade_out_presets->begin(); i != fade_out_presets->end(); ++i) {
- pxmap = manage (new Image (Gdk::Pixbuf::create_from_xpm_data((*i)->xpm)));
+ pxmap = manage (new Image (get_xpm((*i)->xpm)));
pbutton = manage (new Button);
pbutton->add (*pxmap);
pbutton->set_name ("CrossfadeEditButton");
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_left_button.signal_toggled().connect (mem_fun(*this, &CrossfadeEditor::audition_left_toggled));
audition_left_dry_button.signal_toggled().connect (mem_fun(*this, &CrossfadeEditor::audition_left_dry_toggled));
- 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);
-
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 */
xfade.StateChanged.connect (mem_fun(*this, &CrossfadeEditor::xfade_changed));
session.AuditionActive.connect (mem_fun(*this, &CrossfadeEditor::audition_state_changed));
+ show_all_children();
}
CrossfadeEditor::~CrossfadeEditor()
swap (which, current);
}
-gint
-CrossfadeEditor::_canvas_event (GnomeCanvasItem* 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 (GnomeCanvasItem* 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:
CrossfadeEditor::Point::~Point()
{
- gtk_object_destroy (GTK_OBJECT(box));
+ delete box;
}
CrossfadeEditor::Point*
{
Point* p = new Point;
- p->box = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS(_canvas)),
- gnome_canvas_simplerect_get_type(),
- "fill", (gboolean) TRUE,
- "fill_color_rgba", color_map[cCrossfadeEditorPointFill],
- "outline_color_rgba", color_map[cCrossfadeEditorPointOutline],
- "outline_pixels", (gint) 1,
- NULL);
+ p->box = new ArdourCanvas::SimpleRect (*(canvas->root()));
+ p->box->property_fill() = true;
+ p->box->property_fill_color_rgba() = color_map[cCrossfadeEditorPointFill];
+ p->box->property_outline_color_rgba() = color_map[cCrossfadeEditorPointOutline];
+ p->box->property_outline_pixels() = 1;
p->curve = fade[current].line;
- gtk_object_set_data (GTK_OBJECT(p->box), "point", p);
- gtk_signal_connect (GTK_OBJECT(p->box), "event",
- (GtkSignalFunc) _point_event,
- this);
+ p->box->signal_event().connect (bind (mem_fun (*this, &CrossfadeEditor::point_event), p));
return p;
}
double x1 = nx - half_size;
double x2 = nx + half_size;
- gnome_canvas_item_set (box,
- "x1", x1,
- "x2", x2,
- "y1", ny - half_size,
- "y2", ny + half_size,
- NULL);
+ box->property_x1() = x1;
+ box->property_x2() = x2;
+
+ box->property_y1() = ny - half_size;
+ box->property_y2() = ny + half_size;
+
x = xfract;
y = yfract;
}
void
-CrossfadeEditor::canvas_allocation (GtkAllocation *alloc)
+CrossfadeEditor::canvas_allocation (Gtk::Allocation& alloc)
{
if (toplevel) {
- gnome_canvas_item_set (toplevel,
- "x1", 0.0,
- "y1", 0.0,
- "x2", (double) _canvas->allocation.width + canvas_border,
- "y2", (double) _canvas->allocation.height + canvas_border,
- NULL);
+ toplevel->property_x1() = 0.0;
+ toplevel->property_y1() = 0.0;
+ toplevel->property_x2() = (double) canvas->get_allocation().get_width() + canvas_border;
+ toplevel->property_y2() = (double) canvas->get_allocation().get_height() + canvas_border;
}
-
- gnome_canvas_set_scroll_region (GNOME_CANVAS(_canvas), 0.0, 0.0,
- _canvas->allocation.width,
- _canvas->allocation.height);
+
+ canvas->set_scroll_region (0.0, 0.0,
+ canvas->get_allocation().get_width(),
+ canvas->get_allocation().get_height());
Point* end = make_point ();
PointSorter cmp;
}
double ht;
- vector<GnomeCanvasItem*>::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;
- gnome_canvas_item_set ((*i),
- "y", yoff,
- "height", ht,
- "samples_per_unit", spu,
- NULL);
+ (*i)->property_y() = yoff;
+ (*i)->property_height() = ht;
+ (*i)->property_samples_per_unit() = spu;
}
- ht = _canvas->allocation.height / xfade.out().n_channels();
+ ht = canvas->get_allocation().get_height() / xfade.out()->n_channels();
for (n = 0, i = fade[Out].waves.begin(); i != fade[Out].waves.end(); ++i, ++n) {
double yoff;
yoff = n * ht;
- gnome_canvas_item_set ((*i),
- "y", yoff,
- "height", ht,
- "samples_per_unit", spu,
- NULL);
+ (*i)->property_y() = yoff;
+ (*i)->property_height() = ht;
+ (*i)->property_samples_per_unit() = spu;
}
}
-gint
-CrossfadeEditor::_point_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data)
-{
- CrossfadeEditor* ed = static_cast<CrossfadeEditor*> (data);
- return ed->point_event (item, event);
-}
-
-gint
-CrossfadeEditor::point_event (GnomeCanvasItem* 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;
- }
- return TRUE;
-}
-
-gint
-CrossfadeEditor::_curve_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data)
-{
- CrossfadeEditor* ed = static_cast<CrossfadeEditor*> (data);
- return ed->curve_event (item, event);
-}
-
-gint
-CrossfadeEditor::curve_event (GnomeCanvasItem* item, GdkEvent* event)
-{
- /* treat it like a toplevel event */
-
- return canvas_event (item, event);
-}
void
CrossfadeEditor::xfade_changed (Change ignored)
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 ();
fade[current].normative_curve.get_vector (0, 1.0, vec, npoints);
- GnomeCanvasPoints* pts = get_canvas_points ("xfade edit1", npoints);
- GnomeCanvasPoints* spts = get_canvas_points ("xfade edit2", npoints + 3);
+ ArdourCanvas::Points pts;
+ ArdourCanvas::Points spts;
+
+ while (pts.size() < npoints) {
+ pts.push_back (Gnome::Art::Point (0,0));
+ }
+
+ while (spts.size() < npoints + 3) {
+ spts.push_back (Gnome::Art::Point (0,0));
+ }
/* the shade coordinates *MUST* be in anti-clockwise order.
*/
/* lower left */
- spts->coords[0] = canvas_border;
- spts->coords[1] = effective_height() + canvas_border;
+ spts[0].set_x (canvas_border);
+ spts[0].set_y (effective_height() + canvas_border);
/* lower right */
- spts->coords[2] = effective_width() + canvas_border;
- spts->coords[3] = effective_height() + canvas_border;
+ spts[1].set_x (effective_width() + canvas_border);
+ spts[1].set_y (effective_height() + canvas_border);
/* upper right */
- spts->coords[4] = effective_width() + canvas_border;
- spts->coords[5] = canvas_border;
+ spts[2].set_x (effective_width() + canvas_border);
+ spts[2].set_y (canvas_border);
} else {
/* upper left */
- spts->coords[0] = canvas_border;
- spts->coords[1] = canvas_border;
+ spts[0].set_x (canvas_border);
+ spts[0].set_y (canvas_border);
/* lower left */
- spts->coords[2] = canvas_border;
- spts->coords[3] = effective_height() + canvas_border;
+ spts[1].set_x (canvas_border);
+ spts[1].set_y (effective_height() + canvas_border);
/* lower right */
- spts->coords[4] = effective_width() + canvas_border;
- spts->coords[5] = effective_height() + canvas_border;
+ spts[2].set_x (effective_width() + canvas_border);
+ spts[2].set_y (effective_height() + canvas_border);
}
- size_t last_spt = ((npoints + 3) * 2) - 2;
+ size_t last_spt = (npoints + 3) - 1;
for (size_t i = 0; i < npoints; ++i) {
double y = vec[i];
- pts->coords[i*2] = canvas_border + i;
- pts->coords[(i*2)+1] = y_coordinate (y);
+ pts[i].set_x (canvas_border + i);
+ pts[i].set_y (y_coordinate (y));
- spts->coords[last_spt - (i*2)] = canvas_border + i;
- spts->coords[last_spt - (i*2) + 1] = pts->coords[(i*2)+1];
+ spts[last_spt - i].set_x (canvas_border + i);
+ spts[last_spt - i].set_y (pts[i].get_y());
}
- gnome_canvas_item_set (fade[current].line, "points", pts, NULL);
- gnome_canvas_item_set (fade[current].shading, "points", spts, NULL);
-
- gnome_canvas_points_unref (pts);
- gnome_canvas_points_unref (spts);
+ fade[current].line->property_points() = pts;
+ fade[current].shading->property_points() = spts;
- for (vector<GnomeCanvasItem*>::iterator i = fade[current].waves.begin(); i != fade[current].waves.end(); ++i) {
- gnome_canvas_item_set ((*i), "gain_src", &fade[current].gain_curve, NULL);
+ for (vector<ArdourCanvas::WaveView*>::iterator i = fade[current].waves.begin(); i != fade[current].waves.end(); ++i) {
+ (*i)->property_gain_src() = &fade[current].gain_curve;
}
}
fade_out_presets = new Presets;
/* FADE OUT */
-
- p = new Preset (hiin_xpm);
+ 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 (1, 1));
fade_in_presets->push_back (p);
- p = new Preset (loin_xpm);
+ p = new Preset ("loin.xpm");
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 (1, 1));
fade_in_presets->push_back (p);
- p = new Preset (regin_xpm);
+ p = new Preset ("regin.xpm");
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 (1, 1));
fade_in_presets->push_back (p);
- p = new Preset (regin2_xpm);
+ 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 (1, 1));
fade_in_presets->push_back (p);
- p = new Preset (linin_xpm);
+ p = new Preset ("linin.xpm");
p->push_back (PresetPoint (0, 0));
p->push_back (PresetPoint (1, 1));
fade_in_presets->push_back (p);
/* FADE OUT */
- p = new Preset (hiout_xpm);
+ p = new Preset ("hiout.xpm");
p->push_back (PresetPoint (0, 1));
p->push_back (PresetPoint (0.305556, 1));
p->push_back (PresetPoint (0.548611, 0.991736));
p->push_back (PresetPoint (1, 0));
fade_out_presets->push_back (p);
- p = new Preset (regout_xpm);
+ p = new Preset ("regout.xpm");
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 (1, 0));
fade_out_presets->push_back (p);
- p = new Preset (loout_xpm);
+ p = new Preset ("loout.xpm");
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 (1, 0));
fade_out_presets->push_back (p);
- p = new Preset (regout2_xpm);
+ 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 (1, 0));
fade_out_presets->push_back (p);
- p = new Preset (linout_xpm);
+ p = new Preset ("linout.xpm");
p->push_back (PresetPoint (0, 1));
p->push_back (PresetPoint (1, 0));
fade_out_presets->push_back (p);
CrossfadeEditor::curve_select_clicked (WhichFade wf)
{
current = wf;
-
+
if (wf == In) {
-
- for (vector<GnomeCanvasItem*>::iterator i = fade[In].waves.begin(); i != fade[In].waves.end(); ++i) {
- gnome_canvas_item_set ((*i), "wave_color", color_map[cSelectedCrossfadeEditorWave], NULL);
+
+ for (vector<ArdourCanvas::WaveView*>::iterator i = fade[In].waves.begin(); i != fade[In].waves.end(); ++i) {
+ (*i)->property_wave_color() = color_map[cSelectedCrossfadeEditorWave];
}
- for (vector<GnomeCanvasItem*>::iterator i = fade[Out].waves.begin(); i != fade[Out].waves.end(); ++i) {
- gnome_canvas_item_set ((*i), "wave_color", color_map[cCrossfadeEditorWave], NULL);
+ for (vector<ArdourCanvas::WaveView*>::iterator i = fade[Out].waves.begin(); i != fade[Out].waves.end(); ++i) {
+ (*i)->property_wave_color() = color_map[cCrossfadeEditorWave];
}
- gnome_canvas_item_set (fade[In].line, "fill_color_rgba", color_map[cSelectedCrossfadeEditorLine], NULL);
- gnome_canvas_item_set (fade[Out].line, "fill_color_rgba", color_map[cCrossfadeEditorLine], NULL);
- gnome_canvas_item_hide (fade[Out].shading);
- gnome_canvas_item_show (fade[In].shading);
+ fade[In].line->property_fill_color_rgba() = color_map[cSelectedCrossfadeEditorLine];
+ fade[Out].line->property_fill_color_rgba() = color_map[cCrossfadeEditorLine];
+ fade[Out].shading->hide();
+ fade[In].shading->show();
for (list<Point*>::iterator i = fade[Out].points.begin(); i != fade[Out].points.end(); ++i) {
- gnome_canvas_item_hide ((*i)->box);
+ (*i)->box->hide();
}
for (list<Point*>::iterator i = fade[In].points.begin(); i != fade[In].points.end(); ++i) {
- gnome_canvas_item_show ((*i)->box);
+ (*i)->box->show ();
}
for (vector<Button*>::iterator i = fade_out_buttons.begin(); i != fade_out_buttons.end(); ++i) {
} else {
- for (vector<GnomeCanvasItem*>::iterator i = fade[In].waves.begin(); i != fade[In].waves.end(); ++i) {
- gnome_canvas_item_set ((*i), "wave_color", color_map[cCrossfadeEditorWave], NULL);
+ for (vector<ArdourCanvas::WaveView*>::iterator i = fade[In].waves.begin(); i != fade[In].waves.end(); ++i) {
+ (*i)->property_wave_color() = color_map[cCrossfadeEditorWave];
}
- for (vector<GnomeCanvasItem*>::iterator i = fade[Out].waves.begin(); i != fade[Out].waves.end(); ++i) {
- gnome_canvas_item_set ((*i), "wave_color", color_map[cSelectedCrossfadeEditorWave], NULL);
+ for (vector<ArdourCanvas::WaveView*>::iterator i = fade[Out].waves.begin(); i != fade[Out].waves.end(); ++i) {
+ (*i)->property_wave_color() = color_map[cSelectedCrossfadeEditorWave];
}
- gnome_canvas_item_set (fade[Out].line, "fill_color_rgba", color_map[cSelectedCrossfadeEditorLine], NULL);
- gnome_canvas_item_set (fade[In].line, "fill_color_rgba", color_map[cCrossfadeEditorLine], NULL);
- gnome_canvas_item_hide (fade[In].shading);
- gnome_canvas_item_show (fade[Out].shading);
+ fade[Out].line->property_fill_color_rgba() = color_map[cSelectedCrossfadeEditorLine];
+ fade[In].line->property_fill_color_rgba() = color_map[cCrossfadeEditorLine];
+ fade[In].shading->hide();
+ fade[Out].shading->show();
for (list<Point*>::iterator i = fade[In].points.begin(); i != fade[In].points.end(); ++i) {
- gnome_canvas_item_hide ((*i)->box);
+ (*i)->box->hide();
}
for (list<Point*>::iterator i = fade[Out].points.begin(); i != fade[Out].points.end(); ++i) {
- gnome_canvas_item_show ((*i)->box);
+ (*i)->box->show();
}
for (vector<Button*>::iterator i = fade_out_buttons.begin(); i != fade_out_buttons.end(); ++i) {
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;
color = color_map[cCrossfadeEditorWave];
}
- ht = _canvas->allocation.height / (double) nchans;
+ ht = canvas->get_allocation().get_height() / (double) nchans;
spu = xfade.length() / (double) effective_width();
for (uint32_t n = 0; n < nchans; ++n) {
gdouble yoff = n * ht;
- if (region.source(n).peaks_ready (bind (mem_fun(*this, &CrossfadeEditor::peaks_ready), ®ion, which))) {
+ if (region->source(n)->peaks_ready (bind (mem_fun(*this, &CrossfadeEditor::peaks_ready), region, which), peaks_ready_connection)) {
- GnomeCanvasItem *wave = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS(_canvas)),
- gnome_canvas_waveview_get_type (),
- "data_src", (gpointer) ®ion,
- "cache_updater", (gboolean) TRUE,
- "cache", gnome_canvas_waveview_cache_new (),
- "channel", (guint32) n,
- "length_function", (gpointer) region_length_from_c,
- "sourcefile_length_function", (gpointer) sourcefile_length_from_c,
- "peak_function", (gpointer) region_read_peaks_from_c,
- "gain_function", (gpointer) curve_get_vector_from_c,
- "gain_src", &fade[which].gain_curve,
- "x", (double) canvas_border,
- "y", yoff,
- "height", ht,
- "samples_per_unit", spu,
- "amplitude_above_axis", 2.0,
- "wave_color", color,
- NULL);
+ WaveView* waveview = new WaveView (*(canvas->root()));
+
+ waveview->property_data_src() = region.get();
+ waveview->property_cache_updater() = true;
+ waveview->property_cache() = WaveView::create_cache();
+ waveview->property_channel() = n;
+ waveview->property_length_function() = (void*) region_length_from_c;
+ waveview->property_sourcefile_length_function() = (void*) sourcefile_length_from_c;
+ waveview->property_peak_function() = (void*) region_read_peaks_from_c;
+ waveview->property_gain_function() = (void*) curve_get_vector_from_c;
+ waveview->property_gain_src() = &fade[which].gain_curve;
+ waveview->property_x() = canvas_border;
+ waveview->property_y() = yoff;
+ waveview->property_height() = ht;
+ waveview->property_samples_per_unit() = spu;
+ waveview->property_amplitude_above_axis() = 2.0;
+ waveview->property_wave_color() = color;
- gnome_canvas_item_lower_to_bottom (wave);
- fade[which].waves.push_back (wave);
+ waveview->lower_to_bottom();
+ fade[which].waves.push_back (waveview);
}
}
- gnome_canvas_item_lower_to_bottom (toplevel);
+ toplevel->lower_to_bottom();
}
void
-CrossfadeEditor::peaks_ready (AudioRegion* r, WhichFade which)
+CrossfadeEditor::peaks_ready (boost::shared_ptr<AudioRegion> r, WhichFade which)
{
/* this should never be called, because the peak files for an xfade
will be ready by the time we want them. but our API forces us
to provide this, so ..
*/
-
- make_waves (*r, which);
+ peaks_ready_connection.disconnect ();
+ make_waves (r, which);
}
void
CrossfadeEditor::audition_both ()
{
- AudioPlaylist& pl (session.the_auditioner().prepare_playlist());
- jack_nframes_t preroll;
- jack_nframes_t postroll;
- jack_nframes_t length;
- jack_nframes_t left_start_offset;
- jack_nframes_t right_length;
- jack_nframes_t left_length;
+ AudioPlaylist& pl (session.the_auditioner()->prepare_playlist());
+ nframes_t preroll;
+ nframes_t postroll;
+ nframes_t length;
+ nframes_t left_start_offset;
+ nframes_t right_length;
+ nframes_t left_length;
if (preroll_button.get_active()) {
preroll = ARDOUR_UI::instance()->preroll_clock.current_duration ();
postroll = 0;
}
- if ((left_start_offset = xfade.out().length() - xfade.length()) >= preroll) {
+ if ((left_start_offset = xfade.out()->length() - xfade.length()) >= preroll) {
left_start_offset -= preroll;
}
length = 0;
- if ((left_length = xfade.length()) < xfade.out().length() - left_start_offset) {
+ if ((left_length = xfade.length()) < xfade.out()->length() - left_start_offset) {
length += postroll;
}
right_length = xfade.length();
- if (xfade.in().length() - right_length < postroll) {
+ if (xfade.in()->length() - right_length < postroll) {
right_length += postroll;
}
- AudioRegion* left = new AudioRegion (xfade.out(), left_start_offset, left_length, "xfade out",
- 0, Region::DefaultFlags, false);
- AudioRegion* right = new AudioRegion (xfade.in(), 0, right_length, "xfade in",
- 0, Region::DefaultFlags, false);
+ boost::shared_ptr<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)));
- pl.add_region (*left, 0);
- pl.add_region (*right, 1+preroll);
+ pl.add_region (left, 0);
+ pl.add_region (right, 1+preroll);
/* there is only one ... */
void
CrossfadeEditor::audition_left_dry ()
{
- AudioRegion* left = new AudioRegion (xfade.out(), xfade.out().length() - xfade.length(), xfade.length(), "xfade left",
- 0, Region::DefaultFlags, false);
+ boost::shared_ptr<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);
+ session.audition_region (left);
}
void
CrossfadeEditor::audition_left ()
{
- AudioPlaylist& pl (session.the_auditioner().prepare_playlist());
+ AudioPlaylist& pl (session.the_auditioner()->prepare_playlist());
- AudioRegion* left = new AudioRegion (xfade.out(), xfade.out().length() - xfade.length(), xfade.length(), "xfade left",
- 0, Region::DefaultFlags, false);
- AudioRegion* right = new AudioRegion (xfade.in(), 0, xfade.length(), "xfade in",
- 0, Region::DefaultFlags, false);
+ boost::shared_ptr<AudioRegion> left (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (xfade.out(), xfade.out()->length() - xfade.length(), xfade.length(), "xfade left",
+ 0, Region::DefaultFlags, false)));
+ boost::shared_ptr<AudioRegion> right (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (xfade.in(), 0, xfade.length(), "xfade in",
+ 0, Region::DefaultFlags, false)));
- pl.add_region (*left, 0);
- pl.add_region (*right, 1);
+ pl.add_region (left, 0);
+ pl.add_region (right, 1);
right->set_muted (true);
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());
+ AudioPlaylist& pl (session.the_auditioner()->prepare_playlist());
- AudioRegion* left = new AudioRegion (xfade.out(), xfade.out().length() - xfade.length(), xfade.length(), "xfade out",
- 0, Region::DefaultFlags, false);
- AudioRegion* right = new AudioRegion (xfade.out(), 0, xfade.length(), "xfade out",
- 0, Region::DefaultFlags, false);
+ boost::shared_ptr<AudioRegion> left (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (xfade.out(), xfade.out()->length() - xfade.length(), xfade.length(), "xfade out",
+ 0, Region::DefaultFlags, false)));
+ boost::shared_ptr<AudioRegion> right (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (xfade.out(), 0, xfade.length(), "xfade out",
+ 0, Region::DefaultFlags, false)));
- pl.add_region (*left, 0);
- pl.add_region (*right, 1);
+ pl.add_region (left, 0);
+ pl.add_region (right, 1);
left->set_muted (true);
projects / ardour.git / blobdiff