projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix seconds_to_approximate_hms sometimes saying things like 1h60m (#1314).
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_content.h
diff --git
a/src/lib/ffmpeg_content.h
b/src/lib/ffmpeg_content.h
index b11486bf11ef166da4c29a96989fce2fef5def06..d9020ac018dcce2ab2bcda5df638d74d1cc9653f 100644
(file)
--- a/
src/lib/ffmpeg_content.h
+++ b/
src/lib/ffmpeg_content.h
@@
-1,19
+1,20
@@
/*
Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2013-2016 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/>.
*/
*/
@@
-54,9
+55,10
@@
public:
}
void examine (boost::shared_ptr<Job>);
}
void examine (boost::shared_ptr<Job>);
+ void take_settings_from (boost::shared_ptr<const Content> c);
std::string summary () const;
std::string technical_summary () const;
std::string summary () const;
std::string technical_summary () const;
- void as_xml (xmlpp::Node *) const;
+ void as_xml (xmlpp::Node *
, bool with_paths
) const;
DCPTime full_length () const;
std::string identifier () const;
DCPTime full_length () const;
std::string identifier () const;
@@
-65,8
+67,6
@@
public:
void set_filters (std::vector<Filter const *> const &);
void set_filters (std::vector<Filter const *> const &);
- void changed (int property);
-
std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
boost::mutex::scoped_lock lm (_mutex);
return _subtitle_streams;
std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
boost::mutex::scoped_lock lm (_mutex);
return _subtitle_streams;
@@
-91,9
+91,6
@@
public:
return _first_video;
}
return _first_video;
}
- std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;
- std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) const;
-
void signal_subtitle_stream_changed ();
private:
void signal_subtitle_stream_changed ();
private: