From fef348c69139de43a0603de7b1fe4295af4c5d47 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 23 Jun 2014 14:50:51 +0100 Subject: Be more careful when mangling DCP names to fit ISDCF. Reported-by: Jonathan Jensen --- src/lib/film.cc | 42 +++++++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/lib/film.cc b/src/lib/film.cc index 609003bba..940eba1eb 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -77,6 +77,7 @@ using boost::to_upper_copy; using boost::ends_with; using boost::starts_with; using boost::optional; +using boost::is_any_of; using libdcp::Size; using libdcp::Signer; using libdcp::raw_convert; @@ -495,16 +496,39 @@ Film::isdcf_name (bool if_created_now) const stringstream d; string raw_name = name (); + + /* Split the raw name up into words */ + vector words; + split (words, raw_name, is_any_of (" ")); + string fixed_name; - bool cap_next = true; - for (size_t i = 0; i < raw_name.length(); ++i) { - if (raw_name[i] == ' ') { - cap_next = true; - } else if (cap_next) { - fixed_name += toupper (raw_name[i]); - cap_next = false; - } else { - fixed_name += tolower (raw_name[i]); + + /* Add each word to fixed_name */ + for (vector::const_iterator i = words.begin(); i != words.end(); ++i) { + string w = *i; + + /* First letter is always capitalised */ + w[0] = toupper (w[0]); + + /* Count caps in w */ + size_t caps = 0; + for (size_t i = 0; i < w.size(); ++i) { + if (isupper (w[i])) { + ++caps; + } + } + + /* If w is all caps make the rest of it lower case, otherwise + leave it alone. + */ + if (caps == w.size ()) { + for (size_t i = 1; i < w.size(); ++i) { + w[i] = tolower (w[i]); + } + } + + for (size_t i = 0; i < w.size(); ++i) { + fixed_name += w[i]; } } -- cgit v1.2.3 From 461b06109247773349b6cc17c01f74f4131ff04e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 23 Jun 2014 19:15:17 +0100 Subject: Add supporter. --- src/wx/about_dialog.cc | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc index 5e916d149..090f109a2 100644 --- a/src/wx/about_dialog.cc +++ b/src/wx/about_dialog.cc @@ -112,6 +112,7 @@ AboutDialog::AboutDialog (wxWindow* parent) supported_by.Add (wxT ("Manual AC")); supported_by.Add (wxT ("Kambiz Afshar")); supported_by.Add (wxT ("Louis Belloisy")); + supported_by.Add (wxT ("Mike Blakesley")); supported_by.Add (wxT ("Jeff Boot")); supported_by.Add (wxT ("Kieran Carroll")); supported_by.Add (wxT ("Frank Cianciolo")); -- cgit v1.2.3 From e21ed88c5ab6192baa31a433e5ea6f366f74ae99 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 23 Jun 2014 22:33:40 +0100 Subject: Some comments. --- src/lib/writer.cc | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 2ed55a276..01da6d3b4 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -136,6 +136,7 @@ Writer::write (shared_ptr encoded, int frame, Eyes eyes) boost::mutex::scoped_lock lock (_mutex); while (_queued_full_in_memory > _maximum_frames_in_memory) { + /* The queue is too big; wait until that is sorted out */ _full_condition.wait (lock); } @@ -157,7 +158,8 @@ Writer::write (shared_ptr encoded, int frame, Eyes eyes) _queue.push_back (qi); ++_queued_full_in_memory; } - + + /* Now there's something to do: wake anything wait()ing on _empty_condition */ _empty_condition.notify_all (); } @@ -167,6 +169,7 @@ Writer::fake_write (int frame, Eyes eyes) boost::mutex::scoped_lock lock (_mutex); while (_queued_full_in_memory > _maximum_frames_in_memory) { + /* The queue is too big; wait until that is sorted out */ _full_condition.wait (lock); } @@ -188,6 +191,7 @@ Writer::fake_write (int frame, Eyes eyes) _queue.push_back (qi); } + /* Now there's something to do: wake anything wait()ing on _empty_condition */ _empty_condition.notify_all (); } @@ -241,9 +245,11 @@ try while (1) { if (_finish || _queued_full_in_memory > _maximum_frames_in_memory || have_sequenced_image_at_queue_head ()) { + /* We've got something to do: go and do it */ break; } + /* Nothing to do: wait until something happens which may indicate that we do */ LOG_TIMING (N_("writer sleeps with a queue of %1"), _queue.size()); _empty_condition.wait (lock); LOG_TIMING (N_("writer wakes with a queue of %1"), _queue.size()); @@ -345,6 +351,7 @@ try --_queued_full_in_memory; } + /* The queue has probably just gone down a bit; notify anything wait()ing on _full_condition */ _full_condition.notify_all (); } } @@ -481,6 +488,7 @@ Writer::repeat (int f, Eyes e) boost::mutex::scoped_lock lock (_mutex); while (_queued_full_in_memory > _maximum_frames_in_memory) { + /* The queue is too big; wait until that is sorted out */ _full_condition.wait (lock); } @@ -497,6 +505,7 @@ Writer::repeat (int f, Eyes e) _queue.push_back (qi); } + /* Now there's something to do: wake anything wait()ing on _empty_condition */ _empty_condition.notify_all (); } -- cgit v1.2.3 From f3fc4b2a63ccc0a4da61371b3c2b10c8e9b8247d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 24 Jun 2014 10:06:25 +0100 Subject: Re-assign timeline tracks when things are moved about. --- ChangeLog | 5 +++++ src/wx/timeline.cc | 32 ++++++++++++++++++++++++++++---- src/wx/timeline.h | 4 +++- 3 files changed, 36 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/ChangeLog b/ChangeLog index da705b387..714a8516c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-06-24 Carl Hetherington + + * Fix some madness when dragging things around + on the timeline. + 2014-06-23 Carl Hetherington * Try harder to cope with DCP names specified diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index d4df6d8b2..eba12c47f 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -123,6 +123,10 @@ public: _track = t; } + void unset_track () { + _track = boost::optional (); + } + optional track () const { return _track; } @@ -362,7 +366,8 @@ Timeline::Timeline (wxWindow* parent, FilmEditor* ed, shared_ptr film) SetMinSize (wxSize (640, tracks() * track_height() + 96)); - _playlist_connection = film->playlist()->Changed.connect (bind (&Timeline::playlist_changed, this)); + _playlist_changed_connection = film->playlist()->Changed.connect (bind (&Timeline::playlist_changed, this)); + _playlist_content_changed_connection = film->playlist()->ContentChanged.connect (bind (&Timeline::playlist_content_changed, this, _2)); } void @@ -413,19 +418,38 @@ Timeline::playlist_changed () Refresh (); } +void +Timeline::playlist_content_changed (int property) +{ + ensure_ui_thread (); + + if (property == ContentProperty::POSITION) { + assign_tracks (); + setup_pixels_per_time_unit (); + Refresh (); + } +} + void Timeline::assign_tracks () { + for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) { + shared_ptr c = dynamic_pointer_cast (*i); + if (c) { + c->unset_track (); + } + } + for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) { shared_ptr cv = dynamic_pointer_cast (*i); if (!cv) { continue; } - + shared_ptr content = cv->content(); int t = 0; - while (1) { + while (true) { ViewList::iterator j = _views.begin(); while (j != _views.end()) { shared_ptr test = dynamic_pointer_cast (*j); @@ -650,7 +674,7 @@ Timeline::set_position_from_event (wxMouseEvent& ev) if (new_position < 0) { new_position = 0; } - + _down_view->content()->set_position (new_position); shared_ptr film = _film.lock (); diff --git a/src/wx/timeline.h b/src/wx/timeline.h index 7b4d75d09..fafb09c0e 100644 --- a/src/wx/timeline.h +++ b/src/wx/timeline.h @@ -79,6 +79,7 @@ private: void right_down (wxMouseEvent &); void mouse_moved (wxMouseEvent &); void playlist_changed (); + void playlist_content_changed (int); void resized (); void assign_tracks (); void set_position_from_event (wxMouseEvent &); @@ -105,5 +106,6 @@ private: ContentMenu _menu; bool _snap; - boost::signals2::scoped_connection _playlist_connection; + boost::signals2::scoped_connection _playlist_changed_connection; + boost::signals2::scoped_connection _playlist_content_changed_connection; }; -- cgit v1.2.3 From 05bafe7346705a8a3f6bbae17956c54ef3295bcc Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 24 Jun 2014 11:12:11 +0100 Subject: Only emit Changed when things are added to or removed from the playlist. --- src/lib/playlist.cc | 4 ---- src/lib/playlist.h | 6 +++++- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index dc87fbfab..e847e623b 100644 --- a/src/lib/playlist.cc +++ b/src/lib/playlist.cc @@ -367,8 +367,6 @@ Playlist::move_earlier (shared_ptr c) (*previous)->set_position (p + c->length_after_trim ()); c->set_position (p); sort (_content.begin(), _content.end(), ContentSorter ()); - - Changed (); } void @@ -394,8 +392,6 @@ Playlist::move_later (shared_ptr c) (*next)->set_position (c->position ()); c->set_position (p + c->length_after_trim ()); sort (_content.begin(), _content.end(), ContentSorter ()); - - Changed (); } FrameRateChange diff --git a/src/lib/playlist.h b/src/lib/playlist.h index effc52101..12380696b 100644 --- a/src/lib/playlist.h +++ b/src/lib/playlist.h @@ -82,8 +82,12 @@ public: void repeat (ContentList, int); + /** Emitted when content has been added to or removed from the playlist */ mutable boost::signals2::signal Changed; - /** Third parameter is true if signals are currently being emitted frequently */ + /** Emitted when something about a piece of our content has changed; + * these emissions include when the position of the content changes. + * Third parameter is true if signals are currently being emitted frequently. + */ mutable boost::signals2::signal, int, bool)> ContentChanged; private: -- cgit v1.2.3 From 5e49d8faab8627ab8449ff6db5e86b02dcee1661 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 24 Jun 2014 11:12:40 +0100 Subject: Update comment. --- src/lib/film.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/lib/film.h b/src/lib/film.h index 96ea930cc..cbe6d7b6b 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -153,7 +153,7 @@ public: NONE, NAME, USE_ISDCF_NAME, - /** The playlist's content list has changed (i.e. content has been added, moved around or removed) */ + /** The playlist's content list has changed (i.e. content has been added or removed) */ CONTENT, DCP_CONTENT_TYPE, CONTAINER, -- cgit v1.2.3 From bc84d129de2be9663d54eefe5d004450f65b541c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 24 Jun 2014 14:54:24 +0100 Subject: pot-merge. --- src/lib/po/de_DE.po | 22 +++++++++++----------- src/lib/po/es_ES.po | 22 +++++++++++----------- src/lib/po/fr_FR.po | 22 +++++++++++----------- src/lib/po/it_IT.po | 22 +++++++++++----------- src/lib/po/nl_NL.po | 22 +++++++++++----------- src/lib/po/sv_SE.po | 22 +++++++++++----------- src/tools/po/de_DE.po | 2 +- src/tools/po/es_ES.po | 2 +- src/tools/po/fr_FR.po | 2 +- src/tools/po/it_IT.po | 2 +- src/tools/po/nl_NL.po | 2 +- src/tools/po/sv_SE.po | 2 +- src/wx/po/de_DE.po | 12 ++++++------ src/wx/po/es_ES.po | 12 ++++++------ src/wx/po/fr_FR.po | 12 ++++++------ src/wx/po/it_IT.po | 12 ++++++------ src/wx/po/nl_NL.po | 12 ++++++------ src/wx/po/sv_SE.po | 12 ++++++------ 18 files changed, 108 insertions(+), 108 deletions(-) (limited to 'src') diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po index 9f6380c36..6b73bea17 100644 --- a/src/lib/po/de_DE.po +++ b/src/lib/po/de_DE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-23 00:25+0100\n" +"POT-Creation-Date: 2014-06-24 14:53+0100\n" "PO-Revision-Date: 2014-06-21 03:55+0100\n" "Last-Translator: Carsten Kurz\n" "Language-Team: LANGUAGE \n" @@ -106,7 +106,7 @@ msgstr "Center" msgid "Checking existing image data" msgstr "Überprüfe bestehende Bilddateien" -#: src/lib/writer.cc:464 +#: src/lib/writer.cc:471 msgid "Computing audio digest" msgstr "Tonübersicht berechnen" @@ -114,7 +114,7 @@ msgstr "Tonübersicht berechnen" msgid "Computing digest" msgstr "Zusammenfassung berechnen" -#: src/lib/writer.cc:460 +#: src/lib/writer.cc:467 msgid "Computing image digest" msgstr "Bildübersicht berechnen" @@ -493,7 +493,7 @@ msgstr "" msgid "There was not enough memory to do this." msgstr "Zu wenig Speicher für diese Operation." -#: src/lib/film.cc:412 +#: src/lib/film.cc:413 msgid "" "This film was created with a newer version of DCP-o-matic, and it cannot be " "loaded into this version. Sorry!" @@ -502,7 +502,7 @@ msgstr "" "kann leider nicht mit dieser älteren Version geladen werden. Sie müssen den " "Film neu erstellen. Sorry!" -#: src/lib/film.cc:404 +#: src/lib/film.cc:405 msgid "" "This film was created with an older version of DCP-o-matic, and " "unfortunately it cannot be loaded into this version. You will need to " @@ -564,7 +564,7 @@ msgstr "X" msgid "Yet Another Deinterlacing Filter" msgstr "Und ein weiterer De-Interlacer..." -#: src/lib/film.cc:309 +#: src/lib/film.cc:310 msgid "You must add some content to the DCP before creating it" msgstr "Sie müssen erst Inhalte hinzufügen bevor Sie ein DCP erstellen können!" @@ -576,7 +576,7 @@ msgstr "[Bewegte Bilder]" msgid "[still]" msgstr "[Standbild]" -#: src/lib/film.cc:257 +#: src/lib/film.cc:258 msgid "cannot contain slashes" msgstr "Darf keine Schrägstriche enthalten" @@ -588,11 +588,11 @@ msgstr "Zeit zur Verbindung abgelaufen" msgid "connecting" msgstr "verbinde..." -#: src/lib/film.cc:305 +#: src/lib/film.cc:306 msgid "container" msgstr "Containerformat" -#: src/lib/film.cc:313 +#: src/lib/film.cc:314 msgid "content type" msgstr "Inhaltsbeschreibung" @@ -616,7 +616,7 @@ msgstr "Keine Spur-Information gefunden" msgid "could not find video decoder" msgstr "Bild-Dekoder nicht gefunden" -#: src/lib/writer.cc:428 +#: src/lib/writer.cc:435 msgid "could not move audio MXF into the DCP (%1)" msgstr "Ton MXF kann nicht in das DCP verschoben werden (%1)" @@ -712,7 +712,7 @@ msgstr "wird verschoben" msgid "multi-part subtitles not yet supported" msgstr "Mehr-Segment Untertitel werden noch nicht unterstützt" -#: src/lib/film.cc:257 src/lib/film.cc:317 +#: src/lib/film.cc:258 src/lib/film.cc:318 msgid "name" msgstr "Name" diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po index d243f0b9a..813600fe5 100644 --- a/src/lib/po/es_ES.po +++ b/src/lib/po/es_ES.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: LIBDCPOMATIC\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-23 00:25+0100\n" +"POT-Creation-Date: 2014-06-24 14:53+0100\n" "PO-Revision-Date: 2014-04-20 10:12-0500\n" "Last-Translator: Manuel AC \n" "Language-Team: Manuel AC \n" @@ -105,7 +105,7 @@ msgstr "Centro" msgid "Checking existing image data" msgstr "Comprobando las imágenes existentes" -#: src/lib/writer.cc:464 +#: src/lib/writer.cc:471 msgid "Computing audio digest" msgstr "Calculando la firma resumen del audio" @@ -113,7 +113,7 @@ msgstr "Calculando la firma resumen del audio" msgid "Computing digest" msgstr "Calculando la firma resumen" -#: src/lib/writer.cc:460 +#: src/lib/writer.cc:467 msgid "Computing image digest" msgstr "Calculando la firma resumen de imagen" @@ -487,7 +487,7 @@ msgstr "" msgid "There was not enough memory to do this." msgstr "No hubo suficiente memoria para hacer esto." -#: src/lib/film.cc:412 +#: src/lib/film.cc:413 msgid "" "This film was created with a newer version of DCP-o-matic, and it cannot be " "loaded into this version. Sorry!" @@ -496,7 +496,7 @@ msgstr "" "desgraciadamente no s puede cargar. Necesitas crear una nueva película, " "volver a añadir y configurar ton contenido. ¡Lo siento!" -#: src/lib/film.cc:404 +#: src/lib/film.cc:405 msgid "" "This film was created with an older version of DCP-o-matic, and " "unfortunately it cannot be loaded into this version. You will need to " @@ -558,7 +558,7 @@ msgstr "X" msgid "Yet Another Deinterlacing Filter" msgstr "Yet Another Deinterlacing Filter" -#: src/lib/film.cc:309 +#: src/lib/film.cc:310 msgid "You must add some content to the DCP before creating it" msgstr "Tienes que añadir contenido al DCP antes de crearlo." @@ -570,7 +570,7 @@ msgstr "[imágenes en movimiento]" msgid "[still]" msgstr "[imagen fija]" -#: src/lib/film.cc:257 +#: src/lib/film.cc:258 msgid "cannot contain slashes" msgstr "no puede contener barras" @@ -582,11 +582,11 @@ msgstr "tiempo de conexión agotado" msgid "connecting" msgstr "conectando" -#: src/lib/film.cc:305 +#: src/lib/film.cc:306 msgid "container" msgstr "continente" -#: src/lib/film.cc:313 +#: src/lib/film.cc:314 msgid "content type" msgstr "tipo de contenido" @@ -610,7 +610,7 @@ msgstr "no se pudo encontrar información del flujo" msgid "could not find video decoder" msgstr "no se pudo encontrar decodificador de vídeo" -#: src/lib/writer.cc:428 +#: src/lib/writer.cc:435 msgid "could not move audio MXF into the DCP (%1)" msgstr "no s puedo mover el audio MXF en el DCP (%1)" @@ -706,7 +706,7 @@ msgstr "moviendo" msgid "multi-part subtitles not yet supported" msgstr "todavía no se soportan subtítulos en múltiples partes" -#: src/lib/film.cc:257 src/lib/film.cc:317 +#: src/lib/film.cc:258 src/lib/film.cc:318 msgid "name" msgstr "nombre" diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po index 117565dce..6cef1b3dc 100644 --- a/src/lib/po/fr_FR.po +++ b/src/lib/po/fr_FR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCP-o-matic FRENCH\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-23 00:25+0100\n" +"POT-Creation-Date: 2014-06-24 14:53+0100\n" "PO-Revision-Date: 2014-06-20 15:53+0100\n" "Last-Translator: \n" "Language-Team: \n" @@ -105,7 +105,7 @@ msgstr "Centre" msgid "Checking existing image data" msgstr "Recherche de données images existantes" -#: src/lib/writer.cc:464 +#: src/lib/writer.cc:471 msgid "Computing audio digest" msgstr "Fabrication rendu audio" @@ -113,7 +113,7 @@ msgstr "Fabrication rendu audio" msgid "Computing digest" msgstr "fabrication rendu" -#: src/lib/writer.cc:460 +#: src/lib/writer.cc:467 msgid "Computing image digest" msgstr "Fabrication rendu image" @@ -479,7 +479,7 @@ msgstr "" msgid "There was not enough memory to do this." msgstr "Il n'y avait pas assez de mémoire pour faire cela." -#: src/lib/film.cc:412 +#: src/lib/film.cc:413 msgid "" "This film was created with a newer version of DCP-o-matic, and it cannot be " "loaded into this version. Sorry!" @@ -487,7 +487,7 @@ msgstr "" "Ce film a été créé avec une nouvelle version de DCP-o-matic et il ne peut " "être ouvert dans cette version du programme. Désolé!" -#: src/lib/film.cc:404 +#: src/lib/film.cc:405 msgid "" "This film was created with an older version of DCP-o-matic, and " "unfortunately it cannot be loaded into this version. You will need to " @@ -549,7 +549,7 @@ msgstr "X" msgid "Yet Another Deinterlacing Filter" msgstr "Un autre filtre de désentrelacement" -#: src/lib/film.cc:309 +#: src/lib/film.cc:310 msgid "You must add some content to the DCP before creating it" msgstr "Ajoutez un contenu pour créer le DCP" @@ -561,7 +561,7 @@ msgstr "[Déplacement d'images]" msgid "[still]" msgstr "[restant]" -#: src/lib/film.cc:257 +#: src/lib/film.cc:258 msgid "cannot contain slashes" msgstr "slash interdit" @@ -573,11 +573,11 @@ msgstr "temps de connexion expiré" msgid "connecting" msgstr "connexion" -#: src/lib/film.cc:305 +#: src/lib/film.cc:306 msgid "container" msgstr "conteneur" -#: src/lib/film.cc:313 +#: src/lib/film.cc:314 msgid "content type" msgstr "type de contenu" @@ -601,7 +601,7 @@ msgstr "information du flux introuvable" msgid "could not find video decoder" msgstr "décodeur vidéo introuvable" -#: src/lib/writer.cc:428 +#: src/lib/writer.cc:435 msgid "could not move audio MXF into the DCP (%1)" msgstr "ne peut déplacer un MXF son dans le DCP (%1)" @@ -699,7 +699,7 @@ msgstr "déplacement" msgid "multi-part subtitles not yet supported" msgstr "sous-titres en plusieurs parties non supportés" -#: src/lib/film.cc:257 src/lib/film.cc:317 +#: src/lib/film.cc:258 src/lib/film.cc:318 msgid "name" msgstr "nom" diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po index fb73fa1d0..e2bce6f87 100644 --- a/src/lib/po/it_IT.po +++ b/src/lib/po/it_IT.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: IT VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-23 00:25+0100\n" +"POT-Creation-Date: 2014-06-24 14:53+0100\n" "PO-Revision-Date: 2014-02-03 10:48+0100\n" "Last-Translator: William Fanelli \n" "Language-Team: \n" @@ -106,7 +106,7 @@ msgstr "Centro" msgid "Checking existing image data" msgstr "" -#: src/lib/writer.cc:464 +#: src/lib/writer.cc:471 msgid "Computing audio digest" msgstr "" @@ -114,7 +114,7 @@ msgstr "" msgid "Computing digest" msgstr "" -#: src/lib/writer.cc:460 +#: src/lib/writer.cc:467 msgid "Computing image digest" msgstr "" @@ -498,7 +498,7 @@ msgstr "" msgid "There was not enough memory to do this." msgstr "" -#: src/lib/film.cc:412 +#: src/lib/film.cc:413 #, fuzzy msgid "" "This film was created with a newer version of DCP-o-matic, and it cannot be " @@ -509,7 +509,7 @@ msgstr "" "un nuovo film, ri-aggiungere i tuoi contenuti e configurarlo di nuovo. Ci " "dispiace!" -#: src/lib/film.cc:404 +#: src/lib/film.cc:405 msgid "" "This film was created with an older version of DCP-o-matic, and " "unfortunately it cannot be loaded into this version. You will need to " @@ -572,7 +572,7 @@ msgstr "X" msgid "Yet Another Deinterlacing Filter" msgstr "Altro filtro di deinterlacciamento" -#: src/lib/film.cc:309 +#: src/lib/film.cc:310 msgid "You must add some content to the DCP before creating it" msgstr "Devi aggiungere dei contenuti al DCP prima di crearlo" @@ -585,7 +585,7 @@ msgstr "" msgid "[still]" msgstr "ancora" -#: src/lib/film.cc:257 +#: src/lib/film.cc:258 msgid "cannot contain slashes" msgstr "non può contenere barre" @@ -597,11 +597,11 @@ msgstr "connessione scaduta" msgid "connecting" msgstr "mi sto connettendo" -#: src/lib/film.cc:305 +#: src/lib/film.cc:306 msgid "container" msgstr "contenitore" -#: src/lib/film.cc:313 +#: src/lib/film.cc:314 msgid "content type" msgstr "tipo di contenuto" @@ -625,7 +625,7 @@ msgstr "non riesco a trovare informazioni sullo streaming" msgid "could not find video decoder" msgstr "non riesco a trovare il decoder video" -#: src/lib/writer.cc:428 +#: src/lib/writer.cc:435 msgid "could not move audio MXF into the DCP (%1)" msgstr "" @@ -723,7 +723,7 @@ msgstr "" msgid "multi-part subtitles not yet supported" msgstr "sottotitoli multi-part non ancora supportati" -#: src/lib/film.cc:257 src/lib/film.cc:317 +#: src/lib/film.cc:258 src/lib/film.cc:318 msgid "name" msgstr "nome" diff --git a/src/lib/po/nl_NL.po b/src/lib/po/nl_NL.po index 98f5c918c..f471ce8af 100644 --- a/src/lib/po/nl_NL.po +++ b/src/lib/po/nl_NL.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCP-o-matic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-23 00:25+0100\n" +"POT-Creation-Date: 2014-06-24 14:53+0100\n" "PO-Revision-Date: 2014-03-30 19:39+0100\n" "Last-Translator: Theo Kooijmans \n" "Language-Team: UniversalDV \n" @@ -106,7 +106,7 @@ msgstr "Midden" msgid "Checking existing image data" msgstr "Controleer bestaande videodata" -#: src/lib/writer.cc:464 +#: src/lib/writer.cc:471 msgid "Computing audio digest" msgstr "Verwerk audio data" @@ -114,7 +114,7 @@ msgstr "Verwerk audio data" msgid "Computing digest" msgstr "Verwerken..." -#: src/lib/writer.cc:460 +#: src/lib/writer.cc:467 msgid "Computing image digest" msgstr "Verwerk video data" @@ -491,7 +491,7 @@ msgstr "" msgid "There was not enough memory to do this." msgstr "Er was niet genoeg geheugen om dit uit te voeren." -#: src/lib/film.cc:412 +#: src/lib/film.cc:413 msgid "" "This film was created with a newer version of DCP-o-matic, and it cannot be " "loaded into this version. Sorry!" @@ -499,7 +499,7 @@ msgstr "" "Deze film is gemaakt met een nieuwere versie van DCP-o-matic en kan niet " "geopend worden. Sorry!" -#: src/lib/film.cc:404 +#: src/lib/film.cc:405 msgid "" "This film was created with an older version of DCP-o-matic, and " "unfortunately it cannot be loaded into this version. You will need to " @@ -561,7 +561,7 @@ msgstr "X" msgid "Yet Another Deinterlacing Filter" msgstr "Yet Another Deinterlacing Filter" -#: src/lib/film.cc:309 +#: src/lib/film.cc:310 msgid "You must add some content to the DCP before creating it" msgstr "U moet wat content toevoegen voor het maken van de DCP" @@ -573,7 +573,7 @@ msgstr "[bewegend beeld]" msgid "[still]" msgstr "[still]" -#: src/lib/film.cc:257 +#: src/lib/film.cc:258 msgid "cannot contain slashes" msgstr "er mag geen '\" gebruikt worden" @@ -585,11 +585,11 @@ msgstr "verbinding timeout" msgid "connecting" msgstr "verbinden" -#: src/lib/film.cc:305 +#: src/lib/film.cc:306 msgid "container" msgstr "container" -#: src/lib/film.cc:313 +#: src/lib/film.cc:314 msgid "content type" msgstr "content type" @@ -613,7 +613,7 @@ msgstr "kan geen stream informatie vinden" msgid "could not find video decoder" msgstr "kan geen videodecoder vinden" -#: src/lib/writer.cc:428 +#: src/lib/writer.cc:435 msgid "could not move audio MXF into the DCP (%1)" msgstr "kan MXF audio niet plaatsen in DCP (%1)" @@ -709,7 +709,7 @@ msgstr "bewegend" msgid "multi-part subtitles not yet supported" msgstr "ondertitels met meerdere delen worden nog niet ondersteund." -#: src/lib/film.cc:257 src/lib/film.cc:317 +#: src/lib/film.cc:258 src/lib/film.cc:318 msgid "name" msgstr "naam" diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po index f3c0ba9d2..98d76e3bd 100644 --- a/src/lib/po/sv_SE.po +++ b/src/lib/po/sv_SE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCP-o-matic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-23 00:25+0100\n" +"POT-Creation-Date: 2014-06-24 14:53+0100\n" "PO-Revision-Date: 2014-01-19 08:59+0100\n" "Last-Translator: Adam Klotblixt \n" "Language-Team: \n" @@ -105,7 +105,7 @@ msgstr "Center" msgid "Checking existing image data" msgstr "Kontrollerar befintligt bilddata" -#: src/lib/writer.cc:464 +#: src/lib/writer.cc:471 msgid "Computing audio digest" msgstr "Beräknar audiosammanfattning" @@ -113,7 +113,7 @@ msgstr "Beräknar audiosammanfattning" msgid "Computing digest" msgstr "Beräknar sammanfattning" -#: src/lib/writer.cc:460 +#: src/lib/writer.cc:467 msgid "Computing image digest" msgstr "Beräknar bildsammanfattning" @@ -494,7 +494,7 @@ msgstr "" msgid "There was not enough memory to do this." msgstr "" -#: src/lib/film.cc:412 +#: src/lib/film.cc:413 #, fuzzy msgid "" "This film was created with a newer version of DCP-o-matic, and it cannot be " @@ -504,7 +504,7 @@ msgstr "" "inte öppnas i denna version. Du måste skapa en ny Film, lägga till ditt " "innehåll och konfigurera allt igen. Ursäkta!" -#: src/lib/film.cc:404 +#: src/lib/film.cc:405 msgid "" "This film was created with an older version of DCP-o-matic, and " "unfortunately it cannot be loaded into this version. You will need to " @@ -568,7 +568,7 @@ msgstr "X" msgid "Yet Another Deinterlacing Filter" msgstr "Yet Another Deinterlacing Filter" -#: src/lib/film.cc:309 +#: src/lib/film.cc:310 msgid "You must add some content to the DCP before creating it" msgstr "Du måste lägga till något innehåll till DCP:n innan du skapar den" @@ -580,7 +580,7 @@ msgstr "[rörliga bilder]" msgid "[still]" msgstr "[stillbild]" -#: src/lib/film.cc:257 +#: src/lib/film.cc:258 msgid "cannot contain slashes" msgstr "får inte innehålla snedstreck" @@ -593,11 +593,11 @@ msgstr "uppkopplingen tajmade ur" msgid "connecting" msgstr "kopplar upp" -#: src/lib/film.cc:305 +#: src/lib/film.cc:306 msgid "container" msgstr "behållare" -#: src/lib/film.cc:313 +#: src/lib/film.cc:314 msgid "content type" msgstr "innehållstyp" @@ -621,7 +621,7 @@ msgstr "kunde inte hitta information om strömmen" msgid "could not find video decoder" msgstr "kunde inte hitta video-avkodare" -#: src/lib/writer.cc:428 +#: src/lib/writer.cc:435 msgid "could not move audio MXF into the DCP (%1)" msgstr "kunde inte flytta audio-MXF in i DCP:n (%1)" @@ -719,7 +719,7 @@ msgstr "rörlig" msgid "multi-part subtitles not yet supported" msgstr "undertexter i flera delar stöds inte ännu" -#: src/lib/film.cc:257 src/lib/film.cc:317 +#: src/lib/film.cc:258 src/lib/film.cc:318 msgid "name" msgstr "namn" diff --git a/src/tools/po/de_DE.po b/src/tools/po/de_DE.po index 8d4a51bac..209458f23 100644 --- a/src/tools/po/de_DE.po +++ b/src/tools/po/de_DE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-23 00:25+0100\n" +"POT-Creation-Date: 2014-06-24 14:53+0100\n" "PO-Revision-Date: 2014-06-21 02:38+0100\n" "Last-Translator: Carsten Kurz\n" "Language-Team: LANGUAGE \n" diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po index 1fb15f5a0..374877caf 100644 --- a/src/tools/po/es_ES.po +++ b/src/tools/po/es_ES.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCPOMATIC\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-23 00:25+0100\n" +"POT-Creation-Date: 2014-06-24 14:53+0100\n" "PO-Revision-Date: 2014-04-20 10:21-0500\n" "Last-Translator: Manuel AC \n" "Language-Team: Manuel AC \n" diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po index cb81a4995..fca31b0b5 100644 --- a/src/tools/po/fr_FR.po +++ b/src/tools/po/fr_FR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCP-o-matic FRENCH\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-23 00:25+0100\n" +"POT-Creation-Date: 2014-06-24 14:53+0100\n" "PO-Revision-Date: 2014-06-20 15:57+0100\n" "Last-Translator: \n" "Language-Team: \n" diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po index 0d49d1396..c3baa96d1 100644 --- a/src/tools/po/it_IT.po +++ b/src/tools/po/it_IT.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: IT VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-23 00:25+0100\n" +"POT-Creation-Date: 2014-06-24 14:53+0100\n" "PO-Revision-Date: 2014-02-03 09:36+0100\n" "Last-Translator: William Fanelli \n" "Language-Team: \n" diff --git a/src/tools/po/nl_NL.po b/src/tools/po/nl_NL.po index 7a6bd0602..fe0bf7ef8 100644 --- a/src/tools/po/nl_NL.po +++ b/src/tools/po/nl_NL.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCP-o-matic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-23 00:25+0100\n" +"POT-Creation-Date: 2014-06-24 14:53+0100\n" "PO-Revision-Date: 2014-03-30 19:38+0100\n" "Last-Translator: Theo Kooijmans \n" "Language-Team: UniversalDV \n" diff --git a/src/tools/po/sv_SE.po b/src/tools/po/sv_SE.po index fb114885e..be2a243c5 100644 --- a/src/tools/po/sv_SE.po +++ b/src/tools/po/sv_SE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCP-o-matic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-23 00:25+0100\n" +"POT-Creation-Date: 2014-06-24 14:53+0100\n" "PO-Revision-Date: 2014-01-19 08:59+0100\n" "Last-Translator: Adam Klotblixt \n" "Language-Team: \n" diff --git a/src/wx/po/de_DE.po b/src/wx/po/de_DE.po index 017383c03..d0dcccb75 100644 --- a/src/wx/po/de_DE.po +++ b/src/wx/po/de_DE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-23 00:25+0100\n" +"POT-Creation-Date: 2014-06-24 14:53+0100\n" "PO-Revision-Date: 2014-06-21 04:06+0100\n" "Last-Translator: Carsten Kurz\n" "Language-Team: LANGUAGE \n" @@ -941,7 +941,7 @@ msgstr "Untertitel Sprache (z.B. EN)" msgid "Subtitles" msgstr "Untertitel" -#: src/wx/about_dialog.cc:152 +#: src/wx/about_dialog.cc:153 msgid "Supported by" msgstr "Unterstützt durch" @@ -965,7 +965,7 @@ msgstr "Gebiet (z.B. UK)" msgid "Test version " msgstr "Test Version" -#: src/wx/about_dialog.cc:197 +#: src/wx/about_dialog.cc:198 msgid "Tested by" msgstr "Getestet von" @@ -1148,7 +1148,7 @@ msgstr "" "Ihr DCP hat weniger als 6 Audiokanäle. Das kann auf manchen Projektoren zu " "Problemen führen." -#: src/wx/timeline.cc:216 +#: src/wx/timeline.cc:220 msgid "audio" msgstr "Ton" @@ -1173,7 +1173,7 @@ msgstr "ms" msgid "s" msgstr "s" -#: src/wx/timeline.cc:239 +#: src/wx/timeline.cc:243 msgid "still" msgstr "Standbild" @@ -1181,7 +1181,7 @@ msgstr "Standbild" msgid "times" msgstr "Zeiten" -#: src/wx/timeline.cc:237 +#: src/wx/timeline.cc:241 msgid "video" msgstr "Bild" diff --git a/src/wx/po/es_ES.po b/src/wx/po/es_ES.po index d7e48c045..d84e5355c 100644 --- a/src/wx/po/es_ES.po +++ b/src/wx/po/es_ES.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: libdcpomatic-wx\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-23 00:25+0100\n" +"POT-Creation-Date: 2014-06-24 14:53+0100\n" "PO-Revision-Date: 2014-04-20 12:06-0500\n" "Last-Translator: Manuel AC \n" "Language-Team: Manuel AC \n" @@ -947,7 +947,7 @@ msgstr "Idioma del subtítulo (ej. EN)" msgid "Subtitles" msgstr "Subtítulos" -#: src/wx/about_dialog.cc:152 +#: src/wx/about_dialog.cc:153 msgid "Supported by" msgstr "Soportado por" @@ -972,7 +972,7 @@ msgstr "Territorio (ej. ES)" msgid "Test version " msgstr "Versión en prueba" -#: src/wx/about_dialog.cc:197 +#: src/wx/about_dialog.cc:198 msgid "Tested by" msgstr "Comprobado por" @@ -1156,7 +1156,7 @@ msgstr "" "Tu DCP tiene menos de 6 canales de audio. Esto puede causar problemas con " "algunos proyectores." -#: src/wx/timeline.cc:216 +#: src/wx/timeline.cc:220 msgid "audio" msgstr "audio" @@ -1181,7 +1181,7 @@ msgstr "ms" msgid "s" msgstr "s" -#: src/wx/timeline.cc:239 +#: src/wx/timeline.cc:243 msgid "still" msgstr "fijo" @@ -1189,7 +1189,7 @@ msgstr "fijo" msgid "times" msgstr "veces" -#: src/wx/timeline.cc:237 +#: src/wx/timeline.cc:241 msgid "video" msgstr "vídeo" diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po index 9801710eb..766bd3ad3 100644 --- a/src/wx/po/fr_FR.po +++ b/src/wx/po/fr_FR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCP-o-matic FRENCH\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-23 00:25+0100\n" +"POT-Creation-Date: 2014-06-24 14:53+0100\n" "PO-Revision-Date: 2014-06-20 16:08+0100\n" "Last-Translator: \n" "Language-Team: \n" @@ -939,7 +939,7 @@ msgstr "Langue de sous-titres (ex. FR)" msgid "Subtitles" msgstr "Sous-titres" -#: src/wx/about_dialog.cc:152 +#: src/wx/about_dialog.cc:153 msgid "Supported by" msgstr "Soutenu par" @@ -963,7 +963,7 @@ msgstr "Territoire (ex. FR)" msgid "Test version " msgstr "Version Test" -#: src/wx/about_dialog.cc:197 +#: src/wx/about_dialog.cc:198 msgid "Tested by" msgstr "Testé par" @@ -1145,7 +1145,7 @@ msgstr "" "Votre DCP a moins de 6 canaux audio. Cela peut créer des problèmes de " "lecture sur certains projecteurs." -#: src/wx/timeline.cc:216 +#: src/wx/timeline.cc:220 msgid "audio" msgstr "audio" @@ -1170,7 +1170,7 @@ msgstr "ms" msgid "s" msgstr "s" -#: src/wx/timeline.cc:239 +#: src/wx/timeline.cc:243 msgid "still" msgstr "fixe" @@ -1178,7 +1178,7 @@ msgstr "fixe" msgid "times" msgstr "fois" -#: src/wx/timeline.cc:237 +#: src/wx/timeline.cc:241 msgid "video" msgstr "vidéo" diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po index 79febb5ab..7789601a7 100644 --- a/src/wx/po/it_IT.po +++ b/src/wx/po/it_IT.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: IT VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-23 00:25+0100\n" +"POT-Creation-Date: 2014-06-24 14:53+0100\n" "PO-Revision-Date: 2014-02-03 10:46+0100\n" "Last-Translator: William Fanelli \n" "Language-Team: \n" @@ -958,7 +958,7 @@ msgstr "Lingua dei Sottotitoli (es. FR)" msgid "Subtitles" msgstr "Sottotitoli" -#: src/wx/about_dialog.cc:152 +#: src/wx/about_dialog.cc:153 msgid "Supported by" msgstr "" @@ -984,7 +984,7 @@ msgstr "Nazione (es. UK)" msgid "Test version " msgstr "Versione di test" -#: src/wx/about_dialog.cc:197 +#: src/wx/about_dialog.cc:198 msgid "Tested by" msgstr "" @@ -1167,7 +1167,7 @@ msgstr "" "Il vostro DCP ha meno di 6 canali audio. Questo può causare problemi su " "alcuni proiettori." -#: src/wx/timeline.cc:216 +#: src/wx/timeline.cc:220 #, fuzzy msgid "audio" msgstr "Audio" @@ -1193,7 +1193,7 @@ msgstr "ms" msgid "s" msgstr "s" -#: src/wx/timeline.cc:239 +#: src/wx/timeline.cc:243 msgid "still" msgstr "" @@ -1201,7 +1201,7 @@ msgstr "" msgid "times" msgstr "" -#: src/wx/timeline.cc:237 +#: src/wx/timeline.cc:241 #, fuzzy msgid "video" msgstr "Video" diff --git a/src/wx/po/nl_NL.po b/src/wx/po/nl_NL.po index 514ec4665..b33e4a748 100644 --- a/src/wx/po/nl_NL.po +++ b/src/wx/po/nl_NL.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCP-o-matic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-23 00:25+0100\n" +"POT-Creation-Date: 2014-06-24 14:53+0100\n" "PO-Revision-Date: 2014-03-30 19:40+0100\n" "Last-Translator: Theo Kooijmans \n" "Language-Team: UniversalDV \n" @@ -953,7 +953,7 @@ msgstr "Ondertitel Taal (vb NL)" msgid "Subtitles" msgstr "Ondertitels" -#: src/wx/about_dialog.cc:152 +#: src/wx/about_dialog.cc:153 msgid "Supported by" msgstr "Ondersteund door" @@ -978,7 +978,7 @@ msgstr "Grondgebied (vb NL)" msgid "Test version " msgstr "Test Versie" -#: src/wx/about_dialog.cc:197 +#: src/wx/about_dialog.cc:198 msgid "Tested by" msgstr "Getest door" @@ -1160,7 +1160,7 @@ msgstr "" "Uw DCP heeft minder dan 6 audio kanalen. This kan problemen geven op sommige " "projectors." -#: src/wx/timeline.cc:216 +#: src/wx/timeline.cc:220 msgid "audio" msgstr "audio" @@ -1185,7 +1185,7 @@ msgstr "ms" msgid "s" msgstr "s" -#: src/wx/timeline.cc:239 +#: src/wx/timeline.cc:243 msgid "still" msgstr "still" @@ -1193,7 +1193,7 @@ msgstr "still" msgid "times" msgstr "tijden" -#: src/wx/timeline.cc:237 +#: src/wx/timeline.cc:241 msgid "video" msgstr "video" diff --git a/src/wx/po/sv_SE.po b/src/wx/po/sv_SE.po index dd62b1e29..657fe847a 100644 --- a/src/wx/po/sv_SE.po +++ b/src/wx/po/sv_SE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCP-o-matic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-23 00:25+0100\n" +"POT-Creation-Date: 2014-06-24 14:53+0100\n" "PO-Revision-Date: 2014-01-19 09:14+0100\n" "Last-Translator: Adam Klotblixt \n" "Language-Team: \n" @@ -970,7 +970,7 @@ msgstr "Undertextspråk (ex. SV)" msgid "Subtitles" msgstr "Undertexter" -#: src/wx/about_dialog.cc:152 +#: src/wx/about_dialog.cc:153 msgid "Supported by" msgstr "Stöd från" @@ -995,7 +995,7 @@ msgstr "Område (ex. SV)" msgid "Test version " msgstr "Testversion" -#: src/wx/about_dialog.cc:197 +#: src/wx/about_dialog.cc:198 #, fuzzy msgid "Tested by" msgstr "Översatt av" @@ -1183,7 +1183,7 @@ msgstr "" "Din DCP har mindre än 6 audiokanaler. Detta kan medföra problem på vissa " "projektorer." -#: src/wx/timeline.cc:216 +#: src/wx/timeline.cc:220 msgid "audio" msgstr "audio" @@ -1208,7 +1208,7 @@ msgstr "ms" msgid "s" msgstr "s" -#: src/wx/timeline.cc:239 +#: src/wx/timeline.cc:243 msgid "still" msgstr "stillbild" @@ -1217,7 +1217,7 @@ msgstr "stillbild" msgid "times" msgstr "tider" -#: src/wx/timeline.cc:237 +#: src/wx/timeline.cc:241 msgid "video" msgstr "video" -- cgit v1.2.3 From 1427c9e3a9642e613ea0e894d0986ef67d99a4be Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 24 Jun 2014 16:53:31 +0100 Subject: Attempt to fix static link on Debian unstable. --- src/wx/wscript | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/wx/wscript b/src/wx/wscript index 8c142698b..20e2e7c43 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -63,6 +63,10 @@ def configure(conf): conf.env.STLIB_WXWIDGETS = ['wx_gtk2u_richtext-3.0', 'wx_gtk2u_xrc-3.0', 'wx_gtk2u_qa-3.0', 'wx_baseu_net-3.0', 'wx_gtk2u_html-3.0', 'wx_gtk2u_adv-3.0', 'wx_gtk2u_core-3.0', 'wx_baseu_xml-3.0', 'wx_baseu-3.0'] conf.env.LIB_WXWIDGETS = ['tiff', 'SM', 'dl', 'jpeg', 'png', 'X11', 'expat'] + if conf.env.TARGET_DEBIAN: + conf.env.LIB_WXWIDGETS.append('Xxf86vm') + conf.env.LIB_WXWIDGETS.append('Xext') + conf.env.LIB_WXWIDGETS.append('X11') conf.in_msg = 1 wx_version = conf.check_cfg(package='', path=conf.options.wx_config, args='--version').strip() -- cgit v1.2.3 From 07975dbeaad3f7173874faae4e0a702a4d6efa75 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 25 Jun 2014 10:42:48 +0100 Subject: More attempts to fix various debian builds. --- src/wx/wscript | 2 +- wscript | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/wx/wscript b/src/wx/wscript index 20e2e7c43..de256bf60 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -63,7 +63,7 @@ def configure(conf): conf.env.STLIB_WXWIDGETS = ['wx_gtk2u_richtext-3.0', 'wx_gtk2u_xrc-3.0', 'wx_gtk2u_qa-3.0', 'wx_baseu_net-3.0', 'wx_gtk2u_html-3.0', 'wx_gtk2u_adv-3.0', 'wx_gtk2u_core-3.0', 'wx_baseu_xml-3.0', 'wx_baseu-3.0'] conf.env.LIB_WXWIDGETS = ['tiff', 'SM', 'dl', 'jpeg', 'png', 'X11', 'expat'] - if conf.env.TARGET_DEBIAN: + if conf.env.TARGET_DEBIAN and conf.env.DEBIAN_UNSTABLE: conf.env.LIB_WXWIDGETS.append('Xxf86vm') conf.env.LIB_WXWIDGETS.append('Xext') conf.env.LIB_WXWIDGETS.append('X11') diff --git a/wscript b/wscript index 353543815..92250a50c 100644 --- a/wscript +++ b/wscript @@ -13,6 +13,7 @@ def options(opt): opt.add_option('--disable-gui', action='store_true', default=False, help='disable building of GUI tools') opt.add_option('--target-windows', action='store_true', default=False, help='set up to do a cross-compile to make a Windows package') opt.add_option('--target-debian', action='store_true', default=False, help='set up to compile for a Debian/Ubuntu package') + opt.add_option('--debian-unstable', action='store_true', default=False, help='add extra libraries to static-build correctly on Debian unstable') opt.add_option('--target-centos', action='store_true', default=False, help='set up to compile for a Centos package') opt.add_option('--magickpp-config', action='store', default='Magick++-config', help='path to Magick++-config') opt.add_option('--wx-config', action='store', default='wx-config', help='path to wx-config') @@ -163,6 +164,7 @@ def configure(conf): conf.env.TARGET_WINDOWS = conf.options.target_windows conf.env.DISABLE_GUI = conf.options.disable_gui conf.env.TARGET_DEBIAN = conf.options.target_debian + conf.env.DEBIAN_UNSTABLE = conf.options.debian_unstable conf.env.TARGET_CENTOS = conf.options.target_centos conf.env.VERSION = VERSION conf.env.TARGET_OSX = sys.platform == 'darwin' -- cgit v1.2.3 From 7b85b778834753912573fef7bb09d51821c0ef7c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 25 Jun 2014 16:19:53 +0100 Subject: Support pixel format 46 in make_black(). --- ChangeLog | 4 ++++ src/lib/image.cc | 1 + test/make_black_test.cc | 7 ++++--- 3 files changed, 9 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/ChangeLog b/ChangeLog index 0e7ecd836..ad48437c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-06-25 Carl Hetherington + + * Support pixel format 46 in make_black(). + 2014-06-24 Carl Hetherington * Re-assign timeline tracks when things are diff --git a/src/lib/image.cc b/src/lib/image.cc index 8a8fb1c7b..f340637dc 100644 --- a/src/lib/image.cc +++ b/src/lib/image.cc @@ -319,6 +319,7 @@ Image::make_black () case PIX_FMT_RGBA: case PIX_FMT_ABGR: case PIX_FMT_BGRA: + case PIX_FMT_RGB555LE: memset (data()[0], 0, lines(0) * stride()[0]); break; diff --git a/test/make_black_test.cc b/test/make_black_test.cc index 7c0f92142..dd0208b1d 100644 --- a/test/make_black_test.cc +++ b/test/make_black_test.cc @@ -36,12 +36,12 @@ BOOST_AUTO_TEST_CASE (make_black_test) libdcp::Size out_size (1024, 1024); list pix_fmts; - pix_fmts.push_back (AV_PIX_FMT_RGB24); + pix_fmts.push_back (AV_PIX_FMT_RGB24); // 2 pix_fmts.push_back (AV_PIX_FMT_ARGB); pix_fmts.push_back (AV_PIX_FMT_RGBA); pix_fmts.push_back (AV_PIX_FMT_ABGR); pix_fmts.push_back (AV_PIX_FMT_BGRA); - pix_fmts.push_back (AV_PIX_FMT_YUV420P); + pix_fmts.push_back (AV_PIX_FMT_YUV420P); // 0 pix_fmts.push_back (AV_PIX_FMT_YUV411P); pix_fmts.push_back (AV_PIX_FMT_YUV422P10LE); pix_fmts.push_back (AV_PIX_FMT_YUV422P16LE); @@ -71,7 +71,8 @@ BOOST_AUTO_TEST_CASE (make_black_test) pix_fmts.push_back (AV_PIX_FMT_YUVA420P16LE); pix_fmts.push_back (AV_PIX_FMT_YUVA422P16LE); pix_fmts.push_back (AV_PIX_FMT_YUVA444P16LE); - + pix_fmts.push_back (AV_PIX_FMT_RGB555LE); // 46 + int N = 0; for (list::const_iterator i = pix_fmts.begin(); i != pix_fmts.end(); ++i) { boost::shared_ptr foo (new Image (*i, in_size, true)); -- cgit v1.2.3 From 02f028d271677b3b3669b5cdfda1597108a34b80 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 26 Jun 2014 11:04:02 +0100 Subject: Use full/empty conditions rather than just a single condition for the server and encoder. --- ChangeLog | 3 +++ src/lib/encoder.cc | 23 ++++++++++++++--------- src/lib/encoder.h | 5 ++++- src/lib/server.cc | 8 ++++---- src/lib/server.h | 3 ++- 5 files changed, 27 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/ChangeLog b/ChangeLog index 6be780b4b..6b004770c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2014-06-26 Carl Hetherington + * Optimisation of uncertain effect to encoder and server + thread handling. + * Version 1.70.0 released. 2014-06-25 Carl Hetherington diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc index e83ac70f5..02a271029 100644 --- a/src/lib/encoder.cc +++ b/src/lib/encoder.cc @@ -108,8 +108,8 @@ Encoder::process_end () /* Keep waking workers until the queue is empty */ while (!_queue.empty ()) { - _condition.notify_all (); - _condition.wait (lock); + _empty_condition.notify_all (); + _full_condition.wait (lock); } lock.unlock (); @@ -194,7 +194,7 @@ Encoder::process_video (shared_ptr pvf, bool same) /* Wait until the queue has gone down a bit */ while (_queue.size() >= _threads.size() * 2 && !_terminate) { LOG_TIMING ("decoder sleeps with queue of %1", _queue.size()); - _condition.wait (lock); + _full_condition.wait (lock); LOG_TIMING ("decoder wakes with queue of %1", _queue.size()); } @@ -226,8 +226,11 @@ Encoder::process_video (shared_ptr pvf, bool same) _film->j2k_bandwidth(), _film->resolution(), _film->log() ) )); - - _condition.notify_all (); + + /* The queue might not be empty any more, so notify anything which is + waiting on that. + */ + _empty_condition.notify_all (); _have_a_real_frame[pvf->eyes()] = true; } @@ -248,7 +251,8 @@ Encoder::terminate_threads () { boost::mutex::scoped_lock lock (_mutex); _terminate = true; - _condition.notify_all (); + _full_condition.notify_all (); + _empty_condition.notify_all (); } for (list::iterator i = _threads.begin(); i != _threads.end(); ++i) { @@ -271,12 +275,12 @@ try */ int remote_backoff = 0; - while (1) { + while (true) { LOG_TIMING ("[%1] encoder thread sleeps", boost::this_thread::get_id()); boost::mutex::scoped_lock lock (_mutex); while (_queue.empty () && !_terminate) { - _condition.wait (lock); + _empty_condition.wait (lock); } if (_terminate) { @@ -338,8 +342,9 @@ try dcpomatic_sleep (remote_backoff); } + /* The queue might not be full any more, so notify anything that is waiting on that */ lock.lock (); - _condition.notify_all (); + _full_condition.notify_all (); } } catch (...) diff --git a/src/lib/encoder.h b/src/lib/encoder.h index a8ee220aa..8d5aa2c40 100644 --- a/src/lib/encoder.h +++ b/src/lib/encoder.h @@ -111,7 +111,10 @@ private: std::list > _queue; std::list _threads; mutable boost::mutex _mutex; - boost::condition _condition; + /** condition to manage thread wakeups when we have nothing to do */ + boost::condition _empty_condition; + /** condition to manage thread wakeups when we have too much to do */ + boost::condition _full_condition; boost::shared_ptr _writer; Waker _waker; diff --git a/src/lib/server.cc b/src/lib/server.cc index ed7fb6145..7450fd12e 100644 --- a/src/lib/server.cc +++ b/src/lib/server.cc @@ -118,7 +118,7 @@ Server::worker_thread () while (1) { boost::mutex::scoped_lock lock (_worker_mutex); while (_queue.empty ()) { - _worker_condition.wait (lock); + _empty_condition.wait (lock); } shared_ptr socket = _queue.front (); @@ -169,7 +169,7 @@ Server::worker_thread () LOG_GENERAL_NC (message.str ()); } - _worker_condition.notify_all (); + _full_condition.notify_all (); } } @@ -202,11 +202,11 @@ Server::run (int num_threads) /* Wait until the queue has gone down a bit */ while (int (_queue.size()) >= num_threads * 2) { - _worker_condition.wait (lock); + _full_condition.wait (lock); } _queue.push_back (socket); - _worker_condition.notify_all (); + _empty_condition.notify_all (); } } diff --git a/src/lib/server.h b/src/lib/server.h index a9b4b1c1c..b925031eb 100644 --- a/src/lib/server.h +++ b/src/lib/server.h @@ -102,7 +102,8 @@ private: std::vector _worker_threads; std::list > _queue; boost::mutex _worker_mutex; - boost::condition _worker_condition; + boost::condition _full_condition; + boost::condition _empty_condition; boost::shared_ptr _log; bool _verbose; -- cgit v1.2.3 From d1125d09c7741d05b57b1520531a0451663ad66c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 26 Jun 2014 14:35:33 +0100 Subject: Allow user to set video frame rate of video sources (to override the detected one). --- ChangeLog | 2 ++ cscript | 2 +- src/lib/video_content.cc | 15 +++++++++++++++ src/lib/video_content.h | 1 + src/wx/timing_panel.cc | 14 ++++++++------ wscript | 2 +- 6 files changed, 28 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/ChangeLog b/ChangeLog index 6b004770c..39acb863e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2014-06-26 Carl Hetherington + * Allow override of detected video frame rates. + * Optimisation of uncertain effect to encoder and server thread handling. diff --git a/cscript b/cscript index fd8d36d1e..9080a1e09 100644 --- a/cscript +++ b/cscript @@ -157,7 +157,7 @@ def make_control(debian_version, bits, filename, debug): def dependencies(target): return (('ffmpeg-cdist', '67dc770'), - ('libdcp', 'v0.95.0')) + ('libdcp', '2224998')) def build(target, options): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 6f6b2c441..676a694da 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -405,6 +405,21 @@ VideoContent::scale_and_crop_to_fit_height () set_right_crop (crop / 2); } +void +VideoContent::set_video_frame_rate (float r) +{ + { + boost::mutex::scoped_lock lm (_mutex); + if (_video_frame_rate == r) { + return; + } + + _video_frame_rate = r; + } + + signal_changed (VideoContentProperty::VIDEO_FRAME_RATE); +} + VideoContentScale::VideoContentScale (Ratio const * r) : _ratio (r) , _scale (true) diff --git a/src/lib/video_content.h b/src/lib/video_content.h index f23bf0abe..d0b907cb8 100644 --- a/src/lib/video_content.h +++ b/src/lib/video_content.h @@ -116,6 +116,7 @@ public: } void set_video_frame_type (VideoFrameType); + void set_video_frame_rate (float); void set_left_crop (int); void set_right_crop (int); diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index 5d21d0a02..ef963bbfc 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -17,6 +17,7 @@ */ +#include #include "lib/content.h" #include "lib/image_content.h" #include "timing_panel.h" @@ -28,7 +29,7 @@ using std::cout; using std::string; using boost::shared_ptr; using boost::dynamic_pointer_cast; -using boost::lexical_cast; +using libdcp::raw_convert; TimingPanel::TimingPanel (FilmEditor* e) /* horrid hack for apparent lack of context support with wxWidgets i18n code */ @@ -124,7 +125,7 @@ TimingPanel::film_content_changed (int property) if (content) { shared_ptr vc = dynamic_pointer_cast (content); if (vc) { - _video_frame_rate->SetValue (std_to_wx (lexical_cast (vc->video_frame_rate ()))); + _video_frame_rate->SetValue (std_to_wx (raw_convert (vc->video_frame_rate (), 5))); } else { _video_frame_rate->SetValue ("24"); } @@ -133,10 +134,11 @@ TimingPanel::film_content_changed (int property) } } + shared_ptr vc = dynamic_pointer_cast (content); shared_ptr ic = dynamic_pointer_cast (content); _full_length->set_editable (ic && ic->still ()); _play_length->set_editable (!ic || !ic->still ()); - _video_frame_rate->Enable (ic && !ic->still ()); + _video_frame_rate->Enable (vc); _set_video_frame_rate->Enable (false); } @@ -200,9 +202,9 @@ TimingPanel::set_video_frame_rate () { ContentList c = _editor->selected_content (); if (c.size() == 1) { - shared_ptr ic = dynamic_pointer_cast (c.front ()); - if (ic) { - ic->set_video_frame_rate (lexical_cast (wx_to_std (_video_frame_rate->GetValue ()))); + shared_ptr vc = dynamic_pointer_cast (c.front ()); + if (vc) { + vc->set_video_frame_rate (raw_convert (wx_to_std (_video_frame_rate->GetValue ()))); } _set_video_frame_rate->Enable (false); } diff --git a/wscript b/wscript index 82a56e237..866b230c5 100644 --- a/wscript +++ b/wscript @@ -56,7 +56,7 @@ def dynamic_openjpeg(conf): 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): - conf.check_cfg(package='libdcp', atleast_version='0.92', args='--cflags', uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp', atleast_version='0.95', args='--cflags', uselib_store='DCP', mandatory=True) conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP] conf.env.STLIB_DCP = ['dcp', 'asdcp-libdcp', 'kumu-libdcp'] conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt'] -- cgit v1.2.3 From 075f418cc6d9be06bed7a1d98257ae8d17ef3019 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 26 Jun 2014 19:15:56 +0100 Subject: Support different KDM formulations. --- ChangeLog | 2 ++ cscript | 2 +- src/lib/film.cc | 10 ++++++---- src/lib/film.h | 8 +++++--- src/lib/kdm.cc | 21 +++++++++++++-------- src/lib/kdm.h | 5 ++++- src/lib/send_kdm_email_job.cc | 6 ++++-- src/lib/send_kdm_email_job.h | 5 ++++- src/tools/dcpomatic.cc | 4 ++-- src/tools/dcpomatic_kdm.cc | 21 +++++++++++++++++---- src/wx/kdm_dialog.cc | 23 +++++++++++++++++++++++ src/wx/kdm_dialog.h | 2 ++ 12 files changed, 83 insertions(+), 26 deletions(-) (limited to 'src') diff --git a/ChangeLog b/ChangeLog index 39acb863e..bcf3cdb79 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2014-06-26 Carl Hetherington + * Support different KDM formulations. + * Allow override of detected video frame rates. * Optimisation of uncertain effect to encoder and server diff --git a/cscript b/cscript index 9080a1e09..af3921e2f 100644 --- a/cscript +++ b/cscript @@ -157,7 +157,7 @@ def make_control(debian_version, bits, filename, debug): def dependencies(target): return (('ffmpeg-cdist', '67dc770'), - ('libdcp', '2224998')) + ('libdcp', '7103135')) def build(target, options): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() diff --git a/src/lib/film.cc b/src/lib/film.cc index 940eba1eb..0a77caf50 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -1086,7 +1086,8 @@ Film::make_kdm ( shared_ptr target, boost::filesystem::path cpl_file, boost::posix_time::ptime from, - boost::posix_time::ptime until + boost::posix_time::ptime until, + libdcp::KDM::Formulation formulation ) const { shared_ptr signer = make_signer (); @@ -1095,7 +1096,7 @@ Film::make_kdm ( struct tm* tm = localtime (&now); string const issue_date = libdcp::tm_to_string (tm); - return libdcp::KDM (cpl_file, signer, target, key (), from, until, "DCP-o-matic", issue_date); + return libdcp::KDM (cpl_file, signer, target, key (), from, until, "DCP-o-matic", issue_date, formulation); } list @@ -1103,13 +1104,14 @@ Film::make_kdms ( list > screens, boost::filesystem::path dcp, boost::posix_time::ptime from, - boost::posix_time::ptime until + boost::posix_time::ptime until, + libdcp::KDM::Formulation formulation ) const { list kdms; for (list >::iterator i = screens.begin(); i != screens.end(); ++i) { - kdms.push_back (make_kdm ((*i)->certificate, dcp, from, until)); + kdms.push_back (make_kdm ((*i)->certificate, dcp, from, until, formulation)); } return kdms; diff --git a/src/lib/film.h b/src/lib/film.h index cbe6d7b6b..b7d105688 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2014 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -128,14 +128,16 @@ public: boost::shared_ptr target, boost::filesystem::path cpl_file, boost::posix_time::ptime from, - boost::posix_time::ptime until + boost::posix_time::ptime until, + libdcp::KDM::Formulation formulation ) const; std::list make_kdms ( std::list >, boost::filesystem::path cpl_file, boost::posix_time::ptime from, - boost::posix_time::ptime until + boost::posix_time::ptime until, + libdcp::KDM::Formulation formulation ) const; libdcp::Key key () const { diff --git a/src/lib/kdm.cc b/src/lib/kdm.cc index 5efea089c..49bfae20a 100644 --- a/src/lib/kdm.cc +++ b/src/lib/kdm.cc @@ -105,10 +105,11 @@ make_screen_kdms ( list > screens, boost::filesystem::path cpl, boost::posix_time::ptime from, - boost::posix_time::ptime to + boost::posix_time::ptime to, + libdcp::KDM::Formulation formulation ) { - list kdms = film->make_kdms (screens, cpl, from, to); + list kdms = film->make_kdms (screens, cpl, from, to, formulation); list screen_kdms; @@ -129,10 +130,11 @@ make_cinema_kdms ( list > screens, boost::filesystem::path cpl, boost::posix_time::ptime from, - boost::posix_time::ptime to + boost::posix_time::ptime to, + libdcp::KDM::Formulation formulation ) { - list screen_kdms = make_screen_kdms (film, screens, cpl, from, to); + list screen_kdms = make_screen_kdms (film, screens, cpl, from, to, formulation); list cinema_kdms; while (!screen_kdms.empty ()) { @@ -175,10 +177,11 @@ write_kdm_files ( boost::filesystem::path cpl, boost::posix_time::ptime from, boost::posix_time::ptime to, + libdcp::KDM::Formulation formulation, boost::filesystem::path directory ) { - list screen_kdms = make_screen_kdms (film, screens, cpl, from, to); + list screen_kdms = make_screen_kdms (film, screens, cpl, from, to, formulation); /* Write KDMs to the specified directory */ for (list::iterator i = screen_kdms.begin(); i != screen_kdms.end(); ++i) { @@ -195,10 +198,11 @@ write_kdm_zip_files ( boost::filesystem::path cpl, boost::posix_time::ptime from, boost::posix_time::ptime to, + libdcp::KDM::Formulation formulation, boost::filesystem::path directory ) { - list cinema_kdms = make_cinema_kdms (film, screens, cpl, from, to); + list cinema_kdms = make_cinema_kdms (film, screens, cpl, from, to, formulation); for (list::const_iterator i = cinema_kdms.begin(); i != cinema_kdms.end(); ++i) { boost::filesystem::path path = directory; @@ -213,10 +217,11 @@ email_kdms ( list > screens, boost::filesystem::path cpl, boost::posix_time::ptime from, - boost::posix_time::ptime to + boost::posix_time::ptime to, + libdcp::KDM::Formulation formulation ) { - list cinema_kdms = make_cinema_kdms (film, screens, cpl, from, to); + list cinema_kdms = make_cinema_kdms (film, screens, cpl, from, to, formulation); for (list::const_iterator i = cinema_kdms.begin(); i != cinema_kdms.end(); ++i) { diff --git a/src/lib/kdm.h b/src/lib/kdm.h index 8aacd7b72..8fb4ec494 100644 --- a/src/lib/kdm.h +++ b/src/lib/kdm.h @@ -29,6 +29,7 @@ extern void write_kdm_files ( boost::filesystem::path cpl, boost::posix_time::ptime from, boost::posix_time::ptime to, + libdcp::KDM::Formulation formulation, boost::filesystem::path directory ); @@ -38,6 +39,7 @@ extern void write_kdm_zip_files ( boost::filesystem::path cpl, boost::posix_time::ptime from, boost::posix_time::ptime to, + libdcp::KDM::Formulation formulation, boost::filesystem::path directory ); @@ -46,6 +48,7 @@ extern void email_kdms ( std::list > screens, boost::filesystem::path cpl, boost::posix_time::ptime from, - boost::posix_time::ptime to + boost::posix_time::ptime to, + libdcp::KDM::Formulation formulation ); diff --git a/src/lib/send_kdm_email_job.cc b/src/lib/send_kdm_email_job.cc index 8af0b556a..1dec2ffb0 100644 --- a/src/lib/send_kdm_email_job.cc +++ b/src/lib/send_kdm_email_job.cc @@ -33,13 +33,15 @@ SendKDMEmailJob::SendKDMEmailJob ( list > screens, boost::filesystem::path dcp, boost::posix_time::ptime from, - boost::posix_time::ptime to + boost::posix_time::ptime to, + libdcp::KDM::Formulation formulation ) : Job (f) , _screens (screens) , _dcp (dcp) , _from (from) , _to (to) + , _formulation (formulation) { } @@ -62,7 +64,7 @@ SendKDMEmailJob::run () try { set_progress_unknown (); - email_kdms (_film, _screens, _dcp, _from, _to); + email_kdms (_film, _screens, _dcp, _from, _to, _formulation); set_progress (1); set_state (FINISHED_OK); diff --git a/src/lib/send_kdm_email_job.h b/src/lib/send_kdm_email_job.h index f4d154a91..8a8903040 100644 --- a/src/lib/send_kdm_email_job.h +++ b/src/lib/send_kdm_email_job.h @@ -18,6 +18,7 @@ */ #include +#include #include "job.h" class Screen; @@ -30,7 +31,8 @@ public: std::list >, boost::filesystem::path, boost::posix_time::ptime, - boost::posix_time::ptime + boost::posix_time::ptime, + libdcp::KDM::Formulation ); std::string name () const; @@ -42,4 +44,5 @@ private: boost::filesystem::path _dcp; boost::posix_time::ptime _from; boost::posix_time::ptime _to; + libdcp::KDM::Formulation _formulation; }; diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index c9d17eb9b..588fd5c48 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -470,10 +470,10 @@ private: try { if (d->write_to ()) { - write_kdm_files (film, d->screens (), d->cpl (), d->from (), d->until (), d->directory ()); + write_kdm_files (film, d->screens (), d->cpl (), d->from (), d->until (), d->formulation (), d->directory ()); } else { JobManager::instance()->add ( - shared_ptr (new SendKDMEmailJob (film, d->screens (), d->cpl (), d->from (), d->until ())) + shared_ptr (new SendKDMEmailJob (film, d->screens (), d->cpl (), d->from (), d->until (), d->formulation ())) ); } } catch (libdcp::NotEncryptedError& e) { diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index 041f6c7ef..8c26ba4cc 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -44,6 +44,7 @@ help () " -f, --valid-from valid from time (e.g. \"2013-09-28 01:41:51\") or \"now\"\n" " -t, --valid-to valid to time (e.g. \"2014-09-28 01:41:51\")\n" " -d, --valid-duration valid duration (e.g. \"1 day\", \"4 hours\", \"2 weeks\")\n" + " --formulation modified-transitional-1, dci-any or dci-specific [default modified-transitional-1]\n" " -z, --zip ZIP each cinema's KDMs into its own file\n" " -v, --verbose be verbose\n" " -c, --cinema specify a cinema, either by name or email address\n" @@ -110,6 +111,7 @@ int main (int argc, char* argv[]) bool cinemas = false; string duration_string; bool verbose = false; + libdcp::KDM::Formulation formulation = libdcp::KDM::MODIFIED_TRANSITIONAL_1; program_name = argv[0]; @@ -126,10 +128,11 @@ int main (int argc, char* argv[]) { "zip", no_argument, 0, 'z' }, { "duration", required_argument, 0, 'd' }, { "verbose", no_argument, 0, 'v' }, + { "formulation", required_argument, 0, 'C' }, { 0, 0, 0, 0 } }; - int c = getopt_long (argc, argv, "ho:f:t:c:A:Bzd:v", long_options, &option_index); + int c = getopt_long (argc, argv, "ho:f:t:c:A:Bzd:vC:", long_options, &option_index); if (c == -1) { break; @@ -166,6 +169,16 @@ int main (int argc, char* argv[]) case 'v': verbose = true; break; + case 'C': + if (string (optarg) == "modified-transitional-1") { + formulation = libdcp::KDM::MODIFIED_TRANSITIONAL_1; + } else if (string (optarg) == "dci-any") { + formulation = libdcp::KDM::DCI_ANY; + } else if (string (optarg) == "dci-specific") { + formulation = libdcp::KDM::DCI_SPECIFIC; + } else { + error ("unrecognised KDM formulation " + formulation); + } } } @@ -236,7 +249,7 @@ int main (int argc, char* argv[]) } shared_ptr certificate (new libdcp::Certificate (boost::filesystem::path (certificate_file))); - libdcp::KDM kdm = film->make_kdm (certificate, cpl, valid_from.get(), valid_to.get()); + libdcp::KDM kdm = film->make_kdm (certificate, cpl, valid_from.get(), valid_to.get(), formulation); kdm.as_xml (output); if (verbose) { cout << "Generated KDM " << output << " for certificate.\n"; @@ -260,12 +273,12 @@ int main (int argc, char* argv[]) try { if (zip) { - write_kdm_zip_files (film, (*i)->screens(), cpl, valid_from.get(), valid_to.get(), output); + write_kdm_zip_files (film, (*i)->screens(), cpl, valid_from.get(), valid_to.get(), formulation, output); if (verbose) { cout << "Wrote ZIP files to " << output << "\n"; } } else { - write_kdm_files (film, (*i)->screens(), cpl, valid_from.get(), valid_to.get(), output); + write_kdm_files (film, (*i)->screens(), cpl, valid_from.get(), valid_to.get(), formulation, output); if (verbose) { cout << "Wrote KDM files to " << output << "\n"; } diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc index 6750e0e98..8df94de9c 100644 --- a/src/wx/kdm_dialog.cc +++ b/src/wx/kdm_dialog.cc @@ -159,6 +159,14 @@ KDMDialog::KDMDialog (wxWindow* parent, boost::shared_ptr film) table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, 0); + add_label_to_sizer (table, this, _("KDM type"), true); + _type = new wxChoice (this, wxID_ANY); + _type->Append ("Modified Transitional 1"); + _type->Append ("DCI Any"); + _type->Append ("DCI Specific"); + table->Add (_type, 1, wxEXPAND); + _type->SetSelection (0); + _write_to = new wxRadioButton (this, wxID_ANY, _("Write to")); table->Add (_write_to, 1, wxEXPAND); @@ -480,6 +488,21 @@ KDMDialog::write_to () const return _write_to->GetValue (); } +libdcp::KDM::Formulation +KDMDialog::formulation () const +{ + switch (_type->GetSelection()) { + case 0: + return libdcp::KDM::MODIFIED_TRANSITIONAL_1; + case 1: + return libdcp::KDM::DCI_ANY; + case 2: + return libdcp::KDM::DCI_SPECIFIC; + default: + assert (false); + } +} + void KDMDialog::update_cpl_choice () { diff --git a/src/wx/kdm_dialog.h b/src/wx/kdm_dialog.h index 6327b29e8..13e9196ea 100644 --- a/src/wx/kdm_dialog.h +++ b/src/wx/kdm_dialog.h @@ -48,6 +48,7 @@ public: boost::filesystem::path cpl () const; boost::filesystem::path directory () const; bool write_to () const; + libdcp::KDM::Formulation formulation () const; private: void add_cinema (boost::shared_ptr); @@ -83,6 +84,7 @@ private: wxStaticText* _dcp_directory; wxStaticText* _cpl_id; wxStaticText* _cpl_annotation_text; + wxChoice* _type; wxRadioButton* _write_to; #ifdef DCPOMATIC_USE_OWN_DIR_PICKER DirPickerCtrl* _folder; -- cgit v1.2.3