remove unused source files
authorRobin Gareus <robin@gareus.org>
Wed, 30 Mar 2016 23:21:03 +0000 (01:21 +0200)
committerRobin Gareus <robin@gareus.org>
Wed, 30 Mar 2016 23:21:03 +0000 (01:21 +0200)
gtk2_ardour/crossfade_edit.cc [deleted file]
gtk2_ardour/mtest.cc [deleted file]
gtk2_ardour/timecode_tester.cc [deleted file]
libs/ardour/auto_bundle.cc [deleted file]
libs/ardour/export_multiplication.cc [deleted file]

diff --git a/gtk2_ardour/crossfade_edit.cc b/gtk2_ardour/crossfade_edit.cc
deleted file mode 100644 (file)
index d6fe779..0000000
+++ /dev/null
@@ -1,1449 +0,0 @@
-/*
-    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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include <cmath>
-
-#include <sigc++/bind.h>
-
-#include <gtkmm/frame.h>
-#include <gtkmm/image.h>
-#include <gtkmm/scrolledwindow.h>
-
-
-#include "pbd/memento_command.h"
-#include "ardour/automation_list.h"
-#include "evoral/Curve.hpp"
-#include "ardour/crossfade.h"
-#include "ardour/dB.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 <gtkmm2ext/gtk_ui.h>
-
-#include "canvas/rectangle.h"
-#include "canvas/wave_view.h"
-#include "canvas/line.h"
-#include "canvas/polygon.h"
-
-#include "ardour_ui.h"
-#include "crossfade_edit.h"
-#include "rgb_macros.h"
-#include "keyboard.h"
-#include "gui_thread.h"
-#include "actions.h"
-
-using namespace std;
-using namespace ARDOUR;
-using namespace PBD;
-using namespace Gtk;
-using namespace Editing;
-
-using Gtkmm2ext::Keyboard;
-
-#include "i18n.h"
-
-const int32_t CrossfadeEditor::Point::size = 7;
-const double CrossfadeEditor::canvas_border = 10;
-CrossfadeEditor::Presets* CrossfadeEditor::fade_in_presets = 0;
-CrossfadeEditor::Presets* CrossfadeEditor::fade_out_presets = 0;
-
-CrossfadeEditor::Half::Half ()
-       : line (0)
-       , normative_curve (Evoral::Parameter(GainAutomation))
-       , gain_curve (Evoral::Parameter(GainAutomation))
-{
-}
-
-CrossfadeEditor::CrossfadeEditor (Session* s, boost::shared_ptr<Crossfade> xf, double my, double mxy)
-       : ArdourDialog (_("Edit Crossfade")),
-         xfade (xf),
-         clear_button (_("Clear")),
-         revert_button (_("Reset")),
-         audition_both_button (_("Fade")),
-         audition_left_dry_button (_("Out (dry)")),
-         audition_left_button (_("Out")),
-         audition_right_dry_button (_("In (dry)")),
-         audition_right_button (_("In")),
-
-         preroll_button (_("With Pre-roll")),
-         postroll_button (_("With Post-roll")),
-
-         miny (my),
-         maxy (mxy),
-
-         fade_in_table (3, 3),
-         fade_out_table (3, 3),
-
-         select_in_button (_("Fade In")),
-         select_out_button (_("Fade Out")),
-
-         _peaks_ready_connection (0)
-
-{
-       set_session (s);
-
-       set_wmclass (X_("ardour_automationedit"), PROGRAM_NAME);
-       set_name ("CrossfadeEditWindow");
-
-       add_accel_group (ActionManager::ui_manager->get_accel_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 ();
-       }
-
-       point_grabbed = false;
-       toplevel = 0;
-
-       canvas = new ArdourCanvas::GtkCanvas ();
-       canvas->signal_size_allocate().connect (sigc::mem_fun(*this, &CrossfadeEditor::canvas_allocation));
-       canvas->set_size_request (425, 200);
-
-       toplevel = new ArdourCanvas::Rectangle (canvas->root());
-       toplevel->set (ArdourCanvas::Rect (0, 0, 10, 10));
-       toplevel->set_fill (true);
-       toplevel->set_fill_color (UIConfiguration::instance().get_CrossfadeEditorBase());
-       toplevel->set_outline (false);
-       toplevel->Event.connect (sigc::mem_fun (*this, &CrossfadeEditor::canvas_event));
-
-       fade[Out].line = new ArdourCanvas::PolyLine (canvas->root());
-       fade[Out].line->set_outline_color (UIConfiguration::instance().get_CrossfadeEditorLine());
-
-       fade[Out].shading = new ArdourCanvas::Polygon (canvas->root());
-       fade[Out].shading->set_fill_color (UIConfiguration::instance().get_CrossfadeEditorLineShading());
-
-       fade[In].line = new ArdourCanvas::PolyLine (canvas->root());
-       fade[In].line->set_outline_color (UIConfiguration::instance().get_CrossfadeEditorLine());
-
-       fade[In].shading = new ArdourCanvas::Polygon (canvas->root());
-       fade[In].shading->set_fill_color (UIConfiguration::instance().get_CrossfadeEditorLineShading());
-
-       fade[In].shading->Event.connect (sigc::mem_fun (*this, &CrossfadeEditor::canvas_event));
-       fade[In].line->Event.connect (sigc::mem_fun (*this, &CrossfadeEditor::curve_event));
-       fade[Out].shading->Event.connect (sigc::mem_fun (*this, &CrossfadeEditor::canvas_event));
-       fade[Out].line->Event.connect (sigc::mem_fun (*this, &CrossfadeEditor::curve_event));
-
-       select_in_button.set_name (X_("CrossfadeEditCurveButton"));
-       select_out_button.set_name (X_("CrossfadeEditCurveButton"));
-
-       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_left_dry_button, false, false);
-       audition_box.pack_start (audition_left_button, false, false);
-       audition_box.pack_start (audition_both_button, false, false);
-       audition_box.pack_start (audition_right_button, false, 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);
-
-       acbox->pack_start (*audition_frame, true, false);
-
-       Frame* canvas_frame = manage (new Frame);
-       canvas_frame->add (*canvas);
-       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);
-
-       Image *pxmap;
-       Button* pbutton;
-       int row;
-       int col;
-
-       row = 1;
-       col = 0;
-
-       for (list<Preset*>::iterator i = fade_in_presets->begin(); i != fade_in_presets->end(); ++i) {
-
-               pxmap = manage (new Image (::get_icon ((*i)->image_name)));
-               pbutton = manage (new Button);
-               pbutton->add (*pxmap);
-               pbutton->set_name ("CrossfadeEditButton");
-               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);
-
-               col++;
-
-               if (col == 2) {
-                       col = 0;
-                       row++;
-               }
-       }
-
-       row = 1;
-       col = 0;
-
-       for (list<Preset*>::iterator i = fade_out_presets->begin(); i != fade_out_presets->end(); ++i) {
-
-               pxmap = manage (new Image (::get_icon ((*i)->image_name)));
-               pbutton = manage (new Button);
-               pbutton->add (*pxmap);
-               pbutton->set_name ("CrossfadeEditButton");
-               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);
-
-               col++;
-
-               if (col == 2) {
-                       col = 0;
-                       row++;
-               }
-       }
-
-       clear_button.set_name ("CrossfadeEditButton");
-       revert_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_dry_button.set_name ("CrossfadeEditAuditionButton");
-       audition_left_button.set_name ("CrossfadeEditAuditionButton");
-       audition_right_dry_button.set_name ("CrossfadeEditAuditionButton");
-       audition_right_button.set_name ("CrossfadeEditAuditionButton");
-
-       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);
-
-       Gtk::HBox* rcenter_box = manage (new HBox);
-       rcenter_box->pack_start (roll_box, true, false);
-
-       VBox* vpacker2 = manage (new (VBox));
-
-       vpacker2->set_border_width (12);
-       vpacker2->set_spacing (7);
-       vpacker2->pack_start (*acbox, false, false);
-       vpacker2->pack_start (*rcenter_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);
-
-       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-.signal_clicked().connect (sigc::mem_fun(*this, &CrossfadeEditor::dump));
-//     vpacker.pack_start (*foobut, false, false);
-
-       current = In;
-       set (xfade->fade_in(), In);
-
-       current = Out;
-       set (xfade->fade_out(), Out);
-
-       curve_select_clicked (In);
-
-       xfade->PropertyChanged.connect (state_connection, invalidator (*this), boost::bind (&CrossfadeEditor::xfade_changed, this, _1), gui_context());
-
-       _session->AuditionActive.connect (_session_connections, invalidator (*this), boost::bind (&CrossfadeEditor::audition_state_changed, this, _1), gui_context());
-       show_all_children();
-}
-
-CrossfadeEditor::~CrossfadeEditor()
-{
-       /* most objects will be destroyed when the toplevel window is. */
-
-       for (list<Point*>::iterator i = fade[In].points.begin(); i != fade[In].points.end(); ++i) {
-               delete *i;
-       }
-
-       for (list<Point*>::iterator i = fade[Out].points.begin(); i != fade[Out].points.end(); ++i) {
-               delete *i;
-       }
-
-       delete _peaks_ready_connection;
-}
-
-void
-CrossfadeEditor::dump ()
-{
-       for (AutomationList::iterator i = fade[Out].normative_curve.begin(); i != fade[Out].normative_curve.end(); ++i) {
-               cerr << (*i)->when << ' ' << (*i)->value << endl;
-       }
-}
-
-void
-CrossfadeEditor::audition_state_changed (bool yn)
-{
-       ENSURE_GUI_THREAD (*this, &CrossfadeEditor::audition_state_changed, yn)
-
-       if (!yn) {
-               audition_both_button.set_active (false);
-               audition_left_button.set_active (false);
-               audition_right_button.set_active (false);
-               audition_left_dry_button.set_active (false);
-               audition_right_dry_button.set_active (false);
-       }
-}
-
-void
-CrossfadeEditor::set (const ARDOUR::AutomationList& curve, WhichFade which)
-{
-       double firstx, endx;
-       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.end();
-       --the_end;
-
-       firstx = (*curve.begin())->when;
-       endx = (*the_end)->when;
-
-       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);
-}
-
-bool
-CrossfadeEditor::curve_event (GdkEvent* event)
-{
-       /* treat it like a toplevel event */
-
-       return canvas_event (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;
-               break;
-       default:
-               break;
-       }
-       return false;
-}
-
-CrossfadeEditor::Point::~Point()
-{
-       delete box;
-}
-
-CrossfadeEditor::Point*
-CrossfadeEditor::make_point ()
-{
-       Point* p = new Point;
-
-       p->box = new ArdourCanvas::Rectangle (canvas->root());
-       p->box->set_fill (true);
-       p->box->set_fill_color (UIConfiguration::instance().get_CrossfadeEditorPointFill());
-       p->box->set_outline_color (UIConfiguration::instance().get_CrossfadeEditorPointOutline());
-
-       p->curve = fade[current].line;
-
-       p->box->Event.connect (sigc::bind (sigc::mem_fun (*this, &CrossfadeEditor::point_event), p));
-
-       return p;
-}
-
-void
-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 ();
-
-       p->move_to (x_coordinate (x), y_coordinate (y), x, y);
-
-       fade[current].points.push_back (p);
-       fade[current].points.sort (cmp);
-
-       redraw ();
-}
-
-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;
-
-       box->set (ArdourCanvas::Rect (x1, ny - half_size, x2, ny + half_size));
-
-       x = xfract;
-       y = yfract;
-}
-
-void
-CrossfadeEditor::canvas_allocation (Gtk::Allocation& /*alloc*/)
-{
-       if (toplevel) {
-               toplevel->set (
-                       ArdourCanvas::Rect (
-                               0,
-                               0,
-                               canvas->get_allocation().get_width() + canvas_border,
-                               canvas->get_allocation().get_height() + canvas_border
-                               )
-                       );
-       }
-
-       /* XXX: CANVAS */
-//     canvas->set_scroll_region (0.0, 0.0,
-//                                canvas->get_allocation().get_width(),
-//                                canvas->get_allocation().get_height());
-
-       Point* end = make_point ();
-       PointSorter cmp;
-
-       if (fade[In].points.size() > 1) {
-               Point* old_end = fade[In].points.back();
-               fade[In].points.pop_back ();
-               end->move_to (x_coordinate (old_end->x),
-                             y_coordinate (old_end->y),
-                             old_end->x, old_end->y);
-               delete old_end;
-       } else {
-               double x = 1.0;
-               double y = 0.5;
-               end->move_to (x_coordinate (x), y_coordinate (y), x, y);
-
-       }
-
-       fade[In].points.push_back (end);
-       fade[In].points.sort (cmp);
-
-       for (list<Point*>::iterator i = fade[In].points.begin(); i != fade[In].points.end(); ++i) {
-               (*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 ();
-               end->move_to (x_coordinate (old_end->x),
-                             y_coordinate (old_end->y),
-                             old_end->x, old_end->y);
-               delete old_end;
-       } else {
-               double x = 1.0;
-               double y = 0.5;
-               end->move_to (x_coordinate (x), y_coordinate (y), x, y);
-
-       }
-
-       fade[Out].points.push_back (end);
-       fade[Out].points.sort (cmp);
-
-       for (list<Point*>::iterator i = fade[Out].points.begin(); i != fade[Out].points.end(); ++i) {
-               (*i)->move_to (x_coordinate ((*i)->x),
-                              y_coordinate ((*i)->y),
-                              (*i)->x, (*i)->y);
-       }
-
-       WhichFade old_current = current;
-       current = In;
-       redraw ();
-       current = Out;
-       redraw ();
-       current = old_current;
-
-       double spu = xfade->length() / (double) effective_width();
-
-       if (fade[In].waves.empty()) {
-               make_waves (xfade->in(), In);
-       }
-
-       if (fade[Out].waves.empty()) {
-               make_waves (xfade->out(), Out);
-       }
-
-       double ht;
-       vector<ArdourCanvas::WaveView*>::iterator i;
-       uint32_t n;
-
-       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;
-
-               (*i)->set_y_position (yoff);
-               (*i)->set_height (ht);
-               (*i)->set_samples_per_pixel (spu);
-       }
-
-       ht = canvas->get_allocation().get_height() / xfade->out()->n_channels();
-
-       for (n = 0, i = fade[Out].waves.begin(); i != fade[Out].waves.end(); ++i, ++n) {
-               double yoff;
-
-               yoff = n * ht;
-
-               (*i)->set_y_position (yoff);
-               (*i)->set_height (ht);
-               (*i)->set_samples_per_pixel (spu);
-       }
-
-}
-
-
-void
-CrossfadeEditor::xfade_changed (const PropertyChange&)
-{
-       set (xfade->fade_in(), In);
-       set (xfade->fade_out(), Out);
-}
-
-void
-CrossfadeEditor::redraw ()
-{
-       if (canvas->get_allocation().get_width() < 2) {
-               return;
-       }
-
-       framecnt_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);
-               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.curve().get_vector (0, 1.0, vec, npoints);
-
-       ArdourCanvas::Points pts;
-       ArdourCanvas::Points spts;
-
-       while (pts.size() < npoints) {
-               pts.push_back (ArdourCanvas::Duple (0,0));
-       }
-
-       while (spts.size() < npoints + 3) {
-               spts.push_back (ArdourCanvas::Duple (0,0));
-       }
-
-       /* the shade coordinates *MUST* be in anti-clockwise order.
-        */
-
-       if (current == In) {
-
-               /* lower left */
-
-               spts[0].x = canvas_border;
-               spts[0].y = effective_height() + canvas_border;
-
-               /* lower right */
-
-               spts[1].x = effective_width() + canvas_border;
-               spts[1].y = effective_height() + canvas_border;
-
-               /* upper right */
-
-               spts[2].x = effective_width() + canvas_border;
-               spts[2].y = canvas_border;
-
-
-       } else {
-
-               /*  upper left */
-
-               spts[0].x = canvas_border;
-               spts[0].y = canvas_border;
-
-               /* lower left */
-
-               spts[1].x = canvas_border;
-               spts[1].y = effective_height() + canvas_border;
-
-               /* lower right */
-
-               spts[2].x = effective_width() + canvas_border;
-               spts[2].y = effective_height() + canvas_border;
-
-       }
-
-       size_t last_spt = (npoints + 3) - 1;
-
-       for (size_t i = 0; i < npoints; ++i) {
-
-               double y = vec[i];
-
-               pts[i].x = canvas_border + i;
-               pts[i].y = y_coordinate (y);
-
-               spts[last_spt - i].x = canvas_border + i;
-               spts[last_spt - i].y = pts[i].y;
-       }
-
-       fade[current].line->set (pts);
-       fade[current].shading->set (pts);
-
-       for (vector<ArdourCanvas::WaveView*>::iterator i = fade[current].waves.begin(); i != fade[current].waves.end(); ++i) {
-               (*i)->property_gain_src() = static_cast<Evoral::Curve*>(&fade[current].gain_curve.curve());
-       }
-}
-
-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;
-       }
-
-       fade[current].points.clear ();
-
-       for (Preset::iterator i = preset->begin(); i != preset->end(); ++i) {
-               Point* p = make_point ();
-               p->move_to (x_coordinate ((*i).x), y_coordinate ((*i).y),
-                           (*i).x, (*i).y);
-               fade[current].points.push_back (p);
-       }
-
-       redraw ();
-}
-
-void
-CrossfadeEditor::apply ()
-{
-       the_editor().begin_reversible_command (_("Edit crossfade"));
-
-       XMLNode& before = xfade->get_state ();
-
-       _apply_to (xfade);
-
-       _session->add_command (
-               new MementoCommand<Crossfade> (
-                       new ARDOUR::CrossfadeBinder (_session->playlists, xfade->id ()),
-                       &before, &xfade->get_state ()
-                       )
-               );
-
-       the_editor().commit_reversible_command ();
-}
-
-void
-CrossfadeEditor::_apply_to (boost::shared_ptr<Crossfade> xf)
-{
-       ARDOUR::AutomationList& in (xf->fade_in());
-       ARDOUR::AutomationList& out (xf->fade_out());
-
-       /* IN */
-
-
-       ARDOUR::AutomationList::const_iterator the_end = in.end();
-       --the_end;
-
-       double firstx = (*in.begin())->when;
-       double endx = (*the_end)->when;
-
-       in.freeze ();
-       in.clear ();
-
-       for (list<Point*>::iterator i = fade[In].points.begin(); i != fade[In].points.end(); ++i) {
-
-               double when = firstx + ((*i)->x * (endx - firstx));
-               double value = (*i)->y;
-               in.add (when, value);
-       }
-
-       /* OUT */
-
-       the_end = out.end();
-       --the_end;
-
-       firstx = (*out.begin())->when;
-       endx = (*the_end)->when;
-
-       out.freeze ();
-       out.clear ();
-
-       for (list<Point*>::iterator i = fade[Out].points.begin(); i != fade[Out].points.end(); ++i) {
-
-               double when = firstx + ((*i)->x * (endx - firstx));
-               double value = (*i)->y;
-               out.add (when, value);
-       }
-
-       in.thaw ();
-       out.thaw ();
-}
-
-void
-CrossfadeEditor::setup (boost::shared_ptr<Crossfade> xfade)
-{
-       _apply_to (xfade);
-       xfade->set_active (true);
-       xfade->fade_in().curve().solve ();
-       xfade->fade_out().curve().solve ();
-}
-
-void
-CrossfadeEditor::clear ()
-{
-       for (list<Point*>::iterator i = fade[current].points.begin(); i != fade[current].points.end(); ++i) {
-               delete *i;
-       }
-
-       fade[current].points.clear ();
-
-       redraw ();
-}
-
-void
-CrossfadeEditor::reset ()
-{
-       set (xfade->fade_in(),  In);
-       set (xfade->fade_out(), Out);
-
-       curve_select_clicked (current);
-}
-
-void
-CrossfadeEditor::build_presets ()
-{
-       Preset* p;
-
-       fade_in_presets = new Presets;
-       fade_out_presets = new Presets;
-
-       /* FADE IN */
-
-       p = new Preset ("Linear (-6dB)", "fadein-linear");
-       p->push_back (PresetPoint (0.000000, GAIN_COEFF_SMALL));
-       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, GAIN_COEFF_UNITY));
-       fade_in_presets->push_back (p);
-
-       p = new Preset ("S(1)-curve", "fadein-S1");
-       p->push_back (PresetPoint (0, GAIN_COEFF_SMALL));
-       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, GAIN_COEFF_UNITY));
-       fade_in_presets->push_back (p);
-
-       p = new Preset ("S(2)-curve", "fadein-S2");
-       p->push_back (PresetPoint (0.0, GAIN_COEFF_SMALL));
-       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, GAIN_COEFF_UNITY));
-       fade_in_presets->push_back (p);
-
-       p = new Preset ("Constant power (-3dB)", "fadein-constant-power");
-
-       p->push_back (PresetPoint (0.000000, GAIN_COEFF_SMALL));
-       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, GAIN_COEFF_UNITY));
-
-       fade_in_presets->push_back (p);
-
-       p = new Preset ("Short cut", "fadein-short-cut");
-       p->push_back (PresetPoint (0, GAIN_COEFF_SMALL));
-       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, GAIN_COEFF_UNITY));
-       fade_in_presets->push_back (p);
-
-       p = new Preset ("Slow cut", "fadein-slow-cut");
-       p->push_back (PresetPoint (0, GAIN_COEFF_SMALL));
-       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, GAIN_COEFF_UNITY));
-       fade_in_presets->push_back (p);
-
-       p = new Preset ("Fast cut", "fadein-fast-cut");
-       p->push_back (PresetPoint (0, GAIN_COEFF_SMALL));
-       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, GAIN_COEFF_UNITY));
-       fade_in_presets->push_back (p);
-
-       p = new Preset ("Long cut", "fadein-long-cut");
-       p->push_back (PresetPoint (0, GAIN_COEFF_SMALL));
-       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, GAIN_COEFF_UNITY));
-       fade_in_presets->push_back (p);
-
-       /* FADE OUT */
-
-       // p = new Preset ("regout.xpm");
-       p = new Preset ("Linear (-6dB cut)", "fadeout-linear");
-       p->push_back (PresetPoint (0.000000, GAIN_COEFF_UNITY));
-       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, GAIN_COEFF_SMALL));
-       fade_out_presets->push_back (p);
-
-       p = new Preset ("S(1)-Curve", "fadeout-S1");
-       p->push_back (PresetPoint (0, GAIN_COEFF_UNITY));
-       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, GAIN_COEFF_SMALL));
-       fade_out_presets->push_back (p);
-
-       p = new Preset ("S(2)-Curve", "fadeout-S2");
-       p->push_back (PresetPoint (0.0, GAIN_COEFF_UNITY));
-       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, GAIN_COEFF_SMALL));
-       fade_out_presets->push_back (p);
-
-       // p = new Preset ("linout.xpm");
-       p = new Preset ("Constant power (-3dB cut)", "fadeout-constant-power");
-       p->push_back (PresetPoint (0.000000, GAIN_COEFF_UNITY));
-       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, GAIN_COEFF_SMALL));
-       fade_out_presets->push_back (p);
-
-       // p = new Preset ("hiout.xpm");
-       p = new Preset ("Short cut", "fadeout-short-cut");
-       p->push_back (PresetPoint (0, GAIN_COEFF_UNITY));
-       p->push_back (PresetPoint (0.305556, GAIN_COEFF_UNITY));
-       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, GAIN_COEFF_SMALL));
-       fade_out_presets->push_back (p);
-
-       p = new Preset ("Slow cut", "fadeout-slow-cut");
-       p->push_back (PresetPoint (0, GAIN_COEFF_UNITY));
-       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, GAIN_COEFF_SMALL));
-       fade_out_presets->push_back (p);
-
-       p = new Preset ("Fast cut", "fadeout-fast-cut");
-       p->push_back (PresetPoint (0, GAIN_COEFF_UNITY));
-       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, GAIN_COEFF_SMALL));
-       fade_out_presets->push_back (p);
-
-       // p = new Preset ("loout.xpm");
-       p = new Preset ("Long cut", "fadeout-long-cut");
-       p->push_back (PresetPoint (0, GAIN_COEFF_UNITY));
-       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, GAIN_COEFF_SMALL));
-       fade_out_presets->push_back (p);
-}
-
-void
-CrossfadeEditor::curve_select_clicked (WhichFade wf)
-{
-       current = wf;
-
-       if (wf == In) {
-
-               for (vector<ArdourCanvas::WaveView*>::iterator i = fade[In].waves.begin(); i != fade[In].waves.end(); ++i) {
-                       (*i)->set_outline_color (UIConfiguration::instance().get_SelectedCrossfadeEditorWave());
-                       (*i)->set_fill_color (UIConfiguration::instance().get_SelectedCrossfadeEditorWave());
-               }
-
-               for (vector<ArdourCanvas::WaveView*>::iterator i = fade[Out].waves.begin(); i != fade[Out].waves.end(); ++i) {
-                       (*i)->set_outline_color (UIConfiguration::instance().get_CrossfadeEditorWave());
-                       (*i)->set_fill_color (UIConfiguration::instance().get_CrossfadeEditorWave());
-               }
-
-               fade[In].line->set_outline_color (UIConfiguration::instance().get_SelectedCrossfadeEditorLine());
-               fade[Out].line->set_outline_color (UIConfiguration::instance().get_CrossfadeEditorLine());
-               fade[Out].shading->hide();
-               fade[In].shading->show();
-
-               for (list<Point*>::iterator i = fade[Out].points.begin(); i != fade[Out].points.end(); ++i) {
-                       (*i)->box->hide();
-               }
-
-               for (list<Point*>::iterator i = fade[In].points.begin(); i != fade[In].points.end(); ++i) {
-                       (*i)->box->show ();
-               }
-
-       } else {
-
-               for (vector<ArdourCanvas::WaveView*>::iterator i = fade[In].waves.begin(); i != fade[In].waves.end(); ++i) {
-                       (*i)->set_outline_color (UIConfiguration::instance().get_CrossfadeEditorWave());
-                       (*i)->set_fill_color (UIConfiguration::instance().get_CrossfadeEditorWave());
-               }
-
-               for (vector<ArdourCanvas::WaveView*>::iterator i = fade[Out].waves.begin(); i != fade[Out].waves.end(); ++i) {
-                       (*i)->set_outline_color (UIConfiguration::instance().get_SelectedCrossfadeEditorWave());
-                       (*i)->set_fill_color (UIConfiguration::instance().get_SelectedCrossfadeEditorWave());
-               }
-
-               fade[Out].line->set_outline_color (UIConfiguration::instance().get_SelectedCrossfadeEditorLine());
-               fade[In].line->set_outline_color (UIConfiguration::instance().get_CrossfadeEditorLine());
-               fade[In].shading->hide();
-               fade[Out].shading->show();
-
-               for (list<Point*>::iterator i = fade[In].points.begin(); i != fade[In].points.end(); ++i) {
-                       (*i)->box->hide();
-               }
-
-               for (list<Point*>::iterator i = fade[Out].points.begin(); i != fade[Out].points.end(); ++i) {
-                       (*i)->box->show();
-               }
-
-       }
-}
-
-double
-CrossfadeEditor::x_coordinate (double& xfract) const
-{
-       xfract = min (1.0, xfract);
-       xfract = max (0.0, xfract);
-
-       return canvas_border + (xfract * effective_width());
-}
-
-double
-CrossfadeEditor::y_coordinate (double& yfract) const
-{
-       yfract = min (1.0, yfract);
-       yfract = max (0.0, yfract);
-
-       return (canvas->get_allocation().get_height() - (canvas_border)) - (yfract * effective_height());
-}
-
-void
-CrossfadeEditor::make_waves (boost::shared_ptr<AudioRegion> region, WhichFade which)
-{
-       gdouble ht;
-       uint32_t nchans = region->n_channels();
-       guint32 color;
-       double spu;
-
-       if (which == In) {
-               color = UIConfiguration::instance().get_SelectedCrossfadeEditorWave();
-       } else {
-               color = UIConfiguration::instance().get_CrossfadeEditorWave();
-       }
-
-       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->audio_source(n)->peaks_ready (boost::bind (&CrossfadeEditor::peaks_ready, this, boost::weak_ptr<AudioRegion>(region), which), &_peaks_ready_connection, gui_context())) {
-                       ArdourCanvas::WaveView* waveview = new ArdourCanvas::WaveView (canvas->root(), region);
-
-                       waveview->set_channel (n);
-                       waveview->property_gain_function() = (void*) curve_get_vector_from_c;
-                       waveview->property_gain_src() = static_cast<Evoral::Curve*>(&fade[which].gain_curve.curve());
-                       waveview->set_x_position (canvas_border);
-                       waveview->set_y_position (yoff);
-                       waveview->set_height (ht);
-                       waveview->set_samples_per_pixel (spu);
-                       waveview->property_amplitude_above_axis() = 2.0;
-                       waveview->set_outline_color (color);
-                       waveview->set_fill_color (color);
-
-                       if (which != In) {
-                               waveview->set_region_start (region->start() + region->length() - xfade->length());
-                       }
-
-                       waveview->lower_to_bottom();
-                       fade[which].waves.push_back (waveview);
-               }
-       }
-
-       toplevel->lower_to_bottom();
-}
-
-void
-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 ..
-       */
-       delete _peaks_ready_connection;
-       _peaks_ready_connection = 0;
-
-       make_waves (r, which);
-}
-
-void
-CrossfadeEditor::audition (Audition which)
-{
-       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 (which != Left && postroll_button.get_active()) {
-               postroll = _session->frame_rate() * 2;  //2 second hardcoded postroll for now
-       } else {
-               postroll = 0;
-       }
-
-       // 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;
-
-
-       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_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 (which == Left) {
-               right_plist.add (ARDOUR::Properties::scale_amplitude, 0.0f);
-       } else if (which == Right) {
-               left_plist.add (ARDOUR::Properties::scale_amplitude, 0.0f);
-       }
-
-       boost::shared_ptr<AudioRegion> left (boost::dynamic_pointer_cast<AudioRegion>
-                                                    (RegionFactory::create (xfade->out(), left_plist, false)));
-       boost::shared_ptr<AudioRegion> right (boost::dynamic_pointer_cast<AudioRegion>
-                                             (RegionFactory::create (xfade->in(), right_plist, false)));
-
-       // apply a 20ms declicking fade at the start and end of auditioning
-       // XXX this should really be a property
-
-       left->set_fade_in_length (_session->frame_rate() / 50);
-       right->set_fade_out_length (_session->frame_rate() / 50);
-
-       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_both ()
-{
-       audition (Both);
-}
-
-void
-CrossfadeEditor::audition_left_dry ()
-{
-       PropertyList plist;
-
-       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);
-
-       boost::shared_ptr<AudioRegion> left (boost::dynamic_pointer_cast<AudioRegion>
-                                            (RegionFactory::create (xfade->out(), plist, false)));
-
-       _session->audition_region (left);
-}
-
-void
-CrossfadeEditor::audition_left ()
-{
-       audition (Left);
-}
-
-void
-CrossfadeEditor::audition_right_dry ()
-{
-       PropertyList plist;
-
-       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);
-
-       boost::shared_ptr<AudioRegion> right (boost::dynamic_pointer_cast<AudioRegion>
-                                             (RegionFactory::create (xfade->in(), plist, false)));
-
-       _session->audition_region (right);
-}
-
-void
-CrossfadeEditor::audition_right ()
-{
-       audition (Right);
-}
-
-void
-CrossfadeEditor::cancel_audition ()
-{
-       _session->cancel_audition ();
-}
-
-void
-CrossfadeEditor::audition_toggled ()
-{
-       bool x;
-
-       if ((x = audition_both_button.get_active ()) != _session->is_auditioning()) {
-
-               if (x) {
-                       audition_both ();
-               } else {
-                       cancel_audition ();
-               }
-       }
-}
-
-void
-CrossfadeEditor::audition_right_toggled ()
-{
-       bool x;
-
-       if ((x = audition_right_button.get_active ()) != _session->is_auditioning()) {
-
-               if (x) {
-                       audition_right ();
-               } else {
-                       cancel_audition ();
-               }
-       }
-}
-
-void
-CrossfadeEditor::audition_right_dry_toggled ()
-{
-       bool x;
-
-       if ((x = audition_right_dry_button.get_active ()) != _session->is_auditioning()) {
-
-               if (x) {
-                       audition_right_dry ();
-               } else {
-                       cancel_audition ();
-               }
-       }
-}
-
-void
-CrossfadeEditor::audition_left_toggled ()
-{
-       bool x;
-
-       if ((x = audition_left_button.get_active ()) != _session->is_auditioning()) {
-
-               if (x) {
-                       audition_left ();
-               } else {
-                       cancel_audition ();
-               }
-       }
-}
-
-void
-CrossfadeEditor::audition_left_dry_toggled ()
-{
-       bool x;
-
-       if ((x = audition_left_dry_button.get_active ()) != _session->is_auditioning()) {
-
-               if (x) {
-                       audition_left_dry ();
-               } else {
-                       cancel_audition ();
-               }
-       }
-}
-
-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;
-}
diff --git a/gtk2_ardour/mtest.cc b/gtk2_ardour/mtest.cc
deleted file mode 100644 (file)
index 3103a83..0000000
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
-    Copyright (C) 2000-2007 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include <vector>
-#include <iostream>
-#include <gtkmm.h>
-#include <gtkmm/accelmap.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkaccelmap.h>
-
-using namespace Gtk;
-using namespace std;
-using namespace Glib;
-
-void
-printit (string txt)
-{
-       cout << "This is the " << txt << " item\n";
-}
-
-Glib::RefPtr<Action>
-make_action (Glib::RefPtr<ActionGroup> group, string name, string label, RefPtr<AccelGroup> accels, slot<void> sl, guint key, Gdk::ModifierType mods)
-{
-       Glib::RefPtr<Action> act;
-
-       act = Action::create (name, label);
-       group->add (act, sl);
-       AccelMap::add_entry (act->get_accel_path(), key, mods);
-
-       act->set_accel_group (accels);
-
-       cerr << "action " << name << " has path " << act->get_accel_path() << endl;
-
-       return act;
-}
-
-Glib::RefPtr<Action>
-make_action (Glib::RefPtr<ActionGroup> group, string name, string label)
-{
-       Glib::RefPtr<Action> act;
-
-       act = Action::create (name, label);
-       group->add (act);
-
-       cerr << "action " << name << " has path " << act->get_accel_path() << endl;
-
-       return act;
-}
-
-bool
-lookup_entry (const string accel_path, Gtk::AccelKey& key)
-{
-       GtkAccelKey gkey;
-       bool known = gtk_accel_map_lookup_entry (accel_path.c_str(), &gkey);
-
-       if (known) {
-               key = AccelKey (gkey.accel_key, Gdk::ModifierType (gkey.accel_mods));
-       } else {
-               key = AccelKey (GDK_VoidSymbol, Gdk::ModifierType (0));
-       }
-
-       return known;
-}
-
-RefPtr<ActionGroup>
-copy_actions (const RefPtr<ActionGroup> src)
-{
-       RefPtr<ActionGroup> grp = ActionGroup::create (src->get_name());
-
-       ListHandle<RefPtr<Action> > group_actions = src->get_actions();
-
-       for (ListHandle<RefPtr<Action> >::iterator a = group_actions.begin(); a != group_actions.end(); ++a) {
-               RefPtr<Action> act = Action::create ((*a)->get_name(), (*a)->property_label());
-               grp->add (act);
-       }
-
-       return grp;
-}
-
-int
-main (int argc, char* argv[])
-{
-       Main app (argc, argv);
-       Window hidden (WINDOW_TOPLEVEL);
-       Window window (WINDOW_TOPLEVEL);
-       Window other_window (WINDOW_TOPLEVEL);
-       Button button ("click me for baz");
-       Button other_button ("click me for baz");
-       VBox   vpacker;
-       VBox   other_vpacker;
-
-       Glib::RefPtr<ActionGroup> actions;
-       Glib::RefPtr<ActionGroup> other_actions;
-       Glib::RefPtr<ActionGroup> shared_actions;
-       Glib::RefPtr<UIManager> uimanager;
-       Glib::RefPtr<UIManager> other_uimanager;
-       Glib::RefPtr<UIManager> shared_uimanager;
-
-       window.set_name ("Editor");
-       window.set_title ("Editor");
-
-       other_window.set_name ("Other");
-       other_window.set_title ("Other");
-
-       uimanager = UIManager::create();
-       other_uimanager = UIManager::create();
-       shared_uimanager = UIManager::create();
-
-       actions = ActionGroup::create("MyActions");
-       other_actions = ActionGroup::create("OtherActions");
-       shared_actions = ActionGroup::create("SharedActions");
-
-       uimanager->add_ui_from_file ("mtest.menus");
-       other_uimanager->add_ui_from_file ("mtest_other.menus");
-
-       // AccelMap::load ("mtest.bindings");
-
-       RefPtr<AccelGroup> accels = hidden.get_accel_group();
-
-       make_action (actions, "TopMenu", "top");
-       make_action (actions, "Foo", "foo", accels, sigc::bind (sigc::ptr_fun (printit), "foo"), GDK_p, Gdk::ModifierType (0));
-
-       make_action (other_actions, "OTopMenu", "otop");
-       make_action (other_actions, "OFoo", "foo", accels, sigc::bind (sigc::ptr_fun (printit), "o-foo"), GDK_p, Gdk::ModifierType (0));
-
-       make_action (shared_actions, "Bar", "bar", accels, sigc::bind (sigc::ptr_fun (printit), "barshared"), GDK_p, Gdk::CONTROL_MASK);
-       RefPtr<Action> act = make_action (shared_actions, "Baz", "baz", accels, sigc::bind (sigc::ptr_fun (printit), "baz-shared"), GDK_p, Gdk::SHIFT_MASK);
-
-       act->connect_proxy (button);
-       act->connect_proxy (other_button);
-
-       uimanager->insert_action_group (copy_actions (actions));
-       uimanager->insert_action_group (copy_actions (shared_actions));
-       other_uimanager->insert_action_group (copy_actions (other_actions));
-       other_uimanager->insert_action_group (copy_actions (shared_actions));
-
-       other_window.add_accel_group (accels);
-       // window.add_accel_group (accels);
-
-       Gtk::MenuBar* m;
-
-       m = dynamic_cast<MenuBar*>(other_uimanager->get_widget ("/OTop"));
-
-       other_vpacker.pack_start (*m);
-       other_vpacker.pack_start (other_button);
-
-       other_window.add (other_vpacker);
-       other_window.show_all ();
-
-       m = dynamic_cast<MenuBar*>(uimanager->get_widget ("/Top"));
-
-       vpacker.pack_start (*m);
-       vpacker.pack_start (button);
-
-       window.add (vpacker);
-       window.show_all ();
-
-       Settings::get_default()->property_gtk_can_change_accels() = true;
-
-       AccelMap::save ("mtest.bindings");
-
-       app.run ();
-
-       return 0;
-}
diff --git a/gtk2_ardour/timecode_tester.cc b/gtk2_ardour/timecode_tester.cc
deleted file mode 100644 (file)
index 9856231..0000000
+++ /dev/null
@@ -1,392 +0,0 @@
-/*
-    Copyright (C) 2012 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-void
-AudioClock::timecode_tester ()
-{
-#if 0
-#define Timecode_SAMPLE_TEST_1
-#define Timecode_SAMPLE_TEST_2
-#define Timecode_SAMPLE_TEST_3
-#define Timecode_SAMPLE_TEST_4
-#define Timecode_SAMPLE_TEST_5
-#define Timecode_SAMPLE_TEST_6
-#define Timecode_SAMPLE_TEST_7
-
-       // Testcode for timecode<->sample conversions (P.S.)
-       Timecode::Time timecode1;
-       framepos_t sample1;
-       framepos_t oldsample = 0;
-       Timecode::Time timecode2;
-       framecnt_t sample_increment;
-
-       sample_increment = (framecnt_t)rint(_session->frame_rate() / _session->timecode_frames_per_second);
-
-#ifdef Timecode_SAMPLE_TEST_1
-       // Test 1: use_offset = false, use_subframes = false
-       cout << "use_offset = false, use_subframes = false" << endl;
-       for (int i = 0; i < 108003; i++) {
-               _session->timecode_to_sample( timecode1, sample1, false /* use_offset */, false /* use_subframes */ );
-               _session->sample_to_timecode( sample1, timecode2, false /* use_offset */, false /* use_subframes */ );
-
-               if ((i > 0) && ( ((sample1 - oldsample) != sample_increment) && ((sample1 - oldsample) != (sample_increment + 1)) && ((sample1 - oldsample) != (sample_increment - 1)))) {
-                       cout << "ERROR: sample increment not right: " << (sample1 - oldsample) << " != " << sample_increment << endl;
-                       cout << "timecode1: " << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << " -> ";
-                       cout << "sample: " << sample1 << endl;
-                       cout << "sample: " << sample1 << " -> ";
-                       cout << "timecode2: " << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-                       break;
-               }
-
-               if (timecode2.hours != timecode1.hours || timecode2.minutes != timecode1.minutes || timecode2.seconds != timecode2.seconds || timecode2.frames != timecode1.frames) {
-                       cout << "ERROR: timecode2 not equal timecode1" << endl;
-                       cout << "timecode1: " << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << " -> ";
-                       cout << "sample: " << sample1 << endl;
-                       cout << "sample: " << sample1 << " -> ";
-                       cout << "timecode2: " << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-                       break;
-               }
-               oldsample = sample1;
-               _session->timecode_increment( timecode1 );
-       }
-
-       cout << "sample_increment: " << sample_increment << endl;
-       cout << "sample: " << sample1 << " -> ";
-       cout << "timecode: " << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-#endif
-
-#ifdef Timecode_SAMPLE_TEST_2
-       // Test 2: use_offset = true, use_subframes = false
-       cout << "use_offset = true, use_subframes = false" << endl;
-
-       timecode1.hours = 0;
-       timecode1.minutes = 0;
-       timecode1.seconds = 0;
-       timecode1.frames = 0;
-       timecode1.subframes = 0;
-       sample1 = oldsample = 0;
-
-       _session->sample_to_timecode( sample1, timecode1, true /* use_offset */, false /* use_subframes */ );
-       cout << "Starting at sample: " << sample1 << " -> ";
-       cout << "timecode: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << endl;
-
-       for (int i = 0; i < 108003; i++) {
-               _session->timecode_to_sample( timecode1, sample1, true /* use_offset */, false /* use_subframes */ );
-               _session->sample_to_timecode( sample1, timecode2, true /* use_offset */, false /* use_subframes */ );
-
-//     cout << "timecode: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << " -> ";
-//     cout << "sample: " << sample1 << endl;
-//     cout << "sample: " << sample1 << " -> ";
-//     cout << "timecode: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-
-               if ((i > 0) && ( ((sample1 - oldsample) != sample_increment) && ((sample1 - oldsample) != (sample_increment + 1)) && ((sample1 - oldsample) != (sample_increment - 1)))) {
-                       cout << "ERROR: sample increment not right: " << (sample1 - oldsample) << " != " << sample_increment << endl;
-                       cout << "timecode1: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << " -> ";
-                       cout << "sample: " << sample1 << endl;
-                       cout << "sample: " << sample1 << " -> ";
-                       cout << "timecode2: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-                       break;
-               }
-
-               if (timecode2.hours != timecode1.hours || timecode2.minutes != timecode1.minutes || timecode2.seconds != timecode2.seconds || timecode2.frames != timecode1.frames) {
-                       cout << "ERROR: timecode2 not equal timecode1" << endl;
-                       cout << "timecode1: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << " -> ";
-                       cout << "sample: " << sample1 << endl;
-                       cout << "sample: " << sample1 << " -> ";
-                       cout << "timecode2: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-                       break;
-               }
-               oldsample = sample1;
-               _session->timecode_increment( timecode1 );
-       }
-
-       cout << "sample_increment: " << sample_increment << endl;
-       cout << "sample: " << sample1 << " -> ";
-       cout << "timecode: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-#endif
-
-#ifdef Timecode_SAMPLE_TEST_3
-       // Test 3: use_offset = true, use_subframes = false, decrement
-       cout << "use_offset = true, use_subframes = false, decrement" << endl;
-
-       _session->sample_to_timecode( sample1, timecode1, true /* use_offset */, false /* use_subframes */ );
-       cout << "Starting at sample: " << sample1 << " -> ";
-       cout << "timecode: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << endl;
-
-       for (int i = 0; i < 108003; i++) {
-               _session->timecode_to_sample( timecode1, sample1, true /* use_offset */, false /* use_subframes */ );
-               _session->sample_to_timecode( sample1, timecode2, true /* use_offset */, false /* use_subframes */ );
-
-//     cout << "timecode: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << " -> ";
-//     cout << "sample: " << sample1 << endl;
-//     cout << "sample: " << sample1 << " -> ";
-//     cout << "timecode: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-
-               if ((i > 0) && ( ((oldsample - sample1) != sample_increment) && ((oldsample - sample1) != (sample_increment + 1)) && ((oldsample - sample1) != (sample_increment - 1)))) {
-                       cout << "ERROR: sample increment not right: " << (oldsample - sample1) << " != " << sample_increment << endl;
-                       cout << "timecode1: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << " -> ";
-                       cout << "sample: " << sample1 << endl;
-                       cout << "sample: " << sample1 << " -> ";
-                       cout << "timecode2: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-                       break;
-               }
-
-               if (timecode2.hours != timecode1.hours || timecode2.minutes != timecode1.minutes || timecode2.seconds != timecode2.seconds || timecode2.frames != timecode1.frames) {
-                       cout << "ERROR: timecode2 not equal timecode1" << endl;
-                       cout << "timecode1: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << " -> ";
-                       cout << "sample: " << sample1 << endl;
-                       cout << "sample: " << sample1 << " -> ";
-                       cout << "timecode2: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-                       break;
-               }
-               oldsample = sample1;
-               _session->timecode_decrement( timecode1 );
-       }
-
-       cout << "sample_decrement: " << sample_increment << endl;
-       cout << "sample: " << sample1 << " -> ";
-       cout << "timecode: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-#endif
-
-
-#ifdef Timecode_SAMPLE_TEST_4
-       // Test 4: use_offset = true, use_subframes = true
-       cout << "use_offset = true, use_subframes = true" << endl;
-
-       for (long sub = 5; sub < 80; sub += 5) {
-               timecode1.hours = 0;
-               timecode1.minutes = 0;
-               timecode1.seconds = 0;
-               timecode1.frames = 0;
-               timecode1.subframes = 0;
-               sample1 = oldsample = (sample_increment * sub) / 80;
-
-               _session->sample_to_timecode( sample1, timecode1, true /* use_offset */, true /* use_subframes */ );
-
-               cout << "starting at sample: " << sample1 << " -> ";
-               cout << "timecode: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << endl;
-
-               for (int i = 0; i < 108003; i++) {
-                       _session->timecode_to_sample( timecode1, sample1, true /* use_offset */, true /* use_subframes */ );
-                       _session->sample_to_timecode( sample1, timecode2, true /* use_offset */, true /* use_subframes */ );
-
-                       if ((i > 0) && ( ((sample1 - oldsample) != sample_increment) && ((sample1 - oldsample) != (sample_increment + 1)) && ((sample1 - oldsample) != (sample_increment - 1)))) {
-                               cout << "ERROR: sample increment not right: " << (sample1 - oldsample) << " != " << sample_increment << endl;
-                               cout << "timecode1: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << " -> ";
-                               cout << "sample: " << sample1 << endl;
-                               cout << "sample: " << sample1 << " -> ";
-                               cout << "timecode2: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-                               //break;
-                       }
-
-                       if (timecode2.hours != timecode1.hours || timecode2.minutes != timecode1.minutes || timecode2.seconds != timecode2.seconds || timecode2.frames != timecode1.frames || timecode2.subframes != timecode1.subframes) {
-                               cout << "ERROR: timecode2 not equal timecode1" << endl;
-                               cout << "timecode1: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << " -> ";
-                               cout << "sample: " << sample1 << endl;
-                               cout << "sample: " << sample1 << " -> ";
-                               cout << "timecode2: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-                               break;
-                       }
-                       oldsample = sample1;
-                       _session->timecode_increment( timecode1 );
-               }
-
-               cout << "sample_increment: " << sample_increment << endl;
-               cout << "sample: " << sample1 << " -> ";
-               cout << "timecode: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-
-               for (int i = 0; i < 108003; i++) {
-                       _session->timecode_to_sample( timecode1, sample1, true /* use_offset */, true /* use_subframes */ );
-                       _session->sample_to_timecode( sample1, timecode2, true /* use_offset */, true /* use_subframes */ );
-
-                       if ((i > 0) && ( ((oldsample - sample1) != sample_increment) && ((oldsample - sample1) != (sample_increment + 1)) && ((oldsample - sample1) != (sample_increment - 1)))) {
-                               cout << "ERROR: sample increment not right: " << (oldsample - sample1) << " != " << sample_increment << endl;
-                               cout << "timecode1: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << " -> ";
-                               cout << "sample: " << sample1 << endl;
-                               cout << "sample: " << sample1 << " -> ";
-                               cout << "timecode2: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-                               //break;
-                       }
-
-                       if (timecode2.hours != timecode1.hours || timecode2.minutes != timecode1.minutes || timecode2.seconds != timecode2.seconds || timecode2.frames != timecode1.frames || timecode2.subframes != timecode1.subframes) {
-                               cout << "ERROR: timecode2 not equal timecode1" << endl;
-                               cout << "timecode1: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << " -> ";
-                               cout << "sample: " << sample1 << endl;
-                               cout << "sample: " << sample1 << " -> ";
-                               cout << "timecode2: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-                               break;
-                       }
-                       oldsample = sample1;
-                       _session->timecode_decrement( timecode1 );
-               }
-
-               cout << "sample_decrement: " << sample_increment << endl;
-               cout << "sample: " << sample1 << " -> ";
-               cout << "timecode: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-       }
-#endif
-
-
-#ifdef Timecode_SAMPLE_TEST_5
-       // Test 5: use_offset = true, use_subframes = false, increment seconds
-       cout << "use_offset = true, use_subframes = false, increment seconds" << endl;
-
-       timecode1.hours = 0;
-       timecode1.minutes = 0;
-       timecode1.seconds = 0;
-       timecode1.frames = 0;
-       timecode1.subframes = 0;
-       sample1 = oldsample = 0;
-       sample_increment = _session->frame_rate();
-
-       _session->sample_to_timecode( sample1, timecode1, true /* use_offset */, false /* use_subframes */ );
-       cout << "Starting at sample: " << sample1 << " -> ";
-       cout << "timecode: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << endl;
-
-       for (int i = 0; i < 3600; i++) {
-               _session->timecode_to_sample( timecode1, sample1, true /* use_offset */, false /* use_subframes */ );
-               _session->sample_to_timecode( sample1, timecode2, true /* use_offset */, false /* use_subframes */ );
-
-//     cout << "timecode: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << " -> ";
-//     cout << "sample: " << sample1 << endl;
-//     cout << "sample: " << sample1 << " -> ";
-//     cout << "timecode: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-
-//     if ((i > 0) && ( ((sample1 - oldsample) != sample_increment) && ((sample1 - oldsample) != (sample_increment + 1)) && ((sample1 - oldsample) != (sample_increment - 1))))
-//     {
-//       cout << "ERROR: sample increment not right: " << (sample1 - oldsample) << " != " << sample_increment << endl;
-//       break;
-//     }
-
-               if (timecode2.hours != timecode1.hours || timecode2.minutes != timecode1.minutes || timecode2.seconds != timecode2.seconds || timecode2.frames != timecode1.frames) {
-                       cout << "ERROR: timecode2 not equal timecode1" << endl;
-                       cout << "timecode: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << " -> ";
-                       cout << "sample: " << sample1 << endl;
-                       cout << "sample: " << sample1 << " -> ";
-                       cout << "timecode: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-                       break;
-               }
-               oldsample = sample1;
-               _session->timecode_increment_seconds( timecode1 );
-       }
-
-       cout << "sample_increment: " << sample_increment << endl;
-       cout << "sample: " << sample1 << " -> ";
-       cout << "timecode: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-#endif
-
-
-#ifdef Timecode_SAMPLE_TEST_6
-       // Test 6: use_offset = true, use_subframes = false, increment minutes
-       cout << "use_offset = true, use_subframes = false, increment minutes" << endl;
-
-       timecode1.hours = 0;
-       timecode1.minutes = 0;
-       timecode1.seconds = 0;
-       timecode1.frames = 0;
-       timecode1.subframes = 0;
-       sample1 = oldsample = 0;
-       sample_increment = _session->frame_rate() * 60;
-
-       _session->sample_to_timecode( sample1, timecode1, true /* use_offset */, false /* use_subframes */ );
-       cout << "Starting at sample: " << sample1 << " -> ";
-       cout << "timecode: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << endl;
-
-       for (int i = 0; i < 60; i++) {
-               _session->timecode_to_sample( timecode1, sample1, true /* use_offset */, false /* use_subframes */ );
-               _session->sample_to_timecode( sample1, timecode2, true /* use_offset */, false /* use_subframes */ );
-
-//     cout << "timecode: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << " -> ";
-//     cout << "sample: " << sample1 << endl;
-//     cout << "sample: " << sample1 << " -> ";
-//     cout << "timecode: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-
-//     if ((i > 0) && ( ((sample1 - oldsample) != sample_increment) && ((sample1 - oldsample) != (sample_increment + 1)) && ((sample1 - oldsample) != (sample_increment - 1))))
-//     {
-//       cout << "ERROR: sample increment not right: " << (sample1 - oldsample) << " != " << sample_increment << endl;
-//       break;
-//     }
-
-               if (timecode2.hours != timecode1.hours || timecode2.minutes != timecode1.minutes || timecode2.seconds != timecode2.seconds || timecode2.frames != timecode1.frames) {
-                       cout << "ERROR: timecode2 not equal timecode1" << endl;
-                       cout << "timecode: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << " -> ";
-                       cout << "sample: " << sample1 << endl;
-                       cout << "sample: " << sample1 << " -> ";
-                       cout << "timecode: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-                       break;
-               }
-               oldsample = sample1;
-               _session->timecode_increment_minutes( timecode1 );
-       }
-
-       cout << "sample_increment: " << sample_increment << endl;
-       cout << "sample: " << sample1 << " -> ";
-       cout << "timecode: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-#endif
-
-#ifdef Timecode_SAMPLE_TEST_7
-       // Test 7: use_offset = true, use_subframes = false, increment hours
-       cout << "use_offset = true, use_subframes = false, increment hours" << endl;
-
-       timecode1.hours = 0;
-       timecode1.minutes = 0;
-       timecode1.seconds = 0;
-       timecode1.frames = 0;
-       timecode1.subframes = 0;
-       sample1 = oldsample = 0;
-       sample_increment = _session->frame_rate() * 60 * 60;
-
-       _session->sample_to_timecode( sample1, timecode1, true /* use_offset */, false /* use_subframes */ );
-       cout << "Starting at sample: " << sample1 << " -> ";
-       cout << "timecode: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << endl;
-
-       for (int i = 0; i < 10; i++) {
-               _session->timecode_to_sample( timecode1, sample1, true /* use_offset */, false /* use_subframes */ );
-               _session->sample_to_timecode( sample1, timecode2, true /* use_offset */, false /* use_subframes */ );
-
-//     cout << "timecode: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << " -> ";
-//     cout << "sample: " << sample1 << endl;
-//     cout << "sample: " << sample1 << " -> ";
-//     cout << "timecode: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-
-//     if ((i > 0) && ( ((sample1 - oldsample) != sample_increment) && ((sample1 - oldsample) != (sample_increment + 1)) && ((sample1 - oldsample) != (sample_increment - 1))))
-//     {
-//       cout << "ERROR: sample increment not right: " << (sample1 - oldsample) << " != " << sample_increment << endl;
-//       break;
-//     }
-
-               if (timecode2.hours != timecode1.hours || timecode2.minutes != timecode1.minutes || timecode2.seconds != timecode2.seconds || timecode2.frames != timecode1.frames) {
-                       cout << "ERROR: timecode2 not equal timecode1" << endl;
-                       cout << "timecode: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << " -> ";
-                       cout << "sample: " << sample1 << endl;
-                       cout << "sample: " << sample1 << " -> ";
-                       cout << "timecode: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-                       break;
-               }
-               oldsample = sample1;
-               _session->timecode_increment_hours( timecode1 );
-       }
-
-       cout << "sample_increment: " << sample_increment << endl;
-       cout << "sample: " << sample1 << " -> ";
-       cout << "timecode: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-#endif
-
-#endif
-}
diff --git a/libs/ardour/auto_bundle.cc b/libs/ardour/auto_bundle.cc
deleted file mode 100644 (file)
index a8d471a..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-    Copyright (C) 2012 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include <cassert>
-#include "ardour/auto_bundle.h"
-
-ARDOUR::AutoBundle::AutoBundle (bool i)
-       : Bundle (i)
-{
-
-}
-
-ARDOUR::AutoBundle::AutoBundle (std::string const & n, bool i)
-       : Bundle (n, i)
-{
-
-}
-
-ARDOUR::ChanCount
-ARDOUR::AutoBundle::nchannels () const
-{
-       Glib::Threads::Mutex::Lock lm (_ports_mutex);
-       return ChanCount (type(), _ports.size ());
-}
-
-const ARDOUR::PortList&
-ARDOUR::AutoBundle::channel_ports (uint32_t c) const
-{
-       assert (c < nchannels().get (type()));
-
-       Glib::Threads::Mutex::Lock lm (_ports_mutex);
-       return _ports[c];
-}
-
-void
-ARDOUR::AutoBundle::set_channels (uint32_t n)
-{
-       Glib::Threads::Mutex::Lock lm (_ports_mutex);
-       _ports.resize (n);
-}
-
-void
-ARDOUR::AutoBundle::set_port (uint32_t c, std::string const & p)
-{
-       assert (c < nchannels ().get (type()));
-
-       Glib::Threads::Mutex::Lock lm (_ports_mutex);
-       _ports[c].resize (1);
-       _ports[c][0] = p;
-}
diff --git a/libs/ardour/export_multiplication.cc b/libs/ardour/export_multiplication.cc
deleted file mode 100644 (file)
index 13b7a4a..0000000
+++ /dev/null
@@ -1,697 +0,0 @@
-/*
-    Copyright (C) 2008-2012 Paul Davis
-    Author: Sakari Bergen
-
-    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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-/* This file is not used at the moment. It includes code related to export a
- * multiplication graph system that can be used together with the ExportMultiplicator
- * class in the gtk2_ardour folder.
- * - Sakari Bergen 6.8.2008 -
- */
-
-void
-ExportProfileManager::register_all_configs ()
-{
-       list<TimespanNodePtr>::iterator tsl_it; // timespan list node iterator
-       for (tsl_it = graph.timespans.begin(); tsl_it != graph.timespans.end(); ++tsl_it) {
-               list<GraphNode *>::const_iterator cc_it; // channel config node iterator
-               for (cc_it = (*tsl_it)->get_children().begin(); cc_it != (*tsl_it)->get_children().end(); ++cc_it) {
-                       list<GraphNode *>::const_iterator f_it; // format node iterator
-                       for (f_it = (*cc_it)->get_children().begin(); f_it != (*cc_it)->get_children().end(); ++f_it) {
-                               list<GraphNode *>::const_iterator fn_it; // filename node iterator
-                               for (fn_it = (*f_it)->get_children().begin(); fn_it != (*f_it)->get_children().end(); ++fn_it) {
-                                       /* Finally loop through each timespan in the timespan list */
-
-                                       TimespanNodePtr ts_node;
-                                       if (!(ts_node = boost::dynamic_pointer_cast<TimespanNode> (*tsl_it))) {
-                                               throw ExportFailed (X_("Programming error, Invalid pointer cast in ExportProfileManager"));
-                                       }
-
-                                       TimespanListPtr ts_list = ts_node->data()->timespans;
-                                       TimespanList::iterator ts_it;
-                                       for (ts_it = ts_list->begin(); ts_it != ts_list->end(); ++ts_it) {
-
-                                               TimespanPtr timespan = *ts_it;
-
-                                               ChannelConfigNode * cc_node;
-                                               if (!(cc_node = dynamic_cast<ChannelConfigNode *> (*cc_it))) {
-                                                       throw ExportFailed (X_("Programming error, Invalid pointer cast in ExportProfileManager"));
-                                               }
-                                               ChannelConfigPtr channel_config = cc_node->data()->config;
-
-                                               FormatNode * f_node;
-                                               if (!(f_node = dynamic_cast<FormatNode *> (*f_it))) {
-                                                       throw ExportFailed (X_("Programming error, Invalid pointer cast in ExportProfileManager"));
-                                               }
-                                               FormatPtr format = f_node->data()->format;
-
-                                               FilenameNode * fn_node;
-                                               if (!(fn_node = dynamic_cast<FilenameNode *> (*fn_it))) {
-                                                       throw ExportFailed (X_("Programming error, Invalid pointer cast in ExportProfileManager"));
-                                               }
-                                               FilenamePtr filename = fn_node->data()->filename;
-
-                                               handler->add_export_config (timespan, channel_config, format, filename);
-                                       }
-                               }
-                       }
-               }
-       }
-}
-
-void
-ExportProfileManager::create_empty_config ()
-{
-       TimespanNodePtr timespan = TimespanNode::create (new TimespanState ());
-       timespan->data()->timespans->push_back (handler->add_timespan());
-
-       ChannelConfigNodePtr channel_config = ChannelConfigNode::create (new ChannelConfigState(handler->add_channel_config()));
-
-       FormatNodePtr format;
-       load_formats ();
-       if (!format_list.empty()) {
-               format = FormatNode::create (new FormatState (*format_list.begin ()));
-       } else {
-               format = FormatNode::create (new FormatState (handler->add_format ()));
-       }
-
-       FilenameNodePtr filename = FilenameNode::create (new FilenameState (handler->add_filename()));
-
-       /* Bring everything together */
-
-       timespan->add_child (channel_config.get(), 0);
-       channel_config->add_child (format.get(), 0);
-       format->add_child (filename.get(), 0);
-
-       graph.timespans.push_back (timespan);
-       graph.channel_configs.push_back (channel_config);
-       graph.formats.push_back (format);
-       graph.filenames.push_back (filename);
-}
-
-/*** GraphNode ***/
-
-uint32_t ExportProfileManager::GraphNode::id_counter = 0;
-
-ExportProfileManager::GraphNode::GraphNode ()
-{
-       _id = ++id_counter;
-}
-
-ExportProfileManager::GraphNode::~GraphNode ()
-{
-       while (!children.empty()) {
-               remove_child (children.front());
-       }
-
-       while (!parents.empty()) {
-               parents.front()->remove_child (this);
-       }
-}
-
-void
-ExportProfileManager::GraphNode::add_parent (GraphNode * parent)
-{
-       for (list<GraphNode *>::iterator it = parents.begin(); it != parents.end(); ++it) {
-               if (*it == parent) {
-                       return;
-               }
-       }
-
-       parents.push_back (parent);
-}
-
-void
-ExportProfileManager::GraphNode::add_child (GraphNode * child, GraphNode * left_sibling)
-{
-       for (list<GraphNode *>::iterator it = children.begin(); it != children.end(); ++it) {
-               if (*it == child) {
-                       return;
-               }
-       }
-
-       if (left_sibling) {
-               insert_after (children, left_sibling, child);
-       } else {
-               children.push_back (child);
-       }
-
-       child->add_parent (this);
-}
-
-bool
-ExportProfileManager::GraphNode::is_ancestor_of (GraphNode const * node) const
-{
-       for (list<GraphNode *>::const_iterator it = children.begin(); it != children.end(); ++it) {
-               if (*it == node || (*it)->is_ancestor_of (node)) {
-                       return true;
-               }
-       }
-
-       return false;
-}
-
-bool
-ExportProfileManager::GraphNode::is_descendant_of (GraphNode const * node) const
-{
-       for (list<GraphNode *>::const_iterator it = parents.begin(); it != parents.end(); ++it) {
-               if (*it == node || (*it)->is_descendant_of (node)) {
-                       return true;
-               }
-       }
-
-       return false;
-}
-
-void
-ExportProfileManager::GraphNode::select (bool value)
-{
-       if (_selected == value) { return; }
-
-       _selected = value;
-       SelectChanged (value);
-}
-
-void
-ExportProfileManager::GraphNode::remove_parent (GraphNode * parent)
-{
-       for (list<GraphNode *>::iterator it = parents.begin(); it != parents.end(); ++it) {
-               if (*it == parent) {
-                       parents.erase (it);
-                       break;
-               }
-       }
-}
-
-void
-ExportProfileManager::GraphNode::remove_child (GraphNode * child)
-{
-       for (list<GraphNode *>::iterator it = children.begin(); it != children.end(); ++it) {
-               if (*it == child) {
-                       children.erase (it);
-                       break;
-               }
-       }
-
-       child->remove_parent (this);
-}
-
-void
-ExportProfileManager::split_node (GraphNode * node, float position)
-{
-       TimespanNode * ts_node;
-       if ((ts_node = dynamic_cast<TimespanNode *> (node))) {
-               split_timespan (ts_node->self_ptr(), position);
-               return;
-       }
-
-       ChannelConfigNode * cc_node;
-       if ((cc_node = dynamic_cast<ChannelConfigNode *> (node))) {
-               split_channel_config (cc_node->self_ptr(), position);
-               return;
-       }
-
-       FormatNode * f_node;
-       if ((f_node = dynamic_cast<FormatNode *> (node))) {
-               split_format (f_node->self_ptr(), position);
-               return;
-       }
-
-       FilenameNode * fn_node;
-       if ((fn_node = dynamic_cast<FilenameNode *> (node))) {
-               split_filename (fn_node->self_ptr(), position);
-               return;
-       }
-}
-
-void
-ExportProfileManager::remove_node (GraphNode * node)
-{
-       TimespanNode * ts_node;
-       if ((ts_node = dynamic_cast<TimespanNode *> (node))) {
-               remove_timespan (ts_node->self_ptr());
-               return;
-       }
-
-       ChannelConfigNode * cc_node;
-       if ((cc_node = dynamic_cast<ChannelConfigNode *> (node))) {
-               remove_channel_config (cc_node->self_ptr());
-               return;
-       }
-
-       FormatNode * f_node;
-       if ((f_node = dynamic_cast<FormatNode *> (node))) {
-               remove_format (f_node->self_ptr());
-               return;
-       }
-
-       FilenameNode * fn_node;
-       if ((fn_node = dynamic_cast<FilenameNode *> (node))) {
-               remove_filename (fn_node->self_ptr());
-               return;
-       }
-}
-
-void
-ExportProfileManager::purge_graph ()
-{
-       for (list<TimespanNodePtr>::iterator it = graph.timespans.begin(); it != graph.timespans.end(); ) {
-               list<TimespanNodePtr>::iterator tmp = it;
-               ++it;
-
-               if ((*tmp)->get_children().empty()) {
-                       graph.timespans.erase (tmp);
-               }
-       }
-
-       for (list<ChannelConfigNodePtr>::iterator it = graph.channel_configs.begin(); it != graph.channel_configs.end(); ) {
-               list<ChannelConfigNodePtr>::iterator tmp = it;
-               ++it;
-
-               if ((*tmp)->get_parents().empty()) {
-                       graph.channel_configs.erase (tmp);
-               }
-       }
-
-       for (list<FormatNodePtr>::iterator it = graph.formats.begin(); it != graph.formats.end(); ) {
-               list<FormatNodePtr>::iterator tmp = it;
-               ++it;
-
-               if ((*tmp)->get_parents().empty()) {
-                       graph.formats.erase (tmp);
-               }
-       }
-
-       for (list<FilenameNodePtr>::iterator it = graph.filenames.begin(); it != graph.filenames.end(); ) {
-               list<FilenameNodePtr>::iterator tmp = it;
-               ++it;
-
-               if ((*tmp)->get_parents().empty()) {
-                       graph.filenames.erase (tmp);
-               }
-       }
-
-       GraphChanged();
-}
-
-template<typename T>
-void
-ExportProfileManager::insert_after (list<T> & the_list, T const & position, T const & element)
-{
-       typename list<T>::iterator it;
-       for (it = the_list.begin(); it != the_list.end(); ++it) {
-               if (*it == position) {
-                       the_list.insert (++it, element);
-                       return;
-               }
-       }
-
-       std::cerr << "invalid position given to ExportProfileManager::insert_after (aborting)" << std::endl;
-
-       abort();
-}
-
-template<typename T>
-void
-ExportProfileManager::remove_by_element (list<T> & the_list, T const & element)
-{
-       typename list<T>::iterator it;
-       for (it = the_list.begin(); it != the_list.end(); ++it) {
-               if (*it == element) {
-                       the_list.erase (it);
-                       return;
-               }
-       }
-}
-
-bool
-ExportProfileManager::nodes_have_one_common_child (list<GraphNode *> const & the_list)
-{
-       return end_of_common_child_range (the_list, the_list.begin()) == --the_list.end();
-}
-
-list<ExportProfileManager::GraphNode *>::const_iterator
-ExportProfileManager::end_of_common_child_range (list<GraphNode *> const & the_list, list<GraphNode *>::const_iterator beginning)
-{
-       if ((*beginning)->get_children().size() != 1) { return beginning; }
-       GraphNode * child = (*beginning)->get_children().front();
-
-       list<GraphNode *>::const_iterator it = beginning;
-       while (it != the_list.end() && (*it)->get_children().size() == 1 && (*it)->get_children().front() == child) {
-               ++it;
-       }
-
-       return --it;
-}
-
-void
-ExportProfileManager::split_node_at_position (GraphNode * old_node, GraphNode * new_node, float position)
-{
-       list<GraphNode *> const & node_parents = old_node->get_parents();
-       uint32_t split_index = (int) (node_parents.size() * position + 0.5);
-       split_index = std::max ((uint32_t) 1, std::min (split_index, node_parents.size() - 1));
-
-       list<GraphNode *>::const_iterator it = node_parents.begin();
-       for (uint32_t index = 1; it != node_parents.end(); ++index) {
-               if (index > split_index) {
-                       list<GraphNode *>::const_iterator tmp = it++;
-                       (*tmp)->add_child (new_node, old_node);
-                       (*tmp)->remove_child (old_node);
-               } else {
-                       ++it;
-               }
-       }
-}
-
-void
-ExportProfileManager::split_timespan (TimespanNodePtr node, float)
-{
-       TimespanNodePtr new_timespan = duplicate_timespan_node (node);
-       insert_after (graph.timespans, node, new_timespan);
-
-       /* Note: Since a timespan selector allows all combinations of ranges
-        * there is no reason for a channel configuration to have two parents
-        */
-
-       duplicate_timespan_children (node->self_ptr(), new_timespan);
-
-       GraphChanged();
-}
-
-void
-ExportProfileManager::split_channel_config (ChannelConfigNodePtr node, float)
-{
-       ChannelConfigNodePtr new_config = duplicate_channel_config_node (node);
-       insert_after (graph.channel_configs, node, new_config);
-
-       /* Channel configs have only one parent, see above! */
-       node->get_parents().front()->add_child (new_config.get(), node.get());
-
-       if (node->get_children().size() == 1) {
-               new_config->add_child (node->first_child(), 0);
-       } else {
-               duplicate_channel_config_children (node, new_config);
-       }
-
-       GraphChanged();
-}
-
-void
-ExportProfileManager::split_format (FormatNodePtr node, float position)
-{
-       FormatNodePtr new_format = duplicate_format_node (node);
-       insert_after (graph.formats, node, new_format);
-
-       list<GraphNode *> const & node_parents = node->get_parents();
-       if (node_parents.size() == 1) {
-               node_parents.front()->add_child (new_format.get(), 0);
-       } else {
-               node->sort_parents (graph.channel_configs);
-               split_node_at_position (node.get(), new_format.get(), position);
-       }
-
-       if (node->get_children().size() == 1) {
-               new_format->add_child (node->first_child(), 0);
-       } else {
-               duplicate_format_children (node, new_format);
-       }
-
-       GraphChanged();
-}
-
-void
-ExportProfileManager::split_filename (FilenameNodePtr node, float position)
-{
-       FilenameNodePtr new_filename = duplicate_filename_node (node);
-       insert_after (graph.filenames, node, new_filename);
-
-       list<GraphNode *> const & node_parents = node->get_parents();
-
-       if (node_parents.size() == 1) {
-               node_parents.front()->add_child (new_filename.get(), 0);
-       } else {
-               node->sort_parents (graph.formats);
-               split_node_at_position (node.get(), new_filename.get(), position);
-       }
-
-       GraphChanged();
-}
-
-void
-ExportProfileManager::duplicate_timespan_children (TimespanNodePtr source, TimespanNodePtr target, GraphNode * insertion_point)
-{
-       list<GraphNode *> const & source_children = source->get_children();
-       bool one_grandchild = nodes_have_one_common_child (source_children);
-       GraphNode * child_insertion_point = 0;
-
-       ChannelConfigNodePtr node_insertion_point;
-       ChannelConfigNode * node_insertion_ptr;
-       if (!insertion_point) { insertion_point = source->last_child(); }
-       if (!(node_insertion_ptr = dynamic_cast<ChannelConfigNode *> (insertion_point))) {
-               throw ExportFailed (X_("Programming error, Invalid pointer cast in ExportProfileManager"));
-       }
-       node_insertion_point = node_insertion_ptr->self_ptr();
-
-       /* Keep track of common children */
-
-       list<GraphNode *>::const_iterator common_children_begin = source_children.begin();
-       list<GraphNode *>::const_iterator common_children_end = end_of_common_child_range (source_children, source_children.begin());
-       GraphNode * common_child = 0;
-
-       for (list<GraphNode *>::const_iterator it = source_children.begin(); it != source_children.end(); ++it) {
-               /* Duplicate node */
-
-               ChannelConfigNode *  node;
-               ChannelConfigNodePtr new_node;
-
-               if (!(node = dynamic_cast<ChannelConfigNode *> (*it))) {
-                       throw ExportFailed (X_("Programming error, Invalid pointer cast in ExportProfileManager"));
-               }
-
-               new_node = duplicate_channel_config_node (node->self_ptr());
-
-               /* Insert in gaph's list and update insertion position */
-
-               insert_after (graph.channel_configs, node_insertion_point, new_node);
-               node_insertion_point = new_node;
-
-               /* Handle children */
-
-               target->add_child (new_node.get(), child_insertion_point);
-               child_insertion_point = new_node.get();
-
-               if (one_grandchild) {
-                       new_node->add_child (node->first_child(), 0);
-               } else {
-                       list<GraphNode *>::const_iterator past_end = common_children_end;
-                       if (it == ++past_end) { // At end => start new range
-                               common_children_begin = it;
-                               common_children_end = end_of_common_child_range (source_children, it);
-                       }
-
-                       if (it == common_children_begin) { // At beginning => do duplication
-                               GraphNode * grand_child_ins_pt = common_child;
-                               if (!grand_child_ins_pt) {
-                                       grand_child_ins_pt = source->last_child()->last_child();
-                               }
-                               duplicate_channel_config_children (node->self_ptr(), new_node, grand_child_ins_pt);
-                               common_child = new_node->first_child();
-                       } else { // Somewhere in between end and beginning => share child
-                               new_node->add_child (common_child, 0);
-                       }
-               }
-       }
-}
-
-void
-ExportProfileManager::duplicate_channel_config_children (ChannelConfigNodePtr source, ChannelConfigNodePtr target, GraphNode * insertion_point)
-{
-       list<GraphNode *> const & source_children = source->get_children();
-       bool one_grandchild = nodes_have_one_common_child (source_children);
-       GraphNode * child_insertion_point = 0;
-
-       FormatNodePtr node_insertion_point;
-       FormatNode * node_insertion_ptr;
-       if (!insertion_point) { insertion_point = source->last_child(); }
-       if (!(node_insertion_ptr = dynamic_cast<FormatNode *> (insertion_point))) {
-               throw ExportFailed (X_("Programming error, Invalid pointer cast in ExportProfileManager"));
-       }
-       node_insertion_point = node_insertion_ptr->self_ptr();
-
-       /* Keep track of common children */
-
-       list<GraphNode *>::const_iterator common_children_begin = source_children.begin();
-       list<GraphNode *>::const_iterator common_children_end = end_of_common_child_range (source_children, source_children.begin());
-       GraphNode * common_child = 0;
-
-       for (list<GraphNode *>::const_iterator it = source_children.begin(); it != source_children.end(); ++it) {
-               /* Duplicate node */
-
-               FormatNode *  node;
-               FormatNodePtr new_node;
-
-               if (!(node = dynamic_cast<FormatNode *> (*it))) {
-                       throw ExportFailed (X_("Programming error, Invalid pointer cast in ExportProfileManager"));
-               }
-
-               new_node = duplicate_format_node (node->self_ptr());
-
-               /* Insert in gaph's list and update insertion position */
-
-               insert_after (graph.formats, node_insertion_point, new_node);
-               node_insertion_point = new_node;
-
-               /* Handle children */
-
-               target->add_child (new_node.get(), child_insertion_point);
-               child_insertion_point = new_node.get();
-
-               if (one_grandchild) {
-                       new_node->add_child (node->first_child(), 0);
-               } else {
-                       list<GraphNode *>::const_iterator past_end = common_children_end;
-                       if (it == ++past_end) { // At end => start new range
-                               common_children_begin = it;
-                               common_children_end = end_of_common_child_range (source_children, it);
-                       }
-
-                       if (it == common_children_begin) { // At beginning => do duplication
-                               GraphNode * grand_child_ins_pt = common_child;
-                               if (!grand_child_ins_pt) {
-                                       grand_child_ins_pt = source->get_parents().back()->last_child()->last_child()->last_child();
-                               }
-                               duplicate_format_children (node->self_ptr(), new_node, grand_child_ins_pt);
-                               common_child = new_node->first_child();
-                       } else { // Somewhere in between end and beginning => share child
-                               new_node->add_child (common_child, 0);
-                       }
-               }
-       }
-}
-
-void
-ExportProfileManager::duplicate_format_children (FormatNodePtr source, FormatNodePtr target, GraphNode * insertion_point)
-{
-       GraphNode * child_insertion_point = 0;
-
-       FilenameNodePtr node_insertion_point;
-       FilenameNode * node_insertion_ptr;
-       if (!insertion_point) { insertion_point = source->last_child(); }
-       if (!(node_insertion_ptr = dynamic_cast<FilenameNode *> (insertion_point))) {
-               throw ExportFailed (X_("Programming error, Invalid pointer cast in ExportProfileManager"));
-       }
-       node_insertion_point = node_insertion_ptr->self_ptr();
-
-       for (list<GraphNode *>::const_iterator it = source->get_children().begin(); it != source->get_children().end(); ++it) {
-               /* Duplicate node */
-
-               FilenameNode *  node;
-               FilenameNodePtr new_node;
-
-               if (!(node = dynamic_cast<FilenameNode *> (*it))) {
-                       throw ExportFailed (X_("Programming error, Invalid pointer cast in ExportProfileManager"));
-               }
-
-               new_node = duplicate_filename_node (node->self_ptr());
-
-               /* Insert in gaph's list and update insertion position */
-
-               insert_after (graph.filenames, node_insertion_point, new_node);
-               node_insertion_point = new_node;
-
-               /* Handle children */
-
-               target->add_child (new_node.get(), child_insertion_point);
-               child_insertion_point = new_node.get();
-       }
-}
-
-ExportProfileManager::TimespanNodePtr
-ExportProfileManager::duplicate_timespan_node (TimespanNodePtr node)
-{
-       TimespanStatePtr state = node->data();
-       TimespanStatePtr new_state (new TimespanState ());
-       TimespanNodePtr  new_node = TimespanNode::create (new_state);
-
-       for (TimespanList::iterator it = state->timespans->begin(); it != state->timespans->end(); ++it) {
-               new_state->timespans->push_back (handler->add_timespan_copy (*it));
-       }
-
-       new_state->time_format = state->time_format;
-       new_state->marker_format = state->marker_format;
-
-       return new_node;
-}
-
-ExportProfileManager::ChannelConfigNodePtr
-ExportProfileManager::duplicate_channel_config_node (ChannelConfigNodePtr node)
-{
-       ChannelConfigStatePtr state = node->data();
-       ChannelConfigStatePtr new_state (new ChannelConfigState (handler->add_channel_config_copy (state->config)));
-       ChannelConfigNodePtr  new_node = ChannelConfigNode::create (new_state);
-
-       return new_node;
-}
-
-ExportProfileManager::FormatNodePtr
-ExportProfileManager::duplicate_format_node (FormatNodePtr node)
-{
-       FormatStatePtr state = node->data();
-       FormatStatePtr new_state (new FormatState (handler->add_format_copy (state->format)));
-       FormatNodePtr  new_node = FormatNode::create (new_state);
-
-       return new_node;
-}
-
-ExportProfileManager::FilenameNodePtr
-ExportProfileManager::duplicate_filename_node (FilenameNodePtr node)
-{
-       FilenameStatePtr state = node->data();
-       FilenameStatePtr new_state (new FilenameState (handler->add_filename_copy (state->filename)));
-       FilenameNodePtr  new_node = FilenameNode::create (new_state);
-
-       return new_node;
-}
-
-void
-ExportProfileManager::remove_timespan (TimespanNodePtr node)
-{
-       remove_by_element (graph.timespans, node);
-       purge_graph ();
-}
-
-void
-ExportProfileManager::remove_channel_config (ChannelConfigNodePtr node)
-{
-       remove_by_element (graph.channel_configs, node);
-       purge_graph ();
-}
-
-void
-ExportProfileManager::remove_format (FormatNodePtr node)
-{
-       remove_by_element (graph.formats, node);
-       purge_graph ();
-}
-
-void
-ExportProfileManager::remove_filename (FilenameNodePtr node)
-{
-       remove_by_element (graph.filenames, node);
-       purge_graph ();
-}