From: Carl Hetherington Date: Wed, 10 Jun 2015 23:11:35 +0000 (+0100) Subject: Some manual updates. X-Git-Tag: v2.0.51~23 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=2e98263d0aeef4a470209d1cd31e15bdccbeda41 Some manual updates. --- diff --git a/doc/manual/dcpomatic.xml b/doc/manual/dcpomatic.xml index a2610f990..0bb5ed1ca 100644 --- a/doc/manual/dcpomatic.xml +++ b/doc/manual/dcpomatic.xml @@ -47,7 +47,9 @@ cinema projectors. Licence -DCP-o-matic is licensed under the GNU GPL. +DCP-o-matic is free and open-source and is licensed under the GNU +GPL. @@ -113,8 +115,9 @@ like to install it. You can install DCP-o-matic on Ubuntu 12.04 (‘Precise -Pangolin’) or 14.04 (‘Trusty Tahr’) using .deb packages: download the -appropriate package from .deb packages: +download the appropriate package from http://dcpomatic.com/ and double-click it. Ubuntu will install the necessary bits and pieces and set DCP-o-matic up for you. @@ -127,7 +130,7 @@ and set DCP-o-matic up for you.
Debian Linux -Packages are available for Debian 7 (squeeze) and unstable (sid) from http://dcpomatic.com/.
@@ -159,10 +162,11 @@ thanks to Stefan Karner. Other Linux distributions -Installation on non-Ubuntu Linux is currently a little involved, as -there are no packages available (yet); you will have to compile it -from source. If you are using a non-Ubuntu distribution, do let me -know by email and I will see about building some packages. +Installation on other Linux systems (for which no packages are +available) is quite hard; you will have to compile it from source. If +you are using distribution for which no packages are available, do let +me know by email and I +will look into providing packages on the website. @@ -205,7 +209,7 @@ With any luck, this will build and install DCP-o-matic on your system. To run i -dcpomatic +dcpomatic2 @@ -389,9 +393,10 @@ linkend="ch-files"/> for details about the files that DCP-o-matic creates. -Alternatively, if you have a projector or TMS that is accessible via -SCP across your network, you can upload the content directly from -DCP-o-matic. See the . +Alternatively, if you have a projector or Theatre Management System +(TMS) that is accessible via SCP across your network, you can upload +the content directly from DCP-o-matic. See the in . @@ -495,7 +500,7 @@ content as you like, and they can be of the following types: Movie — a file containing some video, probably some -audio and possibly some subtitles; for example, a MOV, MP4 or VOB. +audio and possibly some embedded subtitles; for example, a MOV, MP4 or VOB. Sound — a file containing one or more channels of @@ -509,10 +514,15 @@ example, a JPEG, PNG or TIFF file. Moving image — a directory containing many still images which should be treated as the frames of a video. + +Subtitle — a file containing subtitle which will be +superimposed on the image of the DCP. These can be +.srt or .xml +files. -To add one or more movie, sound or still-image files, select +To add one or more movie, sound, still-image or subtitle files, select Add file(s)... and choose them from the selector. @@ -673,24 +683,10 @@ converting the selected content into the XYZ colourspace for the DCP. -Clicking Edit... will open the colour conversion -dialogue box, as shown in . - - -
- Dialogue box for setting colour conversion - - - - - -
- - -In most cases, it is only necessary to select one of DCP-o-matic's -presets. DCP-o-matic knows how to convert from four common -colourspaces: sRGB, Rec. 601, Rec. 709 and P3. If you do not know -which preset you should use, refer to the suggestions in . @@ -701,7 +697,7 @@ linkend="tab-colour-conversion"/>. -sRGBStill images in RGB, e.g. photographs +sRGBStill images in RGB, e.g. photographs. Rec. 601Standard-definition content (lower than about 1000 pixels across) including DVD rips. @@ -717,13 +713,28 @@ linkend="tab-colour-conversion"/>. -For other required colour conversion, and if you know what you are -doing, you can edit the values in the lower half of the dialogue box. +For other required colour conversions, and if you know what you are +doing, you can choose Custom which will open the full +colour conversion editing dialogue box: + + +
+ Dialogue box for custom colour conversion + + + + + +
+ + +Alternatively, choose None if your source files +are already in the XYZ colour space and require no conversion. -Colour conversion is discussed in much more detail in a separate -document colour.pdf. @@ -734,13 +745,20 @@ url="http://dcpomatic.com/manual/colour.pdf">colour.pdf. Other settings -The ‘crop’ settings can be used to crop your content, +The crop settings can be used to crop your content, which can be used to remove black borders from round the edges of DVD images, for example. The specified number of pixels will be trimmed from each edge, and the content image in the right of the window will be updated to show the effect of the crop. + +The fade in and fade out +settings can be used to apply linear fades into and out of a piece of +content. Specify the time for each, clicking Set +after making any changes. + + The Scale to option governs the shape that DCP-o-matic will scale the content's image into. Select the aspect @@ -793,57 +811,6 @@ The Audio tab controls properties of the image, as shown in - -
-Show audio - - -The Show Audio button will instruct DCP-o-matic -to examine the audio in your content and plot a graph of its level -over time. This can be useful for getting a rough idea of how loud -the sound will be in the cinema auditorium. A typical plot is shown -in - - -
- Audio plot - - - - - -
- - -The plot gives the audio level (vertical axis, in dB) with time -(horizontal axis). 0dB represents full scale, so if there is anything -near this you are in danger of clipping the projector's audio outputs. - - - -There are two plot types: the peak level and the RMS, which can be -shown or hidden using the check-boxes on the right hand side of the -window. - - - -The channel check-boxes will show or hide the plot(s) for -the corresponding channels in the DCP. - - - -The smoothing slider applies a variable degree of temporal smoothing -to the plots, which can make them easier to read in some cases. - - - -Obviously the audio plot is no substitute for listening in an -auditorium, but it can be useful to get levels in the right rough area. - - -
- -
The audio map @@ -1405,6 +1372,56 @@ your content for the DCP, if required. Bicubic is a fine choice in most situations. + +
+Show audio + + +The Show Audio button will instruct DCP-o-matic +to examine the audio in your content and plot a graph of its level +over time. This can be useful for getting a rough idea of how loud +the sound will be in the cinema auditorium. A typical plot is shown +in + + +
+ Audio plot + + + + + +
+ + +The plot gives the audio level (vertical axis, in dB) with time +(horizontal axis). 0dB represents full scale, so if there is anything +near this you are in danger of clipping the projector's audio outputs. + + + +There are two plot types: the peak level and the RMS, which can be +shown or hidden using the check-boxes on the right hand side of the +window. + + + +The channel check-boxes will show or hide the plot(s) for +the corresponding channels in the DCP. + + + +The smoothing slider applies a variable degree of temporal smoothing +to the plots, which can make them easier to read in some cases. + + + +Obviously the audio plot is no substitute for listening in an +auditorium, but it can be useful to get levels in the right rough area. + + +
+ @@ -1769,7 +1786,7 @@ The servers tab is shown in . If Use all servers is ticked DCP-o-matic will locate encoding servers automatically (see ). +linkend="ch-servers"/>). @@ -2039,7 +2056,7 @@ even refuse to ingest. The only rates that are (pretty much) guaranteed to work on all DCI -projectors is 24 frames per second (fps) for video and 48kHz or 96kHz +projectors are 24 frames per second (fps) for video and 48kHz or 96kHz for audio. If you are sending your DCPs to unknown places it wise to consider using these rates if at all possible. @@ -2170,7 +2187,7 @@ To run the command line version, simply enter: -dcpomatic_server_cli +dcpomatic2_server_cli @@ -2180,7 +2197,7 @@ by doing something like: -dcpomatic_server_cli -t 4 +dcpomatic2_server_cli -t 4 diff --git a/doc/manual/diagrams/3d-left-right.svg b/doc/manual/diagrams/3d-left-right.svg index a51c93833..1621200d9 100644 --- a/doc/manual/diagrams/3d-left-right.svg +++ b/doc/manual/diagrams/3d-left-right.svg @@ -13,7 +13,7 @@ height="1052.3622047" id="svg4899" version="1.1" - inkscape:version="0.48.4 r9939" + inkscape:version="0.91 r13725" sodipodi:docname="3d-left-right.svg"> @@ -93,17 +93,17 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="2.4155251" - inkscape:cx="274" - inkscape:cy="557.5" + inkscape:cx="222.25142" + inkscape:cy="623.73819" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" showguides="true" inkscape:guide-bbox="true" - inkscape:window-width="1366" - inkscape:window-height="714" - inkscape:window-x="1024" - inkscape:window-y="27" + inkscape:window-width="1680" + inkscape:window-height="1028" + inkscape:window-x="0" + inkscape:window-y="0" inkscape:window-maximized="1"> LeftLefteyeimage width width / 2 diff --git a/doc/manual/diagrams/3d-top-bottom.svg b/doc/manual/diagrams/3d-top-bottom.svg index f30814fbc..5c0b41eb7 100644 --- a/doc/manual/diagrams/3d-top-bottom.svg +++ b/doc/manual/diagrams/3d-top-bottom.svg @@ -13,7 +13,7 @@ height="1052.3622047" id="svg4899" version="1.1" - inkscape:version="0.48.4 r9939" + inkscape:version="0.91 r13725" sodipodi:docname="3d-top-bottom.svg"> @@ -100,10 +100,10 @@ showgrid="false" showguides="true" inkscape:guide-bbox="true" - inkscape:window-width="1366" - inkscape:window-height="714" - inkscape:window-x="1024" - inkscape:window-y="27" + inkscape:window-width="1680" + inkscape:window-height="1028" + inkscape:window-x="0" + inkscape:window-y="0" inkscape:window-maximized="1"> image height / 2 diff --git a/doc/manual/screenshots/add-file.png b/doc/manual/screenshots/add-file.png index 22234dc6f..53170e0e2 100644 Binary files a/doc/manual/screenshots/add-file.png and b/doc/manual/screenshots/add-file.png differ diff --git a/doc/manual/screenshots/audio-tab.png b/doc/manual/screenshots/audio-tab.png index e12f23797..329127bf5 100644 Binary files a/doc/manual/screenshots/audio-tab.png and b/doc/manual/screenshots/audio-tab.png differ diff --git a/doc/manual/screenshots/colour-conversion.png b/doc/manual/screenshots/colour-conversion.png index c5013ea6a..3d122598f 100644 Binary files a/doc/manual/screenshots/colour-conversion.png and b/doc/manual/screenshots/colour-conversion.png differ diff --git a/doc/manual/screenshots/examine-content.png b/doc/manual/screenshots/examine-content.png index f3e98e189..fecc4b6bc 100644 Binary files a/doc/manual/screenshots/examine-content.png and b/doc/manual/screenshots/examine-content.png differ diff --git a/doc/manual/screenshots/file-new.png b/doc/manual/screenshots/file-new.png index f3dae7e2e..e39bba689 100644 Binary files a/doc/manual/screenshots/file-new.png and b/doc/manual/screenshots/file-new.png differ diff --git a/doc/manual/screenshots/filters.png b/doc/manual/screenshots/filters.png index 1a21c9d24..b7dae35d3 100644 Binary files a/doc/manual/screenshots/filters.png and b/doc/manual/screenshots/filters.png differ diff --git a/doc/manual/screenshots/making-dcp.png b/doc/manual/screenshots/making-dcp.png index 29e1f5d33..0f52f1131 100644 Binary files a/doc/manual/screenshots/making-dcp.png and b/doc/manual/screenshots/making-dcp.png differ diff --git a/doc/manual/screenshots/still-new-film.png b/doc/manual/screenshots/still-new-film.png index 80a736001..f745f1fd6 100644 Binary files a/doc/manual/screenshots/still-new-film.png and b/doc/manual/screenshots/still-new-film.png differ diff --git a/doc/manual/screenshots/still-select-content-file.png b/doc/manual/screenshots/still-select-content-file.png index 310da0ec3..9b60347b1 100644 Binary files a/doc/manual/screenshots/still-select-content-file.png and b/doc/manual/screenshots/still-select-content-file.png differ diff --git a/doc/manual/screenshots/timing-tab.png b/doc/manual/screenshots/timing-tab.png index 9b081e32e..6c2201513 100644 Binary files a/doc/manual/screenshots/timing-tab.png and b/doc/manual/screenshots/timing-tab.png differ diff --git a/doc/manual/screenshots/video-new-film.png b/doc/manual/screenshots/video-new-film.png index 6d93e756a..e3f89111a 100644 Binary files a/doc/manual/screenshots/video-new-film.png and b/doc/manual/screenshots/video-new-film.png differ diff --git a/doc/manual/screenshots/video-select-content-file.png b/doc/manual/screenshots/video-select-content-file.png index a422386de..7193be018 100644 Binary files a/doc/manual/screenshots/video-select-content-file.png and b/doc/manual/screenshots/video-select-content-file.png differ diff --git a/doc/manual/screenshots/video-tab.png b/doc/manual/screenshots/video-tab.png index 80ae513f4..99bb4790a 100644 Binary files a/doc/manual/screenshots/video-tab.png and b/doc/manual/screenshots/video-tab.png differ