smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 06:44:57 +01:00
Code Issues Projects Releases Wiki Activity

remove using namespace sigc everywhere to ensure clarity over which bind/mem_fun is being used; make Config::map_parameters take a boost::function rather than a sigc::slot ; continue debugging crash caused by regionviews not tracking their Region's lifetime

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@6357 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2009-12-12 15:02:15 +00:00
parent 0c80b01f47
commit 8687895abb
122 changed files with 201 additions and 282 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gtk2_ardour/about.cc
View file

@ -44,7 +44,6 @@
using namespace Gtk;
using namespace Gdk;
using namespace std;
using namespace sigc;
using namespace ARDOUR;
using namespace PBD;

1
gtk2_ardour/actions.cc
View file

@ -44,7 +44,6 @@
using namespace std;
using namespace Gtk;
using namespace Glib;
using namespace sigc;
using namespace PBD;
using namespace ARDOUR;

1
gtk2_ardour/add_midi_cc_track_dialog.cc
View file

@ -31,7 +31,6 @@
#include "i18n.h"
using namespace Gtk;
using namespace sigc;
using namespace std;
using namespace PBD;
using namespace ARDOUR;

1
gtk2_ardour/add_route_dialog.cc
View file

@ -40,7 +40,6 @@
using namespace Gtk;
using namespace Gtkmm2ext;
using namespace sigc;
using namespace std;
using namespace PBD;
using namespace ARDOUR;

1
gtk2_ardour/ardour_dialog.cc
View file

@ -30,7 +30,6 @@
#include "utils.h"
using namespace std;
using namespace sigc;
using namespace Gtk;
using namespace Gtkmm2ext;

4
gtk2_ardour/ardour_ui.cc
View file

@ -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 */

6
gtk2_ardour/ardour_ui2.cc
View file

@ -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 ();

1
gtk2_ardour/ardour_ui_dependents.cc
View file

@ -36,7 +36,6 @@
#include "opts.h"
#include "i18n.h"
using namespace sigc;
using namespace Gtk;
using namespace PBD;

1
gtk2_ardour/ardour_ui_ed.cc
View file

@ -60,7 +60,6 @@ using namespace PBD;
using namespace Gtkmm2ext;
using namespace Gtk;
using namespace Glib;
using namespace sigc;
int
ARDOUR_UI::create_editor ()

4
gtk2_ardour/ardour_ui_options.cc
View file

@ -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

1
gtk2_ardour/audio_clock.cc
View file

@ -39,7 +39,6 @@
using namespace ARDOUR;
using namespace PBD;
using namespace sigc;
using namespace Gtk;
using namespace std;

1
gtk2_ardour/audio_region_editor.cc
View file

@ -38,7 +38,6 @@
using namespace ARDOUR;
using namespace PBD;
using namespace sigc;
using namespace std;
using namespace Gtkmm2ext;

3
gtk2_ardour/audio_region_view.cc
View file

@ -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;
}

3
gtk2_ardour/automation_controller.cc
View file

@ -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));
}

3
gtk2_ardour/automation_line.cc
View file

@ -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));
}
}

1
gtk2_ardour/control_point.cc
View file

@ -26,7 +26,6 @@
#include "i18n.h"
using namespace std;
using namespace sigc;
using namespace ARDOUR;
using namespace PBD;
using namespace Gnome; // for Canvas

1
gtk2_ardour/crossfade_edit.cc
View file

@ -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;

1
gtk2_ardour/crossfade_view.cc
View file

@ -33,7 +33,6 @@
#include "canvas_impl.h"
#include "ardour_ui.h"
using namespace sigc;
using namespace ARDOUR;
using namespace PBD;
using namespace Editing;

6
gtk2_ardour/editor.cc
View file

@ -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));

1
gtk2_ardour/editor_actions.cc
View file

@ -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;

1
gtk2_ardour/editor_audio_import.cc
View file

@ -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;

