diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2007-04-11 13:07:51 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-04-11 13:07:51 +0000 |
commit | 45d3ec1437cf661533bc7750c623865def4424df (patch) | |
tree | 80cdeb58bc51a22042b91c50334bdd8ee37deed6 /libs/midi++2/midi++ | |
parent | 4bf712f501e21cbf1e555bf010553aaca55edd39 (diff) |
merged with 1697 revision of trunk (which is post-rc1 but pre-rc2
git-svn-id: svn://localhost/ardour2/branches/2.1-staging@1698 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/midi++2/midi++')
-rw-r--r-- | libs/midi++2/midi++/alsa_rawmidi.h | 1 | ||||
-rw-r--r-- | libs/midi++2/midi++/alsa_sequencer.h | 1 | ||||
-rw-r--r-- | libs/midi++2/midi++/channel.h | 1 | ||||
-rw-r--r-- | libs/midi++2/midi++/factory.h | 1 | ||||
-rw-r--r-- | libs/midi++2/midi++/fd_midiport.h | 1 | ||||
-rw-r--r-- | libs/midi++2/midi++/fifomidi.h | 1 | ||||
-rw-r--r-- | libs/midi++2/midi++/manager.h | 1 | ||||
-rw-r--r-- | libs/midi++2/midi++/mmc.h | 3 | ||||
-rw-r--r-- | libs/midi++2/midi++/nullmidi.h | 1 | ||||
-rw-r--r-- | libs/midi++2/midi++/parser.h | 5 | ||||
-rw-r--r-- | libs/midi++2/midi++/port.h | 1 | ||||
-rw-r--r-- | libs/midi++2/midi++/port_request.h | 1 |
12 files changed, 4 insertions, 14 deletions
diff --git a/libs/midi++2/midi++/alsa_rawmidi.h b/libs/midi++2/midi++/alsa_rawmidi.h index 655b673174..d2aa6f5181 100644 --- a/libs/midi++2/midi++/alsa_rawmidi.h +++ b/libs/midi++2/midi++/alsa_rawmidi.h @@ -14,7 +14,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #ifndef __alsa_rawmidi_h__ diff --git a/libs/midi++2/midi++/alsa_sequencer.h b/libs/midi++2/midi++/alsa_sequencer.h index b76d60d05a..5ca70529c5 100644 --- a/libs/midi++2/midi++/alsa_sequencer.h +++ b/libs/midi++2/midi++/alsa_sequencer.h @@ -14,7 +14,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #ifndef __alsa_sequencer_midiport_h__ diff --git a/libs/midi++2/midi++/channel.h b/libs/midi++2/midi++/channel.h index f8dbb6e194..45da7db9f2 100644 --- a/libs/midi++2/midi++/channel.h +++ b/libs/midi++2/midi++/channel.h @@ -15,7 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #ifndef __midichannel_h__ diff --git a/libs/midi++2/midi++/factory.h b/libs/midi++2/midi++/factory.h index b532e6d5e6..f2963624fe 100644 --- a/libs/midi++2/midi++/factory.h +++ b/libs/midi++2/midi++/factory.h @@ -14,7 +14,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #ifndef __midi_factory_h__ diff --git a/libs/midi++2/midi++/fd_midiport.h b/libs/midi++2/midi++/fd_midiport.h index 6a9b8f74d1..d7fae400a0 100644 --- a/libs/midi++2/midi++/fd_midiport.h +++ b/libs/midi++2/midi++/fd_midiport.h @@ -15,7 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #ifndef __fd_midiport_h__ diff --git a/libs/midi++2/midi++/fifomidi.h b/libs/midi++2/midi++/fifomidi.h index 200d90eda8..57d1502c45 100644 --- a/libs/midi++2/midi++/fifomidi.h +++ b/libs/midi++2/midi++/fifomidi.h @@ -14,7 +14,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #ifndef __fifomidi_h__ diff --git a/libs/midi++2/midi++/manager.h b/libs/midi++2/midi++/manager.h index 1bf8dc7cbd..40140cfde2 100644 --- a/libs/midi++2/midi++/manager.h +++ b/libs/midi++2/midi++/manager.h @@ -15,7 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #ifndef __midi_manager_h__ diff --git a/libs/midi++2/midi++/mmc.h b/libs/midi++2/midi++/mmc.h index 2d569f122c..bc23beb0a1 100644 --- a/libs/midi++2/midi++/mmc.h +++ b/libs/midi++2/midi++/mmc.h @@ -15,7 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #ifndef __midipp_mmc_h_h__ @@ -93,6 +92,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/midi++/nullmidi.h b/libs/midi++2/midi++/nullmidi.h index a74e5e3d9b..13591db4e6 100644 --- a/libs/midi++2/midi++/nullmidi.h +++ b/libs/midi++2/midi++/nullmidi.h @@ -14,7 +14,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #ifndef __nullmidi_h__ diff --git a/libs/midi++2/midi++/parser.h b/libs/midi++2/midi++/parser.h index 36d19f3da9..73c7c75f61 100644 --- a/libs/midi++2/midi++/parser.h +++ b/libs/midi++2/midi++/parser.h @@ -15,7 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #ifndef __midi_parse_h__ @@ -162,8 +161,8 @@ class Parser : public sigc::trackable { bool _mmc_forward; bool _mtc_forward; int expected_mtc_quarter_frame_code; - byte _mtc_time[4]; - byte _qtr_mtc_time[4]; + byte _mtc_time[5]; + byte _qtr_mtc_time[5]; unsigned long consecutive_qtr_frame_cnt; MTC_FPS _mtc_fps; MTC_Status _mtc_running; diff --git a/libs/midi++2/midi++/port.h b/libs/midi++2/midi++/port.h index 4a5319b120..123ac9e3d8 100644 --- a/libs/midi++2/midi++/port.h +++ b/libs/midi++2/midi++/port.h @@ -14,7 +14,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #ifndef __libmidi_port_h__ diff --git a/libs/midi++2/midi++/port_request.h b/libs/midi++2/midi++/port_request.h index 86838dd04d..0cb4ffded6 100644 --- a/libs/midi++2/midi++/port_request.h +++ b/libs/midi++2/midi++/port_request.h @@ -15,7 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #ifndef __midi_port_request_h__ |