Take Film pointer out of Content.

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

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 79dba9fdaf340716c0ca8745ae5890c8ce2b6c32..051fc8db8941f137fdd54d90f457dd709204aa42 100644 (file)
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -24,70 +25,78 @@
 #ifndef DCPOMATIC_AUDIO_CONTENT_H
 #define DCPOMATIC_AUDIO_CONTENT_H
 
-#include "content.h"
+#include "content_part.h"
 #include "audio_stream.h"
 #include "audio_mapping.h"
 
-namespace cxml {
-       class Node;
-}
-
 /** @class AudioContentProperty
  *  @brief Names for properties of AudioContent.
  */
 class AudioContentProperty
 {
 public:
-       static int const AUDIO_STREAMS;
-       static int const AUDIO_GAIN;
-       static int const AUDIO_DELAY;
+       static int const STREAMS;
+       static int const GAIN;
+       static int const DELAY;
 };
 
-/** @class AudioContent
- *  @brief Parent class for content which may contain audio data.
- */
-class AudioContent : public virtual Content
+class AudioContent : public ContentPart
 {
 public:
-       AudioContent (boost::shared_ptr<const Film>);
-       AudioContent (boost::shared_ptr<const Film>, DCPTime);
-       AudioContent (boost::shared_ptr<const Film>, boost::filesystem::path);
-       AudioContent (boost::shared_ptr<const Film>, cxml::ConstNodePtr);
-       AudioContent (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
+       explicit AudioContent (Content* parent);
+       AudioContent (Content* parent, std::vector<boost::shared_ptr<Content> >);
 
        void as_xml (xmlpp::Node *) const;
        std::string technical_summary () const;
+       void take_settings_from (boost::shared_ptr<const AudioContent> c);
 
-       virtual std::vector<AudioStreamPtr> audio_streams () const = 0;
-
-       AudioMapping audio_mapping () const;
-       void set_audio_mapping (AudioMapping);
-       boost::filesystem::path audio_analysis_path () const;
-       int resampled_audio_frame_rate () const;
+       AudioMapping mapping () const;
+       void set_mapping (AudioMapping);
+       int resampled_frame_rate (boost::shared_ptr<const Film> film) const;
        bool has_rate_above_48k () const;
+       std::vector<std::string> channel_names () const;
 
-       boost::signals2::connection analyse_audio (boost::function<void()>);
+       void set_gain (double);
+       void set_delay (int);
+
+       double gain () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _gain;
+       }
 
-       void set_audio_gain (double);
-       void set_audio_delay (int);
-       
-       double audio_gain () const {
+       int delay () const {
                boost::mutex::scoped_lock lm (_mutex);
-               return _audio_gain;
+               return _delay;
        }
 
-       int audio_delay () const {
+       std::string processing_description (boost::shared_ptr<const Film> film) const;
+
+       std::vector<AudioStreamPtr> streams () const {
                boost::mutex::scoped_lock lm (_mutex);
-               return _audio_delay;
+               return _streams;
        }
 
-       std::string processing_description () const;
-       
+       void add_stream (AudioStreamPtr stream);
+       void set_stream (AudioStreamPtr stream);
+       void set_streams (std::vector<AudioStreamPtr> streams);
+       AudioStreamPtr stream () const;
+
+       void add_properties (boost::shared_ptr<const Film> film, std::list<UserProperty> &) const;
+
+       void modify_position (boost::shared_ptr<const Film> film, DCPTime& pos) const;
+       void modify_trim_start (ContentTime& pos) const;
+
+       static boost::shared_ptr<AudioContent> from_xml (Content* parent, cxml::ConstNodePtr, int version);
+
 private:
+
+       AudioContent (Content* parent, cxml::ConstNodePtr);
+
        /** Gain to apply to audio in dB */
-       double _audio_gain;
+       double _gain;
        /** Delay to apply to audio (positive moves audio later) in milliseconds */
-       int _audio_delay;
+       int _delay;
+       std::vector<AudioStreamPtr> _streams;
 };
 
 #endif