Fix subtitle timing under trim.

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

diff --git a/src/lib/mid_side_decoder.cc b/src/lib/mid_side_decoder.cc
index fe628226151e652f66ee12096d03c4ef295557fb..6aadea1a2242facca8522cf489621480fb2aec95 100644 (file)
--- a/src/lib/mid_side_decoder.cc
+++ b/src/lib/mid_side_decoder.cc
@@ -40,12 +40,6 @@ MidSideDecoder::id () const
        return N_("mid-side-decoder");
 }
 
-ChannelCount
-MidSideDecoder::in_channels () const
-{
-       return ChannelCount (2);
-}
-
 int
 MidSideDecoder::out_channels () const
 {
@@ -59,16 +53,27 @@ MidSideDecoder::clone (int) const
 }
 
 shared_ptr<AudioBuffers>
-MidSideDecoder::run (shared_ptr<const AudioBuffers> in)
+MidSideDecoder::run (shared_ptr<const AudioBuffers> in, int channels)
 {
-       shared_ptr<AudioBuffers> out (new AudioBuffers (3, in->frames ()));
+       int const N = min (channels, 3);
+       shared_ptr<AudioBuffers> out (new AudioBuffers (channels, in->frames ()));
        for (int i = 0; i < in->frames(); ++i) {
                float const left = in->data()[0][i];
                float const right = in->data()[1][i];
                float const mid = (left + right) / 2;
-               out->data()[0][i] = left - mid;
-               out->data()[1][i] = right - mid;
-               out->data()[2][i] = mid;
+               if (N > 0) {
+                       out->data()[0][i] = left - mid;
+               }
+               if (N > 1) {
+                       out->data()[1][i] = right - mid;
+               }
+               if (N > 2) {
+                       out->data()[2][i] = mid;
+               }
+       }
+
+       for (int i = N; i < channels; ++i) {
+               out->make_silent (i);
        }
 
        return out;
@@ -89,10 +94,8 @@ MidSideDecoder::input_names () const
 {
        vector<string> n;
 
-       /// TRANSLATORS: this is the name of the `mid' channel for mid-side decoding
-       n.push_back (_("Mid"));
-       /// TRANSLATORS: this is the name of the `side' channel for mid-side decoding
-       n.push_back (_("Side"));
+       n.push_back (_("Left"));
+       n.push_back (_("Right"));
 
        return n;
 }