add a SndFileSource c'tor to create .flac encoded file for archiving

diff --git a/libs/ardour/ardour/sndfilesource.h b/libs/ardour/ardour/sndfilesource.h
index 4579a32b6df9c6bfe19ec2591c708a1807702687..5aa11814fb406775afb6226820bffae7285c6f87 100644 (file)
--- a/libs/ardour/ardour/sndfilesource.h
+++ b/libs/ardour/ardour/sndfilesource.h
@@ -24,6 +24,7 @@
 
 #include "ardour/audiofilesource.h"
 #include "ardour/broadcast_info.h"
+#include "ardour/progress.h"
 
 namespace ARDOUR {
 
@@ -49,6 +50,9 @@ class LIBARDOUR_API SndFileSource : public AudioFileSource {
         */
        SndFileSource (Session&, const XMLNode&);
 
+       /** Constructor to losslessly compress existing source */
+       SndFileSource (Session& s, const AudioFileSource& other, const std::string& path, bool use16bits = false, Progress* p = NULL);
+
        ~SndFileSource ();
 
        float sample_rate () const;

diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc
index 4522e8a54dc794cd106ea0a362297625a0c932a5..d2bd7bc33bac992a046b5cabac6d8f860882a60e 100644 (file)
--- a/libs/ardour/sndfilesource.cc
+++ b/libs/ardour/sndfilesource.cc
@@ -232,6 +232,63 @@ SndFileSource::SndFileSource (Session& s, const string& path, int chn)
        }
 }
 
+/** Constructor to losslessly compress existing source to flac */
+SndFileSource::SndFileSource (Session& s, const AudioFileSource& other, const string& path, bool use16bits, Progress* progress)
+       : Source(s, DataType::AUDIO, path, Flag ((other.flags () | default_writable_flags | NoPeakFile) & ~RF64_RIFF))
+       , AudioFileSource (s, path, "", Flag ((other.flags () | default_writable_flags | NoPeakFile) & ~RF64_RIFF), /*unused*/ FormatFloat, /*unused*/ WAVE64)
+       , _sndfile (0)
+       , _broadcast_info (0)
+       , _capture_start (false)
+       , _capture_end (false)
+       , file_pos (0)
+       , xfade_buf (0)
+{
+       if (other.readable_length () == 0) {
+               throw failed_constructor();
+       }
+
+       assert (!Glib::file_test (_path, Glib::FILE_TEST_EXISTS));
+
+       _channel = other.channel ();
+       init_sndfile ();
+
+       _file_is_new = true;
+
+       _info.channels = other.n_channels();
+       _info.samplerate = other.sample_rate ();
+       _info.format = SF_FORMAT_FLAC | (use16bits ? SF_FORMAT_PCM_16 : SF_FORMAT_PCM_24);
+
+       /* flac is either read or write -- never both,
+        * so we need to special-case ::open () */
+#ifdef PLATFORM_WINDOWS
+       int fd = g_open (_path.c_str(), O_CREAT | O_RDWR, 0644);
+#else
+       int fd = ::open (_path.c_str(), O_CREAT | O_RDWR, 0644);
+#endif
+       if (fd == -1) {
+               throw failed_constructor();
+       }
+
+       _sndfile = sf_open_fd (fd, SFM_WRITE, &_info, true);
+
+       if (_sndfile == 0) {
+               throw failed_constructor();
+       }
+
+       /* copy file */
+       Sample buf[8192];
+       framecnt_t off = 0;
+       framecnt_t len = other.read (buf, off, 8192, /*channel*/0);
+       while (len > 0) {
+               write (buf, len);
+               off += len;
+               len = other.read (buf, off, 8192, /*channel*/0);
+               if (progress) {
+                       progress->set_progress ((float) off / other.readable_length ());
+               }
+       }
+}
+
 void
 SndFileSource::init_sndfile ()
 {
@@ -285,7 +342,12 @@ SndFileSource::open ()
                return -1;
        }
 
-       _sndfile = sf_open_fd (fd, writable() ? SFM_RDWR : SFM_READ, &_info, true);
+       if (_info.format & SF_FORMAT_FLAC) {
+               assert (!writable());
+               _sndfile = sf_open_fd (fd, SFM_READ, &_info, true);
+       } else {
+               _sndfile = sf_open_fd (fd, writable() ? SFM_RDWR : SFM_READ, &_info, true);
+       }
 
        if (_sndfile == 0) {
                char errbuf[1024];
@@ -714,7 +776,10 @@ SndFileSource::set_header_timeline_position ()
 framecnt_t
 SndFileSource::write_float (Sample* data, framepos_t frame_pos, framecnt_t cnt)
 {
-       if (_sndfile == 0 || sf_seek (_sndfile, frame_pos, SEEK_SET|SFM_WRITE) < 0) {
+       if (_info.format & SF_FORMAT_FLAC) {
+               assert (_length == frame_pos);
+       }
+       else if (_sndfile == 0 || sf_seek (_sndfile, frame_pos, SEEK_SET|SFM_WRITE) < 0) {
                char errbuf[256];
                sf_error_str (0, errbuf, sizeof (errbuf) - 1);
                error << string_compose (_("%1: cannot seek to %2 (libsndfile error: %3)"), _path, frame_pos, errbuf) << endmsg;