From 1e289d8026e03c5d016cd3757a18d82456f37c1c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 27 Oct 2021 23:47:23 +0200 Subject: [PATCH] Manual tweaks. --- doc/manual/dcpomatic.xml | 44 ++++++++++++++++++++++------------------ src/lib/config.cc | 4 ++-- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/doc/manual/dcpomatic.xml b/doc/manual/dcpomatic.xml index 93639a7d4..11d98cf55 100644 --- a/doc/manual/dcpomatic.xml +++ b/doc/manual/dcpomatic.xml @@ -2570,7 +2570,7 @@ You will need to restart DCP-o-matic to see the new language. The translations for DCP-o-matic have been contributed by helpful -users. If your language is not on the last, head to the DCP-o-matic website to find out how to contribute a translation. @@ -2612,7 +2612,7 @@ encode. This is the location of DCP-o-matic's configuration file on disk. You can use this to share configuration between several copies of -DCP-o-matic, across a network share, for instance. +DCP-o-matic: across a network share, for instance. @@ -2633,7 +2633,7 @@ store details of the cinemas and screens used to make KDMs. The checkbox to the left of Play sound enables or -disables DCP-o-matic use of sound. On some machines there will be +disables DCP-o-matic's use of sound. On some machines there will be multiple options in the drop-down menu to decide how the sound should be played. @@ -2647,8 +2647,7 @@ be played. If Find integrated loudness, true peak and loudness range when analysing audio is ticked, DCP-o-matic will do extra work when analysing audio. Leave this ticked if the extra parameters -are useful to you. If not, untick it and audio analysis will be -faster. +are useful to you. If not, untick it to make audio analysis faster. @@ -2669,7 +2668,7 @@ If this checkbox is ticked an audio analysis will be run whenever content is add The Check for updates on startup option, if enabled, will tell DCP-o-matic to check on dcpomatic.com to see if there any +url="https://dcpomatic.com/">dcpomatic.com to see if there are any newer versions of DCP-o-matic then the one you are running. If so, a dialogue box will open with a link to download the new version. @@ -2677,8 +2676,7 @@ dialogue box will open with a link to download the new version. The Check for testing updates as well as stable ones option will also check for test updates as well as -those that are formally ‘released’. This is useful if you -like to live on the bleeding edge! +those that are formally ‘released’. @@ -2851,7 +2849,7 @@ you can upload DCPs directly from DCP-o-matic to the TMS using the Protocol should be set to SCP or FTP as appropriate for your TMS. We know that the Arts Alliance Media (AAM) -and the Doremi ranges uses SCP connections, and that Dolby's TMSs use +and the Doremi ranges uses SCP connections, and that Dolby's TMS uses FTP. Do let us know if you use any other type of TMS with the Send DCP to TMS feature. @@ -2980,7 +2978,7 @@ send. -The bottom box in the tab is the contents of the email that should +The bottom box in the tab is the content of the email that should be sent. DCP-o-matic will replace the ‘magic’ strings $JOB_NAME and $JOB_STATUS in the with the details of the job that has completed. @@ -3098,7 +3096,7 @@ that you might see with your current settings. -The four checkboxes labelled Log control what +The checkboxes labelled Log control what sort of messages DCP-o-matic writes to its log file when creating a DCP. It is useful to leave General, Warnings and Errors ticked @@ -3134,7 +3132,7 @@ however, always possible. There are some limitations to video and audio frame rates in DCPs. This is complicated by the fact that not all projectors will play DCPs at the same frame rates. It is possible to create a DCP which one projector will -play fine, but another (of a different type) will refuse to play. +play fine, but another (of a different type, or even just with a different software version) will refuse to play. @@ -3177,7 +3175,7 @@ with minimal loss in quality. -Video rate conversion is harder. DCP-o-matic's basic strategy to deal +Video rate conversion is harder. DCP-o-matic's strategy to deal with a non-supported content rate is to run it at the wrong speed, and to adjust the audio to keep it in sync. @@ -3226,8 +3224,8 @@ content. -If you want to experiment with other non-standard frame rates, you can -do so by ticking the Allow any DCP frame rate in +You can experiment with other non-standard frame rates +by ticking the Allow any DCP frame rate in the Advanced tab of the preferences dialogue (see the ). You are strongly advised to use this only on your own equipment, and only for experimentation @@ -3253,7 +3251,7 @@ a small program called dcpomatic_server. -The master and server machines do not need to be the same type, so you +The master and server machines do not need to be running the same operating system, so you can mix Windows PCs, Macs and Linux machines as you wish. @@ -3263,7 +3261,7 @@ can mix Windows PCs, Macs and Linux machines as you wish. Running the servers -There are two options for the encoding server; +There are two options for the encoding server: dcpomatic_server_cli, which runs on the command line, and dcpomatic_server, which has a simple GUI. The command line version is well-suited to headless servers, especially on Linux, and @@ -3398,7 +3396,7 @@ Following this is the DCP itself: DCP-TEST_EN-XX_UK-U_51_2K_CSY_20130218_CSY_OV. This contains some small XML files, which describe the DCP, and two large MXF files, which contain the DCP's audio and video data. It may also -contain subtitles in either XML or MXF format. This folder +contain subtitles or closed captions in either XML or MXF format. This folder (DCP-TEST_EN-XX_...) is what you should ingest, or pass to the cinema which is showing your DCP. @@ -3633,7 +3631,7 @@ DCP. Check the subtitle appearance in the preview; it will be slow to respond as it is having to decompress images from the existing DCP. Adjust the appearance using controls in the -Subtitle tab if required. +Timed Text or Closed Captions tabs if required. Choose Make DCP from the menu. @@ -3650,7 +3648,7 @@ DCP. Adjust the appearance using controls in the Check the subtitle appearance in the preview; it will be slow to respond as it is having to decompress images from the existing DCP. Adjust the appearance using controls in the -Subtitle tab if required. +Timed Text or Closed Captions tabs if required. Choose Make DCP from the menu. @@ -3728,6 +3726,12 @@ The full details of OV and VF files are discussed in + Another way to improve performance is to set the Video display mode + in Preferences to OpenGL (faster). This should provide + a significant speed-up on most systems, although this mode has not been so widely tested so may + have problems. + + diff --git a/src/lib/config.cc b/src/lib/config.cc index 4924d13ba..bfde74a75 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -967,7 +967,7 @@ Config::write_config () const root->add_child("PlayerActivityLogFile")->add_child_text(_player_activity_log_file->string()); } if (_player_debug_log_file) { - /* [XML] PlayerLogFile Filename to use for player debug logs */ + /* [XML] PlayerLogFile Filename to use for player debug logs. */ root->add_child("PlayerDebugLogFile")->add_child_text(_player_debug_log_file->string()); } if (_player_content_directory) { @@ -989,7 +989,7 @@ Config::write_config () const root->add_child("CustomLanguage")->add_child_text(i.to_string()); } if (_add_files_path) { - /* [XML] The default path that will be offered in the picker when adding files to a film */ + /* [XML] AddFilesPath The default path that will be offered in the picker when adding files to a film. */ root->add_child("AddFilesPath")->add_child_text(_add_files_path->string()); } -- 2.30.2