diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2008-05-16 13:57:51 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-05-16 13:57:51 +0000 |
commit | cd44c8241c868b47c11ea8a669e5c37484fee25f (patch) | |
tree | 44fe6243c3e04fdfe983cb9a449bc4a09782888e /gtk2_ardour/editor_export_audio.cc | |
parent | 5f61efff8f4d80c9576fb8524f37cb8905ba51a8 (diff) |
add GotoWallClock command; switch Editor class to use nframes64_t throughout; fix up some glitches in playhead/screen handling when locating ; never save keybindings to user's ~/.ardour2 dir unless the user changed them (well, nearly)
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3361 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_export_audio.cc')
-rw-r--r-- | gtk2_ardour/editor_export_audio.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc index 8a749d45bc..8ee0ac1f90 100644 --- a/gtk2_ardour/editor_export_audio.cc +++ b/gtk2_ardour/editor_export_audio.cc @@ -73,7 +73,7 @@ Editor::export_selection () } void -Editor::export_range (nframes_t start, nframes_t end) +Editor::export_range (nframes64_t start, nframes64_t end) { if (session) { if (export_dialog == 0) { @@ -157,11 +157,11 @@ bool Editor::write_region (string path, boost::shared_ptr<AudioRegion> region) { boost::shared_ptr<AudioFileSource> fs; - const nframes_t chunk_size = 4096; - nframes_t to_read; + const nframes64_t chunk_size = 4096; + nframes64_t to_read; Sample buf[chunk_size]; gain_t gain_buffer[chunk_size]; - nframes_t pos; + nframes64_t pos; char s[PATH_MAX+1]; uint32_t cnt; vector<boost::shared_ptr<AudioFileSource> > sources; @@ -224,7 +224,7 @@ Editor::write_region (string path, boost::shared_ptr<AudioRegion> region) pos = region->position(); while (to_read) { - nframes_t this_time; + nframes64_t this_time; this_time = min (to_read, chunk_size); @@ -302,11 +302,11 @@ bool Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, list<AudioRange>& range) { boost::shared_ptr<AudioFileSource> fs; - const nframes_t chunk_size = 4096; - nframes_t nframes; + const nframes64_t chunk_size = 4096; + nframes64_t nframes; Sample buf[chunk_size]; gain_t gain_buffer[chunk_size]; - nframes_t pos; + nframes64_t pos; char s[PATH_MAX+1]; uint32_t cnt; string path; @@ -355,7 +355,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, list<Audi pos = (*i).start; while (nframes) { - nframes_t this_time; + nframes64_t this_time; this_time = min (nframes, chunk_size); @@ -387,7 +387,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, list<Audi while (nframes) { - nframes_t this_time = min (nframes, chunk_size); + nframes64_t this_time = min (nframes, chunk_size); memset (buf, 0, sizeof (Sample) * this_time); for (uint32_t n=0; n < channels; ++n) { |