Take some stuff out of VideoContent into ContentPart.

diff --git a/src/lib/content_part.h b/src/lib/content_part.h
new file mode 100644 (file)
index 0000000..2d0f73f
--- /dev/null
+++ b/src/lib/content_part.h
@@ -0,0 +1,37 @@
+/*
+    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <boost/weak_ptr.hpp>
+
+class Content;
+class Film;
+
+class ContentPart
+{
+public:
+       ContentPart (Content* parent, boost::shared_ptr<const Film> film)
+               : _parent (parent)
+               , _film (film)
+       {}
+
+protected:
+       Content* _parent;
+       boost::weak_ptr<const Film> _film;
+       mutable boost::mutex _mutex;
+};

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 708edee76a031e4ea8fe90624388564b173d77a0..4059c29d1eb9395894d21543bbaa5d2b93ed0ea5 100644 (file)
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -65,8 +65,7 @@ using boost::optional;
 using boost::dynamic_pointer_cast;
 
 VideoContent::VideoContent (Content* parent, shared_ptr<const Film> film)
-       : _parent (parent)
-       , _film (film)
+       : ContentPart (parent, film)
        , _video_length (0)
        , _video_frame_type (VIDEO_FRAME_TYPE_2D)
        , _scale (VideoContentScale (Ratio::from_id ("178")))
@@ -78,8 +77,7 @@ VideoContent::VideoContent (Content* parent, shared_ptr<const Film> film)
 }
 
 VideoContent::VideoContent (Content* parent, shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
-       : _parent (parent)
-       , _film (film)
+       : ContentPart (parent, film)
 {
        _video_size.width = node->number_child<int> ("VideoWidth");
        _video_size.height = node->number_child<int> ("VideoHeight");
@@ -117,8 +115,7 @@ VideoContent::VideoContent (Content* parent, shared_ptr<const Film> film, cxml::
 }
 
 VideoContent::VideoContent (Content* parent, shared_ptr<const Film> film, vector<shared_ptr<Content> > c)
-       : _parent (parent)
-       , _film (film)
+       : ContentPart (parent, film)
        , _video_length (0)
        , _yuv (false)
 {

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 768f1897df247e15a714c544b4cb5fce1699afa4..075f7b7015b623a7be591210aff0efd1af90ccfb 100644 (file)
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -25,6 +25,7 @@
 #include "dcpomatic_time.h"
 #include "user_property.h"
 #include "types.h"
+#include "content_part.h"
 #include <boost/thread/mutex.hpp>
 #include <boost/weak_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
@@ -47,7 +48,7 @@ public:
        static int const VIDEO_FADE_OUT;
 };
 
-class VideoContent : public boost::enable_shared_from_this<VideoContent>
+class VideoContent : public ContentPart, public boost::enable_shared_from_this<VideoContent>
 {
 public:
        VideoContent (Content* parent, boost::shared_ptr<const Film>);
@@ -184,9 +185,6 @@ public:
 
 private:
 
-       Content* _parent;
-       boost::weak_ptr<const Film> _film;
-       mutable boost::mutex _mutex;
        Frame _video_length;
        /** Video frame rate, or not set if this content should use the DCP's frame rate */
        boost::optional<double> _video_frame_rate;