diff options
Diffstat (limited to 'gtk2_ardour')
82 files changed, 49 insertions, 123 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; /** |