6:20 a.m.
The package rpms/ardour2.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/ardour2.git/commit/?id=1fbda0629d....
Change:
-%ifarch x86_64
Thanks.
Full change:
============
commit 1fbda0629d146e0f6704227575300f4236ec3874
Author: Nils Philippsen <nils(a)redhat.com>
Date: Tue Mar 20 12:20:37 2018 +0100
Obsoleted by ardour5.
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index ec37559..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/ardour-2.8.16.tar.bz2
diff --git a/0001-Add-boost-linking-to-tranzport-and-generic-midi-surf.patch
b/0001-Add-boost-linking-to-tranzport-and-generic-midi-surf.patch
deleted file mode 100644
index 1c5ba07..0000000
--- a/0001-Add-boost-linking-to-tranzport-and-generic-midi-surf.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From ba7881d97f701960b9cea04f9911ba105857c3fa Mon Sep 17 00:00:00 2001
-From: David Henningsson <david.henningsson(a)canonical.com>
-Date: Thu, 3 Oct 2013 20:26:52 +0200
-Subject: [PATCH] Add boost linking to "tranzport" and "generic midi"
surfaces
-
-This fixes the following scary errors, shown at startup:
-ardour: [ERROR]: ControlProtocolManager: cannot load module
"/usr/lib/ardour2/surfaces//libardour_genericmidi.so"
(/usr/lib/ardour2/surfaces//libardour_genericmidi.so: undefined symbol:
_ZN5boost6system15system_categoryEv)
-ardour: [ERROR]: ControlProtocolManager: cannot load module
"/usr/lib/ardour2/surfaces//libardour_tranzport.so"
(/usr/lib/ardour2/surfaces//libardour_tranzport.so: undefined symbol:
_ZN5boost6system15system_categoryEv)
-
-Signed-off-by: David Henningsson <david.henningsson(a)canonical.com>
----
- libs/surfaces/generic_midi/SConscript | 3 ++-
- libs/surfaces/tranzport/SConscript | 1 +
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/libs/surfaces/generic_midi/SConscript
b/libs/surfaces/generic_midi/SConscript
-index 27f8865..ce37359 100644
---- a/libs/surfaces/generic_midi/SConscript
-+++ b/libs/surfaces/generic_midi/SConscript
-@@ -42,7 +42,8 @@ genericmidi.Merge ([
- libraries['usb'],
- libraries['xml'],
- libraries['glib2'],
-- libraries['glibmm2']
-+ libraries['glibmm2'],
-+ libraries['boost']
- ])
-
- libardour_genericmidi = genericmidi.SharedLibrary('ardour_genericmidi',
genericmidi_files)
-diff --git a/libs/surfaces/tranzport/SConscript b/libs/surfaces/tranzport/SConscript
-index c2ab351..3ea0d4f 100644
---- a/libs/surfaces/tranzport/SConscript
-+++ b/libs/surfaces/tranzport/SConscript
-@@ -64,6 +64,7 @@ tranzport.Merge ([
- libraries['glib2'],
- libraries['glibmm2'],
- libraries['usb'],
-+ libraries['boost'],
- libraries['sndfile']
- ])
-
---
-1.8.3.2
-
diff --git a/0002-Add-boost-linking-to-wiimote.patch
b/0002-Add-boost-linking-to-wiimote.patch
deleted file mode 100644
index 03beca5..0000000
--- a/0002-Add-boost-linking-to-wiimote.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ardour-2.8.16/libs/surfaces/wiimote/SConscript~ 2009-10-01 07:56:53.000000000 -0700
-+++ ardour-2.8.16/libs/surfaces/wiimote/SConscript 2014-10-23 10:59:30.000000000 -0700
-@@ -42,7 +42,8 @@
- libraries['usb'],
- libraries['xml'],
- libraries['glib2'],
-- libraries['glibmm2']
-+ libraries['glibmm2'],
-+ libraries['boost']
- ])
-
- libardour_wiimote = wiimote.SharedLibrary('ardour_wiimote', wiimote_files)
diff --git a/ardour-2.5-HOST_NOT_FOUND.patch b/ardour-2.5-HOST_NOT_FOUND.patch
deleted file mode 100644
index 827743e..0000000
--- a/ardour-2.5-HOST_NOT_FOUND.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- gtk2_ardour/ardour_ui.h~ 2008-06-17 07:58:37.000000000 -0700
-+++ gtk2_ardour/ardour_ui.h 2008-09-21 08:19:26.000000000 -0700
-@@ -53,6 +53,9 @@
- #include <gtkmm/textbuffer.h>
- #include <gtkmm/adjustment.h>
- #include <gtkmm2ext/gtk_ui.h>
-+#ifdef HOST_NOT_FOUND
-+#undef HOST_NOT_FOUND
-+#endif
- #include <gtkmm2ext/click_box.h>
- #include <gtkmm2ext/stateful_button.h>
- #include <gtkmm2ext/bindable_button.h>
diff --git a/ardour-2.8.16-aubio04.patch b/ardour-2.8.16-aubio04.patch
deleted file mode 100644
index 308bdd6..0000000
--- a/ardour-2.8.16-aubio04.patch
+++ /dev/null
@@ -1,363 +0,0 @@
-From 799e4369f1850c36fae856477539cebd2d0c3ad0 Mon Sep 17 00:00:00 2001
-From: Robin Gareus <robin(a)gareus.org>
-Date: Sun, 12 Jan 2014 18:11:14 +0100
-Subject: [PATCH] aubio 3+4 compat
-
-plus relevant changes for scons
-(cherry picked from commit 1eaa30b7257f006878c9b2c88ecbaea5bc36b174)
----
- SConstruct | 2 +
- libs/vamp-plugins/Onset.cpp | 125 +++++++++++++++++++++++++++++++++++++++++---
- libs/vamp-plugins/Onset.h | 26 +++++++--
- 3 files changed, 142 insertions(+), 11 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index 7ad8cdf..290bce1 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -514,6 +514,8 @@ if conf.CheckPKGExists ('fftw3'):
- if conf.CheckPKGExists ('aubio'):
- libraries['aubio'] = LibraryInfo()
- libraries['aubio'].ParseConfig('pkg-config --cflags --libs aubio')
-+ if conf.CheckPKGVersion ('aubio', '0.4.0'):
-+ env.Append (CCFLAGS="-DHAVE_AUBIO4")
-
- env = conf.Finish ()
-
-diff --git a/libs/vamp-plugins/Onset.cpp b/libs/vamp-plugins/Onset.cpp
-index d475b11..64f197c 100644
---- a/libs/vamp-plugins/Onset.cpp
-+++ b/libs/vamp-plugins/Onset.cpp
-@@ -22,29 +22,51 @@ using std::vector;
- using std::cerr;
- using std::endl;
-
-+#ifdef HAVE_AUBIO4
-+const char *getAubioNameForOnsetType(OnsetType t)
-+{
-+ // In the same order as the enum elements in the header
-+ static const char *const names[] = {
-+ "energy", "specdiff", "hfc", "complex",
"phase", "kl", "mkl", "specflux"
-+ };
-+ return names[(int)t];
-+}
-+#endif
-+
- Onset::Onset(float inputSampleRate) :
- Plugin(inputSampleRate),
- m_ibuf(0),
-- m_fftgrain(0),
- m_onset(0),
-+#ifdef HAVE_AUBIO4
-+ m_onsetdet(0),
-+ m_onsettype(OnsetComplex),
-+ m_minioi(4),
-+ m_silence(-70),
-+#else
-+ m_fftgrain(0),
- m_pv(0),
- m_peakpick(0),
- m_onsetdet(0),
- m_onsettype(aubio_onset_complex),
-- m_threshold(0.3),
-+ m_channelCount(1),
- m_silence(-90),
-- m_channelCount(1)
-+#endif
-+ m_threshold(0.3)
- {
- }
-
- Onset::~Onset()
- {
-+#ifdef HAVE_AUBIO4
-+ if (m_onsetdet) del_aubio_onset(m_onsetdet);
-+#else
- if (m_onsetdet) aubio_onsetdetection_free(m_onsetdet);
-- if (m_ibuf) del_fvec(m_ibuf);
-- if (m_onset) del_fvec(m_onset);
- if (m_fftgrain) del_cvec(m_fftgrain);
- if (m_pv) del_aubio_pvoc(m_pv);
- if (m_peakpick) del_aubio_peakpicker(m_peakpick);
-+#endif
-+ if (m_ibuf) del_fvec(m_ibuf);
-+ if (m_onset) del_fvec(m_onset);
- }
-
- string
-@@ -74,7 +96,11 @@ Onset::getMaker() const
- int
- Onset::getPluginVersion() const
- {
-+#ifdef HAVE_AUBIO4
-+ return 2;
-+#else
- return 1;
-+#endif
- }
-
- string
-@@ -86,10 +112,20 @@ Onset::getCopyright() const
- bool
- Onset::initialise(size_t channels, size_t stepSize, size_t blockSize)
- {
-- m_channelCount = channels;
- m_stepSize = stepSize;
- m_blockSize = blockSize;
-
-+#ifdef HAVE_AUBIO4
-+ if (channels != 1) {
-+ std::cerr << "Onset::initialise: channels must be 1" <<
std::endl;
-+ return false;
-+ }
-+ m_ibuf = new_fvec(stepSize);
-+ m_onset = new_fvec(1);
-+ reset();
-+#else
-+ m_channelCount = channels;
-+
- m_ibuf = new_fvec(stepSize, channels);
- m_onset = new_fvec(1, channels);
- m_fftgrain = new_cvec(blockSize, channels);
-@@ -103,13 +139,32 @@ Onset::initialise(size_t channels, size_t stepSize, size_t
blockSize)
-
- m_lastOnset = Vamp::RealTime::zeroTime - m_delay - m_delay;
-
-+#endif
- return true;
- }
-
-+#ifdef HAVE_AUBIO4
- void
- Onset::reset()
- {
-+ if (m_onsetdet) del_aubio_onset(m_onsetdet);
-+
-+ m_onsetdet = new_aubio_onset
-+ (const_cast<char *>(getAubioNameForOnsetType(m_onsettype)),
-+ m_blockSize,
-+ m_stepSize,
-+ lrintf(m_inputSampleRate));
-+
-+ aubio_onset_set_threshold(m_onsetdet, m_threshold);
-+ aubio_onset_set_silence(m_onsetdet, m_silence);
-+ aubio_onset_set_minioi(m_onsetdet, m_minioi);
-+
-+ m_delay = Vamp::RealTime::frame2RealTime(4 * m_stepSize,
-+ lrintf(m_inputSampleRate));
-+
-+ m_lastOnset = Vamp::RealTime::zeroTime - m_delay - m_delay;
- }
-+#endif
-
- size_t
- Onset::getPreferredStepSize() const
-@@ -132,8 +187,13 @@ Onset::getParameterDescriptors() const
- desc.identifier = "onsettype";
- desc.name = "Onset Detection Function Type";
- desc.minValue = 0;
-+#ifdef HAVE_AUBIO4
-+ desc.maxValue = 7;
-+ desc.defaultValue = (int)OnsetComplex;
-+#else
- desc.maxValue = 6;
- desc.defaultValue = (int)aubio_onset_complex;
-+#endif
- desc.isQuantized = true;
- desc.quantizeStep = 1;
- desc.valueNames.push_back("Energy Based");
-@@ -143,6 +203,9 @@ Onset::getParameterDescriptors() const
- desc.valueNames.push_back("Phase Deviation");
- desc.valueNames.push_back("Kullback-Liebler");
- desc.valueNames.push_back("Modified Kullback-Liebler");
-+#ifdef HAVE_AUBIO4
-+ desc.valueNames.push_back("Spectral Flux");
-+#endif
- list.push_back(desc);
-
- desc = ParameterDescriptor();
-@@ -159,11 +222,27 @@ Onset::getParameterDescriptors() const
- desc.name = "Silence Threshold";
- desc.minValue = -120;
- desc.maxValue = 0;
-+#ifdef HAVE_AUBIO4
-+ desc.defaultValue = -70;
-+#else
- desc.defaultValue = -90;
-+#endif
- desc.unit = "dB";
- desc.isQuantized = false;
- list.push_back(desc);
-
-+#ifdef HAVE_AUBIO4
-+ desc = ParameterDescriptor();
-+ desc.identifier = "minioi";
-+ desc.name = "Minimum Inter-Onset Interval";
-+ desc.minValue = 0;
-+ desc.maxValue = 40;
-+ desc.defaultValue = 4;
-+ desc.unit = "ms";
-+ desc.isQuantized = true;
-+ desc.quantizeStep = 1;
-+ list.push_back(desc);
-+#endif
- return list;
- }
-
-@@ -176,6 +255,10 @@ Onset::getParameter(std::string param) const
- return m_threshold;
- } else if (param == "silencethreshold") {
- return m_silence;
-+#ifdef HAVE_AUBIO4
-+ } else if (param == "minioi") {
-+ return m_minioi;
-+#endif
- } else {
- return 0.0;
- }
-@@ -186,6 +269,16 @@ Onset::setParameter(std::string param, float value)
- {
- if (param == "onsettype") {
- switch (lrintf(value)) {
-+#ifdef HAVE_AUBIO4
-+ case 0: m_onsettype = OnsetEnergy; break;
-+ case 1: m_onsettype = OnsetSpecDiff; break;
-+ case 2: m_onsettype = OnsetHFC; break;
-+ case 3: m_onsettype = OnsetComplex; break;
-+ case 4: m_onsettype = OnsetPhase; break;
-+ case 5: m_onsettype = OnsetKL; break;
-+ case 6: m_onsettype = OnsetMKL; break;
-+ case 7: m_onsettype = OnsetSpecFlux; break;
-+#else
- case 0: m_onsettype = aubio_onset_energy; break;
- case 1: m_onsettype = aubio_onset_specdiff; break;
- case 2: m_onsettype = aubio_onset_hfc; break;
-@@ -193,11 +286,16 @@ Onset::setParameter(std::string param, float value)
- case 4: m_onsettype = aubio_onset_phase; break;
- case 5: m_onsettype = aubio_onset_kl; break;
- case 6: m_onsettype = aubio_onset_mkl; break;
-+#endif
- }
- } else if (param == "peakpickthreshold") {
- m_threshold = value;
- } else if (param == "silencethreshold") {
- m_silence = value;
-+#ifdef HAVE_AUBIO4
-+ } else if (param == "minioi") {
-+ m_minioi = value;
-+#endif
- }
- }
-
-@@ -216,6 +314,7 @@ Onset::getOutputDescriptors() const
- d.sampleRate = 0;
- list.push_back(d);
-
-+#ifndef HAVE_AUBIO4
- d = OutputDescriptor();
- d.identifier = "detectionfunction";
- d.name = "Onset Detection Function";
-@@ -226,7 +325,7 @@ Onset::getOutputDescriptors() const
- d.isQuantized = false;
- d.sampleType = OutputDescriptor::OneSamplePerStep;
- list.push_back(d);
--
-+#endif
- return list;
- }
-
-@@ -234,6 +333,15 @@ Onset::FeatureSet
- Onset::process(const float *const *inputBuffers,
- Vamp::RealTime timestamp)
- {
-+#ifdef HAVE_AUBIO4
-+ for (size_t i = 0; i < m_stepSize; ++i) {
-+ fvec_set_sample(m_ibuf, inputBuffers[0][i], i);
-+ }
-+
-+ aubio_onset_do(m_onsetdet, m_ibuf, m_onset);
-+
-+ bool isonset = m_onset->data[0];
-+#else
- for (size_t i = 0; i < m_stepSize; ++i) {
- for (size_t j = 0; j < m_channelCount; ++j) {
- fvec_write_sample(m_ibuf, inputBuffers[j][i], j, i);
-@@ -250,6 +358,7 @@ Onset::process(const float *const *inputBuffers,
- isonset = false;
- }
- }
-+#endif
-
- FeatureSet returnFeatures;
-
-@@ -263,11 +372,13 @@ Onset::process(const float *const *inputBuffers,
- m_lastOnset = timestamp;
- }
- }
-+#ifndef HAVE_AUBIO4
- Feature feature;
- for (size_t j = 0; j < m_channelCount; ++j) {
- feature.values.push_back(m_onset->data[j][0]);
- }
- returnFeatures[1].push_back(feature);
-+#endif
-
- return returnFeatures;
- }
-diff --git a/libs/vamp-plugins/Onset.h b/libs/vamp-plugins/Onset.h
-index 314e107..bba95e0 100644
---- a/libs/vamp-plugins/Onset.h
-+++ b/libs/vamp-plugins/Onset.h
-@@ -20,6 +20,19 @@
- #include <vamp-sdk/Plugin.h>
- #include <aubio/aubio.h>
-
-+#ifdef HAVE_AUBIO4
-+enum OnsetType {
-+ OnsetEnergy,
-+ OnsetSpecDiff,
-+ OnsetHFC,
-+ OnsetComplex,
-+ OnsetPhase,
-+ OnsetKL,
-+ OnsetMKL,
-+ OnsetSpecFlux // new in 0.4!
-+};
-+#endif
-+
- class Onset : public Vamp::Plugin
- {
- public:
-@@ -54,20 +67,25 @@ public:
-
- protected:
- fvec_t *m_ibuf;
-- cvec_t *m_fftgrain;
- fvec_t *m_onset;
-+#ifdef HAVE_AUBIO4
-+ aubio_onset_t *m_onsetdet;
-+ OnsetType m_onsettype;
-+ float m_minioi;
-+#else
-+ cvec_t *m_fftgrain;
- aubio_pvoc_t *m_pv;
- aubio_pickpeak_t *m_peakpick;
- aubio_onsetdetection_t *m_onsetdet;
- aubio_onsetdetection_type m_onsettype;
-- float m_threshold;
-+ size_t m_channelCount;
-+#endif
- float m_silence;
-+ float m_threshold;
- size_t m_stepSize;
- size_t m_blockSize;
-- size_t m_channelCount;
- Vamp::RealTime m_delay;
- Vamp::RealTime m_lastOnset;
- };
-
--
- #endif
---
-2.6.3
-
diff --git a/ardour-2.8.16-c++11-bool-from-pointer.patch
b/ardour-2.8.16-c++11-bool-from-pointer.patch
deleted file mode 100644
index b91a9d3..0000000
--- a/ardour-2.8.16-c++11-bool-from-pointer.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From de79d5107f0d4e47199ac9b733be2d0783791605 Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils(a)tiptoe.de>
-Date: Fri, 27 Nov 2015 20:31:20 +0100
-Subject: [PATCH] C++11: don't cast pointer into bool
-
----
- gtk2_ardour/editor_region_list.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gtk2_ardour/editor_region_list.cc b/gtk2_ardour/editor_region_list.cc
-index 054ef04..0e7cd53 100644
---- a/gtk2_ardour/editor_region_list.cc
-+++ b/gtk2_ardour/editor_region_list.cc
-@@ -94,7 +94,7 @@ Editor::add_audio_region_to_region_display
(boost::shared_ptr<AudioRegion> regio
- Gdk::Color c;
- bool missing_source;
-
-- missing_source =
boost::dynamic_pointer_cast<SilentFileSource>(region->source());
-+ missing_source =
boost::dynamic_pointer_cast<SilentFileSource>(region->source()) != NULL;
-
- if (!show_automatic_regions_in_region_list && region->automatic()) {
- return;
---
-2.6.3
-
diff --git a/ardour-2.8.16-c++11-namespaces.patch b/ardour-2.8.16-c++11-namespaces.patch
deleted file mode 100644
index 87283bc..0000000
--- a/ardour-2.8.16-c++11-namespaces.patch
+++ /dev/null
@@ -1,2782 +0,0 @@
-From c40bff17c7c5ebe13f1a00f49f92c3ddb1179cf9 Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils(a)tiptoe.de>
-Date: Sat, 28 Nov 2015 23:59:50 +0100
-Subject: [PATCH] C++11: use explicit namespaces for clashing symbol names
-
----
- gtk2_ardour/ardour_ui2.cc | 36 ++--
- gtk2_ardour/ardour_ui_ed.cc | 234 ++++++++++++------------
- gtk2_ardour/audio_clock.cc | 202 ++++++++++----------
- gtk2_ardour/audio_region_editor.cc | 4 +-
- gtk2_ardour/automation_line.cc | 2 +-
- gtk2_ardour/crossfade_edit.cc | 14 +-
- gtk2_ardour/editor.cc | 204 ++++++++++-----------
- gtk2_ardour/editor_audio_import.cc | 4 +-
- gtk2_ardour/editor_canvas.cc | 16 +-
- gtk2_ardour/editor_markers.cc | 16 +-
- gtk2_ardour/editor_ops.cc | 14 +-
- gtk2_ardour/editor_selection.cc | 2 +-
- gtk2_ardour/generic_pluginui.cc | 40 ++--
- gtk2_ardour/io_selector.cc | 16 +-
- gtk2_ardour/level_meter.cc | 4 +-
- gtk2_ardour/mixer_strip.cc | 18 +-
- gtk2_ardour/mixer_ui.cc | 24 +--
- gtk2_ardour/option_editor.cc | 24 +--
- gtk2_ardour/plugin_ui.cc | 4 +-
- gtk2_ardour/route_time_axis.cc | 36 ++--
- gtk2_ardour/time_axis_view_item.cc | 2 +-
- libs/ardour/automation_event.cc | 4 +-
- libs/ardour/session.cc | 88 ++++-----
- libs/gtkmm2ext/gtk_ui.cc | 6 +-
- libs/surfaces/mackie/mackie_control_protocol.cc | 4 +-
- libs/surfaces/mackie/mackie_jog_wheel.cc | 3 +-
- 26 files changed, 510 insertions(+), 511 deletions(-)
-
-diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
-index 7107b64..aa4ee8a 100644
---- a/gtk2_ardour/ardour_ui2.cc
-+++ b/gtk2_ardour/ardour_ui2.cc
-@@ -76,7 +76,7 @@ ARDOUR_UI::setup_windows ()
- setup_transport();
- build_menu_bar ();
-
-- theme_manager->signal_unmap().connect (bind
(sigc::ptr_fun(&ActionManager::uncheck_toggleaction),
X_("<Actions>/Common/ToggleThemeManager")));
-+ theme_manager->signal_unmap().connect (sigc::bind
(sigc::ptr_fun(&ActionManager::uncheck_toggleaction),
X_("<Actions>/Common/ToggleThemeManager")));
-
- #ifdef TOP_MENUBAR
- HBox* status_bar_packer = manage (new HBox);
-@@ -156,7 +156,7 @@ ARDOUR_UI::setup_transport ()
- {
- transport_tearoff = manage (new TearOff (transport_tearoff_hbox));
- transport_tearoff->set_name ("TransportBase");
-- transport_tearoff->tearoff_window().signal_key_press_event().connect (bind
(sigc::ptr_fun (relay_key_press), &transport_tearoff->tearoff_window()));
-+ transport_tearoff->tearoff_window().signal_key_press_event().connect (sigc::bind
(sigc::ptr_fun (relay_key_press), &transport_tearoff->tearoff_window()));
-
- if (Profile->get_sae()) {
- transport_tearoff->set_can_be_torn_off (false);
-@@ -171,13 +171,13 @@ ARDOUR_UI::setup_transport ()
- transport_frame.set_name ("BaseFrame");
- transport_frame.add (transport_base);
-
-- transport_tearoff->Detach.connect (bind (mem_fun(*this,
&ARDOUR_UI::detach_tearoff), static_cast<Box*>(&top_packer),
-+ transport_tearoff->Detach.connect (sigc::bind (mem_fun(*this,
&ARDOUR_UI::detach_tearoff), static_cast<Box*>(&top_packer),
- static_cast<Widget*>(&transport_frame)));
-- transport_tearoff->Attach.connect (bind (mem_fun(*this,
&ARDOUR_UI::reattach_tearoff), static_cast<Box*> (&top_packer),
-+ transport_tearoff->Attach.connect (sigc::bind (mem_fun(*this,
&ARDOUR_UI::reattach_tearoff), static_cast<Box*> (&top_packer),
- static_cast<Widget*> (&transport_frame), 1));
-- transport_tearoff->Hidden.connect (bind (mem_fun(*this,
&ARDOUR_UI::detach_tearoff), static_cast<Box*>(&top_packer),
-+ transport_tearoff->Hidden.connect (sigc::bind (mem_fun(*this,
&ARDOUR_UI::detach_tearoff), static_cast<Box*>(&top_packer),
- static_cast<Widget*>(&transport_frame)));
-- transport_tearoff->Visible.connect (bind (mem_fun(*this,
&ARDOUR_UI::reattach_tearoff), static_cast<Box*> (&top_packer),
-+ transport_tearoff->Visible.connect (sigc::bind (mem_fun(*this,
&ARDOUR_UI::reattach_tearoff), static_cast<Box*> (&top_packer),
- static_cast<Widget*> (&transport_frame), 1));
-
- shuttle_box.set_name ("TransportButton");
-@@ -282,8 +282,8 @@ ARDOUR_UI::setup_transport ()
-
- /* clocks, etc. */
-
-- ARDOUR_UI::Clock.connect (bind (mem_fun (primary_clock, &AudioClock::set), 1));
-- ARDOUR_UI::Clock.connect (bind (mem_fun (secondary_clock, &AudioClock::set), 2));
-+ ARDOUR_UI::Clock.connect (sigc::bind (mem_fun (primary_clock, &AudioClock::set),
1));
-+ ARDOUR_UI::Clock.connect (sigc::bind (mem_fun (secondary_clock, &AudioClock::set),
2));
-
- primary_clock.ValueChanged.connect (mem_fun(*this,
&ARDOUR_UI::primary_clock_value_changed));
- secondary_clock.ValueChanged.connect (mem_fun(*this,
&ARDOUR_UI::secondary_clock_value_changed));
-@@ -433,9 +433,9 @@ ARDOUR_UI::setup_transport ()
- void
- ARDOUR_UI::manage_window (Window& win)
- {
-- win.signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), &win));
-- win.signal_enter_notify_event().connect (bind (mem_fun (Keyboard::the_keyboard(),
&Keyboard::enter_window), &win));
-- win.signal_leave_notify_event().connect (bind (mem_fun (Keyboard::the_keyboard(),
&Keyboard::leave_window), &win));
-+ win.signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it),
&win));
-+ win.signal_enter_notify_event().connect (sigc::bind (mem_fun (Keyboard::the_keyboard(),
&Keyboard::enter_window), &win));
-+ win.signal_leave_notify_event().connect (sigc::bind (mem_fun (Keyboard::the_keyboard(),
&Keyboard::leave_window), &win));
- }
-
- void
-@@ -472,7 +472,7 @@ ARDOUR_UI::_auditioning_changed (bool onoff)
- void
- ARDOUR_UI::auditioning_changed (bool onoff)
- {
-- UI::instance()->call_slot(bind (mem_fun(*this,
&ARDOUR_UI::_auditioning_changed), onoff));
-+ UI::instance()->call_slot(sigc::bind (mem_fun(*this,
&ARDOUR_UI::_auditioning_changed), onoff));
- }
-
- void
-@@ -542,27 +542,27 @@ ARDOUR_UI::build_shuttle_context_menu ()
-
- RadioMenuItem::Group group;
-
-- speed_items.push_back (RadioMenuElem (group, "8", bind (mem_fun (*this,
&ARDOUR_UI::set_shuttle_max_speed), 8.0f)));
-+ speed_items.push_back (RadioMenuElem (group, "8", sigc::bind (mem_fun (*this,
&ARDOUR_UI::set_shuttle_max_speed), 8.0f)));
- if (shuttle_max_speed == 8.0) {
- static_cast<RadioMenuItem*>(&speed_items.back())->set_active ();
- }
-- speed_items.push_back (RadioMenuElem (group, "6", bind (mem_fun (*this,
&ARDOUR_UI::set_shuttle_max_speed), 6.0f)));
-+ speed_items.push_back (RadioMenuElem (group, "6", sigc::bind (mem_fun (*this,
&ARDOUR_UI::set_shuttle_max_speed), 6.0f)));
- if (shuttle_max_speed == 6.0) {
- static_cast<RadioMenuItem*>(&speed_items.back())->set_active ();
- }
-- speed_items.push_back (RadioMenuElem (group, "4", bind (mem_fun (*this,
&ARDOUR_UI::set_shuttle_max_speed), 4.0f)));
-+ speed_items.push_back (RadioMenuElem (group, "4", sigc::bind (mem_fun (*this,
&ARDOUR_UI::set_shuttle_max_speed), 4.0f)));
- if (shuttle_max_speed == 4.0) {
- static_cast<RadioMenuItem*>(&speed_items.back())->set_active ();
- }
-- speed_items.push_back (RadioMenuElem (group, "3", bind (mem_fun (*this,
&ARDOUR_UI::set_shuttle_max_speed), 3.0f)));
-+ speed_items.push_back (RadioMenuElem (group, "3", sigc::bind (mem_fun (*this,
&ARDOUR_UI::set_shuttle_max_speed), 3.0f)));
- if (shuttle_max_speed == 3.0) {
- static_cast<RadioMenuItem*>(&speed_items.back())->set_active ();
- }
-- speed_items.push_back (RadioMenuElem (group, "2", bind (mem_fun (*this,
&ARDOUR_UI::set_shuttle_max_speed), 2.0f)));
-+ speed_items.push_back (RadioMenuElem (group, "2", sigc::bind (mem_fun (*this,
&ARDOUR_UI::set_shuttle_max_speed), 2.0f)));
- if (shuttle_max_speed == 2.0) {
- static_cast<RadioMenuItem*>(&speed_items.back())->set_active ();
- }
-- speed_items.push_back (RadioMenuElem (group, "1.5", bind (mem_fun (*this,
&ARDOUR_UI::set_shuttle_max_speed), 1.5f)));
-+ speed_items.push_back (RadioMenuElem (group, "1.5", sigc::bind (mem_fun
(*this, &ARDOUR_UI::set_shuttle_max_speed), 1.5f)));
- if (shuttle_max_speed == 1.5) {
- static_cast<RadioMenuItem*>(&speed_items.back())->set_active ();
- }
-diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
-index 9ae5a71..47a3a8f 100644
---- a/gtk2_ardour/ardour_ui_ed.cc
-+++ b/gtk2_ardour/ardour_ui_ed.cc
-@@ -108,7 +108,7 @@ ARDOUR_UI::install_actions ()
-
- /* the real actions */
-
-- act = ActionManager::register_action (main_actions, X_("New"),
_("New"), hide_return (bind (mem_fun(*this,
&ARDOUR_UI::get_session_parameters), true, true)));
-+ act = ActionManager::register_action (main_actions, X_("New"),
_("New"), hide_return (sigc::bind (mem_fun(*this,
&ARDOUR_UI::get_session_parameters), true, true)));
-
- ActionManager::register_action (main_actions, X_("Open"),
_("Open"), mem_fun(*this, &ARDOUR_UI::open_session));
- ActionManager::register_action (main_actions, X_("Recent"),
_("Recent"), mem_fun(*this, &ARDOUR_UI::open_recent_session));
-@@ -116,7 +116,7 @@ ARDOUR_UI::install_actions ()
- ActionManager::session_sensitive_actions.push_back (act);
-
- act = ActionManager::register_action (main_actions, X_("AddTrackBus"),
_("Add Track/Bus"),
-- bind (mem_fun(*this, &ARDOUR_UI::add_route), (Gtk::Window*) 0));
-+ sigc::bind (mem_fun(*this, &ARDOUR_UI::add_route), (Gtk::Window*) 0));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::write_sensitive_actions.push_back (act);
-
-@@ -135,11 +135,11 @@ ARDOUR_UI::install_actions ()
-
- /* </CMT Additions> */
-
-- act = ActionManager::register_action (main_actions, X_("Snapshot"),
_("Snapshot"), bind (mem_fun(*this, &ARDOUR_UI::snapshot_session),
false));
-+ act = ActionManager::register_action (main_actions, X_("Snapshot"),
_("Snapshot"), sigc::bind (mem_fun(*this, &ARDOUR_UI::snapshot_session),
false));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::write_sensitive_actions.push_back (act);
-
-- act = ActionManager::register_action (main_actions, X_("Save As"),
_("Save As"), bind (mem_fun(*this, &ARDOUR_UI::snapshot_session), true));
-+ act = ActionManager::register_action (main_actions, X_("Save As"),
_("Save As"), sigc::bind (mem_fun(*this, &ARDOUR_UI::snapshot_session),
true));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::write_sensitive_actions.push_back (act);
-
-@@ -181,23 +181,23 @@ ARDOUR_UI::install_actions ()
-
- RadioAction::Group jack_latency_group;
-
-- act = ActionManager::register_radio_action (jack_actions, jack_latency_group,
X_("JACKLatency32"), X_("32"), bind (mem_fun(*this,
&ARDOUR_UI::set_jack_buffer_size), (nframes_t) 32));
-+ act = ActionManager::register_radio_action (jack_actions, jack_latency_group,
X_("JACKLatency32"), X_("32"), sigc::bind (mem_fun(*this,
&ARDOUR_UI::set_jack_buffer_size), (nframes_t) 32));
- ActionManager::jack_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (jack_actions, jack_latency_group,
X_("JACKLatency64"), X_("64"), bind (mem_fun(*this,
&ARDOUR_UI::set_jack_buffer_size), (nframes_t) 64));
-+ act = ActionManager::register_radio_action (jack_actions, jack_latency_group,
X_("JACKLatency64"), X_("64"), sigc::bind (mem_fun(*this,
&ARDOUR_UI::set_jack_buffer_size), (nframes_t) 64));
- ActionManager::jack_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (jack_actions, jack_latency_group,
X_("JACKLatency128"), X_("128"), bind (mem_fun(*this,
&ARDOUR_UI::set_jack_buffer_size), (nframes_t) 128));
-+ act = ActionManager::register_radio_action (jack_actions, jack_latency_group,
X_("JACKLatency128"), X_("128"), sigc::bind (mem_fun(*this,
&ARDOUR_UI::set_jack_buffer_size), (nframes_t) 128));
- ActionManager::jack_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (jack_actions, jack_latency_group,
X_("JACKLatency256"), X_("256"), bind (mem_fun(*this,
&ARDOUR_UI::set_jack_buffer_size), (nframes_t) 256));
-+ act = ActionManager::register_radio_action (jack_actions, jack_latency_group,
X_("JACKLatency256"), X_("256"), sigc::bind (mem_fun(*this,
&ARDOUR_UI::set_jack_buffer_size), (nframes_t) 256));
- ActionManager::jack_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (jack_actions, jack_latency_group,
X_("JACKLatency512"), X_("512"), bind (mem_fun(*this,
&ARDOUR_UI::set_jack_buffer_size), (nframes_t) 512));
-+ act = ActionManager::register_radio_action (jack_actions, jack_latency_group,
X_("JACKLatency512"), X_("512"), sigc::bind (mem_fun(*this,
&ARDOUR_UI::set_jack_buffer_size), (nframes_t) 512));
- ActionManager::jack_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (jack_actions, jack_latency_group,
X_("JACKLatency1024"), X_("1024"), bind (mem_fun(*this,
&ARDOUR_UI::set_jack_buffer_size), (nframes_t) 1024));
-+ act = ActionManager::register_radio_action (jack_actions, jack_latency_group,
X_("JACKLatency1024"), X_("1024"), sigc::bind (mem_fun(*this,
&ARDOUR_UI::set_jack_buffer_size), (nframes_t) 1024));
- ActionManager::jack_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (jack_actions, jack_latency_group,
X_("JACKLatency2048"), X_("2048"), bind (mem_fun(*this,
&ARDOUR_UI::set_jack_buffer_size), (nframes_t) 2048));
-+ act = ActionManager::register_radio_action (jack_actions, jack_latency_group,
X_("JACKLatency2048"), X_("2048"), sigc::bind (mem_fun(*this,
&ARDOUR_UI::set_jack_buffer_size), (nframes_t) 2048));
- ActionManager::jack_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (jack_actions, jack_latency_group,
X_("JACKLatency4096"), X_("4096"), bind (mem_fun(*this,
&ARDOUR_UI::set_jack_buffer_size), (nframes_t) 4096));
-+ act = ActionManager::register_radio_action (jack_actions, jack_latency_group,
X_("JACKLatency4096"), X_("4096"), sigc::bind (mem_fun(*this,
&ARDOUR_UI::set_jack_buffer_size), (nframes_t) 4096));
- ActionManager::jack_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (jack_actions, jack_latency_group,
X_("JACKLatency8192"), X_("8192"), bind (mem_fun(*this,
&ARDOUR_UI::set_jack_buffer_size), (nframes_t) 8192));
-+ act = ActionManager::register_radio_action (jack_actions, jack_latency_group,
X_("JACKLatency8192"), X_("8192"), sigc::bind (mem_fun(*this,
&ARDOUR_UI::set_jack_buffer_size), (nframes_t) 8192));
- ActionManager::jack_sensitive_actions.push_back (act);
-
- /* these actions are intended to be shared across all windows */
-@@ -230,11 +230,11 @@ ARDOUR_UI::install_actions ()
- ActionManager::register_toggle_action (common_actions,
X_("ToggleThemeManager"), _("Theme Manager"), mem_fun(*this,
&ARDOUR_UI::toggle_theme_manager));
- ActionManager::register_toggle_action (common_actions, X_("ToggleKeyEditor"),
_("Keybindings"), mem_fun(*this, &ARDOUR_UI::toggle_key_editor));
-
-- act = ActionManager::register_action (common_actions, X_("AddAudioTrack"),
_("Add Audio Track"), bind (mem_fun(*this,
&ARDOUR_UI::session_add_audio_track), 1, 1, ARDOUR::Normal, 1));
-+ act = ActionManager::register_action (common_actions, X_("AddAudioTrack"),
_("Add Audio Track"), sigc::bind (mem_fun(*this,
&ARDOUR_UI::session_add_audio_track), 1, 1, ARDOUR::Normal, 1));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("AddAudioBus"),
_("Add Audio Bus"), bind (mem_fun(*this, &ARDOUR_UI::session_add_audio_bus),
1, 1, 1));
-+ act = ActionManager::register_action (common_actions, X_("AddAudioBus"),
_("Add Audio Bus"), sigc::bind (mem_fun(*this,
&ARDOUR_UI::session_add_audio_bus), 1, 1, 1));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("Save"),
_("Save"), bind (mem_fun(*this, &ARDOUR_UI::save_state),
string(""), false));
-+ act = ActionManager::register_action (common_actions, X_("Save"),
_("Save"), sigc::bind (mem_fun(*this, &ARDOUR_UI::save_state),
string(""), false));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::write_sensitive_actions.push_back (act);
- act = ActionManager::register_action (common_actions,
X_("RemoveLastCapture"), _("Remove Last Capture"), mem_fun(*this,
&ARDOUR_UI::remove_last_capture));
-@@ -257,13 +257,13 @@ ARDOUR_UI::install_actions ()
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-
-- act = ActionManager::register_action (transport_actions, X_("ToggleRoll"),
_("Start/Stop"), bind (mem_fun (*this, &ARDOUR_UI::toggle_roll), false,
false));
-+ act = ActionManager::register_action (transport_actions, X_("ToggleRoll"),
_("Start/Stop"), sigc::bind (mem_fun (*this, &ARDOUR_UI::toggle_roll),
false, false));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions,
X_("ToggleRollMaybe"), _("Start/Continue/Stop"), bind (mem_fun (*this,
&ARDOUR_UI::toggle_roll), false, true));
-+ act = ActionManager::register_action (transport_actions,
X_("ToggleRollMaybe"), _("Start/Continue/Stop"), sigc::bind (mem_fun
(*this, &ARDOUR_UI::toggle_roll), false, true));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions,
X_("ToggleRollForgetCapture"), _("Stop + Forget Capture"), bind
(mem_fun(*this, &ARDOUR_UI::toggle_roll), true, false));
-+ act = ActionManager::register_action (transport_actions,
X_("ToggleRollForgetCapture"), _("Stop + Forget Capture"), sigc::bind
(mem_fun(*this, &ARDOUR_UI::toggle_roll), true, false));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-
-@@ -273,11 +273,11 @@ ARDOUR_UI::install_actions ()
- - otherwise do nothing
- */
-
-- act = ActionManager::register_action (transport_actions,
X_("TransitionToRoll"), _("Transition To Roll"), bind (mem_fun
(*editor, &PublicEditor::transition_to_rolling), true));
-+ act = ActionManager::register_action (transport_actions,
X_("TransitionToRoll"), _("Transition To Roll"), sigc::bind (mem_fun
(*editor, &PublicEditor::transition_to_rolling), true));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-
-- act = ActionManager::register_action (transport_actions,
X_("TransitionToReverse"), _("Transition To Reverse"), bind (mem_fun
(*editor, &PublicEditor::transition_to_rolling), false));
-+ act = ActionManager::register_action (transport_actions,
X_("TransitionToReverse"), _("Transition To Reverse"), sigc::bind
(mem_fun (*editor, &PublicEditor::transition_to_rolling), false));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-
-@@ -289,29 +289,29 @@ ARDOUR_UI::install_actions ()
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-
-- act = ActionManager::register_action (transport_actions, X_("Record"),
_("Enable Record"), bind (mem_fun(*this, &ARDOUR_UI::transport_record),
false));
-+ act = ActionManager::register_action (transport_actions, X_("Record"),
_("Enable Record"), sigc::bind (mem_fun(*this,
&ARDOUR_UI::transport_record), false));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::write_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions, X_("record-roll"),
_("Start Recording"), bind (mem_fun(*this, &ARDOUR_UI::transport_record),
true));
-+ act = ActionManager::register_action (transport_actions, X_("record-roll"),
_("Start Recording"), sigc::bind (mem_fun(*this,
&ARDOUR_UI::transport_record), true));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::write_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions, X_("Rewind"),
_("Rewind"), bind (mem_fun(*this, &ARDOUR_UI::transport_rewind), 0));
-+ act = ActionManager::register_action (transport_actions, X_("Rewind"),
_("Rewind"), sigc::bind (mem_fun(*this, &ARDOUR_UI::transport_rewind), 0));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions, X_("RewindSlow"),
_("Rewind (Slow)"), bind (mem_fun(*this, &ARDOUR_UI::transport_rewind),
-1));
-+ act = ActionManager::register_action (transport_actions, X_("RewindSlow"),
_("Rewind (Slow)"), sigc::bind (mem_fun(*this,
&ARDOUR_UI::transport_rewind), -1));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions, X_("RewindFast"),
_("Rewind (Fast)"), bind (mem_fun(*this, &ARDOUR_UI::transport_rewind),
1));
-+ act = ActionManager::register_action (transport_actions, X_("RewindFast"),
_("Rewind (Fast)"), sigc::bind (mem_fun(*this,
&ARDOUR_UI::transport_rewind), 1));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions, X_("Forward"),
_("Forward"), bind (mem_fun(*this, &ARDOUR_UI::transport_forward), 0));
-+ act = ActionManager::register_action (transport_actions, X_("Forward"),
_("Forward"), sigc::bind (mem_fun(*this, &ARDOUR_UI::transport_forward),
0));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions, X_("ForwardSlow"),
_("Forward (Slow)"), bind (mem_fun(*this, &ARDOUR_UI::transport_forward),
-1));
-+ act = ActionManager::register_action (transport_actions, X_("ForwardSlow"),
_("Forward (Slow)"), sigc::bind (mem_fun(*this,
&ARDOUR_UI::transport_forward), -1));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions, X_("ForwardFast"),
_("Forward (Fast)"), bind (mem_fun(*this, &ARDOUR_UI::transport_forward),
1));
-+ act = ActionManager::register_action (transport_actions, X_("ForwardFast"),
_("Forward (Fast)"), sigc::bind (mem_fun(*this,
&ARDOUR_UI::transport_forward), 1));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
- act = ActionManager::register_action (transport_actions, X_("GotoZero"),
_("Goto Zero"), mem_fun(*this, &ARDOUR_UI::transport_goto_zero));
-@@ -331,22 +331,22 @@ ARDOUR_UI::install_actions ()
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-
-- act = ActionManager::register_action (transport_actions,
X_("primary-clock-bbt"), _("Bars & Beats"), bind
(mem_fun(primary_clock, &AudioClock::set_mode), AudioClock::BBT));
-+ act = ActionManager::register_action (transport_actions,
X_("primary-clock-bbt"), _("Bars & Beats"), sigc::bind
(mem_fun(primary_clock, &AudioClock::set_mode), AudioClock::BBT));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions,
X_("primary-clock-minsec"), _("Minutes & Seconds"), bind
(mem_fun(primary_clock, &AudioClock::set_mode), AudioClock::MinSec));
-+ act = ActionManager::register_action (transport_actions,
X_("primary-clock-minsec"), _("Minutes & Seconds"), sigc::bind
(mem_fun(primary_clock, &AudioClock::set_mode), AudioClock::MinSec));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions,
X_("primary-clock-samples"), _("Samples"), bind
(mem_fun(primary_clock, &AudioClock::set_mode), AudioClock::Frames));
-+ act = ActionManager::register_action (transport_actions,
X_("primary-clock-samples"), _("Samples"), sigc::bind
(mem_fun(primary_clock, &AudioClock::set_mode), AudioClock::Frames));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions,
X_("primary-clock-off"), _("Off"), bind (mem_fun(primary_clock,
&AudioClock::set_mode), AudioClock::Off));
-+ act = ActionManager::register_action (transport_actions,
X_("primary-clock-off"), _("Off"), sigc::bind (mem_fun(primary_clock,
&AudioClock::set_mode), AudioClock::Off));
- ActionManager::session_sensitive_actions.push_back (act);
-
-- act = ActionManager::register_action (transport_actions,
X_("secondary-clock-bbt"), _("Bars & Beats"), bind
(mem_fun(secondary_clock, &AudioClock::set_mode), AudioClock::BBT));
-+ act = ActionManager::register_action (transport_actions,
X_("secondary-clock-bbt"), _("Bars & Beats"), sigc::bind
(mem_fun(secondary_clock, &AudioClock::set_mode), AudioClock::BBT));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions,
X_("secondary-clock-minsec"), _("Minutes & Seconds"), bind
(mem_fun(secondary_clock, &AudioClock::set_mode), AudioClock::MinSec));
-+ act = ActionManager::register_action (transport_actions,
X_("secondary-clock-minsec"), _("Minutes & Seconds"), sigc::bind
(mem_fun(secondary_clock, &AudioClock::set_mode), AudioClock::MinSec));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions,
X_("secondary-clock-samples"), _("Samples"), bind
(mem_fun(secondary_clock, &AudioClock::set_mode), AudioClock::Frames));
-+ act = ActionManager::register_action (transport_actions,
X_("secondary-clock-samples"), _("Samples"), sigc::bind
(mem_fun(secondary_clock, &AudioClock::set_mode), AudioClock::Frames));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions,
X_("secondary-clock-off"), _("Off"), bind (mem_fun(secondary_clock,
&AudioClock::set_mode), AudioClock::Off));
-+ act = ActionManager::register_action (transport_actions,
X_("secondary-clock-off"), _("Off"), sigc::bind
(mem_fun(secondary_clock, &AudioClock::set_mode), AudioClock::Off));
- ActionManager::session_sensitive_actions.push_back (act);
-
- act = ActionManager::register_toggle_action (transport_actions,
X_("TogglePunchIn"), _("Punch In"), mem_fun(*this,
&ARDOUR_UI::toggle_punch_in));
-@@ -375,75 +375,75 @@ ARDOUR_UI::install_actions ()
- act = ActionManager::register_toggle_action (transport_actions,
X_("ToggleTimeMaster"), _("Time master"), mem_fun(*this,
&ARDOUR_UI::toggle_time_master));
- ActionManager::session_sensitive_actions.push_back (act);
-
-- act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack1"), _("Toggle Record Enable Track1"), bind
(mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 0U));
-+ act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack1"), _("Toggle Record Enable Track1"),
sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 0U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack2"), _("Toggle Record Enable Track2"), bind
(mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 1U));
-+ act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack2"), _("Toggle Record Enable Track2"),
sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 1U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack3"), _("Toggle Record Enable Track3"), bind
(mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 2U));
-+ act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack3"), _("Toggle Record Enable Track3"),
sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 2U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack4"), _("Toggle Record Enable Track4"), bind
(mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 3U));
-+ act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack4"), _("Toggle Record Enable Track4"),
sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 3U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack5"), _("Toggle Record Enable Track5"), bind
(mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 4U));
-+ act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack5"), _("Toggle Record Enable Track5"),
sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 4U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack6"), _("Toggle Record Enable Track6"), bind
(mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 5U));
-+ act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack6"), _("Toggle Record Enable Track6"),
sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 5U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack7"), _("Toggle Record Enable Track7"), bind
(mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 6U));
-+ act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack7"), _("Toggle Record Enable Track7"),
sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 6U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack8"), _("Toggle Record Enable Track8"), bind
(mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 7U));
-+ act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack8"), _("Toggle Record Enable Track8"),
sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 7U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack9"), _("Toggle Record Enable Track9"), bind
(mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 8U));
-+ act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack9"), _("Toggle Record Enable Track9"),
sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 8U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack10"), _("Toggle Record Enable Track10"),
bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 9U));
-+ act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack10"), _("Toggle Record Enable Track10"),
sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 9U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack11"), _("Toggle Record Enable Track11"),
bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 10U));
-+ act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack11"), _("Toggle Record Enable Track11"),
sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 10U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack12"), _("Toggle Record Enable Track12"),
bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 11U));
-+ act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack12"), _("Toggle Record Enable Track12"),
sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 11U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack13"), _("Toggle Record Enable Track13"),
bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 12U));
-+ act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack13"), _("Toggle Record Enable Track13"),
sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 12U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack14"), _("Toggle Record Enable Track14"),
bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 13U));
-+ act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack14"), _("Toggle Record Enable Track14"),
sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 13U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack15"), _("Toggle Record Enable Track15"),
bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 14U));
-+ act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack15"), _("Toggle Record Enable Track15"),
sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 14U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack16"), _("Toggle Record Enable Track16"),
bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 15U));
-+ act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack16"), _("Toggle Record Enable Track16"),
sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 15U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack17"), _("Toggle Record Enable Track17"),
bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 16U));
-+ act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack17"), _("Toggle Record Enable Track17"),
sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 16U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack18"), _("Toggle Record Enable Track18"),
bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 17U));
-+ act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack18"), _("Toggle Record Enable Track18"),
sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 17U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack19"), _("Toggle Record Enable Track19"),
bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 18U));
-+ act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack19"), _("Toggle Record Enable Track19"),
sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 18U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack20"), _("Toggle Record Enable Track20"),
bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 19U));
-+ act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack20"), _("Toggle Record Enable Track20"),
sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 19U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack21"), _("Toggle Record Enable Track21"),
bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 20U));
-+ act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack21"), _("Toggle Record Enable Track21"),
sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 20U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack22"), _("Toggle Record Enable Track22"),
bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 21U));
-+ act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack22"), _("Toggle Record Enable Track22"),
sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 21U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack23"), _("Toggle Record Enable Track23"),
bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 22U));
-+ act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack23"), _("Toggle Record Enable Track23"),
sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 22U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack24"), _("Toggle Record Enable Track24"),
bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 23U));
-+ act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack24"), _("Toggle Record Enable Track24"),
sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 23U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack25"), _("Toggle Record Enable Track25"),
bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 24U));
-+ act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack25"), _("Toggle Record Enable Track25"),
sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 24U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack26"), _("Toggle Record Enable Track26"),
bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 25U));
-+ act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack26"), _("Toggle Record Enable Track26"),
sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 25U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack27"), _("Toggle Record Enable Track27"),
bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 26U));
-+ act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack27"), _("Toggle Record Enable Track27"),
sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 26U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack28"), _("Toggle Record Enable Track28"),
bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 27U));
-+ act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack28"), _("Toggle Record Enable Track28"),
sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 27U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack29"), _("Toggle Record Enable Track29"),
bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 28U));
-+ act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack29"), _("Toggle Record Enable Track29"),
sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 28U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack30"), _("Toggle Record Enable Track30"),
bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 29U));
-+ act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack30"), _("Toggle Record Enable Track30"),
sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 29U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack31"), _("Toggle Record Enable Track31"),
bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 30U));
-+ act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack31"), _("Toggle Record Enable Track31"),
sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 30U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack32"), _("Toggle Record Enable Track32"),
bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 31U));
-+ act = ActionManager::register_action (common_actions,
X_("ToggleRecordEnableTrack32"), _("Toggle Record Enable Track32"),
sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 31U));
- ActionManager::session_sensitive_actions.push_back (act);
-
- Glib::RefPtr<ActionGroup> shuttle_actions = ActionGroup::create
("ShuttleActions");
-
-- shuttle_actions->add (Action::create (X_("SetShuttleUnitsPercentage"),
_("Percentage")), hide_return (bind (mem_fun (*Config,
&Configuration::set_shuttle_units), Percentage)));
-- shuttle_actions->add (Action::create (X_("SetShuttleUnitsSemitones"),
_("Semitones")), hide_return (bind (mem_fun (*Config,
&Configuration::set_shuttle_units), Semitones)));
-+ shuttle_actions->add (Action::create (X_("SetShuttleUnitsPercentage"),
_("Percentage")), hide_return (sigc::bind (mem_fun (*Config,
&Configuration::set_shuttle_units), Percentage)));
-+ shuttle_actions->add (Action::create (X_("SetShuttleUnitsSemitones"),
_("Semitones")), hide_return (sigc::bind (mem_fun (*Config,
&Configuration::set_shuttle_units), Semitones)));
-
- Glib::RefPtr<ActionGroup> option_actions = ActionGroup::create
("options");
-
-@@ -490,7 +490,7 @@ ARDOUR_UI::install_actions ()
-
- ActionManager::register_toggle_action (option_actions,
X_("DenormalProtection"), _("Use DC bias"), mem_fun (*this,
&ARDOUR_UI::toggle_denormal_protection));
-
-- ActionManager::register_radio_action (option_actions, denormal_group,
X_("DenormalNone"), _("No processor handling"), bind (mem_fun (*this,
&ARDOUR_UI::set_denormal_model), DenormalNone));
-+ ActionManager::register_radio_action (option_actions, denormal_group,
X_("DenormalNone"), _("No processor handling"), sigc::bind (mem_fun
(*this, &ARDOUR_UI::set_denormal_model), DenormalNone));
-
- // as of September 10th 2007, Valgrind cannot handle various FPU flag setting
instructions
- // so avoid them
-@@ -499,28 +499,28 @@ ARDOUR_UI::install_actions ()
-
- /* we still need these actions to exist, but make them all insensitive */
-
-- act = ActionManager::register_radio_action (option_actions, denormal_group,
X_("DenormalFTZ"), _("Use FlushToZero"), bind (mem_fun (*this,
&ARDOUR_UI::set_denormal_model), DenormalFTZ));
-+ act = ActionManager::register_radio_action (option_actions, denormal_group,
X_("DenormalFTZ"), _("Use FlushToZero"), sigc::bind (mem_fun (*this,
&ARDOUR_UI::set_denormal_model), DenormalFTZ));
- act->set_sensitive (false);
-- act = ActionManager::register_radio_action (option_actions, denormal_group,
X_("DenormalDAZ"), _("Use DenormalsAreZero"), bind (mem_fun (*this,
&ARDOUR_UI::set_denormal_model), DenormalDAZ));
-+ act = ActionManager::register_radio_action (option_actions, denormal_group,
X_("DenormalDAZ"), _("Use DenormalsAreZero"), sigc::bind (mem_fun
(*this, &ARDOUR_UI::set_denormal_model), DenormalDAZ));
- act->set_sensitive (false);
-- act = ActionManager::register_radio_action (option_actions, denormal_group,
X_("DenormalFTZDAZ"), _("Use FlushToZero & DenormalsAreZero"),
bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalFTZDAZ));
-+ act = ActionManager::register_radio_action (option_actions, denormal_group,
X_("DenormalFTZDAZ"), _("Use FlushToZero & DenormalsAreZero"),
sigc::bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalFTZDAZ));
- act->set_sensitive (false);
-
- } else {
-
- FPU fpu;
-
-- act = ActionManager::register_radio_action (option_actions, denormal_group,
X_("DenormalFTZ"), _("Use FlushToZero"), bind (mem_fun (*this,
&ARDOUR_UI::set_denormal_model), DenormalFTZ));
-+ act = ActionManager::register_radio_action (option_actions, denormal_group,
X_("DenormalFTZ"), _("Use FlushToZero"), sigc::bind (mem_fun (*this,
&ARDOUR_UI::set_denormal_model), DenormalFTZ));
- if (!fpu.has_flush_to_zero()) {
- act->set_sensitive (false);
- }
-
-- act = ActionManager::register_radio_action (option_actions, denormal_group,
X_("DenormalDAZ"), _("Use DenormalsAreZero"), bind (mem_fun (*this,
&ARDOUR_UI::set_denormal_model), DenormalDAZ));
-+ act = ActionManager::register_radio_action (option_actions, denormal_group,
X_("DenormalDAZ"), _("Use DenormalsAreZero"), sigc::bind (mem_fun
(*this, &ARDOUR_UI::set_denormal_model), DenormalDAZ));
- if (!fpu.has_denormals_are_zero()) {
- act->set_sensitive (false);
- }
-
-- act = ActionManager::register_radio_action (option_actions, denormal_group,
X_("DenormalFTZDAZ"), _("Use FlushToZero & DenormalsAreZero"),
bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalFTZDAZ));
-+ act = ActionManager::register_radio_action (option_actions, denormal_group,
X_("DenormalFTZDAZ"), _("Use FlushToZero & DenormalsAreZero"),
sigc::bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalFTZDAZ));
- if (!fpu.has_flush_to_zero() || !fpu.has_denormals_are_zero()) {
- act->set_sensitive (false);
- }
-@@ -540,34 +540,34 @@ ARDOUR_UI::install_actions ()
- RadioAction::Group meter_falloff_group;
- RadioAction::Group meter_hold_group;
-
-- ActionManager::register_radio_action (option_actions, meter_falloff_group,
X_("MeterFalloffOff"), _("Off"), bind (mem_fun (*this,
&ARDOUR_UI::set_meter_falloff), MeterFalloffOff));
-- ActionManager::register_radio_action (option_actions, meter_falloff_group,
X_("MeterFalloffSlowest"), _("Slowest"), bind (mem_fun (*this,
&ARDOUR_UI::set_meter_falloff), MeterFalloffSlowest));
-- ActionManager::register_radio_action (option_actions, meter_falloff_group,
X_("MeterFalloffSlow"), _("Slow"), bind (mem_fun (*this,
&ARDOUR_UI::set_meter_falloff), MeterFalloffSlow));
-- ActionManager::register_radio_action (option_actions, meter_falloff_group,
X_("MeterFalloffMedium"), _("Medium"), bind (mem_fun (*this,
&ARDOUR_UI::set_meter_falloff), MeterFalloffMedium));
-- ActionManager::register_radio_action (option_actions, meter_falloff_group,
X_("MeterFalloffFast"), _("Fast"), bind (mem_fun (*this,
&ARDOUR_UI::set_meter_falloff), MeterFalloffFast));
-- ActionManager::register_radio_action (option_actions, meter_falloff_group,
X_("MeterFalloffFaster"), _("Faster"), bind (mem_fun (*this,
&ARDOUR_UI::set_meter_falloff), MeterFalloffFaster));
-- ActionManager::register_radio_action (option_actions, meter_falloff_group,
X_("MeterFalloffFastest"), _("Fastest"), bind (mem_fun (*this,
&ARDOUR_UI::set_meter_falloff), MeterFalloffFastest));
-+ ActionManager::register_radio_action (option_actions, meter_falloff_group,
X_("MeterFalloffOff"), _("Off"), sigc::bind (mem_fun (*this,
&ARDOUR_UI::set_meter_falloff), MeterFalloffOff));
-+ ActionManager::register_radio_action (option_actions, meter_falloff_group,
X_("MeterFalloffSlowest"), _("Slowest"), sigc::bind (mem_fun (*this,
&ARDOUR_UI::set_meter_falloff), MeterFalloffSlowest));
-+ ActionManager::register_radio_action (option_actions, meter_falloff_group,
X_("MeterFalloffSlow"), _("Slow"), sigc::bind (mem_fun (*this,
&ARDOUR_UI::set_meter_falloff), MeterFalloffSlow));
-+ ActionManager::register_radio_action (option_actions, meter_falloff_group,
X_("MeterFalloffMedium"), _("Medium"), sigc::bind (mem_fun (*this,
&ARDOUR_UI::set_meter_falloff), MeterFalloffMedium));
-+ ActionManager::register_radio_action (option_actions, meter_falloff_group,
X_("MeterFalloffFast"), _("Fast"), sigc::bind (mem_fun (*this,
&ARDOUR_UI::set_meter_falloff), MeterFalloffFast));
-+ ActionManager::register_radio_action (option_actions, meter_falloff_group,
X_("MeterFalloffFaster"), _("Faster"), sigc::bind (mem_fun (*this,
&ARDOUR_UI::set_meter_falloff), MeterFalloffFaster));
-+ ActionManager::register_radio_action (option_actions, meter_falloff_group,
X_("MeterFalloffFastest"), _("Fastest"), sigc::bind (mem_fun (*this,
&ARDOUR_UI::set_meter_falloff), MeterFalloffFastest));
-
-- ActionManager::register_radio_action (option_actions, meter_hold_group,
X_("MeterHoldOff"), _("Off"), bind (mem_fun (*this,
&ARDOUR_UI::set_meter_hold), MeterHoldOff));
-- ActionManager::register_radio_action (option_actions, meter_hold_group,
X_("MeterHoldShort"), _("Short"), bind (mem_fun (*this,
&ARDOUR_UI::set_meter_hold), MeterHoldShort));
-- ActionManager::register_radio_action (option_actions, meter_hold_group,
X_("MeterHoldMedium"), _("Medium"), bind (mem_fun (*this,
&ARDOUR_UI::set_meter_hold), MeterHoldMedium));
-- ActionManager::register_radio_action (option_actions, meter_hold_group,
X_("MeterHoldLong"), _("Long"), bind (mem_fun (*this,
&ARDOUR_UI::set_meter_hold), MeterHoldLong));
-+ ActionManager::register_radio_action (option_actions, meter_hold_group,
X_("MeterHoldOff"), _("Off"), sigc::bind (mem_fun (*this,
&ARDOUR_UI::set_meter_hold), MeterHoldOff));
-+ ActionManager::register_radio_action (option_actions, meter_hold_group,
X_("MeterHoldShort"), _("Short"), sigc::bind (mem_fun (*this,
&ARDOUR_UI::set_meter_hold), MeterHoldShort));
-+ ActionManager::register_radio_action (option_actions, meter_hold_group,
X_("MeterHoldMedium"), _("Medium"), sigc::bind (mem_fun (*this,
&ARDOUR_UI::set_meter_hold), MeterHoldMedium));
-+ ActionManager::register_radio_action (option_actions, meter_hold_group,
X_("MeterHoldLong"), _("Long"), sigc::bind (mem_fun (*this,
&ARDOUR_UI::set_meter_hold), MeterHoldLong));
-
- RadioAction::Group file_header_group;
-
-- act = ActionManager::register_radio_action (option_actions, file_header_group,
X_("FileHeaderFormatBWF"), X_("Broadcast WAVE"), bind (mem_fun (*this,
&ARDOUR_UI::set_native_file_header_format), ARDOUR::BWF));
-- act = ActionManager::register_radio_action (option_actions, file_header_group,
X_("FileHeaderFormatWAVE"), X_("WAVE"), bind (mem_fun (*this,
&ARDOUR_UI::set_native_file_header_format), ARDOUR::WAVE));
-- act = ActionManager::register_radio_action (option_actions, file_header_group,
X_("FileHeaderFormatWAVE64"), X_("WAVE-64"), bind (mem_fun (*this,
&ARDOUR_UI::set_native_file_header_format), ARDOUR::WAVE64));
-- // act = ActionManager::register_radio_action (option_actions, file_header_group,
X_("FileHeaderFormatiXML"), X_("iXML"), bind (mem_fun (*this,
&ARDOUR_UI::set_native_file_header_format), ARDOUR::iXML));
-- // act = ActionManager::register_radio_action (option_actions, file_header_group,
X_("FileHeaderFormatRF64"), X_("RF64"), bind (mem_fun (*this,
&ARDOUR_UI::set_native_file_header_format), ARDOUR::RF64));
-- act = ActionManager::register_radio_action (option_actions, file_header_group,
X_("FileHeaderFormatCAF"), X_("CAF"), bind (mem_fun (*this,
&ARDOUR_UI::set_native_file_header_format), ARDOUR::CAF));
-+ act = ActionManager::register_radio_action (option_actions, file_header_group,
X_("FileHeaderFormatBWF"), X_("Broadcast WAVE"), sigc::bind (mem_fun
(*this, &ARDOUR_UI::set_native_file_header_format), ARDOUR::BWF));
-+ act = ActionManager::register_radio_action (option_actions, file_header_group,
X_("FileHeaderFormatWAVE"), X_("WAVE"), sigc::bind (mem_fun (*this,
&ARDOUR_UI::set_native_file_header_format), ARDOUR::WAVE));
-+ act = ActionManager::register_radio_action (option_actions, file_header_group,
X_("FileHeaderFormatWAVE64"), X_("WAVE-64"), sigc::bind (mem_fun
(*this, &ARDOUR_UI::set_native_file_header_format), ARDOUR::WAVE64));
-+ // act = ActionManager::register_radio_action (option_actions, file_header_group,
X_("FileHeaderFormatiXML"), X_("iXML"), sigc::bind (mem_fun (*this,
&ARDOUR_UI::set_native_file_header_format), ARDOUR::iXML));
-+ // act = ActionManager::register_radio_action (option_actions, file_header_group,
X_("FileHeaderFormatRF64"), X_("RF64"), sigc::bind (mem_fun (*this,
&ARDOUR_UI::set_native_file_header_format), ARDOUR::RF64));
-+ act = ActionManager::register_radio_action (option_actions, file_header_group,
X_("FileHeaderFormatCAF"), X_("CAF"), sigc::bind (mem_fun (*this,
&ARDOUR_UI::set_native_file_header_format), ARDOUR::CAF));
-
- RadioAction::Group file_data_group;
-
-
-- act = ActionManager::register_radio_action (option_actions, file_data_group,
X_("FileDataFormatFloat"), X_("32-bit floating point"), bind (mem_fun
(*this, &ARDOUR_UI::set_native_file_data_format), ARDOUR::FormatFloat));
-- act = ActionManager::register_radio_action (option_actions, file_data_group,
X_("FileDataFormat24bit"), X_("24-bit integer"), bind (mem_fun (*this,
&ARDOUR_UI::set_native_file_data_format), ARDOUR::FormatInt24));
-- act = ActionManager::register_radio_action (option_actions, file_data_group,
X_("FileDataFormat16bit"), X_("16-bit integer"), bind (mem_fun (*this,
&ARDOUR_UI::set_native_file_data_format), ARDOUR::FormatInt16));
-+ act = ActionManager::register_radio_action (option_actions, file_data_group,
X_("FileDataFormatFloat"), X_("32-bit floating point"), sigc::bind
(mem_fun (*this, &ARDOUR_UI::set_native_file_data_format), ARDOUR::FormatFloat));
-+ act = ActionManager::register_radio_action (option_actions, file_data_group,
X_("FileDataFormat24bit"), X_("24-bit integer"), sigc::bind (mem_fun
(*this, &ARDOUR_UI::set_native_file_data_format), ARDOUR::FormatInt24));
-+ act = ActionManager::register_radio_action (option_actions, file_data_group,
X_("FileDataFormat16bit"), X_("16-bit integer"), sigc::bind (mem_fun
(*this, &ARDOUR_UI::set_native_file_data_format), ARDOUR::FormatInt16));
-
- RadioAction::Group monitoring_group;
-
-@@ -578,44 +578,44 @@ ARDOUR_UI::install_actions ()
-
- #ifndef __APPLE__
- /* JACK has no monitoring capabilities with the CoreAudio backend */
-- act = ActionManager::register_radio_action (option_actions, monitoring_group,
X_("UseHardwareMonitoring"), _("JACK does monitoring"), bind (mem_fun
(*this, &ARDOUR_UI::set_monitor_model), HardwareMonitoring));
-+ act = ActionManager::register_radio_action (option_actions, monitoring_group,
X_("UseHardwareMonitoring"), _("JACK does monitoring"), sigc::bind
(mem_fun (*this, &ARDOUR_UI::set_monitor_model), HardwareMonitoring));
- if (!engine->can_request_hardware_monitoring()) {
- act->set_sensitive (false);
- }
- #endif
-- act = ActionManager::register_radio_action (option_actions, monitoring_group,
X_("UseSoftwareMonitoring"), string_compose (_("%1 does monitoring"),
PROGRAM_NAME).c_str(), bind (mem_fun (*this, &ARDOUR_UI::set_monitor_model),
SoftwareMonitoring));
-- act = ActionManager::register_radio_action (option_actions, monitoring_group,
X_("UseExternalMonitoring"), _("Audio Hardware does monitoring"), bind
(mem_fun (*this, &ARDOUR_UI::set_monitor_model), ExternalMonitoring));
-+ act = ActionManager::register_radio_action (option_actions, monitoring_group,
X_("UseSoftwareMonitoring"), string_compose (_("%1 does monitoring"),
PROGRAM_NAME).c_str(), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_monitor_model),
SoftwareMonitoring));
-+ act = ActionManager::register_radio_action (option_actions, monitoring_group,
X_("UseExternalMonitoring"), _("Audio Hardware does monitoring"),
sigc::bind (mem_fun (*this, &ARDOUR_UI::set_monitor_model), ExternalMonitoring));
-
- RadioAction::Group solo_group;
-
-- act = ActionManager::register_radio_action (option_actions, solo_group,
X_("SoloInPlace"), _("Solo in-place"), hide_return (bind (mem_fun
(*this, &ARDOUR_UI::set_solo_model), InverseMute)));
-+ act = ActionManager::register_radio_action (option_actions, solo_group,
X_("SoloInPlace"), _("Solo in-place"), hide_return (sigc::bind
(mem_fun (*this, &ARDOUR_UI::set_solo_model), InverseMute)));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (option_actions, solo_group,
X_("SoloViaBus"), _("Solo via bus"), hide_return (bind (mem_fun
(*this, &ARDOUR_UI::set_solo_model), SoloBus)));
-+ act = ActionManager::register_radio_action (option_actions, solo_group,
X_("SoloViaBus"), _("Solo via bus"), hide_return (sigc::bind (mem_fun
(*this, &ARDOUR_UI::set_solo_model), SoloBus)));
- ActionManager::session_sensitive_actions.push_back (act);
-
- RadioAction::Group input_auto_connect_group;
-
-- act = ActionManager::register_radio_action (option_actions, input_auto_connect_group,
X_("InputAutoConnectPhysical"), _("Auto-connect inputs to physical
inputs"), hide_return (bind (mem_fun (*this, &ARDOUR_UI::set_input_auto_connect),
AutoConnectPhysical)));
-+ act = ActionManager::register_radio_action (option_actions, input_auto_connect_group,
X_("InputAutoConnectPhysical"), _("Auto-connect inputs to physical
inputs"), hide_return (sigc::bind (mem_fun (*this,
&ARDOUR_UI::set_input_auto_connect), AutoConnectPhysical)));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (option_actions, input_auto_connect_group,
X_("InputAutoConnectManual"), _("Manually connect inputs"),
hide_return (bind (mem_fun (*this, &ARDOUR_UI::set_input_auto_connect),
(AutoConnectOption) 0)));
-+ act = ActionManager::register_radio_action (option_actions, input_auto_connect_group,
X_("InputAutoConnectManual"), _("Manually connect inputs"),
hide_return (sigc::bind (mem_fun (*this, &ARDOUR_UI::set_input_auto_connect),
(AutoConnectOption) 0)));
- ActionManager::session_sensitive_actions.push_back (act);
-
- RadioAction::Group output_auto_connect_group;
-
-- act = ActionManager::register_radio_action (option_actions, output_auto_connect_group,
X_("OutputAutoConnectPhysical"), _("Auto-connect outputs to physical
outs"), hide_return (bind (mem_fun (*this, &ARDOUR_UI::set_output_auto_connect),
AutoConnectPhysical)));
-+ act = ActionManager::register_radio_action (option_actions, output_auto_connect_group,
X_("OutputAutoConnectPhysical"), _("Auto-connect outputs to physical
outs"), hide_return (sigc::bind (mem_fun (*this,
&ARDOUR_UI::set_output_auto_connect), AutoConnectPhysical)));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (option_actions, output_auto_connect_group,
X_("OutputAutoConnectMaster"), _("Auto-connect outputs to master
bus"), hide_return (bind (mem_fun (*this, &ARDOUR_UI::set_output_auto_connect),
AutoConnectMaster)));
-+ act = ActionManager::register_radio_action (option_actions, output_auto_connect_group,
X_("OutputAutoConnectMaster"), _("Auto-connect outputs to master
bus"), hide_return (sigc::bind (mem_fun (*this,
&ARDOUR_UI::set_output_auto_connect), AutoConnectMaster)));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (option_actions, output_auto_connect_group,
X_("OutputAutoConnectManual"), _("Manually connect outputs"),
hide_return (bind (mem_fun (*this, &ARDOUR_UI::set_output_auto_connect),
(AutoConnectOption) 0)));
-+ act = ActionManager::register_radio_action (option_actions, output_auto_connect_group,
X_("OutputAutoConnectManual"), _("Manually connect outputs"),
hide_return (sigc::bind (mem_fun (*this, &ARDOUR_UI::set_output_auto_connect),
(AutoConnectOption) 0)));
- ActionManager::session_sensitive_actions.push_back (act);
-
- RadioAction::Group remote_group;
-
-- act = ActionManager::register_radio_action (option_actions, remote_group,
X_("RemoteUserDefined"), _("Remote ID assigned by User"), hide_return
(bind (mem_fun (*this, &ARDOUR_UI::set_remote_model), UserOrdered)));
-+ act = ActionManager::register_radio_action (option_actions, remote_group,
X_("RemoteUserDefined"), _("Remote ID assigned by User"), hide_return
(sigc::bind (mem_fun (*this, &ARDOUR_UI::set_remote_model), UserOrdered)));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (option_actions, remote_group,
X_("RemoteMixerDefined"), _("Remote ID follows order of Mixer"),
hide_return (bind (mem_fun (*this, &ARDOUR_UI::set_remote_model), MixerOrdered)));
-+ act = ActionManager::register_radio_action (option_actions, remote_group,
X_("RemoteMixerDefined"), _("Remote ID follows order of Mixer"),
hide_return (sigc::bind (mem_fun (*this, &ARDOUR_UI::set_remote_model),
MixerOrdered)));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (option_actions, remote_group,
X_("RemoteEditorDefined"), _("Remote ID follows order of Editor"),
hide_return (bind (mem_fun (*this, &ARDOUR_UI::set_remote_model), EditorOrdered)));
-+ act = ActionManager::register_radio_action (option_actions, remote_group,
X_("RemoteEditorDefined"), _("Remote ID follows order of Editor"),
hide_return (sigc::bind (mem_fun (*this, &ARDOUR_UI::set_remote_model),
EditorOrdered)));
- ActionManager::session_sensitive_actions.push_back (act);
-
- act = ActionManager::register_toggle_action (option_actions,
X_("AutoRebinding"), _("Auto Rebind Controls"), mem_fun
(*(this->mixer), &Mixer_UI::toggle_auto_rebinding));
-@@ -809,7 +809,7 @@ ARDOUR_UI::build_control_surface_menu ()
- string action_label = (*i)->name;
-
- Glib::RefPtr<Action> act = ActionManager::register_toggle_action
(editor->editor_actions, action_name.c_str(), action_label.c_str(),
-- (bind (mem_fun (*this, &ARDOUR_UI::toggle_control_protocol), *i)));
-+ (sigc::bind (mem_fun (*this, &ARDOUR_UI::toggle_control_protocol),
*i)));
-
- Glib::RefPtr<ToggleAction> tact =
Glib::RefPtr<ToggleAction>::cast_dynamic (act);
-
-@@ -834,7 +834,7 @@ ARDOUR_UI::build_control_surface_menu ()
- action_name += "Feedback";
-
- Glib::RefPtr<Action> act = ActionManager::register_toggle_action
(editor->editor_actions, action_name.c_str(), _("Feedback"),
-- (bind (mem_fun (*this, &ARDOUR_UI::toggle_control_protocol_feedback),
-+ (sigc::bind (mem_fun (*this,
&ARDOUR_UI::toggle_control_protocol_feedback),
- *i,
- "Editor",
- action_name)));
-@@ -946,19 +946,19 @@ ARDOUR_UI::use_menubar_as_top_menubar ()
- void
- ARDOUR_UI::setup_clock ()
- {
-- ARDOUR_UI::Clock.connect (bind (mem_fun (big_clock, &AudioClock::set), false));
-+ ARDOUR_UI::Clock.connect (sigc::bind (mem_fun (big_clock, &AudioClock::set),
false));
-
- big_clock_window = new Window (WINDOW_TOPLEVEL);
-
- big_clock_window->set_keep_above (true);
- big_clock_window->set_border_width (0);
- big_clock_window->add (big_clock);
-- big_clock_window->signal_key_press_event().connect (bind (sigc::ptr_fun
(relay_key_press), big_clock_window));
-+ big_clock_window->signal_key_press_event().connect (sigc::bind (sigc::ptr_fun
(relay_key_press), big_clock_window));
-
- big_clock_window->set_title (_("Clock"));
- big_clock_window->set_type_hint (Gdk::WINDOW_TYPE_HINT_UTILITY);
-- big_clock_window->signal_realize().connect (bind (sigc::ptr_fun (set_decoration),
big_clock_window, (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
-- big_clock_window->signal_unmap().connect (bind
(sigc::ptr_fun(&ActionManager::uncheck_toggleaction),
X_("<Actions>/Common/ToggleBigClock")));
-+ big_clock_window->signal_realize().connect (sigc::bind (sigc::ptr_fun
(set_decoration), big_clock_window, (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
-+ big_clock_window->signal_unmap().connect (sigc::bind
(sigc::ptr_fun(&ActionManager::uncheck_toggleaction),
X_("<Actions>/Common/ToggleBigClock")));
-
- manage_window (*big_clock_window);
- }
-diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc
-index 518bd1c..1ee26fc 100644
---- a/gtk2_ardour/audio_clock.cc
-+++ b/gtk2_ardour/audio_clock.cc
-@@ -209,7 +209,7 @@ AudioClock::AudioClock (std::string clock_name, bool transient,
std::string widg
- */
-
- clock_base.add_events
(Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::SCROLL_MASK);
-- clock_base.signal_button_release_event().connect (bind (mem_fun (*this,
&AudioClock::field_button_release_event), SMPTE_Hours));
-+ clock_base.signal_button_release_event().connect (sigc::bind (mem_fun (*this,
&AudioClock::field_button_release_event), SMPTE_Hours));
-
- Session::SMPTEOffsetChanged.connect (mem_fun (*this,
&AudioClock::smpte_offset_changed));
-
-@@ -294,101 +294,101 @@ AudioClock::setup_events ()
- ms_minutes_ebox.set_flags (Gtk::CAN_FOCUS);
- ms_seconds_ebox.set_flags (Gtk::CAN_FOCUS);
-
-- hours_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this,
&AudioClock::field_motion_notify_event), SMPTE_Hours));
-- minutes_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this,
&AudioClock::field_motion_notify_event), SMPTE_Minutes));
-- seconds_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this,
&AudioClock::field_motion_notify_event), SMPTE_Seconds));
-- frames_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this,
&AudioClock::field_motion_notify_event), SMPTE_Frames));
-- audio_frames_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this,
&AudioClock::field_motion_notify_event), AudioFrames));
-- bars_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this,
&AudioClock::field_motion_notify_event), Bars));
-- beats_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this,
&AudioClock::field_motion_notify_event), Beats));
-- ticks_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this,
&AudioClock::field_motion_notify_event), Ticks));
-- ms_hours_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this,
&AudioClock::field_motion_notify_event), MS_Hours));
-- ms_minutes_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this,
&AudioClock::field_motion_notify_event), MS_Minutes));
-- ms_seconds_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this,
&AudioClock::field_motion_notify_event), MS_Seconds));
--
-- hours_ebox.signal_button_press_event().connect (bind (mem_fun(*this,
&AudioClock::field_button_press_event), SMPTE_Hours));
-- minutes_ebox.signal_button_press_event().connect (bind (mem_fun(*this,
&AudioClock::field_button_press_event), SMPTE_Minutes));
-- seconds_ebox.signal_button_press_event().connect (bind (mem_fun(*this,
&AudioClock::field_button_press_event), SMPTE_Seconds));
-- frames_ebox.signal_button_press_event().connect (bind (mem_fun(*this,
&AudioClock::field_button_press_event), SMPTE_Frames));
-- audio_frames_ebox.signal_button_press_event().connect (bind (mem_fun(*this,
&AudioClock::field_button_press_event), AudioFrames));
-- bars_ebox.signal_button_press_event().connect (bind (mem_fun(*this,
&AudioClock::field_button_press_event), Bars));
-- beats_ebox.signal_button_press_event().connect (bind (mem_fun(*this,
&AudioClock::field_button_press_event), Beats));
-- ticks_ebox.signal_button_press_event().connect (bind (mem_fun(*this,
&AudioClock::field_button_press_event), Ticks));
-- ms_hours_ebox.signal_button_press_event().connect (bind (mem_fun(*this,
&AudioClock::field_button_press_event), MS_Hours));
-- ms_minutes_ebox.signal_button_press_event().connect (bind (mem_fun(*this,
&AudioClock::field_button_press_event), MS_Minutes));
-- ms_seconds_ebox.signal_button_press_event().connect (bind (mem_fun(*this,
&AudioClock::field_button_press_event), MS_Seconds));
--
-- hours_ebox.signal_button_release_event().connect (bind (mem_fun(*this,
&AudioClock::field_button_release_event), SMPTE_Hours));
-- minutes_ebox.signal_button_release_event().connect (bind (mem_fun(*this,
&AudioClock::field_button_release_event), SMPTE_Minutes));
-- seconds_ebox.signal_button_release_event().connect (bind (mem_fun(*this,
&AudioClock::field_button_release_event), SMPTE_Seconds));
-- frames_ebox.signal_button_release_event().connect (bind (mem_fun(*this,
&AudioClock::field_button_release_event), SMPTE_Frames));
-- audio_frames_ebox.signal_button_release_event().connect (bind (mem_fun(*this,
&AudioClock::field_button_release_event), AudioFrames));
-- bars_ebox.signal_button_release_event().connect (bind (mem_fun(*this,
&AudioClock::field_button_release_event), Bars));
-- beats_ebox.signal_button_release_event().connect (bind (mem_fun(*this,
&AudioClock::field_button_release_event), Beats));
-- ticks_ebox.signal_button_release_event().connect (bind (mem_fun(*this,
&AudioClock::field_button_release_event), Ticks));
-- ms_hours_ebox.signal_button_release_event().connect (bind (mem_fun(*this,
&AudioClock::field_button_release_event), MS_Hours));
-- ms_minutes_ebox.signal_button_release_event().connect (bind (mem_fun(*this,
&AudioClock::field_button_release_event), MS_Minutes));
-- ms_seconds_ebox.signal_button_release_event().connect (bind (mem_fun(*this,
&AudioClock::field_button_release_event), MS_Seconds));
--
-- hours_ebox.signal_scroll_event().connect (bind (mem_fun(*this,
&AudioClock::field_button_scroll_event), SMPTE_Hours));
-- minutes_ebox.signal_scroll_event().connect (bind (mem_fun(*this,
&AudioClock::field_button_scroll_event), SMPTE_Minutes));
-- seconds_ebox.signal_scroll_event().connect (bind (mem_fun(*this,
&AudioClock::field_button_scroll_event), SMPTE_Seconds));
-- frames_ebox.signal_scroll_event().connect (bind (mem_fun(*this,
&AudioClock::field_button_scroll_event), SMPTE_Frames));
-- audio_frames_ebox.signal_scroll_event().connect (bind (mem_fun(*this,
&AudioClock::field_button_scroll_event), AudioFrames));
-- bars_ebox.signal_scroll_event().connect (bind (mem_fun(*this,
&AudioClock::field_button_scroll_event), Bars));
-- beats_ebox.signal_scroll_event().connect (bind (mem_fun(*this,
&AudioClock::field_button_scroll_event), Beats));
-- ticks_ebox.signal_scroll_event().connect (bind (mem_fun(*this,
&AudioClock::field_button_scroll_event), Ticks));
-- ms_hours_ebox.signal_scroll_event().connect (bind (mem_fun(*this,
&AudioClock::field_button_scroll_event), MS_Hours));
-- ms_minutes_ebox.signal_scroll_event().connect (bind (mem_fun(*this,
&AudioClock::field_button_scroll_event), MS_Minutes));
-- ms_seconds_ebox.signal_scroll_event().connect (bind (mem_fun(*this,
&AudioClock::field_button_scroll_event), MS_Seconds));
--
-- hours_ebox.signal_key_press_event().connect (bind (mem_fun(*this,
&AudioClock::field_key_press_event), SMPTE_Hours));
-- minutes_ebox.signal_key_press_event().connect (bind (mem_fun(*this,
&AudioClock::field_key_press_event), SMPTE_Minutes));
-- seconds_ebox.signal_key_press_event().connect (bind (mem_fun(*this,
&AudioClock::field_key_press_event), SMPTE_Seconds));
-- frames_ebox.signal_key_press_event().connect (bind (mem_fun(*this,
&AudioClock::field_key_press_event), SMPTE_Frames));
-- audio_frames_ebox.signal_key_press_event().connect (bind (mem_fun(*this,
&AudioClock::field_key_press_event), AudioFrames));
-- bars_ebox.signal_key_press_event().connect (bind (mem_fun(*this,
&AudioClock::field_key_press_event), Bars));
-- beats_ebox.signal_key_press_event().connect (bind (mem_fun(*this,
&AudioClock::field_key_press_event), Beats));
-- ticks_ebox.signal_key_press_event().connect (bind (mem_fun(*this,
&AudioClock::field_key_press_event), Ticks));
-- ms_hours_ebox.signal_key_press_event().connect (bind (mem_fun(*this,
&AudioClock::field_key_press_event), MS_Hours));
-- ms_minutes_ebox.signal_key_press_event().connect (bind (mem_fun(*this,
&AudioClock::field_key_press_event), MS_Minutes));
-- ms_seconds_ebox.signal_key_press_event().connect (bind (mem_fun(*this,
&AudioClock::field_key_press_event), MS_Seconds));
--
-- hours_ebox.signal_key_release_event().connect (bind (mem_fun(*this,
&AudioClock::field_key_release_event), SMPTE_Hours));
-- minutes_ebox.signal_key_release_event().connect (bind (mem_fun(*this,
&AudioClock::field_key_release_event), SMPTE_Minutes));
-- seconds_ebox.signal_key_release_event().connect (bind (mem_fun(*this,
&AudioClock::field_key_release_event), SMPTE_Seconds));
-- frames_ebox.signal_key_release_event().connect (bind (mem_fun(*this,
&AudioClock::field_key_release_event), SMPTE_Frames));
-- audio_frames_ebox.signal_key_release_event().connect (bind (mem_fun(*this,
&AudioClock::field_key_release_event), AudioFrames));
-- bars_ebox.signal_key_release_event().connect (bind (mem_fun(*this,
&AudioClock::field_key_release_event), Bars));
-- beats_ebox.signal_key_release_event().connect (bind (mem_fun(*this,
&AudioClock::field_key_release_event), Beats));
-- ticks_ebox.signal_key_release_event().connect (bind (mem_fun(*this,
&AudioClock::field_key_release_event), Ticks));
-- ms_hours_ebox.signal_key_release_event().connect (bind (mem_fun(*this,
&AudioClock::field_key_release_event), MS_Hours));
-- ms_minutes_ebox.signal_key_release_event().connect (bind (mem_fun(*this,
&AudioClock::field_key_release_event), MS_Minutes));
-- ms_seconds_ebox.signal_key_release_event().connect (bind (mem_fun(*this,
&AudioClock::field_key_release_event), MS_Seconds));
--
-- hours_ebox.signal_focus_in_event().connect (bind (mem_fun(*this,
&AudioClock::field_focus_in_event), SMPTE_Hours));
-- minutes_ebox.signal_focus_in_event().connect (bind (mem_fun(*this,
&AudioClock::field_focus_in_event), SMPTE_Minutes));
-- seconds_ebox.signal_focus_in_event().connect (bind (mem_fun(*this,
&AudioClock::field_focus_in_event), SMPTE_Seconds));
-- frames_ebox.signal_focus_in_event().connect (bind (mem_fun(*this,
&AudioClock::field_focus_in_event), SMPTE_Frames));
-- audio_frames_ebox.signal_focus_in_event().connect (bind (mem_fun(*this,
&AudioClock::field_focus_in_event), AudioFrames));
-- bars_ebox.signal_focus_in_event().connect (bind (mem_fun(*this,
&AudioClock::field_focus_in_event), Bars));
-- beats_ebox.signal_focus_in_event().connect (bind (mem_fun(*this,
&AudioClock::field_focus_in_event), Beats));
-- ticks_ebox.signal_focus_in_event().connect (bind (mem_fun(*this,
&AudioClock::field_focus_in_event), Ticks));
-- ms_hours_ebox.signal_focus_in_event().connect (bind (mem_fun(*this,
&AudioClock::field_focus_in_event), MS_Hours));
-- ms_minutes_ebox.signal_focus_in_event().connect (bind (mem_fun(*this,
&AudioClock::field_focus_in_event), MS_Minutes));
-- ms_seconds_ebox.signal_focus_in_event().connect (bind (mem_fun(*this,
&AudioClock::field_focus_in_event), MS_Seconds));
--
-- hours_ebox.signal_focus_out_event().connect (bind (mem_fun(*this,
&AudioClock::field_focus_out_event), SMPTE_Hours));
-- minutes_ebox.signal_focus_out_event().connect (bind (mem_fun(*this,
&AudioClock::field_focus_out_event), SMPTE_Minutes));
-- seconds_ebox.signal_focus_out_event().connect (bind (mem_fun(*this,
&AudioClock::field_focus_out_event), SMPTE_Seconds));
-- frames_ebox.signal_focus_out_event().connect (bind (mem_fun(*this,
&AudioClock::field_focus_out_event), SMPTE_Frames));
-- audio_frames_ebox.signal_focus_out_event().connect (bind (mem_fun(*this,
&AudioClock::field_focus_out_event), AudioFrames));
-- bars_ebox.signal_focus_out_event().connect (bind (mem_fun(*this,
&AudioClock::field_focus_out_event), Bars));
-- beats_ebox.signal_focus_out_event().connect (bind (mem_fun(*this,
&AudioClock::field_focus_out_event), Beats));
-- ticks_ebox.signal_focus_out_event().connect (bind (mem_fun(*this,
&AudioClock::field_focus_out_event), Ticks));
-- ms_hours_ebox.signal_focus_out_event().connect (bind (mem_fun(*this,
&AudioClock::field_focus_out_event), MS_Hours));
-- ms_minutes_ebox.signal_focus_out_event().connect (bind (mem_fun(*this,
&AudioClock::field_focus_out_event), MS_Minutes));
-- ms_seconds_ebox.signal_focus_out_event().connect (bind (mem_fun(*this,
&AudioClock::field_focus_out_event), MS_Seconds));
-+ hours_ebox.signal_motion_notify_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_motion_notify_event), SMPTE_Hours));
-+ minutes_ebox.signal_motion_notify_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_motion_notify_event), SMPTE_Minutes));
-+ seconds_ebox.signal_motion_notify_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_motion_notify_event), SMPTE_Seconds));
-+ frames_ebox.signal_motion_notify_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_motion_notify_event), SMPTE_Frames));
-+ audio_frames_ebox.signal_motion_notify_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_motion_notify_event), AudioFrames));
-+ bars_ebox.signal_motion_notify_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_motion_notify_event), Bars));
-+ beats_ebox.signal_motion_notify_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_motion_notify_event), Beats));
-+ ticks_ebox.signal_motion_notify_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_motion_notify_event), Ticks));
-+ ms_hours_ebox.signal_motion_notify_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_motion_notify_event), MS_Hours));
-+ ms_minutes_ebox.signal_motion_notify_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_motion_notify_event), MS_Minutes));
-+ ms_seconds_ebox.signal_motion_notify_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_motion_notify_event), MS_Seconds));
-+
-+ hours_ebox.signal_button_press_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_button_press_event), SMPTE_Hours));
-+ minutes_ebox.signal_button_press_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_button_press_event), SMPTE_Minutes));
-+ seconds_ebox.signal_button_press_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_button_press_event), SMPTE_Seconds));
-+ frames_ebox.signal_button_press_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_button_press_event), SMPTE_Frames));
-+ audio_frames_ebox.signal_button_press_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_button_press_event), AudioFrames));
-+ bars_ebox.signal_button_press_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_button_press_event), Bars));
-+ beats_ebox.signal_button_press_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_button_press_event), Beats));
-+ ticks_ebox.signal_button_press_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_button_press_event), Ticks));
-+ ms_hours_ebox.signal_button_press_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_button_press_event), MS_Hours));
-+ ms_minutes_ebox.signal_button_press_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_button_press_event), MS_Minutes));
-+ ms_seconds_ebox.signal_button_press_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_button_press_event), MS_Seconds));
-+
-+ hours_ebox.signal_button_release_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_button_release_event), SMPTE_Hours));
-+ minutes_ebox.signal_button_release_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_button_release_event), SMPTE_Minutes));
-+ seconds_ebox.signal_button_release_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_button_release_event), SMPTE_Seconds));
-+ frames_ebox.signal_button_release_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_button_release_event), SMPTE_Frames));
-+ audio_frames_ebox.signal_button_release_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_button_release_event), AudioFrames));
-+ bars_ebox.signal_button_release_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_button_release_event), Bars));
-+ beats_ebox.signal_button_release_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_button_release_event), Beats));
-+ ticks_ebox.signal_button_release_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_button_release_event), Ticks));
-+ ms_hours_ebox.signal_button_release_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_button_release_event), MS_Hours));
-+ ms_minutes_ebox.signal_button_release_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_button_release_event), MS_Minutes));
-+ ms_seconds_ebox.signal_button_release_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_button_release_event), MS_Seconds));
-+
-+ hours_ebox.signal_scroll_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_button_scroll_event), SMPTE_Hours));
-+ minutes_ebox.signal_scroll_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_button_scroll_event), SMPTE_Minutes));
-+ seconds_ebox.signal_scroll_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_button_scroll_event), SMPTE_Seconds));
-+ frames_ebox.signal_scroll_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_button_scroll_event), SMPTE_Frames));
-+ audio_frames_ebox.signal_scroll_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_button_scroll_event), AudioFrames));
-+ bars_ebox.signal_scroll_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_button_scroll_event), Bars));
-+ beats_ebox.signal_scroll_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_button_scroll_event), Beats));
-+ ticks_ebox.signal_scroll_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_button_scroll_event), Ticks));
-+ ms_hours_ebox.signal_scroll_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_button_scroll_event), MS_Hours));
-+ ms_minutes_ebox.signal_scroll_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_button_scroll_event), MS_Minutes));
-+ ms_seconds_ebox.signal_scroll_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_button_scroll_event), MS_Seconds));
-+
-+ hours_ebox.signal_key_press_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_key_press_event), SMPTE_Hours));
-+ minutes_ebox.signal_key_press_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_key_press_event), SMPTE_Minutes));
-+ seconds_ebox.signal_key_press_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_key_press_event), SMPTE_Seconds));
-+ frames_ebox.signal_key_press_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_key_press_event), SMPTE_Frames));
-+ audio_frames_ebox.signal_key_press_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_key_press_event), AudioFrames));
-+ bars_ebox.signal_key_press_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_key_press_event), Bars));
-+ beats_ebox.signal_key_press_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_key_press_event), Beats));
-+ ticks_ebox.signal_key_press_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_key_press_event), Ticks));
-+ ms_hours_ebox.signal_key_press_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_key_press_event), MS_Hours));
-+ ms_minutes_ebox.signal_key_press_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_key_press_event), MS_Minutes));
-+ ms_seconds_ebox.signal_key_press_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_key_press_event), MS_Seconds));
-+
-+ hours_ebox.signal_key_release_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_key_release_event), SMPTE_Hours));
-+ minutes_ebox.signal_key_release_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_key_release_event), SMPTE_Minutes));
-+ seconds_ebox.signal_key_release_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_key_release_event), SMPTE_Seconds));
-+ frames_ebox.signal_key_release_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_key_release_event), SMPTE_Frames));
-+ audio_frames_ebox.signal_key_release_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_key_release_event), AudioFrames));
-+ bars_ebox.signal_key_release_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_key_release_event), Bars));
-+ beats_ebox.signal_key_release_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_key_release_event), Beats));
-+ ticks_ebox.signal_key_release_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_key_release_event), Ticks));
-+ ms_hours_ebox.signal_key_release_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_key_release_event), MS_Hours));
-+ ms_minutes_ebox.signal_key_release_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_key_release_event), MS_Minutes));
-+ ms_seconds_ebox.signal_key_release_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_key_release_event), MS_Seconds));
-+
-+ hours_ebox.signal_focus_in_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_focus_in_event), SMPTE_Hours));
-+ minutes_ebox.signal_focus_in_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_focus_in_event), SMPTE_Minutes));
-+ seconds_ebox.signal_focus_in_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_focus_in_event), SMPTE_Seconds));
-+ frames_ebox.signal_focus_in_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_focus_in_event), SMPTE_Frames));
-+ audio_frames_ebox.signal_focus_in_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_focus_in_event), AudioFrames));
-+ bars_ebox.signal_focus_in_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_focus_in_event), Bars));
-+ beats_ebox.signal_focus_in_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_focus_in_event), Beats));
-+ ticks_ebox.signal_focus_in_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_focus_in_event), Ticks));
-+ ms_hours_ebox.signal_focus_in_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_focus_in_event), MS_Hours));
-+ ms_minutes_ebox.signal_focus_in_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_focus_in_event), MS_Minutes));
-+ ms_seconds_ebox.signal_focus_in_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_focus_in_event), MS_Seconds));
-+
-+ hours_ebox.signal_focus_out_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_focus_out_event), SMPTE_Hours));
-+ minutes_ebox.signal_focus_out_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_focus_out_event), SMPTE_Minutes));
-+ seconds_ebox.signal_focus_out_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_focus_out_event), SMPTE_Seconds));
-+ frames_ebox.signal_focus_out_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_focus_out_event), SMPTE_Frames));
-+ audio_frames_ebox.signal_focus_out_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_focus_out_event), AudioFrames));
-+ bars_ebox.signal_focus_out_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_focus_out_event), Bars));
-+ beats_ebox.signal_focus_out_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_focus_out_event), Beats));
-+ ticks_ebox.signal_focus_out_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_focus_out_event), Ticks));
-+ ms_hours_ebox.signal_focus_out_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_focus_out_event), MS_Hours));
-+ ms_minutes_ebox.signal_focus_out_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_focus_out_event), MS_Minutes));
-+ ms_seconds_ebox.signal_focus_out_event().connect (sigc::bind (mem_fun(*this,
&AudioClock::field_focus_out_event), MS_Seconds));
-
- clock_base.signal_focus_in_event().connect (mem_fun (*this,
&AudioClock::drop_focus_handler));
- }
-@@ -1945,12 +1945,12 @@ AudioClock::build_ops_menu ()
- ops_menu->set_name ("ArdourContextMenu");
-
- if (!Profile->get_sae()) {
-- ops_items.push_back (MenuElem (_("Timecode"), bind (mem_fun(*this,
&AudioClock::set_mode), SMPTE)));
-+ ops_items.push_back (MenuElem (_("Timecode"), sigc::bind (mem_fun(*this,
&AudioClock::set_mode), SMPTE)));
- }
-- ops_items.push_back (MenuElem (_("Bars:Beats"), bind (mem_fun(*this,
&AudioClock::set_mode), BBT)));
-- ops_items.push_back (MenuElem (_("Minutes:Seconds"), bind (mem_fun(*this,
&AudioClock::set_mode), MinSec)));
-- ops_items.push_back (MenuElem (_("Samples"), bind (mem_fun(*this,
&AudioClock::set_mode), Frames)));
-- ops_items.push_back (MenuElem (_("Off"), bind (mem_fun(*this,
&AudioClock::set_mode), Off)));
-+ ops_items.push_back (MenuElem (_("Bars:Beats"), sigc::bind (mem_fun(*this,
&AudioClock::set_mode), BBT)));
-+ ops_items.push_back (MenuElem (_("Minutes:Seconds"), sigc::bind
(mem_fun(*this, &AudioClock::set_mode), MinSec)));
-+ ops_items.push_back (MenuElem (_("Samples"), sigc::bind (mem_fun(*this,
&AudioClock::set_mode), Frames)));
-+ ops_items.push_back (MenuElem (_("Off"), sigc::bind (mem_fun(*this,
&AudioClock::set_mode), Off)));
- }
-
- void
-diff --git a/gtk2_ardour/audio_region_editor.cc b/gtk2_ardour/audio_region_editor.cc
-index b30b462..c4a600c 100644
---- a/gtk2_ardour/audio_region_editor.cc
-+++ b/gtk2_ardour/audio_region_editor.cc
-@@ -143,7 +143,7 @@ AudioRegionEditor::AudioRegionEditor (Session& s,
boost::shared_ptr<AudioRegion>
- set_name ("AudioRegionEditorWindow");
- add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
-
-- signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it),
static_cast<Window *> (this)));
-+ signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it),
static_cast<Window *> (this)));
-
- set_title (string_compose (_("Region %1"), _region->name()));
-
-@@ -361,7 +361,7 @@ AudioRegionEditor::name_entry_changed ()
- void
- AudioRegionEditor::audition_state_changed (bool yn)
- {
-- ENSURE_GUI_THREAD (bind (mem_fun(*this,
&AudioRegionEditor::audition_state_changed), yn));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun(*this,
&AudioRegionEditor::audition_state_changed), yn));
-
- if (!yn) {
- audition_button.set_active (false);
-diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc
-index ded54a5..2fcf221 100644
---- a/gtk2_ardour/automation_line.cc
-+++ b/gtk2_ardour/automation_line.cc
-@@ -606,7 +606,7 @@ AutomationLine::determine_visible_control_points (ALPoints&
points)
- double tx = points[pi].x;
- double ty = points[pi].y;
-
-- if (isnan (tx) || isnan (ty)) {
-+ if (std::isnan (tx) || std::isnan (ty)) {
- warning << string_compose (_("Ignoring illegal points on AutomationLine
\"%1\""),
- _name) << endmsg;
- continue;
-diff --git a/gtk2_ardour/crossfade_edit.cc b/gtk2_ardour/crossfade_edit.cc
-index 918c4a5..97aa569 100644
---- a/gtk2_ardour/crossfade_edit.cc
-+++ b/gtk2_ardour/crossfade_edit.cc
-@@ -156,8 +156,8 @@ CrossfadeEditor::CrossfadeEditor (Session& s,
boost::shared_ptr<Crossfade> xf, d
- select_in_button.set_name (X_("CrossfadeEditCurveButton"));
- select_out_button.set_name (X_("CrossfadeEditCurveButton"));
-
-- select_in_button.signal_clicked().connect (bind (mem_fun (*this,
&CrossfadeEditor::curve_select_clicked), In));
-- select_out_button.signal_clicked().connect (bind (mem_fun (*this,
&CrossfadeEditor::curve_select_clicked), Out));
-+ select_in_button.signal_clicked().connect (sigc::bind (mem_fun (*this,
&CrossfadeEditor::curve_select_clicked), In));
-+ select_out_button.signal_clicked().connect (sigc::bind (mem_fun (*this,
&CrossfadeEditor::curve_select_clicked), Out));
-
- HBox* acbox = manage (new HBox);
-
-@@ -198,7 +198,7 @@ CrossfadeEditor::CrossfadeEditor (Session& s,
boost::shared_ptr<Crossfade> xf, d
- pbutton = manage (new Button);
- pbutton->add (*pxmap);
- pbutton->set_name ("CrossfadeEditButton");
-- pbutton->signal_clicked().connect (bind (mem_fun(*this,
&CrossfadeEditor::apply_preset), *i));
-+ pbutton->signal_clicked().connect (sigc::bind (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);
-@@ -220,7 +220,7 @@ CrossfadeEditor::CrossfadeEditor (Session& s,
boost::shared_ptr<Crossfade> xf, d
- pbutton = manage (new Button);
- pbutton->add (*pxmap);
- pbutton->set_name ("CrossfadeEditButton");
-- pbutton->signal_clicked().connect (bind (mem_fun(*this,
&CrossfadeEditor::apply_preset), *i));
-+ pbutton->signal_clicked().connect (sigc::bind (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);
-@@ -318,7 +318,7 @@ CrossfadeEditor::dump ()
- void
- CrossfadeEditor::audition_state_changed (bool yn)
- {
-- ENSURE_GUI_THREAD (bind (mem_fun(*this, &CrossfadeEditor::audition_state_changed),
yn));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun(*this,
&CrossfadeEditor::audition_state_changed), yn));
-
- if (!yn) {
- audition_both_button.set_active (false);
-@@ -464,7 +464,7 @@ CrossfadeEditor::make_point ()
-
- p->curve = fade[current].line;
-
-- p->box->signal_event().connect (bind (mem_fun (*this,
&CrossfadeEditor::point_event), p));
-+ p->box->signal_event().connect (sigc::bind (mem_fun (*this,
&CrossfadeEditor::point_event), p));
-
- return p;
- }
-@@ -1140,7 +1140,7 @@ CrossfadeEditor::make_waves (boost::shared_ptr<AudioRegion>
region, WhichFade wh
-
- gdouble yoff = n * ht;
-
-- if (region->source(n)->peaks_ready (bind (mem_fun(*this,
&CrossfadeEditor::peaks_ready), region, which), peaks_ready_connection)) {
-+ if (region->source(n)->peaks_ready (sigc::bind (mem_fun(*this,
&CrossfadeEditor::peaks_ready), region, which), peaks_ready_connection)) {
-
- WaveView* waveview = new WaveView (*(canvas->root()));
-
-diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
-index 81d5ce1..d2bd781 100644
---- a/gtk2_ardour/editor.cc
-+++ b/gtk2_ardour/editor.cc
-@@ -677,7 +677,7 @@ Editor::Editor ()
- region_list_display.signal_button_press_event().connect (mem_fun(*this,
&Editor::region_list_display_button_press), false);
- region_list_display.signal_button_release_event().connect (mem_fun(*this,
&Editor::region_list_display_button_release));
- region_list_display.get_selection()->signal_changed().connect (mem_fun(*this,
&Editor::region_list_selection_changed));
-- // region_list_display.signal_popup_menu().connect (bind (mem_fun (*this,
&Editor::show_region_list_display_context_menu), 1, 0));
-+ // region_list_display.signal_popup_menu().connect (sigc::bind (mem_fun (*this,
&Editor::show_region_list_display_context_menu), 1, 0));
-
- named_selection_scroller.add (named_selection_display);
- named_selection_scroller.set_policy (POLICY_NEVER, POLICY_AUTOMATIC);
-@@ -741,10 +741,10 @@ Editor::Editor ()
- edit_pane.pack1 (edit_packer, true, true);
- edit_pane.pack2 (the_notebook, false, true);
-
-- edit_pane.signal_size_allocate().connect (bind (mem_fun(*this,
&Editor::pane_allocation_handler), static_cast<Paned*> (&edit_pane)));
-+ edit_pane.signal_size_allocate().connect (sigc::bind (mem_fun(*this,
&Editor::pane_allocation_handler), static_cast<Paned*> (&edit_pane)));
-
- Glib::PropertyProxy<int> proxy = edit_pane.property_position();
-- proxy.signal_changed().connect (bind (sigc::ptr_fun (pane_size_watcher),
static_cast<Paned*> (&edit_pane)));
-+ proxy.signal_changed().connect (sigc::bind (sigc::ptr_fun (pane_size_watcher),
static_cast<Paned*> (&edit_pane)));
-
- top_hbox.pack_start (toolbar_frame, true, true);
-
-@@ -778,7 +778,7 @@ Editor::Editor ()
- set_state (*node);
-
- _playlist_selector = new PlaylistSelector();
-- _playlist_selector->signal_delete_event().connect (bind (sigc::ptr_fun
(just_hide_it), static_cast<Window *> (_playlist_selector)));
-+ _playlist_selector->signal_delete_event().connect (sigc::bind (sigc::ptr_fun
(just_hide_it), static_cast<Window *> (_playlist_selector)));
-
- RegionView::RegionViewGoingAway.connect (mem_fun(*this,
&Editor::catch_vanishing_regionview));
-
-@@ -831,8 +831,8 @@ Editor::Editor ()
- /* allow external control surfaces/protocols to do various things */
-
- ControlProtocol::ZoomToSession.connect (mem_fun (*this,
&Editor::temporal_zoom_session));
-- ControlProtocol::ZoomIn.connect (bind (mem_fun (*this,
&Editor::temporal_zoom_step), false));
-- ControlProtocol::ZoomOut.connect (bind (mem_fun (*this,
&Editor::temporal_zoom_step), true));
-+ ControlProtocol::ZoomIn.connect (sigc::bind (mem_fun (*this,
&Editor::temporal_zoom_step), false));
-+ ControlProtocol::ZoomOut.connect (sigc::bind (mem_fun (*this,
&Editor::temporal_zoom_step), true));
- ControlProtocol::ScrollTimeline.connect (mem_fun (*this,
&Editor::control_scroll));
- BasicUI::AccessAction.connect (mem_fun (*this, &Editor::access_action));
-
-@@ -997,7 +997,7 @@ Editor::zoom_adjustment_changed ()
- void
- Editor::control_scroll (float fraction)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun (*this, &Editor::control_scroll), fraction));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun (*this, &Editor::control_scroll),
fraction));
-
- if (!session) {
- return;
-@@ -1053,7 +1053,7 @@ Editor::control_scroll (float fraction)
-
- /* add the next timeout */
-
-- control_scroll_connection = Glib::signal_timeout().connect (bind (mem_fun (*this,
&Editor::deferred_control_scroll), *_control_scroll_target), 250);
-+ control_scroll_connection = Glib::signal_timeout().connect (sigc::bind (mem_fun (*this,
&Editor::deferred_control_scroll), *_control_scroll_target), 250);
- }
-
- bool
-@@ -1073,7 +1073,7 @@ Editor::access_action (std::string action_group, std::string
action_item)
- return;
- }
-
-- ENSURE_GUI_THREAD (bind (mem_fun (*this, &Editor::access_action), action_group,
action_item));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun (*this, &Editor::access_action),
action_group, action_item));
-
- RefPtr<Action> act;
- act = ActionManager::get_action( action_group.c_str(), action_item.c_str() );
-@@ -1109,7 +1109,7 @@ Editor::stop_scrolling ()
- void
- Editor::map_position_change (nframes64_t frame)
- {
-- ENSURE_GUI_THREAD (bind (mem_fun(*this, &Editor::map_position_change), frame));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun(*this, &Editor::map_position_change),
frame));
-
- if (session == 0 || !_follow_playhead) {
- return;
-@@ -1169,7 +1169,7 @@ Editor::handle_new_duration ()
- void
- Editor::update_title_s (const string & snap_name)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::update_title_s), snap_name));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &Editor::update_title_s),
snap_name));
-
- update_title ();
- }
-@@ -1454,44 +1454,44 @@ Editor::popup_fade_context_menu (int button, int32_t time,
ArdourCanvas::Item* i
- case FadeInItem:
- case FadeInHandleItem:
- if (arv->audio_region()->fade_in_active()) {
-- items.push_back (MenuElem (_("Deactivate"), bind (mem_fun (*this,
&Editor::set_fade_in_active), false)));
-+ items.push_back (MenuElem (_("Deactivate"), sigc::bind (mem_fun (*this,
&Editor::set_fade_in_active), false)));
- } else {
-- items.push_back (MenuElem (_("Activate"), bind (mem_fun (*this,
&Editor::set_fade_in_active), true)));
-+ items.push_back (MenuElem (_("Activate"), sigc::bind (mem_fun (*this,
&Editor::set_fade_in_active), true)));
- }
-
- items.push_back (SeparatorElem());
-
- if (Profile->get_sae()) {
-- items.push_back (MenuElem (_("Linear"), bind (mem_fun (*this,
&Editor::set_fade_in_shape), AudioRegion::Linear)));
-- items.push_back (MenuElem (_("Slowest"), bind (mem_fun (*this,
&Editor::set_fade_in_shape), AudioRegion::Fast)));
-+ items.push_back (MenuElem (_("Linear"), sigc::bind (mem_fun (*this,
&Editor::set_fade_in_shape), AudioRegion::Linear)));
-+ items.push_back (MenuElem (_("Slowest"), sigc::bind (mem_fun (*this,
&Editor::set_fade_in_shape), AudioRegion::Fast)));
- } else {
-- items.push_back (MenuElem (_("Linear"), bind (mem_fun (*this,
&Editor::set_fade_in_shape), AudioRegion::Linear)));
-- items.push_back (MenuElem (_("Slowest"), bind (mem_fun (*this,
&Editor::set_fade_in_shape), AudioRegion::Fast)));
-- items.push_back (MenuElem (_("Slow"), bind (mem_fun (*this,
&Editor::set_fade_in_shape), AudioRegion::LogB)));
-- items.push_back (MenuElem (_("Fast"), bind (mem_fun (*this,
&Editor::set_fade_in_shape), AudioRegion::LogA)));
-- items.push_back (MenuElem (_("Fastest"), bind (mem_fun (*this,
&Editor::set_fade_in_shape), AudioRegion::Slow)));
-+ items.push_back (MenuElem (_("Linear"), sigc::bind (mem_fun (*this,
&Editor::set_fade_in_shape), AudioRegion::Linear)));
-+ items.push_back (MenuElem (_("Slowest"), sigc::bind (mem_fun (*this,
&Editor::set_fade_in_shape), AudioRegion::Fast)));
-+ items.push_back (MenuElem (_("Slow"), sigc::bind (mem_fun (*this,
&Editor::set_fade_in_shape), AudioRegion::LogB)));
-+ items.push_back (MenuElem (_("Fast"), sigc::bind (mem_fun (*this,
&Editor::set_fade_in_shape), AudioRegion::LogA)));
-+ items.push_back (MenuElem (_("Fastest"), sigc::bind (mem_fun (*this,
&Editor::set_fade_in_shape), AudioRegion::Slow)));
- }
- break;
-
- case FadeOutItem:
- case FadeOutHandleItem:
- if (arv->audio_region()->fade_out_active()) {
-- items.push_back (MenuElem (_("Deactivate"), bind (mem_fun (*this,
&Editor::set_fade_out_active), false)));
-+ items.push_back (MenuElem (_("Deactivate"), sigc::bind (mem_fun (*this,
&Editor::set_fade_out_active), false)));
- } else {
-- items.push_back (MenuElem (_("Activate"), bind (mem_fun (*this,
&Editor::set_fade_out_active), true)));
-+ items.push_back (MenuElem (_("Activate"), sigc::bind (mem_fun (*this,
&Editor::set_fade_out_active), true)));
- }
-
- items.push_back (SeparatorElem());
-
- if (Profile->get_sae()) {
-- items.push_back (MenuElem (_("Linear"), bind (mem_fun (*this,
&Editor::set_fade_out_shape), AudioRegion::Linear)));
-- items.push_back (MenuElem (_("Slowest"), bind (mem_fun (*this,
&Editor::set_fade_out_shape), AudioRegion::Slow)));
-+ items.push_back (MenuElem (_("Linear"), sigc::bind (mem_fun (*this,
&Editor::set_fade_out_shape), AudioRegion::Linear)));
-+ items.push_back (MenuElem (_("Slowest"), sigc::bind (mem_fun (*this,
&Editor::set_fade_out_shape), AudioRegion::Slow)));
- } else {
-- items.push_back (MenuElem (_("Linear"), bind (mem_fun (*this,
&Editor::set_fade_out_shape), AudioRegion::Linear)));
-- items.push_back (MenuElem (_("Slowest"), bind (mem_fun (*this,
&Editor::set_fade_out_shape), AudioRegion::Slow)));
-- items.push_back (MenuElem (_("Slow"), bind (mem_fun (*this,
&Editor::set_fade_out_shape), AudioRegion::LogA)));
-- items.push_back (MenuElem (_("Fast"), bind (mem_fun (*this,
&Editor::set_fade_out_shape), AudioRegion::LogB)));
-- items.push_back (MenuElem (_("Fastest"), bind (mem_fun (*this,
&Editor::set_fade_out_shape), AudioRegion::Fast)));
-+ items.push_back (MenuElem (_("Linear"), sigc::bind (mem_fun (*this,
&Editor::set_fade_out_shape), AudioRegion::Linear)));
-+ items.push_back (MenuElem (_("Slowest"), sigc::bind (mem_fun (*this,
&Editor::set_fade_out_shape), AudioRegion::Slow)));
-+ items.push_back (MenuElem (_("Slow"), sigc::bind (mem_fun (*this,
&Editor::set_fade_out_shape), AudioRegion::LogA)));
-+ items.push_back (MenuElem (_("Fast"), sigc::bind (mem_fun (*this,
&Editor::set_fade_out_shape), AudioRegion::LogB)));
-+ items.push_back (MenuElem (_("Fastest"), sigc::bind (mem_fun (*this,
&Editor::set_fade_out_shape), AudioRegion::Fast)));
- }
- break;
-
-@@ -1798,8 +1798,8 @@ Editor::add_crossfade_context_items (AudioStreamView* view,
boost::shared_ptr<Cr
- str = _("Unmute");
- }
-
-- items.push_back (MenuElem (str, bind (mem_fun(*this, &Editor::toggle_xfade_active),
boost::weak_ptr<Crossfade> (xfade))));
-- items.push_back (MenuElem (_("Edit"), bind (mem_fun(*this,
&Editor::edit_xfade), boost::weak_ptr<Crossfade> (xfade))));
-+ items.push_back (MenuElem (str, sigc::bind (mem_fun(*this,
&Editor::toggle_xfade_active), boost::weak_ptr<Crossfade> (xfade))));
-+ items.push_back (MenuElem (_("Edit"), sigc::bind (mem_fun(*this,
&Editor::edit_xfade), boost::weak_ptr<Crossfade> (xfade))));
-
- if (xfade->can_follow_overlap()) {
-
-@@ -1809,7 +1809,7 @@ Editor::add_crossfade_context_items (AudioStreamView* view,
boost::shared_ptr<Cr
- str = _("Convert to full");
- }
-
-- items.push_back (MenuElem (str, bind (mem_fun(*this,
&Editor::toggle_xfade_length), xfade)));
-+ items.push_back (MenuElem (str, sigc::bind (mem_fun(*this,
&Editor::toggle_xfade_length), xfade)));
- }
-
- if (many) {
-@@ -1860,7 +1860,7 @@ Editor::add_region_context_items (AudioStreamView* sv,
boost::shared_ptr<Region>
- */
-
- region_menu->signal_map_event().connect (
-- bind (
-+ sigc::bind (
- mem_fun(*this, &Editor::set_selected_regionview_from_map_event),
- sv,
- boost::weak_ptr<Region>(region)
-@@ -1919,7 +1919,7 @@ Editor::add_region_context_items (AudioStreamView* sv,
boost::shared_ptr<Region>
- break;
- }
-
-- bbt_glue_item->signal_activate().connect (bind (mem_fun (*this,
&Editor::set_region_lock_style), Region::MusicTime));
-+ bbt_glue_item->signal_activate().connect (sigc::bind (mem_fun (*this,
&Editor::set_region_lock_style), Region::MusicTime));
-
- items.push_back (CheckMenuElem (_("Mute")));
- CheckMenuItem* region_mute_item =
static_cast<CheckMenuItem*>(&items.back());
-@@ -2007,8 +2007,8 @@ Editor::add_region_context_items (AudioStreamView* sv,
boost::shared_ptr<Region>
- MenuList& nudge_items = nudge_menu->items();
- nudge_menu->set_name ("ArdourContextMenu");
-
-- nudge_items.push_back (MenuElem (_("Nudge fwd"), (bind (mem_fun(*this,
&Editor::nudge_forward), false, false))));
-- nudge_items.push_back (MenuElem (_("Nudge bwd"), (bind (mem_fun(*this,
&Editor::nudge_backward), false, false))));
-+ nudge_items.push_back (MenuElem (_("Nudge fwd"), (sigc::bind (mem_fun(*this,
&Editor::nudge_forward), false, false))));
-+ nudge_items.push_back (MenuElem (_("Nudge bwd"), (sigc::bind (mem_fun(*this,
&Editor::nudge_backward), false, false))));
- nudge_items.push_back (MenuElem (_("Nudge fwd by capture offset"),
(mem_fun(*this, &Editor::nudge_forward_capture_offset))));
- nudge_items.push_back (MenuElem (_("Nudge bwd by capture offset"),
(mem_fun(*this, &Editor::nudge_backward_capture_offset))));
-
-@@ -2045,8 +2045,8 @@ Editor::add_region_context_items (AudioStreamView* sv,
boost::shared_ptr<Region>
- items.push_back (MenuElem (_("Make mono regions"), (mem_fun(*this,
&Editor::split_multichannel_region))));
- region_edit_menu_split_multichannel_item = &items.back();
-
-- items.push_back (MenuElem (_("Duplicate"), (bind (mem_fun(*this,
&Editor::duplicate_dialog), false))));
-- items.push_back (MenuElem (_("Multi-Duplicate"), (bind (mem_fun(*this,
&Editor::duplicate_dialog), true))));
-+ items.push_back (MenuElem (_("Duplicate"), (sigc::bind (mem_fun(*this,
&Editor::duplicate_dialog), false))));
-+ items.push_back (MenuElem (_("Multi-Duplicate"), (sigc::bind (mem_fun(*this,
&Editor::duplicate_dialog), true))));
- items.push_back (MenuElem (_("Fill Track"), (mem_fun(*this,
&Editor::region_fill_track))));
- items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Remove"), mem_fun(*this,
&Editor::remove_region)));
-@@ -2069,7 +2069,7 @@ Editor::add_region_context_items (AudioStreamView* sv,
boost::shared_ptr<Region>
-
- edit_items.push_back (MenuElem (menu_item_name, *region_menu));
- if (multiple_region_at_position && (layering_order_editor == 0 ||
!layering_order_editor->is_visible ())) {
-- edit_items.push_back (MenuElem (_("Choose top region"), (bind
(mem_fun(*this, &Editor::change_region_layering_order), position))));
-+ edit_items.push_back (MenuElem (_("Choose top region"), (sigc::bind
(mem_fun(*this, &Editor::change_region_layering_order), position))));
- }
- edit_items.push_back (SeparatorElem());
- }
-@@ -2080,10 +2080,10 @@ Editor::add_selection_context_items (Menu_Helpers::MenuList&
items)
- using namespace Menu_Helpers;
-
- items.push_back (MenuElem (_("Play range"), mem_fun(*this,
&Editor::play_selection)));
-- items.push_back (MenuElem (_("Loop range"), bind (mem_fun(*this,
&Editor::set_loop_from_selection), true)));
-+ items.push_back (MenuElem (_("Loop range"), sigc::bind (mem_fun(*this,
&Editor::set_loop_from_selection), true)));
-
- items.push_back (SeparatorElem());
-- items.push_back (MenuElem (_("Set loop from selection"), bind (mem_fun(*this,
&Editor::set_loop_from_selection), false)));
-+ items.push_back (MenuElem (_("Set loop from selection"), sigc::bind
(mem_fun(*this, &Editor::set_loop_from_selection), false)));
- items.push_back (MenuElem (_("Set punch from selection"), mem_fun(*this,
&Editor::set_punch_from_selection)));
-
- #ifdef FFT_ANALYSIS
-@@ -2092,8 +2092,8 @@ Editor::add_selection_context_items (Menu_Helpers::MenuList&
items)
- #endif
-
- items.push_back (SeparatorElem());
-- items.push_back (MenuElem (_("Extend Range to End of Region"), bind
(mem_fun(*this, &Editor::extend_selection_to_end_of_region), false)));
-- items.push_back (MenuElem (_("Extend Range to Start of Region"), bind
(mem_fun(*this, &Editor::extend_selection_to_start_of_region), false)));
-+ items.push_back (MenuElem (_("Extend Range to End of Region"), sigc::bind
(mem_fun(*this, &Editor::extend_selection_to_end_of_region), false)));
-+ items.push_back (MenuElem (_("Extend Range to Start of Region"), sigc::bind
(mem_fun(*this, &Editor::extend_selection_to_start_of_region), false)));
-
- items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Convert to region in-place"), mem_fun(*this,
&Editor::separate_region_from_selection)));
-@@ -2107,13 +2107,13 @@ Editor::add_selection_context_items (Menu_Helpers::MenuList&
items)
- items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Crop region to range"), mem_fun(*this,
&Editor::crop_region_to_selection)));
- items.push_back (MenuElem (_("Fill range with region"), mem_fun(*this,
&Editor::region_fill_selection)));
-- items.push_back (MenuElem (_("Duplicate range"), bind (mem_fun(*this,
&Editor::duplicate_dialog), false)));
-+ items.push_back (MenuElem (_("Duplicate range"), sigc::bind (mem_fun(*this,
&Editor::duplicate_dialog), false)));
- items.push_back (MenuElem (_("Create chunk from range"), mem_fun(*this,
&Editor::create_named_selection)));
- items.push_back (SeparatorElem());
-- items.push_back (MenuElem (_("Consolidate range"), bind (mem_fun(*this,
&Editor::bounce_range_selection), true, false)));
-- items.push_back (MenuElem (_("Consolidate range with processing"), bind
(mem_fun(*this, &Editor::bounce_range_selection), true, true)));
-- items.push_back (MenuElem (_("Bounce range to region list"), bind
(mem_fun(*this, &Editor::bounce_range_selection), false, false)));
-- items.push_back (MenuElem (_("Bounce range to region list with processing"),
bind (mem_fun(*this, &Editor::bounce_range_selection), false, true)));
-+ items.push_back (MenuElem (_("Consolidate range"), sigc::bind (mem_fun(*this,
&Editor::bounce_range_selection), true, false)));
-+ items.push_back (MenuElem (_("Consolidate range with processing"), sigc::bind
(mem_fun(*this, &Editor::bounce_range_selection), true, true)));
-+ items.push_back (MenuElem (_("Bounce range to region list"), sigc::bind
(mem_fun(*this, &Editor::bounce_range_selection), false, false)));
-+ items.push_back (MenuElem (_("Bounce range to region list with processing"),
sigc::bind (mem_fun(*this, &Editor::bounce_range_selection), false, true)));
- items.push_back (MenuElem (_("Export range"), mem_fun(*this,
&Editor::export_selection)));
- }
-
-@@ -2142,20 +2142,20 @@ Editor::add_dstream_context_items (Menu_Helpers::MenuList&
edit_items)
- MenuList& select_items = select_menu->items();
- select_menu->set_name ("ArdourContextMenu");
-
-- select_items.push_back (MenuElem (_("Select All in track"), bind
(mem_fun(*this, &Editor::select_all_in_track), Selection::Set)));
-- select_items.push_back (MenuElem (_("Select All"), bind (mem_fun(*this,
&Editor::select_all), Selection::Set)));
-+ select_items.push_back (MenuElem (_("Select All in track"), sigc::bind
(mem_fun(*this, &Editor::select_all_in_track), Selection::Set)));
-+ select_items.push_back (MenuElem (_("Select All"), sigc::bind (mem_fun(*this,
&Editor::select_all), Selection::Set)));
- select_items.push_back (MenuElem (_("Invert selection in track"),
mem_fun(*this, &Editor::invert_selection_in_track)));
- select_items.push_back (MenuElem (_("Invert selection"), mem_fun(*this,
&Editor::invert_selection)));
- select_items.push_back (SeparatorElem());
- select_items.push_back (MenuElem (_("Set range to loop range"),
mem_fun(*this, &Editor::set_selection_from_loop)));
- select_items.push_back (MenuElem (_("Set range to punch range"),
mem_fun(*this, &Editor::set_selection_from_punch)));
- select_items.push_back (SeparatorElem());
-- select_items.push_back (MenuElem (_("Select All After Edit Point"), bind
(mem_fun(*this, &Editor::select_all_selectables_using_edit), true)));
-- select_items.push_back (MenuElem (_("Select All Before Edit Point"), bind
(mem_fun(*this, &Editor::select_all_selectables_using_edit), false)));
-- select_items.push_back (MenuElem (_("Select All After Playhead"), bind
(mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor,
true)));
-- select_items.push_back (MenuElem (_("Select All Before Playhead"), bind
(mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor,
false)));
-- select_items.push_back (MenuElem (_("Select All Between Playhead & Edit
Point"), bind (mem_fun(*this, &Editor::select_all_selectables_between),
false)));
-- select_items.push_back (MenuElem (_("Select All Within Playhead & Edit
Point"), bind (mem_fun(*this, &Editor::select_all_selectables_between), true)));
-+ select_items.push_back (MenuElem (_("Select All After Edit Point"),
sigc::bind (mem_fun(*this, &Editor::select_all_selectables_using_edit), true)));
-+ select_items.push_back (MenuElem (_("Select All Before Edit Point"),
sigc::bind (mem_fun(*this, &Editor::select_all_selectables_using_edit), false)));
-+ select_items.push_back (MenuElem (_("Select All After Playhead"), sigc::bind
(mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor,
true)));
-+ select_items.push_back (MenuElem (_("Select All Before Playhead"), sigc::bind
(mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor,
false)));
-+ select_items.push_back (MenuElem (_("Select All Between Playhead & Edit
Point"), sigc::bind (mem_fun(*this, &Editor::select_all_selectables_between),
false)));
-+ select_items.push_back (MenuElem (_("Select All Within Playhead & Edit
Point"), sigc::bind (mem_fun(*this, &Editor::select_all_selectables_between),
true)));
- select_items.push_back (MenuElem (_("Select Range Between Playhead & Edit
Point"), mem_fun(*this, &Editor::select_range_between)));
-
- select_items.push_back (SeparatorElem());
-@@ -2170,24 +2170,24 @@ Editor::add_dstream_context_items (Menu_Helpers::MenuList&
edit_items)
-
- cutnpaste_items.push_back (MenuElem (_("Cut"), mem_fun(*this,
&Editor::cut)));
- cutnpaste_items.push_back (MenuElem (_("Copy"), mem_fun(*this,
&Editor::copy)));
-- cutnpaste_items.push_back (MenuElem (_("Paste"), bind (mem_fun(*this,
&Editor::paste), 1.0f)));
-+ cutnpaste_items.push_back (MenuElem (_("Paste"), sigc::bind (mem_fun(*this,
&Editor::paste), 1.0f)));
-
- cutnpaste_items.push_back (SeparatorElem());
-
-- cutnpaste_items.push_back (MenuElem (_("Align"), bind (mem_fun(*this,
&Editor::align), ARDOUR::SyncPoint)));
-- cutnpaste_items.push_back (MenuElem (_("Align Relative"), bind
(mem_fun(*this, &Editor::align_relative), ARDOUR::SyncPoint)));
-+ cutnpaste_items.push_back (MenuElem (_("Align"), sigc::bind (mem_fun(*this,
&Editor::align), ARDOUR::SyncPoint)));
-+ cutnpaste_items.push_back (MenuElem (_("Align Relative"), sigc::bind
(mem_fun(*this, &Editor::align_relative), ARDOUR::SyncPoint)));
-
- cutnpaste_items.push_back (SeparatorElem());
-
-- cutnpaste_items.push_back (MenuElem (_("Insert chunk"), bind (mem_fun(*this,
&Editor::paste_named_selection), 1.0f)));
-+ cutnpaste_items.push_back (MenuElem (_("Insert chunk"), sigc::bind
(mem_fun(*this, &Editor::paste_named_selection), 1.0f)));
-
- edit_items.push_back (MenuElem (_("Edit"), *cutnpaste_menu));
-
- /* Adding new material */
-
- edit_items.push_back (SeparatorElem());
-- edit_items.push_back (MenuElem (_("Insert Selected Region"), bind
(mem_fun(*this, &Editor::insert_region_list_selection), 1.0f)));
-- edit_items.push_back (MenuElem (_("Insert Existing Audio"), bind
(mem_fun(*this, &Editor::add_external_audio_action), ImportToTrack)));
-+ edit_items.push_back (MenuElem (_("Insert Selected Region"), sigc::bind
(mem_fun(*this, &Editor::insert_region_list_selection), 1.0f)));
-+ edit_items.push_back (MenuElem (_("Insert Existing Audio"), sigc::bind
(mem_fun(*this, &Editor::add_external_audio_action), ImportToTrack)));
-
- /* Nudge track */
-
-@@ -2196,10 +2196,10 @@ Editor::add_dstream_context_items (Menu_Helpers::MenuList&
edit_items)
- nudge_menu->set_name ("ArdourContextMenu");
-
- edit_items.push_back (SeparatorElem());
-- nudge_items.push_back (MenuElem (_("Nudge entire track fwd"), (bind
(mem_fun(*this, &Editor::nudge_track), false, true))));
-- nudge_items.push_back (MenuElem (_("Nudge track after edit point fwd"), (bind
(mem_fun(*this, &Editor::nudge_track), true, true))));
-- nudge_items.push_back (MenuElem (_("Nudge entire track bwd"), (bind
(mem_fun(*this, &Editor::nudge_track), false, false))));
-- nudge_items.push_back (MenuElem (_("Nudge track after edit point bwd"), (bind
(mem_fun(*this, &Editor::nudge_track), true, false))));
-+ nudge_items.push_back (MenuElem (_("Nudge entire track fwd"), (sigc::bind
(mem_fun(*this, &Editor::nudge_track), false, true))));
-+ nudge_items.push_back (MenuElem (_("Nudge track after edit point fwd"),
(sigc::bind (mem_fun(*this, &Editor::nudge_track), true, true))));
-+ nudge_items.push_back (MenuElem (_("Nudge entire track bwd"), (sigc::bind
(mem_fun(*this, &Editor::nudge_track), false, false))));
-+ nudge_items.push_back (MenuElem (_("Nudge track after edit point bwd"),
(sigc::bind (mem_fun(*this, &Editor::nudge_track), true, false))));
-
- edit_items.push_back (MenuElem (_("Nudge"), *nudge_menu));
- }
-@@ -2225,15 +2225,15 @@ Editor::add_bus_context_items (Menu_Helpers::MenuList&
edit_items)
- MenuList& select_items = select_menu->items();
- select_menu->set_name ("ArdourContextMenu");
-
-- select_items.push_back (MenuElem (_("Select All in track"), bind
(mem_fun(*this, &Editor::select_all_in_track), Selection::Set)));
-- select_items.push_back (MenuElem (_("Select All"), bind (mem_fun(*this,
&Editor::select_all), Selection::Set)));
-+ select_items.push_back (MenuElem (_("Select All in track"), sigc::bind
(mem_fun(*this, &Editor::select_all_in_track), Selection::Set)));
-+ select_items.push_back (MenuElem (_("Select All"), sigc::bind (mem_fun(*this,
&Editor::select_all), Selection::Set)));
- select_items.push_back (MenuElem (_("Invert selection in track"),
mem_fun(*this, &Editor::invert_selection_in_track)));
- select_items.push_back (MenuElem (_("Invert selection"), mem_fun(*this,
&Editor::invert_selection)));
- select_items.push_back (SeparatorElem());
-- select_items.push_back (MenuElem (_("Select all after edit point"), bind
(mem_fun(*this, &Editor::select_all_selectables_using_edit), true)));
-- select_items.push_back (MenuElem (_("Select all before edit point"), bind
(mem_fun(*this, &Editor::select_all_selectables_using_edit), false)));
-- select_items.push_back (MenuElem (_("Select all after playhead"), bind
(mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor,
true)));
-- select_items.push_back (MenuElem (_("Select all before playhead"), bind
(mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor,
false)));
-+ select_items.push_back (MenuElem (_("Select all after edit point"),
sigc::bind (mem_fun(*this, &Editor::select_all_selectables_using_edit), true)));
-+ select_items.push_back (MenuElem (_("Select all before edit point"),
sigc::bind (mem_fun(*this, &Editor::select_all_selectables_using_edit), false)));
-+ select_items.push_back (MenuElem (_("Select all after playhead"), sigc::bind
(mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor,
true)));
-+ select_items.push_back (MenuElem (_("Select all before playhead"), sigc::bind
(mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor,
false)));
-
- edit_items.push_back (MenuElem (_("Select"), *select_menu));
-
-@@ -2245,17 +2245,17 @@ Editor::add_bus_context_items (Menu_Helpers::MenuList&
edit_items)
-
- cutnpaste_items.push_back (MenuElem (_("Cut"), mem_fun(*this,
&Editor::cut)));
- cutnpaste_items.push_back (MenuElem (_("Copy"), mem_fun(*this,
&Editor::copy)));
-- cutnpaste_items.push_back (MenuElem (_("Paste"), bind (mem_fun(*this,
&Editor::paste), 1.0f)));
-+ cutnpaste_items.push_back (MenuElem (_("Paste"), sigc::bind (mem_fun(*this,
&Editor::paste), 1.0f)));
-
- Menu *nudge_menu = manage (new Menu());
- MenuList& nudge_items = nudge_menu->items();
- nudge_menu->set_name ("ArdourContextMenu");
-
- edit_items.push_back (SeparatorElem());
-- nudge_items.push_back (MenuElem (_("Nudge entire track fwd"), (bind
(mem_fun(*this, &Editor::nudge_track), false, true))));
-- nudge_items.push_back (MenuElem (_("Nudge track after edit point fwd"), (bind
(mem_fun(*this, &Editor::nudge_track), true, true))));
-- nudge_items.push_back (MenuElem (_("Nudge entire track bwd"), (bind
(mem_fun(*this, &Editor::nudge_track), false, false))));
-- nudge_items.push_back (MenuElem (_("Nudge track after edit point bwd"), (bind
(mem_fun(*this, &Editor::nudge_track), true, false))));
-+ nudge_items.push_back (MenuElem (_("Nudge entire track fwd"), (sigc::bind
(mem_fun(*this, &Editor::nudge_track), false, true))));
-+ nudge_items.push_back (MenuElem (_("Nudge track after edit point fwd"),
(sigc::bind (mem_fun(*this, &Editor::nudge_track), true, true))));
-+ nudge_items.push_back (MenuElem (_("Nudge entire track bwd"), (sigc::bind
(mem_fun(*this, &Editor::nudge_track), false, false))));
-+ nudge_items.push_back (MenuElem (_("Nudge track after edit point bwd"),
(sigc::bind (mem_fun(*this, &Editor::nudge_track), true, false))));
-
- edit_items.push_back (MenuElem (_("Nudge"), *nudge_menu));
- }
-@@ -2972,19 +2972,19 @@ Editor::setup_toolbar ()
-
- mouse_mode_tearoff = manage (new TearOff (*mode_box));
- mouse_mode_tearoff->set_name ("MouseModeBase");
-- mouse_mode_tearoff->tearoff_window().signal_key_press_event().connect (bind
(sigc::ptr_fun (relay_key_press), &mouse_mode_tearoff->tearoff_window()));
-+ mouse_mode_tearoff->tearoff_window().signal_key_press_event().connect (sigc::bind
(sigc::ptr_fun (relay_key_press), &mouse_mode_tearoff->tearoff_window()));
-
- if (Profile->get_sae()) {
- mouse_mode_tearoff->set_can_be_torn_off (false);
- }
-
-- mouse_mode_tearoff->Detach.connect (bind (mem_fun(*this,
&Editor::detach_tearoff), static_cast<Box*>(&toolbar_hbox),
-+ mouse_mode_tearoff->Detach.connect (sigc::bind (mem_fun(*this,
&Editor::detach_tearoff), static_cast<Box*>(&toolbar_hbox),
- &mouse_mode_tearoff->tearoff_window()));
-- mouse_mode_tearoff->Attach.connect (bind (mem_fun(*this,
&Editor::reattach_tearoff), static_cast<Box*> (&toolbar_hbox),
-+ mouse_mode_tearoff->Attach.connect (sigc::bind (mem_fun(*this,
&Editor::reattach_tearoff), static_cast<Box*> (&toolbar_hbox),
- &mouse_mode_tearoff->tearoff_window(), 1));
-- mouse_mode_tearoff->Hidden.connect (bind (mem_fun(*this,
&Editor::detach_tearoff), static_cast<Box*>(&toolbar_hbox),
-+ mouse_mode_tearoff->Hidden.connect (sigc::bind (mem_fun(*this,
&Editor::detach_tearoff), static_cast<Box*>(&toolbar_hbox),
- &mouse_mode_tearoff->tearoff_window()));
-- mouse_mode_tearoff->Visible.connect (bind (mem_fun(*this,
&Editor::reattach_tearoff), static_cast<Box*> (&toolbar_hbox),
-+ mouse_mode_tearoff->Visible.connect (sigc::bind (mem_fun(*this,
&Editor::reattach_tearoff), static_cast<Box*> (&toolbar_hbox),
- &mouse_mode_tearoff->tearoff_window(), 1));
-
- mouse_move_button.set_name ("MouseModeButton");
-@@ -3008,14 +3008,14 @@ Editor::setup_toolbar ()
- mouse_timefx_button.unset_flags (CAN_FOCUS);
- mouse_audition_button.unset_flags (CAN_FOCUS);
-
-- mouse_select_button.signal_toggled().connect (bind (mem_fun(*this,
&Editor::mouse_mode_toggled), Editing::MouseRange));
-+ mouse_select_button.signal_toggled().connect (sigc::bind (mem_fun(*this,
&Editor::mouse_mode_toggled), Editing::MouseRange));
- mouse_select_button.signal_button_release_event().connect (mem_fun(*this,
&Editor::mouse_select_button_release));
-
-- mouse_move_button.signal_toggled().connect (bind (mem_fun(*this,
&Editor::mouse_mode_toggled), Editing::MouseObject));
-- mouse_gain_button.signal_toggled().connect (bind (mem_fun(*this,
&Editor::mouse_mode_toggled), Editing::MouseGain));
-- mouse_zoom_button.signal_toggled().connect (bind (mem_fun(*this,
&Editor::mouse_mode_toggled), Editing::MouseZoom));
-- mouse_timefx_button.signal_toggled().connect (bind (mem_fun(*this,
&Editor::mouse_mode_toggled), Editing::MouseTimeFX));
-- mouse_audition_button.signal_toggled().connect (bind (mem_fun(*this,
&Editor::mouse_mode_toggled), Editing::MouseAudition));
-+ mouse_move_button.signal_toggled().connect (sigc::bind (mem_fun(*this,
&Editor::mouse_mode_toggled), Editing::MouseObject));
-+ mouse_gain_button.signal_toggled().connect (sigc::bind (mem_fun(*this,
&Editor::mouse_mode_toggled), Editing::MouseGain));
-+ mouse_zoom_button.signal_toggled().connect (sigc::bind (mem_fun(*this,
&Editor::mouse_mode_toggled), Editing::MouseZoom));
-+ mouse_timefx_button.signal_toggled().connect (sigc::bind (mem_fun(*this,
&Editor::mouse_mode_toggled), Editing::MouseTimeFX));
-+ mouse_audition_button.signal_toggled().connect (sigc::bind (mem_fun(*this,
&Editor::mouse_mode_toggled), Editing::MouseAudition));
-
- // mouse_move_button.set_active (true);
-
-@@ -3028,13 +3028,13 @@ Editor::setup_toolbar ()
- zoom_in_button.set_name ("EditorTimeButton");
- zoom_in_button.set_size_request(-1,16);
- zoom_in_button.add (*(manage (new Image (::get_icon("zoom_in")))));
-- zoom_in_button.signal_clicked().connect (bind (mem_fun(*this,
&Editor::temporal_zoom_step), false));
-+ zoom_in_button.signal_clicked().connect (sigc::bind (mem_fun(*this,
&Editor::temporal_zoom_step), false));
- ARDOUR_UI::instance()->tooltips().set_tip (zoom_in_button, _("Zoom In"));
-
- zoom_out_button.set_name ("EditorTimeButton");
- zoom_out_button.set_size_request(-1,16);
- zoom_out_button.add (*(manage (new Image (::get_icon("zoom_out")))));
-- zoom_out_button.signal_clicked().connect (bind (mem_fun(*this,
&Editor::temporal_zoom_step), true));
-+ zoom_out_button.signal_clicked().connect (sigc::bind (mem_fun(*this,
&Editor::temporal_zoom_step), true));
- ARDOUR_UI::instance()->tooltips().set_tip (zoom_out_button, _("Zoom
Out"));
-
- zoom_out_full_button.set_name ("EditorTimeButton");
-@@ -3099,19 +3099,19 @@ Editor::setup_toolbar ()
-
- tools_tearoff = new TearOff (*hbox);
- tools_tearoff->set_name ("MouseModeBase");
-- tools_tearoff->tearoff_window().signal_key_press_event().connect (bind
(sigc::ptr_fun (relay_key_press), &tools_tearoff->tearoff_window()));
-+ tools_tearoff->tearoff_window().signal_key_press_event().connect (sigc::bind
(sigc::ptr_fun (relay_key_press), &tools_tearoff->tearoff_window()));
-
- if (Profile->get_sae()) {
- tools_tearoff->set_can_be_torn_off (false);
- }
-
-- tools_tearoff->Detach.connect (bind (mem_fun(*this, &Editor::detach_tearoff),
static_cast<Box*>(&toolbar_hbox),
-+ tools_tearoff->Detach.connect (sigc::bind (mem_fun(*this,
&Editor::detach_tearoff), static_cast<Box*>(&toolbar_hbox),
- &tools_tearoff->tearoff_window()));
-- tools_tearoff->Attach.connect (bind (mem_fun(*this, &Editor::reattach_tearoff),
static_cast<Box*> (&toolbar_hbox),
-+ tools_tearoff->Attach.connect (sigc::bind (mem_fun(*this,
&Editor::reattach_tearoff), static_cast<Box*> (&toolbar_hbox),
- &tools_tearoff->tearoff_window(), 0));
-- tools_tearoff->Hidden.connect (bind (mem_fun(*this, &Editor::detach_tearoff),
static_cast<Box*>(&toolbar_hbox),
-+ tools_tearoff->Hidden.connect (sigc::bind (mem_fun(*this,
&Editor::detach_tearoff), static_cast<Box*>(&toolbar_hbox),
- &tools_tearoff->tearoff_window()));
-- tools_tearoff->Visible.connect (bind (mem_fun(*this, &Editor::reattach_tearoff),
static_cast<Box*> (&toolbar_hbox),
-+ tools_tearoff->Visible.connect (sigc::bind (mem_fun(*this,
&Editor::reattach_tearoff), static_cast<Box*> (&toolbar_hbox),
- &tools_tearoff->tearoff_window(), 0));
-
- toolbar_hbox.set_spacing (10);
-@@ -3283,7 +3283,7 @@ Editor::get_memento () const
- State *state = new State;
-
- store_state (*state);
-- return bind (mem_fun (*(const_cast<Editor*>(this)), &Editor::restore_state),
state);
-+ return sigc::bind (mem_fun (*(const_cast<Editor*>(this)),
&Editor::restore_state), state);
- }
-
- void
-@@ -3960,7 +3960,7 @@ Editor::get_nudge_distance (nframes64_t pos, nframes64_t&
next)
- void
- Editor::end_location_changed (Location* location)
- {
-- ENSURE_GUI_THREAD (bind (mem_fun(*this, &Editor::end_location_changed),
location));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun(*this, &Editor::end_location_changed),
location));
- //reset_scrolling_region ();
- nframes64_t session_span = location->start() + (nframes64_t) floorf
(current_page_frames() * 0.10f);
- horizontal_adjustment.set_upper (session_span / frames_per_unit);
-@@ -4137,12 +4137,12 @@ Editor::popup_snapshot_context_menu (int button, int32_t time,
string snapshot_n
-
- const bool modification_allowed = (session->snap_name() != snapshot_name &&
session->name() != snapshot_name);
-
-- items.push_back (MenuElem (_("Remove"), bind (mem_fun (*this,
&Editor::remove_snapshot), snapshot_name)));
-+ items.push_back (MenuElem (_("Remove"), sigc::bind (mem_fun (*this,
&Editor::remove_snapshot), snapshot_name)));
- if (!modification_allowed) {
- items.back().set_sensitive (false);
- }
-
-- items.push_back (MenuElem (_("Rename"), bind (mem_fun (*this,
&Editor::rename_snapshot), snapshot_name)));
-+ items.push_back (MenuElem (_("Rename"), sigc::bind (mem_fun (*this,
&Editor::rename_snapshot), snapshot_name)));
- if (!modification_allowed) {
- items.back().set_sensitive (false);
- }
-@@ -4230,7 +4230,7 @@ Editor::redisplay_snapshots ()
- void
- Editor::session_state_saved (string snap_name)
- {
-- ENSURE_GUI_THREAD (bind (mem_fun(*this, &Editor::session_state_saved),
snap_name));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun(*this, &Editor::session_state_saved),
snap_name));
- redisplay_snapshots ();
- }
-
-@@ -4289,7 +4289,7 @@ Editor::new_playlists (TimeAxisView* v)
- begin_reversible_command (_("new playlists"));
- vector<boost::shared_ptr<ARDOUR::Playlist> > playlists;
- session->get_playlists(playlists);
-- mapover_audio_tracks ( bind(mem_fun (*this, &Editor::mapped_use_new_playlist),
playlists), v );
-+ mapover_audio_tracks ( sigc::bind(mem_fun (*this,
&Editor::mapped_use_new_playlist), playlists), v );
- commit_reversible_command ();
- }
-
-@@ -4306,7 +4306,7 @@ Editor::copy_playlists (TimeAxisView* v)
- begin_reversible_command (_("copy playlists"));
- vector<boost::shared_ptr<ARDOUR::Playlist> > playlists;
- session->get_playlists(playlists);
-- mapover_audio_tracks ( bind(mem_fun (*this, &Editor::mapped_use_copy_playlist),
playlists), v );
-+ mapover_audio_tracks ( sigc::bind(mem_fun (*this,
&Editor::mapped_use_copy_playlist), playlists), v );
- commit_reversible_command ();
- }
-
-diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc
-index 05e31e8..08c6373 100644
---- a/gtk2_ardour/editor_audio_import.cc
-+++ b/gtk2_ardour/editor_audio_import.cc
-@@ -498,7 +498,7 @@ Editor::import_sndfiles (vector<string> paths, ImportMode mode,
SrcQuality quali
- import_status.track = track;
- import_status.replace = replace;
- interthread_progress_connection = Glib::signal_timeout().connect
-- (bind (mem_fun(*this, &Editor::import_progress_timeout), (gpointer) 0), 500);
-+ (sigc::bind (mem_fun(*this, &Editor::import_progress_timeout), (gpointer) 0),
500);
-
- track_canvas->get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH));
- gdk_flush ();
-@@ -944,7 +944,7 @@ Editor::import_progress_timeout (void *arg)
-
- interthread_progress_connection.disconnect ();
- interthread_progress_connection = Glib::signal_timeout().connect
-- (bind (mem_fun(*this, &Editor::import_progress_timeout), (gpointer) 0), 100);
-+ (sigc::bind (mem_fun(*this, &Editor::import_progress_timeout), (gpointer) 0),
100);
- return false;
- } else {
- return !(import_status.done || import_status.cancel);
-diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
-index 878e2cd..f384fe7 100644
---- a/gtk2_ardour/editor_canvas.cc
-+++ b/gtk2_ardour/editor_canvas.cc
-@@ -268,7 +268,7 @@ Editor::initialize_canvas ()
- zoom_rect->property_outline_pixels() = 1;
- zoom_rect->hide();
-
-- zoom_rect->signal_event().connect (bind (mem_fun (*this,
&Editor::canvas_zoom_rect_event), (ArdourCanvas::Item*) 0));
-+ zoom_rect->signal_event().connect (sigc::bind (mem_fun (*this,
&Editor::canvas_zoom_rect_event), (ArdourCanvas::Item*) 0));
-
- // used as rubberband rect
- rubberband_rect = new ArdourCanvas::SimpleRect (*_trackview_group, 0.0, 0.0, 0.0,
0.0);
-@@ -276,12 +276,12 @@ Editor::initialize_canvas ()
- rubberband_rect->property_outline_pixels() = 1;
- rubberband_rect->hide();
-
-- tempo_bar->signal_event().connect (bind (mem_fun (*this,
&Editor::canvas_tempo_bar_event), tempo_bar));
-- meter_bar->signal_event().connect (bind (mem_fun (*this,
&Editor::canvas_meter_bar_event), meter_bar));
-- marker_bar->signal_event().connect (bind (mem_fun (*this,
&Editor::canvas_marker_bar_event), marker_bar));
-- cd_marker_bar->signal_event().connect (bind (mem_fun (*this,
&Editor::canvas_cd_marker_bar_event), cd_marker_bar));
-- range_marker_bar->signal_event().connect (bind (mem_fun (*this,
&Editor::canvas_range_marker_bar_event), range_marker_bar));
-- transport_marker_bar->signal_event().connect (bind (mem_fun (*this,
&Editor::canvas_transport_marker_bar_event), transport_marker_bar));
-+ tempo_bar->signal_event().connect (sigc::bind (mem_fun (*this,
&Editor::canvas_tempo_bar_event), tempo_bar));
-+ meter_bar->signal_event().connect (sigc::bind (mem_fun (*this,
&Editor::canvas_meter_bar_event), meter_bar));
-+ marker_bar->signal_event().connect (sigc::bind (mem_fun (*this,
&Editor::canvas_marker_bar_event), marker_bar));
-+ cd_marker_bar->signal_event().connect (sigc::bind (mem_fun (*this,
&Editor::canvas_cd_marker_bar_event), cd_marker_bar));
-+ range_marker_bar->signal_event().connect (sigc::bind (mem_fun (*this,
&Editor::canvas_range_marker_bar_event), range_marker_bar));
-+ transport_marker_bar->signal_event().connect (sigc::bind (mem_fun (*this,
&Editor::canvas_transport_marker_bar_event), transport_marker_bar));
-
- playhead_cursor = new Cursor (*this, &Editor::canvas_playhead_cursor_event);
-
-@@ -518,7 +518,7 @@ Editor::drop_paths (const RefPtr<Gdk::DragContext>&
context,
- the main event loop with GTK/Quartz. Since import/embed wants
- to push up a progress dialog, defer all this till we go idle.
- */
-- Glib::signal_idle().connect (bind (mem_fun (*this, &Editor::idle_drop_paths),
paths, frame, cy));
-+ Glib::signal_idle().connect (sigc::bind (mem_fun (*this,
&Editor::idle_drop_paths), paths, frame, cy));
- #else
- drop_paths_part_two (paths, frame, cy);
- #endif
-diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
-index 80c8b34..b47a3d3 100644
---- a/gtk2_ardour/editor_markers.cc
-+++ b/gtk2_ardour/editor_markers.cc
-@@ -59,7 +59,7 @@ Editor::clear_marker_display ()
- void
- Editor::add_new_location (Location *location)
- {
-- ENSURE_GUI_THREAD (bind (mem_fun(*this, &Editor::add_new_location), location));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun(*this, &Editor::add_new_location),
location));
-
- LocationMarkers *lam = new LocationMarkers;
- uint32_t color;
-@@ -145,7 +145,7 @@ Editor::add_new_location (Location *location)
- void
- Editor::location_changed (Location *location)
- {
-- ENSURE_GUI_THREAD (bind (mem_fun(*this, &Editor::location_changed), location));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun(*this, &Editor::location_changed),
location));
-
- LocationMarkers *lam = find_location_markers (location);
-
-@@ -167,7 +167,7 @@ Editor::location_changed (Location *location)
- void
- Editor::location_flags_changed (Location *location, void *src)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::location_flags_changed), location,
src));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &Editor::location_flags_changed),
location, src));
-
- LocationMarkers *lam = find_location_markers (location);
-
-@@ -345,7 +345,7 @@ Editor::refresh_location_display ()
- void
- Editor::refresh_location_display_s (Change ignored)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::refresh_location_display_s),
ignored));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &Editor::refresh_location_display_s),
ignored));
-
- if (session) {
- session->locations()->apply (*this,
&Editor::refresh_location_display_internal);
-@@ -442,7 +442,7 @@ Editor::remove_marker (ArdourCanvas::Item& item, GdkEvent*
event)
- Location* loc = find_location_from_marker (marker, is_start);
-
- if (session && loc) {
-- Glib::signal_idle().connect (bind (mem_fun(*this,
&Editor::really_remove_marker), loc));
-+ Glib::signal_idle().connect (sigc::bind (mem_fun(*this,
&Editor::really_remove_marker), loc));
- }
- }
-
-@@ -461,7 +461,7 @@ Editor::really_remove_marker (Location* loc)
- void
- Editor::location_gone (Location *location)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::location_gone), location));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &Editor::location_gone), location));
-
- LocationMarkerMap::iterator i;
-
-@@ -601,8 +601,8 @@ Editor::build_marker_menu (bool start_or_end)
- items.push_back (MenuElem (_("Hide"), mem_fun(*this,
&Editor::marker_menu_hide)));
- if (start_or_end) return;
- items.push_back (MenuElem (_("Rename"), mem_fun(*this,
&Editor::marker_menu_rename)));
-- items.push_back (MenuElem (_("Lock"), bind (mem_fun(*this,
&Editor::marker_menu_lock), true)));
-- items.push_back (MenuElem (_("Unlock"), bind (mem_fun(*this,
&Editor::marker_menu_lock), false)));
-+ items.push_back (MenuElem (_("Lock"), sigc::bind (mem_fun(*this,
&Editor::marker_menu_lock), true)));
-+ items.push_back (MenuElem (_("Unlock"), sigc::bind (mem_fun(*this,
&Editor::marker_menu_lock), false)));
-
- items.push_back (SeparatorElem());
-
-diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
-index 9fc77dd..3a470ab 100644
---- a/gtk2_ardour/editor_ops.cc
-+++ b/gtk2_ardour/editor_ops.cc
-@@ -1580,7 +1580,7 @@ Editor::scroll_tracks_up_line ()
- void
- Editor::temporal_zoom_step (bool coarser)
- {
-- ENSURE_GUI_THREAD (bind (mem_fun (*this, &Editor::temporal_zoom_step), coarser));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun (*this, &Editor::temporal_zoom_step),
coarser));
-
- double nfpu;
-
-@@ -1890,8 +1890,8 @@ Editor::temporal_zoom_to_frame (bool coarser, nframes64_t frame)
- new_leftmost = 0;
- }
- // begin_reversible_command (_("zoom to frame"));
--// session->add_undo (bind (mem_fun(*this, &Editor::reposition_and_zoom),
leftmost_frame, frames_per_unit));
--// session->add_redo (bind (mem_fun(*this, &Editor::reposition_and_zoom),
new_leftmost, new_fpu));
-+// session->add_undo (sigc::bind (mem_fun(*this, &Editor::reposition_and_zoom),
leftmost_frame, frames_per_unit));
-+// session->add_redo (sigc::bind (mem_fun(*this, &Editor::reposition_and_zoom),
new_leftmost, new_fpu));
- // commit_reversible_command ();
-
- reposition_and_zoom (new_leftmost, new_fpu);
-@@ -2536,7 +2536,7 @@ Editor::rename_region()
- entry.set_text (rs.front()->region()->name());
- entry.select_region (0, -1);
-
-- entry.signal_activate().connect (bind (mem_fun (d, &Dialog::response),
RESPONSE_OK));
-+ entry.signal_activate().connect (sigc::bind (mem_fun (d, &Dialog::response),
RESPONSE_OK));
-
- d.show_all ();
-
-@@ -2851,7 +2851,7 @@ Editor::separate_regions_between (const TimeSelection& ts)
-
- got_some = true;
-
-- atv->view()->foreach_regionview (bind (sigc::ptr_fun (add_if_covered),
&(*t), &new_selection));
-+ atv->view()->foreach_regionview (sigc::bind (sigc::ptr_fun
(add_if_covered), &(*t), &new_selection));
-
- if (!in_command) {
- begin_reversible_command (_("separate"));
-@@ -3578,7 +3578,7 @@ Editor::freeze_route ()
- current_interthread_info = &itt;
-
- interthread_progress_connection =
-- Glib::signal_timeout().connect (bind (mem_fun(*this,
&Editor::freeze_progress_timeout), (gpointer) 0), 100);
-+ Glib::signal_timeout().connect (sigc::bind (mem_fun(*this,
&Editor::freeze_progress_timeout), (gpointer) 0), 100);
-
- itt.done = false;
- itt.cancel = false;
-@@ -3710,7 +3710,7 @@ Editor::cut_copy (CutCopyOp op)
- Location* loc = find_location_from_marker (entered_marker, ignored);
-
- if (session && loc) {
-- Glib::signal_idle().connect (bind (mem_fun(*this, &Editor::really_remove_marker),
loc));
-+ Glib::signal_idle().connect (sigc::bind (mem_fun(*this,
&Editor::really_remove_marker), loc));
- }
-
- break_drag ();
-diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc
-index 1c0469c..45e19c1 100644
---- a/gtk2_ardour/editor_selection.cc
-+++ b/gtk2_ardour/editor_selection.cc
-@@ -440,7 +440,7 @@ Editor::mapped_get_equivalent_regions (RouteTimeAxisView& tv,
uint32_t ignored,
- void
- Editor::get_equivalent_regions (RegionView* basis, vector<RegionView*>&
equivalent_regions)
- {
-- mapover_audio_tracks (bind (mem_fun (*this,
&Editor::mapped_get_equivalent_regions), basis, &equivalent_regions),
&basis->get_trackview());
-+ mapover_audio_tracks (sigc::bind (mem_fun (*this,
&Editor::mapped_get_equivalent_regions), basis, &equivalent_regions),
&basis->get_trackview());
-
- /* add clicked regionview since we skipped all other regions in the same track as the
one it was in */
-
-diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc
-index 8642d1f..9b5d998 100644
---- a/gtk2_ardour/generic_pluginui.cc
-+++ b/gtk2_ardour/generic_pluginui.cc
-@@ -404,8 +404,8 @@ GenericPluginUI::build_control_ui (guint32 port_index,
PBD::Controllable* mcontr
- control_ui->combo = new Gtk::ComboBoxText;
- //control_ui->combo->set_value_in_list(true, false);
- set_popdown_strings (*control_ui->combo, setup_scale_values(port_index,
control_ui));
-- control_ui->combo->signal_changed().connect (bind (mem_fun(*this,
&GenericPluginUI::control_combo_changed), control_ui));
-- plugin->ParameterChanged.connect (bind (mem_fun (*this,
&GenericPluginUI::parameter_changed), control_ui));
-+ control_ui->combo->signal_changed().connect (sigc::bind (mem_fun(*this,
&GenericPluginUI::control_combo_changed), control_ui));
-+ plugin->ParameterChanged.connect (sigc::bind (mem_fun (*this,
&GenericPluginUI::parameter_changed), control_ui));
- control_ui->pack_start(control_ui->label, true, true);
- control_ui->pack_start(*control_ui->combo, false, true);
-
-@@ -425,8 +425,8 @@ GenericPluginUI::build_control_ui (guint32 port_index,
PBD::Controllable* mcontr
- control_ui->combo = new Gtk::ComboBoxText;
- //control_ui->combo->set_value_in_list(true, false);
- set_popdown_strings (*control_ui->combo, setup_scale_values(port_index,
control_ui));
-- control_ui->combo->signal_changed().connect (bind (mem_fun(*this,
&GenericPluginUI::control_combo_changed), control_ui));
-- plugin->ParameterChanged.connect (bind (mem_fun (*this,
&GenericPluginUI::parameter_changed), control_ui));
-+ control_ui->combo->signal_changed().connect (sigc::bind (mem_fun(*this,
&GenericPluginUI::control_combo_changed), control_ui));
-+ plugin->ParameterChanged.connect (sigc::bind (mem_fun (*this,
&GenericPluginUI::parameter_changed), control_ui));
- control_ui->pack_start(control_ui->label, true, true);
- control_ui->pack_start(*control_ui->combo, false, true);
-
-@@ -454,14 +454,14 @@ GenericPluginUI::build_control_ui (guint32 port_index,
PBD::Controllable* mcontr
- control_ui->button->set_active(true);
- }
-
-- control_ui->button->signal_clicked().connect (bind (mem_fun(*this,
&GenericPluginUI::control_port_toggled), control_ui));
-+ control_ui->button->signal_clicked().connect (sigc::bind (mem_fun(*this,
&GenericPluginUI::control_port_toggled), control_ui));
-
-- plugin->ParameterChanged.connect (bind (mem_fun(*this,
&GenericPluginUI::toggle_parameter_changed), control_ui));
-+ plugin->ParameterChanged.connect (sigc::bind (mem_fun(*this,
&GenericPluginUI::toggle_parameter_changed), control_ui));
-
-- control_ui->automate_button.signal_clicked().connect (bind (mem_fun(*this,
&GenericPluginUI::astate_clicked), control_ui, (uint32_t) port_index));
-+ control_ui->automate_button.signal_clicked().connect (sigc::bind (mem_fun(*this,
&GenericPluginUI::astate_clicked), control_ui, (uint32_t) port_index));
- automation_state_changed (control_ui);
- insert->automation_list (port_index).automation_state_changed.connect
-- (bind (mem_fun(*this, &GenericPluginUI::automation_state_changed),
control_ui));
-+ (sigc::bind (mem_fun(*this, &GenericPluginUI::automation_state_changed),
control_ui));
-
- return control_ui;
- }
-@@ -501,8 +501,8 @@ GenericPluginUI::build_control_ui (guint32 port_index,
PBD::Controllable* mcontr
- control_ui->control->set_use_parent (true);
- control_ui->control->set_logarithmic (control_ui->logarithmic);
-
-- control_ui->control->StartGesture.connect (bind (mem_fun(*this,
&GenericPluginUI::start_touch), control_ui));
-- control_ui->control->StopGesture.connect (bind (mem_fun(*this,
&GenericPluginUI::stop_touch), control_ui));
-+ control_ui->control->StartGesture.connect (sigc::bind (mem_fun(*this,
&GenericPluginUI::start_touch), control_ui));
-+ control_ui->control->StopGesture.connect (sigc::bind (mem_fun(*this,
&GenericPluginUI::stop_touch), control_ui));
-
- }
-
-@@ -525,14 +525,14 @@ GenericPluginUI::build_control_ui (guint32 port_index,
PBD::Controllable* mcontr
- }
-
- control_ui->pack_start (control_ui->automate_button, false, false);
-- control_ui->adjustment->signal_value_changed().connect (bind (mem_fun(*this,
&GenericPluginUI::control_adjustment_changed), control_ui));
-- control_ui->automate_button.signal_clicked().connect (bind (mem_fun(*this,
&GenericPluginUI::astate_clicked), control_ui, (uint32_t) port_index));
-+ control_ui->adjustment->signal_value_changed().connect (sigc::bind
(mem_fun(*this, &GenericPluginUI::control_adjustment_changed), control_ui));
-+ control_ui->automate_button.signal_clicked().connect (sigc::bind (mem_fun(*this,
&GenericPluginUI::astate_clicked), control_ui, (uint32_t) port_index));
-
- automation_state_changed (control_ui);
-
-- plugin->ParameterChanged.connect (bind (mem_fun(*this,
&GenericPluginUI::parameter_changed), control_ui));
-+ plugin->ParameterChanged.connect (sigc::bind (mem_fun(*this,
&GenericPluginUI::parameter_changed), control_ui));
- insert->automation_list (port_index).automation_state_changed.connect
-- (bind (mem_fun(*this, &GenericPluginUI::automation_state_changed), control_ui));
-+ (sigc::bind (mem_fun(*this, &GenericPluginUI::automation_state_changed),
control_ui));
-
- } else if (plugin->parameter_is_output (port_index)) {
-
-@@ -580,7 +580,7 @@ GenericPluginUI::build_control_ui (guint32 port_index,
PBD::Controllable* mcontr
-
- output_controls.push_back (control_ui);
-
-- plugin->ParameterChanged.connect (bind (mem_fun(*this,
&GenericPluginUI::parameter_changed), control_ui));
-+ plugin->ParameterChanged.connect (sigc::bind (mem_fun(*this,
&GenericPluginUI::parameter_changed), control_ui));
- }
-
- return control_ui;
-@@ -627,13 +627,13 @@ GenericPluginUI::astate_clicked (ControlUI* cui, uint32_t port)
-
- items.clear ();
- items.push_back (MenuElem (_("Manual"),
-- bind (mem_fun(*this, &GenericPluginUI::set_automation_state), (AutoState)
Auto_Off, cui)));
-+ sigc::bind (mem_fun(*this, &GenericPluginUI::set_automation_state),
(AutoState) Auto_Off, cui)));
- items.push_back (MenuElem (_("Play"),
-- bind (mem_fun(*this, &GenericPluginUI::set_automation_state), (AutoState)
Auto_Play, cui)));
-+ sigc::bind (mem_fun(*this, &GenericPluginUI::set_automation_state),
(AutoState) Auto_Play, cui)));
- items.push_back (MenuElem (_("Write"),
-- bind (mem_fun(*this, &GenericPluginUI::set_automation_state), (AutoState)
Auto_Write, cui)));
-+ sigc::bind (mem_fun(*this, &GenericPluginUI::set_automation_state),
(AutoState) Auto_Write, cui)));
- items.push_back (MenuElem (_("Touch"),
-- bind (mem_fun(*this, &GenericPluginUI::set_automation_state), (AutoState)
Auto_Touch, cui)));
-+ sigc::bind (mem_fun(*this, &GenericPluginUI::set_automation_state),
(AutoState) Auto_Touch, cui)));
-
- automation_menu->popup (1, gtk_get_current_event_time());
- }
-@@ -678,7 +678,7 @@ GenericPluginUI::parameter_changed (uint32_t abs_port_id, float val,
ControlUI*
- if (cui->port_index == abs_port_id) {
- if (!cui->update_pending) {
- cui->update_pending = true;
-- Gtkmm2ext::UI::instance()->call_slot (bind (mem_fun(*this,
&GenericPluginUI::update_control_display), cui));
-+ Gtkmm2ext::UI::instance()->call_slot (sigc::bind (mem_fun(*this,
&GenericPluginUI::update_control_display), cui));
- }
- }
- }
-diff --git a/gtk2_ardour/io_selector.cc b/gtk2_ardour/io_selector.cc
-index ecb91e0..77dd219 100644
---- a/gtk2_ardour/io_selector.cc
-+++ b/gtk2_ardour/io_selector.cc
-@@ -97,7 +97,7 @@ IOSelectorWindow::IOSelectorWindow (Session& sess,
boost::shared_ptr<IO> ior, bo
- set_title (title);
- set_position (WIN_POS_MOUSE);
-
-- signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it),
reinterpret_cast<Window *> (this)));
-+ signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it),
reinterpret_cast<Window *> (this)));
- }
-
- IOSelectorWindow::~IOSelectorWindow()
-@@ -263,7 +263,7 @@ IOSelector::set_button_sensitivity ()
- void
- IOSelector::name_changed (void* src)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &IOSelector::name_changed), src));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &IOSelector::name_changed), src));
-
- display_ports ();
- }
-@@ -352,7 +352,7 @@ IOSelector::rescan ()
- row[port_display_columns.full_name] = s->second;
- }
-
-- display->signal_button_release_event().connect (bind (mem_fun(*this,
&IOSelector::port_selection_changed), display));
-+ display->signal_button_release_event().connect (sigc::bind (mem_fun(*this,
&IOSelector::port_selection_changed), display));
- Label *tab_label = manage (new Label);
-
- tab_label->set_name ("IOSelectorNotebookTab");
-@@ -367,7 +367,7 @@ IOSelector::rescan ()
- }
-
- notebook.set_current_page (current_page);
-- page_selection_connection = notebook.signal_show().connect (bind (mem_fun (notebook,
&Notebook::set_current_page), current_page));
-+ page_selection_connection = notebook.signal_show().connect (sigc::bind (mem_fun
(notebook, &Notebook::set_current_page), current_page));
- selector_box.show_all ();
- }
-
-@@ -475,10 +475,10 @@ IOSelector::display_ports ()
- col->set_clickable (true);
-
- /* handle button events on the column header ... */
-- col->signal_clicked().connect (bind (mem_fun(*this,
&IOSelector::select_treeview), tview));
-+ col->signal_clicked().connect (sigc::bind (mem_fun(*this,
&IOSelector::select_treeview), tview));
-
- /* ... and within the treeview itself */
-- tview->signal_button_release_event().connect (bind (mem_fun(*this,
&IOSelector::connection_button_release), tview));
-+ tview->signal_button_release_event().connect (sigc::bind (mem_fun(*this,
&IOSelector::connection_button_release), tview));
- }
-
- port_box.show_all ();
-@@ -529,7 +529,7 @@ IOSelector::port_selection_changed (GdkEventButton *ev, TreeView*
treeview)
- void
- IOSelector::ports_changed (IOChange change, void *src)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &IOSelector::ports_changed), change, src));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &IOSelector::ports_changed), change,
src));
-
- display_ports ();
- }
-@@ -866,7 +866,7 @@ PortInsertWindow::PortInsertWindow (Session& sess,
boost::shared_ptr<PortInsert>
- cancel_button.signal_clicked().connect (mem_fun(*this,
&PortInsertWindow::cancel));
- rescan_button.signal_clicked().connect (mem_fun(*this,
&PortInsertWindow::rescan));
-
-- signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it),
reinterpret_cast<Window *> (this)));
-+ signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it),
reinterpret_cast<Window *> (this)));
-
- going_away_connection = pi->GoingAway.connect (mem_fun(*this,
&PortInsertWindow::plugin_going_away));
- }
-diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc
-index f6680db..a3b7210 100644
---- a/gtk2_ardour/level_meter.cc
-+++ b/gtk2_ardour/level_meter.cc
-@@ -114,7 +114,7 @@ LevelMeter::parameter_changed(const char* parameter_name)
- {
- #define PARAM_IS(x) (!strcmp (parameter_name, (x)))
-
-- ENSURE_GUI_THREAD (bind (mem_fun(*this, &LevelMeter::parameter_changed),
parameter_name));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun(*this, &LevelMeter::parameter_changed),
parameter_name));
-
- if (PARAM_IS ("meter-hold")) {
-
-@@ -205,7 +205,7 @@ LevelMeter::setup_meters (int len, int initial_width)
- meters[n].width = width;
- meters[n].length = len;
- meters[n].meter->add_events (Gdk::BUTTON_RELEASE_MASK);
-- meters[n].meter->signal_button_release_event().connect (bind (mem_fun(*this,
&LevelMeter::meter_button_release), n));
-+ meters[n].meter->signal_button_release_event().connect (sigc::bind (mem_fun(*this,
&LevelMeter::meter_button_release), n));
- }
-
- pack_end (*meters[n].meter, false, false);
-diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
-index ac8ebfd..7265e64 100644
---- a/gtk2_ardour/mixer_strip.cc
-+++ b/gtk2_ardour/mixer_strip.cc
-@@ -712,7 +712,7 @@ MixerStrip::add_connection_to_input_menu (ARDOUR::Connection* c)
-
- if (c->nports() == _route->n_inputs()) {
-
-- citems.push_back (CheckMenuElem (c->name(), bind (mem_fun(*this,
&MixerStrip::connection_input_chosen), c)));
-+ citems.push_back (CheckMenuElem (c->name(), sigc::bind (mem_fun(*this,
&MixerStrip::connection_input_chosen), c)));
-
- ARDOUR::Connection *current = _route->input_connection();
-
-@@ -736,7 +736,7 @@ MixerStrip::add_connection_to_output_menu (ARDOUR::Connection* c)
- if (c->nports() == _route->n_outputs()) {
-
- MenuList& citems = output_menu.items();
-- citems.push_back (CheckMenuElem (c->name(), bind (mem_fun(*this,
&MixerStrip::connection_output_chosen), c)));
-+ citems.push_back (CheckMenuElem (c->name(), sigc::bind (mem_fun(*this,
&MixerStrip::connection_output_chosen), c)));
-
- ARDOUR::Connection *current = _route->output_connection();
-
-@@ -1129,7 +1129,7 @@ MixerStrip::setup_comment_editor ()
- void
- MixerStrip::comment_changed (void *src)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &MixerStrip::comment_changed), src));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &MixerStrip::comment_changed), src));
-
- if (src != this) {
- ignore_comment_edit = true;
-@@ -1153,7 +1153,7 @@ MixerStrip::add_mix_group_to_menu (RouteGroup *rg,
RadioMenuItem::Group* group)
-
- MenuList& items = group_menu->items();
-
-- items.push_back (RadioMenuElem (*group, rg->name(), bind (mem_fun(*this,
&MixerStrip::set_mix_group), rg)));
-+ items.push_back (RadioMenuElem (*group, rg->name(), sigc::bind (mem_fun(*this,
&MixerStrip::set_mix_group), rg)));
-
- if (_route->mix_group() == rg) {
- static_cast<RadioMenuItem*>(&items.back())->set_active ();
-@@ -1176,9 +1176,9 @@ MixerStrip::select_mix_group (GdkEventButton *ev)
- case 1:
-
- items.clear ();
-- items.push_back (RadioMenuElem (group, _("No group"), bind (mem_fun(*this,
&MixerStrip::set_mix_group), (RouteGroup *) 0)));
-+ items.push_back (RadioMenuElem (group, _("No group"), sigc::bind
(mem_fun(*this, &MixerStrip::set_mix_group), (RouteGroup *) 0)));
-
-- _session.foreach_mix_group (bind (mem_fun (*this,
&MixerStrip::add_mix_group_to_menu), &group));
-+ _session.foreach_mix_group (sigc::bind (mem_fun (*this,
&MixerStrip::add_mix_group_to_menu), &group));
-
- group_menu->popup (1, ev->time);
- break;
-@@ -1193,7 +1193,7 @@ MixerStrip::select_mix_group (GdkEventButton *ev)
- void
- MixerStrip::mix_group_changed (void *ignored)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &MixerStrip::mix_group_changed), ignored));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &MixerStrip::mix_group_changed),
ignored));
-
- RouteGroup *rg = _route->mix_group();
-
-@@ -1215,7 +1215,7 @@ MixerStrip::mix_group_changed (void *ignored)
- void
- MixerStrip::route_gui_changed (string what_changed, void* ignored)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &MixerStrip::route_gui_changed),
what_changed, ignored));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &MixerStrip::route_gui_changed),
what_changed, ignored));
-
- if (what_changed == "color") {
- if (set_color_from_route () == 0) {
-@@ -1483,7 +1483,7 @@ void
- MixerStrip::meter_changed (void *src)
- {
-
-- ENSURE_GUI_THREAD (bind (mem_fun(*this, &MixerStrip::meter_changed), src));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun(*this, &MixerStrip::meter_changed), src));
-
- switch (_route->meter_point()) {
- case MeterInput:
-diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
-index d283d80..cc4acf7 100644
---- a/gtk2_ardour/mixer_ui.cc
-+++ b/gtk2_ardour/mixer_ui.cc
-@@ -233,13 +233,13 @@ Mixer_UI::Mixer_UI ()
- list_hpane.add1(list_vpacker);
- list_hpane.add2(global_hpacker);
-
-- rhs_pane1.signal_size_allocate().connect (bind (mem_fun(*this,
&Mixer_UI::pane_allocation_handler),
-+ rhs_pane1.signal_size_allocate().connect (sigc::bind (mem_fun(*this,
&Mixer_UI::pane_allocation_handler),
- static_cast<Gtk::Paned*> (&rhs_pane1)));
-- list_hpane.signal_size_allocate().connect (bind (mem_fun(*this,
&Mixer_UI::pane_allocation_handler),
-+ list_hpane.signal_size_allocate().connect (sigc::bind (mem_fun(*this,
&Mixer_UI::pane_allocation_handler),
- static_cast<Gtk::Paned*> (&list_hpane)));
-
- Glib::PropertyProxy<int> proxy = list_hpane.property_position();
-- proxy.signal_changed().connect (bind (sigc::ptr_fun (pane_size_watcher),
static_cast<Paned*> (&list_hpane)));
-+ proxy.signal_changed().connect (sigc::bind (sigc::ptr_fun (pane_size_watcher),
static_cast<Paned*> (&list_hpane)));
-
-
- global_vpacker.pack_start (list_hpane, true, true);
-@@ -311,7 +311,7 @@ Mixer_UI::hide_window (GdkEventAny *ev)
- void
- Mixer_UI::add_strip (Session::RouteList& routes)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::add_strip), routes));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &Mixer_UI::add_strip), routes));
-
- MixerStrip* strip;
-
-@@ -346,13 +346,13 @@ Mixer_UI::add_strip (Session::RouteList& routes)
- route->set_order_key (N_("signal"),
track_model->children().size()-1);
- }
-
-- route->name_changed.connect (bind (mem_fun(*this,
&Mixer_UI::strip_name_changed), strip));
-+ route->name_changed.connect (sigc::bind (mem_fun(*this,
&Mixer_UI::strip_name_changed), strip));
-
-- strip->GoingAway.connect (bind (mem_fun(*this, &Mixer_UI::remove_strip),
strip));
-+ strip->GoingAway.connect (sigc::bind (mem_fun(*this, &Mixer_UI::remove_strip),
strip));
- #ifdef GTKOSX
- strip->WidthChanged.connect (mem_fun(*this,
&Mixer_UI::queue_draw_all_strips));
- #endif
-- strip->signal_button_release_event().connect (bind (mem_fun(*this,
&Mixer_UI::strip_button_release_event), strip));
-+ strip->signal_button_release_event().connect (sigc::bind (mem_fun(*this,
&Mixer_UI::strip_button_release_event), strip));
- }
-
- no_track_list_redisplay = false;
-@@ -365,7 +365,7 @@ Mixer_UI::add_strip (Session::RouteList& routes)
- void
- Mixer_UI::remove_strip (MixerStrip* strip)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::remove_strip), strip));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &Mixer_UI::remove_strip), strip));
-
- TreeModel::Children rows = track_model->children();
- TreeModel::Children::iterator ri;
-@@ -1012,7 +1012,7 @@ Mixer_UI::build_track_menu ()
- void
- Mixer_UI::strip_name_changed (void* src, MixerStrip* mx)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::strip_name_changed), src, mx));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &Mixer_UI::strip_name_changed), src,
mx));
-
- TreeModel::Children rows = track_model->children();
- TreeModel::Children::iterator i;
-@@ -1203,7 +1203,7 @@ Mixer_UI::group_flags_changed (void* src, RouteGroup* group)
- return;
- }
-
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::group_flags_changed), src,
group));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &Mixer_UI::group_flags_changed), src,
group));
-
- /* force an update of any mixer strips that are using this group,
- otherwise mix group names don't change in mixer strips
-@@ -1293,7 +1293,7 @@ void
- Mixer_UI::add_mix_group (RouteGroup* group)
-
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::add_mix_group), group));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &Mixer_UI::add_mix_group), group));
- bool focus = false;
-
- in_group_row_change = true;
-@@ -1320,7 +1320,7 @@ Mixer_UI::add_mix_group (RouteGroup* group)
- focus = true;
- }
-
-- group->FlagsChanged.connect (bind (mem_fun(*this,
&Mixer_UI::group_flags_changed), group));
-+ group->FlagsChanged.connect (sigc::bind (mem_fun(*this,
&Mixer_UI::group_flags_changed), group));
-
- if (focus) {
- TreeViewColumn* col = group_display.get_column (GROUP_DISPLAY_GROUP_COLUMN);
-diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc
-index 7b5ecd5..6b66d57 100644
---- a/gtk2_ardour/option_editor.cc
-+++ b/gtk2_ardour/option_editor.cc
-@@ -282,7 +282,7 @@ OptionEditor::setup_misc_options ()
- label->set_name ("OptionsLabel");
-
- dpi_range->set_update_policy (Gtk::UPDATE_DISCONTINUOUS);
-- dpi_adj->signal_value_changed().connect (bind (sigc::ptr_fun (font_scale_changed),
dpi_adj));
-+ dpi_adj->signal_value_changed().connect (sigc::bind (sigc::ptr_fun
(font_scale_changed), dpi_adj));
-
- hbox = manage (new HBox);
- hbox->set_border_width (5);
-@@ -629,7 +629,7 @@ OptionEditor::redisplay_midi_ports ()
- bb->show ();
- midi_port_table_widgets.push_back (bb);
- midi_port_table.attach (*bb, 9, 10, n+2, n+3, FILL|EXPAND, FILL);
-- bb->signal_clicked().connect (bind (mem_fun(*this,
&OptionEditor::remove_midi_port), i->second));
-+ bb->signal_clicked().connect (sigc::bind (mem_fun(*this,
&OptionEditor::remove_midi_port), i->second));
- bb->set_sensitive (port_removable (i->second));
-
- label = (manage (new Label (i->first)));
-@@ -652,8 +652,8 @@ OptionEditor::redisplay_midi_ports ()
-
- if (i->second->input()) {
- tb->set_active (!i->second->input()->offline());
-- tb->signal_toggled().connect (bind (mem_fun(*this,
&OptionEditor::port_online_toggled), i->second, tb));
-- i->second->input()->OfflineStatusChanged.connect (bind (mem_fun(*this,
&OptionEditor::map_port_online), (*i).second, tb));
-+ tb->signal_toggled().connect (sigc::bind (mem_fun(*this,
&OptionEditor::port_online_toggled), i->second, tb));
-+ i->second->input()->OfflineStatusChanged.connect (sigc::bind (mem_fun(*this,
&OptionEditor::map_port_online), (*i).second, tb));
- }
- tb->show ();
- midi_port_table_widgets.push_back (tb);
-@@ -661,7 +661,7 @@ OptionEditor::redisplay_midi_ports ()
-
- tb = manage (new ToggleButton ());
- tb->set_name ("OptionEditorToggleButton");
-- tb->signal_toggled().connect (bind (mem_fun(*this,
&OptionEditor::port_trace_in_toggled), (*i).second, tb));
-+ tb->signal_toggled().connect (sigc::bind (mem_fun(*this,
&OptionEditor::port_trace_in_toggled), (*i).second, tb));
- tb->set_size_request (10, 10);
- tb->show ();
- midi_port_table_widgets.push_back (tb);
-@@ -669,7 +669,7 @@ OptionEditor::redisplay_midi_ports ()
-
- tb = manage (new ToggleButton ());
- tb->set_name ("OptionEditorToggleButton");
-- tb->signal_toggled().connect (bind (mem_fun(*this,
&OptionEditor::port_trace_out_toggled), (*i).second, tb));
-+ tb->signal_toggled().connect (sigc::bind (mem_fun(*this,
&OptionEditor::port_trace_out_toggled), (*i).second, tb));
- tb->set_size_request (10, 10);
- tb->show ();
- midi_port_table_widgets.push_back (tb);
-@@ -686,7 +686,7 @@ OptionEditor::redisplay_midi_ports ()
- rb->show ();
- midi_port_table_widgets.push_back (rb);
- midi_port_table.attach (*rb, 4, 5, n+2, n+3, FILL|EXPAND, FILL);
-- rb->signal_toggled().connect (bind (mem_fun(*this,
&OptionEditor::mtc_port_chosen), (*i).second, rb, bb));
-+ rb->signal_toggled().connect (sigc::bind (mem_fun(*this,
&OptionEditor::mtc_port_chosen), (*i).second, rb, bb));
-
- if (session && i->second == session->mtc_port()) {
- rb->set_active (true);
-@@ -702,7 +702,7 @@ OptionEditor::redisplay_midi_ports ()
- rb->show ();
- midi_port_table_widgets.push_back (rb);
- midi_port_table.attach (*rb, 6, 7, n+2, n+3, FILL|EXPAND, FILL);
-- rb->signal_toggled().connect (bind (mem_fun(*this,
&OptionEditor::mmc_port_chosen), (*i).second, rb, bb));
-+ rb->signal_toggled().connect (sigc::bind (mem_fun(*this,
&OptionEditor::mmc_port_chosen), (*i).second, rb, bb));
-
- if (session && i->second == session->mmc_port()) {
- rb->set_active (true);
-@@ -718,7 +718,7 @@ OptionEditor::redisplay_midi_ports ()
- rb->show ();
- midi_port_table_widgets.push_back (rb);
- midi_port_table.attach (*rb, 8, 9, n+2, n+3, FILL|EXPAND, FILL);
-- rb->signal_toggled().connect (bind (mem_fun(*this,
&OptionEditor::midi_port_chosen), (*i).second, rb, bb));
-+ rb->signal_toggled().connect (sigc::bind (mem_fun(*this,
&OptionEditor::midi_port_chosen), (*i).second, rb, bb));
-
- if (session && i->second == session->midi_port()) {
- rb->set_active (true);
-@@ -1039,8 +1039,8 @@ OptionEditor::setup_click_editor ()
- click_path_entry.signal_activate().connect (mem_fun(*this,
&OptionEditor::click_sound_changed));
- click_emphasis_path_entry.signal_activate().connect (mem_fun(*this,
&OptionEditor::click_emphasis_sound_changed));
-
-- click_path_entry.signal_focus_out_event().connect (bind (mem_fun(*this,
&OptionEditor::focus_out_event_handler), &OptionEditor::click_sound_changed));
-- click_emphasis_path_entry.signal_focus_out_event().connect (bind (mem_fun(*this,
&OptionEditor::focus_out_event_handler),
&OptionEditor::click_emphasis_sound_changed));
-+ click_path_entry.signal_focus_out_event().connect (sigc::bind (mem_fun(*this,
&OptionEditor::focus_out_event_handler), &OptionEditor::click_sound_changed));
-+ click_emphasis_path_entry.signal_focus_out_event().connect (sigc::bind (mem_fun(*this,
&OptionEditor::focus_out_event_handler),
&OptionEditor::click_emphasis_sound_changed));
-
- click_browse_button.set_name ("EditorGTKButton");
- click_emphasis_browse_button.set_name ("EditorGTKButton");
-@@ -1355,7 +1355,7 @@ OptionEditor::edit_button_changed ()
- void
- OptionEditor::parameter_changed (const char* parameter_name)
- {
-- ENSURE_GUI_THREAD (bind (mem_fun (*this, &OptionEditor::parameter_changed),
parameter_name));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun (*this, &OptionEditor::parameter_changed),
parameter_name));
-
- #define PARAM_IS(x) (!strcmp (parameter_name, (x)))
-
-diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc
-index c4c42d9..45f3241 100644
---- a/gtk2_ardour/plugin_ui.cc
-+++ b/gtk2_ardour/plugin_ui.cc
-@@ -127,7 +127,7 @@ PluginUIWindow::PluginUIWindow (Gtk::Window* win,
boost::shared_ptr<PluginInsert
- set_name ("PluginEditor");
- add_events
(Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
-
-- signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it),
reinterpret_cast<Window*> (this)), false);
-+ signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it),
reinterpret_cast<Window*> (this)), false);
- death_connection = insert->GoingAway.connect (mem_fun(*this,
&PluginUIWindow::plugin_going_away));
-
- gint h = _pluginui->get_preferred_height ();
-@@ -445,7 +445,7 @@ PlugUIBase::plugin_going_away ()
- void
- PlugUIBase::redirect_active_changed (Redirect* r, void* src)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &PlugUIBase::redirect_active_changed), r,
src));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &PlugUIBase::redirect_active_changed),
r, src));
- bypass_button.set_active (!r->active());
- }
-
-diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
-index 8ed0f97..8980e88 100644
---- a/gtk2_ardour/route_time_axis.cc
-+++ b/gtk2_ardour/route_time_axis.cc
-@@ -306,13 +306,13 @@ RouteTimeAxisView::edit_click (GdkEventButton *ev)
-
- items.clear ();
- items.push_back (RadioMenuElem (group, _("No group"),
-- bind (mem_fun(*this, &RouteTimeAxisView::set_edit_group_from_menu), (RouteGroup
*) 0)));
-+ sigc::bind (mem_fun(*this, &RouteTimeAxisView::set_edit_group_from_menu),
(RouteGroup *) 0)));
-
- if (_route->edit_group() == 0) {
- static_cast<RadioMenuItem*>(&items.back())->set_active ();
- }
-
-- _session.foreach_edit_group (bind (mem_fun (*this,
&RouteTimeAxisView::add_edit_group_menu_item), &group));
-+ _session.foreach_edit_group (sigc::bind (mem_fun (*this,
&RouteTimeAxisView::add_edit_group_menu_item), &group));
- edit_group_menu.popup (ev->button, ev->time);
-
- return FALSE;
-@@ -325,7 +325,7 @@ RouteTimeAxisView::add_edit_group_menu_item (RouteGroup *eg,
RadioMenuItem::Grou
-
- MenuList &items = edit_group_menu.items();
-
-- items.push_back (RadioMenuElem (*group, eg->name(), bind (mem_fun(*this,
&RouteTimeAxisView::set_edit_group_from_menu), eg)));
-+ items.push_back (RadioMenuElem (*group, eg->name(), sigc::bind (mem_fun(*this,
&RouteTimeAxisView::set_edit_group_from_menu), eg)));
- if (_route->edit_group() == eg) {
- static_cast<RadioMenuItem*>(&items.back())->set_active ();
- }
-@@ -468,13 +468,13 @@ RouteTimeAxisView::build_display_menu ()
- RadioMenuItem::Group align_group;
-
- alignment_items.push_back (RadioMenuElem (align_group, _("Align with existing
material"),
-- bind (mem_fun(*this, &RouteTimeAxisView::set_align_style), ExistingMaterial)));
-+ sigc::bind (mem_fun(*this, &RouteTimeAxisView::set_align_style),
ExistingMaterial)));
- align_existing_item =
dynamic_cast<RadioMenuItem*>(&alignment_items.back());
- if (get_diskstream()->alignment_style() == ExistingMaterial)
- align_existing_item->set_active();
-
- alignment_items.push_back (RadioMenuElem (align_group, _("Align with capture
time"),
-- bind (mem_fun(*this, &RouteTimeAxisView::set_align_style), CaptureTime)));
-+ sigc::bind (mem_fun(*this, &RouteTimeAxisView::set_align_style), CaptureTime)));
- align_capture_item = dynamic_cast<RadioMenuItem*>(&alignment_items.back());
- if (get_diskstream()->alignment_style() == CaptureTime)
- align_capture_item->set_active();
-@@ -485,10 +485,10 @@ RouteTimeAxisView::build_display_menu ()
-
- RadioMenuItem::Group mode_group;
- items.push_back (RadioMenuElem (mode_group, _("Normal mode"),
-- bind (mem_fun (*this, &RouteTimeAxisView::set_track_mode),
ARDOUR::Normal)));
-+ sigc::bind (mem_fun (*this, &RouteTimeAxisView::set_track_mode),
ARDOUR::Normal)));
- normal_track_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
- items.push_back (RadioMenuElem (mode_group, _("Tape mode"),
-- bind (mem_fun (*this, &RouteTimeAxisView::set_track_mode),
ARDOUR::Destructive)));
-+ sigc::bind (mem_fun (*this, &RouteTimeAxisView::set_track_mode),
ARDOUR::Destructive)));
- destructive_track_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
-
- switch (track()->mode()) {
-@@ -559,7 +559,7 @@ RouteTimeAxisView::_set_track_mode (boost::shared_ptr<Track>
track, TrackMode mo
-
- if (!needs_bounce) {
- /* cannot be done */
-- Glib::signal_idle().connect (bind (sigc::ptr_fun (__reset_item), reset_item));
-+ Glib::signal_idle().connect (sigc::bind (sigc::ptr_fun (__reset_item), reset_item));
- return;
- } else {
- cerr << "would bounce this one\n";
-@@ -1399,7 +1399,7 @@ RouteTimeAxisView::build_playlist_menu (Gtk::Menu * menu)
- playlist_items.push_back (RadioMenuElem (playlist_group, (*i)->name()));
- RadioMenuItem *item = static_cast<RadioMenuItem*>(&playlist_items.back());
-
-- item->signal_toggled().connect(bind (mem_fun (*this,
&RouteTimeAxisView::use_playlist), item, boost::weak_ptr<Playlist> (*i)));
-+ item->signal_toggled().connect(sigc::bind (mem_fun (*this,
&RouteTimeAxisView::use_playlist), item, boost::weak_ptr<Playlist> (*i)));
-
- if (ds->playlist()->id() == (*i)->id()) {
- item->set_active();
-@@ -1411,16 +1411,16 @@ RouteTimeAxisView::build_playlist_menu (Gtk::Menu * menu)
- playlist_items.push_back (SeparatorElem());
-
- if (!edit_group() || !edit_group()->is_active()) {
-- playlist_items.push_back (MenuElem (_("New"), bind(mem_fun(editor,
&PublicEditor::new_playlists), this)));
-- playlist_items.push_back (MenuElem (_("New Copy"), bind(mem_fun(editor,
&PublicEditor::copy_playlists), this)));
-+ playlist_items.push_back (MenuElem (_("New"), sigc::bind(mem_fun(editor,
&PublicEditor::new_playlists), this)));
-+ playlist_items.push_back (MenuElem (_("New Copy"),
sigc::bind(mem_fun(editor, &PublicEditor::copy_playlists), this)));
- } else {
- // Use a label which tells the user what is happening
-- playlist_items.push_back (MenuElem (_("New Take"), bind(mem_fun(editor,
&PublicEditor::new_playlists), this)));
-- playlist_items.push_back (MenuElem (_("Copy Take"), bind(mem_fun(editor,
&PublicEditor::copy_playlists), this)));
-+ playlist_items.push_back (MenuElem (_("New Take"),
sigc::bind(mem_fun(editor, &PublicEditor::new_playlists), this)));
-+ playlist_items.push_back (MenuElem (_("Copy Take"),
sigc::bind(mem_fun(editor, &PublicEditor::copy_playlists), this)));
- }
-
- playlist_items.push_back (SeparatorElem());
-- playlist_items.push_back (MenuElem (_("Clear Current"), bind(mem_fun(editor,
&PublicEditor::clear_playlists), this)));
-+ playlist_items.push_back (MenuElem (_("Clear Current"),
sigc::bind(mem_fun(editor, &PublicEditor::clear_playlists), this)));
- playlist_items.push_back (SeparatorElem());
- playlist_items.push_back (MenuElem(_("Select from all ..."), mem_fun(*this,
&RouteTimeAxisView::show_playlist_selector)));
- }
-@@ -1705,7 +1705,7 @@ RouteTimeAxisView::add_redirect_automation_curve
(boost::shared_ptr<Redirect> re
-
- ran->view->add_line (*ral);
-
-- ran->view->Hiding.connect (bind (mem_fun(*this,
&RouteTimeAxisView::redirect_automation_track_hidden), ran, redirect));
-+ ran->view->Hiding.connect (sigc::bind (mem_fun(*this,
&RouteTimeAxisView::redirect_automation_track_hidden), ran, redirect));
-
- if (!ran->view->marked_for_display()) {
- ran->view->hide ();
-@@ -1716,7 +1716,7 @@ RouteTimeAxisView::add_redirect_automation_curve
(boost::shared_ptr<Redirect> re
- add_child (ran->view);
-
- if (_view) {
-- _view->foreach_regionview (bind (mem_fun(*this,
&RouteTimeAxisView::add_ghost_to_redirect), ran->view));
-+ _view->foreach_regionview (sigc::bind (mem_fun(*this,
&RouteTimeAxisView::add_ghost_to_redirect), ran->view));
- }
-
- redirect->mark_automation_visible (what, true);
-@@ -1823,7 +1823,7 @@ RouteTimeAxisView::add_redirect_to_subplugin_menu
(boost::shared_ptr<Redirect> r
-
- }
-
-- mitem->signal_toggled().connect (bind (mem_fun(*this,
&RouteTimeAxisView::redirect_menu_item_toggled), rai, ran));
-+ mitem->signal_toggled().connect (sigc::bind (mem_fun(*this,
&RouteTimeAxisView::redirect_menu_item_toggled), rai, ran));
- }
-
- /* add the menu for this redirect, because the subplugin
-@@ -1978,7 +1978,7 @@ RouteTimeAxisView::clear_meter ()
- void
- RouteTimeAxisView::meter_changed (void *src)
- {
-- ENSURE_GUI_THREAD (bind (mem_fun(*this, &RouteTimeAxisView::meter_changed), src));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun(*this, &RouteTimeAxisView::meter_changed),
src));
- reset_meter();
- }
-
-diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc
-index b9753f4..83ac972 100644
---- a/gtk2_ardour/time_axis_view_item.cc
-+++ b/gtk2_ardour/time_axis_view_item.cc
-@@ -957,7 +957,7 @@ TimeAxisViewItem::remove_this_item(void* src)
- defer to idle loop, otherwise we'll delete this object
- while we're still inside this function ...
- */
-- Glib::signal_idle().connect(bind (sigc::ptr_fun
(&TimeAxisViewItem::idle_remove_this_item), this, src));
-+ Glib::signal_idle().connect(sigc::bind (sigc::ptr_fun
(&TimeAxisViewItem::idle_remove_this_item), this, src));
- }
-
- /**
-diff --git a/libs/ardour/automation_event.cc b/libs/ardour/automation_event.cc
-index ed23ad7..0f0606d 100644
---- a/libs/ardour/automation_event.cc
-+++ b/libs/ardour/automation_event.cc
-@@ -663,7 +663,7 @@ AutomationList::move_range (iterator start, iterator end, double
xdelta, double
- while (start != end) {
- (*start)->when += xdelta;
- (*start)->value += ydelta;
-- if (isnan ((*start)->value)) {
-+ if (std::isnan ((*start)->value)) {
- abort ();
- }
- ++start;
-@@ -714,7 +714,7 @@ AutomationList::modify (iterator iter, double when, double val)
- (*iter)->when = when;
- (*iter)->value = val;
-
-- if (isnan (val)) {
-+ if (std::isnan (val)) {
- abort ();
- }
-
-diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
-index 86e07f2..5f5231a 100644
---- a/libs/ardour/session.cc
-+++ b/libs/ardour/session.cc
-@@ -399,14 +399,14 @@ Session::Session (AudioEngine &eng,
- int control_id = 1;
-
- if (control_out_channels) {
-- shared_ptr<Route> r (new Route (*this, _("monitor"), -1,
control_out_channels, -1, control_out_channels, Route::ControlOut));
-+ boost::shared_ptr<Route> r (new Route (*this, _("monitor"),
-1, control_out_channels, -1, control_out_channels, Route::ControlOut));
- r->set_remote_control_id (control_id++);
-
- rl.push_back (r);
- }
-
- if (master_out_channels) {
-- shared_ptr<Route> r (new Route (*this, _("master"), -1,
master_out_channels, -1, master_out_channels, Route::MasterOut));
-+ boost::shared_ptr<Route> r (new Route (*this, _("master"),
-1, master_out_channels, -1, master_out_channels, Route::MasterOut));
- r->set_remote_control_id (control_id);
-
- rl.push_back (r);
-@@ -984,8 +984,8 @@ Session::hookup_io ()
- boost::shared_ptr<Session::RouteList>
- Session::get_routes_with_regions_at (nframes64_t const p) const
- {
-- shared_ptr<RouteList> r = routes.reader ();
-- shared_ptr<RouteList> rl (new RouteList);
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> rl (new RouteList);
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
-@@ -1590,9 +1590,9 @@ struct RouteSorter {
- };
-
- static void
--trace_terminal (shared_ptr<Route> r1, shared_ptr<Route> rbase)
-+trace_terminal (boost::shared_ptr<Route> r1, boost::shared_ptr<Route>
rbase)
- {
-- shared_ptr<Route> r2;
-+ boost::shared_ptr<Route> r2;
-
- if ((r1->fed_by.find (rbase) != r1->fed_by.end()) &&
(rbase->fed_by.find (r1) != rbase->fed_by.end())) {
- info << string_compose(_("feedback loop setup between %1 and %2"),
r1->name(), rbase->name()) << endmsg;
-@@ -1601,13 +1601,13 @@ trace_terminal (shared_ptr<Route> r1,
shared_ptr<Route> rbase)
-
- /* make a copy of the existing list of routes that feed r1 */
-
-- set<shared_ptr<Route> > existing = r1->fed_by;
-+ set<boost::shared_ptr<Route> > existing = r1->fed_by;
-
- /* for each route that feeds r1, recurse, marking it as feeding
- rbase as well.
- */
-
-- for (set<shared_ptr<Route> >::iterator i = existing.begin(); i !=
existing.end(); ++i) {
-+ for (set<boost::shared_ptr<Route> >::iterator i = existing.begin(); i !=
existing.end(); ++i) {
- r2 =* i;
-
- /* r2 is a route that feeds r1 which somehow feeds base. mark
-@@ -1651,14 +1651,14 @@ Session::resort_routes ()
- {
-
- RCUWriter<RouteList> writer (routes);
-- shared_ptr<RouteList> r = writer.get_copy ();
-+ boost::shared_ptr<RouteList> r = writer.get_copy ();
- resort_routes_using (r);
- /* writer goes out of scope and forces update */
- }
- }
-
- void
--Session::resort_routes_using (shared_ptr<RouteList> r)
-+Session::resort_routes_using (boost::shared_ptr<RouteList> r)
- {
- RouteList::iterator i, j;
-
-@@ -1723,7 +1723,7 @@ Session::new_audio_track (int input_channels, int output_channels,
TrackMode mod
- /* count existing audio tracks */
-
- {
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- if (dynamic_cast<AudioTrack*>((*i).get()) != 0) {
-@@ -1776,7 +1776,7 @@ Session::new_audio_track (int input_channels, int output_channels,
TrackMode mod
- nphysical_out = 0;
- }
-
-- shared_ptr<AudioTrack> track;
-+ boost::shared_ptr<AudioTrack> track;
-
- try {
- track = boost::shared_ptr<AudioTrack>((new AudioTrack (*this, track_name,
Route::Flag (0), mode)));
-@@ -1884,7 +1884,7 @@ Session::set_remote_control_ids ()
- {
- RemoteModel m = Config->get_remote_model();
-
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- if ( MixerOrdered == m) {
-@@ -1913,7 +1913,7 @@ Session::new_audio_route (int input_channels, int output_channels,
uint32_t how_
- /* count existing audio busses */
-
- {
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- if (dynamic_cast<AudioTrack*>((*i).get()) == 0) {
-@@ -1945,7 +1945,7 @@ Session::new_audio_route (int input_channels, int output_channels,
uint32_t how_
- } while (bus_id < (UINT_MAX-1));
-
- try {
-- shared_ptr<Route> bus (new Route (*this, bus_name, -1, -1, -1, -1,
Route::Flag(0), DataType::AUDIO));
-+ boost::shared_ptr<Route> bus (new Route (*this, bus_name, -1, -1, -1,
-1, Route::Flag(0), DataType::AUDIO));
-
- if (bus->ensure_io (input_channels, output_channels, false, this)) {
- error << string_compose (_("cannot configure %1 in/%2 out configuration
for new audio track"),
-@@ -2060,7 +2060,7 @@ Session::new_route_from_template (uint32_t how_many, const
std::string& template
- Track::zero_diskstream_id_in_xml (node_copy);
-
- try {
-- shared_ptr<Route> route (XMLRouteFactory (node_copy));
-+ boost::shared_ptr<Route> route (XMLRouteFactory (node_copy));
-
- if (route == 0) {
- error << _("Session: cannot create track/bus from template
description") << endmsg;
-@@ -2107,7 +2107,7 @@ boost::shared_ptr<Route>
- Session::new_video_track (string name)
- {
- uint32_t control_id = ntracks() + nbusses() + 1;
-- shared_ptr<Route> new_route (
-+ boost::shared_ptr<Route> new_route (
- new Route ( *this, name, -1, -1, -1, -1, Route::Flag(0), ARDOUR::DataType::NIL));
- new_route->set_remote_control_id (control_id);
-
-@@ -2115,7 +2115,7 @@ Session::new_video_track (string name)
- rl.push_back (new_route);
- {
- RCUWriter<RouteList> writer (routes);
-- shared_ptr<RouteList> r = writer.get_copy ();
-+ boost::shared_ptr<RouteList> r = writer.get_copy ();
- r->insert (r->end(), rl.begin(), rl.end());
- resort_routes_using (r);
- }
-@@ -2127,7 +2127,7 @@ Session::add_routes (RouteList& new_routes, bool save)
- {
- {
- RCUWriter<RouteList> writer (routes);
-- shared_ptr<RouteList> r = writer.get_copy ();
-+ boost::shared_ptr<RouteList> r = writer.get_copy ();
- r->insert (r->end(), new_routes.begin(), new_routes.end());
- resort_routes_using (r);
- }
-@@ -2198,14 +2198,14 @@ Session::add_diskstream (boost::shared_ptr<Diskstream>
dstream)
- }
-
- void
--Session::remove_route (shared_ptr<Route> route)
-+Session::remove_route (boost::shared_ptr<Route> route)
- {
- //clear solos before removing the route
- route->set_solo ( false, this);
-
- {
- RCUWriter<RouteList> writer (routes);
-- shared_ptr<RouteList> rs = writer.get_copy ();
-+ boost::shared_ptr<RouteList> rs = writer.get_copy ();
-
- rs->remove (route);
-
-@@ -2215,11 +2215,11 @@ Session::remove_route (shared_ptr<Route> route)
- */
-
- if (route == _master_out) {
-- _master_out = shared_ptr<Route> ();
-+ _master_out = boost::shared_ptr<Route> ();
- }
-
- if (route == _control_out) {
-- _control_out = shared_ptr<Route> ();
-+ _control_out = boost::shared_ptr<Route> ();
-
- /* cancel control outs for all routes */
-
-@@ -2308,7 +2308,7 @@ Session::route_solo_changed (void* src,
boost::weak_ptr<Route> wpr)
-
- is_track = (boost::dynamic_pointer_cast<AudioTrack>(route) != 0);
-
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-
-@@ -2404,7 +2404,7 @@ Session::update_route_solo_state ()
- the solo mute setting of each track.
- */
-
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- if ((*i)->soloed()) {
-@@ -2446,7 +2446,7 @@ Session::update_route_solo_state ()
- void
- Session::modify_solo_mute (bool is_track, bool mute)
- {
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-
-@@ -2511,7 +2511,7 @@ Session::catch_up_on_solo_mute_override ()
- /* this is called whenever the param solo-mute-override is
- changed.
- */
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- (*i)->catch_up_on_solo_mute_override ();
-@@ -2521,7 +2521,7 @@ Session::catch_up_on_solo_mute_override ()
- bool
- Session::io_name_is_legal (const std::string& name)
- {
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- if ((*i)->name() == name) {
-@@ -2536,10 +2536,10 @@ Session::io_name_is_legal (const std::string& name)
- return true;
- }
-
--shared_ptr<Route>
-+boost::shared_ptr<Route>
- Session::route_by_name (const std::string& name)
- {
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- if ((*i)->name() == name) {
-@@ -2547,13 +2547,13 @@ Session::route_by_name (const std::string& name)
- }
- }
-
-- return shared_ptr<Route> ((Route*) 0);
-+ return boost::shared_ptr<Route> ((Route*) 0);
- }
-
--shared_ptr<Route>
-+boost::shared_ptr<Route>
- Session::route_by_id (PBD::ID id)
- {
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- if ((*i)->id() == id) {
-@@ -2561,13 +2561,13 @@ Session::route_by_id (PBD::ID id)
- }
- }
-
-- return shared_ptr<Route> ((Route*) 0);
-+ return boost::shared_ptr<Route> ((Route*) 0);
- }
-
--shared_ptr<Route>
-+boost::shared_ptr<Route>
- Session::route_by_remote_id (uint32_t id)
- {
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- if ((*i)->remote_control_id() == id) {
-@@ -2575,7 +2575,7 @@ Session::route_by_remote_id (uint32_t id)
- }
- }
-
-- return shared_ptr<Route> ((Route*) 0);
-+ return boost::shared_ptr<Route> ((Route*) 0);
- }
-
- void
-@@ -3595,7 +3595,7 @@ Session::is_auditioning () const
- void
- Session::set_all_solo (bool yn)
- {
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- if (!(*i)->hidden()) {
-@@ -3609,7 +3609,7 @@ Session::set_all_solo (bool yn)
- void
- Session::set_all_mute (bool yn)
- {
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- if (!(*i)->hidden()) {
-@@ -3680,7 +3680,7 @@ Session::record_enable_all ()
- void
- Session::record_enable_change_all (bool yn)
- {
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- AudioTrack* at;
-@@ -4071,7 +4071,7 @@ Session::reset_native_file_format ()
- bool
- Session::route_name_unique (string n) const
- {
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) {
- if ((*i)->name() == n) {
-@@ -4117,7 +4117,7 @@ Session::allocate_pan_automation_buffers (nframes_t nframes,
uint32_t howmany, b
- int
- Session::freeze (InterThreadInfo& itt)
- {
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-
-@@ -4355,7 +4355,7 @@ uint32_t
- Session::ntracks () const
- {
- uint32_t n = 0;
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) {
- if (dynamic_cast<AudioTrack*> ((*i).get())) {
-@@ -4370,7 +4370,7 @@ uint32_t
- Session::nbusses () const
- {
- uint32_t n = 0;
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) {
- if (dynamic_cast<AudioTrack*> ((*i).get()) == 0) {
-diff --git a/libs/gtkmm2ext/gtk_ui.cc b/libs/gtkmm2ext/gtk_ui.cc
-index 291740c..48a03c5 100644
---- a/libs/gtkmm2ext/gtk_ui.cc
-+++ b/libs/gtkmm2ext/gtk_ui.cc
-@@ -100,7 +100,7 @@ UI::UI (string namestr, int *argc, char ***argv)
- errors->set_title (title.get_string());
-
- errors->dismiss_button().set_name ("ErrorLogCloseButton");
-- errors->signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), (Window
*) errors));
-+ errors->signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it),
(Window *) errors));
- errors->set_type_hint (Gdk::WINDOW_TYPE_HINT_UTILITY);
-
- register_thread (pthread_self(), X_("GUI"));
-@@ -624,8 +624,8 @@ UI::get_color (const string& prompt, bool& picked, const
Gdk::Color* initial)
- ColorSelectionDialog color_dialog (prompt);
-
- color_dialog.set_modal (true);
-- color_dialog.get_cancel_button()->signal_clicked().connect (bind (mem_fun (*this,
&UI::color_selection_done), false));
-- color_dialog.get_ok_button()->signal_clicked().connect (bind (mem_fun (*this,
&UI::color_selection_done), true));
-+ color_dialog.get_cancel_button()->signal_clicked().connect (sigc::bind (mem_fun
(*this, &UI::color_selection_done), false));
-+ color_dialog.get_ok_button()->signal_clicked().connect (sigc::bind (mem_fun (*this,
&UI::color_selection_done), true));
- color_dialog.signal_delete_event().connect (mem_fun (*this,
&UI::color_selection_deleted));
-
- if (initial) {
-diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc
b/libs/surfaces/mackie/mackie_control_protocol.cc
-index 7cb017f..62eac81 100644
---- a/libs/surfaces/mackie/mackie_control_protocol.cc
-+++ b/libs/surfaces/mackie/mackie_control_protocol.cc
-@@ -200,7 +200,7 @@ MackieControlProtocol::port_for_id( uint32_t index )
- // predicate for sort call in get_sorted_routes
- struct RouteByRemoteId
- {
-- bool operator () ( const shared_ptr<Route> & a, const shared_ptr<Route>
& b ) const {
-+ bool operator () ( const boost::shared_ptr<Route> & a, const
boost::shared_ptr<Route> & b ) const {
- return a->remote_control_id() < b->remote_control_id();
- }
-
-@@ -680,7 +680,7 @@ MackieControlProtocol::create_ports()
- }
- }
-
--shared_ptr<Route>
-+boost::shared_ptr<Route>
- MackieControlProtocol::master_route()
- {
- boost::shared_ptr<IO> mo = session->master_out ();
-diff --git a/libs/surfaces/mackie/mackie_jog_wheel.cc
b/libs/surfaces/mackie/mackie_jog_wheel.cc
-index d05eb23..b4372cf 100644
---- a/libs/surfaces/mackie/mackie_jog_wheel.cc
-+++ b/libs/surfaces/mackie/mackie_jog_wheel.cc
-@@ -10,7 +10,6 @@
- #include <algorithm>
-
- using namespace Mackie;
--using std::isnan;
-
- JogWheel::JogWheel( MackieControlProtocol & mcp )
- : _mcp( mcp )
-@@ -68,7 +67,7 @@ void JogWheel::jog_event( SurfacePort & port, Control &
control, const ControlSt
- _transport_speed += _mcp.surface().scaled_delta( state,
_mcp.get_session().transport_speed() );
-
- // make sure no weirdness gets to the session
-- if ( _transport_speed < 0 || isnan( _transport_speed ) )
-+ if ( _transport_speed < 0 || std::isnan( _transport_speed ) )
- {
- _transport_speed = 0.0;
- }
---
-2.6.3
-
diff --git a/ardour-2.8.16-c++11-xpm.patch b/ardour-2.8.16-c++11-xpm.patch
deleted file mode 100644
index 10345fd..0000000
--- a/ardour-2.8.16-c++11-xpm.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-From d82af19ee11b6d0b240d89da276824ef4077bbff Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils(a)tiptoe.de>
-Date: Fri, 27 Nov 2015 14:56:45 +0100
-Subject: [PATCH] C++11: use explicit unsigned types for XPM data...
-
-...then cast back to 'const char *' for libgdkmm's Bitmap::create()
----
- gtk2_ardour/editor.cc | 14 +++++++-------
- gtk2_ardour/editor_tempodisplay.cc | 10 +++++-----
- gtk2_ardour/editor_xpms | 24 ++++++++++++------------
- 3 files changed, 24 insertions(+), 24 deletions(-)
-
-diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
-index d2bd781..c3122a9 100644
---- a/gtk2_ardour/editor.cc
-+++ b/gtk2_ardour/editor.cc
-@@ -1388,8 +1388,8 @@ Editor::build_cursors ()
-
- {
- RefPtr<Bitmap> source, mask;
-- source = Bitmap::create (mag_bits, mag_width, mag_height);
-- mask = Bitmap::create (magmask_bits, mag_width, mag_height);
-+ source = Bitmap::create ((const char *)mag_bits, mag_width, mag_height);
-+ mask = Bitmap::create ((const char *)magmask_bits, mag_width, mag_height);
- zoom_cursor = new Gdk::Cursor (source, mask, mfg, mbg, mag_x_hot, mag_y_hot);
- }
-
-@@ -1399,22 +1399,22 @@ Editor::build_cursors ()
- {
- RefPtr<Bitmap> source, mask;
-
-- source = Bitmap::create (fader_cursor_bits, fader_cursor_width, fader_cursor_height);
-- mask = Bitmap::create (fader_cursor_mask_bits, fader_cursor_width,
fader_cursor_height);
-+ source = Bitmap::create ((const char *)fader_cursor_bits, fader_cursor_width,
fader_cursor_height);
-+ mask = Bitmap::create ((const char *)fader_cursor_mask_bits, fader_cursor_width,
fader_cursor_height);
- fader_cursor = new Gdk::Cursor (source, mask, ffg, fbg, fader_cursor_x_hot,
fader_cursor_y_hot);
- }
-
- {
- RefPtr<Bitmap> source, mask;
-- source = Bitmap::create (speaker_cursor_bits, speaker_cursor_width,
speaker_cursor_height);
-- mask = Bitmap::create (speaker_cursor_mask_bits, speaker_cursor_width,
speaker_cursor_height);
-+ source = Bitmap::create ((const char *)speaker_cursor_bits, speaker_cursor_width,
speaker_cursor_height);
-+ mask = Bitmap::create ((const char *)speaker_cursor_mask_bits, speaker_cursor_width,
speaker_cursor_height);
- speaker_cursor = new Gdk::Cursor (source, mask, ffg, fbg, speaker_cursor_x_hot,
speaker_cursor_y_hot);
- }
-
- {
- RefPtr<Bitmap> bits;
- char pix[4] = { 0, 0, 0, 0 };
-- bits = Bitmap::create (pix, 2, 2);
-+ bits = Bitmap::create ((const char *)pix, 2, 2);
- Gdk::Color c;
- transparent_cursor = new Gdk::Cursor (bits, bits, c, c, 0, 0);
- }
-diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
-index d30981b..95a64a9 100644
---- a/gtk2_ardour/editor_tempodisplay.cc
-+++ b/gtk2_ardour/editor_tempodisplay.cc
-@@ -101,7 +101,7 @@ Editor::tempo_map_changed (Change ignored)
- return;
- }
-
-- ENSURE_GUI_THREAD(bind (mem_fun (*this, &Editor::tempo_map_changed), ignored));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun (*this, &Editor::tempo_map_changed),
ignored));
-
- if (tempo_lines) {
- tempo_lines->tempo_map_changed();
-@@ -215,7 +215,7 @@ Editor::mouse_add_new_tempo_event (nframes64_t frame)
-
- tempo_dialog.set_position (Gtk::WIN_POS_MOUSE);
- //this causes compiz to display no border.
-- //tempo_dialog.signal_realize().connect (bind (sigc::ptr_fun (set_decoration),
&tempo_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
-+ //tempo_dialog.signal_realize().connect (sigc::bind (sigc::ptr_fun (set_decoration),
&tempo_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
-
- ensure_float (tempo_dialog);
-
-@@ -259,7 +259,7 @@ Editor::mouse_add_new_meter_event (nframes64_t frame)
- meter_dialog.set_position (Gtk::WIN_POS_MOUSE);
-
- //this causes compiz to display no border..
-- //meter_dialog.signal_realize().connect (bind (sigc::ptr_fun (set_decoration),
&meter_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
-+ //meter_dialog.signal_realize().connect (sigc::bind (sigc::ptr_fun (set_decoration),
&meter_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
-
- ensure_float (meter_dialog);
-
-@@ -304,7 +304,7 @@ Editor::remove_tempo_marker (ArdourCanvas::Item* item)
- }
-
- if (tempo_marker->tempo().movable()) {
-- Glib::signal_idle().connect (bind (mem_fun(*this,
&Editor::real_remove_tempo_marker), &tempo_marker->tempo()));
-+ Glib::signal_idle().connect (sigc::bind (mem_fun(*this,
&Editor::real_remove_tempo_marker), &tempo_marker->tempo()));
- }
- }
-
-@@ -440,7 +440,7 @@ Editor::remove_meter_marker (ArdourCanvas::Item* item)
- }
-
- if (meter_marker->meter().movable()) {
-- Glib::signal_idle().connect (bind (mem_fun(*this,
&Editor::real_remove_meter_marker), &meter_marker->meter()));
-+ Glib::signal_idle().connect (sigc::bind (mem_fun(*this,
&Editor::real_remove_meter_marker), &meter_marker->meter()));
- }
- }
-
-diff --git a/gtk2_ardour/editor_xpms b/gtk2_ardour/editor_xpms
-index 95a51a8..deea1fb 100644
---- a/gtk2_ardour/editor_xpms
-+++ b/gtk2_ardour/editor_xpms
-@@ -3,12 +3,12 @@
- #define mag_height 16
- #define mag_x_hot 9
- #define mag_y_hot 5
--static const gchar mag_bits[] = {
-+static const guchar mag_bits[] = {
- 0x7f, 0xe0, 0x3f, 0xc0, 0x1f, 0x8f, 0x8f, 0x9f, 0xcf, 0x3f, 0xcf, 0x3f,
- 0xcf, 0x3f, 0xcf, 0x3f, 0x8f, 0x1f, 0x1f, 0x8f, 0x0f, 0xc0, 0x47, 0xe0,
- 0xe3, 0xff, 0xf1, 0xff, 0xf8, 0xff, 0xfc, 0xff };
-
--static const gchar magmask_bits[] = {
-+static const guchar magmask_bits[] = {
- 0x80, 0x1f, 0xc0, 0x3f, 0xe0, 0x70, 0x70, 0x66, 0x30, 0xc6, 0xb0, 0xdf,
- 0xb0, 0xdf, 0x30, 0xc6, 0x70, 0xe6, 0xe0, 0x70, 0xf0, 0x3f, 0xb8, 0x1f,
- 0x1c, 0x00, 0x0e, 0x00, 0x07, 0x00, 0x03, 0x00 };
-@@ -18,7 +18,7 @@ static const gchar magmask_bits[] = {
- #define fader_cursor_height 25
- #define fader_cursor_x_hot 3
- #define fader_cursor_y_hot 21
--static const gchar fader_cursor_bits[] = {
-+static const guchar fader_cursor_bits[] = {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, 0x00,
- 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0x02, 0x01,
- 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x01,
-@@ -30,7 +30,7 @@ static const gchar fader_cursor_bits[] = {
- 0x00, 0x00, 0x00, 0x00 };
-
- /* Created with The GIMP */
--static const gchar fader_cursor_mask_bits[] = {
-+static const guchar fader_cursor_mask_bits[] = {
- 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0x78, 0x00,
- 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x01,
- 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x01,
-@@ -46,7 +46,7 @@ static const gchar fader_cursor_mask_bits[] = {
- #define speaker_cursor_height 26
- #define speaker_cursor_x_hot 0
- #define speaker_cursor_y_hot 0
--static const gchar speaker_cursor_bits[] = {
-+static const guchar speaker_cursor_bits[] = {
- 0x00, 0xc0, 0x00, 0xc0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xcc, 0x00, 0xcc,
- 0xff, 0xc3, 0xff, 0xc3, 0x03, 0xc0, 0x03, 0xc0, 0xc3, 0xc0, 0xc3, 0xc0,
- 0xc3, 0xc0, 0xc3, 0xc0, 0xc3, 0xc0, 0xc3, 0xc0, 0x03, 0xc0, 0x03, 0xc0,
-@@ -57,7 +57,7 @@ static const gchar speaker_cursor_bits[] = {
- #define speaker_cursor_mask_height 26
- #define speaker_cursor_mask_x_hot 0
- #define speaker_cursor_mask_y_hot 0
--static const gchar speaker_cursor_mask_bits[] = {
-+static const guchar speaker_cursor_mask_bits[] = {
- 0x00, 0xc0, 0x00, 0xc0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xfc, 0x00, 0xfc,
- 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0x3f, 0xff,
-@@ -68,7 +68,7 @@ static const gchar speaker_cursor_mask_bits[] = {
- #define cursor_audition_height 16
- #define cursor_audition_x_hot 0
- #define cursor_audition_y_hot 7
--static const short cursor_audition_bits[] = {
-+static const unsigned short cursor_audition_bits[] = {
- 0x1000, 0x1800, 0x1400, 0x1200, 0x11f0, 0x1110, 0x111f, 0x1111, 0x1112,
- 0x111e, 0x1110, 0x11f0, 0x1200, 0x1400, 0x1800, 0x1000 };
-
-@@ -76,7 +76,7 @@ static const short cursor_audition_bits[] = {
- #define cursor_audition_mask_height 16
- #define cursor_audition_mask_x_hot 0
- #define cursor_audition_mask_y_hot 7
--static const short cursor_audition_mask_bits[] = {
-+static const unsigned short cursor_audition_mask_bits[] = {
- 0x1000, 0x1800, 0x1c00, 0x1e00, 0x1ff0, 0x1ff0, 0x1fff, 0x1fff, 0x1ffe,
- 0x1ffe, 0x1ff0, 0x1ff0, 0x1e00, 0x1c00, 0x1800, 0x1000 };
-
-@@ -84,7 +84,7 @@ static const short cursor_audition_mask_bits[] = {
- #define cursor_timestretch_height 16
- #define cursor_timestretch_x_hot 7
- #define cursor_timestretch_y_hot 8
--static const short cursor_timestretch_bits[] = {
-+static const unsigned short cursor_timestretch_bits[] = {
- 0x01c0, 0x0140, 0x0140, 0x0140, 0x0540, 0x0d40, 0x1548, 0x274c, 0x417e,
- 0x274c, 0x1548, 0x0d40, 0x0540, 0x0140, 0x0140, 0x01c0 };
-
-@@ -92,7 +92,7 @@ static const short cursor_timestretch_bits[] = {
- #define cursor_timestretch_mask_height 16
- #define cursor_timestretch_mask_x_hot 7
- #define cursor_timestretch_mask_y_hot 8
--static const short cursor_timestretch_mask_bits[] = {
-+static const unsigned short cursor_timestretch_mask_bits[] = {
- 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x05d0, 0x0dd8, 0x1ddc, 0x3ffe, 0x7fff,
- 0x3ffe, 0x1ddc, 0x0dd8, 0x05d0, 0x01c0, 0x01c0, 0x01c0 };
-
-@@ -100,7 +100,7 @@ static const short cursor_timestretch_mask_bits[] = {
- #define cursor_zoom_height 16
- #define cursor_zoom_x_hot 6
- #define cursor_zoom_y_hot 6
--static const short cursor_zoom_bits[] = {
-+static const unsigned short cursor_zoom_bits[] = {
- 0x00e0, 0x0000, 0x03b8, 0x0000, 0x0604, 0x0000, 0x0806, 0x0000, 0x0842,
- 0x0000, 0x1843, 0x0000, 0x11f1, 0x0000, 0x1843, 0x0000, 0x0842, 0x0000,
- 0x1806, 0x0000, 0x2604, 0x0000, 0x4758, 0x0000, 0x88e0, 0x0000, 0x1000,
-@@ -110,7 +110,7 @@ static const short cursor_zoom_bits[] = {
- #define cursor_zoom_mask_height 16
- #define cursor_zoom_mask_x_hot 6
- #define cursor_zoom_mask_y_hot 6
--static const short cursor_zoom_mask_bits[] = {
-+static const unsigned short cursor_zoom_mask_bits[] = {
- 0x00e0, 0x0000, 0x03f8, 0x0000, 0x07fc, 0x0000, 0x0ffe, 0x0000, 0x0ffe,
- 0x0000, 0x1fff, 0x0000, 0x1fff, 0x0000, 0x1fff, 0x0000, 0x0ffe, 0x0000,
- 0x1ffe, 0x0000, 0x3ffc, 0x0000, 0x7ff8, 0x0000, 0xf8e0, 0x0000, 0xf000,
---
-2.6.3
-
diff --git a/ardour-2.8.16-free-dmalloc.patch b/ardour-2.8.16-free-dmalloc.patch
deleted file mode 100644
index 763d184..0000000
--- a/ardour-2.8.16-free-dmalloc.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff -up ardour-2.8.16/libs/pbd/dmalloc.cc.old ardour-2.8.16/libs/pbd/dmalloc.cc
---- ardour-2.8.16/libs/pbd/dmalloc.cc.old 2009-02-24 06:38:16.000000000 -0600
-+++ ardour-2.8.16/libs/pbd/dmalloc.cc 2016-03-08 23:26:11.192874608 -0600
-@@ -1,27 +1,24 @@
- /*
-- * file that facilitates C++ program debugging.
-+ * File that facilitates C++ program debugging.
- *
-- * Copyright 1995 by Gray Watson
-+ * Copyright 2000 by Gray Watson
- *
- * This file is part of the dmalloc package.
- *
-- * Permission to use, copy, modify, and distribute this software for any
-- * NON-COMMERCIAL purpose and without fee is hereby granted, provided
-- * that the above copyright notice and this permission notice appear
-- * in all copies, and that the name of Gray Watson not be used in
-- * advertising or publicity pertaining to distribution of the document
-- * or software without specific, written prior permission.
-- *
-- * Please see the PERMISSIONS file or contact the author for information
-- * about commercial licenses.
-+ * Permission to use, copy, modify, and distribute this software for
-+ * any purpose and without fee is hereby granted, provided that the
-+ * above copyright notice and this permission notice appear in all
-+ * copies, and that the name of Gray Watson not be used in advertising
-+ * or publicity pertaining to distribution of the document or software
-+ * without specific, written prior permission.
- *
- * Gray Watson makes no representations about the suitability of the
- * software described herein for any purpose. It is provided "as is"
- * without express or implied warranty.
- *
-- * The author may be contacted via http://www.letters.com/~gray/
-+ * The author may be contacted via http://dmalloc.com/
- *
-- * $Id: dmalloc.cc 4 2005-05-13 20:47:18Z taybin $
-+ * $Id: dmallocc.cc,v 1.3 2003/05/15 20:08:46 gray Exp $
- */
-
- /*
-@@ -37,11 +34,14 @@
- */
-
- #ifdef DEBUG_MALLOC
--
-+
- extern "C" {
- #include <stdlib.h>
--#include <dmalloc.h>
--#include "/usr/local/src/dmalloc-4.1.2/return.h"
-+
-+#define DMALLOC_DISABLE
-+
-+#include "dmalloc.h"
-+#include "return.h"
- }
-
- /*
-@@ -52,12 +52,8 @@ operator new(size_t size)
- {
- char *file;
- GET_RET_ADDR(file);
--
-- /* handle correct C++ semantics for an alloc of size 0 */
--
-- if (size == 0) size = 1;
--
-- return _malloc_leap(file, 0, size);
-+ return dmalloc_malloc(file, 0, size, DMALLOC_FUNC_NEW,
-+ 0 /* no alignment */, 0 /* no xalloc messages */);
- }
-
- /*
-@@ -68,12 +64,8 @@ operator new[](size_t size)
- {
- char *file;
- GET_RET_ADDR(file);
--
-- /* handle correct C++ semantics for an alloc of size 0 */
--
-- if (size == 0) size = 1;
--
-- return _malloc_leap(file, 0, size);
-+ return dmalloc_malloc(file, 0, size, DMALLOC_FUNC_NEW_ARRAY,
-+ 0 /* no alignment */, 0 /* no xalloc messages */);
- }
-
- /*
-@@ -84,19 +76,18 @@ operator delete(void *pnt)
- {
- char *file;
- GET_RET_ADDR(file);
-- _free_leap(file, 0, pnt);
-+ dmalloc_free(file, 0, pnt, DMALLOC_FUNC_DELETE);
- }
-
- /*
-- * An overload function for the C++ delete[]. Thanks to Jens Krinke
-- * <j.krinke(a)gmx.de>
-+ * An overload function for the C++ delete[]. Thanks to Jens Krinke.
- */
- void
- operator delete[](void *pnt)
- {
- char *file;
- GET_RET_ADDR(file);
-- _free_leap(file, 0, pnt);
-+ dmalloc_free(file, 0, pnt, DMALLOC_FUNC_DELETE_ARRAY);
- }
-
- #endif
diff --git a/ardour-2.8.16-gcc6.patch b/ardour-2.8.16-gcc6.patch
deleted file mode 100644
index 849bbfe..0000000
--- a/ardour-2.8.16-gcc6.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up ardour-2.8.16/gtk2_ardour/gain_meter.cc.fix
ardour-2.8.16/gtk2_ardour/gain_meter.cc
---- ardour-2.8.16/gtk2_ardour/gain_meter.cc.fix 2016-03-08 23:48:45.663150677 -0600
-+++ ardour-2.8.16/gtk2_ardour/gain_meter.cc 2016-03-08 23:49:04.970011796 -0600
-@@ -89,11 +89,11 @@ GainMeterBase::GainMeterBase (Session& s
- if (horizontal) {
- gain_slider = manage (new HSliderController (pix,
- &gain_adjustment,
-- false));
-+ (PBD::Controllable*) false));
- } else {
- gain_slider = manage (new VSliderController (pix,
- &gain_adjustment,
-- false));
-+ (PBD::Controllable*) false));
- }
-
- level_meter = new LevelMeter(_session);
diff --git a/ardour-2.8.16-gcc7.patch b/ardour-2.8.16-gcc7.patch
deleted file mode 100644
index 7582399..0000000
--- a/ardour-2.8.16-gcc7.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ardour-2.8.16/gtk2_ardour/ardour_ui.cc.orig 2017-01-31 16:28:28.898346791 +0000
-+++ ardour-2.8.16/gtk2_ardour/ardour_ui.cc 2017-01-31 16:30:41.021026990 +0000
-@@ -1964,7 +1964,7 @@
-
- const char **connections = io.input(0)->get_connections();
-
-- if (connections == 0 || connections[0] == '\0') {
-+ if (connections == 0 || connections[0] == 0) {
- buf = _("off");
- } else {
- buf = connections[0];
-@@ -1983,7 +1983,7 @@
-
- const char **connections = io.output(0)->get_connections();
-
-- if (connections == 0 || connections[0] == '\0') {
-+ if (connections == 0 || connections[0] == 0) {
- buf = _("off");
- } else {
- buf = connections[0];
diff --git a/ardour-2.8.16-glibmm250.patch b/ardour-2.8.16-glibmm250.patch
deleted file mode 100644
index a2687c6..0000000
--- a/ardour-2.8.16-glibmm250.patch
+++ /dev/null
@@ -1,133 +0,0 @@
---- ardour-2.8.16/libs/gtkmm2ext/fastmeter.cc
-+++ ardour-2.8.16/libs/gtkmm2ext/fastmeter.cc
-@@ -475,7 +475,7 @@
-
- Glib::RefPtr<Gdk::Window> win;
-
-- if ((win = get_window()) == 0) {
-+ if (! (win = get_window())) {
- queue_draw ();
- return;
- }
---- ardour-2.8.16/gtk2_ardour/editor.cc
-+++ ardour-2.8.16/gtk2_ardour/editor.cc
-@@ -800,16 +800,16 @@
- list<Glib::RefPtr<Gdk::Pixbuf> > window_icons;
- Glib::RefPtr<Gdk::Pixbuf> icon;
-
-- if ((icon = ::get_icon ("ardour_icon_16px")) != 0) {
-+ if ((icon = ::get_icon ("ardour_icon_16px"))) {
- window_icons.push_back (icon);
- }
-- if ((icon = ::get_icon ("ardour_icon_22px")) != 0) {
-+ if ((icon = ::get_icon ("ardour_icon_22px"))) {
- window_icons.push_back (icon);
- }
-- if ((icon = ::get_icon ("ardour_icon_32px")) != 0) {
-+ if ((icon = ::get_icon ("ardour_icon_32px"))) {
- window_icons.push_back (icon);
- }
-- if ((icon = ::get_icon ("ardour_icon_48px")) != 0) {
-+ if ((icon = ::get_icon ("ardour_icon_48px"))) {
- window_icons.push_back (icon);
- }
- if (!window_icons.empty()) {
---- ardour-2.8.16/gtk2_ardour/editor_keyboard.cc
-+++ ardour-2.8.16/gtk2_ardour/editor_keyboard.cc
-@@ -42,9 +42,9 @@
- Glib::RefPtr<Gdk::Window> evw = track_canvas->get_window()->get_pointer (x,
y, mask);
- bool doit = false;
-
-- if (use_track_canvas && track_canvas_event_box.get_window()->get_pointer(x,
y, mask) != 0) {
-+ if (use_track_canvas && track_canvas_event_box.get_window()->get_pointer(x,
y, mask)) {
- doit = true;
-- } else if (use_time_canvas &&
time_canvas_event_box.get_window()->get_pointer(x, y, mask)!= 0) {
-+ } else if (use_time_canvas &&
time_canvas_event_box.get_window()->get_pointer(x, y, mask)) {
- doit = true;
- }
-
---- ardour-2.8.16/gtk2_ardour/gain_meter.cc
-+++ ardour-2.8.16/gtk2_ardour/gain_meter.cc
-@@ -63,7 +63,7 @@
- void
- GainMeter::setup_slider_pix ()
- {
-- if ((slider = ::get_icon ("fader_belt")) == 0) {
-+ if (! (slider = ::get_icon ("fader_belt"))) {
- throw failed_constructor();
- }
- }
---- ardour-2.8.16/gtk2_ardour/new_session_dialog.cc
-+++ ardour-2.8.16/gtk2_ardour/new_session_dialog.cc
-@@ -354,16 +354,16 @@
- list<Glib::RefPtr<Gdk::Pixbuf> > window_icons;
- Glib::RefPtr<Gdk::Pixbuf> icon;
-
-- if ((icon = ::get_icon ("ardour_icon_16px")) != 0) {
-+ if ((icon = ::get_icon ("ardour_icon_16px"))) {
- window_icons.push_back (icon);
- }
-- if ((icon = ::get_icon ("ardour_icon_22px")) != 0) {
-+ if ((icon = ::get_icon ("ardour_icon_22px"))) {
- window_icons.push_back (icon);
- }
-- if ((icon = ::get_icon ("ardour_icon_32px")) != 0) {
-+ if ((icon = ::get_icon ("ardour_icon_32px"))) {
- window_icons.push_back (icon);
- }
-- if ((icon = ::get_icon ("ardour_icon_48px")) != 0) {
-+ if ((icon = ::get_icon ("ardour_icon_48px"))) {
- window_icons.push_back (icon);
- }
- if (!window_icons.empty()) {
---- ardour-2.8.16/gtk2_ardour/panner2d.cc
-+++ ardour-2.8.16/gtk2_ardour/panner2d.cc
-@@ -427,7 +427,7 @@
- gint x, y;
- float fx, fy;
-
-- if (layout == 0) {
-+ if (! layout) {
- layout = create_pango_layout ("");
- layout->set_font_description (get_style()->get_font());
- }
-@@ -579,7 +579,7 @@
- {
- using namespace Menu_Helpers;
-
-- if (context_menu == 0) {
-+ if (! context_menu) {
- context_menu = manage (new Menu);
- context_menu->set_name ("ArdourContextMenu");
- MenuList& items = context_menu->items();
---- ardour-2.8.16/gtk2_ardour/route_time_axis.cc
-+++ ardour-2.8.16/gtk2_ardour/route_time_axis.cc
-@@ -88,7 +88,7 @@
- void
- RouteTimeAxisView::setup_slider_pix ()
- {
-- if ((slider = ::get_icon ("fader_belt_h")) == 0) {
-+ if (! (slider = ::get_icon ("fader_belt_h"))) {
- throw failed_constructor ();
- }
- }
---- ardour-2.8.16/gtk2_ardour/fft_graph.cc
-+++ ardour-2.8.16/gtk2_ardour/fft_graph.cc
-@@ -190,7 +190,7 @@
-
-
-
-- if (graph_gc == 0) {
-+ if (! graph_gc) {
- graph_gc = GC::create( get_window() );
- }
-
-@@ -200,7 +200,7 @@
-
- graph_gc->set_rgb_fg_color( grey );
-
-- if (layout == 0) {
-+ if (! layout) {
- layout = create_pango_layout ("");
- layout->set_font_description (get_style()->get_font());
- }
diff --git a/ardour-2.8.16-libsigc++26.patch b/ardour-2.8.16-libsigc++26.patch
deleted file mode 100644
index d88ec19..0000000
--- a/ardour-2.8.16-libsigc++26.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From f7ae7643c2733403f742dcad0045551a26a8c2b7 Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils(a)tiptoe.de>
-Date: Sun, 29 Nov 2015 00:16:18 +0100
-Subject: [PATCH] libsigc++-2.6.x: don't #include obsolete headers
-
----
- gtk2_ardour/editor_markers.cc | 1 -
- libs/ardour/audio_track.cc | 5 ++---
- libs/ardour/audioregion.cc | 1 -
- libs/ardour/region.cc | 1 -
- libs/ardour/session.cc | 3 +--
- libs/ardour/session_transport.cc | 3 +--
- libs/ardour/track.cc | 5 ++---
- 7 files changed, 6 insertions(+), 13 deletions(-)
-
-diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
-index b47a3d3..0809dea 100644
---- a/gtk2_ardour/editor_markers.cc
-+++ b/gtk2_ardour/editor_markers.cc
-@@ -17,7 +17,6 @@
-
- */
-
--#include <sigc++/retype.h>
- #include <cstdlib>
- #include <cmath>
-
-diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc
-index 688030d..fa260d3 100644
---- a/libs/ardour/audio_track.cc
-+++ b/libs/ardour/audio_track.cc
-@@ -19,9 +19,8 @@
-
- #include <boost/scoped_array.hpp>
-
--#include <sigc++/retype.h>
--#include <sigc++/retype_return.h>
--#include <sigc++/bind.h>
-+#include <sigc++/adaptors/retype_return.h>
-+#include <sigc++/adaptors/bind.h>
-
- #include <pbd/error.h>
- #include <pbd/enumwriter.h>
-diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc
-index 7eefd68..3245319 100644
---- a/libs/ardour/audioregion.cc
-+++ b/libs/ardour/audioregion.cc
-@@ -26,7 +26,6 @@
- #include <boost/scoped_array.hpp>
-
- #include <sigc++/bind.h>
--#include <sigc++/class_slot.h>
-
- #include <glibmm/thread.h>
-
-diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc
-index a575700..0c1eb40 100644
---- a/libs/ardour/region.cc
-+++ b/libs/ardour/region.cc
-@@ -24,7 +24,6 @@
- #include <sstream>
-
- #include <sigc++/bind.h>
--#include <sigc++/class_slot.h>
-
- #include <glibmm/thread.h>
- #include <pbd/xml++.h>
-diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
-index 5f5231a..4463eb5 100644
---- a/libs/ardour/session.cc
-+++ b/libs/ardour/session.cc
-@@ -29,8 +29,7 @@
- #include <limits.h>
- #include <sys/time.h>
-
--#include <sigc++/bind.h>
--#include <sigc++/retype.h>
-+#include <sigc++/adaptors/bind.h>
-
- #include <glibmm/thread.h>
- #include <glibmm/miscutils.h>
-diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
-index c19c115..02129bc 100644
---- a/libs/ardour/session_transport.cc
-+++ b/libs/ardour/session_transport.cc
-@@ -21,8 +21,7 @@
- #include <cerrno>
- #include <unistd.h>
-
--#include <sigc++/bind.h>
--#include <sigc++/retype.h>
-+#include <sigc++/adaptors/bind.h>
-
- #include <pbd/undo.h>
- #include <pbd/error.h>
-diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc
-index 63254a3..4706452 100644
---- a/libs/ardour/track.cc
-+++ b/libs/ardour/track.cc
-@@ -16,9 +16,8 @@
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
- #include <pbd/error.h>
--#include <sigc++/retype.h>
--#include <sigc++/retype_return.h>
--#include <sigc++/bind.h>
-+#include <sigc++/adaptors/retype_return.h>
-+#include <sigc++/adaptors/bind.h>
-
- #include <ardour/track.h>
- #include <ardour/diskstream.h>
---
-2.6.3
-
diff --git a/ardour-SConscript.patch b/ardour-SConscript.patch
deleted file mode 100644
index ce39fb1..0000000
--- a/ardour-SConscript.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -rupN ardour-2.8.3.old/libs/midi++2/SConscript ardour-2.8.3/libs/midi++2/SConscript
---- ardour-2.8.3.old/libs/midi++2/SConscript 2009-03-19 13:52:43.000000000 -0400
-+++ ardour-2.8.3/libs/midi++2/SConscript 2009-11-12 04:01:48.000000000 -0500
-@@ -42,7 +42,7 @@ if env['SYSMIDI'] == 'CoreMIDI':
- else:
- sysdep_src = [ 'alsa_sequencer_midiport.cc' ]
- midi2.Append (CCFLAGS="-DWITH_ALSA")
--
-+ midi2.Append (LIBS = "-lasound")
- midi2.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE
-D_LARGEFILE64_SOURCE")
- midi2.Append(CCFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
-
-diff -rupN ardour-2.8.3.old/libs/vamp-sdk/SConscript
ardour-2.8.3/libs/vamp-sdk/SConscript
---- ardour-2.8.3.old/libs/vamp-sdk/SConscript 2009-03-26 11:20:21.000000000 -0400
-+++ ardour-2.8.3/libs/vamp-sdk/SConscript 2009-11-12 04:04:32.000000000 -0500
-@@ -27,7 +27,7 @@ vampsdk.Merge ([libraries['fftw3'], libr
- # HAVE_FFTW3 is used to help improve some performance aspects of VAMP's
InputDomainAdapter
-
- vampsdk.Append (CPPATH='#libs/vamp-sdk/vamp', CXXFLAGS="-Ilibs/vamp-sdk
-DHAVE_FFTW3")
--
-+vampsdk.Append (LIBS = "-ldl")
- libvampsdk = vampsdk.SharedLibrary('vampsdk', vampsdk_files)
- libvamphostsdk = vampsdk.SharedLibrary('vamphostsdk', vamphostsdk_files)
-
diff --git a/ardour-fix-mm-includes.patch b/ardour-fix-mm-includes.patch
deleted file mode 100644
index a0978a1..0000000
--- a/ardour-fix-mm-includes.patch
+++ /dev/null
@@ -1,1915 +0,0 @@
-gtkmm is sensitive to headers not being included in the right order, esp.
-to glibmm.h and gdkmm.h not being included first. This causes compile errors
-with gcc >= 4.8
-
-Switch to simply including gtkmm.h, rather then specific headers, as that does
-the right thing for us.
-diff -up ardour-2.8.16/libs/gtkmm2ext/application.cc~
ardour-2.8.16/libs/gtkmm2ext/application.cc
---- ardour-2.8.16/libs/gtkmm2ext/application.cc~ 2010-04-16 16:43:29.000000000 +0200
-+++ ardour-2.8.16/libs/gtkmm2ext/application.cc 2013-05-10 12:34:45.890929703 +0200
-@@ -21,8 +21,7 @@
- * Boston, MA 02111-1307, USA.
- */
-
--#include <gtkmm/menushell.h>
--#include <gtkmm/menuitem.h>
-+#include <gtkmm.h>
-
- #include "gtkmm2ext/application.h"
- #include "gtkmm2ext/gtkapplication.h"
-diff -up ardour-2.8.16/libs/gtkmm2ext/choice.cc~ ardour-2.8.16/libs/gtkmm2ext/choice.cc
---- ardour-2.8.16/libs/gtkmm2ext/choice.cc~ 2009-02-24 13:37:45.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/choice.cc 2013-05-10 12:36:27.538937570 +0200
-@@ -18,7 +18,7 @@
- $Id: choice.cc 461 2006-04-20 20:41:05Z nickm $
- */
-
--#include <gtkmm/label.h>
-+#include <gtkmm.h>
- #include <gtkmm2ext/choice.h>
-
- using namespace std;
-diff -up ardour-2.8.16/libs/gtkmm2ext/fastmeter.cc~
ardour-2.8.16/libs/gtkmm2ext/fastmeter.cc
---- ardour-2.8.16/libs/gtkmm2ext/fastmeter.cc~ 2009-02-24 13:37:45.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/fastmeter.cc 2013-05-10 12:35:45.250934297 +0200
-@@ -21,10 +21,9 @@
- #include <iostream>
- #include <cmath>
- #include <algorithm>
--#include <gdkmm/rectangle.h>
-+#include <gtkmm.h>
- #include <gtkmm2ext/fastmeter.h>
- #include <gtkmm2ext/utils.h>
--#include <gtkmm/style.h>
- #include <cstring>
-
- #define UINT_TO_RGB(u,r,g,b) { (*(r)) = ((u)>>16)&0xff; (*(g)) =
((u)>>8)&0xff; (*(b)) = (u)&0xff; }
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/barcontroller.h~
ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/barcontroller.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/barcontroller.h~ 2009-07-09 20:29:31.000000000
+0200
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/barcontroller.h 2013-05-10 12:38:14.145945821
+0200
-@@ -19,8 +19,7 @@
- #ifndef __gtkmm2ext_bar_controller_h__
- #define __gtkmm2ext_bar_controller_h__
-
--#include <gtkmm/frame.h>
--#include <gtkmm/drawingarea.h>
-+#include <gtkmm.h>
- #include <gtkmm2ext/binding_proxy.h>
-
- namespace ARDOUR {
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/choice.h~
ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/choice.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/choice.h~ 2009-02-24 13:37:45.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/choice.h 2013-05-10 12:38:51.009948674 +0200
-@@ -20,10 +20,7 @@
- #ifndef __pbd_gtkmm_choice_h__
- #define __pbd_gtkmm_choice_h__
-
--#include <gtkmm/dialog.h>
--#include <gtkmm/image.h>
--#include <gtkmm/stock.h>
--#include <gtkmm/box.h>
-+#include <gtkmm.h>
- #include <string>
- #include <vector>
-
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h~
ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h~ 2009-02-24 13:37:45.000000000
+0100
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h 2013-05-10 12:39:11.089950228
+0200
-@@ -22,9 +22,7 @@
-
- #include <stdint.h>
- #include <string>
--#include <gtkmm/treeview.h>
--#include <gtkmm/treeselection.h>
--#include <gtkmm/selectiondata.h>
-+#include <gtkmm.h>
-
- namespace Gtkmm2ext {
-
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/fastmeter.h~
ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/fastmeter.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/fastmeter.h~ 2009-02-24 13:37:45.000000000
+0100
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/fastmeter.h 2013-05-10 12:38:40.721947878
+0200
-@@ -20,8 +20,7 @@
- #ifndef __gtkmm2ext_fastmeter_h__
- #define __gtkmm2ext_fastmeter_h__
-
--#include <gtkmm/drawingarea.h>
--#include <gdkmm/pixbuf.h>
-+#include <gtkmm.h>
-
- namespace Gtkmm2ext {
-
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/focus_entry.h~
ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/focus_entry.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/focus_entry.h~ 2009-02-24 13:37:45.000000000
+0100
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/focus_entry.h 2013-05-10 12:39:19.953950914
+0200
-@@ -20,7 +20,7 @@
- #ifndef __gtkmm2ext_focus_entry_h__
- #define __gtkmm2ext_focus_entry_h__
-
--#include <gtkmm/entry.h>
-+#include <gtkmm.h>
-
- namespace Gtkmm2ext {
-
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h~
ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h~ 2011-02-04 05:05:47.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h 2013-05-10 12:37:56.737944474 +0200
-@@ -27,14 +27,7 @@
- #include <stdint.h>
- #include <setjmp.h>
- #include <pthread.h>
--#include <gtkmm/widget.h>
--#include <gtkmm/style.h>
--#ifndef GTK_NEW_TOOLTIP_API
--#include <gtkmm/tooltips.h>
--#endif
--#include <gtkmm/textbuffer.h>
--#include <gtkmm/main.h>
--#include <gdkmm/color.h>
-+#include <gtkmm.h>
- #include <pbd/abstract_ui.h>
- #include <pbd/ringbufferNPT.h>
-
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/idle_adjustment.h~
ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/idle_adjustment.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/idle_adjustment.h~ 2009-02-24
13:37:45.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/idle_adjustment.h 2013-05-10
12:39:33.585951969 +0200
-@@ -21,7 +21,7 @@
- #define __gtkmm2ext_idle_adjustment_h__
-
- #include <sys/time.h>
--#include <gtkmm/adjustment.h>
-+#include <gtkmm.h>
-
- namespace Gtkmm2ext {
-
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/pixfader.h~
ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/pixfader.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/pixfader.h~ 2009-02-24 13:37:45.000000000
+0100
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/pixfader.h 2013-05-10 12:38:34.865947425
+0200
-@@ -22,9 +22,7 @@
-
- #include <cmath>
-
--#include <gtkmm/drawingarea.h>
--#include <gtkmm/adjustment.h>
--#include <gdkmm/pixbuf.h>
-+#include <gtkmm.h>
-
- namespace Gtkmm2ext {
-
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/pixscroller.h~
ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/pixscroller.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/pixscroller.h~ 2009-02-24 13:37:45.000000000
+0100
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/pixscroller.h 2013-05-10 12:38:03.809945021
+0200
-@@ -20,9 +20,7 @@
- #ifndef __gtkmm2ext_pixscroller_h__
- #define __gtkmm2ext_pixscroller_h__
-
--#include <gtkmm/drawingarea.h>
--#include <gtkmm/adjustment.h>
--#include <gdkmm.h>
-+#include <gtkmm.h>
-
- namespace Gtkmm2ext {
-
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/prompter.h~
ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/prompter.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/prompter.h~ 2009-02-24 13:37:45.000000000
+0100
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/prompter.h 2013-05-10 12:38:22.945946502
+0200
-@@ -21,10 +21,7 @@
- #define __gtkmm2ext_prompter_h__
-
- #include <string>
--#include <gtkmm/box.h>
--#include <gtkmm/entry.h>
--#include <gtkmm/label.h>
--#include <gtkmm/dialog.h>
-+#include <gtkmm.h>
- #include <sigc++/sigc++.h>
-
- namespace Gtk {
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/stateful_button.h~
ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/stateful_button.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/stateful_button.h~ 2009-02-24
13:37:45.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/stateful_button.h 2013-05-10
12:39:25.793951366 +0200
-@@ -22,7 +22,7 @@
-
- #include <vector>
-
--#include <gtkmm/togglebutton.h>
-+#include <gtkmm.h>
-
- namespace Gtkmm2ext {
-
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/tearoff.h~
ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/tearoff.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/tearoff.h~ 2009-02-24 13:37:45.000000000
+0100
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/tearoff.h 2013-05-10 12:38:57.297949161 +0200
-@@ -20,10 +20,7 @@
- #ifndef __gtkmm2ext_tearoff_h__
- #define __gtkmm2ext_tearoff_h__
-
--#include <gtkmm/window.h>
--#include <gtkmm/arrow.h>
--#include <gtkmm/box.h>
--#include <gtkmm/eventbox.h>
-+#include <gtkmm.h>
-
- namespace Gtkmm2ext {
-
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/utils.h~
ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/utils.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/utils.h~ 2009-03-13 13:42:40.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/utils.h 2013-05-10 12:37:19.682941606 +0200
-@@ -23,8 +23,7 @@
- #include <vector>
- #include <string>
-
--#include <gtkmm/treeview.h>
--#include <gdkmm/window.h> /* for WMDecoration */
-+#include <gtkmm.h>
-
- namespace Gtk {
- class ComboBoxText;
-diff -up ardour-2.8.16/libs/gtkmm2ext/idle_adjustment.cc~
ardour-2.8.16/libs/gtkmm2ext/idle_adjustment.cc
---- ardour-2.8.16/libs/gtkmm2ext/idle_adjustment.cc~ 2009-02-24 13:37:45.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/idle_adjustment.cc 2013-05-10 12:34:33.891928774 +0200
-@@ -19,7 +19,7 @@
-
- #define _BSD_SOURCE
- #include <gtkmm2ext/idle_adjustment.h>
--#include <gtkmm/main.h>
-+#include <gtkmm.h>
- #include <iostream>
-
- using namespace Gtk;
-diff -up ardour-2.8.16/libs/gtkmm2ext/prompter.cc~
ardour-2.8.16/libs/gtkmm2ext/prompter.cc
---- ardour-2.8.16/libs/gtkmm2ext/prompter.cc~ 2009-02-24 13:37:45.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/prompter.cc 2013-05-10 12:36:11.906936360 +0200
-@@ -22,7 +22,7 @@
-
- #include <pbd/whitespace.h>
-
--#include <gtkmm/stock.h>
-+#include <gtkmm.h>
- #include <gtkmm2ext/prompter.h>
-
- #include "i18n.h"
-diff -up ardour-2.8.16/libs/gtkmm2ext/stateful_button.cc~
ardour-2.8.16/libs/gtkmm2ext/stateful_button.cc
---- ardour-2.8.16/libs/gtkmm2ext/stateful_button.cc~ 2010-03-19 20:04:50.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/stateful_button.cc 2013-05-10 12:36:18.834936896 +0200
-@@ -20,7 +20,7 @@
- #include <string>
- #include <iostream>
-
--#include <gtkmm/main.h>
-+#include <gtkmm.h>
-
- #include <gtkmm2ext/stateful_button.h>
-
-diff -up ardour-2.8.16/libs/gtkmm2ext/utils.cc~ ardour-2.8.16/libs/gtkmm2ext/utils.cc
---- ardour-2.8.16/libs/gtkmm2ext/utils.cc~ 2009-03-13 14:01:25.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/utils.cc 2013-05-10 12:35:09.746931549 +0200
-@@ -21,15 +21,10 @@
- #include <iostream>
- #include <map>
-
--#include <gtk/gtkpaned.h>
- #include <gtk/gtk.h>
-
- #include <gtkmm2ext/utils.h>
--#include <gtkmm/widget.h>
--#include <gtkmm/button.h>
--#include <gtkmm/window.h>
--#include <gtkmm/paned.h>
--#include <gtkmm/comboboxtext.h>
-+#include <gtkmm.h>
-
- #include "i18n.h"
-
-diff -up ardour-2.8.16/gtk2_ardour/actions.cc~ ardour-2.8.16/gtk2_ardour/actions.cc
---- ardour-2.8.16/gtk2_ardour/actions.cc~ 2013-05-10 12:55:41.612026892 +0200
-+++ ardour-2.8.16/gtk2_ardour/actions.cc 2013-05-10 12:48:09.470991898 +0200
-@@ -26,8 +26,8 @@
- #include <gtk/gtkuimanager.h>
- #include <gtk/gtkactiongroup.h>
-
-+#include <gtkmm.h>
- #include <gtkmm/accelmap.h>
--#include <gtkmm/uimanager.h>
-
- #include <pbd/error.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/add_route_dialog.cc~
ardour-2.8.16/gtk2_ardour/add_route_dialog.cc
---- ardour-2.8.16/gtk2_ardour/add_route_dialog.cc~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/add_route_dialog.cc 2013-05-10 12:48:43.070994498 +0200
-@@ -21,8 +21,7 @@
- #include <cmath>
-
- #include <sigc++/bind.h>
--#include <gtkmm/stock.h>
--#include <gtkmm/separator.h>
-+#include <gtkmm.h>
- #include <pbd/error.h>
- #include <pbd/convert.h>
- #include <gtkmm2ext/utils.h>
-diff -up ardour-2.8.16/gtk2_ardour/analysis_window.cc~
ardour-2.8.16/gtk2_ardour/analysis_window.cc
---- ardour-2.8.16/gtk2_ardour/analysis_window.cc~ 2011-04-06 19:09:42.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/analysis_window.cc 2013-05-10 12:48:51.997995189 +0200
-@@ -19,10 +19,7 @@
- */
-
- #include <gtkmm2ext/gtk_ui.h>
--#include <gtkmm/stock.h>
--#include <gtkmm/label.h>
--#include <gtkmm/treemodel.h>
--#include <gtkmm/treeiter.h>
-+#include <gtkmm.h>
-
- #include <ardour/audioregion.h>
- #include <ardour/audioplaylist.h>
-diff -up ardour-2.8.16/gtk2_ardour/ardour_ui.cc~ ardour-2.8.16/gtk2_ardour/ardour_ui.cc
---- ardour-2.8.16/gtk2_ardour/ardour_ui.cc~ 2012-07-20 17:24:56.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/ardour_ui.cc 2013-05-10 12:48:58.814995717 +0200
-@@ -32,7 +32,7 @@
-
- #include <sys/resource.h>
-
--#include <gtkmm/messagedialog.h>
-+#include <gtkmm.h>
- #include <gtkmm/accelmap.h>
- #include <gtkmm2ext/application.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/ardour_ui_ed.cc~
ardour-2.8.16/gtk2_ardour/ardour_ui_ed.cc
---- ardour-2.8.16/gtk2_ardour/ardour_ui_ed.cc~ 2012-10-17 00:35:38.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/ardour_ui_ed.cc 2013-05-10 12:49:06.509996312 +0200
-@@ -26,7 +26,7 @@
- #include <pbd/pathscanner.h>
- #include <pbd/fpu.h>
-
--#include <glibmm/miscutils.h>
-+#include <glibmm.h>
-
- #include <gtkmm2ext/utils.h>
- #include <gtkmm2ext/window_title.h>
-diff -up ardour-2.8.16/gtk2_ardour/crossfade_edit.cc~
ardour-2.8.16/gtk2_ardour/crossfade_edit.cc
---- ardour-2.8.16/gtk2_ardour/crossfade_edit.cc~ 2010-03-26 17:39:18.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/crossfade_edit.cc 2013-05-10 12:49:47.165999459 +0200
-@@ -21,11 +21,9 @@
-
- #include <sigc++/bind.h>
-
--#include <gtkmm/frame.h>
--#include <gtkmm/image.h>
--#include <gtkmm/scrolledwindow.h>
-+#include <gtkmm.h>
-
--#include <libgnomecanvasmm/line.h>
-+#include <libgnomecanvasmm.h>
-
- #include <ardour/automation_event.h>
- #include <ardour/curve.h>
-diff -up ardour-2.8.16/gtk2_ardour/editor.cc~ ardour-2.8.16/gtk2_ardour/editor.cc
---- ardour-2.8.16/gtk2_ardour/editor.cc~ 2012-03-16 15:33:28.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/editor.cc 2013-05-10 12:50:02.782000668 +0200
-@@ -33,10 +33,7 @@
- #include <pbd/enumwriter.h>
- #include <pbd/memento_command.h>
-
--#include <glibmm/miscutils.h>
--#include <gtkmm/image.h>
--#include <gdkmm/color.h>
--#include <gdkmm/bitmap.h>
-+#include <gtkmm.h>
-
- #include <gtkmm2ext/grouped_buttons.h>
- #include <gtkmm2ext/gtk_ui.h>
-diff -up ardour-2.8.16/gtk2_ardour/editor_canvas.cc~
ardour-2.8.16/gtk2_ardour/editor_canvas.cc
---- ardour-2.8.16/gtk2_ardour/editor_canvas.cc~ 2012-03-16 15:33:28.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/editor_canvas.cc 2013-05-10 12:50:09.534001190 +0200
-@@ -23,8 +23,7 @@
- #undef Rect
- #endif /* __APPLE__ */
-
--#include <libgnomecanvasmm/init.h>
--#include <libgnomecanvasmm/pixbuf.h>
-+#include <libgnomecanvasmm.h>
- #include <jack/types.h>
- #include <gtkmm2ext/utils.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/editor_export_audio.cc~
ardour-2.8.16/gtk2_ardour/editor_export_audio.cc
---- ardour-2.8.16/gtk2_ardour/editor_export_audio.cc~ 2009-02-24 13:37:42.000000000
+0100
-+++ ardour-2.8.16/gtk2_ardour/editor_export_audio.cc 2013-05-10 12:50:13.918001530 +0200
-@@ -20,7 +20,7 @@
- #include <unistd.h>
- #include <climits>
-
--#include <gtkmm/messagedialog.h>
-+#include <gtkmm.h>
-
- #include "export_session_dialog.h"
- #include "export_region_dialog.h"
-diff -up ardour-2.8.16/gtk2_ardour/editor_keys.cc~
ardour-2.8.16/gtk2_ardour/editor_keys.cc
---- ardour-2.8.16/gtk2_ardour/editor_keys.cc~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/editor_keys.cc 2013-05-10 12:50:18.975001921 +0200
-@@ -25,7 +25,7 @@
-
- #include <ardour/session.h>
- #include <ardour/region.h>
--#include <gtkmm/treeview.h>
-+#include <gtkmm.h>
-
- #include "ardour_ui.h"
- #include "editor.h"
-diff -up ardour-2.8.16/gtk2_ardour/editor_mixer.cc~
ardour-2.8.16/gtk2_ardour/editor_mixer.cc
---- ardour-2.8.16/gtk2_ardour/editor_mixer.cc~ 2012-03-09 17:56:54.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/editor_mixer.cc 2013-05-10 12:50:23.406002264 +0200
-@@ -17,7 +17,7 @@
-
- */
-
--#include <glibmm/miscutils.h>
-+#include <glibmm.h>
- #include <gtkmm2ext/utils.h>
- #include <gtkmm2ext/window_title.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/engine_dialog.cc~
ardour-2.8.16/gtk2_ardour/engine_dialog.cc
---- ardour-2.8.16/gtk2_ardour/engine_dialog.cc~ 2012-12-02 01:37:37.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/engine_dialog.cc 2013-05-10 12:50:36.878003307 +0200
-@@ -4,8 +4,7 @@
- #include <map>
-
- #include <boost/scoped_ptr.hpp>
--#include <glibmm.h>
--#include <gtkmm/messagedialog.h>
-+#include <gtkmm.h>
- #include <pbd/xml++.h>
- #include <pbd/epa.h>
-
-@@ -21,7 +20,6 @@
- #include <ardour/profile.h>
- #include <jack/jack.h>
-
--#include <gtkmm/stock.h>
- #include <gtkmm2ext/utils.h>
-
- #include <pbd/convert.h>
-diff -up ardour-2.8.16/gtk2_ardour/fft_graph.cc~ ardour-2.8.16/gtk2_ardour/fft_graph.cc
---- ardour-2.8.16/gtk2_ardour/fft_graph.cc~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/fft_graph.cc 2013-05-10 12:50:53.886004623 +0200
-@@ -19,15 +19,7 @@
-
- #include <iostream>
-
--#include <glibmm.h>
--#include <glibmm/refptr.h>
--
--#include <gdkmm/gc.h>
--
--#include <gtkmm/widget.h>
--#include <gtkmm/style.h>
--#include <gtkmm/treemodel.h>
--#include <gtkmm/treepath.h>
-+#include <gtkmm.h>
-
- #include <pbd/stl_delete.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/imageframe_time_axis.cc~
ardour-2.8.16/gtk2_ardour/imageframe_time_axis.cc
---- ardour-2.8.16/gtk2_ardour/imageframe_time_axis.cc~ 2009-03-02 21:42:15.000000000
+0100
-+++ ardour-2.8.16/gtk2_ardour/imageframe_time_axis.cc 2013-05-10 12:51:13.341006129
+0200
-@@ -22,7 +22,7 @@
-
- #include <pbd/error.h>
-
--#include <gtkmm/menu.h>
-+#include <gtkmm.h>
-
- #include <gtkmm2ext/utils.h>
- #include <gtkmm2ext/gtk_ui.h>
-diff -up ardour-2.8.16/gtk2_ardour/io_selector.cc~
ardour-2.8.16/gtk2_ardour/io_selector.cc
---- ardour-2.8.16/gtk2_ardour/io_selector.cc~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/io_selector.cc 2013-05-10 12:51:24.205006970 +0200
-@@ -22,9 +22,7 @@
-
- #include <sigc++/bind.h>
-
--#include <gtkmm/messagedialog.h>
--
--#include <glibmm/thread.h>
-+#include <gtkmm.h>
-
- #include <ardour/io.h>
- #include <ardour/route.h>
-diff -up ardour-2.8.16/gtk2_ardour/keyboard.cc~ ardour-2.8.16/gtk2_ardour/keyboard.cc
---- ardour-2.8.16/gtk2_ardour/keyboard.cc~ 2012-04-19 16:35:13.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/keyboard.cc 2013-05-10 12:51:29.773007401 +0200
-@@ -28,6 +28,7 @@
-
- #include <ctype.h>
-
-+#include <gtkmm.h>
- #include <gtkmm/accelmap.h>
-
- #include <gdk/gdkkeysyms.h>
-diff -up ardour-2.8.16/gtk2_ardour/keyeditor.cc~ ardour-2.8.16/gtk2_ardour/keyeditor.cc
---- ardour-2.8.16/gtk2_ardour/keyeditor.cc~ 2012-03-16 15:33:28.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/keyeditor.cc 2013-05-10 12:51:37.821008023 +0200
-@@ -2,11 +2,8 @@
-
- #include <ardour/profile.h>
-
--#include <gtkmm/stock.h>
--#include <gtkmm/label.h>
--#include <gtkmm/accelkey.h>
-+#include <gtkmm.h>
- #include <gtkmm/accelmap.h>
--#include <gtkmm/uimanager.h>
-
- #include <pbd/strsplit.h>
- #include <pbd/replace_all.h>
-diff -up ardour-2.8.16/gtk2_ardour/main.cc~ ardour-2.8.16/gtk2_ardour/main.cc
---- ardour-2.8.16/gtk2_ardour/main.cc~ 2012-07-02 15:21:59.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/main.cc 2013-05-10 12:51:47.421008766 +0200
-@@ -23,7 +23,7 @@
- #include <fstream>
-
- #include <sigc++/bind.h>
--#include <gtkmm/settings.h>
-+#include <gtkmm.h>
-
- #include <pbd/error.h>
- #include <pbd/textreceiver.h>
-@@ -38,8 +38,6 @@
- #include <ardour/ardour.h>
- #include <ardour/audioengine.h>
-
--#include <gtkmm/main.h>
--
- #include <gtkmm2ext/application.h>
- #include <gtkmm2ext/popup.h>
- #include <gtkmm2ext/utils.h>
-diff -up ardour-2.8.16/gtk2_ardour/marker_time_axis.cc~
ardour-2.8.16/gtk2_ardour/marker_time_axis.cc
---- ardour-2.8.16/gtk2_ardour/marker_time_axis.cc~ 2009-03-02 21:42:15.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/marker_time_axis.cc 2013-05-10 12:51:52.333009147 +0200
-@@ -21,7 +21,7 @@
-
- #include <pbd/error.h>
-
--#include <gtkmm/menu.h>
-+#include <gtkmm.h>
-
- #include <gtkmm2ext/utils.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/midi_port_dialog.cc~
ardour-2.8.16/gtk2_ardour/midi_port_dialog.cc
---- ardour-2.8.16/gtk2_ardour/midi_port_dialog.cc~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/midi_port_dialog.cc 2013-05-10 12:51:58.029009588 +0200
-@@ -1,6 +1,6 @@
- #include <string>
- #include <sigc++/bind.h>
--#include <gtkmm/stock.h>
-+#include <gtkmm.h>
-
- #include <pbd/convert.h>
- #include <gtkmm2ext/utils.h>
-diff -up ardour-2.8.16/gtk2_ardour/mixer_ui.cc~ ardour-2.8.16/gtk2_ardour/mixer_ui.cc
---- ardour-2.8.16/gtk2_ardour/mixer_ui.cc~ 2011-09-27 18:10:50.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/mixer_ui.cc 2013-05-10 12:52:09.053010441 +0200
-@@ -20,11 +20,11 @@
- #include <algorithm>
- #include <sigc++/bind.h>
-
-+#include <gtkmm.h>
- #include <gtkmm/accelmap.h>
-
- #include <pbd/convert.h>
- #include <pbd/stacktrace.h>
--#include <glibmm/thread.h>
-
- #include <gtkmm2ext/gtk_ui.h>
- #include <gtkmm2ext/utils.h>
-diff -up ardour-2.8.16/gtk2_ardour/nag.cc~ ardour-2.8.16/gtk2_ardour/nag.cc
---- ardour-2.8.16/gtk2_ardour/nag.cc~ 2012-07-02 15:21:59.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/nag.cc 2013-05-10 12:52:13.501010785 +0200
-@@ -1,6 +1,6 @@
- #include <boost/scoped_ptr.hpp>
- #include <fstream>
--#include <gtkmm/stock.h>
-+#include <gtkmm.h>
-
- #include <ardour/ardour.h>
- #include <pbd/epa.h>
-diff -up ardour-2.8.16/gtk2_ardour/new_session_dialog.cc~
ardour-2.8.16/gtk2_ardour/new_session_dialog.cc
---- ardour-2.8.16/gtk2_ardour/new_session_dialog.cc~ 2012-07-02 02:19:40.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/new_session_dialog.cc 2013-05-10 12:52:22.126011453 +0200
-@@ -25,14 +25,7 @@
-
- #include "pbd/stacktrace.h"
-
--#include <gtkmm/entry.h>
--#include <gtkmm/filechooserbutton.h>
--#include <gtkmm/spinbutton.h>
--#include <gtkmm/checkbutton.h>
--#include <gtkmm/radiobutton.h>
--#include <gtkmm/filefilter.h>
--#include <gtkmm/stock.h>
--#include <gdkmm/cursor.h>
-+#include <gtkmm.h>
-
- #include <gtkmm2ext/window_title.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/panner2d.cc~ ardour-2.8.16/gtk2_ardour/panner2d.cc
---- ardour-2.8.16/gtk2_ardour/panner2d.cc~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/panner2d.cc 2013-05-10 12:52:27.453011865 +0200
-@@ -21,8 +21,7 @@
- #include <climits>
- #include <cstring>
-
--#include <gtkmm/menu.h>
--#include <gtkmm/checkmenuitem.h>
-+#include <gtkmm.h>
-
- #include <pbd/error.h>
- #include <ardour/panner.h>
-diff -up ardour-2.8.16/gtk2_ardour/playlist_selector.cc~
ardour-2.8.16/gtk2_ardour/playlist_selector.cc
---- ardour-2.8.16/gtk2_ardour/playlist_selector.cc~ 2009-10-26 02:03:48.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/playlist_selector.cc 2013-05-10 12:52:32.493012255 +0200
-@@ -18,7 +18,7 @@
-
- */
-
--#include <gtkmm/button.h>
-+#include <gtkmm.h>
-
- #include <ardour/session_playlist.h>
- #include <ardour/audio_diskstream.h>
-diff -up ardour-2.8.16/gtk2_ardour/plugin_selector.cc~
ardour-2.8.16/gtk2_ardour/plugin_selector.cc
---- ardour-2.8.16/gtk2_ardour/plugin_selector.cc~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/plugin_selector.cc 2013-05-10 12:52:39.037012761 +0200
-@@ -23,10 +23,7 @@
-
- #include <algorithm>
-
--#include <gtkmm/table.h>
--#include <gtkmm/stock.h>
--#include <gtkmm/button.h>
--#include <gtkmm/notebook.h>
-+#include <gtkmm.h>
-
- #include <gtkmm2ext/utils.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/plugin_ui.cc~ ardour-2.8.16/gtk2_ardour/plugin_ui.cc
---- ardour-2.8.16/gtk2_ardour/plugin_ui.cc~ 2012-06-18 21:49:14.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/plugin_ui.cc 2013-05-10 12:52:45.117013232 +0200
-@@ -26,7 +26,7 @@
- #include <pbd/xml++.h>
- #include <pbd/failed_constructor.h>
-
--#include <gtkmm/widget.h>
-+#include <gtkmm.h>
- #include <gtkmm2ext/click_box.h>
- #include <gtkmm2ext/fastmeter.h>
- #include <gtkmm2ext/barcontroller.h>
-diff -up ardour-2.8.16/gtk2_ardour/redirect_box.cc~
ardour-2.8.16/gtk2_ardour/redirect_box.cc
---- ardour-2.8.16/gtk2_ardour/redirect_box.cc~ 2010-03-16 19:30:09.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/redirect_box.cc 2013-05-10 12:52:55.325014022 +0200
-@@ -24,9 +24,7 @@
-
- #include <pbd/convert.h>
-
--#include <glibmm/miscutils.h>
--
--#include <gtkmm/messagedialog.h>
-+#include <gtkmm.h>
-
- #include <gtkmm2ext/gtk_ui.h>
- #include <gtkmm2ext/utils.h>
-diff -up ardour-2.8.16/gtk2_ardour/region_layering_order_editor.cc~
ardour-2.8.16/gtk2_ardour/region_layering_order_editor.cc
---- ardour-2.8.16/gtk2_ardour/region_layering_order_editor.cc~ 2009-11-13
15:37:10.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/region_layering_order_editor.cc 2013-05-10
12:53:02.061014543 +0200
-@@ -1,6 +1,4 @@
--#include <gtkmm/table.h>
--#include <gtkmm/stock.h>
--#include <gtkmm/alignment.h>
-+#include <gtkmm.h>
- #include <ardour/region.h>
-
- #include "i18n.h"
-diff -up ardour-2.8.16/gtk2_ardour/rhythm_ferret.cc~
ardour-2.8.16/gtk2_ardour/rhythm_ferret.cc
---- ardour-2.8.16/gtk2_ardour/rhythm_ferret.cc~ 2011-04-06 19:09:42.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/rhythm_ferret.cc 2013-05-10 12:53:06.893014917 +0200
-@@ -1,4 +1,4 @@
--#include <gtkmm/stock.h>
-+#include <gtkmm.h>
- #include <gtkmm2ext/utils.h>
-
- #include <pbd/memento_command.h>
-diff -up ardour-2.8.16/gtk2_ardour/route_params_ui.cc~
ardour-2.8.16/gtk2_ardour/route_params_ui.cc
---- ardour-2.8.16/gtk2_ardour/route_params_ui.cc~ 2010-03-16 21:00:41.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/route_params_ui.cc 2013-05-10 12:53:15.581015590 +0200
-@@ -19,7 +19,7 @@
-
- #include <algorithm>
-
--#include <glibmm/thread.h>
-+#include <glibmm.h>
- #include <gtkmm2ext/utils.h>
- #include <gtkmm2ext/stop_signal.h>
- #include <gtkmm2ext/window_title.h>
-diff -up ardour-2.8.16/gtk2_ardour/route_time_axis.cc~
ardour-2.8.16/gtk2_ardour/route_time_axis.cc
---- ardour-2.8.16/gtk2_ardour/route_time_axis.cc~ 2010-04-17 17:23:01.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/route_time_axis.cc 2013-05-10 12:53:22.957016161 +0200
-@@ -31,8 +31,7 @@
- #include <pbd/whitespace.h>
- #include <pbd/memento_command.h>
-
--#include <gtkmm/menu.h>
--#include <gtkmm/menuitem.h>
-+#include <gtkmm.h>
- #include <gtkmm2ext/gtk_ui.h>
- #include <gtkmm2ext/selector.h>
- #include <gtkmm2ext/stop_signal.h>
-diff -up ardour-2.8.16/gtk2_ardour/sfdb_ui.cc~ ardour-2.8.16/gtk2_ardour/sfdb_ui.cc
---- ardour-2.8.16/gtk2_ardour/sfdb_ui.cc~ 2012-07-02 15:21:59.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/sfdb_ui.cc 2013-05-10 12:53:31.197016799 +0200
-@@ -25,9 +25,7 @@
- #include <sys/stat.h>
- #include <sys/param.h>
-
--#include <gtkmm/box.h>
--#include <gtkmm/stock.h>
--#include <glibmm/fileutils.h>
-+#include <gtkmm.h>
-
- #include <pbd/convert.h>
- #include <pbd/tokenizer.h>
-diff -up ardour-2.8.16/gtk2_ardour/tempo_dialog.cc~
ardour-2.8.16/gtk2_ardour/tempo_dialog.cc
---- ardour-2.8.16/gtk2_ardour/tempo_dialog.cc~ 2009-09-17 00:13:32.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/tempo_dialog.cc 2013-05-10 12:53:42.844017700 +0200
-@@ -19,7 +19,7 @@
-
- #include <cstdio> // for snprintf, grrr
-
--#include <gtkmm/stock.h>
-+#include <gtkmm.h>
- #include <gtkmm2ext/utils.h>
-
- #include "tempo_dialog.h"
-diff -up ardour-2.8.16/gtk2_ardour/tempo_lines.cc~
ardour-2.8.16/gtk2_ardour/tempo_lines.cc
---- ardour-2.8.16/gtk2_ardour/tempo_lines.cc~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/tempo_lines.cc 2013-05-10 12:53:49.100018184 +0200
-@@ -17,8 +17,7 @@
-
- */
-
--#include <libgnomecanvasmm/canvas.h>
--#include <libgnomecanvasmm/group.h>
-+#include <libgnomecanvasmm.h>
- #include "tempo_lines.h"
- #include "ardour_ui.h"
-
-diff -up ardour-2.8.16/gtk2_ardour/theme_manager.cc~
ardour-2.8.16/gtk2_ardour/theme_manager.cc
---- ardour-2.8.16/gtk2_ardour/theme_manager.cc~ 2010-03-16 19:30:09.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/theme_manager.cc 2013-05-10 12:53:55.916018712 +0200
-@@ -22,9 +22,8 @@
- #include <fstream>
- #include <errno.h>
-
--#include <gtkmm/stock.h>
-+#include <gtkmm.h>
- #include <gtkmm2ext/gtk_ui.h>
--#include <gtkmm/settings.h>
-
- #include <ardour/profile.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/time_axis_view.cc~
ardour-2.8.16/gtk2_ardour/time_axis_view.cc
---- ardour-2.8.16/gtk2_ardour/time_axis_view.cc~ 2010-06-02 17:55:17.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/time_axis_view.cc 2013-05-10 12:54:02.060019187 +0200
-@@ -24,7 +24,6 @@
- #include <list>
-
- #include <libgnomecanvasmm.h>
--#include <libgnomecanvasmm/canvas.h>
- #include <libgnomecanvasmm/item.h>
-
- #include <pbd/error.h>
-diff -up ardour-2.8.16/gtk2_ardour/ui_config.cc~ ardour-2.8.16/gtk2_ardour/ui_config.cc
---- ardour-2.8.16/gtk2_ardour/ui_config.cc~ 2010-03-16 19:30:09.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/ui_config.cc 2013-05-10 12:54:13.164020047 +0200
-@@ -20,7 +20,7 @@
- #include <unistd.h>
- #include <cstdio> /* for snprintf, grrr */
-
--#include <glibmm/miscutils.h>
-+#include <glibmm.h>
-
- #include <pbd/failed_constructor.h>
- #include <pbd/xml++.h>
-diff -up ardour-2.8.16/gtk2_ardour/utils.cc~ ardour-2.8.16/gtk2_ardour/utils.cc
---- ardour-2.8.16/gtk2_ardour/utils.cc~ 2012-07-27 04:36:07.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/utils.cc 2013-05-10 12:54:38.989022045 +0200
-@@ -25,12 +25,8 @@
- #include <fstream>
- #include <sys/stat.h>
- #include <libart_lgpl/art_misc.h>
--#include <gtkmm/rc.h>
--#include <gtkmm/window.h>
--#include <gtkmm/combo.h>
--#include <gtkmm/label.h>
--#include <gtkmm/paned.h>
--#include <gtk/gtkpaned.h>
-+#include <gtk/gtk.h>
-+#include <gtkmm.h>
-
- #include <gtkmm2ext/utils.h>
- #include <ardour/ardour.h>
-diff -up ardour-2.8.16/gtk2_ardour/about.h~ ardour-2.8.16/gtk2_ardour/about.h
---- ardour-2.8.16/gtk2_ardour/about.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/about.h 2013-05-10 12:59:25.595044228 +0200
-@@ -20,7 +20,7 @@
- #ifndef __ardour_gtk_about_h__
- #define __ardour_gtk_about_h__
-
--#include <gtkmm/aboutdialog.h>
-+#include <gtkmm.h>
-
- class ARDOUR_UI;
-
-diff -up ardour-2.8.16/gtk2_ardour/actions.h~ ardour-2.8.16/gtk2_ardour/actions.h
---- ardour-2.8.16/gtk2_ardour/actions.h~ 2012-03-16 15:33:28.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/actions.h 2013-05-10 12:59:33.883044870 +0200
-@@ -21,11 +21,7 @@
- #define __ardour_gtk_actions_h__
-
- #include <vector>
--#include <gtkmm/action.h>
--#include <gtkmm/radioaction.h>
--#include <gtkmm/toggleaction.h>
--#include <gtkmm/actiongroup.h>
--#include <gtkmm/accelkey.h>
-+#include <gtkmm.h>
-
- #include <ardour/configuration.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/add_route_dialog.h~
ardour-2.8.16/gtk2_ardour/add_route_dialog.h
---- ardour-2.8.16/gtk2_ardour/add_route_dialog.h~ 2009-07-04 19:38:23.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/add_route_dialog.h 2013-05-10 12:59:40.330045369 +0200
-@@ -22,14 +22,7 @@
-
- #include <string>
-
--#include <gtkmm/entry.h>
--#include <gtkmm/dialog.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/radiobutton.h>
--#include <gtkmm/adjustment.h>
--#include <gtkmm/spinbutton.h>
--#include <gtkmm/button.h>
--#include <gtkmm/comboboxtext.h>
-+#include <gtkmm.h>
-
- #include <ardour/types.h>
- #include <ardour/session.h>
-diff -up ardour-2.8.16/gtk2_ardour/analysis_window.h~
ardour-2.8.16/gtk2_ardour/analysis_window.h
---- ardour-2.8.16/gtk2_ardour/analysis_window.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/analysis_window.h 2013-05-10 12:59:58.154046748 +0200
-@@ -20,24 +20,9 @@
- #ifndef __ardour_analysis_window_h__
- #define __ardour_analysis_window_h__
-
--#include <glibmm.h>
--#include <glibmm/refptr.h>
--
--#include <gtkmm/radiobutton.h>
--#include <gtkmm/dialog.h>
--#include <gtkmm/layout.h>
--#include <gtkmm/treeview.h>
--#include <gtkmm/notebook.h>
--#include <gtkmm/label.h>
--#include <gtkmm/liststore.h>
--#include <gtkmm/separator.h>
--#include <gtkmm/window.h>
--
-+#include <gtkmm.h>
- #include <gtkmm2ext/dndtreeview.h>
-
--#include <glibmm/thread.h>
--
--
- #include "ardour_dialog.h"
- #include "fft_graph.h"
- #include "fft_result.h"
-diff -up ardour-2.8.16/gtk2_ardour/ardour_dialog.h~
ardour-2.8.16/gtk2_ardour/ardour_dialog.h
---- ardour-2.8.16/gtk2_ardour/ardour_dialog.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/ardour_dialog.h 2013-05-10 13:00:04.043047204 +0200
-@@ -21,8 +21,7 @@
- #define __ardour_dialog_h__
-
- #include <ardour/ardour.h>
--#include <gtkmm/window.h>
--#include <gtkmm/dialog.h>
-+#include <gtkmm.h>
-
- namespace ARDOUR {
- class Session;
-diff -up ardour-2.8.16/gtk2_ardour/ardour_ui.h~ ardour-2.8.16/gtk2_ardour/ardour_ui.h
---- ardour-2.8.16/gtk2_ardour/ardour_ui.h~ 2013-05-10 12:44:45.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/ardour_ui.h 2013-05-10 13:00:36.859049744 +0200
-@@ -35,24 +35,10 @@
- #include <list>
- #include <cmath>
-
--#include <libgnomecanvasmm/canvas.h>
-+#include <gtkmm.h>
-+#include <libgnomecanvasmm.h>
-
- #include <pbd/xml++.h>
--#include <gtkmm/box.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/label.h>
--#include <gtkmm/table.h>
--#include <gtkmm/fixed.h>
--#include <gtkmm/drawingarea.h>
--#include <gtkmm/eventbox.h>
--#include <gtkmm/menu.h>
--#include <gtkmm/menuitem.h>
--#include <gtkmm/button.h>
--#include <gtkmm/togglebutton.h>
--#include <gtkmm/treeview.h>
--#include <gtkmm/menubar.h>
--#include <gtkmm/textbuffer.h>
--#include <gtkmm/adjustment.h>
- #include <gtkmm2ext/gtk_ui.h>
- #ifdef HOST_NOT_FOUND
- #undef HOST_NOT_FOUND
-diff -up ardour-2.8.16/gtk2_ardour/au_pluginui.h~
ardour-2.8.16/gtk2_ardour/au_pluginui.h
---- ardour-2.8.16/gtk2_ardour/au_pluginui.h~ 2012-07-02 15:21:59.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/au_pluginui.h 2013-05-10 13:00:47.642050578 +0200
-@@ -20,10 +20,7 @@
- #undef require
- #undef verify
-
--#include <gtkmm/box.h>
--#include <gtkmm/combobox.h>
--#include <gtkmm/button.h>
--#include <gtkmm/label.h>
-+#include <gtkmm.h>
-
- #include "plugin_ui.h"
-
-diff -up ardour-2.8.16/gtk2_ardour/audio_clock.h~
ardour-2.8.16/gtk2_ardour/audio_clock.h
---- ardour-2.8.16/gtk2_ardour/audio_clock.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/audio_clock.h 2013-05-10 13:00:56.554051268 +0200
-@@ -20,11 +20,7 @@
- #ifndef __audio_clock_h__
- #define __audio_clock_h__
-
--#include <gtkmm/box.h>
--#include <gtkmm/menu.h>
--#include <gtkmm/eventbox.h>
--#include <gtkmm/label.h>
--#include <gtkmm/frame.h>
-+#include <gtkmm.h>
- #include <ardour/ardour.h>
-
- namespace ARDOUR {
-diff -up ardour-2.8.16/gtk2_ardour/audio_region_editor.h~
ardour-2.8.16/gtk2_ardour/audio_region_editor.h
---- ardour-2.8.16/gtk2_ardour/audio_region_editor.h~ 2009-10-28 19:59:09.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/audio_region_editor.h 2013-05-10 13:01:47.417055205 +0200
-@@ -22,19 +22,7 @@
-
- #include <map>
-
--#include <gtkmm/label.h>
--#include <gtkmm/entry.h>
--#include <gtkmm/box.h>
--#include <gtkmm/togglebutton.h>
--#include <gtkmm/button.h>
--#include <gtkmm/arrow.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/table.h>
--#include <gtkmm/alignment.h>
--#include <gtkmm/adjustment.h>
--#include <gtkmm/separator.h>
--#include <gtkmm/spinbutton.h>
--
-+#include <gtkmm.h>
- #include <libgnomecanvas/libgnomecanvas.h>
- #include <sigc++/signal.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/audio_time_axis.h~
ardour-2.8.16/gtk2_ardour/audio_time_axis.h
---- ardour-2.8.16/gtk2_ardour/audio_time_axis.h~ 2009-08-21 15:47:47.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/audio_time_axis.h 2013-05-10 13:02:02.969056408 +0200
-@@ -20,14 +20,7 @@
- #ifndef __ardour_audio_time_axis_h__
- #define __ardour_audio_time_axis_h__
-
--#include <gtkmm/table.h>
--#include <gtkmm/button.h>
--#include <gtkmm/box.h>
--#include <gtkmm/menu.h>
--#include <gtkmm/menuitem.h>
--#include <gtkmm/radiomenuitem.h>
--#include <gtkmm/checkmenuitem.h>
--
-+#include <gtkmm.h>
- #include <gtkmm2ext/selector.h>
- #include <list>
-
-diff -up ardour-2.8.16/gtk2_ardour/automation_line.h~
ardour-2.8.16/gtk2_ardour/automation_line.h
---- ardour-2.8.16/gtk2_ardour/automation_line.h~ 2010-04-21 17:09:47.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/automation_line.h 2013-05-10 13:02:11.769057090 +0200
-@@ -25,7 +25,7 @@
- #include <string>
- #include <sys/types.h>
-
--#include <libgnomecanvasmm/line.h>
-+#include <libgnomecanvasmm.h>
- #include <sigc++/signal.h>
- #include "canvas.h"
- #include "simplerect.h"
-diff -up ardour-2.8.16/gtk2_ardour/axis_view.h~ ardour-2.8.16/gtk2_ardour/axis_view.h
---- ardour-2.8.16/gtk2_ardour/axis_view.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/axis_view.h 2013-05-10 13:02:19.225057667 +0200
-@@ -22,8 +22,7 @@
-
- #include <list>
-
--#include <gtkmm/label.h>
--#include <gdkmm/color.h>
-+#include <gtkmm.h>
-
- #include <pbd/xml++.h>
- #include "prompter.h"
-diff -up ardour-2.8.16/gtk2_ardour/canvas-noevent-text.h~
ardour-2.8.16/gtk2_ardour/canvas-noevent-text.h
---- ardour-2.8.16/gtk2_ardour/canvas-noevent-text.h~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/canvas-noevent-text.h 2013-05-10 13:02:26.601058237 +0200
-@@ -21,8 +21,7 @@
- #ifndef __gtk2_ardour_canvas_noevent_text_h__
- #define __gtk2_ardour_canvas_noevent_text_h__
-
--#include <libgnomecanvasmm/text.h>
--#include <libgnomecanvasmm/text.h>
-+#include <libgnomecanvasmm.h>
-
- namespace Gnome { namespace Canvas {
-
-diff -up ardour-2.8.16/gtk2_ardour/canvas_impl.h~
ardour-2.8.16/gtk2_ardour/canvas_impl.h
---- ardour-2.8.16/gtk2_ardour/canvas_impl.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/canvas_impl.h 2013-05-10 13:02:33.099058740 +0200
-@@ -22,11 +22,8 @@
-
- #include "canvas.h"
-
--#include <libgnomecanvasmm/canvas.h>
-+#include <libgnomecanvasmm.h>
- #include <libgnomecanvasmm/polygon.h>
--#include <libgnomecanvasmm/text.h>
--#include <libgnomecanvasmm/rect.h>
--#include <libgnomecanvasmm/line.h>
- #include <libgnomecanvasmm/item.h>
-
- using namespace ArdourCanvas;
-diff -up ardour-2.8.16/gtk2_ardour/connection_editor.h~
ardour-2.8.16/gtk2_ardour/connection_editor.h
---- ardour-2.8.16/gtk2_ardour/connection_editor.h~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/connection_editor.h 2013-05-10 13:02:47.865059883 +0200
-@@ -27,19 +27,10 @@ using __gnu_cxx::slist;
- #include <slist.h>
- #endif
-
--#include <gtkmm/box.h>
--#include <gtkmm/window.h>
--#include <gtkmm/scrolledwindow.h>
--#include <gtkmm/button.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/notebook.h>
--#include <gtkmm/treeview.h>
--#include <gtkmm/liststore.h>
-+#include <gtkmm.h>
-
- #include "ardour_dialog.h"
-
--#include <glibmm/thread.h>
--
- namespace ARDOUR {
- class Session;
- class Connection;
-diff -up ardour-2.8.16/gtk2_ardour/crossfade_edit.h~
ardour-2.8.16/gtk2_ardour/crossfade_edit.h
---- ardour-2.8.16/gtk2_ardour/crossfade_edit.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/crossfade_edit.h 2013-05-10 13:02:53.865060348 +0200
-@@ -22,9 +22,7 @@
-
- #include <list>
-
--#include <gtkmm/box.h>
--#include <gtkmm/button.h>
--#include <gtkmm/radiobutton.h>
-+#include <gtkmm.h>
-
- #include <ardour/curve.h>
- #include "ardour_dialog.h"
-diff -up ardour-2.8.16/gtk2_ardour/editor.h~ ardour-2.8.16/gtk2_ardour/editor.h
---- ardour-2.8.16/gtk2_ardour/editor.h~ 2012-03-16 15:33:28.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/editor.h 2013-05-10 13:03:13.241061847 +0200
-@@ -28,16 +28,11 @@
-
- #include <boost/optional.hpp>
-
--#include <libgnomecanvasmm/canvas.h>
--#include <libgnomecanvasmm/group.h>
--#include <libgnomecanvasmm/line.h>
--#include <libgnomecanvasmm/pixbuf.h>
-+#include <gtkmm.h>
-+#include <libgnomecanvasmm.h>
-
- #include <cmath>
-
--#include <gtkmm/layout.h>
--#include <gtkmm/comboboxtext.h>
--
- #include <gtkmm2ext/selector.h>
- #include <gtkmm2ext/click_box.h>
- #include <gtkmm2ext/dndtreeview.h>
-diff -up ardour-2.8.16/gtk2_ardour/engine_dialog.h~
ardour-2.8.16/gtk2_ardour/engine_dialog.h
---- ardour-2.8.16/gtk2_ardour/engine_dialog.h~ 2009-09-17 04:19:04.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/engine_dialog.h 2013-05-10 13:03:22.281062547 +0200
-@@ -5,15 +5,7 @@
- #include <vector>
- #include <string>
-
--#include <gtkmm/checkbutton.h>
--#include <gtkmm/spinbutton.h>
--#include <gtkmm/notebook.h>
--#include <gtkmm/comboboxtext.h>
--#include <gtkmm/table.h>
--#include <gtkmm/expander.h>
--#include <gtkmm/box.h>
--#include <gtkmm/buttonbox.h>
--#include <gtkmm/button.h>
-+#include <gtkmm.h>
-
- class EngineControl : public Gtk::VBox {
- public:
-diff -up ardour-2.8.16/gtk2_ardour/fft_graph.h~ ardour-2.8.16/gtk2_ardour/fft_graph.h
---- ardour-2.8.16/gtk2_ardour/fft_graph.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/fft_graph.h 2013-05-10 13:03:30.601063191 +0200
-@@ -23,11 +23,7 @@
- #include <ardour/types.h>
- #include <fftw3.h>
-
--#include <gtkmm/drawingarea.h>
--#include <gtkmm/treemodel.h>
--#include <gdkmm/color.h>
--
--#include <glibmm/refptr.h>
-+#include <gtkmm.h>
-
- #include <string>
-
-diff -up ardour-2.8.16/gtk2_ardour/fft_result.h~ ardour-2.8.16/gtk2_ardour/fft_result.h
---- ardour-2.8.16/gtk2_ardour/fft_result.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/fft_result.h 2013-05-10 13:03:36.985063685 +0200
-@@ -24,7 +24,7 @@
- #include <ardour/types.h>
- #include <fftw3.h>
-
--#include <gdkmm/color.h>
-+#include <gtkmm.h>
-
- #include <string>
-
-diff -up ardour-2.8.16/gtk2_ardour/gain_meter.h~ ardour-2.8.16/gtk2_ardour/gain_meter.h
---- ardour-2.8.16/gtk2_ardour/gain_meter.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/gain_meter.h 2013-05-10 13:03:43.656064201 +0200
-@@ -23,13 +23,7 @@
- #include <vector>
- #include <map>
-
--#include <gtkmm/box.h>
--#include <gtkmm/adjustment.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/eventbox.h>
--#include <gtkmm/button.h>
--#include <gtkmm/table.h>
--#include <gtkmm/drawingarea.h>
-+#include <gtkmm.h>
-
- #include <ardour/types.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/imageframe.h~ ardour-2.8.16/gtk2_ardour/imageframe.h
---- ardour-2.8.16/gtk2_ardour/imageframe.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/imageframe.h 2013-05-10 13:03:49.352064642 +0200
-@@ -27,8 +27,8 @@
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-+#include <libgnomecanvasmm.h>
- #include <libgnomecanvasmm/item.h>
--#include <libgnomecanvasmm/group.h>
- #include <libgnomecanvasmm/shape.h>
- #include "canvas-imageframe.h"
-
-diff -up ardour-2.8.16/gtk2_ardour/imageframe_p.h~
ardour-2.8.16/gtk2_ardour/imageframe_p.h
---- ardour-2.8.16/gtk2_ardour/imageframe_p.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/imageframe_p.h 2013-05-10 13:03:53.977065000 +0200
-@@ -21,7 +21,7 @@
- #ifndef _LIBGNOMECANVASMM_IMAGEFRAME_P_H
- #define _LIBGNOMECANVASMM_IMAGEFRAME_P_H
-
--#include <glibmm/class.h>
-+#include <glibmm.h>
-
- namespace Gnome
- {
-diff -up ardour-2.8.16/gtk2_ardour/imageframe_time_axis_group.h~
ardour-2.8.16/gtk2_ardour/imageframe_time_axis_group.h
---- ardour-2.8.16/gtk2_ardour/imageframe_time_axis_group.h~ 2009-02-24 13:37:42.000000000
+0100
-+++ ardour-2.8.16/gtk2_ardour/imageframe_time_axis_group.h 2013-05-10 13:04:07.241066027
+0200
-@@ -23,7 +23,7 @@
- #include <list>
- #include <cmath>
-
--#include <gdkmm/color.h>
-+#include <gtkmm.h>
-
- #include <libgnomecanvas/libgnomecanvas.h>
- #include <jack/jack.h>
-diff -up ardour-2.8.16/gtk2_ardour/imageframe_time_axis_view.h~
ardour-2.8.16/gtk2_ardour/imageframe_time_axis_view.h
---- ardour-2.8.16/gtk2_ardour/imageframe_time_axis_view.h~ 2009-02-24 13:37:42.000000000
+0100
-+++ ardour-2.8.16/gtk2_ardour/imageframe_time_axis_view.h 2013-05-10 13:04:12.217066412
+0200
-@@ -23,7 +23,7 @@
- #include <list>
- #include <cmath>
-
--#include <gdkmm/color.h>
-+#include <gtkmm.h>
-
- #include <jack/jack.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/imageframe_view.h~
ardour-2.8.16/gtk2_ardour/imageframe_view.h
---- ardour-2.8.16/gtk2_ardour/imageframe_view.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/imageframe_view.h 2013-05-10 13:04:44.872068939 +0200
-@@ -21,7 +21,7 @@
- #define __gtk_ardour_imageframe_view_h__
-
- #include <string>
--#include <gdkmm/color.h>
-+#include <gtkmm.h>
- #include <libgnomecanvas/libgnomecanvas.h>
- #include <sigc++/signal.h>
- #include <list>
-diff -up ardour-2.8.16/gtk2_ardour/io_selector.h~
ardour-2.8.16/gtk2_ardour/io_selector.h
---- ardour-2.8.16/gtk2_ardour/io_selector.h~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/io_selector.h 2013-05-10 13:04:54.472069682 +0200
-@@ -29,16 +29,7 @@ using __gnu_cxx::slist;
-
- #include <string>
-
--#include <glibmm/thread.h>
--
--#include <gtkmm/box.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/button.h>
--#include <gtkmm/togglebutton.h>
--#include <gtkmm/scrolledwindow.h>
--#include <gtkmm/notebook.h>
--#include <gtkmm/treeview.h>
--#include <gtkmm/liststore.h>
-+#include <gtkmm.h>
-
- #include <ardour_dialog.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/keyboard.h~ ardour-2.8.16/gtk2_ardour/keyboard.h
---- ardour-2.8.16/gtk2_ardour/keyboard.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/keyboard.h 2013-05-10 13:05:41.912073354 +0200
-@@ -26,8 +26,7 @@
-
- #include <sigc++/signal.h>
- #include <gtk/gtk.h>
--#include <gtkmm/window.h>
--#include <gtkmm/accelkey.h>
-+#include <gtkmm.h>
-
- #include <ardour/types.h>
- #include <pbd/stateful.h>
-diff -up ardour-2.8.16/gtk2_ardour/keyeditor.h~ ardour-2.8.16/gtk2_ardour/keyeditor.h
---- ardour-2.8.16/gtk2_ardour/keyeditor.h~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/keyeditor.h 2013-05-10 13:06:25.832076753 +0200
-@@ -3,10 +3,7 @@
-
- #include <string>
-
--#include <gtkmm/buttonbox.h>
--#include <gtkmm/treeview.h>
--#include <gtkmm/treestore.h>
--#include <gtkmm/scrolledwindow.h>
-+#include <gtkmm.h>
-
- #include "ardour_dialog.h"
-
-diff -up ardour-2.8.16/gtk2_ardour/level_meter.h~
ardour-2.8.16/gtk2_ardour/level_meter.h
---- ardour-2.8.16/gtk2_ardour/level_meter.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/level_meter.h 2013-05-10 13:06:33.047077312 +0200
-@@ -23,13 +23,7 @@
- #include <vector>
- #include <map>
-
--#include <gtkmm/box.h>
--#include <gtkmm/adjustment.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/eventbox.h>
--#include <gtkmm/button.h>
--#include <gtkmm/table.h>
--#include <gtkmm/drawingarea.h>
-+#include <gtkmm.h>
-
- #include <ardour/types.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/location_ui.h~
ardour-2.8.16/gtk2_ardour/location_ui.h
---- ardour-2.8.16/gtk2_ardour/location_ui.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/location_ui.h 2013-05-10 13:06:39.544077815 +0200
-@@ -20,12 +20,7 @@
- #ifndef __ardour_location_ui_h__
- #define __ardour_location_ui_h__
-
--#include <gtkmm/box.h>
--#include <gtkmm/checkbutton.h>
--#include <gtkmm/button.h>
--#include <gtkmm/table.h>
--#include <gtkmm/entry.h>
--#include <gtkmm/label.h>
-+#include <gtkmm.h>
-
- #include <ardour/location.h>
- #include <ardour/session.h>
-diff -up ardour-2.8.16/gtk2_ardour/lv2_plugin_ui.h~
ardour-2.8.16/gtk2_ardour/lv2_plugin_ui.h
---- ardour-2.8.16/gtk2_ardour/lv2_plugin_ui.h~ 2012-02-27 16:03:44.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/lv2_plugin_ui.h 2013-05-10 13:06:45.000078237 +0200
-@@ -26,7 +26,7 @@
- #include <list>
-
- #include <sigc++/signal.h>
--#include <gtkmm/widget.h>
-+#include <gtkmm.h>
-
- #include <ardour_dialog.h>
- #include <ardour/types.h>
-diff -up ardour-2.8.16/gtk2_ardour/marker.h~ ardour-2.8.16/gtk2_ardour/marker.h
---- ardour-2.8.16/gtk2_ardour/marker.h~ 2010-06-02 17:55:17.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/marker.h 2013-05-10 13:06:50.200078639 +0200
-@@ -25,7 +25,7 @@
- #include <ardour/ardour.h>
- #include <pbd/destructible.h>
-
--#include <libgnomecanvasmm/pixbuf.h>
-+#include <libgnomecanvasmm.h>
-
- #include "canvas.h"
-
-diff -up ardour-2.8.16/gtk2_ardour/marker_time_axis_view.h~
ardour-2.8.16/gtk2_ardour/marker_time_axis_view.h
---- ardour-2.8.16/gtk2_ardour/marker_time_axis_view.h~ 2009-02-24 13:37:42.000000000
+0100
-+++ ardour-2.8.16/gtk2_ardour/marker_time_axis_view.h 2013-05-10 13:06:59.879079389
+0200
-@@ -21,8 +21,8 @@
- #define __ardour_marker_time_axis_view_h__
-
- #include <list>
--#include <gdkmm/color.h>
--#include <libgnomecanvasmm/group.h>
-+#include <gtkmm.h>
-+#include <libgnomecanvasmm.h>
-
- #include <ardour/location.h>
- #include "simplerect.h"
-diff -up ardour-2.8.16/gtk2_ardour/midi_port_dialog.h~
ardour-2.8.16/gtk2_ardour/midi_port_dialog.h
---- ardour-2.8.16/gtk2_ardour/midi_port_dialog.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/midi_port_dialog.h 2013-05-10 13:07:06.503079901 +0200
-@@ -1,7 +1,4 @@
--#include <gtkmm/box.h>
--#include <gtkmm/label.h>
--#include <gtkmm/entry.h>
--#include <gtkmm/comboboxtext.h>
-+#include <gtkmm.h>
-
- #include "ardour_dialog.h"
-
-diff -up ardour-2.8.16/gtk2_ardour/mixer_strip.h~
ardour-2.8.16/gtk2_ardour/mixer_strip.h
---- ardour-2.8.16/gtk2_ardour/mixer_strip.h~ 2009-10-01 19:15:47.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/mixer_strip.h 2013-05-10 13:07:16.120080646 +0200
-@@ -23,17 +23,7 @@
-
- #include <cmath>
-
--#include <gtkmm/eventbox.h>
--#include <gtkmm/button.h>
--#include <gtkmm/box.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/button.h>
--#include <gtkmm/label.h>
--#include <gtkmm/togglebutton.h>
--#include <gtkmm/menu.h>
--#include <gtkmm/textview.h>
--#include <gtkmm/adjustment.h>
--
-+#include <gtkmm.h>
- #include <gtkmm2ext/auto_spin.h>
- #include <gtkmm2ext/click_box.h>
- #include <gtkmm2ext/slider_controller.h>
-diff -up ardour-2.8.16/gtk2_ardour/mixer_ui.h~ ardour-2.8.16/gtk2_ardour/mixer_ui.h
---- ardour-2.8.16/gtk2_ardour/mixer_ui.h~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/mixer_ui.h 2013-05-10 13:07:22.855081167 +0200
-@@ -22,15 +22,7 @@
-
- #include <list>
-
--#include <gtkmm/box.h>
--#include <gtkmm/scrolledwindow.h>
--#include <gtkmm/eventbox.h>
--#include <gtkmm/label.h>
--#include <gtkmm/button.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/paned.h>
--#include <gtkmm/menu.h>
--#include <gtkmm/treeview.h>
-+#include <gtkmm.h>
-
- #include <pbd/stateful.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/nag.h~ ardour-2.8.16/gtk2_ardour/nag.h
---- ardour-2.8.16/gtk2_ardour/nag.h~ 2009-06-04 16:36:00.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/nag.h 2013-05-10 13:07:30.423081753 +0200
-@@ -3,9 +3,7 @@
-
- #include "ardour_dialog.h"
-
--#include <gtkmm/label.h>
--#include <gtkmm/radiobutton.h>
--#include <gtkmm/buttonbox.h>
-+#include <gtkmm.h>
-
- class NagScreen : public ArdourDialog
- {
-diff -up ardour-2.8.16/gtk2_ardour/new_session_dialog.h~
ardour-2.8.16/gtk2_ardour/new_session_dialog.h
---- ardour-2.8.16/gtk2_ardour/new_session_dialog.h~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/new_session_dialog.h 2013-05-10 13:07:56.743083790 +0200
-@@ -23,20 +23,10 @@
- #define NEW_SESSION_DIALOG_H
-
- #include <string>
--#include <gtkmm/treeview.h>
--#include <gtkmm/treestore.h>
--#include <gtkmm/treepath.h>
--#include <gtkmm/scrolledwindow.h>
--#include <gtkmm/notebook.h>
--#include <gtkmm/table.h>
--#include <gtkmm/alignment.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/expander.h>
-+#include <gtkmm.h>
-
- #include <ardour/utils.h>
-
--#include <glibmm/refptr.h>
--
- #include "ardour_dialog.h"
- #include "engine_dialog.h"
-
-diff -up ardour-2.8.16/gtk2_ardour/option_editor.h~
ardour-2.8.16/gtk2_ardour/option_editor.h
---- ardour-2.8.16/gtk2_ardour/option_editor.h~ 2009-03-13 13:35:02.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/option_editor.h 2013-05-10 13:08:04.135084362 +0200
-@@ -22,17 +22,7 @@
-
- #include <vector>
-
--#include <gtkmm/notebook.h>
--#include <gtkmm/checkbutton.h>
--#include <gtkmm/table.h>
--#include <gtkmm/entry.h>
--#include <gtkmm/box.h>
--#include <gtkmm/label.h>
--#include <gtkmm/adjustment.h>
--#include <gtkmm/scale.h>
--#include <gtkmm/spinbutton.h>
--#include <gtkmm/radiobutton.h>
--#include <gtkmm/comboboxtext.h>
-+#include <gtkmm.h>
-
- #include <ardour/session.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/pan_automation_time_axis.h~
ardour-2.8.16/gtk2_ardour/pan_automation_time_axis.h
---- ardour-2.8.16/gtk2_ardour/pan_automation_time_axis.h~ 2009-02-24 13:37:42.000000000
+0100
-+++ ardour-2.8.16/gtk2_ardour/pan_automation_time_axis.h 2013-05-10 13:08:07.751084642
+0200
-@@ -23,7 +23,7 @@
- #include "canvas.h"
- #include "automation_time_axis.h"
-
--#include <gtkmm/comboboxtext.h>
-+#include <gtkmm.h>
-
- namespace ARDOUR {
- class Redirect;
-diff -up ardour-2.8.16/gtk2_ardour/panner2d.h~ ardour-2.8.16/gtk2_ardour/panner2d.h
---- ardour-2.8.16/gtk2_ardour/panner2d.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/panner2d.h 2013-05-10 13:08:14.919085196 +0200
-@@ -24,8 +24,7 @@
- #include <map>
- #include <string>
-
--#include <glibmm/refptr.h>
--#include <gtkmm/drawingarea.h>
-+#include <gtkmm.h>
-
- using std::map;
- using std::string;
-diff -up ardour-2.8.16/gtk2_ardour/panner_ui.h~ ardour-2.8.16/gtk2_ardour/panner_ui.h
---- ardour-2.8.16/gtk2_ardour/panner_ui.h~ 2009-04-29 15:53:50.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/panner_ui.h 2013-05-10 13:08:21.623085715 +0200
-@@ -22,13 +22,7 @@
-
- #include <vector>
-
--#include <gtkmm/box.h>
--#include <gtkmm/adjustment.h>
--#include <gtkmm/viewport.h>
--#include <gtkmm/eventbox.h>
--#include <gtkmm/arrow.h>
--#include <gtkmm/togglebutton.h>
--#include <gtkmm/button.h>
-+#include <gtkmm.h>
-
- #include <gtkmm2ext/click_box.h>
- #include <gtkmm2ext/slider_controller.h>
-diff -up ardour-2.8.16/gtk2_ardour/playlist_selector.h~
ardour-2.8.16/gtk2_ardour/playlist_selector.h
---- ardour-2.8.16/gtk2_ardour/playlist_selector.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/playlist_selector.h 2013-05-10 13:08:27.767086191 +0200
-@@ -22,10 +22,7 @@
-
- #include <boost/shared_ptr.hpp>
-
--#include <gtkmm/box.h>
--#include <gtkmm/scrolledwindow.h>
--#include <gtkmm/button.h>
--#include <gtkmm/treeview.h>
-+#include <gtkmm.h>
- #include <gtkmm2ext/selector.h>
-
- #include <ardour_dialog.h>
-diff -up ardour-2.8.16/gtk2_ardour/plugin_selector.h~
ardour-2.8.16/gtk2_ardour/plugin_selector.h
---- ardour-2.8.16/gtk2_ardour/plugin_selector.h~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/plugin_selector.h 2013-05-10 13:08:36.743086886 +0200
-@@ -20,9 +20,7 @@
- #ifndef __ardour_plugin_selector_h__
- #define __ardour_plugin_selector_h__
-
--#include <gtkmm/dialog.h>
--#include <gtkmm/notebook.h>
--#include <gtkmm/treeview.h>
-+#include <gtkmm.h>
- #include <gtkmm2ext/selector.h>
-
- #include <ardour/plugin.h>
-diff -up ardour-2.8.16/gtk2_ardour/plugin_ui.h~ ardour-2.8.16/gtk2_ardour/plugin_ui.h
---- ardour-2.8.16/gtk2_ardour/plugin_ui.h~ 2012-06-18 21:49:14.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/plugin_ui.h 2013-05-10 13:08:49.831087899 +0200
-@@ -26,22 +26,7 @@
-
- #include <sigc++/signal.h>
-
--#include <gtkmm/button.h>
--#include <gtkmm/box.h>
--#include <gtkmm/table.h>
--#include <gtkmm/eventbox.h>
--#include <gtkmm/viewport.h>
--#include <gtkmm/scrolledwindow.h>
--#include <gtkmm/label.h>
--#include <gtkmm/menu.h>
--#include <gtkmm/image.h>
--#include <gtkmm/adjustment.h>
--#include <gtkmm/togglebutton.h>
--#include <gtkmm/socket.h>
--#include <gtkmm/combobox.h>
--#include <gtkmm/liststore.h>
--#include <gtkmm/comboboxtext.h>
--#include <gtkmm/socket.h>
-+#include <gtkmm.h>
-
- #include <ardour_dialog.h>
- #include <ardour/types.h>
-diff -up ardour-2.8.16/gtk2_ardour/public_editor.h~
ardour-2.8.16/gtk2_ardour/public_editor.h
---- ardour-2.8.16/gtk2_ardour/public_editor.h~ 2012-03-16 15:33:28.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/public_editor.h 2013-05-10 13:09:04.791089056 +0200
-@@ -25,9 +25,7 @@
- #include <string>
- #include <glib.h>
- #include <gdk/gdktypes.h>
--#include <gtkmm/window.h>
--#include <gtkmm/box.h>
--#include <gtkmm/actiongroup.h>
-+#include <gtkmm.h>
- #include <jack/types.h>
- #include <sigc++/signal.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/redirect_box.h~
ardour-2.8.16/gtk2_ardour/redirect_box.h
---- ardour-2.8.16/gtk2_ardour/redirect_box.h~ 2009-03-07 14:28:24.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/redirect_box.h 2013-05-10 13:09:16.439089958 +0200
-@@ -23,10 +23,7 @@
- #include <vector>
-
- #include <cmath>
--#include <gtkmm/box.h>
--#include <gtkmm/eventbox.h>
--#include <gtkmm/menu.h>
--#include <gtkmm/scrolledwindow.h>
-+#include <gtkmm.h>
- #include <gtkmm2ext/dndtreeview.h>
- #include <gtkmm2ext/auto_spin.h>
- #include <gtkmm2ext/click_box.h>
-diff -up ardour-2.8.16/gtk2_ardour/region_layering_order_editor.h~
ardour-2.8.16/gtk2_ardour/region_layering_order_editor.h
---- ardour-2.8.16/gtk2_ardour/region_layering_order_editor.h~ 2009-11-13
15:30:20.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/region_layering_order_editor.h 2013-05-10
13:09:23.383090495 +0200
-@@ -1,10 +1,7 @@
- #ifndef __gtk2_ardour_region_layering_order_editor_h__
- #define __gtk2_ardour_region_layering_order_editor_h__
-
--#include <gtkmm/dialog.h>
--#include <gtkmm/liststore.h>
--#include <gtkmm/treeview.h>
--#include <gtkmm/scrolledwindow.h>
-+#include <gtkmm.h>
-
- #include <ardour/region.h>
- #include <ardour/playlist.h>
-diff -up ardour-2.8.16/gtk2_ardour/rhythm_ferret.h~
ardour-2.8.16/gtk2_ardour/rhythm_ferret.h
---- ardour-2.8.16/gtk2_ardour/rhythm_ferret.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/rhythm_ferret.h 2013-05-10 13:09:34.678091370 +0200
-@@ -1,16 +1,7 @@
- #ifndef __gtk2_ardour_rhythm_ferret_h__
- #define __gtk2_ardour_rhythm_ferret_h__
-
--#include <gtkmm/box.h>
--#include <gtkmm/scale.h>
--#include <gtkmm/spinbutton.h>
--#include <gtkmm/radiobutton.h>
--#include <gtkmm/radiobuttongroup.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/image.h>
--#include <gtkmm/comboboxtext.h>
--#include <gtkmm/button.h>
--#include <gtkmm/label.h>
-+#include <gtkmm.h>
-
- #include "ardour_dialog.h"
-
-diff -up ardour-2.8.16/gtk2_ardour/route_params_ui.h~
ardour-2.8.16/gtk2_ardour/route_params_ui.h
---- ardour-2.8.16/gtk2_ardour/route_params_ui.h~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/route_params_ui.h 2013-05-10 13:09:41.350091886 +0200
-@@ -22,15 +22,7 @@
-
- #include <list>
-
--#include <gtkmm/box.h>
--#include <gtkmm/button.h>
--#include <gtkmm/eventbox.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/label.h>
--#include <gtkmm/paned.h>
--#include <gtkmm/scrolledwindow.h>
--#include <gtkmm/togglebutton.h>
--#include <gtkmm/treeview.h>
-+#include <gtkmm.h>
-
- #include <pbd/stateful.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/route_time_axis.h~
ardour-2.8.16/gtk2_ardour/route_time_axis.h
---- ardour-2.8.16/gtk2_ardour/route_time_axis.h~ 2009-06-26 19:00:42.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/route_time_axis.h 2013-05-10 13:09:50.150092567 +0200
-@@ -20,15 +20,7 @@
- #ifndef __ardour_route_time_axis_h__
- #define __ardour_route_time_axis_h__
-
--#include <gtkmm/table.h>
--#include <gtkmm/button.h>
--#include <gtkmm/box.h>
--#include <gtkmm/menu.h>
--#include <gtkmm/menuitem.h>
--#include <gtkmm/radiomenuitem.h>
--#include <gtkmm/checkmenuitem.h>
--#include <gtkmm/adjustment.h>
--
-+#include <gtkmm.h>
- #include <gtkmm2ext/selector.h>
- #include <gtkmm2ext/slider_controller.h>
- #include <list>
-diff -up ardour-2.8.16/gtk2_ardour/sfdb_freesound_mootcher.h~
ardour-2.8.16/gtk2_ardour/sfdb_freesound_mootcher.h
---- ardour-2.8.16/gtk2_ardour/sfdb_freesound_mootcher.h~ 2012-07-02 15:21:59.000000000
+0200
-+++ ardour-2.8.16/gtk2_ardour/sfdb_freesound_mootcher.h 2013-05-10 13:09:55.862093009
+0200
-@@ -20,7 +20,7 @@
- #include <string>
- #include <sstream>
- #include <vector>
--#include <gtkmm/progressbar.h>
-+#include <gtkmm.h>
- //#include <ctime>
-
- #include "sfdb_ui.h"
-diff -up ardour-2.8.16/gtk2_ardour/sfdb_ui.h~ ardour-2.8.16/gtk2_ardour/sfdb_ui.h
---- ardour-2.8.16/gtk2_ardour/sfdb_ui.h~ 2012-07-02 15:21:59.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/sfdb_ui.h 2013-05-10 13:10:02.406093516 +0200
-@@ -26,20 +26,7 @@
-
- #include <sigc++/signal.h>
-
--#include <gtkmm/box.h>
--#include <gtkmm/button.h>
--#include <gtkmm/checkbutton.h>
--#include <gtkmm/comboboxtext.h>
--#include <gtkmm/dialog.h>
--#include <gtkmm/entry.h>
--#include <gtkmm/filechooserwidget.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/label.h>
--#include <gtkmm/table.h>
--#include <gtkmm/liststore.h>
--#include <gtkmm/textview.h>
--#include <gtkmm/spinbutton.h>
--#include <gtkmm/notebook.h>
-+#include <gtkmm.h>
-
- #include <ardour/session.h>
- #include <ardour/audiofilesource.h>
-diff -up ardour-2.8.16/gtk2_ardour/simpleline.h~ ardour-2.8.16/gtk2_ardour/simpleline.h
---- ardour-2.8.16/gtk2_ardour/simpleline.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/simpleline.h 2013-05-10 13:10:12.934094331 +0200
-@@ -27,6 +27,7 @@
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-+#include <libgnomecanvasmm.h>
- #include <libgnomecanvasmm/item.h>
- #include <libgnomecanvas/gnome-canvas-util.h>
- #include <libgnomecanvas/libgnomecanvas.h>
-diff -up ardour-2.8.16/gtk2_ardour/simpleline_p.h~
ardour-2.8.16/gtk2_ardour/simpleline_p.h
---- ardour-2.8.16/gtk2_ardour/simpleline_p.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/simpleline_p.h 2013-05-10 13:10:21.750095013 +0200
-@@ -22,7 +22,7 @@
- #define _LIBGNOMECANVASMM_SIMPLELINE_P_H
- #include <libgnomecanvasmm/private/item_p.h>
-
--#include <glibmm/class.h>
-+#include <glibmm.h>
-
- namespace Gnome
- {
-diff -up ardour-2.8.16/gtk2_ardour/simplerect.h~ ardour-2.8.16/gtk2_ardour/simplerect.h
---- ardour-2.8.16/gtk2_ardour/simplerect.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/simplerect.h 2013-05-10 13:10:29.190095589 +0200
-@@ -27,9 +27,8 @@
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-+#include <libgnomecanvasmm.h>
- #include <libgnomecanvasmm/item.h>
--#include <libgnomecanvasmm/group.h>
--#include <libgnomecanvasmm/shape.h>
- #include "canvas-simplerect.h"
-
-
-diff -up ardour-2.8.16/gtk2_ardour/simplerect_p.h~
ardour-2.8.16/gtk2_ardour/simplerect_p.h
---- ardour-2.8.16/gtk2_ardour/simplerect_p.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/simplerect_p.h 2013-05-10 13:10:33.654095934 +0200
-@@ -21,7 +21,7 @@
- #ifndef _LIBGNOMECANVASMM_SIMPLERECT_P_H
- #define _LIBGNOMECANVASMM_SIMPLERECT_P_H
-
--#include <glibmm/class.h>
-+#include <glibmm.h>
-
- namespace Gnome
- {
-diff -up ardour-2.8.16/gtk2_ardour/splash.h~ ardour-2.8.16/gtk2_ardour/splash.h
---- ardour-2.8.16/gtk2_ardour/splash.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/splash.h 2013-05-10 13:10:41.782096563 +0200
-@@ -20,11 +20,7 @@
- #ifndef __ardour_gtk_splash_h__
- #define __ardour_gtk_splash_h__
-
--#include <gtkmm/window.h>
--#include <gtkmm/drawingarea.h>
--#include <gtkmm/box.h>
--#include <gtkmm/label.h>
--#include <gdkmm/pixbuf.h>
-+#include <gtkmm.h>
-
- class ARDOUR_UI;
-
-diff -up ardour-2.8.16/gtk2_ardour/tempo_dialog.h~
ardour-2.8.16/gtk2_ardour/tempo_dialog.h
---- ardour-2.8.16/gtk2_ardour/tempo_dialog.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/tempo_dialog.h 2013-05-10 13:10:50.070097205 +0200
-@@ -20,15 +20,7 @@
- #ifndef __ardour_gtk_tempo_dialog_h__
- #define __ardour_gtk_tempo_dialog_h__
-
--#include <gtkmm/entry.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/box.h>
--#include <gtkmm/button.h>
--#include <gtkmm/label.h>
--#include <gtkmm/table.h>
--#include <gtkmm/entry.h>
--#include <gtkmm/spinbutton.h>
--#include <gtkmm/comboboxtext.h>
-+#include <gtkmm.h>
-
- #include <ardour/types.h>
- #include <ardour/tempo.h>
-diff -up ardour-2.8.16/gtk2_ardour/theme_manager.h~
ardour-2.8.16/gtk2_ardour/theme_manager.h
---- ardour-2.8.16/gtk2_ardour/theme_manager.h~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/theme_manager.h 2013-05-10 13:10:59.014097897 +0200
-@@ -20,13 +20,7 @@
- #ifndef __ardour_gtk_color_manager_h__
- #define __ardour_gtk_color_manager_h__
-
--#include <gtkmm/treeview.h>
--#include <gtkmm/liststore.h>
--#include <gtkmm/scrolledwindow.h>
--#include <gtkmm/colorselection.h>
--#include <gtkmm/radiobutton.h>
--#include <gtkmm/button.h>
--#include <gtkmm/rc.h>
-+#include <gtkmm.h>
- #include "ardour_dialog.h"
- #include "ui_config.h"
-
-diff -up ardour-2.8.16/gtk2_ardour/time_axis_view.h~
ardour-2.8.16/gtk2_ardour/time_axis_view.h
---- ardour-2.8.16/gtk2_ardour/time_axis_view.h~ 2010-05-21 17:15:17.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/time_axis_view.h 2013-05-10 13:11:13.398099010 +0200
-@@ -23,14 +23,7 @@
- #include <vector>
- #include <list>
-
--#include <gtkmm/box.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/drawingarea.h>
--#include <gtkmm/eventbox.h>
--#include <gtkmm/table.h>
--#include <gtkmm/entry.h>
--#include <gtkmm/label.h>
--
-+#include <gtkmm.h>
- #include <gtkmm2ext/focus_entry.h>
-
- #include <pbd/stateful.h>
-diff -up ardour-2.8.16/gtk2_ardour/time_axis_view_item.h~
ardour-2.8.16/gtk2_ardour/time_axis_view_item.h
---- ardour-2.8.16/gtk2_ardour/time_axis_view_item.h~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/time_axis_view_item.h 2013-05-10 13:11:17.798099351 +0200
-@@ -23,7 +23,7 @@
- #include <jack/jack.h>
- #include <string>
-
--#include <libgnomecanvasmm/pixbuf.h>
-+#include <libgnomecanvasmm.h>
-
- #include "selectable.h"
- #include "simplerect.h"
-diff -up ardour-2.8.16/gtk2_ardour/utils.h~ ardour-2.8.16/gtk2_ardour/utils.h
---- ardour-2.8.16/gtk2_ardour/utils.h~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/utils.h 2013-05-10 13:11:28.934100213 +0200
-@@ -24,8 +24,8 @@
- #include <cmath>
- #include <vector>
- #include <ardour/types.h>
--#include <libgnomecanvasmm/line.h>
--#include <gdkmm/types.h>
-+#include <gtkmm.h>
-+#include <libgnomecanvasmm.h>
-
- #include "canvas.h"
- #include "public_editor.h"
-diff -up ardour-2.8.16/gtk2_ardour/visual_time_axis.h~
ardour-2.8.16/gtk2_ardour/visual_time_axis.h
---- ardour-2.8.16/gtk2_ardour/visual_time_axis.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/visual_time_axis.h 2013-05-10 13:11:35.062100687 +0200
-@@ -20,9 +20,7 @@
- #ifndef __ardour_visual_time_axis_h__
- #define __ardour_visual_time_axis_h__
-
--#include <gtkmm/box.h>
--#include <gtkmm/button.h>
--
-+#include <gtkmm.h>
- #include <gtkmm2ext/selector.h>
-
- #include "ardour_dialog.h"
-diff -up ardour-2.8.16/gtk2_ardour/waveview.h~ ardour-2.8.16/gtk2_ardour/waveview.h
---- ardour-2.8.16/gtk2_ardour/waveview.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/waveview.h 2013-05-10 13:11:56.822102371 +0200
-@@ -27,6 +27,7 @@
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-+#include <libgnomecanvasmm.h>
- #include <libgnomecanvasmm/item.h>
- #include "canvas-waveview.h"
- #include <libgnomecanvas/gnome-canvas-util.h>
-diff -up ardour-2.8.16/gtk2_ardour/waveview_p.h~ ardour-2.8.16/gtk2_ardour/waveview_p.h
---- ardour-2.8.16/gtk2_ardour/waveview_p.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/waveview_p.h 2013-05-10 13:12:06.613103129 +0200
-@@ -22,7 +22,7 @@
- #define _LIBGNOMECANVASMM_WAVEVIEW_P_H
-
- #include <libgnomecanvasmm/private/item_p.h>
--#include <glibmm/class.h>
-+#include <glibmm.h>
-
- namespace Gnome
- {
diff --git a/ardour-lilv016fix.patch b/ardour-lilv016fix.patch
deleted file mode 100644
index 2f4545b..0000000
--- a/ardour-lilv016fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -rupN ardour-2.8.16.old/libs/ardour/ardour/lv2_plugin.h
ardour-2.8.16/libs/ardour/ardour/lv2_plugin.h
---- ardour-2.8.16.old/libs/ardour/ardour/lv2_plugin.h 2012-04-19 14:51:59.000000000
-0400
-+++ ardour-2.8.16/libs/ardour/ardour/lv2_plugin.h 2013-08-03 16:18:15.556223746 -0400
-@@ -154,7 +154,7 @@ class LV2Plugin : public ARDOUR::Plugin
- /** Find the LV2 input port with the given designation.
- * If found, bufptrs[port_index] will be set to bufptr.
- */
-- LilvPort* designated_input (const char* uri, void** bufptrs[], void** bufptr);
-+ const LilvPort* designated_input (const char* uri, void** bufptrs[], void** bufptr);
- };
-
-
-diff -rupN ardour-2.8.16.old/libs/ardour/lv2_plugin.cc
ardour-2.8.16/libs/ardour/lv2_plugin.cc
---- ardour-2.8.16.old/libs/ardour/lv2_plugin.cc 2012-04-19 14:51:59.000000000 -0400
-+++ ardour-2.8.16/libs/ardour/lv2_plugin.cc 2013-08-03 16:17:03.564508732 -0400
-@@ -644,10 +644,10 @@ LV2Plugin::latency_compute_run ()
- deactivate ();
- }
-
--LilvPort*
-+const LilvPort*
- LV2Plugin::designated_input (const char* uri, void** bufptrs[], void** bufptr)
- {
-- LilvPort* port = NULL;
-+ const LilvPort* port = NULL;
- #ifdef HAVE_NEW_LILV
- LilvNode* designation = lilv_new_uri(_world.world, uri);
- port = lilv_plugin_get_port_by_designation(
diff --git a/ardour-no-grep-options.patch b/ardour-no-grep-options.patch
deleted file mode 100644
index c6145e5..0000000
--- a/ardour-no-grep-options.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -rupN ardour-2.8.13.old/gtk2_ardour/ardour.sh.in
ardour-2.8.13/gtk2_ardour/ardour.sh.in
---- ardour-2.8.13.old/gtk2_ardour/ardour.sh.in 2012-07-09 22:12:15.834833285 -0400
-+++ ardour-2.8.13/gtk2_ardour/ardour.sh.in 2012-07-09 22:11:45.957934297 -0400
-@@ -1,5 +1,6 @@
- #!/bin/sh
-
-+unset GREP_OPTIONS
- export GTK_PATH=%INSTALL_PREFIX%/%LIBDIR%/ardour2${GTK_PATH:+:$GTK_PATH}
-
- export
LD_LIBRARY_PATH=%INSTALL_PREFIX%/%LIBDIR%/ardour2${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
diff --git a/ardour.sh b/ardour.sh
deleted file mode 100755
index f560328..0000000
--- a/ardour.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-A2DIR=~/.ardour2
-
-if ! test -d $A2DIR; then
- mkdir -p $A2DIR
- touch $A2DIR/ardourver2.2
- touch $A2DIR/ardourver2.5
-else
- if ! test -a $A2DIR/ardourver2.2; then
- if test -a $A2DIR/ardour2_ui.rc; then
- mv -f $A2DIR/ardour2_ui.rc $A2DIR/ardour2_ui.rc.bak
- fi
- if test -a $A2DIR/ardour2_ui.conf; then
- mv -f $A2DIR/ardour2_ui.conf $A2DIR/ardour2_ui.conf.bak
- fi
- if test -a $A2DIR/ardour.bindings; then
- mv -f $A2DIR/ardour.bindings $A2DIR/ardour.bindings.bak
- fi
- touch $A2DIR/ardourver2.2
- fi
- if ! test -a $A2DIR/ardourver2.5; then
- if test -a $A2DIR/ardour.bindings; then
- mv -f $A2DIR/ardour.bindings $A2DIR/ardour.bindings.bak
- fi
- touch $A2DIR/ardourver2.5
- fi
-fi
-
-exec /usr/libexec/ardour2 "$@"
diff --git a/ardour2.spec b/ardour2.spec
deleted file mode 100644
index 02e25ae..0000000
--- a/ardour2.spec
+++ /dev/null
@@ -1,293 +0,0 @@
-Summary: Digital Audio Workstation
-Name: ardour2
-Version: 2.8.16
-Release: 30%{?dist}
-# No more direct links. Download from
-# http://ardour.org/download
-Source: ardour-%{version}.tar.bz2
-Source2: ardour.sh
-Patch0: ardour-SConscript.patch
-# Colored grep output makes the script print errors:
-Patch1: ardour-no-grep-options.patch
-Patch3: ardour-2.5-HOST_NOT_FOUND.patch
-# Filed upstream: http://tracker.ardour.org/view.php?id=5476
-Patch4: ardour-fix-mm-includes.patch
-# lilv-0.16 compatibility. Fixed in trunk
-Patch5: ardour-lilv016fix.patch
-# Need to link various plugins against boost (rhbz#1156179)
-Patch6: 0001-Add-boost-linking-to-tranzport-and-generic-midi-surf.patch
-Patch7: 0002-Add-boost-linking-to-wiimote.patch
-# C++11 needs this
-Patch8: ardour-2.8.16-c++11-namespaces.patch
-Patch9: ardour-2.8.16-c++11-xpm.patch
-Patch10: ardour-2.8.16-c++11-bool-from-pointer.patch
-# libsigc++ >= 2.6 needs this
-Patch11: ardour-2.8.16-libsigc++26.patch
-# aubio >= 0.4.0 needs this
-Patch12: ardour-2.8.16-aubio04.patch
-# include a freely licensed version of dmalloc.c
-# this code is not actually used, but eh.
-# Taken from http://dmalloc.com/releases/ v5.5.2
-Patch13: ardour-2.8.16-free-dmalloc.patch
-# fix to compile with gcc6
-# There are almost certainly other cleanups that could be made here
-# but this code is legacy, so just get it building again.
-Patch14: ardour-2.8.16-gcc6.patch
-# Fix to compile with glibmm 2.50.x
-Patch15: ardour-2.8.16-glibmm250.patch
-# Fix to compile with gcc7
-Patch16: ardour-2.8.16-gcc7.patch
-URL: http://ardour.org
-License: GPLv2+
-Group: Applications/Multimedia
-
-BuildRequires: alsa-lib-devel
-BuildRequires: aubio-devel
-BuildRequires: boost-devel
-BuildRequires: cwiid-devel
-BuildRequires: desktop-file-utils
-BuildRequires: fftw-devel
-BuildRequires: gettext >= 0.11.5
-BuildRequires: gtkmm24-devel >= 2.8
-BuildRequires: jack-audio-connection-kit-devel
-BuildRequires: libcurl-devel
-BuildRequires: libgnomecanvas-devel
-BuildRequires: libgnomecanvasmm26-devel >= 2.12
-BuildRequires: liblo-devel
-BuildRequires: liblrdf-devel >= 0.3.1
-BuildRequires: libsamplerate-devel >= 0.0.13
-BuildRequires: libsndfile-devel >= 1.0.18
-BuildRequires: libtool
-BuildRequires: libusb-devel
-BuildRequires: libxslt-devel
-BuildRequires: lilv-devel
-BuildRequires: pkgconfig
-BuildRequires: scons
-BuildRequires: soundtouch-devel
-BuildRequires: suil-devel
-# For up2date config.guess for new architectures (ie aarch64) support
-BuildRequires: redhat-rpm-config
-
-Requires: hicolor-icon-theme
-
-Obsoletes: ardour < 2.8.16-16
-
-%description
-This package contains the legacy version 2 of Ardour. It is provided as a way
-to work on sessions created by this version. Please use the current version of
-Ardour for new projects.
-
-Ardour is a multichannel hard disk recorder (HDR) and digital audio workstation
-(DAW). It is capable of simultaneously recording 24 or more channels of 32 bit
-audio at 48kHz.
-
-%prep
-%setup -q -n ardour-%{version}
-%patch0 -p1 -b .SConscript
-%patch1 -p1 -b .no.grep.opts
-%patch3 -p0 -b .host.not.found
-%patch4 -p1 -b .fix-mm-includes
-%patch5 -p1 -b .lilv016
-%patch6 -p1 -b .boost-tranzport-generic-midi
-%patch7 -p1 -b .boost-linking-wiimote
-%patch8 -p1 -b .c++11-namespaces
-%patch9 -p1 -b .c++11-xpm
-%patch10 -p1 -b .c++11-bool-from-pointer
-%patch11 -p1 -b .libsigc++26
-%patch12 -p1 -b .aubio04
-%patch13 -p1 -b .free-dmalloc
-%patch14 -p1 -b .gcc6
-%patch15 -p1 -b .glibmm250
-%patch16 -p1 -b .gcc7
-
-# Update config.guess for new architectures (ie aarch64) support
-cp /usr/lib/rpm/redhat/config.guess tools
-
-# Fix encodings:
-iconv -f ISO-8859-1 -t UTF8 ardour.1.fr > ardour.1.fr.tmp
-touch -r ardour.1.fr ardour.1.fr.tmp
-mv -f ardour.1.fr.tmp ardour.1.fr
-iconv -f KOI8-R -t UTF8 ardour.1.ru > ardour.1.ru.tmp
-touch -r ardour.1.ru ardour.1.ru.tmp
-mv -f ardour.1.ru.tmp ardour.1.ru
-
-%build
-echo "GenericName=Digital Audio Workstation" >>
gtk2_ardour/ardour2.desktop.in
-# <sigh> ardours SConstruct script is a mess when it comes to determining
-# opt_flags, so we override the lot using the ARCH= and DIST_TARGET= options
-
-TARGETCPU="none"
-
-%ifarch %{ix86}
-ARCH_FLAGS="-DARCH_X86 -DBUILD_SSE_OPTIMIZATIONS -msse -mfpmath=sse
-DUSE_XMMINTRIN"
-TARGETCPU="i386"
-%endif
-%ifarch x86_64
-ARCH_FLAGS="-DARCH_X86 -DBUILD_SSE_OPTIMIZATIONS -DUSE_X86_64_ASM -msse -mfpmath=sse
-DUSE_XMMINTRIN"
-TARGETCPU="x86_64"
-%endif
-
-# Parallel build fails
-scons PREFIX=%{_prefix} LIBDIR=%{_lib} SYSLIBS=1 \
- FREESOUND=1 \
- DIST_TARGET="${TARGETCPU}" \
- ARCH="$RPM_OPT_FLAGS $ARCH_FLAGS -std=c++11" \
- AUSTATE=1 \
- DIST_LIBDIR=%{_lib} \
- WIIMOTE=1
-
-%install
-scons DESTDIR=$RPM_BUILD_ROOT install
-
-# Current Ardour versions have their own appdata file:
-# https://github.com/Ardour/ardour/pull/158
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
-cat > $RPM_BUILD_ROOT%{_datadir}/appdata/ardour2.appdata.xml <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Richard Hughes <richard(a)hughsie.com> -->
-<application>
- <id type="desktop">ardour2.desktop</id>
- <metadata_license>CC0-1.0</metadata_license>
- <summary>Digital Audio Workstation (Legacy Version)</summary>
- <description>
- <p>
- This package contains the legacy version 2 of Ardour. It is provided as a
- way to work on sessions created by this version. Please use the current
- version of Ardour for new projects.
- </p>
- <p>
- Ardour is a digital audio workstation that permits you to record and
- create music.
- Ardour supports multi-track recording, and allows you to use plug-ins to
- create music in a virtual studio.
- </p>
- </description>
- <url type="homepage">http://ardour.org</url>
- <screenshots>
- <screenshot
type="default">http://ardour.org/images/lsdedits.png</scr...
- <screenshot>http://ardour.org/images/eno.png</screenshot>
- <screenshot>http://ardour.org/images/lsd-mixer.jpg</screenshot>
- </screenshots>
- <updatecontact>ardour-users(a)lists.ardour.org</updatecontact>
-</application>
-EOF
-
-# Replace ardour2 with a script
-install -dm 755 $RPM_BUILD_ROOT%{_libexecdir}
-mv $RPM_BUILD_ROOT%{_bindir}/ardour2 $RPM_BUILD_ROOT%{_libexecdir}
-install -pm 755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/ardour2
-
-# copy icons to freedesktop locations
-for s in 16 22 32 48 ; do
- mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps
- cp -p $RPM_BUILD_ROOT%{_datadir}/ardour2/icons/ardour_icon_${s}px.png \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/ardour2.png
-done
-
-# install the desktop entry
-cp -dpf gtk2_ardour/ardour2.desktop{.in,}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
- gtk2_ardour/ardour2.desktop
-
-# install mime entry
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime/packages/
-install -p -m 0644 gtk2_ardour/ardour2.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages/
-
-# install the man pages
-install -dm 755 $RPM_BUILD_ROOT%{_mandir}/man1/
-install -p -m 0644 ardour.1 $RPM_BUILD_ROOT%{_mandir}/man1/ardour2.1
-for lang in es fr ru ; do
- install -dm 755 $RPM_BUILD_ROOT%{_mandir}/${lang}/man1/
- install -p -m 0644 ardour.1.${lang} $RPM_BUILD_ROOT%{_mandir}/${lang}/man1/ardour2.1
-done
-
-%find_lang gtk2_ardour
-cat gtk2_ardour.lang > ardour.lang
-%find_lang libardour2
-cat libardour2.lang >> ardour.lang
-%find_lang libgtkmm2ext
-cat libgtkmm2ext.lang >> ardour.lang
-
-%files -f ardour.lang
-%license COPYING
-%doc README
-%config(noreplace) %{_sysconfdir}/ardour2
-%{_bindir}/ardour2
-%{_libexecdir}/ardour2
-%{_libdir}/ardour2/
-%{_datadir}/ardour2/
-%{_datadir}/icons/hicolor/*/apps/ardour2.png
-%{_datadir}/appdata/*.appdata.xml
-%{_datadir}/applications/ardour2.desktop
-%{_datadir}/mime/packages/ardour2.xml
-%{_mandir}/man1/ardour2.1*
-%{_mandir}/es/man1/ardour2.1*
-%{_mandir}/fr/man1/ardour2.1*
-%{_mandir}/ru/man1/ardour2.1*
-
-%changelog
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
2.8.16-30
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Sun Jan 07 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 2.8.16-29
-- Remove obsolete scriptlets
-
-* Sat Sep 30 2017 Jerry James <loganjerry(a)gmail.com> - 2.8.16-28
-- Rebuild for soundtouch 2.0.0
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
2.8.16-27
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
2.8.16-26
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Mon May 15 2017 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
2.8.16-25
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
2.8.16-24
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Tue Jan 31 2017 Jonathan Wakely <jwakely(a)redhat.com> - 2.8.16-23
-- Rebuilt for Boost 1.63 and patched for glibmm 2.50.x and GCC 7
-
-* Tue Mar 8 2016 Tom Callaway <spot(a)fedoraproject.org> - 2.8.16-22
-- replace non-free dmalloc.cc with a freely licensed version (bz1313285)
-- fix FTBFS with gcc6 (bz1307324)
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> -
2.8.16-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Sat Jan 16 2016 Jonathan Wakely <jwakely(a)redhat.com> - 2.8.16-20
-- Rebuilt for Boost 1.60
-
-* Sun Nov 29 2015 Nils Philippsen <nils(a)redhat.com> - 2.8.16-19
-- patch for and build with -std=c++11
-- patch for libsigc++20 >= 2.6
-- patch for aubio >= 0.4.0
-- mention legacy version in appdata file
-- miscellaneous fixes
-
-* Thu Aug 27 2015 Jonathan Wakely <jwakely(a)redhat.com> - 2.8.16-18
-- Rebuilt for Boost 1.59
-
-* Wed Jul 29 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
2.8.16-17
-- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
-
-* Wed Jul 22 2015 David Tardon <dtardon(a)redhat.com> - 2.8.16-16
-- rebuild for Boost 1.58
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
2.8.16-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Thu Jun 11 2015 Nils Philippsen <nils(a)redhat.com> 2.8.16-14
-- make release higher than ardour to break obsoletes loop (#1230469)
-
-* Mon May 11 2015 Nils Philippsen <nils(a)redhat.com> 2.8.16-1
-- rename ardour.script to ardour.sh to appease rpmlint
-- trim description
-
-* Fri May 08 2015 Nils Philippsen <nils(a)redhat.com> 2.8.16-1
-- rename package to ardour2
-- mention legacy status in %%changelog
-- fix file names of man pages
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..1a0cff8
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Obsoleted by ardour5.
diff --git a/sources b/sources
deleted file mode 100644
index 368454d..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-5bafe41df00d25e7a357baaa1038f16d ardour-2.8.16.tar.bz2
![type="default">http://ardour.org/images/lsdedits.png</scr...](http://type="default">http://ardour.org/images/lsdedits.png%3C/screenshot%3E){kind=link}
