Use Error objects as result for WavData::load().

Signed-off-by: Stefan Westerfeld <stefan@space.twc.de>

src/audiowmark.cc

@@ -1909,9 +1909,10 @@ int
 get_watermark (const string& infile, const string& orig_pattern)
 {
   WavData wav_data;
-  if (!wav_data.load (infile))
+  Error err = wav_data.load (infile);
+  if (err)
     {
-      fprintf (stderr, "audiowmark: error loading %s: %s\n", infile.c_str(), wav_data.error_blurb());
+      fprintf (stderr, "audiowmark: error loading %s: %s\n", infile.c_str(), err.message());
       return 1;
     }
 
@@ -1942,9 +1943,10 @@ gentest (const string& infile, const string& outfile)
   printf ("generating test sample from '%s' to '%s'\n", infile.c_str(), outfile.c_str());
 
   WavData wav_data;
-  if (!wav_data.load (infile))
+  Error err = wav_data.load (infile);
+  if (err)
     {
-      fprintf (stderr, "audiowmark: error loading %s: %s\n", infile.c_str(), wav_data.error_blurb());
+      fprintf (stderr, "audiowmark: error loading %s: %s\n", infile.c_str(), err.message());
       return 1;
     }
   const vector<float>& in_signal = wav_data.samples();
@@ -1976,9 +1978,10 @@ int
 cut_start (const string& infile, const string& outfile, const string& start_str)
 {
   WavData wav_data;
-  if (!wav_data.load (infile))
+  Error err = wav_data.load (infile);
+  if (err)
     {
-      fprintf (stderr, "audiowmark: error loading %s: %s\n", infile.c_str(), wav_data.error_blurb());
+      fprintf (stderr, "audiowmark: error loading %s: %s\n", infile.c_str(), err.message());
       return 1;
     }
 
@@ -2002,15 +2005,17 @@ int
 test_subtract (const string& infile1, const string& infile2, const string& outfile)
 {
   WavData in1_data;
-  if (!in1_data.load (infile1))
+  Error err = in1_data.load (infile1);
+  if (err)
     {
-      error ("audiowmark: error loading %s: %s\n", infile1.c_str(), in1_data.error_blurb());
+      error ("audiowmark: error loading %s: %s\n", infile1.c_str(), err.message());
       return 1;
     }
   WavData in2_data;
-  if (!in2_data.load (infile2))
+  err = in2_data.load (infile2);
+  if (err)
     {
-      error ("audiowmark: error loading %s: %s\n", infile2.c_str(), in2_data.error_blurb());
+      error ("audiowmark: error loading %s: %s\n", infile2.c_str(), err.message());
       return 1;
     }
   if (in1_data.n_values() != in2_data.n_values())

src/wavdata.cc

@@ -24,7 +24,7 @@ WavData::WavData (const vector<float>& samples, int n_channels, int sample_rate,
   m_bit_depth   = bit_depth;
 }
 
-bool
+Error
 WavData::load (const string& filename)
 {
   std::unique_ptr<AudioInputStream> in_stream; // FIXME: virtual constructor
@@ -39,26 +39,18 @@ WavData::load (const string& filename)
 
       err = mistream->open (filename);
       if (err)
-        {
-          m_error_blurb = err.message();
-          return false;
-        }
+        return err;
     }
   else if (err)
-    {
-      m_error_blurb = err.message();
-      return false;
-    }
+    return err;
 
   vector<float> m_buffer;
   while (true)
     {
       err = in_stream->read_frames (m_buffer, 1024);
       if (err)
-        {
-          m_error_blurb = err.message();
-          return false;
-        }
+        return err;
+
       if (!m_buffer.size())
         {
           /* reached eof */
@@ -70,7 +62,7 @@ WavData::load (const string& filename)
   m_n_channels  = in_stream->n_channels();
   m_bit_depth   = in_stream->bit_depth();
 
-  return true;
+  return Error::Code::NONE;
 }
 
 bool

src/wavdata.hh

@@ -4,6 +4,8 @@
 #include <string>
 #include <vector>
 
+#include "utils.hh"
+
 class WavData
 {
   std::vector<float> m_samples;
@@ -16,7 +18,7 @@ public:
   WavData();
   WavData (const std::vector<float>& samples, int n_channels, int sample_rate, int bit_depth);
 
-  bool load (const std::string& filename);
+  Error load (const std::string& filename);
   bool save (const std::string& filename);
 
   int                         sample_rate() const;