pot/merge.

[dcpomatic.git] / src / tools / dcpomatic_playlist.cc

diff --git a/src/tools/dcpomatic_playlist.cc b/src/tools/dcpomatic_playlist.cc
index ad54e364817352a92ec4d5ab9fa5eacfd8493dbf..50f692376d0cace72ead47bb8cde2f78a97f28ed 100644 (file)
--- a/src/tools/dcpomatic_playlist.cc
+++ b/src/tools/dcpomatic_playlist.cc
@@ -45,7 +45,7 @@ using boost::dynamic_pointer_cast;
 class ContentDialog : public wxDialog, public ContentStore
 {
 public:
-       ContentDialog (wxWindow* parent, weak_ptr<Film> film)
+       ContentDialog (wxWindow* parent)
                : wxDialog (parent, wxID_ANY, _("Add content"), wxDefaultPosition, wxSize(800, 640))
                , _content_view (new ContentView(this))
        {
@@ -83,9 +83,7 @@ class DOMFrame : public wxFrame
 public:
        explicit DOMFrame (wxString const & title)
                : wxFrame (0, -1, title)
-               /* XXX: this is a bit of a hack, but we need it to be able to use the Content class hierarchy */
-               , _film (new Film(optional<boost::filesystem::path>()))
-               , _content_dialog (new ContentDialog(this, _film))
+               , _content_dialog (new ContentDialog(this))
        {
                /* Use a panel as the only child of the Frame so that we avoid
                   the dark-grey background on Windows.
@@ -163,7 +161,6 @@ private:
                item.SetId (_list->GetItemCount());
                long const N = _list->InsertItem (item);
                set_item (N, e);
-               _playlist.add (e);
        }
 
        void selection_changed ()
@@ -232,7 +229,9 @@ private:
                if (r == wxID_OK) {
                        shared_ptr<Content> content = _content_dialog->selected ();
                        if (content) {
-                               add (SPLEntry(content));
+                               SPLEntry e (content);
+                               add (e);
+                               _playlist.add (e);
                        }
                }
        }
@@ -284,7 +283,9 @@ private:
                wxString default_dir = c->player_playlist_directory() ? std_to_wx(c->player_playlist_directory()->string()) : wxString(wxEmptyString);
                wxFileDialog* d = new wxFileDialog (this, _("Select playlist file"), default_dir, wxEmptyString, wxT("XML files (*.xml)|*.xml"), wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
                if (d->ShowModal() == wxID_OK) {
-                       _playlist.write (wx_to_std(d->GetPath()));
+                       boost::filesystem::path file = wx_to_std (d->GetPath());
+                       file.replace_extension (".xml");
+                       _playlist.write (file);
                }
        }
 
@@ -297,6 +298,7 @@ private:
                        _list->DeleteAllItems ();
                        _playlist.read (wx_to_std(d->GetPath()), _content_dialog);
                        if (!_playlist.missing()) {
+                               _list->DeleteAllItems ();
                                BOOST_FOREACH (SPLEntry i, _playlist.get()) {
                                        add (i);
                                }
@@ -313,7 +315,6 @@ private:
        wxButton* _remove;
        wxButton* _save;
        wxButton* _load;
-       boost::shared_ptr<Film> _film;
        SPL _playlist;
        ContentDialog* _content_dialog;