1
gtk2_ardour/editor_canvas.cc
View file

@ -49,7 +49,6 @@
#include "i18n.h"
using namespace std;
using namespace sigc;
using namespace ARDOUR;
using namespace PBD;
using namespace Gtk;

1
gtk2_ardour/editor_canvas_events.cc
View file

@ -52,7 +52,6 @@
#include "i18n.h"
using namespace sigc;
using namespace std;
using namespace ARDOUR;
using namespace PBD;

3
gtk2_ardour/editor_component.cc
View file

@ -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 ();
}

1
gtk2_ardour/editor_cursors.cc
View file

@ -25,7 +25,6 @@
#include "utils.h"
#include "editor.h"
using namespace sigc;
using namespace ARDOUR;
using namespace PBD;
using namespace Gtk;

1
gtk2_ardour/editor_drag.cc
View file

@ -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;

4
gtk2_ardour/editor_imageframe.cc
View file

@ -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

1
gtk2_ardour/editor_keys.cc
View file

@ -37,7 +37,6 @@
using namespace ARDOUR;
using namespace PBD;
using namespace sigc;
void
Editor::keyboard_selection_finish (bool add)

1
gtk2_ardour/editor_markers.cc
View file

@ -41,7 +41,6 @@
#include "i18n.h"
using namespace std;
using namespace sigc;
using namespace ARDOUR;
using namespace PBD;
using namespace Gtk;

1
gtk2_ardour/editor_mouse.cc
View file

@ -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;

1
gtk2_ardour/editor_nudge.cc
View file

@ -24,7 +24,6 @@
#include "i18n.h"
using namespace sigc;
using namespace ARDOUR;
using namespace PBD;
using namespace Gtk;

1
gtk2_ardour/editor_ops.cc
View file

@ -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;

3
gtk2_ardour/editor_regions.cc
View file

@ -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 ();

1
gtk2_ardour/editor_route_groups.cc
View file

@ -42,7 +42,6 @@
#include "i18n.h"
using namespace std;
using namespace sigc;
using namespace ARDOUR;
using namespace PBD;
using namespace Gtk;

1
gtk2_ardour/editor_routes.cc
View file

@ -49,7 +49,6 @@
#include "i18n.h"
using namespace std;
using namespace sigc;
using namespace ARDOUR;
using namespace PBD;
using namespace Gtk;

1
gtk2_ardour/editor_rulers.cc
View file

@ -41,7 +41,6 @@
#include "i18n.h"
using namespace sigc;
using namespace ARDOUR;
using namespace PBD;
using namespace Gtk;

3
gtk2_ardour/editor_selection.cc
View file

@ -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) {

3
gtk2_ardour/editor_selection_list.cc
View file

@ -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

1
gtk2_ardour/editor_snapshots.cc
View file

@ -30,7 +30,6 @@
#include "prompter.h"
using namespace std;
using namespace sigc;
using namespace PBD;
using namespace Gtk;
using namespace ARDOUR;

1
gtk2_ardour/editor_summary.cc
View file

@ -28,7 +28,6 @@
#include "keyboard.h"
using namespace std;
using namespace sigc;
using namespace ARDOUR;
using Gtkmm2ext::Keyboard;

1
gtk2_ardour/editor_tempodisplay.cc
View file

@ -49,7 +49,6 @@
#include "i18n.h"
using namespace std;
using namespace sigc;
using namespace ARDOUR;
using namespace PBD;
using namespace Gtk;

1
gtk2_ardour/editor_timefx.cc
View file

@ -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;

3
gtk2_ardour/gain_meter.cc
View file

@ -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

3
gtk2_ardour/generic_pluginui.cc
View file

@ -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));
}
}

1
gtk2_ardour/imageframe_socket_handler.cc
View file

@ -50,7 +50,6 @@
using namespace std;
using namespace ardourvis ;
using namespace sigc;
using namespace ARDOUR;
using namespace PBD;

1
gtk2_ardour/imageframe_time_axis.cc
View file

