Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index 3ea31f673457f4200642f29ab8640c04ce240512..c67a66ed8a00f669e768a32db5be27626524eb19 100644 (file)
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -18,15 +18,16 @@
 */
 
 #include "audio_content.h"
-#include "analyse_audio_job.h"
-#include "job_manager.h"
 #include "film.h"
 #include "exceptions.h"
 #include "config.h"
 #include "frame_rate_change.h"
 #include "raw_convert.h"
+#include "compose.hpp"
 #include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
+#include <iostream>
 
 #include "i18n.h"
 
@@ -45,43 +46,43 @@ int const AudioContentProperty::AUDIO_STREAMS = 200;
 int const AudioContentProperty::AUDIO_GAIN = 201;
 int const AudioContentProperty::AUDIO_DELAY = 202;
 
-AudioContent::AudioContent (shared_ptr<const Film> f)
-       : Content (f)
+AudioContent::AudioContent (shared_ptr<const Film> film)
+       : Content (film)
        , _audio_gain (0)
        , _audio_delay (Config::instance()->default_audio_delay ())
 {
 
 }
 
-AudioContent::AudioContent (shared_ptr<const Film> f, DCPTime s)
-       : Content (f, s)
+AudioContent::AudioContent (shared_ptr<const Film> film, DCPTime s)
+       : Content (film, s)
        , _audio_gain (0)
        , _audio_delay (Config::instance()->default_audio_delay ())
 {
 
 }
 
-AudioContent::AudioContent (shared_ptr<const Film> f, boost::filesystem::path p)
-       : Content (f, p)
+AudioContent::AudioContent (shared_ptr<const Film> film, boost::filesystem::path p)
+       : Content (film, p)
        , _audio_gain (0)
        , _audio_delay (Config::instance()->default_audio_delay ())
 {
 
 }
 
-AudioContent::AudioContent (shared_ptr<const Film> f, cxml::ConstNodePtr node)
-       : Content (f, node)
+AudioContent::AudioContent (shared_ptr<const Film> film, cxml::ConstNodePtr node)
+       : Content (film, node)
 {
        _audio_gain = node->number_child<float> ("AudioGain");
        _audio_delay = node->number_child<int> ("AudioDelay");
 }
 
-AudioContent::AudioContent (shared_ptr<const Film> f, vector<shared_ptr<Content> > c)
-       : Content (f, c)
+AudioContent::AudioContent (shared_ptr<const Film> film, vector<shared_ptr<Content> > c)
+       : Content (film, c)
 {
        shared_ptr<AudioContent> ref = dynamic_pointer_cast<AudioContent> (c[0]);
        DCPOMATIC_ASSERT (ref);
-       
+
        for (size_t i = 0; i < c.size(); ++i) {
                shared_ptr<AudioContent> ac = dynamic_pointer_cast<AudioContent> (c[i]);
 
@@ -114,7 +115,7 @@ AudioContent::set_audio_gain (double g)
                boost::mutex::scoped_lock lm (_mutex);
                _audio_gain = g;
        }
-       
+
        signal_changed (AudioContentProperty::AUDIO_GAIN);
 }
 
@@ -125,34 +126,8 @@ AudioContent::set_audio_delay (int d)
                boost::mutex::scoped_lock lm (_mutex);
                _audio_delay = d;
        }
-       
-       signal_changed (AudioContentProperty::AUDIO_DELAY);
-}
-
-boost::signals2::connection
-AudioContent::analyse_audio (boost::function<void()> finished)
-{
-       shared_ptr<const Film> film = _film.lock ();
-       DCPOMATIC_ASSERT (film);
-       
-       shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, dynamic_pointer_cast<AudioContent> (shared_from_this())));
-       boost::signals2::connection c = job->Finished.connect (finished);
-       JobManager::instance()->add (job);
-
-       return c;
-}
-
-boost::filesystem::path
-AudioContent::audio_analysis_path () const
-{
-       shared_ptr<const Film> film = _film.lock ();
-       if (!film) {
-               return boost::filesystem::path ();
-       }
 
-       boost::filesystem::path p = film->audio_analysis_dir ();
-       p /= digest() + "_" + audio_mapping().digest();
-       return p;
+       signal_changed (AudioContentProperty::AUDIO_DELAY);
 }
 
 string
@@ -171,16 +146,16 @@ AudioContent::set_audio_mapping (AudioMapping mapping)
 {
        int c = 0;
        BOOST_FOREACH (AudioStreamPtr i, audio_streams ()) {
-               AudioMapping stream_mapping (i->channels ());
+               AudioMapping stream_mapping (i->channels (), MAX_DCP_AUDIO_CHANNELS);
                for (int j = 0; j < i->channels(); ++j) {
                        for (int k = 0; k < MAX_DCP_AUDIO_CHANNELS; ++k) {
-                               stream_mapping.set (j, static_cast<dcp::Channel> (k), mapping.get (c, static_cast<dcp::Channel> (k)));
+                               stream_mapping.set (j, k, mapping.get (c, k));
                        }
                        ++c;
                }
                i->set_mapping (stream_mapping);
        }
-               
+
        signal_changed (AudioContentProperty::AUDIO_STREAMS);
 }
 
@@ -191,17 +166,16 @@ AudioContent::audio_mapping () const
        BOOST_FOREACH (AudioStreamPtr i, audio_streams ()) {
                channels += i->channels ();
        }
-       
-       AudioMapping merged (channels);
-       
+
+       AudioMapping merged (channels, MAX_DCP_AUDIO_CHANNELS);
+
        int c = 0;
        int s = 0;
        BOOST_FOREACH (AudioStreamPtr i, audio_streams ()) {
                AudioMapping mapping = i->mapping ();
-               for (int j = 0; j < mapping.content_channels(); ++j) {
-                       merged.set_name (c, String::compose ("%1:%2", s + 1, j + 1));
+               for (int j = 0; j < mapping.input_channels(); ++j) {
                        for (int k = 0; k < MAX_DCP_AUDIO_CHANNELS; ++k) {
-                               merged.set (c, static_cast<dcp::Channel> (k), mapping.get (j, static_cast<dcp::Channel> (k)));
+                               merged.set (c, k, mapping.get (j, k));
                        }
                        ++c;
                }
@@ -219,7 +193,7 @@ AudioContent::resampled_audio_frame_rate () const
 {
        shared_ptr<const Film> film = _film.lock ();
        DCPOMATIC_ASSERT (film);
-       
+
        /* Resample to a DCI-approved sample rate */
        double t = has_rate_above_48k() ? 96000 : 48000;
 
@@ -234,7 +208,7 @@ AudioContent::resampled_audio_frame_rate () const
                t /= frc.speed_up;
        }
 
-       return rint (t);
+       return lrint (t);
 }
 
 string
@@ -289,6 +263,7 @@ AudioContent::processing_description () const
        return "";
 }
 
+/** @return true if any stream in this content has a sampling rate of more than 48kHz */
 bool
 AudioContent::has_rate_above_48k () const
 {
@@ -300,3 +275,20 @@ AudioContent::has_rate_above_48k () const
 
        return false;
 }
+
+/** @return User-visible names of each of our audio channels */
+vector<string>
+AudioContent::audio_channel_names () const
+{
+       vector<string> n;
+
+       int t = 1;
+       BOOST_FOREACH (AudioStreamPtr i, audio_streams ()) {
+               for (int j = 0; j < i->channels(); ++j) {
+                       n.push_back (String::compose ("%1:%2", t, j + 1));
+               }
+               ++t;
+       }
+
+       return n;
+}