Added dialog to allow adding any Midi CC track.

[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..9b0a7c7cb590f2ff412f49a284fa304189b39b0b 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>
 
@@ -87,19 +90,20 @@ Editor::export_range (nframes_t start, nframes_t end)
        }
 }      
 
+/** 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 (r->first_frame(), r->last_frame());
        dialog->start_export();
 }
 
@@ -170,7 +174,9 @@ Editor::write_region (string path, boost::shared_ptr<AudioRegion> region)
        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 +192,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);
                                }
 
@@ -316,17 +322,19 @@ Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list
        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);
                        }