allow track selection to be toggled (ctrl-clicked); potential fixes for tape display...

[ardour.git] / gtk2_ardour / editor_export_audio.cc

diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc
index 6eeff78d849e965be3222044f7ec79ddc9670579..fd40b9cae0f9af319b7bbcc23283c4167480b543 100644 (file)
--- a/gtk2_ardour/editor_export_audio.cc
+++ b/gtk2_ardour/editor_export_audio.cc
@@ -41,6 +41,8 @@
 #include <ardour/audio_diskstream.h>
 #include <ardour/audioregion.h>
 #include <ardour/audioplaylist.h>
+#include <ardour/source_factory.h>
+#include <ardour/audiofilesource.h>
 
 #include "i18n.h"
 
@@ -53,7 +55,7 @@ void
 Editor::export_session()
 {
        if (session) {
-               export_range (0, session->current_end_frame());
+               export_range (session->current_start_frame(), session->current_end_frame());
        }
 }
 
@@ -72,7 +74,7 @@ Editor::export_selection ()
 }
 
 void
-Editor::export_range (jack_nframes_t start, jack_nframes_t end)
+Editor::export_range (nframes_t start, nframes_t end)
 {
        if (session) {
                if (export_dialog == 0) {
@@ -157,22 +159,22 @@ Editor::bounce_region_selection ()
 bool
 Editor::write_region (string path, boost::shared_ptr<AudioRegion> region)
 {
-       AudioFileSource* fs;
-       const jack_nframes_t chunk_size = 4096;
-       jack_nframes_t to_read;
+       boost::shared_ptr<AudioFileSource> fs;
+       const nframes_t chunk_size = 4096;
+       nframes_t to_read;
        Sample buf[chunk_size];
        gain_t gain_buffer[chunk_size];
-       jack_nframes_t pos;
+       nframes_t pos;
        char s[PATH_MAX+1];
        uint32_t cnt;
-       vector<AudioFileSource *> sources;
+       vector<boost::shared_ptr<AudioFileSource> > sources;
        uint32_t nchans;
        
        nchans = region->n_channels();
        
        /* don't do duplicate of the entire source if that's what is going on here */
 
-       if (region->start() == 0 && region->length() == region->source().length()) {
+       if (region->start() == 0 && region->length() == region->source()->length()) {
                /* XXX should link(2) to create a new inode with "path" */
                return true;
        }
@@ -206,7 +208,7 @@ Editor::write_region (string path, boost::shared_ptr<AudioRegion> region)
                
                        
                        try {
-                               fs = AudioFileSource::create (path);
+                               fs = boost::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createReadable (*session, path, AudioFileSource::Flag (0)));
                        }
                        
                        catch (failed_constructor& err) {
@@ -225,11 +227,11 @@ Editor::write_region (string path, boost::shared_ptr<AudioRegion> region)
        pos = region->position();
 
        while (to_read) {
-               jack_nframes_t this_time;
+               nframes_t this_time;
 
                this_time = min (to_read, chunk_size);
 
-               for (vector<AudioFileSource *>::iterator src=sources.begin(); src != sources.end(); ++src) {
+               for (vector<boost::shared_ptr<AudioFileSource> >::iterator src=sources.begin(); src != sources.end(); ++src) {
                        
                        fs = (*src);
 
@@ -252,7 +254,7 @@ Editor::write_region (string path, boost::shared_ptr<AudioRegion> region)
        time (&tnow);
        now = localtime (&tnow);
        
-       for (vector<AudioFileSource *>::iterator src = sources.begin(); src != sources.end(); ++src) {
+       for (vector<boost::shared_ptr<AudioFileSource> >::iterator src = sources.begin(); src != sources.end(); ++src) {
                (*src)->update_header (0, *now, tnow);
        }
 
@@ -260,10 +262,8 @@ Editor::write_region (string path, boost::shared_ptr<AudioRegion> region)
 
 error_out:
 
-       for (vector<AudioFileSource*>::iterator i = sources.begin(); i != sources.end(); ++i) {
-               
+       for (vector<boost::shared_ptr<AudioFileSource> >::iterator i = sources.begin(); i != sources.end(); ++i) {
                (*i)->mark_for_remove ();
-               delete (*i);
        }
 
        return 0;
@@ -303,16 +303,16 @@ Editor::write_audio_selection (TimeSelection& ts)
 bool
 Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, list<AudioRange>& range)
 {
-       AudioFileSource* fs;
-       const jack_nframes_t chunk_size = 4096;
-       jack_nframes_t nframes;
+       boost::shared_ptr<AudioFileSource> fs;
+       const nframes_t chunk_size = 4096;
+       nframes_t nframes;
        Sample buf[chunk_size];
        gain_t gain_buffer[chunk_size];
-       jack_nframes_t pos;
+       nframes_t pos;
        char s[PATH_MAX+1];
        uint32_t cnt;
        string path;
-       vector<AudioFileSource *> sources;
+       vector<boost::shared_ptr<AudioFileSource> > sources;
 
        for (uint32_t n=0; n < channels; ++n) {
                
@@ -339,7 +339,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, list<Audi
                path = s;
                
                try {
-                       fs = AudioFileSource::create (path);
+                       fs = boost::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createReadable (*session, path, AudioFileSource::Flag (0)));
                }
                
                catch (failed_constructor& err) {
@@ -357,7 +357,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, list<Audi
                pos = (*i).start;
                
                while (nframes) {
-                       jack_nframes_t this_time;
+                       nframes_t this_time;
                        
                        this_time = min (nframes, chunk_size);
 
@@ -389,7 +389,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, list<Audi
 
                        while (nframes) {
 
-                               jack_nframes_t this_time = min (nframes, chunk_size);
+                               nframes_t this_time = min (nframes, chunk_size);
                                memset (buf, 0, sizeof (Sample) * this_time);
 
                                for (uint32_t n=0; n < channels; ++n) {
@@ -422,9 +422,8 @@ Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, list<Audi
 error_out:
        /* unref created files */
 
-       for (vector<AudioFileSource*>::iterator i = sources.begin(); i != sources.end(); ++i) {
+       for (vector<boost::shared_ptr<AudioFileSource> >::iterator i = sources.begin(); i != sources.end(); ++i) {
                (*i)->mark_for_remove ();
-               delete *i;
        }
 
        return false;