ardour/livetrax
13
0
Fork 0
Code

MCP: build fix

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@11821 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-04-07 18:54:31 +00:00
parent a202b08f65
commit d1d164092b
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/surfaces/mackie/controls.h
View File

@ -163,7 +163,7 @@ public:
type_pot = 0xb0
};
Control (int id, int ordinal, std::string name, Group & group);
Control (int id, int ordinal, std::string name, Group& group);
virtual ~Control() {}
virtual const Led & led() const { throw MackieControlException ("no led available"); }
@ -212,7 +212,7 @@ private:
int _id;
int _ordinal;
std::string _name;
Group & _group;
Group& _group;
bool _in_use;
};

5
libs/surfaces/mackie/mackie_port.cc
View File

@ -140,17 +140,18 @@ MidiByteArray calculate_challenge_response (MidiByteArray::iterator begin, MidiB
// not used right now
MidiByteArray MackiePort::host_connection_query (MidiByteArray & bytes)
{
MidiByteArray response;
// handle host connection query
DEBUG_TRACE (DEBUG::MackieControl, string_compose ("host connection query: %1\n", bytes));
if (bytes.size() != 18) {
finalise_init (false);
cerr << "expecting 18 bytes, read " << bytes << " from " << input_port().name() << endl;
return;
return response;
}
// build and send host connection reply
MidiByteArray response;
response << 0x02;
copy (bytes.begin() + 6, bytes.begin() + 6 + 7, back_inserter (response));
response << calculate_challenge_response (bytes.begin() + 6 + 7, bytes.begin() + 6 + 7 + 4);