ardour/livetrax
13
0
Fork 0
Code

Potential fix for MSVC builds

Browse Source 
The set is defined with custom compare fn:
  std::set<T, cmp> x;
but later iterators used a default constructor:
  std::set<T>::iterator i = x.begin();
This commit is contained in:
Robin Gareus 2021-02-25 15:55:10 +01:00
parent d124b3600b
commit 07d04be98d
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk2_ardour/recorder_ui.cc
View File

@ -625,11 +625,11 @@ RecorderUI::update_io_widget_labels ()
uint32_t n_audio = 0; uint32_t n_audio = 0;
uint32_t n_midi = 0; uint32_t n_midi = 0;
std::set <boost::shared_ptr<InputPort>, InputPortPtrSort> ips; InputPortSet ips;
for (InputPortMap::const_iterator i = _input_ports.begin (); i != _input_ports.end (); ++i) { for (InputPortMap::const_iterator i = _input_ports.begin (); i != _input_ports.end (); ++i) {
ips.insert (i->second); ips.insert (i->second);
} }
for (set<boost::shared_ptr<InputPort> >::const_iterator i = ips.begin (); i != ips.end (); ++i) { for (InputPortSet::const_iterator i = ips.begin (); i != ips.end (); ++i) {
boost::shared_ptr<InputPort> const& ip = *i; boost::shared_ptr<InputPort> const& ip = *i;
switch (ip->data_type ()) { switch (ip->data_type ()) {
case DataType::AUDIO: case DataType::AUDIO:
@ -708,14 +708,14 @@ RecorderUI::meter_area_layout ()
int row = 0; int row = 0;
int spc = 2; int spc = 2;
std::set <boost::shared_ptr<InputPort>, InputPortPtrSort> ips; InputPortSet ips;
for (InputPortMap::const_iterator i = _input_ports.begin (); i != _input_ports.end (); ++i) { for (InputPortMap::const_iterator i = _input_ports.begin (); i != _input_ports.end (); ++i) {
boost::shared_ptr<InputPort> const& ip = i->second; boost::shared_ptr<InputPort> const& ip = i->second;
ip->show (); ip->show ();
ips.insert (ip); ips.insert (ip);
} }
for (set<boost::shared_ptr<InputPort> >::const_iterator i = ips.begin (); i != ips.end (); ++i) { for (InputPortSet::const_iterator i = ips.begin (); i != ips.end (); ++i) {
boost::shared_ptr<InputPort> const& ip = *i; boost::shared_ptr<InputPort> const& ip = *i;
_meter_table.attach (*ip, col, col + 1, row, row + 1, SHRINK|FILL, SHRINK, spc, spc); _meter_table.attach (*ip, col, col + 1, row, row + 1, SHRINK|FILL, SHRINK, spc, spc);

1
gtk2_ardour/recorder_ui.h
View File

@ -244,6 +244,7 @@ private:
}; };
typedef std::map<std::string, boost::shared_ptr<InputPort> > InputPortMap; typedef std::map<std::string, boost::shared_ptr<InputPort> > InputPortMap;
typedef std::set<boost::shared_ptr<InputPort>, InputPortPtrSort> InputPortSet;
RecRuler _ruler; RecRuler _ruler;
Gtk::EventBox _space; Gtk::EventBox _space;