projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Put Time types in dcpomatic namespace.
[dcpomatic.git]
/
src
/
wx
/
closed_captions_dialog.h
diff --git
a/src/wx/closed_captions_dialog.h
b/src/wx/closed_captions_dialog.h
index 4b407fa5a7a7c49ae2631ace6979cba235b88bc9..fb4e9d59b40c5569e90a02c5013f28bd2a051531 100644
(file)
--- a/
src/wx/closed_captions_dialog.h
+++ b/
src/wx/closed_captions_dialog.h
@@
-31,7
+31,7
@@
class ClosedCaptionsDialog : public wxDialog
public:
explicit ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer);
public:
explicit ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer);
- void update (DCPTime);
+ void update (
dcpomatic::
DCPTime);
void clear ();
void set_film_and_butler (boost::shared_ptr<Film>, boost::weak_ptr<Butler>);
void clear ();
void set_film_and_butler (boost::shared_ptr<Film>, boost::weak_ptr<Butler>);
@@
-47,5
+47,5
@@
private:
std::vector<wxString> _lines;
std::vector<DCPTextTrack> _tracks;
boost::weak_ptr<Butler> _butler;
std::vector<wxString> _lines;
std::vector<DCPTextTrack> _tracks;
boost::weak_ptr<Butler> _butler;
- DCPTime _last_update;
+
dcpomatic::
DCPTime _last_update;
};
};