From: Carl Hetherington Date: Tue, 21 May 2013 20:07:35 +0000 (+0100) Subject: Merge master. X-Git-Tag: v2.0.48~1337^2~367 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=237a0052c60af768f4d62b00321932918b7ba4d9 Merge master. --- 237a0052c60af768f4d62b00321932918b7ba4d9 diff --cc src/lib/film.cc index 37af4cb20,81c7de77f..487499e32 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@@ -691,18 -1000,14 +691,17 @@@ Film::set_trust_content_headers (bool t { { boost::mutex::scoped_lock lm (_state_mutex); - _trust_content_header = t; + _trust_content_headers = t; } - signal_changed (TRUST_CONTENT_HEADER); - - if (!_trust_content_header && !content().empty()) { + signal_changed (TRUST_CONTENT_HEADERS); - + + Playlist::ContentList content = _playlist->content (); + if (!_trust_content_headers && !content.empty()) { /* We just said that we don't trust the content's header */ - examine_content (); + for (Playlist::ContentList::iterator i = content.begin(); i != content.end(); ++i) { + examine_content (*i); + } } } diff --cc src/lib/po/es_ES.po index 7d2f8511e,944505007..58ad48a9c --- a/src/lib/po/es_ES.po +++ b/src/lib/po/es_ES.po @@@ -5,9 -5,9 +5,9 @@@ # msgid "" msgstr "" -"Project-Id-Version: LIBDVDOMATIC\n" +"Project-Id-Version: LIBDCPOMATIC\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2013-04-22 15:06+0100\n" + "POT-Creation-Date: 2013-05-09 09:51+0100\n" "PO-Revision-Date: 2013-04-02 19:10-0500\n" "Last-Translator: Manuel AC \n" "Language-Team: Manuel AC \n" @@@ -247,13 -247,13 +247,13 @@@ msgstr "Horizontal deblocking filter msgid "Horizontal deblocking filter A" msgstr "Horizontal deblocking filter A" - #: src/lib/job.cc:96 src/lib/job.cc:105 + #: src/lib/job.cc:97 src/lib/job.cc:106 msgid "" "It is not known what caused this error. The best idea is to report the " -"problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)" +"problem to the DCP-o-matic mailing list (dcpomatic@carlh.net)" msgstr "" "Error desconocido. La mejor idea es informar del problema a la lista de " -"correo de DVD-O-matic (dvdomatic@carlh.net)" +"correo de DCP-o-matic (dcpomatic@carlh.net)" #: src/lib/filter.cc:82 msgid "Kernel deinterlacer" diff --cc src/lib/po/fr_FR.po index 7f3da788b,a6a72598f..d69e2f7d5 --- a/src/lib/po/fr_FR.po +++ b/src/lib/po/fr_FR.po @@@ -5,11 -5,11 +5,11 @@@ # msgid "" msgstr "" -"Project-Id-Version: DVD-o-matic FRENCH\n" +"Project-Id-Version: DCP-o-matic FRENCH\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2013-04-22 15:06+0100\n" - "PO-Revision-Date: 2013-03-20 00:39+0100\n" - "Last-Translator: FreeDCP.net \n" + "POT-Creation-Date: 2013-05-09 09:51+0100\n" + "PO-Revision-Date: 2013-05-10 14:33+0100\n" + "Last-Translator: \n" "Language-Team: \n" "Language: \n" "MIME-Version: 1.0\n" @@@ -245,13 -255,10 +255,10 @@@ msgstr "Filtre dé-bloc horizontal msgid "Horizontal deblocking filter A" msgstr "Filtre dé-bloc horizontal" - #: src/lib/job.cc:96 src/lib/job.cc:105 - msgid "" - "It is not known what caused this error. The best idea is to report the " - "problem to the DCP-o-matic mailing list (dcpomatic@carlh.net)" - msgstr "" - "Erreur indéterminée. Merci de rapporter le problème à la liste DCP-o-matic " - "(dcpomatic@carlh.net)" + #: src/lib/job.cc:97 + #: src/lib/job.cc:106 -msgid "It is not known what caused this error. The best idea is to report the problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)" -msgstr "Erreur indéterminée. Merci de rapporter le problème à la liste DVD-o-matic (dvdomatic@carlh.net)" ++msgid "It is not known what caused this error. The best idea is to report the problem to the DCP-o-matic mailing list (dcpomatic@carlh.net)" ++msgstr "Erreur indéterminée. Merci de rapporter le problème à la liste DCP-o-matic (dcpomatic@carlh.net)" #: src/lib/filter.cc:82 msgid "Kernel deinterlacer" diff --cc src/lib/po/it_IT.po index bd22412fc,6a7486d82..1a46e67be --- a/src/lib/po/it_IT.po +++ b/src/lib/po/it_IT.po @@@ -244,13 -244,13 +244,13 @@@ msgstr "Filtro sblocco orizzontale msgid "Horizontal deblocking filter A" msgstr "Filtro A sblocco orizzontale" - #: src/lib/job.cc:96 src/lib/job.cc:105 + #: src/lib/job.cc:97 src/lib/job.cc:106 msgid "" "It is not known what caused this error. The best idea is to report the " -"problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)" +"problem to the DCP-o-matic mailing list (dcpomatic@carlh.net)" msgstr "" "Non sappiamo cosa ha causato questo errore. La cosa migliore è inviare un " -"report del problema alla mailing list di DVD-o-matic (dvdomatic@carlh.net)" +"report del problema alla mailing list di DCP-o-matic (dcpomatic@carlh.net)" #: src/lib/filter.cc:82 msgid "Kernel deinterlacer" diff --cc src/lib/po/sv_SE.po index ff86e23af,58d336ef8..d9a9c5955 --- a/src/lib/po/sv_SE.po +++ b/src/lib/po/sv_SE.po @@@ -5,9 -5,9 +5,9 @@@ # msgid "" msgstr "" -"Project-Id-Version: DVD-o-matic\n" +"Project-Id-Version: DCP-o-matic\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2013-04-22 15:06+0100\n" + "POT-Creation-Date: 2013-05-09 09:51+0100\n" "PO-Revision-Date: 2013-04-10 15:35+0100\n" "Last-Translator: Adam Klotblixt \n" "Language-Team: \n" @@@ -245,13 -245,13 +245,13 @@@ msgstr "Filter för horisontal kantighe msgid "Horizontal deblocking filter A" msgstr "Filter för horisontal kantighetsutjämning A" - #: src/lib/job.cc:96 src/lib/job.cc:105 + #: src/lib/job.cc:97 src/lib/job.cc:106 msgid "" "It is not known what caused this error. The best idea is to report the " -"problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)" +"problem to the DCP-o-matic mailing list (dcpomatic@carlh.net)" msgstr "" "Det är inte känt vad som orsakade detta fel. Bästa sättet att rapportera " -"problemet är till DVD-o-matics mejl-lista (dvdomatic@carlh.net)" +"problemet är till DCP-o-matics mejl-lista (dcpomatic@carlh.net)" #: src/lib/filter.cc:82 msgid "Kernel deinterlacer" diff --cc src/lib/util.cc index 9063b46d4,2f8be6edd..de5fbf8d1 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@@ -63,25 -67,20 +67,26 @@@ extern "C" #include "i18n.h" -using std::cout; using std::string; using std::stringstream; -using std::list; +using std::setfill; using std::ostream; +using std::endl; using std::vector; +using std::hex; +using std::setw; using std::ifstream; -using std::istream; +using std::ios; using std::min; using std::max; +using std::list; using std::multimap; +using std::istream; +using std::numeric_limits; using std::pair; + using std::ofstream; using boost::shared_ptr; +using boost::thread; using boost::lexical_cast; using boost::optional; using libdcp::Size; @@@ -258,8 -262,14 +274,14 @@@ LONG WINAPI exception_handler(struct _E * Must be called from the UI thread, if there is one. */ void -dvdomatic_setup () +dcpomatic_setup () { + #ifdef DVDOMATIC_WINDOWS + backtrace_file /= g_get_user_config_dir (); + backtrace_file /= "backtrace.txt"; + SetUnhandledExceptionFilter(exception_handler); + #endif + avfilter_register_all (); Format::setup_formats (); diff --cc src/lib/wscript index 0d9da3a8f,253a496d1..d8cc8261d --- a/src/lib/wscript +++ b/src/lib/wscript @@@ -69,19 -64,21 +69,23 @@@ def build(bld) obj.uselib = """ AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 - SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP GLIB LZMA + SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA """ + + obj.source = sources + ' version.cc' + if bld.env.TARGET_WINDOWS: - obj.uselib += ' WINSOCK2' + obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY' + obj.source += ' stack.cpp' + if bld.env.STATIC: + obj.uselib += ' XML++' + obj.source = sources + " version.cc" + obj.target = 'dcpomatic' - obj.target = 'dvdomatic' - - i18n.po_to_mo(os.path.join('src', 'lib'), 'libdvdomatic', bld) + i18n.po_to_mo(os.path.join('src', 'lib'), 'libdcpomatic', bld) def pot(bld): - i18n.pot(os.path.join('src', 'lib'), sources, 'libdvdomatic') + i18n.pot(os.path.join('src', 'lib'), sources, 'libdcpomatic') def pot_merge(bld): - i18n.pot_merge(os.path.join('src', 'lib'), 'libdvdomatic') + i18n.pot_merge(os.path.join('src', 'lib'), 'libdcpomatic') diff --cc src/tools/po/es_ES.po index 346aa2b39,30f568c98..b64478334 --- a/src/tools/po/es_ES.po +++ b/src/tools/po/es_ES.po @@@ -5,9 -5,9 +5,9 @@@ # msgid "" msgstr "" -"Project-Id-Version: DVDOMATIC\n" +"Project-Id-Version: DCPOMATIC\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2013-04-22 15:06+0100\n" + "POT-Creation-Date: 2013-05-09 09:51+0100\n" "PO-Revision-Date: 2013-03-23 21:08-0500\n" "Last-Translator: Manuel AC \n" "Language-Team: Manuel AC \n" @@@ -85,16 -85,16 +85,27 @@@ msgstr "No se pudo cargar la película msgid "Could not open film at %s (%s)" msgstr "No se pudo cargar la película en %s (%s)" ++<<<<<<< HEAD +#: src/tools/dcpomatic.cc:287 src/tools/dcpomatic.cc:410 +#: src/tools/dcpomatic.cc:531 +msgid "DCP-o-matic" +msgstr "DCP-o-matic" + +#: src/tools/dcpomatic.cc:75 +msgid "Film changed" +msgstr "Película cambiada" + +#: src/tools/dcpomatic.cc:416 + #: src/tools/dvdomatic.cc:288 src/tools/dvdomatic.cc:419 + #: src/tools/dvdomatic.cc:506 + msgid "DVD-o-matic" + msgstr "DVD-o-matic" + + #: src/tools/dvdomatic.cc:76 + msgid "Film changed" + msgstr "Película cambiada" + + #: src/tools/dvdomatic.cc:425 msgid "Free, open-source DCP generation from almost anything." msgstr "" "Generación de DCP a partir de casi cualquier fuente, libre y de código " diff --cc src/tools/po/fr_FR.po index 8ce305ccf,6b8f1e783..a2c91e65e --- a/src/tools/po/fr_FR.po +++ b/src/tools/po/fr_FR.po @@@ -5,10 -5,10 +5,10 @@@ # msgid "" msgstr "" -"Project-Id-Version: DVD-o-matic FRENCH\n" +"Project-Id-Version: DCP-o-matic FRENCH\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2013-04-22 15:06+0100\n" - "PO-Revision-Date: 2013-03-13 22:33+0100\n" + "POT-Creation-Date: 2013-05-09 09:51+0100\n" + "PO-Revision-Date: 2013-05-10 14:09+0100\n" "Last-Translator: \n" "Language-Team: \n" "Language: \n" diff --cc src/tools/po/sv_SE.po index 69706d647,7e88f84b1..6507bb69c --- a/src/tools/po/sv_SE.po +++ b/src/tools/po/sv_SE.po @@@ -5,9 -5,9 +5,9 @@@ # msgid "" msgstr "" -"Project-Id-Version: DVD-o-matic\n" +"Project-Id-Version: DCP-o-matic\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2013-04-22 15:06+0100\n" + "POT-Creation-Date: 2013-05-09 09:51+0100\n" "PO-Revision-Date: 2013-04-09 10:12+0100\n" "Last-Translator: Adam Klotblixt \n" "Language-Team: \n" @@@ -84,12 -84,12 +84,12 @@@ msgstr "Kunde inte öppna filmen %1 (%2 msgid "Could not open film at %s (%s)" msgstr "Kunde inte öppna filmen vid %s (%s)" - #: src/tools/dcpomatic.cc:287 src/tools/dcpomatic.cc:410 - #: src/tools/dcpomatic.cc:531 + #: src/tools/dvdomatic.cc:288 src/tools/dvdomatic.cc:419 + #: src/tools/dvdomatic.cc:506 -msgid "DVD-o-matic" -msgstr "DVD-o-matic" +msgid "DCP-o-matic" +msgstr "DCP-o-matic" - #: src/tools/dcpomatic.cc:75 + #: src/tools/dvdomatic.cc:76 msgid "Film changed" msgstr "Film ändrad" @@@ -106,11 -106,12 +106,12 @@@ msgstr "Ny... msgid "S&how DCP" msgstr "&Visa DCP" - #: src/tools/dcpomatic.cc:74 + #: src/tools/dvdomatic.cc:75 + #, fuzzy, c-format msgid "Save changes to film \"%s\" before closing?" -msgstr "Spara ändringarna till filmen \"%1\" före avslut?" +msgstr "Spara ändringarna till filmen \"%s\" före avslut?" - #: src/tools/dcpomatic.cc:319 + #: src/tools/dvdomatic.cc:328 msgid "Select film to open" msgstr "Välj film att öppna" diff --cc src/wx/po/es_ES.po index a193325e6,efc8436c5..bf5dce4b0 --- a/src/wx/po/es_ES.po +++ b/src/wx/po/es_ES.po @@@ -5,9 -5,9 +5,9 @@@ # msgid "" msgstr "" -"Project-Id-Version: libdvdomatic-wx\n" +"Project-Id-Version: libdcpomatic-wx\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2013-04-22 15:06+0100\n" + "POT-Creation-Date: 2013-05-09 09:51+0100\n" "PO-Revision-Date: 2013-04-02 19:08-0500\n" "Last-Translator: Manuel AC \n" "Language-Team: Manuel AC \n" @@@ -21,7 -21,7 +21,6 @@@ msgid "%" msgstr "%" - #: src/wx/config_dialog.cc:61 -#: src/wx/config_dialog.cc:98 msgid "(restart DCP-o-matic to see language changes)" msgstr "" @@@ -150,10 -160,10 +158,10 @@@ msgstr "Preferencias DCP-o-matic #: src/wx/audio_dialog.cc:101 #, fuzzy, c-format -msgid "DVD-o-matic audio - %s" -msgstr "Audio DVD-o-matic - %1" +msgid "DCP-o-matic audio - %s" +msgstr "Audio DCP-o-matic - %1" - #: src/wx/config_dialog.cc:102 + #: src/wx/config_dialog.cc:120 msgid "Default DCI name details" msgstr "Detalles por defecto del nombre DCI" diff --cc src/wx/po/fr_FR.po index 36ae4a925,ad138d45a..aee97956f --- a/src/wx/po/fr_FR.po +++ b/src/wx/po/fr_FR.po @@@ -5,11 -5,11 +5,11 @@@ # msgid "" msgstr "" -"Project-Id-Version: DVD-o-matic FRENCH\n" +"Project-Id-Version: DCP-o-matic FRENCH\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2013-04-22 15:06+0100\n" - "PO-Revision-Date: 2013-03-20 00:34+0100\n" - "Last-Translator: FreeDCP.net \n" + "POT-Creation-Date: 2013-05-09 09:51+0100\n" + "PO-Revision-Date: 2013-05-10 14:19+0100\n" + "Last-Translator: \n" "Language-Team: \n" "Language: \n" "MIME-Version: 1.0\n" @@@ -149,10 -159,10 +158,10 @@@ msgstr "Préférences DCP-o-matic #: src/wx/audio_dialog.cc:101 #, c-format -msgid "DVD-o-matic audio - %s" -msgstr "Son DVD-o-matic - %s" +msgid "DCP-o-matic audio - %s" +msgstr "Son DCP-o-matic - %s" - #: src/wx/config_dialog.cc:102 + #: src/wx/config_dialog.cc:120 msgid "Default DCI name details" msgstr "Détails du nom DCI par défaut" diff --cc src/wx/po/it_IT.po index 2c6c67868,37ee492fe..f667a6f21 --- a/src/wx/po/it_IT.po +++ b/src/wx/po/it_IT.po @@@ -150,10 -161,10 +159,10 @@@ msgstr "Preferenze DCP-o-matic #: src/wx/audio_dialog.cc:101 #, c-format -msgid "DVD-o-matic audio - %s" -msgstr "Audio DVD-o-matic - %s" +msgid "DCP-o-matic audio - %s" +msgstr "Audio DCP-o-matic - %s" - #: src/wx/config_dialog.cc:102 + #: src/wx/config_dialog.cc:120 msgid "Default DCI name details" msgstr "Dettagli del nome di default DCI" diff --cc src/wx/po/sv_SE.po index 9ed7ee2be,7c10aebcb..f31d98c38 --- a/src/wx/po/sv_SE.po +++ b/src/wx/po/sv_SE.po @@@ -5,9 -5,9 +5,9 @@@ # msgid "" msgstr "" -"Project-Id-Version: DVD-o-matic\n" +"Project-Id-Version: DCP-o-matic\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2013-04-22 15:06+0100\n" + "POT-Creation-Date: 2013-05-09 09:51+0100\n" "PO-Revision-Date: 2013-04-09 10:13+0100\n" "Last-Translator: Adam Klotblixt \n" "Language-Team: \n" @@@ -150,10 -161,10 +159,10 @@@ msgstr "DCP-o-matic Inställningar #: src/wx/audio_dialog.cc:101 #, c-format -msgid "DVD-o-matic audio - %s" -msgstr "DVD-o-matic audio - %s" +msgid "DCP-o-matic audio - %s" +msgstr "DCP-o-matic audio - %s" - #: src/wx/config_dialog.cc:102 + #: src/wx/config_dialog.cc:120 msgid "Default DCI name details" msgstr "Detaljer om förvalda DCI-namn"