projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename SafeStringStream -> locked_stringstream. Bump deps for removal of stringstream.
[dcpomatic.git]
/
src
/
lib
/
transcoder.h
diff --git
a/src/lib/transcoder.h
b/src/lib/transcoder.h
index 25b2ef90841c68a23dd077eb12d41d0c4a282969..14f3636619a8303aacf2d568011df8883c5ec6de 100644
(file)
--- a/
src/lib/transcoder.h
+++ b/
src/lib/transcoder.h
@@
-1,40
+1,42
@@
/*
Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2012 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/>.
*/
#include "types.h"
*/
#include "types.h"
-#include
"encoder.h"
+#include
<boost/weak_ptr.hpp>
class Film;
class Encoder;
class Film;
class Encoder;
-class VideoFilter;
class Player;
class Player;
+class Writer;
+class Job;
/** @class Transcoder */
class Transcoder : public boost::noncopyable
{
public:
/** @class Transcoder */
class Transcoder : public boost::noncopyable
{
public:
- Transcoder (boost::shared_ptr<const Film>, boost::
shared
_ptr<Job>);
+ Transcoder (boost::shared_ptr<const Film>, boost::
weak
_ptr<Job>);
void go ();
float current_encoding_rate () const;
void go ();
float current_encoding_rate () const;
- int video_frames_
out
() const;
+ int video_frames_
enqueued
() const;
/** @return true if we are in the process of calling Encoder::process_end */
bool finishing () const {
/** @return true if we are in the process of calling Encoder::process_end */
bool finishing () const {
@@
-43,7
+45,9
@@
public:
private:
boost::shared_ptr<const Film> _film;
private:
boost::shared_ptr<const Film> _film;
+ boost::weak_ptr<Job> _job;
boost::shared_ptr<Player> _player;
boost::shared_ptr<Player> _player;
+ boost::shared_ptr<Writer> _writer;
boost::shared_ptr<Encoder> _encoder;
bool _finishing;
};
boost::shared_ptr<Encoder> _encoder;
bool _finishing;
};