diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2007-02-20 21:26:20 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-02-20 21:26:20 +0000 |
commit | 326cd24c12d8b11402ef0c10507ecbdea8f86d7f (patch) | |
tree | 315d307f6f14439651b75be5206437970ad50c0f /libs/midi++2 | |
parent | 780e9d7ecb224a4f95de06d4af2d3795565bcec0 (diff) |
make MMC work again, make tracing MIDI input work again, add GUI control for MMC device ID ++
git-svn-id: svn://localhost/ardour2/trunk@1480 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/midi++2')
-rw-r--r-- | libs/midi++2/midi++/mmc.h | 2 | ||||
-rw-r--r-- | libs/midi++2/midiparser.cc | 6 | ||||
-rw-r--r-- | libs/midi++2/mmc.cc | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libs/midi++2/midi++/mmc.h b/libs/midi++2/midi++/mmc.h index 2d569f122c..23e07f5151 100644 --- a/libs/midi++2/midi++/mmc.h +++ b/libs/midi++2/midi++/mmc.h @@ -93,6 +93,8 @@ class MachineControl : public sigc::trackable Port &port() { return _port; } void set_device_id (byte id); + byte device_id () const { return _device_id; } + static bool is_mmc (byte *sysex_buf, size_t len); /* Signals to connect to if you want to run "callbacks" diff --git a/libs/midi++2/midiparser.cc b/libs/midi++2/midiparser.cc index 424bfa04f8..782c3a8239 100644 --- a/libs/midi++2/midiparser.cc +++ b/libs/midi++2/midiparser.cc @@ -25,6 +25,7 @@ #include <unistd.h> #include <string> #include <iostream> +#include <iterator> #include <midi++/types.h> #include <midi++/parser.h> @@ -138,7 +139,6 @@ Parser::~Parser () void Parser::trace_event (Parser &p, byte *msg, size_t len) - { eventType type; ostream *o; @@ -309,15 +309,13 @@ Parser::trace_event (Parser &p, byte *msg, size_t len) void Parser::trace (bool onoff, ostream *o, const string &prefix) - { trace_connection.disconnect (); if (onoff) { trace_stream = o; trace_prefix = prefix; - trace_connection = any.connect - (mem_fun (*this, &Parser::trace_event)); + trace_connection = any.connect (mem_fun (*this, &Parser::trace_event)); } else { trace_prefix = ""; trace_stream = 0; diff --git a/libs/midi++2/mmc.cc b/libs/midi++2/mmc.cc index 61c47e856f..28d6393fb4 100644 --- a/libs/midi++2/mmc.cc +++ b/libs/midi++2/mmc.cc @@ -202,7 +202,7 @@ MachineControl::MachineControl (Port &p, float version, build_mmc_cmd_map (); - _device_id = 1; + _device_id = 0; if ((parser = _port.input()) != 0) { parser->mmc.connect @@ -258,7 +258,7 @@ MachineControl::process_mmc_message (Parser &p, byte *msg, size_t len) */ #if 0 - cerr << "*** MMC message: len = " << len << "\n\t"; + cerr << "*** me = " << (int) _device_id << " MMC message: len = " << len << "\n\t"; for (size_t i = 0; i < len; i++) { cerr << hex << (int) msg[i] << dec << ' '; } |