Remove support for FFmpeg postprocessing filters.

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

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 4ae5546c2c2daa38a76a07c770eba837f572047a..e52e36f781e6663964e6208b145dcc0835040805 100644 (file)
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -215,13 +215,13 @@ FFmpegContent::technical_summary () const
                ss = _subtitle_stream->technical_summary ();
        }
 
-       pair<string, string> filt = Filter::ffmpeg_strings (_filters);
+       string filt = Filter::ffmpeg_string (_filters);
        
        return Content::technical_summary() + " - "
                + VideoContent::technical_summary() + " - "
                + AudioContent::technical_summary() + " - "
                + String::compose (
-                       "ffmpeg: audio %1, subtitle %2, filters %3 %4", as, ss, filt.first, filt.second
+                       "ffmpeg: audio %1, subtitle %2, filters %3", as, ss, filt
                        );
 }
 
@@ -477,3 +477,23 @@ FFmpegContent::identifier () const
        return s.str ();
 }
 
+boost::filesystem::path
+FFmpegContent::audio_analysis_path () const
+{
+       shared_ptr<const Film> film = _film.lock ();
+       if (!film) {
+               return boost::filesystem::path ();
+       }
+
+       /* We need to include the stream ID in this path so that we get different
+          analyses for each stream.
+       */
+
+       boost::filesystem::path p = film->audio_analysis_dir ();
+       string name = digest ();
+       if (audio_stream ()) {
+               name += "_" + audio_stream()->identifier ();
+       }
+       p /= name;
+       return p;
+}