Put correct number of audio channels in DCP name. Use XX for subtitle language when...

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 3ee8a416ff30d4dfb03ca2199f4a497a7c67d3ca..3709807b73fec46f46c44c431ea769cc525f9c7a 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -442,7 +442,7 @@ Film::dci_name (bool if_created_now) const
 
        if (!dm.audio_language.empty ()) {
                d << "_" << dm.audio_language;
-               if (!dm.subtitle_language.empty()) {
+               if (!dm.subtitle_language.empty() && with_subtitles()) {
                        d << "-" << dm.subtitle_language;
                } else {
                        d << "-XX";
@@ -456,7 +456,28 @@ Film::dci_name (bool if_created_now) const
                }
        }
 
-       d << "_51_" << resolution_to_string (_resolution);
+       switch (dcp_audio_channels ()) {
+       case 1:
+               d << "_10";
+               break;
+       case 2:
+               d << "_20";
+               break;
+       case 3:
+               d << "_30";
+               break;
+       case 4:
+               d << "_40";
+               break;
+       case 5:
+               d << "_50";
+               break;
+       case 6:
+               d << "_51";
+               break;
+       }
+
+       d << "_" << resolution_to_string (_resolution);
 
        if (!dm.studio.empty ()) {
                d << "_" << dm.studio;

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 669be844b90637a8535138317a44f5c1cb3b10bd..4ae3743b300a5ebfaf39e8838b716b8cd9ec3d86 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -681,6 +681,7 @@ FilmEditor::film_changed (Film::Property p)
        case Film::DCP_AUDIO_CHANNELS:
                _dcp_audio_channels->SetValue (_film->dcp_audio_channels ());
                _audio_mapping->set_channels (_film->dcp_audio_channels ());
+               setup_dcp_name ();
                break;
        }
 }