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 399e71aac26edba4d752847d0faa4240bb2ead69..cd831baed7cbc5b97324d97a1a603773d0ee0614 100644
(file)
--- a/
src/wx/video_panel.cc
+++ b/
src/wx/video_panel.cc
@@
-24,12
+24,13
@@
#include "lib/config.h"
#include "lib/util.h"
#include "lib/ratio.h"
#include "lib/config.h"
#include "lib/util.h"
#include "lib/ratio.h"
+#include "lib/frame_rate_change.h"
#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;
@@
-63,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);
@@
-221,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 ()) {
@@
-257,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;
}
@@
-271,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;
@@
-307,8
+308,8
@@
VideoPanel::setup_description ()
++lines;
}
++lines;
}
- dcp::Size const container_size = _
editor
->film()->frame_size ();
- dcp::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 (
@@
-330,8
+331,8
@@
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 ());
- d << std_to_wx (frc.description) << "\n";
+ FrameRateChange frc (vcs->video_frame_rate(), _
parent
->film()->video_frame_rate ());
+ d << std_to_wx (frc.description
()
) << "\n";
++lines;
for (int i = lines; i < 6; ++i) {
++lines;
for (int i = lines; i < 6; ++i) {
@@
-345,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;
}
@@
-362,7
+363,7
@@
VideoPanel::edit_colour_conversion_clicked ()
void
VideoPanel::content_selection_changed ()
{
void
VideoPanel::content_selection_changed ()
{
- VideoContentList sel = _
editor->selected_video_content
();
+ VideoContentList sel = _
parent->selected_video
();
bool const single = sel.size() == 1;
_left_crop->set_content (sel);
bool const single = sel.size() == 1;
_left_crop->set_content (sel);