@ -47,7 +47,6 @@
using namespace ARDOUR;
using namespace PBD;
using namespace sigc;
using namespace Gtk;
/**

1
gtk2_ardour/imageframe_view.cc
View file

@ -34,7 +34,6 @@
#include "canvas_impl.h"
#include "gui_thread.h"
using namespace sigc ;
using namespace ARDOUR ;
using namespace Gtk;

1
gtk2_ardour/itest.cc
View file

@ -35,7 +35,6 @@
#include <jack/jack.h>
using namespace std;
using namespace sigc;
using namespace Gtk;
using namespace Gtkmm2ext;
using namespace Glib;

1
gtk2_ardour/latency_gui.cc
View file

@ -12,7 +12,6 @@
using namespace PBD;
using namespace Gtk;
using namespace Gtkmm2ext;
using namespace sigc;
using namespace ARDOUR;

1
gtk2_ardour/level_meter.cc
View file

@ -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;

1
gtk2_ardour/main.cc
View file

@ -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");

1
gtk2_ardour/marker_time_axis.cc
View file

@ -42,7 +42,6 @@
using namespace ARDOUR;
using namespace PBD;
using namespace sigc;
using namespace Gtk;
//---------------------------------------------------------------------------------------//

1
gtk2_ardour/marker_view.cc
View file

@ -26,7 +26,6 @@
#include "marker_view.h"
using namespace ARDOUR ;
using namespace sigc;
sigc::signal<void,MarkerView*> MarkerView::GoingAway;

1
gtk2_ardour/midi_channel_selector.cc
View file

@ -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)

1
gtk2_ardour/midi_port_dialog.cc
View file

@ -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 };

1
gtk2_ardour/midi_region_view.cc
View file

@ -65,7 +65,6 @@
#include "i18n.h"
using namespace sigc;
using namespace ARDOUR;
using namespace PBD;
using namespace Editing;

1
gtk2_ardour/midi_time_axis.cc
View file

@ -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

7
gtk2_ardour/mixer_strip.cc
View file

@ -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);
}

1
gtk2_ardour/mixer_ui.cc
View file

@ -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;

1
gtk2_ardour/mtest.cc
View file

@ -26,7 +26,6 @@
using namespace Gtk;
using namespace std;
using namespace sigc;
using namespace Glib;
void

5
gtk2_ardour/option_editor.cc
View file

@ -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)

1
gtk2_ardour/panner2d.cc
View file

@ -36,7 +36,6 @@
using namespace std;
using namespace Gtk;
using namespace sigc;
using namespace ARDOUR;
using namespace PBD;
using Gtkmm2ext::Keyboard;

1
gtk2_ardour/panner_ui.cc
View file

@ -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;

1
gtk2_ardour/playlist_selector.cc
View file

@ -36,7 +36,6 @@
#include "i18n.h"
using namespace std;
using namespace sigc;
using namespace Gtk;
using namespace Gtkmm2ext;
using namespace ARDOUR;

1
gtk2_ardour/plugin_ui.cc
View file

@ -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)

3
gtk2_ardour/port_matrix.cc
View file

@ -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 ();

1
gtk2_ardour/processor_box.cc
View file

@ -80,7 +80,6 @@ class AUPluginUI;
#endif
using namespace std;
using namespace sigc;
using namespace ARDOUR;
using namespace PBD;
using namespace Gtk;

1
gtk2_ardour/rc_option_editor.cc
View file

@ -18,7 +18,6 @@
#include "i18n.h"
using namespace std;
using namespace sigc;
using namespace Gtk;
using namespace Gtkmm2ext;
using namespace PBD;

1
gtk2_ardour/region_selection.cc
View file

@ -27,7 +27,6 @@
using namespace std;
using namespace ARDOUR;
using namespace PBD;
using namespace sigc;
/** Construct an empty RegionSelection.
*/

5
gtk2_ardour/region_view.cc
View file

