From 87841297ae084555a064199770e477c7aa8001a3 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 21 Dec 2012 22:05:15 +0000 Subject: Update manual a bit. --- doc/manual/Makefile | 2 +- doc/manual/dvdomatic.xml | 306 +++++++++++----------- doc/manual/screenshots/audio-tab.png | Bin 0 -> 57463 bytes doc/manual/screenshots/click-content-selector.png | Bin 32701 -> 31411 bytes doc/manual/screenshots/examine-thumbs.png | Bin 264474 -> 420850 bytes doc/manual/screenshots/film-tab.png | Bin 0 -> 54280 bytes doc/manual/screenshots/job-make-dcp.png | Bin 13442 -> 0 bytes doc/manual/screenshots/prefs.png | Bin 50655 -> 55212 bytes doc/manual/screenshots/range.png | Bin 14182 -> 0 bytes doc/manual/screenshots/still-setup.png | Bin 21445 -> 0 bytes doc/manual/screenshots/subtitles-tab.png | Bin 0 -> 28155 bytes doc/manual/screenshots/video-setup.png | Bin 51602 -> 0 bytes doc/manual/screenshots/video-tab.png | Bin 0 -> 30273 bytes ffmpeg-versions | 1 + 14 files changed, 160 insertions(+), 149 deletions(-) create mode 100644 doc/manual/screenshots/audio-tab.png create mode 100644 doc/manual/screenshots/film-tab.png delete mode 100644 doc/manual/screenshots/job-make-dcp.png delete mode 100644 doc/manual/screenshots/range.png delete mode 100644 doc/manual/screenshots/still-setup.png create mode 100644 doc/manual/screenshots/subtitles-tab.png delete mode 100644 doc/manual/screenshots/video-setup.png create mode 100644 doc/manual/screenshots/video-tab.png create mode 100644 ffmpeg-versions diff --git a/doc/manual/Makefile b/doc/manual/Makefile index c762899bf..d7736a4cf 100644 --- a/doc/manual/Makefile +++ b/doc/manual/Makefile @@ -6,7 +6,7 @@ DIAGRAMS := SCREENSHOTS := file-new.png video-new-film.png still-new-film.png click-content-selector.png video-select-content-file.png \ still-select-content-file.png examine-thumbs.png video-setup.png still-setup.png range.png \ - calculate-audio-gain.png prefs.png making-dcp.png filters.png + calculate-audio-gain.png prefs.png making-dcp.png filters.png film-tab.png video-tab.png audio-tab.png subtitles-tab.png XML := dvdomatic.xml diff --git a/doc/manual/dvdomatic.xml b/doc/manual/dvdomatic.xml index ba066247e..d6bfdac00 100644 --- a/doc/manual/dvdomatic.xml +++ b/doc/manual/dvdomatic.xml @@ -48,8 +48,8 @@ your cinema. DVD-o-matic is licensed under the GNU GPL. - + @@ -77,11 +77,28 @@ version.
-Linux +Ubuntu Linux + + +You can install DVD-o-matic on Ubuntu 12.04 (‘Precise Pangolin’) or +12.10 (‘Quantal Quetzal’) using .deb packages. Simply +download the appropriate package from http://carlh.net and +double-click it. Ubuntu will install the necessary bits and pieces +and set DVD-o-matic up for you. + + +
+ +
+Other Linux distributions -Installation on Linux is currently a little involved, as there are no -packages available (yet); you will have to compile it from source. +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 via the mailing +list and I will see about building some packages. @@ -126,87 +143,6 @@ dvdomatic in a shell. -
-Obtaining dependencies on Ubuntu 12.04 - - -Ubuntu 12.04 packages most of DVD-o-matic's dependencies, but some are missing. This section -describes how to obtain all of the dependencies. - - -
-Packaged dependencies - - -Most of the dependencies can be obtained from Ubuntu's packages using: - - - -sudo apt-get install libwxgtk2.8-dev libsndfile1-dev libssl-dev libssh-dev -sudo apt-get install libmagickcore-dev libboost-filesystem-dev libboost-thread-dev - - -
- -
-Unpackaged dependencies -
- -
-FFmpeg - - -Ubuntu does not package FFmpeg, so you will need to build it from source. The -following commands should work: - - - -git clone git://source.ffmpeg.org/ffmpeg.git ffmpeg -cd ffmpeg -./configure --enable-shared --enable-postproc --enable-gpl -make -sudo make install - - -
- -
-libdcp - - -You can build libdcp using: - - - -wget http://carlh.net/software/libdcp-0.32.tar.bz2 -tar xjf libdcp-0.32.tar.bz2 -cd libdcp-0.32 -./waf configure -./waf build -sudo ./waf install - - -
- -
-libopenjpeg - - -Ubuntu does package libopenjpeg, but it is a rather old version. To build -the current release: - - - -wget http://code.google.com/p/openjpeg/downloads/detail?name=openjpeg-1.5.1.tar.gz -tar xzf openjpeg-1.5.1.tar.gz -cd openjepg-1.5.1.tar.gz -./configure -make -sudo make install - - -
-
 @@ -334,7 +270,13 @@ the right of the window, as shown in . -Dragging the slider will move through your video. +Dragging the slider will move through your video. You can also click +the Play button to play the content back. Note +that there will be no sound, and playback might not be entirely +accurate (it may be slightly slower or faster than it should be, for +example). This player is really only intended for brief inspection of +content; if you need to check it more thoroughly, use another player +such as Totem, mplayer or VLC. @@ -381,24 +323,52 @@ can be specified in the DCI name details dialogue box, which you can open by clicking on the Details button. + +The Trust content's header button starts off +checked, and this means that DVD-o-matic will use the content's header +information to determine its length. If, for some reason, this header +length is wrong, uncheck the Trust content's +header button and DVD-o-matic will run through the content +to find its exact length. This may take a while for large pieces of content. + + Next up is the content type. This can be ‘feature’, ‘trailer’ or whatever; select the required type from the drop-down list. + +The trim frames settings allow you to trim frames +from the beginning and end of the content; any trimmed frames will not +be included in the DCP. + + +
