projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use libdcp's warnings.h
[dcpomatic.git]
/
src
/
wx
/
content_view.h
diff --git
a/src/wx/content_view.h
b/src/wx/content_view.h
index 0da53f636f139ff0d1838ec1793ad011bc1c821a..16ff5c4636f51e571e4f37907e21d93bd58501f0 100644
(file)
--- a/
src/wx/content_view.h
+++ b/
src/wx/content_view.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2018
-2021
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,25
+18,32
@@
*/
*/
+
+#include "lib/content_store.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/listctrl.h>
#include <wx/listctrl.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
+LIBDCP_ENABLE_WARNINGS
#include <vector>
#include <vector>
+
class Content;
class Film;
class Content;
class Film;
-class ContentView : public wxListCtrl
+
+class ContentView : public wxListCtrl, public ContentStore
{
public:
{
public:
- ContentView (wxWindow* parent
, boost::weak_ptr<Film> film
);
+ ContentView (wxWindow* parent);
-
boost
::shared_ptr<Content> selected () const;
+
std
::shared_ptr<Content> selected () const;
void update ();
void update ();
+ std::shared_ptr<Content> get (std::string digest) const override;
+
private:
private:
- void add (
boost
::shared_ptr<Content> content);
+ void add (
std
::shared_ptr<Content> content);
-
boost
::weak_ptr<Film> _film;
- std::vector<
boost::shared_ptr<Content>
> _content;
+
std
::weak_ptr<Film> _film;
+ std::vector<
std::shared_ptr<Content>
> _content;
};
};