diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-16 03:28:38 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-16 03:28:38 +0100 |
| commit | 27e1f73c75e6c0f75d4863cfe2c8e50f811913d9 (patch) | |
| tree | 1a03fc9b5be26fa17a5f1228b940a348d48681df /src/lib | |
| parent | ec0a74ffb64199847847cb4413380d5e3c24f617 (diff) | |
Various DCI naming tweaks and a subtitle bug fix.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/film_state.cc | 22 | ||||
| -rw-r--r-- | src/lib/imagemagick_encoder.cc | 2 |
2 files changed, 18 insertions, 6 deletions
diff --git a/src/lib/film_state.cc b/src/lib/film_state.cc index e39e14da8..094342d7b 100644 --- a/src/lib/film_state.cc +++ b/src/lib/film_state.cc @@ -360,7 +360,14 @@ FilmState::dci_name () const { stringstream d; - d << name << "_"; + string fixed_name = to_upper_copy (name); + for (size_t i = 0; i < fixed_name.length(); ++i) { + if (fixed_name[i] == ' ') { + fixed_name[i] = '-'; + } + } + + d << fixed_name << "_"; if (dcp_content_type) { d << dcp_content_type->dci_name() << "_"; @@ -372,9 +379,14 @@ FilmState::dci_name () const if (!audio_language.empty ()) { d << audio_language; - if (!subtitle_language.empty ()) { - d << "-" << subtitle_language; + if (with_subtitles) { + if (!subtitle_language.empty ()) { + d << "-" << subtitle_language; + } else { + d << "-XX"; + } } + d << "_"; } @@ -388,10 +400,10 @@ FilmState::dci_name () const switch (audio_channels) { case 1: - d << "1_"; + d << "10_"; break; case 2: - d << "2_"; + d << "20_"; break; case 6: d << "51_"; diff --git a/src/lib/imagemagick_encoder.cc b/src/lib/imagemagick_encoder.cc index d0feb1893..2518f8dc5 100644 --- a/src/lib/imagemagick_encoder.cc +++ b/src/lib/imagemagick_encoder.cc @@ -85,7 +85,7 @@ ImageMagickEncoder::process_video (shared_ptr<Image> image, int frame, shared_pt << "y " << sub->position().y << "\n"; metadata.close (); - filesystem::rename (tmp_metadata_file, _opt->frame_out_path (frame, false, ".sub.png")); + filesystem::rename (tmp_metadata_file, _opt->frame_out_path (frame, false, ".sub")); } frame_done (frame); |