diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-11-04 20:37:46 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-11-04 20:37:46 +0000 |
| commit | 1cb36f5a81d806132b366aeabd5c6da2bbbcf7e0 (patch) | |
| tree | 5625c5423ff451e07678606228d29956678444ba /libs/ardour | |
| parent | 844b7d0f684eaf01a8d553f935027f496a09c3ad (diff) | |
Add column headings and length field to export timespan selector. Fixes #3518.
git-svn-id: svn://localhost/ardour2/branches/3.0@7968 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/ardour/bbt_time.h | 12 | ||||
| -rw-r--r-- | libs/ardour/ardour/session.h | 2 | ||||
| -rw-r--r-- | libs/ardour/session_time.cc | 2 |
3 files changed, 14 insertions, 2 deletions
diff --git a/libs/ardour/ardour/bbt_time.h b/libs/ardour/ardour/bbt_time.h index 76e91d5752..2157e794a2 100644 --- a/libs/ardour/ardour/bbt_time.h +++ b/libs/ardour/ardour/bbt_time.h @@ -22,6 +22,7 @@ #include <ostream> #include <stdint.h> +#include <iomanip> namespace ARDOUR { @@ -59,4 +60,15 @@ operator<< (std::ostream& o, const ARDOUR::BBT_Time& bbt) return o; } +inline std::ostream& +print_padded (std::ostream& o, const ARDOUR::BBT_Time& bbt) +{ + o << std::setfill ('0') << std::right + << std::setw (3) << bbt.bars << "|" + << std::setw (2) << bbt.beats << "|" + << std::setw (4) << bbt.ticks; + + return o; +} + #endif /* __ardour_bbt_time_h__ */ diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 82b5d1360d..7c7ff820e9 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -453,7 +453,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi void timecode_time (nframes_t when, Timecode::Time&); void timecode_time_subframes (nframes_t when, Timecode::Time&); - void timecode_duration (nframes_t, Timecode::Time&) const; + void timecode_duration (framecnt_t, Timecode::Time&) const; void timecode_duration_string (char *, framecnt_t) const; void set_timecode_offset (nframes_t); diff --git a/libs/ardour/session_time.cc b/libs/ardour/session_time.cc index f7511b398d..b39c9399b3 100644 --- a/libs/ardour/session_time.cc +++ b/libs/ardour/session_time.cc @@ -424,7 +424,7 @@ Session::timecode_time_subframes (nframes_t when, Timecode::Time& timecode) } void -Session::timecode_duration (nframes_t when, Timecode::Time& timecode) const +Session::timecode_duration (framecnt_t when, Timecode::Time& timecode) const { sample_to_timecode( when, timecode, false /* use_offset */, true /* use_subframes */ ); } |