X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_playlist.cc;h=3e3bd02669cc8e359c855126608b66a69e551d08;hb=9319f03bb4efd1182a710864f69a1d64c4ec9920;hp=9eada8b3820968807aea9297d772c342545d4328;hpb=baed0f37f3cb3375f39b8d44f01eadb8796eb0d5;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_playlist.cc b/src/tools/dcpomatic_playlist.cc
index 9eada8b38..3e3bd0266 100644
--- a/src/tools/dcpomatic_playlist.cc
+++ b/src/tools/dcpomatic_playlist.cc
@@ -136,6 +136,8 @@ public:
 		_list->Bind (wxEVT_COMMAND_LIST_ITEM_DESELECTED, bind(&PlaylistList::selection_changed, this));
 		_new->Bind (wxEVT_BUTTON, bind(&PlaylistList::new_playlist, this));
 		_delete->Bind (wxEVT_BUTTON, bind(&PlaylistList::delete_playlist, this));
+
+		setup_sensitivity();
 	}
 
 	wxSizer* sizer ()
@@ -155,6 +157,11 @@ public:
 	boost::signals2::signal<void (shared_ptr<SignalSPL>)> Edit;
 
 private:
+	void setup_sensitivity()
+	{
+		_delete->Enable(static_cast<bool>(selected()));
+	}
+
 	void add_playlist_to_view (shared_ptr<const SignalSPL> playlist)
 	{
 		wxListItem item;
@@ -176,7 +183,9 @@ private:
 			return;
 		}
 
-		if (change == SignalSPL::Change::NAME) {
+		switch (change) {
+		case SignalSPL::Change::NAME:
+		{
 			int N = 0;
 			for (auto i: _playlists) {
 				if (i == playlist) {
@@ -184,6 +193,13 @@ private:
 				}
 				++N;
 			}
+			break;
+		}
+		case SignalSPL::Change::CONTENT:
+			if (auto dir = Config::instance()->player_playlist_directory()) {
+				playlist->write(*dir / (playlist->id() + ".xml"));
+			}
+			break;
 		}
 	}
 
@@ -217,10 +233,20 @@ private:
 		_list->SetItemState (_list->GetItemCount() - 1, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
 	}
 
-	void delete_playlist ()
+	boost::optional<int> selected() const
 	{
-		long int selected = _list->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+		long int selected = _list->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 		if (selected < 0 || selected >= int(_playlists.size())) {
+			return {};
+		}
+
+		return selected;
+	}
+
+	void delete_playlist ()
+	{
+		auto index = selected();
+		if (!index) {
 			return;
 		}
 
@@ -229,11 +255,11 @@ private:
 			return;
 		}
 
-		boost::filesystem::remove (*dir / (_playlists[selected]->id() + ".xml"));
-		_list->DeleteItem (selected);
-		_playlists.erase (_playlists.begin() + selected);
+		boost::filesystem::remove(*dir / (_playlists[*index]->id() + ".xml"));
+		_list->DeleteItem(*index);
+		_playlists.erase(_playlists.begin() + *index);
 
-		Edit (shared_ptr<SignalSPL>());
+		Edit(shared_ptr<SignalSPL>());
 	}
 
 	void selection_changed ()
@@ -244,6 +270,8 @@ private:
 		} else {
 			Edit (_playlists[selected]);
 		}
+
+		setup_sensitivity();
 	}
 
 	wxBoxSizer* _sizer;
@@ -314,6 +342,8 @@ public:
 		_down->Bind (wxEVT_BUTTON, bind(&PlaylistContent::down_clicked, this));
 		_add->Bind (wxEVT_BUTTON, bind(&PlaylistContent::add_clicked, this));
 		_remove->Bind (wxEVT_BUTTON, bind(&PlaylistContent::remove_clicked, this));
+
+		setup_sensitivity();
 	}
 
 	wxSizer* sizer ()
@@ -402,9 +432,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]);
@@ -419,9 +447,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]);
@@ -479,8 +505,6 @@ public:
 
 		_playlist_list->Edit.connect (bind(&DOMFrame::change_playlist, this, _1));
 
-		_playlist_content->set (_playlist_list->first_playlist());
-
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_exit, this), wxID_EXIT);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::help_about, this), wxID_ABOUT);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::edit_preferences, this), wxID_PREFERENCES);