Improve audio mapping handling a bit.

[dcpomatic.git] / src / lib / video_content.cc

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 14897c5706a68852873abe090ef617d39a66f6ce..2e413678f5d0aa219a91157b8162b8a0594fd3f5 100644 (file)
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -26,6 +26,7 @@
 int const VideoContentProperty::VIDEO_LENGTH = 0;
 int const VideoContentProperty::VIDEO_SIZE = 1;
 int const VideoContentProperty::VIDEO_FRAME_RATE = 2;
+int const VideoContentProperty::VIDEO_CROP = 3;
 
 using std::string;
 using std::stringstream;
@@ -33,20 +34,31 @@ using std::setprecision;
 using boost::shared_ptr;
 using boost::lexical_cast;
 
-VideoContent::VideoContent (boost::filesystem::path f)
-       : Content (f)
+VideoContent::VideoContent (shared_ptr<const Film> f, Time s, ContentVideoFrame len)
+       : Content (f, s)
+       , _video_length (len)
+{
+
+}
+
+VideoContent::VideoContent (shared_ptr<const Film> f, boost::filesystem::path p)
+       : Content (f, p)
        , _video_length (0)
 {
 
 }
 
-VideoContent::VideoContent (shared_ptr<const cxml::Node> node)
-       : Content (node)
+VideoContent::VideoContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node)
+       : Content (f, node)
 {
        _video_length = node->number_child<ContentVideoFrame> ("VideoLength");
        _video_size.width = node->number_child<int> ("VideoWidth");
        _video_size.height = node->number_child<int> ("VideoHeight");
        _video_frame_rate = node->number_child<float> ("VideoFrameRate");
+       _crop.left = node->number_child<int> ("LeftCrop");
+       _crop.right = node->number_child<int> ("RightCrop");
+       _crop.top = node->number_child<int> ("TopCrop");
+       _crop.bottom = node->number_child<int> ("BottomCrop");
 }
 
 VideoContent::VideoContent (VideoContent const & o)
@@ -66,14 +78,18 @@ VideoContent::as_xml (xmlpp::Node* node) const
        node->add_child("VideoWidth")->add_child_text (lexical_cast<string> (_video_size.width));
        node->add_child("VideoHeight")->add_child_text (lexical_cast<string> (_video_size.height));
        node->add_child("VideoFrameRate")->add_child_text (lexical_cast<string> (_video_frame_rate));
+       node->add_child("LeftCrop")->add_child_text (boost::lexical_cast<string> (_crop.left));
+       node->add_child("RightCrop")->add_child_text (boost::lexical_cast<string> (_crop.right));
+       node->add_child("TopCrop")->add_child_text (boost::lexical_cast<string> (_crop.top));
+       node->add_child("BottomCrop")->add_child_text (boost::lexical_cast<string> (_crop.bottom));
 }
 
 void
 VideoContent::take_from_video_decoder (shared_ptr<VideoDecoder> d)
 {
        /* These decoder calls could call other content methods which take a lock on the mutex */
-       libdcp::Size const vs = d->native_size ();
-       float const vfr = d->frames_per_second ();
+       libdcp::Size const vs = d->video_size ();
+       float const vfr = d->video_frame_rate ();
        
         {
                 boost::mutex::scoped_lock lm (_mutex);
@@ -81,14 +97,18 @@ VideoContent::take_from_video_decoder (shared_ptr<VideoDecoder> d)
                _video_frame_rate = vfr;
         }
         
-        Changed (VideoContentProperty::VIDEO_SIZE);
-        Changed (VideoContentProperty::VIDEO_FRAME_RATE);
+        signal_changed (VideoContentProperty::VIDEO_SIZE);
+        signal_changed (VideoContentProperty::VIDEO_FRAME_RATE);
 }
 
 
 string
 VideoContent::information () const
 {
+       if (video_size().width == 0 || video_size().height == 0) {
+               return "";
+       }
+       
        stringstream s;
 
        s << String::compose (
@@ -100,3 +120,75 @@ VideoContent::information () const
        
        return s.str ();
 }
+
+void
+VideoContent::set_crop (Crop c)
+{
+       {
+               boost::mutex::scoped_lock lm (_mutex);
+               _crop = c;
+       }
+       signal_changed (VideoContentProperty::VIDEO_CROP);
+}
+
+void
+VideoContent::set_left_crop (int c)
+{
+       {
+               boost::mutex::scoped_lock lm (_mutex);
+               
+               if (_crop.left == c) {
+                       return;
+               }
+               
+               _crop.left = c;
+       }
+       
+       signal_changed (VideoContentProperty::VIDEO_CROP);
+}
+
+void
+VideoContent::set_right_crop (int c)
+{
+       {
+               boost::mutex::scoped_lock lm (_mutex);
+               if (_crop.right == c) {
+                       return;
+               }
+               
+               _crop.right = c;
+       }
+       
+       signal_changed (VideoContentProperty::VIDEO_CROP);
+}
+
+void
+VideoContent::set_top_crop (int c)
+{
+       {
+               boost::mutex::scoped_lock lm (_mutex);
+               if (_crop.top == c) {
+                       return;
+               }
+               
+               _crop.top = c;
+       }
+       
+       signal_changed (VideoContentProperty::VIDEO_CROP);
+}
+
+void
+VideoContent::set_bottom_crop (int c)
+{
+       {
+               boost::mutex::scoped_lock lm (_mutex);
+               if (_crop.bottom == c) {
+                       return;
+               }
+               
+               _crop.bottom = c;
+       }
+
+       signal_changed (VideoContentProperty::VIDEO_CROP);
+}
+