summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-11-11 12:53:26 +0000
committerCarl Hetherington <cth@carlh.net>2013-11-11 12:53:26 +0000
commitcb83eb7b209054da2f81b456a0fbda6ea9d03844 (patch)
tree214f5ebeaefdbeb20129b541dfe9715588999aeb /src/lib
parentdeafd62ea410aa23b6b4c87989e8bc7e95db46e3 (diff)
Basic multiple selection for cropping.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/types.h2
-rw-r--r--src/lib/video_content.h20
2 files changed, 22 insertions, 0 deletions
diff --git a/src/lib/types.h b/src/lib/types.h
index ad706270e..448b6c154 100644
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -29,6 +29,7 @@ class Content;
class VideoContent;
class AudioContent;
class SubtitleContent;
+class FFmpegContent;
class AudioBuffers;
/** The version number of the protocol used to communicate
@@ -46,6 +47,7 @@ typedef std::vector<boost::shared_ptr<Content> > ContentList;
typedef std::vector<boost::shared_ptr<VideoContent> > VideoContentList;
typedef std::vector<boost::shared_ptr<AudioContent> > AudioContentList;
typedef std::vector<boost::shared_ptr<SubtitleContent> > SubtitleContentList;
+typedef std::vector<boost::shared_ptr<FFmpegContent> > FFmpegContentList;
template<class T>
struct TimedAudioBuffers
diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 6f80536fe..106adf959 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -85,6 +85,26 @@ public:
return _crop;
}
+ int left_crop () const {
+ boost::mutex::scoped_lock lm (_mutex);
+ return _crop.left;
+ }
+
+ int right_crop () const {
+ boost::mutex::scoped_lock lm (_mutex);
+ return _crop.right;
+ }
+
+ int top_crop () const {
+ boost::mutex::scoped_lock lm (_mutex);
+ return _crop.top;
+ }
+
+ int bottom_crop () const {
+ boost::mutex::scoped_lock lm (_mutex);
+ return _crop.bottom;
+ }
+
void set_ratio (Ratio const *);
/** @return ratio to scale to, or 0 if the content's own ratio should be preserved. */