cleanup a couple of audio file format names as reported by libsndfile

[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 dc7fadb4702a4b572d267e0d2aa0d71ad271516a..776832143628bf879b570275f82bcc2c2c88fdb6 100644 (file)
--- a/gtk2_ardour/editor_export_audio.cc
+++ b/gtk2_ardour/editor_export_audio.cc
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <unistd.h>
@@ -55,7 +54,7 @@ void
 Editor::export_session()
 {
        if (session) {
-               export_range (0, session->current_end_frame());
+               export_range (session->current_start_frame(), session->current_end_frame());
        }
 }
 
@@ -74,7 +73,7 @@ Editor::export_selection ()
 }
 
 void
-Editor::export_range (jack_nframes_t start, jack_nframes_t end)
+Editor::export_range (nframes64_t start, nframes64_t end)
 {
        if (session) {
                if (export_dialog == 0) {
@@ -97,9 +96,7 @@ Editor::export_region ()
        ExportDialog* dialog = new ExportRegionDialog (*this, clicked_regionview->region());
                
        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();
 }
 
@@ -152,7 +149,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;
        }
 }
 
@@ -160,11 +162,11 @@ bool
 Editor::write_region (string path, boost::shared_ptr<AudioRegion> region)
 {
        boost::shared_ptr<AudioFileSource> fs;
-       const jack_nframes_t chunk_size = 4096;
-       jack_nframes_t to_read;
+       const nframes64_t chunk_size = 4096;
+       nframes64_t to_read;
        Sample buf[chunk_size];
        gain_t gain_buffer[chunk_size];
-       jack_nframes_t pos;
+       nframes64_t pos;
        char s[PATH_MAX+1];
        uint32_t cnt;
        vector<boost::shared_ptr<AudioFileSource> > sources;
@@ -208,7 +210,7 @@ Editor::write_region (string path, boost::shared_ptr<AudioRegion> region)
                
                        
                        try {
-                               fs = boost::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createReadable (path, AudioFileSource::Flag (0)));
+                               fs = boost::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createWritable (*session, path, false, session->frame_rate()));
                        }
                        
                        catch (failed_constructor& err) {
@@ -227,7 +229,7 @@ Editor::write_region (string path, boost::shared_ptr<AudioRegion> region)
        pos = region->position();
 
        while (to_read) {
-               jack_nframes_t this_time;
+               nframes64_t this_time;
 
                this_time = min (to_read, chunk_size);
 
@@ -256,6 +258,7 @@ Editor::write_region (string path, boost::shared_ptr<AudioRegion> region)
        
        for (vector<boost::shared_ptr<AudioFileSource> >::iterator src = sources.begin(); src != sources.end(); ++src) {
                (*src)->update_header (0, *now, tnow);
+               (*src)->mark_immutable ();
        }
 
        return true;
@@ -288,7 +291,7 @@ Editor::write_audio_selection (TimeSelection& ts)
 
                if (atv->is_audio_track()) {
 
-                       AudioPlaylist* playlist = dynamic_cast<AudioPlaylist*>(atv->get_diskstream()->playlist());
+                       boost::shared_ptr<AudioPlaylist> playlist = boost::dynamic_pointer_cast<AudioPlaylist>(atv->get_diskstream()->playlist());
                        
                        if (playlist && write_audio_range (*playlist, atv->get_diskstream()->n_channels(), ts) == 0) {
                                ret = -1;
@@ -304,11 +307,11 @@ bool
 Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, list<AudioRange>& range)
 {
        boost::shared_ptr<AudioFileSource> fs;
-       const jack_nframes_t chunk_size = 4096;
-       jack_nframes_t nframes;
+       const nframes64_t chunk_size = 4096;
+       nframes64_t nframes;
        Sample buf[chunk_size];
        gain_t gain_buffer[chunk_size];
-       jack_nframes_t pos;
+       nframes64_t pos;
        char s[PATH_MAX+1];
        uint32_t cnt;
        string path;
@@ -339,7 +342,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, list<Audi
                path = s;
                
                try {
-                       fs = boost::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createReadable (path, AudioFileSource::Flag (0)));
+                       fs = boost::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createWritable (*session, path, false, session->frame_rate()));
                }
                
                catch (failed_constructor& err) {
@@ -357,7 +360,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, list<Audi
                pos = (*i).start;
                
                while (nframes) {
-                       jack_nframes_t this_time;
+                       nframes64_t this_time;
                        
                        this_time = min (nframes, chunk_size);
 
@@ -389,7 +392,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, list<Audi
 
                        while (nframes) {
 
-                               jack_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) {
@@ -412,8 +415,9 @@ Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, list<Audi
        time (&tnow);
        now = localtime (&tnow);
 
-       for (uint32_t n=0; n < channels; ++n) {
-               sources[n]->update_header (0, *now, tnow);
+       for (vector<boost::shared_ptr<AudioFileSource> >::iterator s = sources.begin(); s != sources.end(); ++s) {
+               (*s)->update_header (0, *now, tnow);
+               (*s)->mark_immutable ();
                // do we need to ref it again?
        }