using boost::dynamic_pointer_cast;
AudioMapping::AudioMapping ()
+ : _content_channels (0)
{
}
* @param c Number of channels.
*/
AudioMapping::AudioMapping (int c)
+ : _content_channels (c)
{
- if (c == 1) {
+
+}
+
+void
+AudioMapping::make_default ()
+{
+ if (_content_channels == 1) {
/* Mono -> Centre */
add (0, libdcp::CENTRE);
} else {
/* 1:1 mapping */
- for (int i = 0; i < c; ++i) {
+ for (int i = 0; i < _content_channels; ++i) {
add (i, static_cast<libdcp::Channel> (i));
}
}
AudioMapping::AudioMapping (shared_ptr<const cxml::Node> node)
{
+ _content_channels = node->number_child<int> ("ContentChannels");
+
list<shared_ptr<cxml::Node> > const c = node->node_children ("Map");
for (list<shared_ptr<cxml::Node> >::const_iterator i = c.begin(); i != c.end(); ++i) {
add ((*i)->number_child<int> ("ContentIndex"), static_cast<libdcp::Channel> ((*i)->number_child<int> ("DCP")));
return c;
}
-list<int>
-AudioMapping::content_channels () const
-{
- list<int> c;
- for (list<pair<int, libdcp::Channel> >::const_iterator i = _content_to_dcp.begin(); i != _content_to_dcp.end(); ++i) {
- if (find (c.begin(), c.end(), i->first) == c.end ()) {
- c.push_back (i->first);
- }
- }
-
- return c;
-}
-
list<libdcp::Channel>
AudioMapping::content_to_dcp (int c) const
{
+ assert (c < _content_channels);
+
list<libdcp::Channel> d;
for (list<pair<int, libdcp::Channel> >::const_iterator i = _content_to_dcp.begin(); i != _content_to_dcp.end(); ++i) {
if (i->first == c) {
void
AudioMapping::as_xml (xmlpp::Node* node) const
{
+ node->add_child ("ContentChannels")->add_child_text (lexical_cast<string> (_content_channels));
+
for (list<pair<int, libdcp::Channel> >::const_iterator i = _content_to_dcp.begin(); i != _content_to_dcp.end(); ++i) {
xmlpp::Node* t = node->add_child ("Map");
t->add_child ("ContentIndex")->add_child_text (lexical_cast<string> (i->first));
class Node;
}
+/** A many-to-many mapping from some content channels to DCP channels.
+ * The number of content channels is set on construction and fixed,
+ * and then each of those content channels can be mapped to zero or
+ * more DCP channels.
+ */
class AudioMapping
{
public:
void as_xml (xmlpp::Node *) const;
void add (int, libdcp::Channel);
+ void make_default ();
std::list<int> dcp_to_content (libdcp::Channel) const;
std::list<std::pair<int, libdcp::Channel> > content_to_dcp () const {
return _content_to_dcp;
}
- std::list<int> content_channels () const;
+ int content_channels () const {
+ return _content_channels;
+ }
+
std::list<libdcp::Channel> content_to_dcp (int) const;
private:
+ int _content_channels;
std::list<std::pair<int, libdcp::Channel> > _content_to_dcp;
};
}
FFmpegAudioStream::FFmpegAudioStream (shared_ptr<const cxml::Node> node)
+ : mapping (node->node_child ("Mapping"))
{
name = node->string_child ("Name");
id = node->number_child<int> ("Id");
frame_rate = node->number_child<int> ("FrameRate");
channels = node->number_child<int64_t> ("Channels");
- mapping = AudioMapping (node->node_child ("Mapping"));
first_audio = node->optional_number_child<double> ("FirstAudio");
}
#include "video_content.h"
#include "audio_content.h"
#include "subtitle_content.h"
+#include "audio_mapping.h"
class Filter;
class ffmpeg_pts_offset_test;
, frame_rate (f)
, channels (c)
, mapping (c)
- {}
+ {
+ mapping.make_default ();
+ }
FFmpegAudioStream (boost::shared_ptr<const cxml::Node>);
private:
friend class ffmpeg_pts_offset_test;
+
/* Constructor for tests */
- FFmpegAudioStream () {}
+ FFmpegAudioStream ()
+ : mapping (1)
+ {}
};
extern bool operator== (FFmpegAudioStream const & a, FFmpegAudioStream const & b);
SndfileContent::SndfileContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node)
: Content (f, node)
, AudioContent (f, node)
+ , _audio_mapping (node->node_child ("AudioMapping"))
{
_audio_channels = node->number_child<int> ("AudioChannels");
_audio_length = node->number_child<AudioContent::Frame> ("AudioLength");
_audio_frame_rate = node->number_child<int> ("AudioFrameRate");
- _audio_mapping = AudioMapping (node->node_child ("AudioMapping"));
}
string
/* XXX: do this in signal_changed...? */
_audio_mapping = AudioMapping (_audio_channels);
+ _audio_mapping.make_default ();
signal_changed (AudioContentProperty::AUDIO_MAPPING);
}
#include <wx/grid.h>
#include <libdcp/types.h>
#include "lib/audio_mapping.h"
+#include "lib/util.h"
#include "audio_mapping_view.h"
#include "wx_util.h"
}
if (_grid->GetCellValue (ev.GetRow(), ev.GetCol()) == wxT("1")) {
+ cout << "set " << ev.GetRow() << " " << ev.GetCol() << " to 0.\n";
_grid->SetCellValue (ev.GetRow(), ev.GetCol(), wxT("0"));
} else {
+ cout << "set " << ev.GetRow() << " " << ev.GetCol() << " to 1.\n";
_grid->SetCellValue (ev.GetRow(), ev.GetCol(), wxT("1"));
}
- _map = AudioMapping ();
+ _map = AudioMapping (_map.content_channels ());
+ cout << "was: " << _map.dcp_to_content(libdcp::CENTRE).size() << "\n";
+
for (int i = 0; i < _grid->GetNumberRows(); ++i) {
for (int j = 1; j < _grid->GetNumberCols(); ++j) {
if (_grid->GetCellValue (i, j) == wxT ("1")) {
}
}
+ cout << "changed: " << _map.dcp_to_content(libdcp::CENTRE).size() << "\n";
Changed (_map);
}
_grid->DeleteRows (0, _grid->GetNumberRows ());
}
- list<int> content_channels = _map.content_channels ();
- _grid->InsertRows (0, content_channels.size ());
+ _grid->InsertRows (0, _map.content_channels ());
- for (size_t r = 0; r < content_channels.size(); ++r) {
+ for (int r = 0; r < _map.content_channels(); ++r) {
for (int c = 1; c < 7; ++c) {
_grid->SetCellRenderer (r, c, new CheckBoxRenderer);
}
}
- int n = 0;
- for (list<int>::iterator i = content_channels.begin(); i != content_channels.end(); ++i) {
- _grid->SetCellValue (n, 0, wxString::Format (wxT("%d"), *i + 1));
+ for (int i = 0; i < _map.content_channels(); ++i) {
+ _grid->SetCellValue (i, 0, wxString::Format (wxT("%d"), i + 1));
- list<libdcp::Channel> const d = _map.content_to_dcp (*i);
+ list<libdcp::Channel> const d = _map.content_to_dcp (i);
for (list<libdcp::Channel>::const_iterator j = d.begin(); j != d.end(); ++j) {
int const c = static_cast<int>(*j) + 1;
if (c < _grid->GetNumberCols ()) {
- _grid->SetCellValue (n, c, wxT("1"));
+ _grid->SetCellValue (i, c, wxT("1"));
}
}
- ++n;
}
}