Use EnumIndexedVector in J2KEncoder.

[dcpomatic.git] / src / lib / film.cc

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 4084ca59c1700ec2d5ecae874b8eb5b0732b62b5..4e133a90dd8e5b59abce153bba33d2d90be43c8f 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -973,7 +973,10 @@ Film::isdcf_name (bool if_created_now) const
                if (_ratings.empty ()) {
                        d += "-NR";
                } else {
-                       d += "-" + _ratings[0].label;
+                       auto label = _ratings[0].label;
+                       boost::erase_all(label, "+");
+                       boost::erase_all(label, "-");
+                       d += "-" + label;
                }
        }
 
@@ -1755,7 +1758,7 @@ Film::audio_output_names () const
        vector<NamedChannel> n;
 
        for (int i = 0; i < audio_channels(); ++i) {
-               if (i != 8 && i != 9 && i != 15) {
+               if (Config::instance()->use_all_audio_channels() || (i != 8 && i != 9 && i != 15)) {
                        n.push_back (NamedChannel(short_audio_channel_name(i), i));
                }
        }