projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Attempt to prevent a deadlock if audio is full and video empty (or vice versa).
[dcpomatic.git]
/
src
/
lib
/
image_subtitle.h
diff --git
a/src/lib/image_subtitle.h
b/src/lib/image_subtitle.h
index b25943ae178aedc12010b515350e4bc0c6b295be..f82c5b1944a3dac58af150ab8b4dbcc53b937366 100644
(file)
--- a/
src/lib/image_subtitle.h
+++ b/
src/lib/image_subtitle.h
@@
-1,19
+1,20
@@
/*
Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic 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.
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,
+
DCP-o-matic
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
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.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-21,6
+22,7
@@
#define DCPOMATIC_IMAGE_SUBTITLE_H
#include "rect.h"
#define DCPOMATIC_IMAGE_SUBTITLE_H
#include "rect.h"
+#include <boost/shared_ptr.hpp>
class Image;
class Image;
@@
-31,7
+33,7
@@
public:
: image (i)
, rectangle (r)
{}
: image (i)
, rectangle (r)
{}
-
+
boost::shared_ptr<Image> image;
/** Area that the subtitle covers on its corresponding video, expressed in
* proportions of the image size; e.g. rectangle.x = 0.5 would mean that
boost::shared_ptr<Image> image;
/** Area that the subtitle covers on its corresponding video, expressed in
* proportions of the image size; e.g. rectangle.x = 0.5 would mean that