projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move Image::as_png() out to image_as_png().
[dcpomatic.git]
/
src
/
wx
/
timeline_labels_view.cc
diff --git
a/src/wx/timeline_labels_view.cc
b/src/wx/timeline_labels_view.cc
index 3146d03662873325a7ea64d7446b4217388bfe40..7075d4b7dce74418bfa264cc0ad007a57c9b271c 100644
(file)
--- a/
src/wx/timeline_labels_view.cc
+++ b/
src/wx/timeline_labels_view.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2016
-2021
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-19,84
+19,100
@@
*/
*/
-#include "timeline_labels_view.h"
#include "timeline.h"
#include "timeline.h"
-#include <wx/wx.h>
+#include "timeline_labels_view.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/graphics.h>
#include <wx/graphics.h>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
+
using std::list;
using std::list;
-using std::min;
using std::max;
using std::max;
+using std::min;
+
TimelineLabelsView::TimelineLabelsView (Timeline& tl)
: TimelineView (tl)
TimelineLabelsView::TimelineLabelsView (Timeline& tl)
: TimelineView (tl)
- , _threed (true)
- , _subtitle (true)
- , _atmos (true)
{
wxString labels[] = {
_("Video"),
_("Audio"),
{
wxString labels[] = {
_("Video"),
_("Audio"),
- _("Subtitles"),
+ _("Subtitles
/captions
"),
_("Atmos")
};
_("Atmos")
};
- _width = 0;
-
wxClientDC dc (&_timeline);
for (int i = 0; i < 3; ++i) {
wxClientDC dc (&_timeline);
for (int i = 0; i < 3; ++i) {
-
wxSize
size = dc.GetTextExtent (labels[i]);
+
auto
size = dc.GetTextExtent (labels[i]);
_width = max (_width, size.GetWidth());
}
_width = max (_width, size.GetWidth());
}
- _width +=
16
;
+ _width +=
24
;
}
}
+
dcpomatic::Rect<int>
TimelineLabelsView::bbox () const
{
dcpomatic::Rect<int>
TimelineLabelsView::bbox () const
{
- return dcpomatic::Rect<int> (0, 0, _width, _timeline.tracks() * _timeline.
track_height
());
+ return dcpomatic::Rect<int> (0, 0, _width, _timeline.tracks() * _timeline.
pixels_per_track
());
}
}
+
void
void
-TimelineLabelsView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>
>)
+TimelineLabelsView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>>)
{
{
- int const h = _timeline.
track_height
();
- gc->SetFont (gc->CreateFont(wxNORMAL_FONT->Bold(), wxColour
(0, 0, 0)));
+ int const h = _timeline.
pixels_per_track
();
+ gc->SetFont (gc->CreateFont(wxNORMAL_FONT->Bold(), wxColour(0, 0, 0)));
int fy = 0;
int fy = 0;
- int ty = _threed ? 2 * h : h;
- gc->DrawText (_("Video"), 0, _timeline.tracks_position().y + (ty + fy) / 2 - 8);
- fy = ty;
+ if (_video_tracks) {
+ int ty = fy + _video_tracks * h;
+ gc->DrawText (_("Video"), 0, (ty + fy) / 2 - 8);
+ fy = ty;
+ }
- if (_
subtitle
) {
-
ty = fy +
h;
- gc->DrawText (_("Subtitles
"), 0, _timeline.tracks_position().y +
(ty + fy) / 2 - 8);
+ if (_
text_tracks
) {
+
int ty = fy + _text_tracks *
h;
+ gc->DrawText (_("Subtitles
/captions"), 0,
(ty + fy) / 2 - 8);
fy = ty;
}
if (_atmos) {
fy = ty;
}
if (_atmos) {
- ty = fy + h;
- gc->DrawText (_("Atmos"), 0,
_timeline.tracks_position().y +
(ty + fy) / 2 - 8);
+
int
ty = fy + h;
+ gc->DrawText (_("Atmos"), 0, (ty + fy) / 2 - 8);
fy = ty;
}
fy = ty;
}
- ty = _timeline.tracks() * h;
- gc->DrawText (_("Audio"), 0, _timeline.tracks_position().y + (ty + fy) / 2 - 8);
+ if (_audio_tracks) {
+ int ty = _timeline.tracks() * h;
+ gc->DrawText (_("Audio"), 0, (ty + fy) / 2 - 8);
+ }
}
}
+
void
void
-TimelineLabelsView::set_
3d (bool s
)
+TimelineLabelsView::set_
video_tracks (int n
)
{
{
- _
threed = s
;
+ _
video_tracks = n
;
}
}
+
void
void
-TimelineLabelsView::set_
subtitle (bool s
)
+TimelineLabelsView::set_
audio_tracks (int n
)
{
{
- _
subtitle = s
;
+ _
audio_tracks = n
;
}
}
+
+void
+TimelineLabelsView::set_text_tracks (int n)
+{
+ _text_tracks = n;
+}
+
+
void
TimelineLabelsView::set_atmos (bool s)
{
void
TimelineLabelsView::set_atmos (bool s)
{