*/
-#include <dcp/raw_convert.h>
#include "single_stream_audio_content.h"
#include "audio_examiner.h"
#include "film.h"
+#include "raw_convert.h"
using std::string;
using std::cout;
using boost::shared_ptr;
-using dcp::raw_convert;
SingleStreamAudioContent::SingleStreamAudioContent (shared_ptr<const Film> f)
: Content (f)
, _audio_mapping (node->node_child ("AudioMapping"), version)
{
_audio_channels = node->number_child<int> ("AudioChannels");
- _audio_length = ContentTime (node->number_child<ContentTime::Type> ("AudioLength"));
+ _audio_length = node->number_child<Frame> ("AudioLength");
_audio_frame_rate = node->number_child<int> ("AudioFrameRate");
}
{
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("AudioLength")->add_child_text (raw_convert<string> (audio_length ()));
node->add_child("AudioFrameRate")->add_child_text (raw_convert<string> (audio_frame_rate ()));
_audio_mapping.as_xml (node->add_child("AudioMapping"));
}
}
signal_changed (AudioContentProperty::AUDIO_CHANNELS);
- signal_changed (AudioContentProperty::AUDIO_LENGTH);
signal_changed (AudioContentProperty::AUDIO_FRAME_RATE);
int const p = processed_audio_channels ();