@ -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

1
gtk2_ardour/route_params_ui.cc
View file

@ -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"),

1
gtk2_ardour/route_processor_selection.cc
View file

@ -32,7 +32,6 @@
using namespace std;
using namespace ARDOUR;
using namespace PBD;
using namespace sigc;
RouteRedirectSelection&
RouteRedirectSelection::operator= (const RouteRedirectSelection& other)

5
gtk2_ardour/route_time_axis.cc
View file

@ -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

15
gtk2_ardour/route_ui.cc
View file

@ -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()));
}
}

1
gtk2_ardour/selection.cc
View file

@ -38,7 +38,6 @@
using namespace std;
using namespace ARDOUR;
using namespace PBD;
using namespace sigc;
struct AudioRangeComparator {
bool operator()(AudioRange a, AudioRange b) {

1
gtk2_ardour/session_option_editor.cc
View file

@ -8,7 +8,6 @@
#include "i18n.h"
using namespace std;
using namespace sigc;
using namespace ARDOUR;
class OptionsPortMatrix : public PortMatrix

20
gtk2_ardour/streamview.cc
View file

@ -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

1
gtk2_ardour/tape_region_view.cc
View file

@ -35,7 +35,6 @@
#include "i18n.h"
using namespace sigc;
using namespace ARDOUR;
using namespace PBD;
using namespace Editing;

1
gtk2_ardour/time_axis_view.cc
View file

@ -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;

1
gtk2_ardour/time_fx_dialog.cc
View file

@ -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;

1
gtk2_ardour/utils.cc
View file

@ -50,7 +50,6 @@
using namespace std;
using namespace Gtk;
using namespace sigc;
using namespace Glib;
using namespace PBD;
using Gtkmm2ext::Keyboard;

1
gtk2_ardour/visual_time_axis.cc
View file

@ -55,7 +55,6 @@
using namespace ARDOUR;
using namespace PBD;
using namespace sigc;
using namespace Gtk;
/**

1
libs/ardour/analyser.cc
View file

@ -26,7 +26,6 @@
#include "pbd/convert.h"
using namespace std;
using namespace sigc;
using namespace ARDOUR;
using namespace PBD;

4
libs/ardour/ardour/configuration.h
View file

@ -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;

2
libs/ardour/ardour/rc_configuration.h
View file

@ -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 ();

2
libs/ardour/ardour/session_configuration.h
View file

@ -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 ();

2
libs/ardour/audio_diskstream.cc
View file

@ -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);

9
libs/ardour/audio_playlist.cc
View file

@ -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);
}

4
libs/ardour/audio_track.cc
View file

@ -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 ();
}

18
libs/ardour/audioregion.cc
View file

@ -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

2
libs/ardour/auditioner.cc
View file

@ -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);

1
libs/ardour/automation_list.cc
View file

@ -34,7 +34,6 @@
using namespace std;
using namespace ARDOUR;
using namespace sigc;
using namespace PBD;
sigc::signal<void,AutomationList *> AutomationList::AutomationListCreated;

2
libs/ardour/control_protocol_manager.cc
View file

@ -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) {

18
libs/ardour/delivery.cc
View file

@ -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));
}
}

10
libs/ardour/diskstream.cc
View file

@ -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

4
libs/ardour/internal_return.cc
View file

@ -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

6
libs/ardour/internal_send.cc
View file

@ -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 ();
}

4
libs/ardour/io.cc
View file

@ -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;

1
libs/ardour/jack_slave.cc
View file

@ -30,7 +30,6 @@
using namespace std;
using namespace ARDOUR;
using namespace sigc;
JACK_Slave::JACK_Slave (jack_client_t* j)
: jack (j)

1
libs/ardour/location.cc
View file

@ -41,7 +41,6 @@
using namespace std;
using namespace ARDOUR;
using namespace sigc;
using namespace PBD;
Location::Location (const Location& other)

Some files were not shown because too many files have changed in this diff Show more