-
+2014-07-15 Carl Hetherington <cth@carlh.net>
+
+ * A variety of changes were made on the 2.0 branch
+ but not documented in the ChangeLog. Most sigificantly:
++
+ - DCP import
+ - Creation of DCPs with proper XML subtitles
+ - Import of .srt and .xml subtitles
+ - Audio processing framework (with some basic processors).
+
+2014-03-07 Carl Hetherington <cth@carlh.net>
+
+ * Add subtitle view.
+
+ 2014-07-16 Carl Hetherington <cth@carlh.net>
+
+ * Updates to de_DE from Carsten Kurz.
+
+ * Limit allowed KDM types based on Interop/SMPTE setting
+ of DCP (#385).
+
+ * Updates to fr_FR from Grégoire Ausina.
+
+ 2014-07-14 Carl Hetherington <cth@carlh.net>
+
+ * Bump libdcp to get a new version which writes
+ <Hash> values to CPLs.
+
+ 2014-07-10 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.72.2 released.
++>>>>>>> origin/master
+
2014-07-10 Carl Hetherington <cth@carlh.net>
* Try to fix corruption of KDM email setting in
obj.uselib = """
AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE
BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2
- SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XMLPP
- CURL ZIP QUICKMAIL XMLSEC
+ SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML++
- CURL ZIP QUICKMAIL PANGOMM CAIROMM
++ CURL ZIP QUICKMAIL PANGOMM CAIROMM XMLSEC
"""
if bld.env.TARGET_OSX:
return _write_to->GetValue ();
}
-libdcp::KDM::Formulation
+dcp::Formulation
KDMDialog::formulation () const
{
- switch (_type->GetSelection()) {
- case 0:
- return dcp::MODIFIED_TRANSITIONAL_1;
- case 1:
- return dcp::DCI_ANY;
- case 2:
- return dcp::DCI_SPECIFIC;
- default:
- assert (false);
- }
- return (libdcp::KDM::Formulation) reinterpret_cast<long int> (_type->GetClientData (_type->GetSelection()));
++ return (dcp::KDM::Formulation) reinterpret_cast<long int> (_type->GetClientData (_type->GetSelection()));
}
void
conf.check_cfg(package='libopenjpeg', args='--cflags --libs', max_version='1.5.2', mandatory=True)
def static_dcp(conf, static_boost, static_xmlpp, static_xmlsec, static_ssh):
++<<<<<<< HEAD
+ conf.check_cfg(package='libdcp-1.0', atleast_version='0.95', args='--cflags', uselib_store='DCP', mandatory=True)
++=======
+ conf.check_cfg(package='libdcp', atleast_version='0.96', args='--cflags', uselib_store='DCP', mandatory=True)
++>>>>>>> origin/master
conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
- conf.env.STLIB_DCP = ['dcp', 'asdcp-libdcp', 'kumu-libdcp']
+ conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-libdcp-1.0', 'kumu-libdcp-1.0']
conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt']
if static_boost: