/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
*/
-#include <dcp/raw_convert.h>
#include "single_stream_audio_content.h"
#include "audio_examiner.h"
#include "film.h"
+#include "raw_convert.h"
+#include <libxml++/libxml++.h>
+#include <iostream>
+
+#include "i18n.h"
using std::string;
using std::cout;
+using std::vector;
+using std::list;
+using std::pair;
using boost::shared_ptr;
-using dcp::raw_convert;
-
-SingleStreamAudioContent::SingleStreamAudioContent (shared_ptr<const Film> f)
- : Content (f)
- , AudioContent (f)
- , _audio_channels (0)
- , _audio_length (0)
- , _audio_frame_rate (0)
+
+SingleStreamAudioContent::SingleStreamAudioContent (shared_ptr<const Film> film)
+ : Content (film)
+ , AudioContent (film)
{
}
-SingleStreamAudioContent::SingleStreamAudioContent (shared_ptr<const Film> f, boost::filesystem::path p)
- : Content (f, p)
- , AudioContent (f, p)
- , _audio_channels (0)
- , _audio_length (0)
- , _audio_frame_rate (0)
+SingleStreamAudioContent::SingleStreamAudioContent (shared_ptr<const Film> film, boost::filesystem::path p)
+ : Content (film, p)
+ , AudioContent (film, p)
{
}
-SingleStreamAudioContent::SingleStreamAudioContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version)
- : Content (f, node)
- , AudioContent (f, node)
- , _audio_mapping (node->node_child ("AudioMapping"), version)
+SingleStreamAudioContent::SingleStreamAudioContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
+ : Content (film, node)
+ , AudioContent (film, node)
+ , _audio_stream (new AudioStream (node->number_child<int> ("AudioFrameRate"), AudioMapping (node->node_child ("AudioMapping"), version)))
{
- _audio_channels = node->number_child<int> ("AudioChannels");
- _audio_length = ContentTime (node->number_child<ContentTime::Type> ("AudioLength"));
- _audio_frame_rate = node->number_child<int> ("AudioFrameRate");
-}
-
-void
-SingleStreamAudioContent::set_audio_mapping (AudioMapping m)
-{
- {
- boost::mutex::scoped_lock lm (_mutex);
- _audio_mapping = m;
- }
- AudioContent::set_audio_mapping (m);
}
-
void
SingleStreamAudioContent::as_xml (xmlpp::Node* node) const
{
AudioContent::as_xml (node);
- node->add_child("AudioChannels")->add_child_text (raw_convert<string> (audio_channels ()));
- node->add_child("AudioLength")->add_child_text (raw_convert<string> (audio_length().get ()));
- node->add_child("AudioFrameRate")->add_child_text (raw_convert<string> (audio_frame_rate ()));
- _audio_mapping.as_xml (node->add_child("AudioMapping"));
+ node->add_child("AudioFrameRate")->add_child_text (raw_convert<string> (audio_stream()->frame_rate ()));
+ audio_stream()->mapping().as_xml (node->add_child("AudioMapping"));
}
void
{
{
boost::mutex::scoped_lock lm (_mutex);
- _audio_channels = examiner->audio_channels ();
- _audio_length = examiner->audio_length ();
- _audio_frame_rate = examiner->audio_frame_rate ();
+ _audio_stream.reset (new AudioStream (examiner->audio_frame_rate(), examiner->audio_channels ()));
+ AudioMapping m = _audio_stream->mapping ();
+ film()->make_audio_mapping_default (m);
+ _audio_stream->set_mapping (m);
}
- signal_changed (AudioContentProperty::AUDIO_CHANNELS);
- signal_changed (AudioContentProperty::AUDIO_LENGTH);
- signal_changed (AudioContentProperty::AUDIO_FRAME_RATE);
+ signal_changed (AudioContentProperty::AUDIO_STREAMS);
+}
- int const p = processed_audio_channels ();
+vector<AudioStreamPtr>
+SingleStreamAudioContent::audio_streams () const
+{
+ vector<AudioStreamPtr> s;
+ s.push_back (_audio_stream);
+ return s;
+}
- {
- boost::mutex::scoped_lock lm (_mutex);
- /* XXX: do this in signal_changed...? */
- _audio_mapping = AudioMapping (p);
- _audio_mapping.make_default ();
- }
-
- signal_changed (AudioContentProperty::AUDIO_MAPPING);
+void
+SingleStreamAudioContent::add_properties (list<pair<string, string> >& p) const
+{
+ /* XXX: this could be better wrt audio streams */
+ p.push_back (make_pair (_("Audio channels"), raw_convert<string> (audio_stream()->channels ())));
}