projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo in string (thanks MichaĆ Tomaszewski)
[dcpomatic.git]
/
src
/
wx
/
content_view.h
diff --git
a/src/wx/content_view.h
b/src/wx/content_view.h
index 0bbfffaa76418f331f1ee699d7d6afb3d21fe508..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,16
+18,19
@@
*/
*/
+
#include "lib/content_store.h"
#include "lib/content_store.h"
-#include
"lib/warnings.h"
-
DCPOMATIC
_DISABLE_WARNINGS
+#include
<dcp/warnings.h>
+
LIBDCP
_DISABLE_WARNINGS
#include <wx/listctrl.h>
#include <wx/listctrl.h>
-
DCPOMATIC
_ENABLE_WARNINGS
+
LIBDCP
_ENABLE_WARNINGS
#include <vector>
#include <vector>
+
class Content;
class Film;
class Content;
class Film;
+
class ContentView : public wxListCtrl, public ContentStore
{
public:
class ContentView : public wxListCtrl, public ContentStore
{
public:
@@
-36,11
+39,11
@@
public:
std::shared_ptr<Content> selected () const;
void update ();
std::shared_ptr<Content> selected () const;
void update ();
- std::shared_ptr<Content> get (std::string digest) const;
+ std::shared_ptr<Content> get (std::string digest) const
override
;
private:
void add (std::shared_ptr<Content> content);
std::weak_ptr<Film> _film;
private:
void add (std::shared_ptr<Content> content);
std::weak_ptr<Film> _film;
- std::vector<std::shared_ptr<Content>
> _content;
+ std::vector<std::shared_ptr<Content>> _content;
};
};