diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-09-17 16:24:22 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-09-17 16:24:22 +0000 |
| commit | 10bdce85a0e7381d1b5db38e3640600c6fd3ec79 (patch) | |
| tree | 5e6fd6a2e69e972ada31018cbe6761e5ec5c77a7 /libs/ardour/ardour/types.h | |
| parent | e84c3fe5552bc5cf2ed23812c41e7e3b19fbdb84 (diff) | |
megaopus commit: (1) add __STD_(LIMIT|FORMAT)_MACROS to command line flags for cc and c++ builds, remove them from source (2) add new Property::midi_data used by MidiRegion to signal that its (MIDI) contents have changed (3) massive switch from nframes_t to framepos_t/framecnt_t including removal of ARDOUR::max_frames (replaced by ARDOUR::max_frame{pos,cnt} (lots more to do but this set was driven by changes to the Diskstream API to use framepos_t
git-svn-id: svn://localhost/ardour2/branches/3.0@7791 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/types.h')
| -rw-r--r-- | libs/ardour/ardour/types.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h index 435cf8d416..f91b67bb5a 100644 --- a/libs/ardour/ardour/types.h +++ b/libs/ardour/ardour/types.h @@ -20,14 +20,11 @@ #ifndef __ardour_types_h__ #define __ardour_types_h__ -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS /* PRI<foo>; C++ requires explicit requesting of these */ -#endif - #include <istream> #include <vector> #include <boost/shared_ptr.hpp> #include <sys/types.h> +#include <stdint.h> #include <inttypes.h> #include <jack/types.h> @@ -58,12 +55,6 @@ namespace ARDOUR { typedef uint32_t nframes_t; typedef int64_t nframes64_t; - - /** "Session frames", frames relative to the session timeline. - * Everything related to transport position etc. should be of this type. - * We might want to make this a compile time option for 32-bitters who - * don't want to pay for extremely long session times they don't need... - */ typedef int64_t sframes_t; typedef int64_t framepos_t; /* any offset from a framepos_t, measured in audio frames */ @@ -71,6 +62,9 @@ namespace ARDOUR { /* any count of audio frames */ typedef int64_t framecnt_t; + static const framepos_t max_framepos = INT64_MAX; + static const framecnt_t max_framecnt = INT64_MAX; + struct IOChange { enum Type { |