+Video tab - + +This tab contains settings related to the picture in your DCP, as shown in . + + +
+ Video settings tab + + + + + +
-Next is the format. This will govern the shape that DVD-o-matic will -make your image into. Select the aspect ratio that your content -should be presented in. The ‘4:3 within Flat’ and -‘16:9 within Flat’ settings will put the image at the -specified ratio within a Flat (1.85:1) frame, so that you can project -the DCP using your projector's Flat preset. +The first option on this tab is the format. This will govern the +shape that DVD-o-matic will make your image into. Select the aspect +ratio that your content should be presented in. The ‘4:3 within +Flat’ and ‘16:9 within Flat’ settings will put the +image at the specified ratio within a Flat (1.85:1) frame, so that you +can project the DCP using your projector's Flat preset. @@ -409,7 +379,7 @@ edges of DVD images, for example. The L, R, T and B settings correspond to the left, right, top and bottom of the image respectively. The specified number of pixels will -be trimmed from each edge, and your content image in the right of the +be trimmed from each edge, and the content image in the right of the window will be updated to show the cropping in action. @@ -428,6 +398,25 @@ most situations. +
+ +
+Audio tab + + +This tab contains settings related to the sound in your DCP, as shown in . + + +
+ Audio settings tab + + + + + +
+ + ‘Audio Gain’ is used to alter the volume of the soundtrack. The specified gain (in dB) will be applied to each sound @@ -476,10 +465,56 @@ with respect to the video, and a negative delay will move it earlier. -The Range controls allow you to specify a part of -your content to encode. We will discuss this later. +By default the Use content‘s audio button +will be selected. This means that the DCP will use one of the +soundtracks from your content file; you can select the soundtrack that +you wish to use from the drop-down box. + +Alternatively, you can supply different sound files by clicking the +Use external audio button and choosing a WAV file +for any channels that you want to appear in the DCP. These files can +be any bit depth and sampling rate, and will be re-sampled and +bit-depth converted if required. + + +
+
+Subtitles tab + + +This tab contains settings related to subtitles in your DCP, as shown in . + + +
+ Subtitle settings tab + + + + + +
+ + +DVD-o-matic will extract subtitles from the content, if present, and +they can be ‘burnt into’ the DCP (that is, they are +included in the image and not overlaid by the projector). Note that +DVD and Blu-Ray subtitles are stored as bitmaps, so it is not possible +(automatically) to use non-burnt-in subtitles with these sources. +Select the With Subtitles checkbox to enable +subtitles. The offset control moves the +subtitles up and down the image, and the scale +control changes their size. + + + +Future versions of DVD-o-matic will hopefully include the option to +use text subtitles (as is the norm with most professionally-mastered +DCPs). + + +
@@ -562,24 +597,25 @@ linkend="fig-still-select-content-file"/>. Setting up for a still image DCP is somewhat simpler than for a video; -the options are shown in . +the tabs are all the same, but many options are removed and a few are added. -
- Setting up to make a still DCP - - - - - -
- As with video, you can select a content type and the format (ratio) -that your image should be presented in. It will be scaled to fit the -selected ratio. You can also crop your image, if you so choose, and -then set a duration (in seconds) that the image should appear on -screen. +that your image should be presented in. It will be scaled and padded +to fit the selected ratio, but in such a way that the pixel aspect +ratio is preserved. In other words, the image will not be stretched, +merely scaled; if you want to stretch your image, you will need to do +so in a separate program before importing it into DVD-o-matic. You +can also crop your image, if you so choose, and then set a duration +(in seconds) that the image should appear on screen. + + + +Still-image DCPs can include sound; this can be added from the +Audio tab. If your specified duration is shorter +than the audio, the audio will be cut off at the duration; if it is +longer, silence will be added after your audio. @@ -649,6 +685,15 @@ processors (or processor cores) in your machine.
+
+Default directory for new films + + +This is the directory which DVD-o-matic will suggest initially as a place to put new films. + + +
+
Colour look-up table @@ -729,7 +774,9 @@ If you want to examine them yourself, you may find the A/B option (see After changing the filters setup, you will need to regenerate the DCP -to see the effect on-screen. +to see the effect on the cinema screen. The preview in DVD-o-matic +will update itself whenever filters are changed, though of course this +image is much smaller and of lower resolution than a projected image!
@@ -783,43 +830,6 @@ half will use the filters and scaler specified in the film setup. - -
-Encode range - - -If you want to encode only a portion of your input content, you can do -so by clicking the Edit button next to the -Range entry in the film setup area. This will -open the dialogue shown in . - - -
- Range selector - - - - - -
- - -Here you can choose to encode the whole film, or just the first -so-many frames of it. This can be useful to check the quality of an -encode before comitting to encoding the whole film — perhaps -just encode the first ten minutes, look at it on screen, and check -that it is ok. - - - -If you choose to encode only a part of the film, you can set -DVD-o-matic to black out the rest. This can be useful to chop a small -part off the end of a piece of content while letting the audio play -out. - - -
-
Encoding servers diff --git a/doc/manual/screenshots/audio-tab.png b/doc/manual/screenshots/audio-tab.png new file mode 100644 index 000000000..650f67b3c Binary files /dev/null and b/doc/manual/screenshots/audio-tab.png differ diff --git a/doc/manual/screenshots/click-content-selector.png b/doc/manual/screenshots/click-content-selector.png index 1072c7eff..d8ff34c60 100644 Binary files a/doc/manual/screenshots/click-content-selector.png and b/doc/manual/screenshots/click-content-selector.png differ diff --git a/doc/manual/screenshots/examine-thumbs.png b/doc/manual/screenshots/examine-thumbs.png index 3eae1fbd7..9026ae5ca 100644 Binary files a/doc/manual/screenshots/examine-thumbs.png and b/doc/manual/screenshots/examine-thumbs.png differ diff --git a/doc/manual/screenshots/film-tab.png b/doc/manual/screenshots/film-tab.png new file mode 100644 index 000000000..184a17b7e Binary files /dev/null and b/doc/manual/screenshots/film-tab.png differ diff --git a/doc/manual/screenshots/job-make-dcp.png b/doc/manual/screenshots/job-make-dcp.png deleted file mode 100644 index 0e91b63d1..000000000 Binary files a/doc/manual/screenshots/job-make-dcp.png and /dev/null differ diff --git a/doc/manual/screenshots/prefs.png b/doc/manual/screenshots/prefs.png index 5e060b33f..28706dad1 100644 Binary files a/doc/manual/screenshots/prefs.png and b/doc/manual/screenshots/prefs.png differ diff --git a/doc/manual/screenshots/range.png b/doc/manual/screenshots/range.png deleted file mode 100644 index f1676c787..000000000 Binary files a/doc/manual/screenshots/range.png and /dev/null differ diff --git a/doc/manual/screenshots/still-setup.png b/doc/manual/screenshots/still-setup.png deleted file mode 100644 index c7205379e..000000000 Binary files a/doc/manual/screenshots/still-setup.png and /dev/null differ diff --git a/doc/manual/screenshots/subtitles-tab.png b/doc/manual/screenshots/subtitles-tab.png new file mode 100644 index 000000000..09a8b8edb Binary files /dev/null and b/doc/manual/screenshots/subtitles-tab.png differ diff --git a/doc/manual/screenshots/video-setup.png b/doc/manual/screenshots/video-setup.png deleted file mode 100644 index 897590ff3..000000000 Binary files a/doc/manual/screenshots/video-setup.png and /dev/null differ diff --git a/doc/manual/screenshots/video-tab.png b/doc/manual/screenshots/video-tab.png new file mode 100644 index 000000000..a3e21c9d3 Binary files /dev/null and b/doc/manual/screenshots/video-tab.png differ diff --git a/ffmpeg-versions b/ffmpeg-versions new file mode 100644 index 000000000..caf166c99 --- /dev/null +++ b/ffmpeg-versions @@ -0,0 +1 @@ +6912e7a008acd1464a63b0a00779a3de81b9a8ab 0.64 -- cgit v1.2.3 From 69ae35eb02481de7ba48863a00d165a579cefad7 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 21 Dec 2012 22:16:34 +0000 Subject: Try not to say 'git release' on versions built from non-git checkouts. --- src/tools/dvdomatic.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc index 59f3ebc3e..9d0d58662 100644 --- a/src/tools/dvdomatic.cc +++ b/src/tools/dvdomatic.cc @@ -350,7 +350,11 @@ public: { wxAboutDialogInfo info; info.SetName (_("DVD-o-matic")); - info.SetVersion (std_to_wx (String::compose ("version %1 git %2", dvdomatic_version, dvdomatic_git_commit))); + if (strcmp (dvdomatic_git_commit, "release") == 0) { + info.SetVersion (std_to_wx (String::compose ("version %1", dvdomatic_version))); + } else { + info.SetVersion (std_to_wx (String::compose ("version %1 git %2", dvdomatic_version, dvdomatic_git_commit))); + } info.SetDescription (_("Free, open-source DCP generation from almost anything.")); info.SetCopyright (_("(C) Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen")); wxArrayString authors; -- cgit v1.2.3 From 81c40635c73b402e13613a614fa8b9e9c2aa703a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 21 Dec 2012 22:20:52 +0000 Subject: Fix subtitle control sensitivity a little (#14). --- src/wx/film_editor.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index c90122aff..8cf8c5fda 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -611,9 +611,7 @@ FilmEditor::film_changed (Film::Property p) break; case Film::WITH_SUBTITLES: checked_set (_with_subtitles, _film->with_subtitles ()); - _subtitle_stream->Enable (_film->with_subtitles ()); - _subtitle_scale->Enable (_film->with_subtitles ()); - _subtitle_offset->Enable (_film->with_subtitles ()); + setup_subtitle_control_sensitivity (); _dcp_name->SetLabel (std_to_wx (_film->dcp_name ())); break; case Film::SUBTITLE_OFFSET: @@ -965,9 +963,9 @@ FilmEditor::setup_subtitle_control_sensitivity () } _with_subtitles->Enable (h); - _subtitle_stream->Enable (h); - _subtitle_offset->Enable (h); - _subtitle_scale->Enable (h); + _subtitle_stream->Enable (_film->with_subtitles ()); + _subtitle_offset->Enable (_film->with_subtitles ()); + _subtitle_scale->Enable (_film->with_subtitles ()); } void -- cgit v1.2.3