Add browse button to recent session dialogue. Fixes #3357.

[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 c8d27037a33259ca9a190bc6808b271f4e614c90..6aa43c8bcf5975267798d7ea68b517badcd8fdc9 100644 (file)
--- a/gtk2_ardour/editor_export_audio.cc
+++ b/gtk2_ardour/editor_export_audio.cc
@@ -58,8 +58,8 @@ using namespace Gtk;
 void
 Editor::export_audio ()
 {
-       ExportDialog dialog (*this);
-       dialog.set_session (session);
+       ExportDialog dialog (*this, _("Export"));
+       dialog.set_session (_session);
        dialog.run();
 }
 
@@ -67,7 +67,7 @@ void
 Editor::export_selection ()
 {
        ExportSelectionDialog dialog (*this);
-       dialog.set_session (session);
+       dialog.set_session (_session);
        dialog.run();
 }
 
@@ -86,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();
        }
 }
@@ -107,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) {
@@ -146,10 +146,6 @@ Editor::bounce_region_selection ()
 
                InterThreadInfo itt;
 
-               itt.done = false;
-               itt.cancel = false;
-               itt.progress = 0.0f;
-
                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()
@@ -173,7 +169,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();
 
@@ -214,9 +210,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) {
@@ -297,9 +293,9 @@ Editor::write_audio_selection (TimeSelection& ts)
 
                if (atv->is_audio_track()) {
 
-                       boost::shared_ptr<AudioPlaylist> playlist = boost::dynamic_pointer_cast<AudioPlaylist>(atv->get_diskstream()->playlist());
+                       boost::shared_ptr<AudioPlaylist> playlist = boost::dynamic_pointer_cast<AudioPlaylist>(atv->track()->playlist());
 
-                       if (playlist && write_audio_range (*playlist, atv->get_diskstream()->n_channels(), ts) == 0) {
+                       if (playlist && write_audio_range (*playlist, atv->track()->n_channels(), ts) == 0) {
                                ret = -1;
                                break;
                        }
@@ -323,7 +319,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();
 
@@ -353,9 +349,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) {