X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_playlist.cc;h=5a8ee91267a9cb27aa65dbc42f828a36fe6257fd;hp=dea8e81d5b84b6204e51ee0fefbca05552684261;hb=bf471e4e6d2502bb3b4e2eb4b1309d87e1003070;hpb=439b5d7a315daf2422cb6c995110d628a91d9389

diff --git a/src/tools/dcpomatic_playlist.cc b/src/tools/dcpomatic_playlist.cc
index dea8e81d5..5a8ee9126 100644
--- a/src/tools/dcpomatic_playlist.cc
+++ b/src/tools/dcpomatic_playlist.cc
@@ -166,22 +166,24 @@ private:
 	void add_playlist_to_model (shared_ptr<SignalSPL> playlist)
 	{
 		_playlists.push_back (playlist);
-		playlist->NameChanged.connect (bind(&PlaylistList::name_changed, this, weak_ptr<SignalSPL>(playlist)));
+		playlist->Changed.connect(bind(&PlaylistList::changed, this, weak_ptr<SignalSPL>(playlist), _1));
 	}
 
-	void name_changed (weak_ptr<SignalSPL> wp)
+	void changed(weak_ptr<SignalSPL> wp, SignalSPL::Change change)
 	{
 		auto playlist = wp.lock ();
 		if (!playlist) {
 			return;
 		}
 
-		int N = 0;
-		for (auto i: _playlists) {
-			if (i == playlist) {
-				_list->SetItem (N, 0, std_to_wx(i->name()));
+		if (change == SignalSPL::Change::NAME) {
+			int N = 0;
+			for (auto i: _playlists) {
+				if (i == playlist) {
+					_list->SetItem (N, 0, std_to_wx(i->name()));
+				}
+				++N;
 			}
-			++N;
 		}
 	}
 
@@ -360,7 +362,7 @@ private:
 	{
 		_list->SetItem (N, 0, std_to_wx(e.name));
 		_list->SetItem (N, 1, std_to_wx(e.id));
-		_list->SetItem (N, 2, std_to_wx(dcp::content_kind_to_string(e.kind)));
+		_list->SetItem (N, 2, std_to_wx(e.kind->name()));
 		_list->SetItem (N, 3, e.encrypted ? S_("Question|Y") : S_("Question|N"));
 	}
 
@@ -400,9 +402,7 @@ private:
 
 		DCPOMATIC_ASSERT (_playlist);
 
-		auto tmp = (*_playlist)[s];
-		(*_playlist)[s] = (*_playlist)[s-1];
-		(*_playlist)[s-1] = tmp;
+		_playlist->swap(s, s - 1);
 
 		set_item (s - 1, (*_playlist)[s-1]);
 		set_item (s, (*_playlist)[s]);
@@ -417,9 +417,7 @@ private:
 
 		DCPOMATIC_ASSERT (_playlist);
 
-		auto tmp = (*_playlist)[s];
-		(*_playlist)[s] = (*_playlist)[s+1];
-		(*_playlist)[s+1] = tmp;
+		_playlist->swap(s, s + 1);
 
 		set_item (s + 1, (*_playlist)[s+1]);
 		set_item (s, (*_playlist)[s]);