diff options
| author | Sakari Bergen <sakari.bergen@beatwaves.net> | 2008-09-28 11:11:38 +0000 |
|---|---|---|
| committer | Sakari Bergen <sakari.bergen@beatwaves.net> | 2008-09-28 11:11:38 +0000 |
| commit | 6b50ba341da426805ce3c92609c0fa12c52b67ac (patch) | |
| tree | 4ed20d3699613da5a952b09b7e9ef47ceb6b8610 /libs/ardour/export_timespan.cc | |
| parent | 909995338c970e9f8f7a51886502640527f2061e (diff) | |
* Improved export error handling, streamlined ExportFailed
* Cleaned out export related visibility in Session, and simpified Session <--> export component communication in general
* Removed export_status.h header dependency from session.h
* Added check for libsndfile FLAC and Ogg Vorbis compatibility
* Added ExportFileFactory, leading in cleaner code in ExportProcessor, and better extensibility for possible future non-libsndfile formats
git-svn-id: svn://localhost/ardour2/branches/3.0@3818 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/export_timespan.cc')
| -rw-r--r-- | libs/ardour/export_timespan.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/ardour/export_timespan.cc b/libs/ardour/export_timespan.cc index 14273d835f..d6996a5a48 100644 --- a/libs/ardour/export_timespan.cc +++ b/libs/ardour/export_timespan.cc @@ -28,7 +28,7 @@ namespace ARDOUR { -ExportTimespan::ExportTimespan (ExportStatus & status, nframes_t frame_rate) : +ExportTimespan::ExportTimespan (ExportStatusPtr status, nframes_t frame_rate) : status (status), start_frame (0), end_frame (0), @@ -62,7 +62,7 @@ ExportTimespan::get_data (float * data, nframes_t frames, ExportChannel const & { TempFileMap::iterator it = filemap.find (channel); if (it == filemap.end()) { - throw ExportFailed (_("Export failed due to programming error"), _("Trying to get data from ExportTimespan for channel that was never registered!")); + throw ExportFailed (X_("Trying to get data from ExportTimespan for channel that was never registered!")); } return it->second->read (data, frames); @@ -79,7 +79,7 @@ ExportTimespan::set_range (nframes_t start, nframes_t end) int ExportTimespan::process (nframes_t frames) { - status.stage = export_ReadTimespan; + status->stage = export_ReadTimespan; /* update position */ @@ -89,11 +89,11 @@ ExportTimespan::process (nframes_t frames) frames_to_read = frames; } else { frames_to_read = end_frame - position; - status.stop = true; + status->stop = true; } position += frames_to_read; - status.progress = (float) (position - start_frame) / (end_frame - start_frame); + status->progress = (float) (position - start_frame) / (end_frame - start_frame); /* Read channels from ports and save to tempfiles */ |