Use sigc::bind due to clash with std::bind

essej · Jun 7, 2016 · 0cb1e65 · 0cb1e65
1 parent 920443d
commit 0cb1e65
Show file tree

Hide file tree

Showing 4 changed files with 169 additions and 169 deletions.
diff --git a/src/engine.cpp b/src/engine.cpp
@@ -313,7 +313,7 @@ void Engine::set_midi_bridge (MidiBridge * bridge)
 		_midi_bridge->MidiControlEvent.connect (mem_fun(*this, &Engine::push_midi_control_event));
 		_midi_bridge->MidiSyncEvent.connect (mem_fun(*this, &Engine::push_sync_event));
 
-		ParamChanged.connect(bind (mem_fun(*_midi_bridge, &MidiBridge::parameter_changed), this));
+		ParamChanged.connect(sigc::bind(mem_fun(*_midi_bridge, &MidiBridge::parameter_changed), this));
 
 		_midi_bridge->set_output_midi_clock(_output_midi_clock);
 	}

diff --git a/src/gui/latency_panel.cpp b/src/gui/latency_panel.cpp
@@ -150,7 +150,7 @@ void LatencyPanel::init()
 	_input_spin->set_allow_outside_bounds(false);
 	//_input_spin->SetFont (sliderFont);
 	_input_spin->set_decimal_digits(0);
-	_input_spin->value_changed.connect (bind (mem_fun (*this,  &LatencyPanel::on_spin_change), (int) ID_InputLatency));
+	_input_spin->value_changed.connect (sigc::bind(mem_fun (*this,  &LatencyPanel::on_spin_change), (int) ID_InputLatency));
 	rowsizer->Add (_input_spin, 1, wxLEFT|wxEXPAND, 10);
 
 	_output_spin = new SpinBox(this, ID_OutputLatency, 0.0f, 100000.0f, 512.0f, false, wxDefaultPosition, wxSize(200, 35));
@@ -160,7 +160,7 @@ void LatencyPanel::init()
 	_output_spin->set_allow_outside_bounds(false);
 	_output_spin->set_decimal_digits(0);
 	//_output_spin->SetFont (sliderFont);
-	_output_spin->value_changed.connect (bind (mem_fun (*this,  &LatencyPanel::on_spin_change), (int) ID_OutputLatency));
+	_output_spin->value_changed.connect (sigc::bind(mem_fun (*this,  &LatencyPanel::on_spin_change), (int) ID_OutputLatency));
 	rowsizer->Add (_output_spin, 1, wxLEFT|wxRIGHT|wxEXPAND, 10);