diff options
| author | David Robillard <d@drobilla.net> | 2006-08-12 08:20:24 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-08-12 08:20:24 +0000 |
| commit | 30ab1fd61569f9d7fb7410d483fa68cbf9865c37 (patch) | |
| tree | 60cf9b5228a2728cda6608d517528066253d1a17 /libs/ardour/ardour/data_type.h | |
| parent | cbdf686e391bc2e7b93f37a5d3fa9197cb178078 (diff) | |
Towards MIDI:
- Converted vector<Sample*> to BufferList and numerous counts from int to ChanCount (and related changes)
- Added fancy type-generic iterators to BufferList, PortIterator (see IO::collect_input for a good example of the idea - the same code will work to read all input (of various types in a single IO, eg instruments) without modification no matter how many types we add)
- Fixed comparison operator bugs with ChanCount (screwed up metering among other things)
- Moved peak metering into it's own object, and moved most of the pan related code out of IO to panner (still a touch more to be done here for MIDI playback)
Not directly MIDI related fixes for problems in trunk:
- Fixed varispeed gain/pan automation to work properly (was reading the wrong range of automation data, probably causing nasty clicks?)
- Fixed crash on varispeed looping (possibly only a 64-bit problem). It still doesn't work, but at least it doesn't die
Quite a few things broken, and the new classes are pretty filthy still, but I think the direction is a lot better than all my previous plans...
git-svn-id: svn://localhost/ardour2/branches/midi@795 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/data_type.h')
| -rw-r--r-- | libs/ardour/ardour/data_type.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/ardour/ardour/data_type.h b/libs/ardour/ardour/data_type.h index cbb88afccf..2703372311 100644 --- a/libs/ardour/ardour/data_type.h +++ b/libs/ardour/ardour/data_type.h @@ -19,6 +19,7 @@ #ifndef __ardour_data_type_h__ #define __ardour_data_type_h__ +#include <cassert> #include <string> #include <ardour/data_type.h> #include <jack/jack.h> @@ -95,7 +96,7 @@ public: } Symbol to_symbol() const { return _symbol; } - inline size_t to_index() const { return symbol_index(_symbol); } + inline size_t to_index() const { assert(_symbol != NIL); return symbol_index(_symbol); } /** DataType iterator, for writing generic loops that iterate over all * available types. |