projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidy and fix logging.
[dcpomatic.git]
/
src
/
lib
/
video_content.cc
diff --git
a/src/lib/video_content.cc
b/src/lib/video_content.cc
index d3ba6c1ab1f3d50d89806290b8eb8ed12b2b54aa..932977858e8649abec0364e843c8e4c0da10c1f1 100644
(file)
--- a/
src/lib/video_content.cc
+++ b/
src/lib/video_content.cc
@@
-30,6
+30,7
@@
#include "exceptions.h"
#include "frame_rate_change.h"
#include "log.h"
#include "exceptions.h"
#include "frame_rate_change.h"
#include "log.h"
+#include "dcpomatic_log.h"
#include <dcp/raw_convert.h>
#include <libcxml/cxml.h>
#include <libxml++/libxml++.h>
#include <dcp/raw_convert.h>
#include <libcxml/cxml.h>
#include <libxml++/libxml++.h>
@@
-38,8
+39,6
@@
#include "i18n.h"
#include "i18n.h"
-#define LOG_GENERAL(...) _parent->film()->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
-
int const VideoContentProperty::SIZE = 0;
int const VideoContentProperty::FRAME_TYPE = 1;
int const VideoContentProperty::CROP = 2;
int const VideoContentProperty::SIZE = 0;
int const VideoContentProperty::FRAME_TYPE = 1;
int const VideoContentProperty::CROP = 2;
@@
-234,6
+233,10
@@
VideoContent::take_from_examiner (shared_ptr<VideoExaminer> d)
optional<double> const ar = d->sample_aspect_ratio ();
bool const yuv = d->yuv ();
optional<double> const ar = d->sample_aspect_ratio ();
bool const yuv = d->yuv ();
+ ChangeSignaller<Content> cc1 (_parent, VideoContentProperty::SIZE);
+ ChangeSignaller<Content> cc2 (_parent, VideoContentProperty::SCALE);
+ ChangeSignaller<Content> cc3 (_parent, ContentProperty::LENGTH);
+
{
boost::mutex::scoped_lock lm (_mutex);
_size = vs;
{
boost::mutex::scoped_lock lm (_mutex);
_size = vs;
@@
-256,10
+259,6
@@
VideoContent::take_from_examiner (shared_ptr<VideoExaminer> d)
if (d->video_frame_rate()) {
_parent->set_video_frame_rate (d->video_frame_rate().get());
}
if (d->video_frame_rate()) {
_parent->set_video_frame_rate (d->video_frame_rate().get());
}
-
- _parent->signal_changed (VideoContentProperty::SIZE);
- _parent->signal_changed (VideoContentProperty::SCALE);
- _parent->signal_changed (ContentProperty::LENGTH);
}
/** @return string which includes everything about how this content looks */
}
/** @return string which includes everything about how this content looks */
@@
-332,10
+331,9
@@
VideoContent::size_after_crop () const
}
void
}
void
-VideoContent::scale_and_crop_to_fit_width ()
+VideoContent::scale_and_crop_to_fit_width (
shared_ptr<const Film> film
)
{
{
- shared_ptr<const Film> film = _parent->film ();
- set_scale (VideoContentScale (film->container ()));
+ set_scale (VideoContentScale(film->container()));
int const crop = max (0, int (size().height - double (film->frame_size().height) * size().width / film->frame_size().width));
set_left_crop (0);
int const crop = max (0, int (size().height - double (film->frame_size().height) * size().width / film->frame_size().width));
set_left_crop (0);
@@
-345,10
+343,9
@@
VideoContent::scale_and_crop_to_fit_width ()
}
void
}
void
-VideoContent::scale_and_crop_to_fit_height ()
+VideoContent::scale_and_crop_to_fit_height (
shared_ptr<const Film> film
)
{
{
- shared_ptr<const Film> film = _parent->film ();
- set_scale (VideoContentScale (film->container ()));
+ set_scale (VideoContentScale(film->container()));
int const crop = max (0, int (size().width - double (film->frame_size().width) * size().height / film->frame_size().height));
set_left_crop (crop / 2);
int const crop = max (0, int (size().width - double (film->frame_size().width) * size().height / film->frame_size().height));
set_left_crop (crop / 2);
@@
-359,13
+356,11
@@
VideoContent::scale_and_crop_to_fit_height ()
/** @param f Frame index within the whole (untrimmed) content */
optional<double>
/** @param f Frame index within the whole (untrimmed) content */
optional<double>
-VideoContent::fade (Frame f) const
+VideoContent::fade (
shared_ptr<const Film> film,
Frame f) const
{
DCPOMATIC_ASSERT (f >= 0);
{
DCPOMATIC_ASSERT (f >= 0);
- shared_ptr<const Film> film = _parent->film ();
-
- double const vfr = _parent->active_video_frame_rate ();
+ double const vfr = _parent->active_video_frame_rate(film);
Frame const ts = _parent->trim_start().frames_round(vfr);
if ((f - ts) < fade_in()) {
Frame const ts = _parent->trim_start().frames_round(vfr);
if ((f - ts) < fade_in()) {
@@
-381,7
+376,7
@@
VideoContent::fade (Frame f) const
}
string
}
string
-VideoContent::processing_description () const
+VideoContent::processing_description (
shared_ptr<const Film> film
) const
{
string d;
char buffer[256];
{
string d;
char buffer[256];
@@
-417,7
+412,6
@@
VideoContent::processing_description () const
d += buffer;
}
d += buffer;
}
- shared_ptr<const Film> film = _parent->film ();
dcp::Size const container_size = film->frame_size ();
dcp::Size const scaled = scale().size (shared_from_this(), container_size, container_size);
dcp::Size const container_size = film->frame_size ();
dcp::Size const scaled = scale().size (shared_from_this(), container_size, container_size);
@@
-547,9
+541,9
@@
VideoContent::take_settings_from (shared_ptr<const VideoContent> c)
}
void
}
void
-VideoContent::modify_position (DCPTime& pos) const
+VideoContent::modify_position (
shared_ptr<const Film> film,
DCPTime& pos) const
{
{
- pos = pos.round (
_parent->film()
->video_frame_rate());
+ pos = pos.round (
film
->video_frame_rate());
}
void
}
void