projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix position of content outline (#2108).
[dcpomatic.git]
/
src
/
wx
/
timeline_video_content_view.cc
diff --git
a/src/wx/timeline_video_content_view.cc
b/src/wx/timeline_video_content_view.cc
index a54b91de02ca864b84947e3d2353ba904f929acb..b0f4b4f5d34dd255a8a5083b7ca883f96b5d160d 100644
(file)
--- a/
src/wx/timeline_video_content_view.cc
+++ b/
src/wx/timeline_video_content_view.cc
@@
-1,27
+1,29
@@
/*
/*
- Copyright (C) 2013-201
5
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
9
Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
-#include "timeline_video_content_view.h"
#include "lib/image_content.h"
#include "lib/image_content.h"
+#include "lib/video_content.h"
+#include "timeline_video_content_view.h"
-using
boost
::dynamic_pointer_cast;
-using
boost
::shared_ptr;
+using
std
::dynamic_pointer_cast;
+using
std
::shared_ptr;
TimelineVideoContentView::TimelineVideoContentView (Timeline& tl, shared_ptr<Content> c)
: TimelineContentView (tl, c)
TimelineVideoContentView::TimelineVideoContentView (Timeline& tl, shared_ptr<Content> c)
: TimelineContentView (tl, c)
@@
-32,12
+34,27
@@
TimelineVideoContentView::TimelineVideoContentView (Timeline& tl, shared_ptr<Con
wxColour
TimelineVideoContentView::background_colour () const
{
wxColour
TimelineVideoContentView::background_colour () const
{
+ if (!active()) {
+ return wxColour (210, 210, 210, 128);
+ }
+
return wxColour (242, 92, 120, 255);
}
wxColour
TimelineVideoContentView::foreground_colour () const
{
return wxColour (242, 92, 120, 255);
}
wxColour
TimelineVideoContentView::foreground_colour () const
{
+ if (!active()) {
+ return wxColour (180, 180, 180, 128);
+ }
+
return wxColour (0, 0, 0, 255);
}
return wxColour (0, 0, 0, 255);
}
+bool
+TimelineVideoContentView::active () const
+{
+ shared_ptr<Content> c = _content.lock ();
+ DCPOMATIC_ASSERT (c);
+ return c->video && c->video->use();
+}