projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More enum class additions.
[dcpomatic.git]
/
src
/
wx
/
timeline_dialog.cc
diff --git
a/src/wx/timeline_dialog.cc
b/src/wx/timeline_dialog.cc
index 050f900534f7431e64724e4af2038985f36709e9..f15bf7bfc254f712d37968ce280f2b97f916edb5 100644
(file)
--- a/
src/wx/timeline_dialog.cc
+++ b/
src/wx/timeline_dialog.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-201
8
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
9
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-32,11
+32,15
@@
using std::list;
using std::cout;
using std::string;
using std::list;
using std::cout;
using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
+using std::weak_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
-TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film)
+TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film
, weak_ptr<FilmViewer> viewer
)
: wxDialog (
: wxDialog (
- cp->
panel
(),
+ cp->
window
(),
wxID_ANY,
_("Timeline"),
wxDefaultPosition,
wxID_ANY,
_("Timeline"),
wxDefaultPosition,
@@
-51,9
+55,9
@@
TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film)
#endif
)
, _film (film)
#endif
)
, _film (film)
- , _timeline (this, cp, film)
+ , _timeline (this, cp, film
, viewer
)
{
{
-
wxBoxSizer*
sizer = new wxBoxSizer (wxVERTICAL);
+
auto
sizer = new wxBoxSizer (wxVERTICAL);
wxBitmap select (bitmap_path("select"), wxBITMAP_TYPE_PNG);
wxBitmap zoom (bitmap_path("zoom"), wxBITMAP_TYPE_PNG);
wxBitmap select (bitmap_path("select"), wxBITMAP_TYPE_PNG);
wxBitmap zoom (bitmap_path("zoom"), wxBITMAP_TYPE_PNG);
@@
-87,26
+91,19
@@
TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film)
sizer->SetSizeHints (this);
_toolbar->ToggleTool ((int) Timeline::SNAP, _timeline.snap ());
sizer->SetSizeHints (this);
_toolbar->ToggleTool ((int) Timeline::SNAP, _timeline.snap ());
- film_change (C
HANGE_TYPE_
DONE, Film::SEQUENCE);
+ film_change (C
hangeType::
DONE, Film::SEQUENCE);
_film_changed_connection = film->Change.connect (bind (&TimelineDialog::film_change, this, _1, _2));
}
_film_changed_connection = film->Change.connect (bind (&TimelineDialog::film_change, this, _1, _2));
}
-wxString
-TimelineDialog::bitmap_path (string name)
-{
- boost::filesystem::path p = shared_path() / String::compose("%1.png", name);
- return std_to_wx (p.string());
-}
-
void
TimelineDialog::film_change (ChangeType type, Film::Property p)
{
void
TimelineDialog::film_change (ChangeType type, Film::Property p)
{
- if (type != C
HANGE_TYPE_
DONE) {
+ if (type != C
hangeType::
DONE) {
return;
}
return;
}
-
shared_ptr<Film>
film = _film.lock ();
+
auto
film = _film.lock ();
if (!film) {
return;
}
if (!film) {
return;
}
@@
-130,7
+127,7
@@
TimelineDialog::tool_clicked (wxCommandEvent& ev)
if (t == Timeline::SNAP) {
_timeline.set_snap (_toolbar->GetToolState ((int) t));
} else if (t == Timeline::SEQUENCE) {
if (t == Timeline::SNAP) {
_timeline.set_snap (_toolbar->GetToolState ((int) t));
} else if (t == Timeline::SEQUENCE) {
-
shared_ptr<Film>
film = _film.lock ();
+
auto
film = _film.lock ();
if (film) {
film->set_sequence (_toolbar->GetToolState ((int) t));
}
if (film) {
film->set_sequence (_toolbar->GetToolState ((int) t));
}