Fix uninitialized variable

[ardour.git] / gtk2_ardour / export_report.cc

diff --git a/gtk2_ardour/export_report.cc b/gtk2_ardour/export_report.cc
index 67e2f61e7d6700e624a1bcfdfe6a5c7808365ae1..52a5dae0cc83385abe78bba7c210a5061c4d5abc 100644 (file)
--- a/gtk2_ardour/export_report.cc
+++ b/gtk2_ardour/export_report.cc
@@ -25,10 +25,9 @@
 
 #include "pbd/openuri.h"
 #include "pbd/basename.h"
+
 #include "gtkmm2ext/utils.h"
-#include "gtkmm2ext/utils.h"
-#include "canvas/utils.h"
-#include "canvas/colors.h"
+#include "gtkmm2ext/colors.h"
 
 #include "audiographer/general/analyser.h"
 
@@ -42,6 +41,7 @@
 #include "ardour/smf_source.h"
 #include "ardour/source_factory.h"
 #include "ardour/srcfilesource.h"
+#include "ardour/utils.h"
 
 #include "audio_clock.h"
 #include "export_report.h"
@@ -123,9 +123,9 @@ ExportReport::init (const AnalysisResults & ar, bool with_file)
                SoundFileInfo info;
                std::string errmsg;
 
-               framecnt_t file_length = 0;
-               framecnt_t sample_rate = 0;
-               framecnt_t start_off = 0;
+               samplecnt_t file_length = 0;
+               samplecnt_t sample_rate = 0;
+               samplecnt_t start_off = 0;
                unsigned int channels = 0;
                std::string file_fmt;
 
@@ -141,7 +141,7 @@ ExportReport::init (const AnalysisResults & ar, bool with_file)
 
                        /* File Info Table */
 
-                       framecnt_t const nfr = _session ? _session->nominal_frame_rate () : 25;
+                       samplecnt_t const nfr = _session ? _session->nominal_sample_rate () : 25;
                        double src_coef = (double) nfr / info.samplerate;
 
                        l = manage (new Label (_("Format:"), ALIGN_END));
@@ -182,10 +182,14 @@ ExportReport::init (const AnalysisResults & ar, bool with_file)
                        clock->set (info.timecode * src_coef + 0.5, true);
                        t->attach (*clock, 3, 4, 3, 4);
                } else if (with_file) {
-                       l = manage (new Label (_("Error:"), ALIGN_END));
-                       t->attach (*l, 0, 1, 1, 2);
-                       l = manage (new Label (errmsg, ALIGN_START));
-                       t->attach (*l, 1, 4, 1, 2);
+                       with_file = false;
+                       /* Note: errmsg can have size = 1, and contain "\0\0" */
+                       if (!errmsg.empty() && 0 != strlen(errmsg.c_str())) {
+                               l = manage (new Label (_("Error:"), ALIGN_END));
+                               t->attach (*l, 0, 1, 1, 2);
+                               l = manage (new Label (errmsg, ALIGN_START));
+                               t->attach (*l, 1, 4, 1, 2);
+                       }
                }
 
                int w, h;
@@ -318,9 +322,13 @@ ExportReport::init (const AnalysisResults & ar, bool with_file)
 
                                // TODO get max width of labels per column, right-align labels,  x-align 1/3, 2/3 columns
                                const int lx0 = m_l;
-                               const int lx1 = m_l + png_w / 2;
+                               const int lx1 = m_l + png_w * 2 / 3; // right-col is short (channels, SR, duration)
+                               std::string sha1sum = ARDOUR::compute_sha1_of_file (path);
+                               if (!sha1sum.empty()) {
+                                       sha1sum = " (sha1: " + sha1sum + ")";
+                               }
 
-                               IMGLABEL (lx0, _("File:"), Glib::path_get_basename (path));
+                               IMGLABEL (lx0, _("File:"), Glib::path_get_basename (path) + sha1sum);
                                IMGLABEL (lx1, _("Channels:"), string_compose ("%1", channels));
                                png_y0 += linesp;
 
@@ -525,8 +533,8 @@ ExportReport::init (const AnalysisResults & ar, bool with_file)
                                                        rint ((g + 59.0) * 10.0 - h * .5), 5,
                                                        h + 2, w + 2, 4);
                                        const float pk = (g + 59.0) / 54.0;
