projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
wx
/
video_panel.cc
diff --git
a/src/wx/video_panel.cc
b/src/wx/video_panel.cc
index b33a97591c6617e45fe3a2da2a04bd1fca0fbe24..a5d197c2a15324e81b32e557ed8d45ad0a889931 100644
(file)
--- a/
src/wx/video_panel.cc
+++ b/
src/wx/video_panel.cc
@@
-28,9
+28,9
@@
#include "filter_dialog.h"
#include "video_panel.h"
#include "wx_util.h"
#include "filter_dialog.h"
#include "video_panel.h"
#include "wx_util.h"
-#include "film_editor.h"
#include "content_colour_conversion_dialog.h"
#include "content_widget.h"
#include "content_colour_conversion_dialog.h"
#include "content_widget.h"
+#include "content_panel.h"
using std::vector;
using std::string;
using std::vector;
using std::string;
@@
-64,8
+64,8
@@
scale_to_index (VideoContentScale scale)
assert (false);
}
assert (false);
}
-VideoPanel::VideoPanel (
FilmEditor* e
)
- :
FilmEditorPanel (e
, _("Video"))
+VideoPanel::VideoPanel (
ContentPanel* p
)
+ :
ContentSubPanel (p
, _("Video"))
{
wxGridBagSizer* grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
_sizer->Add (grid, 0, wxALL, 8);
{
wxGridBagSizer* grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
_sizer->Add (grid, 0, wxALL, 8);
@@
-222,7
+222,7
@@
VideoPanel::film_changed (Film::Property property)
void
VideoPanel::film_content_changed (int property)
{
void
VideoPanel::film_content_changed (int property)
{
- VideoContentList vc = _
editor->selected_video_content
();
+ VideoContentList vc = _
parent->selected_video
();
shared_ptr<VideoContent> vcs;
shared_ptr<FFmpegContent> fcs;
if (!vc.empty ()) {
shared_ptr<VideoContent> vcs;
shared_ptr<FFmpegContent> fcs;
if (!vc.empty ()) {
@@
-258,7
+258,7
@@
VideoPanel::film_content_changed (int property)
void
VideoPanel::edit_filters_clicked ()
{
void
VideoPanel::edit_filters_clicked ()
{
- FFmpegContentList c = _
editor->selected_ffmpeg_content
();
+ FFmpegContentList c = _
parent->selected_ffmpeg
();
if (c.size() != 1) {
return;
}
if (c.size() != 1) {
return;
}
@@
-272,7
+272,7
@@
VideoPanel::edit_filters_clicked ()
void
VideoPanel::setup_description ()
{
void
VideoPanel::setup_description ()
{
- VideoContentList vc = _
editor->selected_video_content
();
+ VideoContentList vc = _
parent->selected_video
();
if (vc.empty ()) {
_description->SetLabel ("");
return;
if (vc.empty ()) {
_description->SetLabel ("");
return;
@@
-298,8
+298,8
@@
VideoPanel::setup_description ()
}
Crop const crop = vcs->crop ();
}
Crop const crop = vcs->crop ();
- if ((crop.left || crop.right || crop.top || crop.bottom) && vcs->video_size() !=
lib
dcp::Size (0, 0)) {
-
lib
dcp::Size cropped = vcs->video_size_after_crop ();
+ if ((crop.left || crop.right || crop.top || crop.bottom) && vcs->video_size() != dcp::Size (0, 0)) {
+ dcp::Size cropped = vcs->video_size_after_crop ();
d << wxString::Format (
_("Cropped to %dx%d (%.2f:1)\n"),
cropped.width, cropped.height,
d << wxString::Format (
_("Cropped to %dx%d (%.2f:1)\n"),
cropped.width, cropped.height,
@@
-308,8
+308,8
@@
VideoPanel::setup_description ()
++lines;
}
++lines;
}
-
libdcp::Size const container_size = _editor
->film()->frame_size ();
-
libdcp::Size const scaled = vcs->scale().size (vcs, container_size, container_size
);
+
dcp::Size const container_size = _parent
->film()->frame_size ();
+
dcp::Size const scaled = vcs->scale().size (vcs, container_size, container_size, 1
);
if (scaled != vcs->video_size_after_crop ()) {
d << wxString::Format (
if (scaled != vcs->video_size_after_crop ()) {
d << wxString::Format (
@@
-331,7
+331,7
@@
VideoPanel::setup_description ()
d << wxString::Format (_("Content frame rate %.4f\n"), vcs->video_frame_rate ());
++lines;
d << wxString::Format (_("Content frame rate %.4f\n"), vcs->video_frame_rate ());
++lines;
- FrameRateChange frc (vcs->video_frame_rate(), _
editor
->film()->video_frame_rate ());
+ FrameRateChange frc (vcs->video_frame_rate(), _
parent
->film()->video_frame_rate ());
d << std_to_wx (frc.description ()) << "\n";
++lines;
d << std_to_wx (frc.description ()) << "\n";
++lines;
@@
-346,7
+346,7
@@
VideoPanel::setup_description ()
void
VideoPanel::edit_colour_conversion_clicked ()
{
void
VideoPanel::edit_colour_conversion_clicked ()
{
- VideoContentList vc = _
editor->selected_video_content
();
+ VideoContentList vc = _
parent->selected_video
();
if (vc.size() != 1) {
return;
}
if (vc.size() != 1) {
return;
}
@@
-363,8
+363,8
@@
VideoPanel::edit_colour_conversion_clicked ()
void
VideoPanel::content_selection_changed ()
{
void
VideoPanel::content_selection_changed ()
{
- VideoContentList video_sel = _
editor->selected_video_content
();
- FFmpegContentList ffmpeg_sel = _
editor->selected_ffmpeg_content
();
+ VideoContentList video_sel = _
parent->selected_video
();
+ FFmpegContentList ffmpeg_sel = _
parent->selected_ffmpeg
();
bool const single = video_sel.size() == 1;
bool const single = video_sel.size() == 1;