make link (rubberband) work

[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 75f355f668ce5b2bbb7d4d23ecb1bd04ce06b4ea..c1d0c568331d8e0a08c27a9df00adac0e1674edb 100644 (file)
--- a/gtk2_ardour/editor_export_audio.cc
+++ b/gtk2_ardour/editor_export_audio.cc
@@ -17,6 +17,8 @@
 
 */
 
+/* Note: public Editor methods are documented in public_editor.h */
+
 #include <unistd.h>
 #include <climits>
 
@@ -41,6 +43,7 @@
 #include <ardour/audioregion.h>
 #include <ardour/audioplaylist.h>
 #include <ardour/chan_count.h>
+#include <ardour/session_directory.h>
 #include <ardour/source_factory.h>
 #include <ardour/audiofilesource.h>
 
@@ -74,32 +77,33 @@ 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) {
                        export_dialog = new ExportSessionDialog (*this);
+                       export_dialog->connect_to_session (session);
                }
                
-               export_dialog->connect_to_session (session);
                export_dialog->set_range (start, end);
                export_dialog->start_export();
        }
 }      
 
+/** Export the first selected region */
 void
 Editor::export_region ()
 {
-       if (clicked_regionview == 0) {
+       if (selection->regions.empty()) {
                return;
        }
 
-       ExportDialog* dialog = new ExportRegionDialog (*this, clicked_regionview->region());
+       boost::shared_ptr<Region> r = selection->regions.front()->region();
+       
+       ExportDialog* dialog = new ExportRegionDialog (*this, r);
                
        dialog->connect_to_session (session);
-       dialog->set_range (
-               clicked_regionview->region()->first_frame(), 
-               clicked_regionview->region()->last_frame());
+       dialog->set_range (clicked_regionview->region()->first_frame(), clicked_regionview->region()->last_frame());
        dialog->start_export();
 }
 
@@ -117,9 +121,9 @@ Editor::export_range_markers ()
 
                if (export_range_markers_dialog == 0) {
                        export_range_markers_dialog = new ExportRangeMarkersDialog(*this);
+                       export_range_markers_dialog->connect_to_session (session);
                }
-               
-               export_range_markers_dialog->connect_to_session (session);
+
                export_range_markers_dialog->start_export();
        }
 }      
@@ -153,7 +157,12 @@ Editor::bounce_region_selection ()
                itt.cancel = false;
                itt.progress = 0.0f;
 
-               track->bounce_range (region->position(), region->position() + region->length(), itt);
+               boost::shared_ptr<Region> r = track->bounce_range (region->position(), region->position() + region->length(), itt);
+               cerr << "Result of bounce of "
+                    << region->name() << " len = " << region->length()
+                    << " was "
+                    << r->name() << " len = " << r->length()
+                    << endl;
        }
 }
 
@@ -161,16 +170,18 @@ 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;
        uint32_t nchans;
-       
+
+       const string sound_directory = session->session_directory().sound_path().to_string();
+
        nchans = region->n_channels();
        
        /* don't do duplicate of the entire source if that's what is going on here */
@@ -186,11 +197,11 @@ Editor::write_region (string path, boost::shared_ptr<AudioRegion> region)
                        
                        for (cnt = 0; cnt < 999999; ++cnt) {
                                if (nchans == 1) {
-                                       snprintf (s, sizeof(s), "%s/%s_%" PRIu32 ".wav", session->sound_dir().c_str(),
+                                       snprintf (s, sizeof(s), "%s/%s_%" PRIu32 ".wav", sound_directory.c_str(),
                                                  legalize_for_path(region->name()).c_str(), cnt);
                                }
                                else {
-                                       snprintf (s, sizeof(s), "%s/%s_%" PRIu32 "-%" PRId32 ".wav", session->sound_dir().c_str(),
+                                       snprintf (s, sizeof(s), "%s/%s_%" PRIu32 "-%" PRId32 ".wav", sound_directory.c_str(),
                                                  legalize_for_path(region->name()).c_str(), cnt, n);
                                }
 
@@ -228,7 +239,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);
 
@@ -306,27 +317,29 @@ bool
 Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, 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;
        vector<boost::shared_ptr<AudioFileSource> > sources;
 
+       const string sound_directory = session->session_directory().sound_path().to_string();
+
        uint32_t channels = count.n_audio();
 
        for (uint32_t n=0; n < channels; ++n) {
                
                for (cnt = 0; cnt < 999999; ++cnt) {
                        if (channels == 1) {
-                               snprintf (s, sizeof(s), "%s/%s_%" PRIu32 ".wav", session->sound_dir().c_str(),
+                               snprintf (s, sizeof(s), "%s/%s_%" PRIu32 ".wav", sound_directory.c_str(),
                                          legalize_for_path(playlist.name()).c_str(), cnt);
                        }
                        else {
-                               snprintf (s, sizeof(s), "%s/%s_%" PRIu32 "-%" PRId32 ".wav", session->sound_dir().c_str(),
+                               snprintf (s, sizeof(s), "%s/%s_%" PRIu32 "-%" PRId32 ".wav", sound_directory.c_str(),
                                          legalize_for_path(playlist.name()).c_str(), cnt, n);
                        }
                        
@@ -361,7 +374,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list
                pos = (*i).start;
                
                while (nframes) {
-                       nframes_t this_time;
+                       nframes64_t this_time;
                        
                        this_time = min (nframes, chunk_size);
 
@@ -393,7 +406,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list
 
                        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) {