fix (or mostly fix) ctrl-drag (copy drag) for regions

[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 851a045f0d376bb68f21079bdb68415ba9b5e40f..7d0fcc1bf9d2d04b4a3c6a76b8045710ca0fed8f 100644 (file)
--- a/gtk2_ardour/editor_export_audio.cc
+++ b/gtk2_ardour/editor_export_audio.cc
@@ -19,6 +19,8 @@
 
 /* Note: public Editor methods are documented in public_editor.h */
 
+#define __STDC_FORMAT_MACROS 1
+#include <inttypes.h>
 #include <unistd.h>
 #include <climits>
 
@@ -44,6 +46,7 @@
 #include "ardour/session_directory.h"
 #include "ardour/source_factory.h"
 #include "ardour/audiofilesource.h"
+#include "ardour/session.h"
 
 #include "i18n.h"
 
@@ -56,7 +59,7 @@ void
 Editor::export_audio ()
 {
        ExportDialog dialog (*this);
-       dialog.set_session (session);
+       dialog.set_session (_session);
        dialog.run();
 }
 
@@ -64,7 +67,7 @@ void
 Editor::export_selection ()
 {
        ExportSelectionDialog dialog (*this);
-       dialog.set_session (session);
+       dialog.set_session (_session);
        dialog.run();
 }
 
@@ -83,7 +86,7 @@ Editor::export_range ()
 
        if (((l = find_location_from_marker (marker, is_start)) != 0) && (l->end() > l->start())) {
                ExportRangeDialog dialog (*this, l->id().to_s());
-               dialog.set_session (session);
+               dialog.set_session (_session);
                dialog.run();
        }
 }
@@ -104,7 +107,7 @@ Editor::export_region ()
                AudioTrack & track (dynamic_cast<AudioTrack &> (*rtv.route()));
 
                ExportRegionDialog dialog (*this, region, track);
-               dialog.set_session (session);
+               dialog.set_session (_session);
                dialog.run();
 
        } catch (std::bad_cast & e) {
@@ -170,7 +173,7 @@ Editor::write_region (string path, boost::shared_ptr<AudioRegion> region)
        vector<boost::shared_ptr<AudioFileSource> > sources;
        uint32_t nchans;
 
-       const string sound_directory = session->session_directory().sound_path().to_string();
+       const string sound_directory = _session->session_directory().sound_path().to_string();
 
        nchans = region->n_channels();
 
@@ -211,9 +214,9 @@ Editor::write_region (string path, boost::shared_ptr<AudioRegion> region)
 
                        try {
                                fs = boost::dynamic_pointer_cast<AudioFileSource> (
-                                               SourceFactory::createWritable (DataType::AUDIO, *session,
+                                               SourceFactory::createWritable (DataType::AUDIO, *_session,
                                                                path, true,
-                                                               false, session->frame_rate()));
+                                                               false, _session->frame_rate()));
                        }
 
                        catch (failed_constructor& err) {
@@ -320,7 +323,7 @@ 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();
+       const string sound_directory = _session->session_directory().sound_path().to_string();
 
        uint32_t channels = count.n_audio();
 
@@ -350,9 +353,9 @@ Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list
 
                try {
                        fs = boost::dynamic_pointer_cast<AudioFileSource> (
-                                       SourceFactory::createWritable (DataType::AUDIO, *session,
+                                       SourceFactory::createWritable (DataType::AUDIO, *_session,
                                                        path, true,
-                                                       false, session->frame_rate()));
+                                                       false, _session->frame_rate()));
                }
 
                catch (failed_constructor& err) {