diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-10-26 02:17:45 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-10-26 02:17:45 +0200 |
| commit | cee4765caf903bf4b60e0e7539eaa2dae2bfa952 (patch) | |
| tree | e863bcb58ed51b7875d22532ba9f0bbf08fd4be0 /src/lib | |
| parent | 256bb5b0d41992d5ed10c5a72954eae553de9719 (diff) | |
Use new signalling code for the other Hints signals.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/hints.cc | 12 | ||||
| -rw-r--r-- | src/lib/hints.h | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/hints.cc b/src/lib/hints.cc index c414d2231..7f2fcb017 100644 --- a/src/lib/hints.cc +++ b/src/lib/hints.cc @@ -410,11 +410,11 @@ Hints::scan_content(shared_ptr<const Film> film) } if (check_loudness_done && have_text) { - emit(boost::bind(boost::ref(Progress), _("Examining subtitles and closed captions"))); + Progress.emit(_("Examining subtitles and closed captions")); } else if (!check_loudness_done && !have_text) { - emit(boost::bind(boost::ref(Progress), _("Examining audio"))); + Progress.emit(_("Examining audio")); } else { - emit(boost::bind(boost::ref(Progress), _("Examining audio, subtitles and closed captions"))); + Progress.emit(_("Examining audio, subtitles and closed captions")); } auto player = make_shared<Player>(film, Image::Alignment::COMPACT, false); @@ -441,7 +441,7 @@ Hints::scan_content(shared_ptr<const Film> film) if (_stop) { return; } - emit(boost::bind(boost::ref(Pulse))); + Pulse.emit(); last_pulse = now; } } @@ -535,7 +535,7 @@ try } dcp::filesystem::remove_all(dcp_dir); - emit(boost::bind(boost::ref(Finished))); + Finished.emit(); } catch (boost::thread_interrupted) { @@ -544,7 +544,7 @@ catch (boost::thread_interrupted) catch (...) { store_current(); - emit(boost::bind(boost::ref(Finished))); + Finished.emit(); } diff --git a/src/lib/hints.h b/src/lib/hints.h index 024224806..2a63017c8 100644 --- a/src/lib/hints.h +++ b/src/lib/hints.h @@ -46,9 +46,9 @@ public: void start(); Signal<void (std::string)> Hint; - boost::signals2::signal<void (std::string)> Progress; - boost::signals2::signal<void (void)> Pulse; - boost::signals2::signal<void (void)> Finished; + Signal<void (std::string)> Progress; + Signal<void (void)> Pulse; + Signal<void (void)> Finished; /* For tests only */ void join(); |