From 7161ce167ca3745d5762c1a5e75c1061d8ec9788 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Wed, 23 Apr 2014 15:48:39 -0700 Subject: [PATCH] Use lambdas rather than std::bind(std::ref(Signal)) for signal forwarding --- src/audio_timing_dialogue.cpp | 6 +++--- src/audio_timing_karaoke.cpp | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/audio_timing_dialogue.cpp b/src/audio_timing_dialogue.cpp index 95806ca4e..25522cd9a 100644 --- a/src/audio_timing_dialogue.cpp +++ b/src/audio_timing_dialogue.cpp @@ -432,9 +432,9 @@ AudioTimingControllerDialogue::AudioTimingControllerDialogue(agi::Context *c) , active_line_connection(c->selectionController->AddActiveLineListener(&AudioTimingControllerDialogue::OnActiveLineChanged, this)) , selection_connection(c->selectionController->AddSelectionListener(&AudioTimingControllerDialogue::OnSelectedSetChanged, this)) { - keyframes_provider.AddMarkerMovedListener(std::bind(std::ref(AnnounceMarkerMoved))); - video_position_provider.AddMarkerMovedListener(std::bind(std::ref(AnnounceMarkerMoved))); - seconds_provider.AddMarkerMovedListener(std::bind(std::ref(AnnounceMarkerMoved))); + keyframes_provider.AddMarkerMovedListener([=]{ AnnounceMarkerMoved(); }); + video_position_provider.AddMarkerMovedListener([=]{ AnnounceMarkerMoved(); }); + seconds_provider.AddMarkerMovedListener([=]{ AnnounceMarkerMoved(); }); Revert(); } diff --git a/src/audio_timing_karaoke.cpp b/src/audio_timing_karaoke.cpp index 8ff6e5d52..4f5ed8314 100644 --- a/src/audio_timing_karaoke.cpp +++ b/src/audio_timing_karaoke.cpp @@ -172,11 +172,10 @@ AudioTimingControllerKaraoke::AudioTimingControllerKaraoke(agi::Context *c, AssK slots.push_back(kara->AddSyllablesChangedListener(&AudioTimingControllerKaraoke::Revert, this)); slots.push_back(OPT_SUB("Audio/Auto/Commit", &AudioTimingControllerKaraoke::OnAutoCommitChange, this)); - keyframes_provider.AddMarkerMovedListener(std::bind(std::ref(AnnounceMarkerMoved))); - video_position_provider.AddMarkerMovedListener(std::bind(std::ref(AnnounceMarkerMoved))); + keyframes_provider.AddMarkerMovedListener([=]{ AnnounceMarkerMoved(); }); + video_position_provider.AddMarkerMovedListener([=]{ AnnounceMarkerMoved(); }); Revert(); - } void AudioTimingControllerKaraoke::OnAutoCommitChange(agi::OptionValue const& opt) {