diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2010-09-17 18:20:37 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-09-17 18:20:37 +0000 |
commit | ede4ecbb00ecc866c502454c81e711baea780ccd (patch) | |
tree | d4a05e59cc96651ddf0eeab929f58fb7a7019fb0 /libs/ardour/export_handler.cc | |
parent | 10bdce85a0e7381d1b5db38e3640600c6fd3ec79 (diff) |
megaopus patch #2 for today: remove nframes64_t and sframes_t from source
git-svn-id: svn://localhost/ardour2/branches/3.0@7792 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/export_handler.cc')
-rw-r--r-- | libs/ardour/export_handler.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/ardour/export_handler.cc b/libs/ardour/export_handler.cc index 05fa1d881d..9ffb7c1778 100644 --- a/libs/ardour/export_handler.cc +++ b/libs/ardour/export_handler.cc @@ -195,8 +195,8 @@ ExportHandler::process_timespan (nframes_t frames) /* update position */ nframes_t frames_to_read = 0; - sframes_t const start = current_timespan->get_start(); - sframes_t const end = current_timespan->get_end(); + framepos_t const start = current_timespan->get_start(); + framepos_t const end = current_timespan->get_end(); bool const last_cycle = (process_position + frames >= end); @@ -308,7 +308,7 @@ ExportHandler::export_cd_marker_file (TimespanPtr timespan, FormatPtr file_forma /* Start actual marker stuff */ - sframes_t last_end_time = timespan->get_start(), last_start_time = timespan->get_start(); + framepos_t last_end_time = timespan->get_start(), last_start_time = timespan->get_start(); status.track_position = last_start_time - timespan->get_start(); for (i = temp.begin(); i != temp.end(); ++i) { @@ -535,9 +535,9 @@ ExportHandler::write_index_info_toc (CDMarkerStatus & status) } void -ExportHandler::frames_to_cd_frames_string (char* buf, sframes_t when) +ExportHandler::frames_to_cd_frames_string (char* buf, framepos_t when) { - sframes_t remainder; + framecnt_t remainder; nframes_t fr = session.nominal_frame_rate(); int mins, secs, frames; |