projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename MD5Digester -> Digester.
[dcpomatic.git]
/
src
/
lib
/
playlist.cc
diff --git
a/src/lib/playlist.cc
b/src/lib/playlist.cc
index b473bee8a059882a039bc9ab5920f41bc1b6761d..739c5a20b3d0317f506786ce8dbc4fd544a91bab 100644
(file)
--- a/
src/lib/playlist.cc
+++ b/
src/lib/playlist.cc
@@
-1,25
+1,24
@@
/*
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/>.
*/
#include "playlist.h"
*/
#include "playlist.h"
-#include "sndfile_content.h"
-#include "sndfile_decoder.h"
#include "video_content.h"
#include "subtitle_content.h"
#include "ffmpeg_decoder.h"
#include "video_content.h"
#include "subtitle_content.h"
#include "ffmpeg_decoder.h"
@@
-30,7
+29,7
@@
#include "job.h"
#include "config.h"
#include "util.h"
#include "job.h"
#include "config.h"
#include "util.h"
-#include "
md5_
digester.h"
+#include "digester.h"
#include <libcxml/cxml.h>
#include <libxml++/libxml++.h>
#include <boost/shared_ptr.hpp>
#include <libcxml/cxml.h>
#include <libxml++/libxml++.h>
#include <boost/shared_ptr.hpp>
@@
-155,7
+154,7
@@
Playlist::video_identifier () const
}
}
}
}
-
MD5
Digester digester;
+ Digester digester;
digester.add (t.c_str(), t.length());
return digester.get ();
}
digester.add (t.c_str(), t.length());
return digester.get ();
}
@@
-240,7
+239,7
@@
public:
};
int
};
int
-Playlist::best_
dcp
_frame_rate () const
+Playlist::best_
video
_frame_rate () const
{
list<int> const allowed_dcp_frame_rates = Config::instance()->allowed_dcp_frame_rates ();
{
list<int> const allowed_dcp_frame_rates = Config::instance()->allowed_dcp_frame_rates ();