projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump libdcp for better ContentKind support, and libsub
[dcpomatic.git]
/
src
/
tools
/
dcpomatic_playlist.cc
diff --git
a/src/tools/dcpomatic_playlist.cc
b/src/tools/dcpomatic_playlist.cc
index dbc5e81ddf673b445876b42863260daddfdd936e..c327a8603d1f11a0c87c73da8ab0f69b7298dbf4 100644
(file)
--- a/
src/tools/dcpomatic_playlist.cc
+++ b/
src/tools/dcpomatic_playlist.cc
@@
-19,12
+19,12
@@
*/
*/
-#include "wx/wx_util.h"
-#include "wx/wx_signal_manager.h"
+#include "wx/about_dialog.h"
#include "wx/content_view.h"
#include "wx/dcpomatic_button.h"
#include "wx/content_view.h"
#include "wx/dcpomatic_button.h"
-#include "wx/about_dialog.h"
#include "wx/playlist_editor_config_dialog.h"
#include "wx/playlist_editor_config_dialog.h"
+#include "wx/wx_signal_manager.h"
+#include "wx/wx_util.h"
#include "lib/config.h"
#include "lib/cross.h"
#include "lib/dcp_content.h"
#include "lib/config.h"
#include "lib/cross.h"
#include "lib/dcp_content.h"
@@
-32,11
+32,14
@@
#include "lib/spl.h"
#include "lib/spl_entry.h"
#include "lib/util.h"
#include "lib/spl.h"
#include "lib/spl_entry.h"
#include "lib/util.h"
-#include <
wx/wx
.h>
-#include <wx/listctrl.h>
+#include <
dcp/warnings
.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/imaglist.h>
#include <wx/imaglist.h>
-#include <wx/
spin
ctrl.h>
+#include <wx/
list
ctrl.h>
#include <wx/preferences.h>
#include <wx/preferences.h>
+#include <wx/spinctrl.h>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
using std::cout;
using std::cout;
@@
-279,8
+282,8
@@
public:
auto images = new wxImageList (16, 16);
wxIcon tick_icon;
wxIcon no_tick_icon;
auto images = new wxImageList (16, 16);
wxIcon tick_icon;
wxIcon no_tick_icon;
- tick_icon.LoadFile (bitmap_path("tick"), wxBITMAP_TYPE_PNG);
- no_tick_icon.LoadFile (bitmap_path("no_tick"), wxBITMAP_TYPE_PNG);
+ tick_icon.LoadFile (bitmap_path("tick
.png
"), wxBITMAP_TYPE_PNG);
+ no_tick_icon.LoadFile (bitmap_path("no_tick
.png
"), wxBITMAP_TYPE_PNG);
images->Add (tick_icon);
images->Add (no_tick_icon);
images->Add (tick_icon);
images->Add (no_tick_icon);
@@
-357,7
+360,7
@@
private:
{
_list->SetItem (N, 0, std_to_wx(e.name));
_list->SetItem (N, 1, std_to_wx(e.id));
{
_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"));
}
_list->SetItem (N, 3, e.encrypted ? S_("Question|Y") : S_("Question|N"));
}