diff options
| author | nick_m <mainsbridge@gmail.com> | 2015-12-30 00:39:10 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-05-27 23:38:10 +1000 |
| commit | 885f1fd684da31a730f90ebad23ad9ff39baedb0 (patch) | |
| tree | c8d4564d40cd29948d802357b29595a5916b6689 /libs/ardour/ardour | |
| parent | 772683d2df7ba96d27943140fe59c8797fd7bed3 (diff) | |
Tempo ramps - update midi regions and locations when dragging tempo.
- also make locations and regions use a double beat rather than bbt for musical position.
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/location.h | 4 | ||||
| -rw-r--r-- | libs/ardour/ardour/region.h | 3 | ||||
| -rw-r--r-- | libs/ardour/ardour/session.h | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/ardour/location.h b/libs/ardour/ardour/location.h index 530f757c65..d31e9dccce 100644 --- a/libs/ardour/ardour/location.h +++ b/libs/ardour/ardour/location.h @@ -151,9 +151,9 @@ class LIBARDOUR_API Location : public SessionHandleRef, public PBD::StatefulDest private: std::string _name; framepos_t _start; - Timecode::BBT_Time _bbt_start; + double _bbt_start; framepos_t _end; - Timecode::BBT_Time _bbt_end; + double _bbt_end; Flags _flags; bool _locked; PositionLockStyle _position_lock_style; diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h index 6839340fee..383bc6675d 100644 --- a/libs/ardour/ardour/region.h +++ b/libs/ardour/ardour/region.h @@ -27,7 +27,6 @@ #include "pbd/undo.h" #include "pbd/signals.h" - #include "ardour/ardour.h" #include "ardour/data_type.h" #include "ardour/automatable.h" @@ -429,7 +428,7 @@ class LIBARDOUR_API Region framecnt_t _last_length; framepos_t _last_position; mutable RegionEditState _first_edit; - Timecode::BBT_Time _bbt_time; + double _beat; layer_t _layer; void register_properties (); diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 1a4ddeb562..8d6dabd331 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -1640,6 +1640,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop TempoMap *_tempo_map; void tempo_map_changed (const PBD::PropertyChange&); + void gui_tempo_map_changed (); /* edit/mix groups */ |