-                                       ArdourCanvas::Color c = ArdourCanvas::hsva_to_color (252 - 260 * pk, .9, .3 + pk * .4, .6);
-                                       ArdourCanvas::set_source_rgba (cr, c);
+                                       Gtkmm2ext::Color c = Gtkmm2ext::hsva_to_color (252 - 260 * pk, .9, .3 + pk * .4, .6);
+                                       Gtkmm2ext::set_source_rgba (cr, c);
                                        cr->fill ();
 
                                        cr->save ();
@@ -726,8 +734,8 @@ ExportReport::init (const AnalysisResults & ar, bool with_file)
                        for (size_t x = 0 ; x < width; ++x) {
                                for (size_t y = 0 ; y < height; ++y) {
                                        const float pk = p->spectrum[x][y];
-                                       ArdourCanvas::Color c = ArdourCanvas::hsva_to_color (252 - 260 * pk, .9, sqrt(pk));
-                                       ArdourCanvas::set_source_rgba (cr, c);
+                                       Gtkmm2ext::Color c = Gtkmm2ext::hsva_to_color (252 - 260 * pk, .9, sqrt(pk));
+                                       Gtkmm2ext::set_source_rgba (cr, c);
                                        cr->rectangle (m_l + x - .5, y - .5, 1, 1);
                                        cr->fill ();
                                }
@@ -787,8 +795,8 @@ ExportReport::init (const AnalysisResults & ar, bool with_file)
 
                        for (size_t y = 0 ; y < innerheight - 2; ++y) {
                                        const float pk = 1.0 - (float) y / innerheight;
-                                       ArdourCanvas::Color c = ArdourCanvas::hsva_to_color (252 - 260 * pk, .9, sqrt(pk));
-                                       ArdourCanvas::set_source_rgba (cr, c);
+                                       Gtkmm2ext::Color c = Gtkmm2ext::hsva_to_color (252 - 260 * pk, .9, sqrt(pk));
+                                       Gtkmm2ext::set_source_rgba (cr, c);
                                        cr->rectangle (2, innertop + y + .5, m_r - 4 - anw, 1);
                                        cr->fill ();
                        }
@@ -957,7 +965,7 @@ ExportReport::audition (std::string path, unsigned n_chn, int page)
                                SourceFactory::createExternal (DataType::AUDIO, *_session,
                                                                                 path, n,
                                                                                 Source::Flag (ARDOUR::AudioFileSource::NoPeakFile), false));
-                       if (afs->sample_rate() != _session->nominal_frame_rate()) {
+                       if (afs->sample_rate() != _session->nominal_sample_rate()) {
                                boost::shared_ptr<SrcFileSource> sfs (new SrcFileSource(*_session, afs, ARDOUR::SrcGood));
                                srclist.push_back(sfs);
                        } else {
@@ -1030,7 +1038,7 @@ ExportReport::on_switch_page (GtkNotebookPage*, guint page_num)
 }
 
 void
-ExportReport::audition_progress (framecnt_t pos, framecnt_t len)
+ExportReport::audition_progress (samplecnt_t pos, samplecnt_t len)
 {
        if (_audition_num == _page_num && timeline.find (_audition_num) != timeline.end ()) {
                const float p = (float)pos / len;
@@ -1165,7 +1173,7 @@ ExportReport::draw_waveform (Cairo::RefPtr<Cairo::ImageSurface>& wave, ExportAna
 
        // >= -1dBTP (coeff >= .89125, libs/vamp-plugins/TruePeak.cpp)
        cr->set_source_rgba (1.0, 0.7, 0, 0.7);
-       for (std::set<framepos_t>::const_iterator i = p->truepeakpos[c].begin (); i != p->truepeakpos[c].end (); ++i) {
+       for (std::set<samplepos_t>::const_iterator i = p->truepeakpos[c].begin (); i != p->truepeakpos[c].end (); ++i) {
                cr->move_to (m_l + (*i) - .5, clip_top);
                cr->line_to (m_l + (*i) - .5, clip_bot);
                cr->stroke ();