diff options
122 files changed, 201 insertions, 282 deletions
diff --git a/gtk2_ardour/about.cc b/gtk2_ardour/about.cc index 400c3f2a45..2519e767bd 100644 --- a/gtk2_ardour/about.cc +++ b/gtk2_ardour/about.cc @@ -44,7 +44,6 @@ using namespace Gtk; using namespace Gdk; using namespace std; -using namespace sigc; using namespace ARDOUR; using namespace PBD; diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc index b99fe79135..5836a4c201 100644 --- a/gtk2_ardour/actions.cc +++ b/gtk2_ardour/actions.cc @@ -44,7 +44,6 @@ using namespace std; using namespace Gtk; using namespace Glib; -using namespace sigc; using namespace PBD; using namespace ARDOUR; diff --git a/gtk2_ardour/add_midi_cc_track_dialog.cc b/gtk2_ardour/add_midi_cc_track_dialog.cc index 455a9f7715..2b1fa21d1f 100644 --- a/gtk2_ardour/add_midi_cc_track_dialog.cc +++ b/gtk2_ardour/add_midi_cc_track_dialog.cc @@ -31,7 +31,6 @@ #include "i18n.h" using namespace Gtk; -using namespace sigc; using namespace std; using namespace PBD; using namespace ARDOUR; diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc index 219af4c1de..a828caeb92 100644 --- a/gtk2_ardour/add_route_dialog.cc +++ b/gtk2_ardour/add_route_dialog.cc @@ -40,7 +40,6 @@ using namespace Gtk; using namespace Gtkmm2ext; -using namespace sigc; using namespace std; using namespace PBD; using namespace ARDOUR; diff --git a/gtk2_ardour/ardour_dialog.cc b/gtk2_ardour/ardour_dialog.cc index bde0d4484e..cafb356d60 100644 --- a/gtk2_ardour/ardour_dialog.cc +++ b/gtk2_ardour/ardour_dialog.cc @@ -30,7 +30,6 @@ #include "utils.h" using namespace std; -using namespace sigc; using namespace Gtk; using namespace Gtkmm2ext; diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 44f9b9442e..9086bde940 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -103,7 +103,6 @@ using namespace ARDOUR; using namespace PBD; using namespace Gtkmm2ext; using namespace Gtk; -using namespace sigc; ARDOUR_UI *ARDOUR_UI::theArdourUI = 0; UIConfiguration *ARDOUR_UI::ui_config = 0; @@ -410,7 +409,8 @@ ARDOUR_UI::post_engine () update_sample_rate (engine->frame_rate()); Config->ParameterChanged.connect (sigc::mem_fun (*this, &ARDOUR_UI::parameter_changed)); - Config->map_parameters (sigc::mem_fun (*this, &ARDOUR_UI::parameter_changed)); + boost::function<void (string)> pc (boost::bind (&ARDOUR_UI::parameter_changed, this, _1)); + Config->map_parameters (pc); /* now start and maybe save state */ diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index 9b0674e347..97fb9c742a 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -54,7 +54,6 @@ using namespace PBD; using namespace Gtkmm2ext; using namespace Gtk; using namespace Glib; -using namespace sigc; int ARDOUR_UI::setup_windows () @@ -463,7 +462,7 @@ ARDOUR_UI::_auditioning_changed (bool onoff) void ARDOUR_UI::auditioning_changed (bool onoff) { - UI::instance()->call_slot(sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::_auditioning_changed), onoff)); + UI::instance()->call_slot (boost::bind (&ARDOUR_UI::_auditioning_changed, this, onoff)); } void @@ -878,7 +877,8 @@ ARDOUR_UI::set_transport_sensitivity (bool yn) void ARDOUR_UI::editor_realized () { - Config->map_parameters (sigc::mem_fun (*this, &ARDOUR_UI::parameter_changed)); + boost::function<void (string)> pc (boost::bind (&ARDOUR_UI::parameter_changed, this, _1)); + Config->map_parameters (pc); set_size_request_to_display_given_text (speed_display_box, _("-0.55"), 2, 2); reset_dpi (); diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc index 009afe26ca..d02fd41def 100644 --- a/gtk2_ardour/ardour_ui_dependents.cc +++ b/gtk2_ardour/ardour_ui_dependents.cc @@ -36,7 +36,6 @@ #include "opts.h" #include "i18n.h" -using namespace sigc; using namespace Gtk; using namespace PBD; diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index c0e9fa1fa5..f8bf0a2be4 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -60,7 +60,6 @@ using namespace PBD; using namespace Gtkmm2ext; using namespace Gtk; using namespace Glib; -using namespace sigc; int ARDOUR_UI::create_editor () diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc index 6efca69c1b..592750a81b 100644 --- a/gtk2_ardour/ardour_ui_options.cc +++ b/gtk2_ardour/ardour_ui_options.cc @@ -45,7 +45,6 @@ using namespace Gtk; using namespace Gtkmm2ext; using namespace ARDOUR; using namespace PBD; -using namespace sigc; void ARDOUR_UI::toggle_external_sync() @@ -272,7 +271,8 @@ void ARDOUR_UI::setup_session_options () { session->config.ParameterChanged.connect (sigc::mem_fun (*this, &ARDOUR_UI::parameter_changed)); - session->config.map_parameters (sigc::mem_fun (*this, &ARDOUR_UI::parameter_changed)); + boost::function<void (std::string)> pc (boost::bind (&ARDOUR_UI::parameter_changed, this, _1)); + session->config.map_parameters (pc); } #if 0 diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc index 347a3f6848..68df057b95 100644 --- a/gtk2_ardour/audio_clock.cc +++ b/gtk2_ardour/audio_clock.cc @@ -39,7 +39,6 @@ using namespace ARDOUR; using namespace PBD; -using namespace sigc; using namespace Gtk; using namespace std; diff --git a/gtk2_ardour/audio_region_editor.cc b/gtk2_ardour/audio_region_editor.cc index 361ec8b08d..ade0b8edb9 100644 --- a/gtk2_ardour/audio_region_editor.cc +++ b/gtk2_ardour/audio_region_editor.cc @@ -38,7 +38,6 @@ using namespace ARDOUR; using namespace PBD; -using namespace sigc; using namespace std; using namespace Gtkmm2ext; diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index 86e49efada..682287bf59 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -58,7 +58,6 @@ #define MUTED_ALPHA 10 using namespace std; -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Editing; @@ -983,7 +982,7 @@ AudioRegionView::create_one_wave (uint32_t which, bool /*direct*/) void AudioRegionView::peaks_ready_handler (uint32_t which) { - Gtkmm2ext::UI::instance()->call_slot (sigc::bind (sigc::mem_fun(*this, &AudioRegionView::create_one_wave), which, false)); + Gtkmm2ext::UI::instance()->call_slot (boost::bind (&AudioRegionView::create_one_wave, this, which, false)); // cerr << "AudioRegionView::peaks_ready_handler() called on " << which << " this: " << this << endl; } diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc index e25c7e42e1..08b3f001cd 100644 --- a/gtk2_ardour/automation_controller.cc +++ b/gtk2_ardour/automation_controller.cc @@ -147,7 +147,6 @@ AutomationController::automation_state_changed () void AutomationController::value_changed () { - Gtkmm2ext::UI::instance()->call_slot ( - sigc::mem_fun(*this, &AutomationController::display_effective_value)); + Gtkmm2ext::UI::instance()->call_slot (boost::bind (&AutomationController::display_effective_value, this)); } diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc index 77a002d570..f56ca898ce 100644 --- a/gtk2_ardour/automation_line.cc +++ b/gtk2_ardour/automation_line.cc @@ -50,7 +50,6 @@ #include "i18n.h" using namespace std; -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Editing; @@ -115,7 +114,7 @@ AutomationLine::queue_reset () { if (!update_pending) { update_pending = true; - Gtkmm2ext::UI::instance()->call_slot (sigc::mem_fun(*this, &AutomationLine::reset)); + Gtkmm2ext::UI::instance()->call_slot (boost::bind (&AutomationLine::reset, this)); } } diff --git a/gtk2_ardour/control_point.cc b/gtk2_ardour/control_point.cc index d482149507..78a3dc57d5 100644 --- a/gtk2_ardour/control_point.cc +++ b/gtk2_ardour/control_point.cc @@ -26,7 +26,6 @@ #include "i18n.h" using namespace std; -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Gnome; // for Canvas diff --git a/gtk2_ardour/crossfade_edit.cc b/gtk2_ardour/crossfade_edit.cc index 4f0bbb702b..4c9b8b7537 100644 --- a/gtk2_ardour/crossfade_edit.cc +++ b/gtk2_ardour/crossfade_edit.cc @@ -54,7 +54,6 @@ using namespace std; using namespace ARDOUR; using namespace PBD; using namespace Gtk; -using namespace sigc; using namespace Editing; using Gtkmm2ext::Keyboard; diff --git a/gtk2_ardour/crossfade_view.cc b/gtk2_ardour/crossfade_view.cc index 8356ca7de4..2df4cd0982 100644 --- a/gtk2_ardour/crossfade_view.cc +++ b/gtk2_ardour/crossfade_view.cc @@ -33,7 +33,6 @@ #include "canvas_impl.h" #include "ardour_ui.h" -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Editing; diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index d0be4161d1..41f5cc4a58 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -121,7 +121,6 @@ #endif using namespace std; -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Gtk; @@ -1132,8 +1131,9 @@ Editor::connect_to_session (Session *t) loc->set_name (_("Punch")); } - Config->map_parameters (sigc::mem_fun (*this, &Editor::parameter_changed)); - session->config.map_parameters (sigc::mem_fun (*this, &Editor::parameter_changed)); + boost::function<void (string)> pc (boost::bind (&Editor::parameter_changed, this, _1)); + Config->map_parameters (pc); + session->config.map_parameters (pc); session->StateSaved.connect (sigc::mem_fun(*this, &Editor::session_state_saved)); diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index 7e2a8b340d..bc7d5ee7af 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -40,7 +40,6 @@ using namespace Gtk; using namespace Glib; using namespace std; -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Editing; diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index b61668ab28..6ae445d828 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -63,7 +63,6 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -using namespace sigc; using namespace Gtk; using namespace Gtkmm2ext; using namespace Editing; diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 1c1ddceedb..97df092faa 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -49,7 +49,6 @@ #include "i18n.h" using namespace std; -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Gtk; diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc index db4dcac1f3..24b2e646a6 100644 --- a/gtk2_ardour/editor_canvas_events.cc +++ b/gtk2_ardour/editor_canvas_events.cc @@ -52,7 +52,6 @@ #include "i18n.h" -using namespace sigc; using namespace std; using namespace ARDOUR; using namespace PBD; diff --git a/gtk2_ardour/editor_component.cc b/gtk2_ardour/editor_component.cc index 2032f62f14..149ce6717c 100644 --- a/gtk2_ardour/editor_component.cc +++ b/gtk2_ardour/editor_component.cc @@ -21,7 +21,6 @@ #include "editor_component.h" using namespace std; -using namespace sigc; using namespace ARDOUR; EditorComponent::EditorComponent (Editor* e) @@ -42,7 +41,7 @@ EditorComponent::connect_to_session (Session* s) void EditorComponent::session_going_away () { - for (list<connection>::iterator i = _session_connections.begin(); i != _session_connections.end(); ++i) { + for (list<sigc::connection>::iterator i = _session_connections.begin(); i != _session_connections.end(); ++i) { i->disconnect (); } diff --git a/gtk2_ardour/editor_cursors.cc b/gtk2_ardour/editor_cursors.cc index b304b9cfc7..89d2fcbaa1 100644 --- a/gtk2_ardour/editor_cursors.cc +++ b/gtk2_ardour/editor_cursors.cc @@ -25,7 +25,6 @@ #include "utils.h" #include "editor.h" -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Gtk; diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 68a73fef7b..a78ee144d2 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -43,7 +43,6 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -using namespace sigc; using namespace Gtk; using namespace Editing; using namespace ArdourCanvas; diff --git a/gtk2_ardour/editor_imageframe.cc b/gtk2_ardour/editor_imageframe.cc index 2de23ec7f4..3e99f9e6bf 100644 --- a/gtk2_ardour/editor_imageframe.cc +++ b/gtk2_ardour/editor_imageframe.cc @@ -74,7 +74,7 @@ Editor::add_imageframe_time_axis(const string & track_name, void* src) } else { - Gtkmm2ext::UI::instance()->call_slot(sigc::bind(sigc::mem_fun(*this, &Editor::handle_new_imageframe_time_axis_view),track_name, src)) ; + Gtkmm2ext::UI::instance()->call_slot (boost::bind (&Editor::handle_new_imageframe_time_axis_view, this,track_name, src)); } } @@ -132,7 +132,7 @@ Editor::add_imageframe_marker_time_axis(const string & track_name, TimeAxisView* // Can we only sigc::bind 2 data Items? // @todo we really want to sigc::bind the src attribute too, for the moment tracks can only be added remotely, // so this is not too much of an issue, however will need to be looked at again - Gtkmm2ext::UI::instance()->call_slot(sigc::bind(sigc::mem_fun(*this, &Editor::handle_new_imageframe_marker_time_axis_view),track_name, marked_track)) ; + Gtkmm2ext::UI::instance()->call_slot (boost::bind (&Editor::handle_new_imageframe_marker_time_axis_view, this, track_name, marked_track)); } void diff --git a/gtk2_ardour/editor_keys.cc b/gtk2_ardour/editor_keys.cc index a31711a4d0..cbbe11f37b 100644 --- a/gtk2_ardour/editor_keys.cc +++ b/gtk2_ardour/editor_keys.cc @@ -37,7 +37,6 @@ using namespace ARDOUR; using namespace PBD; -using namespace sigc; void Editor::keyboard_selection_finish (bool add) diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index e7ef08cfb4..fa9fd83cc2 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -41,7 +41,6 @@ #include "i18n.h" using namespace std; -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Gtk; diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 452c909891..78e5e9a145 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -76,7 +76,6 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -using namespace sigc; using namespace Gtk; using namespace Editing; using Gtkmm2ext::Keyboard; diff --git a/gtk2_ardour/editor_nudge.cc b/gtk2_ardour/editor_nudge.cc index a6961d43cd..7d6aa5b904 100644 --- a/gtk2_ardour/editor_nudge.cc +++ b/gtk2_ardour/editor_nudge.cc @@ -24,7 +24,6 @@ #include "i18n.h" -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Gtk; diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index b652da58e3..ae4942c169 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -84,7 +84,6 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -using namespace sigc; using namespace Gtk; using namespace Gtkmm2ext; using namespace Editing; diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc index f3a710416e..8aa6d94192 100644 --- a/gtk2_ardour/editor_regions.cc +++ b/gtk2_ardour/editor_regions.cc @@ -46,7 +46,6 @@ #include "i18n.h" using namespace std; -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Gtk; @@ -1097,7 +1096,7 @@ EditorRegions::reset_sort_direction (bool up) } void -EditorRegions::selection_mapover (slot<void,boost::shared_ptr<Region> > sl) +EditorRegions::selection_mapover (sigc::slot<void,boost::shared_ptr<Region> > sl) { Glib::RefPtr<TreeSelection> selection = _display.get_selection(); TreeView::Selection::ListHandle_Path rows = selection->get_selected_rows (); diff --git a/gtk2_ardour/editor_route_groups.cc b/gtk2_ardour/editor_route_groups.cc index d0f5a200ee..16bba4955b 100644 --- a/gtk2_ardour/editor_route_groups.cc +++ b/gtk2_ardour/editor_route_groups.cc @@ -42,7 +42,6 @@ #include "i18n.h" using namespace std; -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Gtk; diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc index 9f091867eb..de6b081fd4 100644 --- a/gtk2_ardour/editor_routes.cc +++ b/gtk2_ardour/editor_routes.cc @@ -49,7 +49,6 @@ #include "i18n.h" using namespace std; -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Gtk; diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index 6065e1f785..be806eb366 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -41,7 +41,6 @@ #include "i18n.h" -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Gtk; diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc index 8d5590fe89..27f4fe6c69 100644 --- a/gtk2_ardour/editor_selection.cc +++ b/gtk2_ardour/editor_selection.cc @@ -40,7 +40,6 @@ #include "i18n.h" using namespace std; -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Gtk; @@ -314,7 +313,7 @@ Editor::get_relevant_tracks (set<RouteTimeAxisView*>& relevant_tracks) const */ void -Editor::mapover_tracks (slot<void, RouteTimeAxisView&, uint32_t> sl, TimeAxisView* basis, RouteGroup::Property prop) const +Editor::mapover_tracks (sigc::slot<void, RouteTimeAxisView&, uint32_t> sl, TimeAxisView* basis, RouteGroup::Property prop) const { RouteTimeAxisView* route_basis = dynamic_cast<RouteTimeAxisView*> (basis); if (route_basis == 0) { diff --git a/gtk2_ardour/editor_selection_list.cc b/gtk2_ardour/editor_selection_list.cc index ddf73b8e4e..f3d11343bc 100644 --- a/gtk2_ardour/editor_selection_list.cc +++ b/gtk2_ardour/editor_selection_list.cc @@ -39,7 +39,6 @@ #include "i18n.h" using namespace std; -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Gtk; @@ -48,7 +47,7 @@ using namespace Gtkmm2ext; void Editor::handle_new_named_selection () { - ARDOUR_UI::instance()->call_slot (sigc::mem_fun(*this, &Editor::redisplay_named_selections)); + ARDOUR_UI::instance()->call_slot (boost::bind (&Editor::redisplay_named_selections, this)); } void diff --git a/gtk2_ardour/editor_snapshots.cc b/gtk2_ardour/editor_snapshots.cc index 0c69bf14fa..8b544508d7 100644 --- a/gtk2_ardour/editor_snapshots.cc +++ b/gtk2_ardour/editor_snapshots.cc @@ -30,7 +30,6 @@ #include "prompter.h" using namespace std; -using namespace sigc; using namespace PBD; using namespace Gtk; using namespace ARDOUR; diff --git a/gtk2_ardour/editor_summary.cc b/gtk2_ardour/editor_summary.cc index 7926490a05..9fc0b1119f 100644 --- a/gtk2_ardour/editor_summary.cc +++ b/gtk2_ardour/editor_summary.cc @@ -28,7 +28,6 @@ #include "keyboard.h" using namespace std; -using namespace sigc; using namespace ARDOUR; using Gtkmm2ext::Keyboard; diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index 5bec1d0f7b..7fecf61be3 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -49,7 +49,6 @@ #include "i18n.h" using namespace std; -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Gtk; diff --git a/gtk2_ardour/editor_timefx.cc b/gtk2_ardour/editor_timefx.cc index e8aa0e9e47..8538c7b8b3 100644 --- a/gtk2_ardour/editor_timefx.cc +++ b/gtk2_ardour/editor_timefx.cc @@ -55,7 +55,6 @@ using namespace RubberBand; using namespace std; using namespace ARDOUR; using namespace PBD; -using namespace sigc; using namespace Gtk; using namespace Gtkmm2ext; diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index be6687f380..950071ba13 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -56,7 +56,6 @@ using namespace ARDOUR; using namespace PBD; using namespace Gtkmm2ext; using namespace Gtk; -using namespace sigc; using namespace std; using Gtkmm2ext::Keyboard; @@ -438,7 +437,7 @@ GainMeterBase::effective_gain_display () void GainMeterBase::gain_changed () { - Gtkmm2ext::UI::instance()->call_slot (sigc::mem_fun(*this, &GainMeterBase::effective_gain_display)); + Gtkmm2ext::UI::instance()->call_slot (boost::bind (&GainMeterBase::effective_gain_display, this)); } void diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc index 5625393d4c..dc8307eecb 100644 --- a/gtk2_ardour/generic_pluginui.cc +++ b/gtk2_ardour/generic_pluginui.cc @@ -62,7 +62,6 @@ using namespace ARDOUR; using namespace PBD; using namespace Gtkmm2ext; using namespace Gtk; -using namespace sigc; GenericPluginUI::GenericPluginUI (boost::shared_ptr<PluginInsert> pi, bool scrollable) : PlugUIBase (pi), @@ -662,7 +661,7 @@ GenericPluginUI::parameter_changed (ControlUI* cui) { if (!cui->update_pending) { cui->update_pending = true; - Gtkmm2ext::UI::instance()->call_slot (sigc::bind (sigc::mem_fun(*this, &GenericPluginUI::update_control_display), cui)); + Gtkmm2ext::UI::instance()->call_slot (boost::bind (&GenericPluginUI::update_control_display, this, cui)); } } diff --git a/gtk2_ardour/imageframe_socket_handler.cc b/gtk2_ardour/imageframe_socket_handler.cc index 08493fb7f0..3d85eda5d4 100644 --- a/gtk2_ardour/imageframe_socket_handler.cc +++ b/gtk2_ardour/imageframe_socket_handler.cc @@ -50,7 +50,6 @@ using namespace std; using namespace ardourvis ; -using namespace sigc; using namespace ARDOUR; using namespace PBD; diff --git a/gtk2_ardour/imageframe_time_axis.cc b/gtk2_ardour/imageframe_time_axis.cc index 47b56dff64..91a4b768fd 100644 --- a/gtk2_ardour/imageframe_time_axis.cc +++ b/gtk2_ardour/imageframe_time_axis.cc @@ -47,7 +47,6 @@ using namespace ARDOUR; using namespace PBD; -using namespace sigc; using namespace Gtk; /** diff --git a/gtk2_ardour/imageframe_view.cc b/gtk2_ardour/imageframe_view.cc index 9c1e3d2273..65d091804a 100644 --- a/gtk2_ardour/imageframe_view.cc +++ b/gtk2_ardour/imageframe_view.cc @@ -34,7 +34,6 @@ #include "canvas_impl.h" #include "gui_thread.h" -using namespace sigc ; using namespace ARDOUR ; using namespace Gtk; diff --git a/gtk2_ardour/itest.cc b/gtk2_ardour/itest.cc index 0622d51140..ec6925ce26 100644 --- a/gtk2_ardour/itest.cc +++ b/gtk2_ardour/itest.cc @@ -35,7 +35,6 @@ #include <jack/jack.h> using namespace std; -using namespace sigc; using namespace Gtk; using namespace Gtkmm2ext; using namespace Glib; diff --git a/gtk2_ardour/latency_gui.cc b/gtk2_ardour/latency_gui.cc index e5eab6201b..849edae767 100644 --- a/gtk2_ardour/latency_gui.cc +++ b/gtk2_ardour/latency_gui.cc @@ -12,7 +12,6 @@ using namespace PBD; using namespace Gtk; using namespace Gtkmm2ext; -using namespace sigc; using namespace ARDOUR; diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc index 78babf4bb3..3ddc9d2f94 100644 --- a/gtk2_ardour/level_meter.cc +++ b/gtk2_ardour/level_meter.cc @@ -47,7 +47,6 @@ using namespace ARDOUR; using namespace PBD; using namespace Gtkmm2ext; using namespace Gtk; -using namespace sigc; using namespace std; //sigc::signal<void> LevelMeter::ResetAllPeakDisplays; diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index 1b09e635e2..6ad5d245d8 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -55,7 +55,6 @@ using namespace Gtk; using namespace ARDOUR_COMMAND_LINE; using namespace ARDOUR; using namespace PBD; -using namespace sigc; TextReceiver text_receiver ("ardour"); diff --git a/gtk2_ardour/marker_time_axis.cc b/gtk2_ardour/marker_time_axis.cc index 928242a78e..9dea703dfd 100644 --- a/gtk2_ardour/marker_time_axis.cc +++ b/gtk2_ardour/marker_time_axis.cc @@ -42,7 +42,6 @@ using namespace ARDOUR; using namespace PBD; -using namespace sigc; using namespace Gtk; //---------------------------------------------------------------------------------------// diff --git a/gtk2_ardour/marker_view.cc b/gtk2_ardour/marker_view.cc index 7700c8436f..60a8cb26db 100644 --- a/gtk2_ardour/marker_view.cc +++ b/gtk2_ardour/marker_view.cc @@ -26,7 +26,6 @@ #include "marker_view.h" using namespace ARDOUR ; -using namespace sigc; sigc::signal<void,MarkerView*> MarkerView::GoingAway; diff --git a/gtk2_ardour/midi_channel_selector.cc b/gtk2_ardour/midi_channel_selector.cc index 3d44ca2429..c889602b8c 100644 --- a/gtk2_ardour/midi_channel_selector.cc +++ b/gtk2_ardour/midi_channel_selector.cc @@ -25,7 +25,6 @@ using namespace std; using namespace Gtk; -using namespace sigc; using namespace ARDOUR; MidiChannelSelector::MidiChannelSelector(int n_rows, int n_columns, int start_row, int start_column) diff --git a/gtk2_ardour/midi_port_dialog.cc b/gtk2_ardour/midi_port_dialog.cc index 05685050d5..23fb6f1ef2 100644 --- a/gtk2_ardour/midi_port_dialog.cc +++ b/gtk2_ardour/midi_port_dialog.cc @@ -13,7 +13,6 @@ using namespace std; using namespace PBD; using namespace Gtk; using namespace Gtkmm2ext; -using namespace sigc; static const char* mode_strings[] = { "duplex", "output", "input", (char*) 0 }; diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index 6ebee3ec24..a8f6f11b42 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -65,7 +65,6 @@ #include "i18n.h" -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Editing; diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index 1c84acd78e..c8c34e4369 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -87,7 +87,6 @@ using namespace ARDOUR; using namespace PBD; using namespace Gtk; -using namespace sigc; using namespace Editing; // Minimum height at which a control is displayed diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 1fb558df4d..01f67c51fe 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -63,7 +63,6 @@ #include "i18n.h" -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Gtk; @@ -1182,20 +1181,20 @@ MixerStrip::fast_update () void MixerStrip::diskstream_changed () { - Gtkmm2ext::UI::instance()->call_slot (sigc::mem_fun(*this, &MixerStrip::update_diskstream_display)); + Gtkmm2ext::UI::instance()->call_slot (boost::bind (&MixerStrip::update_diskstream_display, this)); } void MixerStrip::input_changed (IOChange /*change*/, void */*src*/) { - Gtkmm2ext::UI::instance()->call_slot (sigc::mem_fun(*this, &MixerStrip::update_input_display)); + Gtkmm2ext::UI::instance()->call_slot (boost::bind (&MixerStrip::update_input_display, this)); set_width_enum (_width, this); } void MixerStrip::output_changed (IOChange /*change*/, void */*src*/) { - Gtkmm2ext::UI::instance()->call_slot (sigc::mem_fun(*this, &MixerStrip::update_output_display)); + Gtkmm2ext::UI::instance()->call_slot (boost::bind (&MixerStrip::update_output_display, this)); set_width_enum (_width, this); } diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index 215daccde6..12dde081af 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -57,7 +57,6 @@ using namespace PBD; using namespace Gtk; using namespace Glib; using namespace Gtkmm2ext; -using namespace sigc; using namespace std; using PBD::atoi; diff --git a/gtk2_ardour/mtest.cc b/gtk2_ardour/mtest.cc index 2ff1fd6b37..b37b75c9b6 100644 --- a/gtk2_ardour/mtest.cc +++ b/gtk2_ardour/mtest.cc @@ -26,7 +26,6 @@ using namespace Gtk; using namespace std; -using namespace sigc; using namespace Glib; void diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc index 8674bc0630..b67180cb09 100644 --- a/gtk2_ardour/option_editor.cc +++ b/gtk2_ardour/option_editor.cc @@ -25,7 +25,6 @@ #include "i18n.h" using namespace std; -using namespace sigc; using namespace Gtk; using namespace ARDOUR; @@ -71,7 +70,7 @@ OptionEditorBox::add_to_page (OptionEditorPage* p) add_widget_to_page (p, _box); } -BoolOption::BoolOption (string const & i, string const & n, slot<bool> g, slot<bool, bool> s) +BoolOption::BoolOption (string const & i, string const & n, sigc::slot<bool> g, sigc::slot<bool, bool> s) : Option (i, n), _get (g), _set (s) @@ -99,7 +98,7 @@ BoolOption::toggled () _set (_button->get_active ()); } -EntryOption::EntryOption (string const & i, string const & n, slot<string> g, slot<bool, string> s) +EntryOption::EntryOption (string const & i, string const & n, sigc::slot<string> g, sigc::slot<bool, string> s) : Option (i, n), _get (g), _set (s) diff --git a/gtk2_ardour/panner2d.cc b/gtk2_ardour/panner2d.cc index d2399f457c..08a4aa7b1b 100644 --- a/gtk2_ardour/panner2d.cc +++ b/gtk2_ardour/panner2d.cc @@ -36,7 +36,6 @@ using namespace std; using namespace Gtk; -using namespace sigc; using namespace ARDOUR; using namespace PBD; using Gtkmm2ext::Keyboard; diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc index eb93052380..3c2cfafdfe 100644 --- a/gtk2_ardour/panner_ui.cc +++ b/gtk2_ardour/panner_ui.cc @@ -45,7 +45,6 @@ using namespace ARDOUR; using namespace PBD; using namespace Gtkmm2ext; using namespace Gtk; -using namespace sigc; const int PannerUI::pan_bar_height = 30; diff --git a/gtk2_ardour/playlist_selector.cc b/gtk2_ardour/playlist_selector.cc index 1469a3566c..abf249fb3d 100644 --- a/gtk2_ardour/playlist_selector.cc +++ b/gtk2_ardour/playlist_selector.cc @@ -36,7 +36,6 @@ #include "i18n.h" using namespace std; -using namespace sigc; using namespace Gtk; using namespace Gtkmm2ext; using namespace ARDOUR; diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc index acad8d640f..cb7491917c 100644 --- a/gtk2_ardour/plugin_ui.cc +++ b/gtk2_ardour/plugin_ui.cc @@ -73,7 +73,6 @@ using namespace ARDOUR; using namespace PBD; using namespace Gtkmm2ext; using namespace Gtk; -using namespace sigc; PluginUIWindow::PluginUIWindow (Gtk::Window* win, boost::shared_ptr<PluginInsert> insert, bool scrollable) : parent (win) diff --git a/gtk2_ardour/port_matrix.cc b/gtk2_ardour/port_matrix.cc index 5ac8b1265c..8dec953d7a 100644 --- a/gtk2_ardour/port_matrix.cc +++ b/gtk2_ardour/port_matrix.cc @@ -37,7 +37,6 @@ #include "gui_thread.h" using namespace std; -using namespace sigc; using namespace Gtk; using namespace ARDOUR; @@ -166,7 +165,7 @@ PortMatrix::init () void PortMatrix::reconnect_to_routes () { - for (vector<connection>::iterator i = _route_connections.begin(); i != _route_connections.end(); ++i) { + for (vector<sigc::connection>::iterator i = _route_connections.begin(); i != _route_connections.end(); ++i) { i->disconnect (); } _route_connections.clear (); diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index 900579e419..ab6d9f546d 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -80,7 +80,6 @@ class AUPluginUI; #endif using namespace std; -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Gtk; diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index a4a2e2c9a5..a3796a6746 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -18,7 +18,6 @@ #include "i18n.h" using namespace std; -using namespace sigc; using namespace Gtk; using namespace Gtkmm2ext; using namespace PBD; diff --git a/gtk2_ardour/region_selection.cc b/gtk2_ardour/region_selection.cc index 696c14b140..94592000a1 100644 --- a/gtk2_ardour/region_selection.cc +++ b/gtk2_ardour/region_selection.cc @@ -27,7 +27,6 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -using namespace sigc; /** Construct an empty RegionSelection. */ diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index 059d240837..343c2b47ff 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -51,7 +51,6 @@ #include "i18n.h" using namespace std; -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Editing; @@ -81,6 +80,7 @@ RegionView::RegionView (ArdourCanvas::Group* parent, , wait_for_data(false) , _time_converter(r->session().tempo_map(), r->position()) { + cerr << "RV " << this << " has ref on region " << _region->name() << endl; } RegionView::RegionView (const RegionView& other) @@ -95,6 +95,7 @@ RegionView::RegionView (const RegionView& other) valid = false; _pixel_width = other._pixel_width; _height = other._height; + cerr << "RV " << this << " has ref on region " << _region->name() << endl; } RegionView::RegionView (const RegionView& other, boost::shared_ptr<Region> other_region) @@ -113,6 +114,7 @@ RegionView::RegionView (const RegionView& other, boost::shared_ptr<Region> other valid = false; _pixel_width = other._pixel_width; _height = other._height; + cerr << "RV " << this << " has ref on region " << _region->name() << endl; } RegionView::RegionView (ArdourCanvas::Group* parent, @@ -135,6 +137,7 @@ RegionView::RegionView (ArdourCanvas::Group* parent, , wait_for_data(false) , _time_converter(r->session().tempo_map(), r->position()) { + cerr << "RV " << this << " has ref on region " << _region->name() << endl; } void diff --git a/gtk2_ardour/route_params_ui.cc b/gtk2_ardour/route_params_ui.cc index ae4762284a..c9bba4b63b 100644 --- a/gtk2_ardour/route_params_ui.cc +++ b/gtk2_ardour/route_params_ui.cc @@ -58,7 +58,6 @@ using namespace ARDOUR; using namespace PBD; using namespace Gtk; using namespace Gtkmm2ext; -using namespace sigc; RouteParams_UI::RouteParams_UI () : ArdourDialog ("track/bus inspector"), diff --git a/gtk2_ardour/route_processor_selection.cc b/gtk2_ardour/route_processor_selection.cc index f5cd4dd571..1af1e0c968 100644 --- a/gtk2_ardour/route_processor_selection.cc +++ b/gtk2_ardour/route_processor_selection.cc @@ -32,7 +32,6 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -using namespace sigc; RouteRedirectSelection& RouteRedirectSelection::operator= (const RouteRedirectSelection& other) diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index e46d31bf8d..34eff4636b 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -88,7 +88,6 @@ using namespace PBD; using namespace Gtkmm2ext; using namespace Gtk; using namespace Editing; -using namespace sigc; using namespace std; Glib::RefPtr<Gdk::Pixbuf> RouteTimeAxisView::slider; @@ -1144,13 +1143,13 @@ RouteTimeAxisView::clear_playlist () void RouteTimeAxisView::speed_changed () { - Gtkmm2ext::UI::instance()->call_slot (sigc::mem_fun(*this, &RouteTimeAxisView::reset_samples_per_unit)); + Gtkmm2ext::UI::instance()->call_slot (boost::bind (&RouteTimeAxisView::reset_samples_per_unit, this)); } void RouteTimeAxisView::diskstream_changed () { - Gtkmm2ext::UI::instance()->call_slot (sigc::mem_fun(*this, &RouteTimeAxisView::update_diskstream_display)); + Gtkmm2ext::UI::instance()->call_slot (boost::bind (&RouteTimeAxisView::update_diskstream_display, this)); } void diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index 1b27c05773..2b5c892c0c 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -60,7 +60,6 @@ #include "ardour/profile.h" #include "i18n.h" -using namespace sigc; using namespace Gtk; using namespace Gtkmm2ext; using namespace ARDOUR; @@ -655,14 +654,14 @@ RouteUI::send_blink (bool onoff) void RouteUI::solo_changed(void* /*src*/) { - Gtkmm2ext::UI::instance()->call_slot (sigc::mem_fun (*this, &RouteUI::update_solo_display)); + Gtkmm2ext::UI::instance()->call_slot (boost::bind (&RouteUI::update_solo_display, this)); } void RouteUI::listen_changed(void* /*src*/) { - Gtkmm2ext::UI::instance()->call_slot (sigc::mem_fun (*this, &RouteUI::update_solo_display)); + Gtkmm2ext::UI::instance()->call_slot (boost::bind (&RouteUI::update_solo_display, this)); } int @@ -758,13 +757,13 @@ RouteUI::update_solo_display () void RouteUI::solo_changed_so_update_mute () { - Gtkmm2ext::UI::instance()->call_slot (sigc::mem_fun (*this, &RouteUI::update_mute_display)); + Gtkmm2ext::UI::instance()->call_slot (boost::bind (&RouteUI::update_mute_display, this)); } void RouteUI::mute_changed(void* /*src*/) { - Gtkmm2ext::UI::instance()->call_slot (sigc::mem_fun (*this, &RouteUI::update_mute_display)); + Gtkmm2ext::UI::instance()->call_slot (boost::bind (&RouteUI::update_mute_display, this)); } int @@ -823,13 +822,13 @@ RouteUI::update_mute_display () void RouteUI::route_rec_enable_changed () { - Gtkmm2ext::UI::instance()->call_slot (sigc::mem_fun (*this, &RouteUI::update_rec_display)); + Gtkmm2ext::UI::instance()->call_slot (boost::bind (&RouteUI::update_rec_display, this)); } void RouteUI::session_rec_enable_changed () { - Gtkmm2ext::UI::instance()->call_slot (sigc::mem_fun (*this, &RouteUI::update_rec_display)); + Gtkmm2ext::UI::instance()->call_slot (boost::bind (&RouteUI::update_rec_display, this)); } void @@ -1164,7 +1163,7 @@ void RouteUI::route_active_changed () { if (route_active_menu_item) { - Gtkmm2ext::UI::instance()->call_slot (sigc::bind (sigc::mem_fun (*route_active_menu_item, &CheckMenuItem::set_active), _route->active())); + Gtkmm2ext::UI::instance()->call_slot (boost::bind (&CheckMenuItem::set_active, route_active_menu_item, _route->active())); } } diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc index 75151fce2a..78fb785d11 100644 --- a/gtk2_ardour/selection.cc +++ b/gtk2_ardour/selection.cc @@ -38,7 +38,6 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -using namespace sigc; struct AudioRangeComparator { bool operator()(AudioRange a, AudioRange b) { diff --git a/gtk2_ardour/session_option_editor.cc b/gtk2_ardour/session_option_editor.cc index 5650b79568..08cd8ef260 100644 --- a/gtk2_ardour/session_option_editor.cc +++ b/gtk2_ardour/session_option_editor.cc @@ -8,7 +8,6 @@ #include "i18n.h" using namespace std; -using namespace sigc; using namespace ARDOUR; class OptionsPortMatrix : public PortMatrix diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc index dd5da01b0f..168ddb3904 100644 --- a/gtk2_ardour/streamview.cc +++ b/gtk2_ardour/streamview.cc @@ -234,9 +234,9 @@ StreamView::display_diskstream (boost::shared_ptr<Diskstream> ds) { playlist_change_connection.disconnect(); playlist_changed (ds); - playlist_change_connection = ds->PlaylistChanged.connect (sigc::bind ( - sigc::mem_fun (*this, &StreamView::playlist_changed_weak), - boost::weak_ptr<Diskstream> (ds))); + playlist_change_connection = ds->PlaylistChanged.connect ( + sigc::bind (sigc::mem_fun (*this, &StreamView::playlist_changed_weak), + boost::weak_ptr<Diskstream> (ds))); } void @@ -379,11 +379,9 @@ StreamView::diskstream_changed () boost::shared_ptr<Track> t; if ((t = _trackview.track()) != 0) { - Gtkmm2ext::UI::instance()->call_slot (sigc::bind ( - sigc::mem_fun (*this, &StreamView::display_diskstream), - t->diskstream())); + Gtkmm2ext::UI::instance()->call_slot (boost::bind (&StreamView::display_diskstream, this, t->diskstream())); } else { - Gtkmm2ext::UI::instance()->call_slot (sigc::mem_fun (*this, &StreamView::undisplay_diskstream)); + Gtkmm2ext::UI::instance()->call_slot (boost::bind (&StreamView::undisplay_diskstream, this)); } } @@ -421,19 +419,19 @@ StreamView::region_layered (RegionView* rv) void StreamView::rec_enable_changed () { - Gtkmm2ext::UI::instance()->call_slot (sigc::mem_fun (*this, &StreamView::setup_rec_box)); + Gtkmm2ext::UI::instance()->call_slot (boost::bind (&StreamView::setup_rec_box, this)); } void StreamView::sess_rec_enable_changed () { - Gtkmm2ext::UI::instance()->call_slot (sigc::mem_fun (*this, &StreamView::setup_rec_box)); + Gtkmm2ext::UI::instance()->call_slot (boost::bind (&StreamView::setup_rec_box, this)); } void StreamView::transport_changed() { - Gtkmm2ext::UI::instance()->call_slot (sigc::mem_fun (*this, &StreamView::setup_rec_box)); + Gtkmm2ext::UI::instance()->call_slot (boost::bind (&StreamView::setup_rec_box, this)); } void @@ -441,7 +439,7 @@ StreamView::transport_looped() { // to force a new rec region rec_active = false; - Gtkmm2ext::UI::instance()->call_slot (sigc::mem_fun (*this, &StreamView::setup_rec_box)); + Gtkmm2ext::UI::instance()->call_slot (boost::bind (&StreamView::setup_rec_box, this)); } void diff --git a/gtk2_ardour/tape_region_view.cc b/gtk2_ardour/tape_region_view.cc index 0682a04841..7397997a38 100644 --- a/gtk2_ardour/tape_region_view.cc +++ b/gtk2_ardour/tape_region_view.cc @@ -35,7 +35,6 @@ #include "i18n.h" -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Editing; diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index 18b760e509..e5cd0c71bc 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -57,7 +57,6 @@ using namespace std; using namespace Gtk; using namespace Gdk; -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Editing; diff --git a/gtk2_ardour/time_fx_dialog.cc b/gtk2_ardour/time_fx_dialog.cc index f1aba78492..04280e0011 100644 --- a/gtk2_ardour/time_fx_dialog.cc +++ b/gtk2_ardour/time_fx_dialog.cc @@ -56,7 +56,6 @@ using namespace RubberBand; using namespace std; using namespace ARDOUR; using namespace PBD; -using namespace sigc; using namespace Gtk; using namespace Gtkmm2ext; diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc index a98435f0d9..9aba168ef1 100644 --- a/gtk2_ardour/utils.cc +++ b/gtk2_ardour/utils.cc @@ -50,7 +50,6 @@ using namespace std; using namespace Gtk; -using namespace sigc; using namespace Glib; using namespace PBD; using Gtkmm2ext::Keyboard; diff --git a/gtk2_ardour/visual_time_axis.cc b/gtk2_ardour/visual_time_axis.cc index 8dd0be5773..1e83f56dc9 100644 --- a/gtk2_ardour/visual_time_axis.cc +++ b/gtk2_ardour/visual_time_axis.cc @@ -55,7 +55,6 @@ using namespace ARDOUR; using namespace PBD; -using namespace sigc; using namespace Gtk; /** diff --git a/libs/ardour/analyser.cc b/libs/ardour/analyser.cc index 992e5c5246..c19657baaf 100644 --- a/libs/ardour/analyser.cc +++ b/libs/ardour/analyser.cc @@ -26,7 +26,6 @@ #include "pbd/convert.h" using namespace std; -using namespace sigc; using namespace ARDOUR; using namespace PBD; diff --git a/libs/ardour/ardour/configuration.h b/libs/ardour/ardour/configuration.h index bd164a08e9..02bbcaca23 100644 --- a/libs/ardour/ardour/configuration.h +++ b/libs/ardour/ardour/configuration.h @@ -19,7 +19,7 @@ #ifndef __ardour_configuration_h__ #define __ardour_configuration_h__ - +#include <boost/function.hpp> #include "pbd/stateful.h" #include "ardour/configuration_variable.h" @@ -33,7 +33,7 @@ class Configuration : public PBD::Stateful Configuration(); virtual ~Configuration(); - virtual void map_parameters (sigc::slot<void, std::string> s) = 0; + virtual void map_parameters (boost::function<void (std::string)>&) = 0; virtual int set_state (XMLNode const &, int) = 0; virtual XMLNode & get_state () = 0; virtual XMLNode & get_variables () = 0; diff --git a/libs/ardour/ardour/rc_configuration.h b/libs/ardour/ardour/rc_configuration.h index 555c925a01..ad31aac44e 100644 --- a/libs/ardour/ardour/rc_configuration.h +++ b/libs/ardour/ardour/rc_configuration.h @@ -36,7 +36,7 @@ class RCConfiguration : public Configuration public: RCConfiguration(); - void map_parameters (sigc::slot<void, std::string>); + void map_parameters (boost::function<void (std::string)>&); int set_state (XMLNode const &, int version); XMLNode& get_state (); XMLNode& get_variables (); diff --git a/libs/ardour/ardour/session_configuration.h b/libs/ardour/ardour/session_configuration.h index 20df86ca4d..d19c28f0cb 100644 --- a/libs/ardour/ardour/session_configuration.h +++ b/libs/ardour/ardour/session_configuration.h @@ -29,7 +29,7 @@ class SessionConfiguration : public Configuration public: SessionConfiguration (); - void map_parameters (sigc::slot<void, std::string>); + void map_parameters (boost::function<void (std::string)>&); int set_state (XMLNode const &, int version); XMLNode& get_state (); XMLNode& get_variables (); diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc index 6df18e681d..40411f4133 100644 --- a/libs/ardour/audio_diskstream.cc +++ b/libs/ardour/audio_diskstream.cc @@ -1506,7 +1506,7 @@ AudioDiskstream::transport_stopped (struct tm& when, time_t twhen, bool abort_ca continue; /* XXX is this OK? */ } - region->GoingAway.connect (bind (mem_fun (*this, &Diskstream::remove_region_from_last_capture), boost::weak_ptr<Region>(region))); + region->GoingAway.connect (sigc::bind (sigc::mem_fun (*this, &Diskstream::remove_region_from_last_capture), boost::weak_ptr<Region>(region))); _last_capture_regions.push_back (region); diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc index 9649439487..63013426cb 100644 --- a/libs/ardour/audio_playlist.cc +++ b/libs/ardour/audio_playlist.cc @@ -35,7 +35,6 @@ #include "i18n.h" using namespace ARDOUR; -using namespace sigc; using namespace std; using namespace PBD; @@ -532,8 +531,8 @@ AudioPlaylist::add_crossfade (boost::shared_ptr<Crossfade> xfade) } else { _crossfades.push_back (xfade); - xfade->Invalidated.connect (mem_fun (*this, &AudioPlaylist::crossfade_invalidated)); - xfade->StateChanged.connect (mem_fun (*this, &AudioPlaylist::crossfade_changed)); + xfade->Invalidated.connect (sigc::mem_fun (*this, &AudioPlaylist::crossfade_invalidated)); + xfade->StateChanged.connect (sigc::mem_fun (*this, &AudioPlaylist::crossfade_changed)); notify_crossfade_added (xfade); } @@ -588,8 +587,8 @@ AudioPlaylist::set_state (const XMLNode& node, int version) try { boost::shared_ptr<Crossfade> xfade = boost::shared_ptr<Crossfade> (new Crossfade (*((const Playlist *)this), *child)); _crossfades.push_back (xfade); - xfade->Invalidated.connect (mem_fun (*this, &AudioPlaylist::crossfade_invalidated)); - xfade->StateChanged.connect (mem_fun (*this, &AudioPlaylist::crossfade_changed)); + xfade->Invalidated.connect (sigc::mem_fun (*this, &AudioPlaylist::crossfade_invalidated)); + xfade->StateChanged.connect (sigc::mem_fun (*this, &AudioPlaylist::crossfade_changed)); NewCrossfade(xfade); } diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc index f190b50bd6..68081661ad 100644 --- a/libs/ardour/audio_track.cc +++ b/libs/ardour/audio_track.cc @@ -185,7 +185,7 @@ AudioTrack::set_diskstream (boost::shared_ptr<AudioDiskstream> ds, void * /*src* if (audio_diskstream()->deprecated_io_node) { if (!IO::connecting_legal) { - IO::ConnectingLegal.connect (mem_fun (*this, &AudioTrack::deprecated_use_diskstream_connections)); + IO::ConnectingLegal.connect (sigc::mem_fun (*this, &AudioTrack::deprecated_use_diskstream_connections)); } else { deprecated_use_diskstream_connections (); } @@ -307,7 +307,7 @@ AudioTrack::_set_state (const XMLNode& node, int version, bool call_base) pending_state = const_cast<XMLNode*> (&node); if (_session.state_of_the_state() & Session::Loading) { - _session.StateReady.connect (mem_fun (*this, &AudioTrack::set_state_part_two)); + _session.StateReady.connect (sigc::mem_fun (*this, &AudioTrack::set_state_part_two)); } else { set_state_part_two (); } diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc index e46f8ed3fd..d660616bb3 100644 --- a/libs/ardour/audioregion.cc +++ b/libs/ardour/audioregion.cc @@ -98,7 +98,7 @@ AudioRegion::AudioRegion (boost::shared_ptr<AudioSource> src, nframes_t start, n { boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource> (src); if (afs) { - afs->HeaderPositionOffsetChanged.connect (mem_fun (*this, &AudioRegion::source_offset_changed)); + afs->HeaderPositionOffsetChanged.connect (sigc::mem_fun (*this, &AudioRegion::source_offset_changed)); } init (); @@ -115,7 +115,7 @@ AudioRegion::AudioRegion (boost::shared_ptr<AudioSource> src, nframes_t start, n { boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource> (src); if (afs) { - afs->HeaderPositionOffsetChanged.connect (mem_fun (*this, &AudioRegion::source_offset_changed)); + afs->HeaderPositionOffsetChanged.connect (sigc::mem_fun (*this, &AudioRegion::source_offset_changed)); } init (); @@ -207,7 +207,7 @@ AudioRegion::AudioRegion (boost::shared_ptr<const AudioRegion> other, const Sour boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource> ((*i)); if (afs) { - afs->HeaderPositionOffsetChanged.connect (mem_fun (*this, &AudioRegion::source_offset_changed)); + afs->HeaderPositionOffsetChanged.connect (sigc::mem_fun (*this, &AudioRegion::source_offset_changed)); } } @@ -231,7 +231,7 @@ AudioRegion::AudioRegion (boost::shared_ptr<AudioSource> src, const XMLNode& nod { boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource> (src); if (afs) { - afs->HeaderPositionOffsetChanged.connect (mem_fun (*this, &AudioRegion::source_offset_changed)); + afs->HeaderPositionOffsetChanged.connect (sigc::mem_fun (*this, &AudioRegion::source_offset_changed)); } init (); @@ -272,7 +272,7 @@ void AudioRegion::connect_to_analysis_changed () { for (SourceList::const_iterator i = _sources.begin(); i != _sources.end(); ++i) { - (*i)->AnalysisChanged.connect (mem_fun (*this, &AudioRegion::invalidate_transients)); + (*i)->AnalysisChanged.connect (sigc::mem_fun (*this, &AudioRegion::invalidate_transients)); } } @@ -287,7 +287,7 @@ AudioRegion::connect_to_header_position_offset_changed () unique_srcs.insert (*i); boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource> (*i); if (afs) { - afs->HeaderPositionOffsetChanged.connect (mem_fun (*this, &AudioRegion::source_offset_changed)); + afs->HeaderPositionOffsetChanged.connect (sigc::mem_fun (*this, &AudioRegion::source_offset_changed)); } } } @@ -296,9 +296,9 @@ AudioRegion::connect_to_header_position_offset_changed () void AudioRegion::listen_to_my_curves () { - _envelope->StateChanged.connect (mem_fun (*this, &AudioRegion::envelope_changed)); - _fade_in->StateChanged.connect (mem_fun (*this, &AudioRegion::fade_in_changed)); - _fade_out->StateChanged.connect (mem_fun (*this, &AudioRegion::fade_out_changed)); + _envelope->StateChanged.connect (sigc::mem_fun (*this, &AudioRegion::envelope_changed)); + _fade_in->StateChanged.connect (sigc::mem_fun (*this, &AudioRegion::fade_in_changed)); + _fade_out->StateChanged.connect (sigc::mem_fun (*this, &AudioRegion::fade_out_changed)); } void diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc index 9db604cd54..dbb76c005e 100644 --- a/libs/ardour/auditioner.cc +++ b/libs/ardour/auditioner.cc @@ -72,7 +72,7 @@ Auditioner::Auditioner (Session& s) _main_outs->allow_pan_reset (); _main_outs->reset_panner (); - _output->changed.connect (mem_fun (*this, &Auditioner::output_changed)); + _output->changed.connect (sigc::mem_fun (*this, &Auditioner::output_changed)); the_region.reset ((AudioRegion*) 0); g_atomic_int_set (&_active, 0); diff --git a/libs/ardour/automation_list.cc b/libs/ardour/automation_list.cc index c0a652275c..db8f5bb799 100644 --- a/libs/ardour/automation_list.cc +++ b/libs/ardour/automation_list.cc @@ -34,7 +34,6 @@ using namespace std; using namespace ARDOUR; -using namespace sigc; using namespace PBD; sigc::signal<void,AutomationList *> AutomationList::AutomationListCreated; diff --git a/libs/ardour/control_protocol_manager.cc b/libs/ardour/control_protocol_manager.cc index e94829898a..d15283c85c 100644 --- a/libs/ardour/control_protocol_manager.cc +++ b/libs/ardour/control_protocol_manager.cc @@ -66,7 +66,7 @@ void ControlProtocolManager::set_session (Session& s) { _session = &s; - _session->GoingAway.connect (mem_fun (*this, &ControlProtocolManager::drop_session)); + _session->GoingAway.connect (sigc::mem_fun (*this, &ControlProtocolManager::drop_session)); for (list<ControlProtocolInfo*>::iterator i = control_protocol_info.begin(); i != control_protocol_info.end(); ++i) { if ((*i)->requested || (*i)->mandatory) { diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc index ec2ae7d4cc..07489687c1 100644 --- a/libs/ardour/delivery.cc +++ b/libs/ardour/delivery.cc @@ -64,10 +64,10 @@ Delivery::Delivery (Session& s, boost::shared_ptr<IO> io, boost::shared_ptr<Mute _display_to_user = false; if (_output) { - _output->changed.connect (mem_fun (*this, &Delivery::output_changed)); + _output->changed.connect (sigc::mem_fun (*this, &Delivery::output_changed)); } - CycleStart.connect (mem_fun (*this, &Delivery::cycle_start)); + CycleStart.connect (sigc::mem_fun (*this, &Delivery::cycle_start)); } /* deliver to a new IO object */ @@ -88,10 +88,10 @@ Delivery::Delivery (Session& s, boost::shared_ptr<MuteMaster> mm, const string& _display_to_user = false; if (_output) { - _output->changed.connect (mem_fun (*this, &Delivery::output_changed)); + _output->changed.connect (sigc::mem_fun (*this, &Delivery::output_changed)); } - CycleStart.connect (mem_fun (*this, &Delivery::cycle_start)); + CycleStart.connect (sigc::mem_fun (*this, &Delivery::cycle_start)); } /* deliver to a new IO object, reconstruct from XML */ @@ -116,10 +116,10 @@ Delivery::Delivery (Session& s, boost::shared_ptr<MuteMaster> mm, const XMLNode& } if (_output) { - _output->changed.connect (mem_fun (*this, &Delivery::output_changed)); + _output->changed.connect (sigc::mem_fun (*this, &Delivery::output_changed)); } - CycleStart.connect (mem_fun (*this, &Delivery::cycle_start)); + CycleStart.connect (sigc::mem_fun (*this, &Delivery::cycle_start)); } /* deliver to an existing IO object, reconstruct from XML */ @@ -144,10 +144,10 @@ Delivery::Delivery (Session& s, boost::shared_ptr<IO> out, boost::shared_ptr<Mut } if (_output) { - _output->changed.connect (mem_fun (*this, &Delivery::output_changed)); + _output->changed.connect (sigc::mem_fun (*this, &Delivery::output_changed)); } - CycleStart.connect (mem_fun (*this, &Delivery::cycle_start)); + CycleStart.connect (sigc::mem_fun (*this, &Delivery::cycle_start)); } std::string @@ -419,7 +419,7 @@ Delivery::reset_panner () } } else { panner_legal_c.disconnect (); - panner_legal_c = PannersLegal.connect (mem_fun (*this, &Delivery::panners_became_legal)); + panner_legal_c = PannersLegal.connect (sigc::mem_fun (*this, &Delivery::panners_became_legal)); } } diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc index b1d5a92355..ee279c601d 100644 --- a/libs/ardour/diskstream.cc +++ b/libs/ardour/diskstream.cc @@ -143,13 +143,13 @@ Diskstream::set_route (Route& r) _io = _route->input(); ic_connection.disconnect(); - ic_connection = _io->changed.connect (mem_fun (*this, &Diskstream::handle_input_change)); + ic_connection = _io->changed.connect (sigc::mem_fun (*this, &Diskstream::handle_input_change)); input_change_pending = ConfigurationChanged; non_realtime_input_change (); set_align_style_from_io (); - _route->GoingAway.connect (mem_fun (*this, &Diskstream::route_going_away)); + _route->GoingAway.connect (sigc::mem_fun (*this, &Diskstream::route_going_away)); } void @@ -342,9 +342,9 @@ Diskstream::use_playlist (boost::shared_ptr<Playlist> playlist) reset_write_sources (false); } - plmod_connection = _playlist->Modified.connect (mem_fun (*this, &Diskstream::playlist_modified)); - plgone_connection = _playlist->GoingAway.connect (bind (mem_fun (*this, &Diskstream::playlist_deleted), boost::weak_ptr<Playlist>(_playlist))); - plregion_connection = _playlist->RangesMoved.connect (mem_fun (*this, &Diskstream::playlist_ranges_moved)); + plmod_connection = _playlist->Modified.connect (sigc::mem_fun (*this, &Diskstream::playlist_modified)); + plgone_connection = _playlist->GoingAway.connect (sigc::bind (sigc::mem_fun (*this, &Diskstream::playlist_deleted), boost::weak_ptr<Playlist>(_playlist))); + plregion_connection = _playlist->RangesMoved.connect (sigc::mem_fun (*this, &Diskstream::playlist_ranges_moved)); } /* don't do this if we've already asked for it *or* if we are setting up diff --git a/libs/ardour/internal_return.cc b/libs/ardour/internal_return.cc index 86d0a2deea..41c29f43f1 100644 --- a/libs/ardour/internal_return.cc +++ b/libs/ardour/internal_return.cc @@ -33,14 +33,14 @@ InternalReturn::InternalReturn (Session& s) : Return (s, true) , user_count (0) { - CycleStart.connect (mem_fun (*this, &InternalReturn::cycle_start)); + CycleStart.connect (sigc::mem_fun (*this, &InternalReturn::cycle_start)); } InternalReturn::InternalReturn (Session& s, const XMLNode& node) : Return (s, node, true) , user_count (0) { - CycleStart.connect (mem_fun (*this, &InternalReturn::cycle_start)); + CycleStart.connect (sigc::mem_fun (*this, &InternalReturn::cycle_start)); } void diff --git a/libs/ardour/internal_send.cc b/libs/ardour/internal_send.cc index 0fc498be7f..e10857a2a9 100644 --- a/libs/ardour/internal_send.cc +++ b/libs/ardour/internal_send.cc @@ -43,8 +43,8 @@ InternalSend::InternalSend (Session& s, boost::shared_ptr<MuteMaster> mm, boost: set_name (sendto->name()); - _send_to->GoingAway.connect (mem_fun (*this, &InternalSend::send_to_going_away)); - _send_to->NameChanged.connect (mem_fun (*this, &InternalSend::send_to_name_changed)); + _send_to->GoingAway.connect (sigc::mem_fun (*this, &InternalSend::send_to_going_away)); + _send_to->NameChanged.connect (sigc::mem_fun (*this, &InternalSend::send_to_name_changed)); } InternalSend::InternalSend (Session& s, boost::shared_ptr<MuteMaster> mm, const XMLNode& node) @@ -187,7 +187,7 @@ InternalSend::set_our_state (const XMLNode& node, int version) */ if (!IO::connecting_legal) { - connect_c = IO::ConnectingLegal.connect (mem_fun (*this, &InternalSend::connect_when_legal)); + connect_c = IO::ConnectingLegal.connect (sigc::mem_fun (*this, &InternalSend::connect_when_legal)); } else { connect_when_legal (); } diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc index fe2dfb1f7a..d8d7ec88a5 100644 --- a/libs/ardour/io.cc +++ b/libs/ardour/io.cc @@ -567,7 +567,7 @@ IO::set_state (const XMLNode& node, int version) pending_state_node = new XMLNode (node); pending_state_node_version = version; pending_state_node_in = false; - connection_legal_c = ConnectingLegal.connect (mem_fun (*this, &IO::connecting_became_legal)); + connection_legal_c = ConnectingLegal.connect (sigc::mem_fun (*this, &IO::connecting_became_legal)); } @@ -620,7 +620,7 @@ IO::set_state_2X (const XMLNode& node, int version, bool in) pending_state_node = new XMLNode (node); pending_state_node_version = version; pending_state_node_in = in; - connection_legal_c = ConnectingLegal.connect (mem_fun (*this, &IO::connecting_became_legal)); + connection_legal_c = ConnectingLegal.connect (sigc::mem_fun (*this, &IO::connecting_became_legal)); } return 0; diff --git a/libs/ardour/jack_slave.cc b/libs/ardour/jack_slave.cc index 94a12319f2..9ef6eb8579 100644 --- a/libs/ardour/jack_slave.cc +++ b/libs/ardour/jack_slave.cc @@ -30,7 +30,6 @@ using namespace std; using namespace ARDOUR; -using namespace sigc; JACK_Slave::JACK_Slave (jack_client_t* j) : jack (j) diff --git a/libs/ardour/location.cc b/libs/ardour/location.cc index b3421d2b0b..24e4628c0b 100644 --- a/libs/ardour/location.cc +++ b/libs/ardour/location.cc @@ -41,7 +41,6 @@ using namespace std; using namespace ARDOUR; -using namespace sigc; using namespace PBD; Location::Location (const Location& other) diff --git a/libs/ardour/midi_clock_slave.cc b/libs/ardour/midi_clock_slave.cc index 53f819e54a..e2b83a1e65 100644 --- a/libs/ardour/midi_clock_slave.cc +++ b/libs/ardour/midi_clock_slave.cc @@ -39,7 +39,6 @@ using namespace std; using namespace ARDOUR; -using namespace sigc; using namespace MIDI; using namespace PBD; @@ -79,11 +78,11 @@ MIDIClock_Slave::rebind (MIDI::Port& p) std::cerr << "MIDIClock_Slave: connecting to port " << port->name() << std::endl; #endif - connections.push_back (port->input()->timing.connect (mem_fun (*this, &MIDIClock_Slave::update_midi_clock))); - connections.push_back (port->input()->start.connect (mem_fun (*this, &MIDIClock_Slave::start))); - connections.push_back (port->input()->contineu.connect (mem_fun (*this, &MIDIClock_Slave::contineu))); - connections.push_back (port->input()->stop.connect (mem_fun (*this, &MIDIClock_Slave::stop))); - connections.push_back (port->input()->position.connect (mem_fun (*this, &MIDIClock_Slave::position))); + connections.push_back (port->input()->timing.connect (sigc::mem_fun (*this, &MIDIClock_Slave::update_midi_clock))); + connections.push_back (port->input()->start.connect (sigc::mem_fun (*this, &MIDIClock_Slave::start))); + connections.push_back (port->input()->contineu.connect (sigc::mem_fun (*this, &MIDIClock_Slave::contineu))); + connections.push_back (port->input()->stop.connect (sigc::mem_fun (*this, &MIDIClock_Slave::stop))); + connections.push_back (port->input()->position.connect (sigc::mem_fun (*this, &MIDIClock_Slave::position))); } void diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc index 176ec156f0..f780948d69 100644 --- a/libs/ardour/midi_diskstream.cc +++ b/libs/ardour/midi_diskstream.cc @@ -1024,7 +1024,7 @@ MidiDiskstream::transport_stopped (struct tm& /*when*/, time_t /*twhen*/, bool a continue; /* XXX is this OK? */ } - region->GoingAway.connect (bind (mem_fun (*this, &Diskstream::remove_region_from_last_capture), boost::weak_ptr<Region>(region))); + region->GoingAway.connect (sigc::bind (sigc::mem_fun (*this, &Diskstream::remove_region_from_last_capture), boost::weak_ptr<Region>(region))); _last_capture_regions.push_back (region); diff --git a/libs/ardour/midi_patch_manager.cc b/libs/ardour/midi_patch_manager.cc index f523ab056f..307655bff8 100644 --- a/libs/ardour/midi_patch_manager.cc +++ b/libs/ardour/midi_patch_manager.cc @@ -32,7 +32,6 @@ #include "i18n.h" using namespace std; -using namespace sigc; using namespace ARDOUR; using namespace MIDI; using namespace MIDI::Name; @@ -45,7 +44,7 @@ void MidiPatchManager::set_session (Session& s) { _session = &s; - _session->GoingAway.connect (mem_fun (*this, &MidiPatchManager::drop_session)); + _session->GoingAway.connect (sigc::mem_fun (*this, &MidiPatchManager::drop_session)); refresh(); } diff --git a/libs/ardour/midi_playlist.cc b/libs/ardour/midi_playlist.cc index a1fb01a7bb..b230f6f6d5 100644 --- a/libs/ardour/midi_playlist.cc +++ b/libs/ardour/midi_playlist.cc @@ -40,7 +40,6 @@ #include "i18n.h" using namespace ARDOUR; -using namespace sigc; using namespace std; MidiPlaylist::MidiPlaylist (Session& session, const XMLNode& node, bool hidden) diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc index 2bec1e6901..ebbe231e62 100644 --- a/libs/ardour/midi_track.cc +++ b/libs/ardour/midi_track.cc @@ -233,7 +233,7 @@ MidiTrack::_set_state (const XMLNode& node, int version, bool call_base) pending_state = const_cast<XMLNode*> (&node); if (_session.state_of_the_state() & Session::Loading) { - _session.StateReady.connect (mem_fun (*this, &MidiTrack::set_state_part_two)); + _session.StateReady.connect (sigc::mem_fun (*this, &MidiTrack::set_state_part_two)); } else { set_state_part_two (); } diff --git a/libs/ardour/midi_ui.cc b/libs/ardour/midi_ui.cc index ffcec00de7..1bb10d713f 100644 --- a/libs/ardour/midi_ui.cc +++ b/libs/ardour/midi_ui.cc @@ -44,7 +44,7 @@ MidiControlUI::MidiControlUI (Session& s) : AbstractUI<MidiUIRequest> (_("midiui")) , _session (s) { - MIDI::Manager::instance()->PortsChanged.connect (mem_fun (*this, &MidiControlUI::change_midi_ports)); + MIDI::Manager::instance()->PortsChanged.connect (sigc::mem_fun (*this, &MidiControlUI::change_midi_ports)); } MidiControlUI::~MidiControlUI () @@ -125,7 +125,7 @@ MidiControlUI::reset_ports () if ((fd = (*i)->selectable ()) >= 0) { Glib::RefPtr<IOSource> psrc = IOSource::create (fd, IO_IN|IO_HUP|IO_ERR); - psrc->connect (bind (mem_fun (*this, &MidiControlUI::midi_input_handler), (*i))); + psrc->connect (sigc::bind (sigc::mem_fun (*this, &MidiControlUI::midi_input_handler), (*i))); psrc->attach (_main_loop->get_context()); // glibmm hack: for now, store only the GSource* diff --git a/libs/ardour/mtc_slave.cc b/libs/ardour/mtc_slave.cc index 95fa4d984a..3e06efa56f 100644 --- a/libs/ardour/mtc_slave.cc +++ b/libs/ardour/mtc_slave.cc @@ -37,7 +37,6 @@ using namespace std; using namespace ARDOUR; -using namespace sigc; using namespace MIDI; using namespace PBD; @@ -94,9 +93,9 @@ MTC_Slave::rebind (MIDI::Port& p) port = &p; - connections.push_back (port->input()->mtc_time.connect (mem_fun (*this, &MTC_Slave::update_mtc_time))); - connections.push_back (port->input()->mtc_qtr.connect (mem_fun (*this, &MTC_Slave::update_mtc_qtr))); - connections.push_back (port->input()->mtc_status.connect (mem_fun (*this, &MTC_Slave::update_mtc_status))); + connections.push_back (port->input()->mtc_time.connect (sigc::mem_fun (*this, &MTC_Slave::update_mtc_time))); + connections.push_back (port->input()->mtc_qtr.connect (sigc::mem_fun (*this, &MTC_Slave::update_mtc_qtr))); + connections.push_back (port->input()->mtc_status.connect (sigc::mem_fun (*this, &MTC_Slave::update_mtc_status))); } void diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc index 3e1ea79477..29beb7c6b7 100644 --- a/libs/ardour/playlist.cc +++ b/libs/ardour/playlist.cc @@ -267,7 +267,7 @@ Playlist::init (bool hide) freeze_length = 0; _explicit_relayering = false; - Modified.connect (mem_fun (*this, &Playlist::mark_session_dirty)); + Modified.connect (sigc::mem_fun (*this, &Playlist::mark_session_dirty)); } Playlist::~Playlist () @@ -602,7 +602,7 @@ Playlist::add_region_internal (boost::shared_ptr<Region> region, nframes_t posit } region_state_changed_connections.push_back ( - region->StateChanged.connect (sigc::bind (mem_fun (this, &Playlist::region_changed_proxy), + region->StateChanged.connect (sigc::bind (sigc::mem_fun (this, &Playlist::region_changed_proxy), boost::weak_ptr<Region> (region))) ); diff --git a/libs/ardour/rc_configuration.cc b/libs/ardour/rc_configuration.cc index e187622757..a68d0d3b94 100644 --- a/libs/ardour/rc_configuration.cc +++ b/libs/ardour/rc_configuration.cc @@ -309,12 +309,12 @@ RCConfiguration::set_variables (const XMLNode& node) } void -RCConfiguration::map_parameters (sigc::slot<void, std::string> theSlot) +RCConfiguration::map_parameters (boost::function<void (std::string)>& functor) { #undef CONFIG_VARIABLE #undef CONFIG_VARIABLE_SPECIAL -#define CONFIG_VARIABLE(type,var,name,value) theSlot (name); -#define CONFIG_VARIABLE_SPECIAL(type,var,name,value,mutator) theSlot (name); +#define CONFIG_VARIABLE(type,var,name,value) functor (name); +#define CONFIG_VARIABLE_SPECIAL(type,var,name,value,mutator) functor (name); #include "ardour/rc_configuration_vars.h" #undef CONFIG_VARIABLE #undef CONFIG_VARIABLE_SPECIAL diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc index 33baa12d20..2c4d8004cf 100644 --- a/libs/ardour/region.cc +++ b/libs/ardour/region.cc @@ -111,7 +111,7 @@ Region::Region (boost::shared_ptr<Source> src, nframes_t start, nframes_t length _sources.push_back (src); _master_sources.push_back (src); - src->GoingAway.connect (bind (mem_fun (*this, &Region::source_deleted), src)); + src->GoingAway.connect (sigc::bind (sigc::mem_fun (*this, &Region::source_deleted), src)); assert(_sources.size() > 0); _positional_lock_style = AudioTime; @@ -341,7 +341,7 @@ Region::~Region () { DEBUG_TRACE (DEBUG::Destruction, string_compose ("Region %1 destructor @ %2\n", _name, this)); notify_callbacks (); - GoingAway (); /* EMIT SIGNAL */ + drop_references (); } void @@ -1419,6 +1419,7 @@ void Region::source_deleted (boost::shared_ptr<Source>) { _sources.clear (); + drop_references (); } vector<string> @@ -1587,14 +1588,14 @@ Region::use_sources (SourceList const & s) for (SourceList::const_iterator i = s.begin (); i != s.end(); ++i) { _sources.push_back (*i); - (*i)->GoingAway.connect (bind (mem_fun (*this, &Region::source_deleted), *i)); + (*i)->GoingAway.connect (sigc::bind (sigc::mem_fun (*this, &Region::source_deleted), *i)); unique_srcs.insert (*i); } for (SourceList::const_iterator i = s.begin (); i != s.end(); ++i) { _master_sources.push_back (*i); if (unique_srcs.find (*i) == unique_srcs.end()) { - (*i)->GoingAway.connect (bind (mem_fun (*this, &Region::source_deleted), *i)); + (*i)->GoingAway.connect (sigc::bind (sigc::mem_fun (*this, &Region::source_deleted), *i)); } } } diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 0bf43fdcc5..3390245828 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -94,7 +94,7 @@ Route::Route (Session& sess, string name, Flag flg, DataType default_type) /* now that we have _meter, its safe to connect to this */ - _meter_connection = Metering::connect (mem_fun (*this, &Route::meter)); + _meter_connection = Metering::connect (sigc::mem_fun (*this, &Route::meter)); } Route::Route (Session& sess, const XMLNode& node, DataType default_type) @@ -110,7 +110,7 @@ Route::Route (Session& sess, const XMLNode& node, DataType default_type) /* now that we have _meter, its safe to connect to this */ - _meter_connection = Metering::connect (mem_fun (*this, &Route::meter)); + _meter_connection = Metering::connect (sigc::mem_fun (*this, &Route::meter)); } void @@ -148,8 +148,8 @@ Route::init () _input.reset (new IO (_session, _name, IO::Input, _default_type)); _output.reset (new IO (_session, _name, IO::Output, _default_type)); - _input->changed.connect (mem_fun (this, &Route::input_change_handler)); - _output->changed.connect (mem_fun (this, &Route::output_change_handler)); + _input->changed.connect (sigc::mem_fun (this, &Route::input_change_handler)); + _output->changed.connect (sigc::mem_fun (this, &Route::output_change_handler)); /* add amp processor */ @@ -794,7 +794,7 @@ Route::add_processor (boost::shared_ptr<Processor> processor, ProcessorList::ite // XXX: do we want to emit the signal here ? change call order. processor->activate (); } - processor->ActiveChanged.connect (bind (mem_fun (_session, &Session::update_latency_compensation), false, false)); + processor->ActiveChanged.connect (sigc::bind (sigc::mem_fun (_session, &Session::update_latency_compensation), false, false)); _output->set_user_latency (0); } @@ -1049,7 +1049,7 @@ Route::add_processors (const ProcessorList& others, ProcessorList::iterator iter return -1; } - (*i)->ActiveChanged.connect (bind (mem_fun (_session, &Session::update_latency_compensation), false, false)); + (*i)->ActiveChanged.connect (sigc::bind (sigc::mem_fun (_session, &Session::update_latency_compensation), false, false)); } _output->set_user_latency (0); diff --git a/libs/ardour/route_group.cc b/libs/ardour/route_group.cc index d7ac672f9a..3d98c61548 100644 --- a/libs/ardour/route_group.cc +++ b/libs/ardour/route_group.cc @@ -38,7 +38,6 @@ #include "i18n.h" using namespace ARDOUR; -using namespace sigc; using namespace std; RouteGroup::RouteGroup (Session& s, const string &n, Flag f, Property p) @@ -78,7 +77,7 @@ RouteGroup::add (boost::shared_ptr<Route> r) routes->push_back (r); r->join_route_group (this); - r->GoingAway.connect (sigc::bind (mem_fun (*this, &RouteGroup::remove_when_going_away), boost::weak_ptr<Route> (r))); + r->GoingAway.connect (sigc::bind (sigc::mem_fun (*this, &RouteGroup::remove_when_going_away), boost::weak_ptr<Route> (r))); _session.set_dirty (); changed (); /* EMIT SIGNAL */ diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 0b71ad84cd..fbe8edfa80 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -191,8 +191,8 @@ Session::Session (AudioEngine &eng, _state_of_the_state = StateOfTheState (_state_of_the_state & ~Dirty); - Config->ParameterChanged.connect (bind (mem_fun (*this, &Session::config_changed), false)); - config.ParameterChanged.connect (bind (mem_fun (*this, &Session::config_changed), true)); + Config->ParameterChanged.connect (sigc::bind (sigc::mem_fun (*this, &Session::config_changed), false)); + config.ParameterChanged.connect (sigc::bind (sigc::mem_fun (*this, &Session::config_changed), true)); if (was_dirty) { DirtyChanged (); /* EMIT SIGNAL */ @@ -324,7 +324,7 @@ Session::Session (AudioEngine &eng, _state_of_the_state = StateOfTheState (_state_of_the_state & ~Dirty); - Config->ParameterChanged.connect (bind (mem_fun (*this, &Session::config_changed), false)); + Config->ParameterChanged.connect (sigc::bind (sigc::mem_fun (*this, &Session::config_changed), false)); } Session::~Session () @@ -411,7 +411,7 @@ Session::destroy () tmp = i; ++tmp; - DEBUG_TRACE(DEBUG::Destruction, string_compose ("Dropping for region %1 (%2); pre-ref = %2\n", i->second->name(), i->second.get(), i->second.use_count())); + DEBUG_TRACE(DEBUG::Destruction, string_compose ("Dropping for region %1 (%2); pre-ref = %3\n", i->second->name(), i->second.get(), i->second.use_count())); i->second->drop_references (); DEBUG_TRACE(DEBUG::Destruction, string_compose ("region post ref = %1\n", i->second.use_count())); i = tmp; @@ -514,12 +514,15 @@ Session::when_engine_running () BootMessage (_("Using configuration")); - Config->map_parameters (bind (mem_fun (*this, &Session::config_changed), false)); - config.map_parameters (bind (mem_fun (*this, &Session::config_changed), true)); + boost::function<void (std::string)> ff (boost::bind (&Session::config_changed, this, _1, false)); + boost::function<void (std::string)> ft (boost::bind (&Session::config_changed, this, _1, true)); + + Config->map_parameters (ff); + config.map_parameters (ft); /* every time we reconnect, recompute worst case output latencies */ - _engine.Running.connect (mem_fun (*this, &Session::set_worst_io_latencies)); + _engine.Running.connect (sigc::mem_fun (*this, &Session::set_worst_io_latencies)); if (synced_to_jack()) { _engine.transport_stop (); @@ -873,7 +876,7 @@ Session::diskstream_playlist_changed (boost::weak_ptr<Diskstream> wp) boost::shared_ptr<Playlist> playlist; if ((playlist = dstream->playlist()) != 0) { - playlist->LengthChanged.connect (mem_fun (this, &Session::playlist_length_changed)); + playlist->LengthChanged.connect (sigc::mem_fun (this, &Session::playlist_length_changed)); } /* see comment in playlist_length_changed () */ @@ -1013,9 +1016,9 @@ Session::set_auto_punch_location (Location* location) auto_punch_end_changed_connection.disconnect(); auto_punch_changed_connection.disconnect(); - auto_punch_start_changed_connection = location->start_changed.connect (mem_fun (this, &Session::auto_punch_start_changed)); - auto_punch_end_changed_connection = location->end_changed.connect (mem_fun (this, &Session::auto_punch_end_changed)); - auto_punch_changed_connection = location->changed.connect (mem_fun (this, &Session::auto_punch_changed)); + auto_punch_start_changed_connection = location->start_changed.connect (sigc::mem_fun (this, &Session::auto_punch_start_changed)); + auto_punch_end_changed_connection = location->end_changed.connect (sigc::mem_fun (this, &Session::auto_punch_end_changed)); + auto_punch_changed_connection = location->changed.connect (sigc::mem_fun (this, &Session::auto_punch_changed)); location->set_auto_punch (true, this); @@ -1057,11 +1060,11 @@ Session::set_auto_loop_location (Location* location) auto_loop_changed_connection.disconnect(); auto_loop_start_changed_connection = location->start_changed.connect ( - mem_fun (this, &Session::auto_loop_changed)); + sigc::mem_fun (this, &Session::auto_loop_changed)); auto_loop_end_changed_connection = location->end_changed.connect ( - mem_fun (this, &Session::auto_loop_changed)); + sigc::mem_fun (this, &Session::auto_loop_changed)); auto_loop_changed_connection = location->changed.connect ( - mem_fun (this, &Session::auto_loop_changed)); + sigc::mem_fun (this, &Session::auto_loop_changed)); location->set_auto_loop (true, this); @@ -1655,7 +1658,7 @@ Session::new_midi_track (TrackMode mode, RouteGroup* route_group, uint32_t how_m route_group->add (track); } - track->DiskstreamChanged.connect (mem_fun (this, &Session::resort_routes)); + track->DiskstreamChanged.connect (sigc::mem_fun (this, &Session::resort_routes)); //track->set_remote_control_id (control_id); new_routes.push_back (track); @@ -1830,7 +1833,7 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod track->audio_diskstream()->non_realtime_input_change(); - track->DiskstreamChanged.connect (mem_fun (this, &Session::resort_routes)); + track->DiskstreamChanged.connect (sigc::mem_fun (this, &Session::resort_routes)); track->set_remote_control_id (control_id); ++control_id; @@ -2155,12 +2158,12 @@ Session::add_routes (RouteList& new_routes, bool save) boost::weak_ptr<Route> wpr (*x); - (*x)->listen_changed.connect (sigc::bind (mem_fun (*this, &Session::route_listen_changed), wpr)); - (*x)->solo_changed.connect (sigc::bind (mem_fun (*this, &Session::route_solo_changed), wpr)); - (*x)->mute_changed.connect (mem_fun (*this, &Session::route_mute_changed)); - (*x)->output()->changed.connect (mem_fun (*this, &Session::set_worst_io_latencies_x)); - (*x)->processors_changed.connect (mem_fun (*this, &Session::route_processors_changed)); - (*x)->route_group_changed.connect (mem_fun (*this, &Session::route_group_changed)); + (*x)->listen_changed.connect (sigc::bind (sigc::mem_fun (*this, &Session::route_listen_changed), wpr)); + (*x)->solo_changed.connect (sigc::bind (sigc::mem_fun (*this, &Session::route_solo_changed), wpr)); + (*x)->mute_changed.connect (sigc::mem_fun (*this, &Session::route_mute_changed)); + (*x)->output()->changed.connect (sigc::mem_fun (*this, &Session::set_worst_io_latencies_x)); + (*x)->processors_changed.connect (sigc::mem_fun (*this, &Session::route_processors_changed)); + (*x)->route_group_changed.connect (sigc::mem_fun (*this, &Session::route_group_changed)); if ((*x)->is_master()) { _master_out = (*x); @@ -2300,11 +2303,11 @@ Session::add_diskstream (boost::shared_ptr<Diskstream> dstream) /* writer goes out of scope, copies ds back to main */ } - dstream->PlaylistChanged.connect (sigc::bind (mem_fun (*this, &Session::diskstream_playlist_changed), boost::weak_ptr<Diskstream> (dstream))); + dstream->PlaylistChanged.connect (sigc::bind (sigc::mem_fun (*this, &Session::diskstream_playlist_changed), boost::weak_ptr<Diskstream> (dstream))); /* this will connect to future changes, and check the current length */ diskstream_playlist_changed (boost::weak_ptr<Diskstream> (dstream)); - dstream->RecordEnableChanged.connect (mem_fun (*this, &Session::update_have_rec_enabled_diskstream)); + dstream->RecordEnableChanged.connect (sigc::mem_fun (*this, &Session::update_have_rec_enabled_diskstream)); dstream->prepare (); @@ -2818,8 +2821,8 @@ Session::add_regions (vector<boost::shared_ptr<Region> >& new_regions) } } - region->StateChanged.connect (sigc::bind (mem_fun (*this, &Session::region_changed), boost::weak_ptr<Region>(region))); - region->GoingAway.connect (sigc::bind (mem_fun (*this, &Session::remove_region), boost::weak_ptr<Region>(region))); + region->StateChanged.connect (sigc::bind (sigc::mem_fun (*this, &Session::region_changed), boost::weak_ptr<Region>(region))); + region->GoingAway.connect (sigc::bind (sigc::mem_fun (*this, &Session::remove_region), boost::weak_ptr<Region>(region))); update_region_name_map (region); } @@ -3007,7 +3010,7 @@ Session::add_source (boost::shared_ptr<Source> source) } if (result.second) { - source->GoingAway.connect (sigc::bind (mem_fun (this, &Session::remove_source), boost::weak_ptr<Source> (source))); + source->GoingAway.connect (sigc::bind (sigc::mem_fun (this, &Session::remove_source), boost::weak_ptr<Source> (source))); set_dirty(); } @@ -3398,7 +3401,7 @@ Session::add_playlist (boost::shared_ptr<Playlist> playlist, bool unused) bool existing = playlists->add (playlist); if (!existing) { - playlist->GoingAway.connect (sigc::bind (mem_fun (*this, &Session::remove_playlist), boost::weak_ptr<Playlist>(playlist))); + playlist->GoingAway.connect (sigc::bind (sigc::mem_fun (*this, &Session::remove_playlist), boost::weak_ptr<Playlist>(playlist))); } if (unused) { @@ -3572,7 +3575,7 @@ Session::graph_reordered () void Session::add_processor (Processor* processor) { - processor->GoingAway.connect (sigc::bind (mem_fun (*this, &Session::remove_processor), processor)); + processor->GoingAway.connect (sigc::bind (sigc::mem_fun (*this, &Session::remove_processor), processor)); set_dirty(); } diff --git a/libs/ardour/session_configuration.cc b/libs/ardour/session_configuration.cc index 0cdb85bfd0..899b85e770 100644 --- a/libs/ardour/session_configuration.cc +++ b/libs/ardour/session_configuration.cc @@ -112,12 +112,12 @@ SessionConfiguration::set_variables (const XMLNode& node) } void -SessionConfiguration::map_parameters (sigc::slot<void, std::string> theSlot) +SessionConfiguration::map_parameters (boost::function<void (std::string)>& functor) { #undef CONFIG_VARIABLE #undef CONFIG_VARIABLE_SPECIAL -#define CONFIG_VARIABLE(type,var,name,value) theSlot (name); -#define CONFIG_VARIABLE_SPECIAL(type,var,name,value,mutator) theSlot (name); +#define CONFIG_VARIABLE(type,var,name,value) functor (name); +#define CONFIG_VARIABLE_SPECIAL(type,var,name,value,mutator) functor (name); #include "ardour/session_configuration_vars.h" #undef CONFIG_VARIABLE #undef CONFIG_VARIABLE_SPECIAL diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc index 4388fe6dca..d006097f09 100644 --- a/libs/ardour/session_midi.cc +++ b/libs/ardour/session_midi.cc @@ -209,38 +209,38 @@ Session::set_mmc_port (string port_tag) } mmc->Play.connect - (mem_fun (*this, &Session::mmc_deferred_play)); + (sigc::mem_fun (*this, &Session::mmc_deferred_play)); mmc->DeferredPlay.connect - (mem_fun (*this, &Session::mmc_deferred_play)); + (sigc::mem_fun (*this, &Session::mmc_deferred_play)); mmc->Stop.connect - (mem_fun (*this, &Session::mmc_stop)); + (sigc::mem_fun (*this, &Session::mmc_stop)); mmc->FastForward.connect - (mem_fun (*this, &Session::mmc_fast_forward)); + (sigc::mem_fun (*this, &Session::mmc_fast_forward)); mmc->Rewind.connect - (mem_fun (*this, &Session::mmc_rewind)); + (sigc::mem_fun (*this, &Session::mmc_rewind)); mmc->Pause.connect - (mem_fun (*this, &Session::mmc_pause)); + (sigc::mem_fun (*this, &Session::mmc_pause)); mmc->RecordPause.connect - (mem_fun (*this, &Session::mmc_record_pause)); + (sigc::mem_fun (*this, &Session::mmc_record_pause)); mmc->RecordStrobe.connect - (mem_fun (*this, &Session::mmc_record_strobe)); + (sigc::mem_fun (*this, &Session::mmc_record_strobe)); mmc->RecordExit.connect - (mem_fun (*this, &Session::mmc_record_exit)); + (sigc::mem_fun (*this, &Session::mmc_record_exit)); mmc->Locate.connect - (mem_fun (*this, &Session::mmc_locate)); + (sigc::mem_fun (*this, &Session::mmc_locate)); mmc->Step.connect - (mem_fun (*this, &Session::mmc_step)); + (sigc::mem_fun (*this, &Session::mmc_step)); mmc->Shuttle.connect - (mem_fun (*this, &Session::mmc_shuttle)); + (sigc::mem_fun (*this, &Session::mmc_shuttle)); mmc->TrackRecordStatusChange.connect - (mem_fun (*this, &Session::mmc_record_enable)); + (sigc::mem_fun (*this, &Session::mmc_record_enable)); /* also handle MIDI SPP because its so common */ - _mmc_port->input()->start.connect (mem_fun (*this, &Session::spp_start)); - _mmc_port->input()->contineu.connect (mem_fun (*this, &Session::spp_continue)); - _mmc_port->input()->stop.connect (mem_fun (*this, &Session::spp_stop)); + _mmc_port->input()->start.connect (sigc::mem_fun (*this, &Session::spp_start)); + _mmc_port->input()->contineu.connect (sigc::mem_fun (*this, &Session::spp_continue)); + _mmc_port->input()->stop.connect (sigc::mem_fun (*this, &Session::spp_stop)); Config->set_mmc_port_name (port_tag); @@ -641,7 +641,7 @@ Session::mmc_step (MIDI::MachineControl &/*mmc*/, int steps) if (!step_queued) { if (midi_control_ui) { RefPtr<TimeoutSource> tsrc = TimeoutSource::create (100); - tsrc->connect (mem_fun (*this, &Session::mmc_step_timeout)); + tsrc->connect (sigc::mem_fun (*this, &Session::mmc_step_timeout)); tsrc->attach (midi_control_ui->main_loop()->get_context()); step_queued = true; } diff --git a/libs/ardour/session_playlists.cc b/libs/ardour/session_playlists.cc index 55ca8da0bc..5af0dc4caa 100644 --- a/libs/ardour/session_playlists.cc +++ b/libs/ardour/session_playlists.cc @@ -73,7 +73,7 @@ SessionPlaylists::add (boost::shared_ptr<Playlist> playlist) if (!existing) { playlists.insert (playlists.begin(), playlist); - playlist->InUse.connect (sigc::bind (mem_fun (*this, &SessionPlaylists::track), boost::weak_ptr<Playlist>(playlist))); + playlist->InUse.connect (sigc::bind (sigc::mem_fun (*this, &SessionPlaylists::track), boost::weak_ptr<Playlist>(playlist))); } return existing; diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 74578039a8..3364de9815 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -165,7 +165,7 @@ Session::first_stage_init (string fullpath, string snapshot_name) _base_frame_rate = _current_frame_rate; _tempo_map = new TempoMap (_current_frame_rate); - _tempo_map->StateChanged.connect (mem_fun (*this, &Session::tempo_map_changed)); + _tempo_map->StateChanged.connect (sigc::mem_fun (*this, &Session::tempo_map_changed)); _non_soloed_outs_muted = false; @@ -267,20 +267,20 @@ Session::first_stage_init (string fullpath, string snapshot_name) delta_accumulator_cnt = 0; _slave_state = Stopped; - _engine.GraphReordered.connect (mem_fun (*this, &Session::graph_reordered)); + _engine.GraphReordered.connect (sigc::mem_fun (*this, &Session::graph_reordered)); /* These are all static "per-class" signals */ - RegionFactory::CheckNewRegion.connect (mem_fun (*this, &Session::add_region)); - SourceFactory::SourceCreated.connect (mem_fun (*this, &Session::add_source)); - PlaylistFactory::PlaylistCreated.connect (mem_fun (*this, &Session::add_playlist)); - Processor::ProcessorCreated.connect (mem_fun (*this, &Session::add_processor)); - NamedSelection::NamedSelectionCreated.connect (mem_fun (*this, &Session::add_named_selection)); - AutomationList::AutomationListCreated.connect (mem_fun (*this, &Session::add_automation_list)); + RegionFactory::CheckNewRegion.connect (sigc::mem_fun (*this, &Session::add_region)); + SourceFactory::SourceCreated.connect (sigc::mem_fun (*this, &Session::add_source)); + PlaylistFactory::PlaylistCreated.connect (sigc::mem_fun (*this, &Session::add_playlist)); + Processor::ProcessorCreated.connect (sigc::mem_fun (*this, &Session::add_processor)); + NamedSelection::NamedSelectionCreated.connect (sigc::mem_fun (*this, &Session::add_named_selection)); + AutomationList::AutomationListCreated.connect (sigc::mem_fun (*this, &Session::add_automation_list)); - Controllable::Destroyed.connect (mem_fun (*this, &Session::remove_controllable)); + Controllable::Destroyed.connect (sigc::mem_fun (*this, &Session::remove_controllable)); - IO::PortCountChanged.connect (mem_fun (*this, &Session::ensure_buffers)); + IO::PortCountChanged.connect (sigc::mem_fun (*this, &Session::ensure_buffers)); /* stop IO objects from doing stuff until we're ready for them */ @@ -332,15 +332,15 @@ Session::second_stage_init (bool new_session) _state_of_the_state = StateOfTheState (_state_of_the_state|CannotSave|Loading); - _locations.changed.connect (mem_fun (this, &Session::locations_changed)); - _locations.added.connect (mem_fun (this, &Session::locations_added)); + _locations.changed.connect (sigc::mem_fun (this, &Session::locations_changed)); + _locations.added.connect (sigc::mem_fun (this, &Session::locations_added)); setup_click_sounds (0); setup_midi_control (); /* Pay attention ... */ - _engine.Halted.connect (mem_fun (*this, &Session::engine_halted)); - _engine.Xrun.connect (mem_fun (*this, &Session::xrun_recovery)); + _engine.Halted.connect (sigc::mem_fun (*this, &Session::engine_halted)); + _engine.Xrun.connect (sigc::mem_fun (*this, &Session::xrun_recovery)); try { when_engine_running(); diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc index a632ae067d..63bb4c4213 100644 --- a/libs/ardour/session_transport.cc +++ b/libs/ardour/session_transport.cc @@ -47,7 +47,6 @@ using namespace std; using namespace ARDOUR; -using namespace sigc; using namespace PBD; void diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc index 5836bdd95c..7f66486425 100644 --- a/libs/ardour/sndfilesource.cc +++ b/libs/ardour/sndfilesource.cc @@ -193,7 +193,7 @@ SndFileSource::init_sndfile () } AudioFileSource::HeaderPositionOffsetChanged.connect ( - mem_fun (*this, &SndFileSource::handle_header_position_change)); + sigc::mem_fun (*this, &SndFileSource::handle_header_position_change)); } int diff --git a/libs/ardour/ticker.cc b/libs/ardour/ticker.cc index 7f7ca32907..ab0a7144a8 100644 --- a/libs/ardour/ticker.cc +++ b/libs/ardour/ticker.cc @@ -36,8 +36,8 @@ void Ticker::set_session(Session& s) _session = &s; if (_session) { - _session->tick.connect(mem_fun (*this, &Ticker::tick)); - _session->GoingAway.connect(mem_fun (*this, &Ticker::going_away)); + _session->tick.connect(sigc::mem_fun (*this, &Ticker::tick)); + _session->GoingAway.connect(sigc::mem_fun (*this, &Ticker::going_away)); } } @@ -47,13 +47,13 @@ void MidiClockTicker::set_session(Session& s) if (_session) { _session->MIDIClock_PortChanged.connect( - mem_fun (*this, &MidiClockTicker::update_midi_clock_port)); + sigc::mem_fun (*this, &MidiClockTicker::update_midi_clock_port)); _session->TransportStateChange.connect( - mem_fun (*this, &MidiClockTicker::transport_state_changed)); + sigc::mem_fun (*this, &MidiClockTicker::transport_state_changed)); _session->PositionChanged.connect( - mem_fun (*this, &MidiClockTicker::position_changed)); + sigc::mem_fun (*this, &MidiClockTicker::position_changed)); _session->TransportLooped.connect( - mem_fun (*this, &MidiClockTicker::transport_looped)); + sigc::mem_fun (*this, &MidiClockTicker::transport_looped)); update_midi_clock_port(); } } diff --git a/libs/pbd/pbd/ui_callback.h b/libs/pbd/pbd/ui_callback.h index 878f6e4fd0..8574de0dec 100644 --- a/libs/pbd/pbd/ui_callback.h +++ b/libs/pbd/pbd/ui_callback.h @@ -21,6 +21,7 @@ #define __pbd_ui_callback_h__ #include <boost/function.hpp> +#include <boost/bind.hpp> /* we don't need this here, but anything calling call_slot() probably will, so this is convenient */ #include <glibmm/thread.h> namespace PBD diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc index 7e67c52adf..4a151d44d0 100644 --- a/libs/surfaces/osc/osc.cc +++ b/libs/surfaces/osc/osc.cc @@ -47,7 +47,6 @@ #include "i18n.h" using namespace ARDOUR; -using namespace sigc; using namespace std; using namespace Glib; @@ -83,7 +82,7 @@ OSC::OSC (Session& s, uint32_t port) // "Application Hooks" session_loaded (s); - session->Exported.connect (mem_fun (*this, &OSC::session_exported)); + session->Exported.connect (sigc::mem_fun (*this, &OSC::session_exported)); } OSC::~OSC() @@ -213,7 +212,7 @@ OSC::thread_init () { if (_osc_unix_server) { Glib::RefPtr<IOSource> src = IOSource::create (lo_server_get_socket_fd (_osc_unix_server), IO_IN|IO_HUP|IO_ERR); - src->connect (bind (sigc::mem_fun (*this, &OSC::osc_input_handler), _osc_unix_server)); + src->connect (sigc::bind (sigc::mem_fun (*this, &OSC::osc_input_handler), _osc_unix_server)); src->attach (_main_loop->get_context()); local_server = src->gobj(); g_source_ref (local_server); @@ -221,7 +220,7 @@ OSC::thread_init () if (_osc_server) { Glib::RefPtr<IOSource> src = IOSource::create (lo_server_get_socket_fd (_osc_server), IO_IN|IO_HUP|IO_ERR); - src->connect (bind (sigc::mem_fun (*this, &OSC::osc_input_handler), _osc_server)); + src->connect (sigc::bind (sigc::mem_fun (*this, &OSC::osc_input_handler), _osc_server)); src->attach (_main_loop->get_context()); remote_server = src->gobj(); g_source_ref (remote_server); @@ -573,7 +572,7 @@ OSC::listen_to_route (boost::shared_ptr<Route> route, lo_address addr) */ if (!route_exists) { - route->GoingAway.connect (bind (mem_fun (*this, &OSC::drop_route), boost::weak_ptr<Route> (route))); + route->GoingAway.connect (sigc::bind (sigc::mem_fun (*this, &OSC::drop_route), boost::weak_ptr<Route> (route))); } } |