add configurable colors to stereo panner, plus keybindings for zero width (0), 1...

[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 7d0fcc1bf9d2d04b4a3c6a76b8045710ca0fed8f..59109c508eac545a8575614386b45c418a982b33 100644 (file)
--- a/gtk2_ardour/editor_export_audio.cc
+++ b/gtk2_ardour/editor_export_audio.cc
@@ -19,7 +19,6 @@
 
 /* Note: public Editor methods are documented in public_editor.h */
 
-#define __STDC_FORMAT_MACROS 1
 #include <inttypes.h>
 #include <unistd.h>
 #include <climits>
@@ -58,7 +57,7 @@ using namespace Gtk;
 void
 Editor::export_audio ()
 {
-       ExportDialog dialog (*this);
+       ExportDialog dialog (*this, _("Export"));
        dialog.set_session (_session);
        dialog.run();
 }
@@ -146,10 +145,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()
@@ -163,11 +158,11 @@ bool
 Editor::write_region (string path, boost::shared_ptr<AudioRegion> region)
 {
        boost::shared_ptr<AudioFileSource> fs;
-       const nframes64_t chunk_size = 4096;
-       nframes64_t to_read;
+       const framepos_t chunk_size = 4096;
+       framepos_t to_read;
        Sample buf[chunk_size];
        gain_t gain_buffer[chunk_size];
-       nframes64_t pos;
+       framepos_t pos;
        char s[PATH_MAX+1];
        uint32_t cnt;
        vector<boost::shared_ptr<AudioFileSource> > sources;
@@ -214,9 +209,9 @@ Editor::write_region (string path, boost::shared_ptr<AudioRegion> region)
 
                        try {
                                fs = boost::dynamic_pointer_cast<AudioFileSource> (
-                                               SourceFactory::createWritable (DataType::AUDIO, *_session,
-                                                               path, true,
-                                                               false, _session->frame_rate()));
+                                       SourceFactory::createWritable (DataType::AUDIO, *_session,
+                                                                      path, string(), true,
+                                                                      false, _session->frame_rate()));
                        }
 
                        catch (failed_constructor& err) {
@@ -235,7 +230,7 @@ Editor::write_region (string path, boost::shared_ptr<AudioRegion> region)
        pos = region->position();
 
        while (to_read) {
-               nframes64_t this_time;
+               framepos_t this_time;
 
                this_time = min (to_read, chunk_size);
 
@@ -297,9 +292,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;
                        }
@@ -313,11 +308,11 @@ bool
 Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list<AudioRange>& range)
 {
        boost::shared_ptr<AudioFileSource> fs;
-       const nframes64_t chunk_size = 4096;
-       nframes64_t nframes;
+       const framepos_t chunk_size = 4096;
+       framepos_t nframes;
        Sample buf[chunk_size];
        gain_t gain_buffer[chunk_size];
-       nframes64_t pos;
+       framepos_t pos;
        char s[PATH_MAX+1];
        uint32_t cnt;
        string path;
@@ -353,9 +348,9 @@ Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list
 
                try {
                        fs = boost::dynamic_pointer_cast<AudioFileSource> (
-                                       SourceFactory::createWritable (DataType::AUDIO, *_session,
-                                                       path, true,
-                                                       false, _session->frame_rate()));
+                               SourceFactory::createWritable (DataType::AUDIO, *_session,
+                                                              path, string(), true,
+                                                              false, _session->frame_rate()));
                }
 
                catch (failed_constructor& err) {
@@ -373,7 +368,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list
                pos = (*i).start;
 
                while (nframes) {
-                       nframes64_t this_time;
+                       framepos_t this_time;
 
                        this_time = min (nframes, chunk_size);
 
@@ -405,7 +400,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list
 
                        while (nframes) {
 
-                               nframes64_t this_time = min (nframes, chunk_size);
+                               framepos_t this_time = min (nframes, chunk_size);
                                memset (buf, 0, sizeof (Sample) * this_time);
 
                                for (uint32_t n=0; n < channels; ++n) {