summaryrefslogtreecommitdiff
path: root/libs/midi++2/midi++/parser.h
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2010-12-03 22:26:29 +0000
committerCarl Hetherington <carl@carlh.net>2010-12-03 22:26:29 +0000
commit73192bc1a7ea55fa1864dc3826845b15c00dd2ec (patch)
treec0039f3f5a848aed6e880abf11519dad855fa899 /libs/midi++2/midi++/parser.h
parent74b4a3c77b08dc1e58274875604eb73e8492fa93 (diff)
Remove all use of nframes_t.
git-svn-id: svn://localhost/ardour2/branches/3.0@8166 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/midi++2/midi++/parser.h')
-rw-r--r--libs/midi++2/midi++/parser.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/libs/midi++2/midi++/parser.h b/libs/midi++2/midi++/parser.h
index 43cf80c067..e57323e72d 100644
--- a/libs/midi++2/midi++/parser.h
+++ b/libs/midi++2/midi++/parser.h
@@ -33,7 +33,7 @@ class Port;
class Parser;
typedef PBD::Signal1<void,Parser&> ZeroByteSignal;
-typedef PBD::Signal2<void,Parser&,nframes_t> TimestampedSignal;
+typedef PBD::Signal2<void,Parser&,framecnt_t> TimestampedSignal;
typedef PBD::Signal2<void,Parser&, byte> OneByteSignal;
typedef PBD::Signal2<void,Parser &, EventTwoBytes *> TwoByteSignal;
typedef PBD::Signal2<void,Parser &, pitchbend_t> PitchBendSignal;
@@ -49,8 +49,8 @@ class Parser {
therefore be set before every byte passed into ::scanner().
*/
- nframes_t get_timestamp() const { return _timestamp; }
- void set_timestamp (const nframes_t timestamp) { _timestamp = timestamp; }
+ framecnt_t get_timestamp() const { return _timestamp; }
+ void set_timestamp (const framecnt_t timestamp) { _timestamp = timestamp; }
/* signals that anyone can connect to */
@@ -124,10 +124,10 @@ class Parser {
const byte *mtc_current() const { return _mtc_time; }
bool mtc_locked() const { return _mtc_locked; }
- PBD::Signal3<void,Parser&,int,nframes_t> mtc_qtr;
- PBD::Signal3<void,const byte*,bool,nframes_t> mtc_time;
- PBD::Signal1<void,MTC_Status> mtc_status;
- PBD::Signal0<bool> mtc_skipped;
+ PBD::Signal3<void, Parser &, int, framecnt_t> mtc_qtr;
+ PBD::Signal3<void, const byte *, bool, framecnt_t> mtc_time;
+ PBD::Signal1<void, MTC_Status> mtc_status;
+ PBD::Signal0<bool> mtc_skipped;
void set_mtc_forwarding (bool yn) {
_mtc_forward = yn;
@@ -172,7 +172,7 @@ class Parser {
bool _mtc_locked;
byte last_qtr_frame;
- nframes_t _timestamp;
+ framecnt_t _timestamp;
ParseState pre_variable_state;
MIDI::eventType pre_variable_msgtype;