diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/film.cc | 3 | ||||
| -rw-r--r-- | src/lib/kdm.cc | 3 | ||||
| -rw-r--r-- | src/tools/dcpomatic.cc | 3 | ||||
| -rw-r--r-- | src/wx/kdm_dialog.h | 4 | ||||
| -rw-r--r-- | src/wx/po/de_DE.po | 6 | ||||
| -rw-r--r-- | src/wx/po/it_IT.po | 26 | ||||
| -rw-r--r-- | src/wx/po/sv_SE.po | 14 |
7 files changed, 32 insertions, 27 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index 09d939957..12a57753f 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -973,6 +973,9 @@ Film::frame_size () const return fit_ratio_within (container()->ratio(), full_frame ()); } +/** @param from KDM from time in local time. + * @param to KDM to time in local time. + */ libdcp::KDM Film::make_kdm ( shared_ptr<libdcp::Certificate> target, diff --git a/src/lib/kdm.cc b/src/lib/kdm.cc index cf551285b..2a8e191e7 100644 --- a/src/lib/kdm.cc +++ b/src/lib/kdm.cc @@ -164,6 +164,9 @@ make_cinema_kdms ( return cinema_kdms; } +/** @param from KDM from time in local time. + * @param to KDM to time in local time. + */ void write_kdm_files ( shared_ptr<const Film> film, diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 1abd25198..28074a4ba 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -457,7 +457,8 @@ private: void file_exit () { - Close (true); + /* false here allows the close handler to veto the close request */ + Close (false); } void edit_preferences () diff --git a/src/wx/kdm_dialog.h b/src/wx/kdm_dialog.h index 90354a2d1..db51d6d03 100644 --- a/src/wx/kdm_dialog.h +++ b/src/wx/kdm_dialog.h @@ -39,8 +39,12 @@ public: KDMDialog (wxWindow *, boost::shared_ptr<const Film>); std::list<boost::shared_ptr<Screen> > screens () const; + + /** @return KDM from time in local time */ boost::posix_time::ptime from () const; + /** @return KDM until time in local time */ boost::posix_time::ptime until () const; + boost::filesystem::path dcp () const; boost::filesystem::path directory () const; bool write_to () const; diff --git a/src/wx/po/de_DE.po b/src/wx/po/de_DE.po index 1197fdc21..fcae1c83f 100644 --- a/src/wx/po/de_DE.po +++ b/src/wx/po/de_DE.po @@ -568,9 +568,8 @@ msgid "L" msgstr "L" #: src/wx/audio_mapping_view.cc:312 -#, fuzzy msgid "Lc" -msgstr "L" +msgstr "Lc" #: src/wx/video_panel.cc:87 msgid "Left crop" @@ -717,9 +716,8 @@ msgid "Rating (e.g. 15)" msgstr "FSK (z.B. 12)" #: src/wx/audio_mapping_view.cc:316 -#, fuzzy msgid "Rc" -msgstr "R" +msgstr "Rc" #: src/wx/content_menu.cc:54 src/wx/film_editor.cc:284 #: src/wx/editable_list.h:66 diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po index 5d18a5dbc..e4b9d4ff0 100644 --- a/src/wx/po/it_IT.po +++ b/src/wx/po/it_IT.po @@ -170,11 +170,11 @@ msgstr "Sfoglia..." #: src/wx/audio_mapping_view.cc:320 msgid "BsL" -msgstr "" +msgstr "BsL" #: src/wx/audio_mapping_view.cc:324 msgid "BsR" -msgstr "" +msgstr "BsR" #: src/wx/gain_calculator_dialog.cc:32 msgid "But I have to use fader" @@ -182,7 +182,7 @@ msgstr "Ma dovrò riprodurre con il fader a" #: src/wx/audio_mapping_view.cc:288 msgid "C" -msgstr "" +msgstr "C" #: src/wx/audio_panel.cc:63 msgid "Calculate..." @@ -506,7 +506,7 @@ msgstr "Gb" #: src/wx/audio_mapping_view.cc:304 msgid "HI" -msgstr "" +msgstr "HI" #: src/wx/hints_dialog.cc:26 msgid "Hints" @@ -563,11 +563,11 @@ msgstr "Tieni i video in sequenza" #: src/wx/audio_mapping_view.cc:280 msgid "L" -msgstr "" +msgstr "L" #: src/wx/audio_mapping_view.cc:312 msgid "Lc" -msgstr "" +msgstr "Lc" #: src/wx/video_panel.cc:87 msgid "Left crop" @@ -575,7 +575,7 @@ msgstr "Taglio a sinistra" #: src/wx/audio_mapping_view.cc:292 msgid "Lfe" -msgstr "" +msgstr "Lfe" #: src/wx/colour_conversion_editor.cc:49 msgid "Linearise input gamma curve for low values" @@ -586,9 +586,8 @@ msgid "Load from file..." msgstr "" #: src/wx/audio_mapping_view.cc:296 -#, fuzzy msgid "Ls" -msgstr "s" +msgstr "Ls" #: src/wx/film_editor.cc:749 msgid "MISSING: " @@ -707,7 +706,7 @@ msgstr "Posizione" #: src/wx/audio_mapping_view.cc:284 msgid "R" -msgstr "" +msgstr "R" #: src/wx/audio_dialog.cc:61 msgid "RMS" @@ -719,7 +718,7 @@ msgstr "Classificazione (es. 15)" #: src/wx/audio_mapping_view.cc:316 msgid "Rc" -msgstr "" +msgstr "Rc" #: src/wx/content_menu.cc:54 src/wx/film_editor.cc:284 #: src/wx/editable_list.h:66 @@ -763,9 +762,8 @@ msgid "Right crop" msgstr "Taglio a destra" #: src/wx/audio_mapping_view.cc:300 -#, fuzzy msgid "Rs" -msgstr "s" +msgstr "Rs" #: src/wx/film_editor.cc:223 msgid "SMPTE" @@ -999,7 +997,7 @@ msgstr "Nome utente" #: src/wx/audio_mapping_view.cc:308 msgid "VI" -msgstr "" +msgstr "VI" #: src/wx/video_panel.cc:67 msgid "Video" diff --git a/src/wx/po/sv_SE.po b/src/wx/po/sv_SE.po index f22f1c625..ecfd78013 100644 --- a/src/wx/po/sv_SE.po +++ b/src/wx/po/sv_SE.po @@ -173,11 +173,11 @@ msgstr "Bläddra..." #: src/wx/audio_mapping_view.cc:320 msgid "BsL" -msgstr "" +msgstr "BsL" #: src/wx/audio_mapping_view.cc:324 msgid "BsR" -msgstr "" +msgstr "BsR" #: src/wx/gain_calculator_dialog.cc:32 msgid "But I have to use fader" @@ -510,7 +510,7 @@ msgstr "Gb" #: src/wx/audio_mapping_view.cc:304 msgid "HI" -msgstr "" +msgstr "HI" #: src/wx/hints_dialog.cc:26 msgid "Hints" @@ -571,9 +571,8 @@ msgid "L" msgstr "V" #: src/wx/audio_mapping_view.cc:312 -#, fuzzy msgid "Lc" -msgstr "V" +msgstr "Vc" #: src/wx/video_panel.cc:87 msgid "Left crop" @@ -723,9 +722,8 @@ msgid "Rating (e.g. 15)" msgstr "Klassificering (ex. 15)" #: src/wx/audio_mapping_view.cc:316 -#, fuzzy msgid "Rc" -msgstr "H" +msgstr "Hc" #: src/wx/content_menu.cc:54 src/wx/film_editor.cc:284 #: src/wx/editable_list.h:66 @@ -1010,7 +1008,7 @@ msgstr "Användarnamn" #: src/wx/audio_mapping_view.cc:308 msgid "VI" -msgstr "" +msgstr "VI" #: src/wx/video_panel.cc:67 msgid "Video" |
