when mapping into a DCP.
(target.platform == 'osx' and target.bits == 64) or
(target.platform == 'windows')) else {}
- deps.append(('libdcp', '38864bb', cpp_lib_options))
- deps.append(('libsub', '308476c', cpp_lib_options))
+ deps.append(('libdcp', '25526a5', cpp_lib_options))
+ deps.append(('libsub', '3286d3a', cpp_lib_options))
deps.append(('leqm-nrt', 'carl'))
deps.append(('rtaudio', 'carl'))
# We get our OpenSSL libraries from the environment, but we
}
/** @return User-visible names of each of our audio channels */
-vector<string>
+vector<NamedChannel>
AudioContent::channel_names () const
{
- vector<string> n;
+ vector<NamedChannel> n;
- int t = 1;
+ int index = 0;
+ int stream = 1;
BOOST_FOREACH (AudioStreamPtr i, streams ()) {
for (int j = 0; j < i->channels(); ++j) {
- n.push_back (String::compose ("%1:%2", t, j + 1));
+ n.push_back (NamedChannel(String::compose ("%1:%2", stream, j + 1), index++));
}
- ++t;
+ ++stream;
}
return n;
AudioMapping mapping () const;
void set_mapping (AudioMapping);
int resampled_frame_rate (boost::shared_ptr<const Film> film) const;
- std::vector<std::string> channel_names () const;
+ std::vector<NamedChannel> channel_names () const;
void set_gain (double);
void set_delay (int);
#ifndef DCPOMATIC_AUDIO_PROCESSOR_H
#define DCPOMATIC_AUDIO_PROCESSOR_H
+#include "types.h"
#include <boost/shared_ptr.hpp>
#include <list>
#include <string>
/** Make the supplied audio mapping into a sensible default for this processor */
virtual void make_audio_mapping_default (AudioMapping& mapping) const = 0;
/** @return the user-visible (translated) names of each of our inputs, in order */
- virtual std::vector<std::string> input_names () const = 0;
+ virtual std::vector<NamedChannel> input_names () const = 0;
static std::list<AudioProcessor const *> all ();
static std::list<AudioProcessor const *> visible ();
/** @return The names of the channels that audio contents' outputs are passed into;
* this is either the DCP or a AudioProcessor.
*/
-vector<string>
+vector<NamedChannel>
Film::audio_output_names () const
{
if (audio_processor ()) {
DCPOMATIC_ASSERT (MAX_DCP_AUDIO_CHANNELS == 16);
- vector<string> n;
+ vector<NamedChannel> n;
for (int i = 0; i < audio_channels(); ++i) {
- n.push_back (short_audio_channel_name (i));
+ if (i != 8 && i != 9 && i != 15) {
+ n.push_back (NamedChannel(short_audio_channel_name(i), i));
+ }
}
return n;
std::string subtitle_language () const;
- std::vector<std::string> audio_output_names () const;
+ std::vector<NamedChannel> audio_output_names () const;
void repeat_content (ContentList, int);
}
}
-vector<string>
+vector<NamedChannel>
MidSideDecoder::input_names () const
{
- vector<string> n;
-
- n.push_back (_("Left"));
- n.push_back (_("Right"));
-
+ vector<NamedChannel> n;
+ n.push_back (NamedChannel(_("Left"), 0));
+ n.push_back (NamedChannel(_("Right"), 1));
return n;
}
boost::shared_ptr<AudioProcessor> clone (int) const;
boost::shared_ptr<AudioBuffers> run (boost::shared_ptr<const AudioBuffers>, int channels);
void make_audio_mapping_default (AudioMapping& mapping) const;
- std::vector<std::string> input_names () const;
+ std::vector<NamedChannel> input_names () const;
};
last_write_time = boost::filesystem::last_write_time (p);
}
+
+
+bool operator== (NamedChannel const& a, NamedChannel const& b)
+{
+ return a.name == b.name && a.index == b.index;
+}
+
EMAIL_PROTOCOL_SSL
};
+
+class NamedChannel
+{
+public:
+ NamedChannel (std::string name_, int index_)
+ : name(name_)
+ , index(index_)
+ {}
+
+ std::string name;
+ int index;
+};
+
+
+bool operator== (NamedChannel const& a, NamedChannel const& b);
+
#endif
}
}
-vector<string>
+vector<NamedChannel>
UpmixerA::input_names () const
{
- vector<string> n;
- n.push_back (_("Upmix L"));
- n.push_back (_("Upmix R"));
+ vector<NamedChannel> n;
+ n.push_back (NamedChannel(_("Upmix L"), 0));
+ n.push_back (NamedChannel(_("Upmix R"), 1));
return n;
}
boost::shared_ptr<AudioBuffers> run (boost::shared_ptr<const AudioBuffers>, int channels);
void flush ();
void make_audio_mapping_default (AudioMapping& mapping) const;
- std::vector<std::string> input_names () const;
+ std::vector<NamedChannel> input_names () const;
private:
BandPassAudioFilter _left;
}
}
-vector<string>
+vector<NamedChannel>
UpmixerB::input_names () const
{
- vector<string> n;
- n.push_back (_("Upmix L"));
- n.push_back (_("Upmix R"));
+ vector<NamedChannel> n;
+ n.push_back (NamedChannel(_("Upmix L"), 0));
+ n.push_back (NamedChannel(_("Upmix R"), 1));
return n;
}
boost::shared_ptr<AudioBuffers> run (boost::shared_ptr<const AudioBuffers>, int channels);
void flush ();
void make_audio_mapping_default (AudioMapping& mapping) const;
- std::vector<std::string> input_names () const;
+ std::vector<NamedChannel> input_names () const;
private:
LowPassAudioFilter _lfe;
case dcp::CENTRE:
case dcp::LS:
case dcp::RS:
- case dcp::LC:
- case dcp::RC:
case dcp::BSL:
case dcp::BSR:
++non_lfe;
case dcp::MOTION_DATA:
case dcp::SYNC_SIGNAL:
case dcp::SIGN_LANGUAGE:
- case dcp::UNUSED:
case dcp::CHANNEL_COUNT:
break;
}
wxCoord label_width;
wxCoord label_height;
int N = 0;
- BOOST_FOREACH (string i, _output_channels) {
- dc.GetTextExtent (std_to_wx(i), &label_width, &label_height);
- dc.DrawText (std_to_wx(i), LEFT_WIDTH + GRID_SPACING * N + (GRID_SPACING - label_width) / 2, GRID_SPACING + (GRID_SPACING - label_height) / 2);
+ BOOST_FOREACH (NamedChannel const& i, _output_channels) {
+ dc.GetTextExtent (std_to_wx(i.name), &label_width, &label_height);
+ dc.DrawText (std_to_wx(i.name), LEFT_WIDTH + GRID_SPACING * N + (GRID_SPACING - label_width) / 2, GRID_SPACING + (GRID_SPACING - label_height) / 2);
++N;
}
/* Row channel labels */
int N = 0;
- BOOST_FOREACH (string i, _input_channels) {
- dc.GetTextExtent (std_to_wx(i), &label_width, &label_height);
- dc.DrawText (std_to_wx(i), GRID_SPACING * 2 + (GRID_SPACING - label_width) / 2, TOP_HEIGHT + GRID_SPACING * N + (GRID_SPACING - label_height) / 2);
+ BOOST_FOREACH (NamedChannel const& i, _input_channels) {
+ dc.GetTextExtent (std_to_wx(i.name), &label_width, &label_height);
+ dc.DrawText (std_to_wx(i.name), GRID_SPACING * 2 + (GRID_SPACING - label_width) / 2, TOP_HEIGHT + GRID_SPACING * N + (GRID_SPACING - label_height) / 2);
++N;
}
)
);
- float const value_dB = linear_to_db(_map.get(y, x));
+ float const value_dB = linear_to_db(_map.get(_input_channels[y].index, _output_channels[x].index));
wxColour const colour = value_dB <= 0 ? wxColour(0, 255, 0) : wxColour(255, 150, 0);
int const range = 18;
int height = 0;
restore (dc);
}
-optional<pair<int, int> >
+optional<pair<NamedChannel, NamedChannel> >
AudioMappingView::mouse_event_to_channels (wxMouseEvent& ev) const
{
int const x = ev.GetX() + _horizontal_scroll->GetThumbPosition();
int const y = ev.GetY() + _vertical_scroll->GetThumbPosition();
if (x <= LEFT_WIDTH || y < TOP_HEIGHT) {
- return optional<pair<int, int> >();
+ return optional<pair<NamedChannel, NamedChannel> >();
}
int const input = (y - TOP_HEIGHT) / GRID_SPACING;
int const output = (x - LEFT_WIDTH) / GRID_SPACING;
if (input >= int(_input_channels.size()) || output >= int(_output_channels.size())) {
- return optional<pair<int, int> >();
+ return optional<pair<NamedChannel, NamedChannel> >();
}
- return make_pair (input, output);
+ return make_pair (_input_channels[input], _output_channels[output]);
}
optional<string>
void
AudioMappingView::left_down (wxMouseEvent& ev)
{
- optional<pair<int, int> > channels = mouse_event_to_channels (ev);
+ optional<pair<NamedChannel, NamedChannel> > channels = mouse_event_to_channels (ev);
if (!channels) {
return;
}
- if (_map.get(channels->first, channels->second) > 0) {
- _map.set (channels->first, channels->second, 0);
+ if (_map.get(channels->first.index, channels->second.index) > 0) {
+ _map.set (channels->first.index, channels->second.index, 0);
} else {
- _map.set (channels->first, channels->second, 1);
+ _map.set (channels->first.index, channels->second.index, 1);
}
map_values_changed ();
void
AudioMappingView::right_down (wxMouseEvent& ev)
{
- optional<pair<int, int> > channels = mouse_event_to_channels (ev);
+ optional<pair<NamedChannel, NamedChannel> > channels = mouse_event_to_channels (ev);
if (!channels) {
return;
}
- _menu_input = channels->first;
- _menu_output = channels->second;
+ _menu_input = channels->first.index;
+ _menu_output = channels->second.index;
PopupMenu (_menu, ev.GetPosition());
}
AudioMappingView::map_values_changed ()
{
Changed (_map);
- _last_tooltip_channels = optional<pair<int, int> >();
+ _last_tooltip_channels = optional<pair<NamedChannel, NamedChannel> >();
Refresh ();
}
}
void
-AudioMappingView::set_input_channels (vector<string> const & names)
+AudioMappingView::set_input_channels (vector<NamedChannel> const& channels)
{
- _input_channels = names;
+ _input_channels = channels;
setup ();
Refresh ();
}
void
-AudioMappingView::set_output_channels (vector<string> const & names)
+AudioMappingView::set_output_channels (vector<NamedChannel> const & channels)
{
- _output_channels = names;
+ _output_channels = channels;
setup ();
Refresh ();
}
+
wxString
-AudioMappingView::safe_input_channel_name (int n) const
+AudioMappingView::input_channel_name_with_group (NamedChannel const& n) const
{
- if (n >= int(_input_channels.size())) {
- return wxString::Format ("%d", n + 1);
- }
-
optional<wxString> group;
BOOST_FOREACH (Group i, _input_groups) {
- if (i.from <= n && n <= i.to) {
+ if (i.from <= n.index && n.index <= i.to) {
group = std_to_wx (i.name);
}
}
if (group && !group->IsEmpty()) {
- return wxString::Format ("%s/%s", group->data(), std_to_wx(_input_channels[n]).data());
+ return wxString::Format ("%s/%s", group->data(), std_to_wx(n.name).data());
}
- return std_to_wx(_input_channels[n]);
+ return std_to_wx(n.name);
}
-wxString
-AudioMappingView::safe_output_channel_name (int n) const
-{
- if (n >= int(_output_channels.size())) {
- return wxString::Format ("%d", n + 1);
- }
-
- return std_to_wx(_output_channels[n]);
-}
void
AudioMappingView::motion (wxMouseEvent& ev)
{
- optional<pair<int, int> > channels = mouse_event_to_channels (ev);
+ optional<pair<NamedChannel, NamedChannel> > channels = mouse_event_to_channels (ev);
if (channels) {
if (channels != _last_tooltip_channels) {
wxString s;
- float const gain = _map.get(channels->first, channels->second);
+ float const gain = _map.get(channels->first.index, channels->second.index);
if (gain == 0) {
s = wxString::Format (
_("No audio will be passed from %s channel '%s' to %s channel '%s'."),
_from,
- safe_input_channel_name(channels->first),
+ input_channel_name_with_group(channels->first),
_to,
- safe_output_channel_name(channels->second)
+ std_to_wx(channels->second.name)
);
} else if (gain == 1) {
s = wxString::Format (
_("Audio will be passed from %s channel %s to %s channel %s unaltered."),
_from,
- safe_input_channel_name(channels->first),
+ input_channel_name_with_group(channels->first),
_to,
- safe_output_channel_name(channels->second)
+ std_to_wx(channels->second.name)
);
} else {
float const dB = linear_to_db(gain);
s = wxString::Format (
_("Audio will be passed from %s channel %s to %s channel %s with gain %.1fdB."),
_from,
- safe_input_channel_name(channels->first),
+ input_channel_name_with_group(channels->first),
_to,
- safe_output_channel_name(channels->second),
+ std_to_wx(channels->second.name),
dB
);
}
*/
#include "lib/audio_mapping.h"
+#include "lib/types.h"
#include "lib/warnings.h"
DCPOMATIC_DISABLE_WARNINGS
#include <wx/wx.h>
AudioMappingView (wxWindow *, wxString left_label, wxString from, wxString top_label, wxString to);
void set (AudioMapping);
- void set_input_channels (std::vector<std::string> const & names);
- void set_output_channels (std::vector<std::string> const & names);
+ void set_input_channels (std::vector<NamedChannel> const& channels);
+ void set_output_channels (std::vector<NamedChannel> const& channels);
struct Group
{
void right_down (wxMouseEvent &);
void motion (wxMouseEvent &);
void mouse_wheel (wxMouseEvent &);
- boost::optional<std::pair<int, int> > mouse_event_to_channels (wxMouseEvent& ev) const;
+ boost::optional<std::pair<NamedChannel, NamedChannel> > mouse_event_to_channels (wxMouseEvent& ev) const;
boost::optional<std::string> mouse_event_to_input_group_name (wxMouseEvent& ev) const;
void setup ();
- wxString safe_input_channel_name (int n) const;
- wxString safe_output_channel_name (int n) const;
+ wxString input_channel_name_with_group (NamedChannel const& n) const;
void set_gain_from_menu (double linear);
void edit ();
wxString _top_label;
wxString _to;
- std::vector<std::string> _input_channels;
- std::vector<std::string> _output_channels;
+ std::vector<NamedChannel> _input_channels;
+ std::vector<NamedChannel> _output_channels;
std::vector<Group> _input_groups;
- boost::optional<std::pair<int, int> > _last_tooltip_channels;
+ boost::optional<std::pair<NamedChannel, NamedChannel> > _last_tooltip_channels;
};
_map->set (Config::instance()->audio_mapping(channels));
- vector<string> input;
+ vector<NamedChannel> input;
for (int i = 0; i < MAX_DCP_AUDIO_CHANNELS; ++i) {
- input.push_back (short_audio_channel_name(i));
+ input.push_back (NamedChannel(short_audio_channel_name(i), i));
}
_map->set_input_channels (input);
- vector<string> output;
+ vector<NamedChannel> output;
for (int i = 0; i < channels; ++i) {
- output.push_back (dcp::raw_convert<string>(i));
+ output.push_back (NamedChannel(dcp::raw_convert<string>(i), i));
}
_map->set_output_channels (output);
BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_51-HI-VI_4K_DI_20140704_PP_SMPTE_OV");
film->set_audio_channels(10);
- mapping.set (0, dcp::LC, 1.0);
- mapping.set (0, dcp::RC, 1.0);
mapping.set (0, dcp::HI, 0.0);
mapping.set (0, dcp::VI, 0.0);
sound->audio->set_mapping (mapping);
BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_71-HI-VI_4K_DI_20140704_PP_SMPTE_OV");
film->set_audio_channels(12);
- mapping.set (0, dcp::LC, 0.0);
- mapping.set (0, dcp::RC, 0.0);
mapping.set (0, dcp::BSL, 1.0);
mapping.set (0, dcp::BSR, 1.0);
mapping.set (0, dcp::HI, 0.0);