From: Carl Hetherington Date: Tue, 19 Nov 2019 16:13:25 +0000 (+0100) Subject: Naming tweak. X-Git-Tag: v2.15.40^2~30 X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=73713b742a2be95ea736d2d3d889f5b535a0f0f1;ds=sidebyside Naming tweak. --- diff --git a/src/lib/film.cc b/src/lib/film.cc index aa71834a1..90b18ea70 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -167,7 +167,7 @@ Film::Film (optional dir) set_isdcf_date_today (); _playlist_change_connection = _playlist->Change.connect (bind (&Film::playlist_change, this, _1)); - _playlist_order_changed_connection = _playlist->OrderChanged.connect (bind (&Film::playlist_order_changed, this)); + _playlist_order_changed_connection = _playlist->OrderChange.connect (bind (&Film::playlist_order_changed, this)); _playlist_content_change_connection = _playlist->ContentChange.connect (bind (&Film::playlist_content_change, this, _1, _2, _3, _4)); _playlist_length_change_connection = _playlist->LengthChange.connect (bind(&Film::playlist_length_change, this)); diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index 73a3214d3..48053bbf4 100644 --- a/src/lib/playlist.cc +++ b/src/lib/playlist.cc @@ -111,7 +111,7 @@ Playlist::content_change (weak_ptr weak_film, ChangeType type, weak_ } if (changed) { - OrderChanged (); + OrderChange (); } /* The length might have changed, and that's good enough for this signal */ diff --git a/src/lib/playlist.h b/src/lib/playlist.h index b6e23b4a5..dc984aacf 100644 --- a/src/lib/playlist.h +++ b/src/lib/playlist.h @@ -77,7 +77,7 @@ public: /** Emitted when content has been added to or removed from the playlist; implies OrderChanged */ mutable boost::signals2::signal Change; - mutable boost::signals2::signal OrderChanged; + mutable boost::signals2::signal OrderChange; /** Emitted when the length might have changed; may sometimes be emitted when it has not */ mutable boost::signals2::signal LengthChange;