globally change all use of "frame" to refer to audio into "sample".
[ardour.git] / gtk2_ardour / export_report.cc
index 3755445e53ac926066cf5b112b54d9745c5813d3..0c7270db721266288a809e8906e38f1dd8e0beb0 100644 (file)
 #include <gtkmm/stock.h>
 
 #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"
 
 #include "ardour/audioregion.h"
 #include "ardour/auditioner.h"
 #include "ardour/dB.h"
+#include "ardour/logmeter.h"
 #include "ardour/region_factory.h"
 #include "ardour/session.h"
 #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"
-#include "logmeter.h"
 #include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Gtk;
 using namespace ARDOUR;
 
 ExportReport::ExportReport (Session* session, StatusPtr s)
        : ArdourDialog (_("Export Report/Analysis"))
-       , status (s)
        , _session (session)
+       , stop_btn (0)
+       , play_btn (0)
+       , _audition_num (-1)
+       , _page_num (0)
+{
+       init (s->result_map, true);
+}
+
+ExportReport::ExportReport (const std::string & title, const AnalysisResults & ar)
+       : ArdourDialog (title)
+       , _session (0)
+       , stop_btn (0)
+       , play_btn (0)
        , _audition_num (-1)
        , _page_num (0)
+{
+       init (ar, false);
+}
+
+void
+ExportReport::init (const AnalysisResults & ar, bool with_file)
 {
        set_resizable (false);
        pages.set_scrollable ();
 
-       AnalysisResults & ar = status->result_map;
-
        std::vector<double> dashes;
        dashes.push_back (3.0);
        dashes.push_back (5.0);
 
        int page = 0;
-       for (AnalysisResults::iterator i = ar.begin (); i != ar.end (); ++i, ++page) {
+       for (AnalysisResults::const_iterator i = ar.begin (); i != ar.end (); ++i, ++page) {
                Label *l;
                VBox *vb = manage (new VBox ());
                Table *t = manage (new Table (4, 4));
@@ -87,29 +104,32 @@ ExportReport::ExportReport (Session* session, StatusPtr s)
 
                std::list<CimgPlayheadArea*> playhead_widgets;
 
-               l = manage (new Label (_("File:"), ALIGN_END));
-               t->attach (*l, 0, 1, 0, 1);
-               l = manage (new Label ());
-               l->set_ellipsize (Pango::ELLIPSIZE_START);
-               l->set_width_chars (48);
-               l->set_max_width_chars (48);
-               l->set_text (path);
-               l->set_alignment (ALIGN_START, ALIGN_CENTER);
-               t->attach (*l, 1, 3, 0, 1, FILL, SHRINK);
+               if (with_file) {
+                       l = manage (new Label (_("File:"), ALIGN_END));
+                       t->attach (*l, 0, 1, 0, 1);
+                       l = manage (new Label ());
+                       l->set_ellipsize (Pango::ELLIPSIZE_START);
+                       l->set_width_chars (48);
+                       l->set_max_width_chars (48);
+                       l->set_text (path);
+                       l->set_alignment (ALIGN_START, ALIGN_CENTER);
+                       t->attach (*l, 1, 3, 0, 1, FILL, SHRINK);
 
-               Button *b = manage (new Button (_("Open Folder")));
-               t->attach (*b, 3, 4, 0, 2, FILL, SHRINK);
-               b->signal_clicked ().connect (sigc::bind (sigc::mem_fun (*this, &ExportReport::open_folder), path));
+                       Button *b = manage (new Button (_("Open Folder")));
+                       t->attach (*b, 3, 4, 0, 2, FILL, SHRINK);
+                       b->signal_clicked ().connect (sigc::bind (sigc::mem_fun (*this, &ExportReport::open_folder), path));
+               }
 
                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;
 
-               if (AudioFileSource::get_soundfile_info (path, info, errmsg)) {
+               if (with_file && AudioFileSource::get_soundfile_info (path, info, errmsg)) {
                        AudioClock * clock;
 
                        file_length = info.length;
@@ -121,18 +141,18 @@ ExportReport::ExportReport (Session* session, StatusPtr s)
 
                        /* 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));
                        t->attach (*l, 0, 1, 1, 2);
-                       std::string fmt = info.format_name;
-                       std::replace (fmt.begin (), fmt.end (), '\n', ' ');
+                       file_fmt = info.format_name;
+                       std::replace (file_fmt.begin (), file_fmt.end (), '\n', ' ');
                        l = manage (new Label ());
                        l->set_ellipsize (Pango::ELLIPSIZE_START);
                        l->set_width_chars (48);
                        l->set_max_width_chars (48);
-                       l->set_text (fmt);
+                       l->set_text (file_fmt);
                        l->set_alignment (ALIGN_START, ALIGN_CENTER);
                        t->attach (*l, 1, 3, 1, 2, FILL, SHRINK);
 
@@ -161,7 +181,7 @@ ExportReport::ExportReport (Session* session, StatusPtr s)
                        clock->set_mode (AudioClock::Timecode);
                        clock->set (info.timecode * src_coef + 0.5, true);
                        t->attach (*clock, 3, 4, 3, 4);
-               } else {
+               } 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));
@@ -195,11 +215,11 @@ ExportReport::ExportReport (Session* session, StatusPtr s)
                int mnw = 0; // max numeric width
                int anw = 0; // spectrum annotation text width
 
-               int lin[4] = { 0, 0, 0, 0 }; // max line height
+               int lin[6] = { 0, 0, 0, 0, 0, 0 }; // max line height
 
                TXTSIZE(0, _("(too short integration time)"), get_SmallFont);
 
-               TXTSIZE(0, _("-88"), get_SmallMonospaceFont);
+               TXTSIZE(0, _("-888"), get_SmallMonospaceFont);
                anw = w;
                m_r = anw + 10;
                mnh = h + 1;
@@ -208,6 +228,8 @@ ExportReport::ExportReport (Session* session, StatusPtr s)
                TXTSIZE(1, string_compose (_("%1 dBFS"), std::setprecision (1), std::fixed, dbfs), get_LargeFont);
                TXTSIZE(2, _("True Peak:"), get_SmallFont);
                TXTSIZE(3, string_compose (_("%1 dBTP"), std::setprecision (1), std::fixed, dbtp), get_LargeFont);
+               TXTSIZE(4, _("Normalization Gain:"), get_SmallFont);
+               TXTSIZE(5, _("+888.88 dB"), get_SmallMonospaceFont);
 
                TXTSIZE(0, _("Integrated Loudness:"), get_SmallFont);
                TXTSIZE(1, string_compose (_("%1 LUFS"), std::setprecision (1), std::fixed, p->loudness), get_LargeFont);
@@ -215,8 +237,9 @@ ExportReport::ExportReport (Session* session, StatusPtr s)
                TXTSIZE(3, string_compose (_("%1 LU"), std::setprecision (1), std::fixed, p->loudness_range), get_LargeFont);
 
                mnw += 8;
-               const int ht = lin[0] * 1.25 + lin[1] * 1.25 + lin[2] * 1.25 + lin[3] + 8;
-               const int hh = std::max (100, ht);
+               const int ht = lin[0] * 1.25 + lin[1] * 1.25 + lin[2] * 1.25 + lin[3] *1.25 + lin[4] * 1.25 + lin[5];
+               const int hh = std::max (100, ht + 12);
+               const int htn = lin[0] * 1.25 + lin[1] * 1.25 + lin[2] * 1.25 + lin[3];
                int m_l =  2 * mnw + /*hist-width*/ 540 + /*box spacing*/ 8 - /*peak-width*/ 800 - m_r; // margin left
 
                int mml = 0; // min margin left -- ensure left margin is wide enough
@@ -227,12 +250,97 @@ ExportReport::ExportReport (Session* session, StatusPtr s)
                mnw = (m_l - /*hist-width*/ 540 - /*box spacing*/ 8 + /*peak-width*/ 800 + m_r) / 2;
                const int nw2 = mnw / 2; // nums, horizontal center
 
-               int y0[4];
-               y0[0] = (hh - ht) * .5 + lin[0] * .25;
+               int y0[6];
+               if (p->normalized) {
+                       y0[0] = (hh - ht) * .5;
+               } else {
+                       y0[0] = (hh - htn) * .5;
+               }
                y0[1] = y0[0] + lin[0] * 1.25;
                y0[2] = y0[1] + lin[1] * 1.25;
                y0[3] = y0[2] + lin[2] * 1.25;
+               y0[4] = y0[3] + lin[3] * 1.25;
+               y0[5] = y0[4] + lin[4] * 1.25;
+
+               /* calc heights & alignment of png-image */
+               const float specth = sizeof (p->spectrum[0]) / sizeof (float);
+               const float waveh2 = std::min (100, 8 * lin[0] / (int) p->n_channels);
+
+               Cairo::RefPtr<Cairo::ImageSurface> png_surface;
+               int png_w = 0;
+               int png_y0 = 0;
+
+               if (with_file && UIConfiguration::instance().get_save_export_analysis_image ()) { /*png image */
+                       const int top_w = 540 + 2 * (mnw + 4); // 4px spacing
+                       const int wav_w = m_l + m_r + 4 + sizeof (p->peaks) / sizeof (ARDOUR::PeakData::PeakDatum) / 4;
+                       const int spc_w = m_l + m_r + 4 + sizeof (p->spectrum) / sizeof (float) / specth;
+                       int ann_h = 0;
+                       int linesp = 0;
+
+                       if (channels > 0 && file_length > 0 && sample_rate > 0) {
+                               layout->set_font_description (UIConfiguration::instance ().get_SmallMonospaceFont ());
+                               layout->set_text (_("00:00:00.000"));
+                               layout->get_pixel_size (w, h);
+                               int height = h * 1.75;
+                               ann_h = 4 + height /* Time Axis */;
+
+                               layout->set_font_description (UIConfiguration::instance ().get_SmallFont ());
+                               layout->set_text (_("0|A8"));
+                               layout->get_pixel_size (w, h);
+                               linesp = h * 1.5;
+                               ann_h += 4 + 3 * linesp; /* File Info */;
+                       }
+
+                       const int png_h = hh + 4 + p->n_channels * (2 * waveh2 + 4) + ann_h + specth + 4;
+                       png_w = std::max (std::max (top_w, wav_w), spc_w);
+
+                       png_surface = Cairo::ImageSurface::create (Cairo::FORMAT_RGB24, png_w, png_h);
+                       Cairo::RefPtr<Cairo::Context> pcx = Cairo::Context::create (png_surface);
+                       pcx->set_source_rgb (.2, .2, .2);
+                       pcx->paint ();
 
+                       if (channels > 0 && file_length > 0 && sample_rate > 0) {
+                               png_y0 += 4;
+                               // Add file-name, format, duration, sample-rate & timecode
+                               pcx->set_source_rgb (.7, .7, .7);
+                               layout->set_font_description (UIConfiguration::instance ().get_SmallFont ());
+                               layout->set_alignment (Pango::ALIGN_LEFT);
+
+#define IMGLABEL(X0, STR, VAL) {       \
+  layout->set_text (STR);              \
+  pcx->move_to (X0, png_y0);           \
+  layout->get_pixel_size (w, h);       \
+  layout->show_in_cairo_context (pcx); \
+  layout->set_text (VAL);              \
+  pcx->move_to (X0 + w + 2, png_y0);   \
+  layout->show_in_cairo_context (pcx); \
+}
+
+                               // 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 / 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) + sha1sum);
+                               IMGLABEL (lx1, _("Channels:"), string_compose ("%1", channels));
+                               png_y0 += linesp;
+
+                               IMGLABEL (lx0, _("Format:"), file_fmt);
+                               IMGLABEL (lx1, _("Sample rate:"), string_compose (_("%1 Hz"), sample_rate));
+                               png_y0 += linesp;
+
+                               if (_session) {
+                                       Timecode::Time tct;
+                                       _session->sample_to_timecode (start_off, tct, false, false);
+                                       IMGLABEL (lx0, _("Timecode:"), Timecode::timecode_format_time (tct));
+                               }
+                               IMGLABEL (lx1, _("Duration:"), Timecode::timecode_format_sampletime (file_length, sample_rate, 1000, false));
+                               png_y0 += linesp;
+                       }
+               }
 
                { /* peak, loudness and R128 histogram */
                        Cairo::RefPtr<Cairo::ImageSurface> nums = Cairo::ImageSurface::create (Cairo::FORMAT_ARGB32, mnw, hh);
@@ -277,6 +385,35 @@ ExportReport::ExportReport (Session* session, StatusPtr s)
                                layout->show_in_cairo_context (cr);
                        }
 
+                       if (p->normalized) {
+                               const float ndb = accurate_coefficient_to_dB (p->norm_gain_factor);
+                               layout->set_font_description (UIConfiguration::instance ().get_SmallFont ());
+                               layout->set_text (_("Normalization Gain:"));
+                               layout->get_pixel_size (w, h);
+                               cr->move_to (rint (nw2 - w * .5), y0[4]);
+                               cr->set_source_rgba (.7, .7, .7, 1.0);
+                               layout->show_in_cairo_context (cr);
+
+                               layout->set_font_description (UIConfiguration::instance ().get_SmallMonospaceFont ());
+                               layout->set_text (string_compose (_("%1 dB"), std::setprecision (2), std::showpos, std::fixed, ndb));
+
+                               layout->get_pixel_size (w, h);
+                               cr->move_to (rint (nw2 - w * .5), y0[5]);
+                               // TODO tweak thresholds
+                               if (p->norm_gain_factor < 1.0) {
+                                       cr->set_source_rgba (1.0, .7, .1, 1.0);
+                               } else if (p->norm_gain_factor == 1.0) {
+                                       cr->set_source_rgba (.7, .7, .7, 1.0);
+                               } else if (fabsf (ndb) < 12) {
+                                       cr->set_source_rgba (.1, 1.0, .1, 1.0);
+                               } else if (fabsf (ndb) < 18) {
+                                       cr->set_source_rgba (1.0, .7, .1, 1.0);
+                               } else {
+                                       cr->set_source_rgba (1.0, .1, .1, 1.0);
+                               }
+                               layout->show_in_cairo_context (cr);
+                       }
+
                        nums->flush ();
 
                        /* EBU R128 numerics */
@@ -299,7 +436,7 @@ ExportReport::ExportReport (Session* session, StatusPtr s)
                                layout->set_font_description (UIConfiguration::instance ().get_LargeFont ());
                                layout->set_text (_("Not\nAvailable"));
                                layout->get_pixel_size (w, h);
-                               cr->move_to (rint (nw2 - w * .5), rint (hh * .5 - h * .6));
+                               cr->move_to (rint (nw2 - w * .5), rint (hh * .5 - h * .66));
                                layout->show_in_cairo_context (cr);
                                int yy = h * .5;
 
@@ -346,85 +483,96 @@ ExportReport::ExportReport (Session* session, StatusPtr s)
                        cr->set_line_width (1.0);
 
                        if (p->loudness_hist_max > 0 && i->second->have_loudness) {
+                               // draw data
                                for (size_t x = 0 ; x < 510; ++x) {
                                        cr->move_to (x - .5, hh);
                                        cr->line_to (x - .5, (float) hh * (1.0 - p->loudness_hist[x] / (float) p->loudness_hist_max));
                                        cr->stroke ();
                                }
-                       } else {
-                               // TODO print "Not Avail"
-                       }
 
-                       layout->set_font_description (UIConfiguration::instance ().get_SmallerFont ());
-                       layout->set_alignment (Pango::ALIGN_CENTER);
-
-                       // Label
-                       layout->set_text (_("LUFS\n(short)"));
-                       layout->get_pixel_size (w, h);
-                       Gtkmm2ext::rounded_rectangle (cr, 5, rint (.5 * (hh - w) - 1), h + 2, w + 2, 4);
-                       cr->set_source_rgba (.1, .1, .1, 0.7);
-                       cr->fill ();
-                       cr->save ();
-                       cr->move_to (6, rint (.5 * (hh + w)));
-                       cr->set_source_rgba (.9, .9, .9, 1.0);
-                       cr->rotate (M_PI / -2.0);
-                       layout->show_in_cairo_context (cr);
-                       cr->restore ();
+                               layout->set_font_description (UIConfiguration::instance ().get_SmallerFont ());
+                               layout->set_alignment (Pango::ALIGN_CENTER);
 
-                       // x-Axis
-                       layout->set_font_description (UIConfiguration::instance ().get_SmallMonospaceFont ());
-                       layout->set_alignment (Pango::ALIGN_LEFT);
-                       for (int g = -53; g <= -8; g += 5) {
-                               // grid-lines. [110] -59LUFS .. [650]: -5 LUFS
-                               layout->set_text (string_compose ("%1", std::setw(3), std::setfill(' '), g));
+                               // x-axis label
+                               layout->set_text (_("LUFS\n(short)"));
                                layout->get_pixel_size (w, h);
-
-                               cr->set_operator (Cairo::OPERATOR_OVER);
-                               Gtkmm2ext::rounded_rectangle (cr,
-                                               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::rounded_rectangle (cr, 5, 5, w + 2, h + 2, 4);
+                               cr->set_source_rgba (.1, .1, .1, 0.7);
                                cr->fill ();
+                               cr->move_to (6, 6);
+                               cr->set_source_rgba (.9, .9, .9, 1.0);
+                               layout->show_in_cairo_context (cr);
 
+                               // y-axis label
+                               layout->set_text (_("Multiplicity"));
+                               layout->get_pixel_size (w, h);
+                               Gtkmm2ext::rounded_rectangle (cr, 5, hh - w - 3, h + 2, w + 2, 4);
+                               cr->set_source_rgba (.1, .1, .1, 0.7);
+                               cr->fill ();
                                cr->save ();
+                               cr->move_to (6, hh - 2);
                                cr->set_source_rgba (.9, .9, .9, 1.0);
-                               cr->move_to (rint ((g + 59.0) * 10.0 - h * .5), w + 6.0);
                                cr->rotate (M_PI / -2.0);
                                layout->show_in_cairo_context (cr);
                                cr->restore ();
 
-                               cr->set_operator (Cairo::OPERATOR_ADD);
-                               cr->save ();
-                               cr->set_source_rgba (.3, .3, .3, 1.0);
-                               cr->set_dash (dashes, 1.0);
-                               cr->set_line_cap (Cairo::LINE_CAP_ROUND);
-                               cr->move_to (rint ((g + 59.0) * 10.0) + .5, w + 8.0);
-                               cr->line_to (rint ((g + 59.0) * 10.0) + .5, hh);
-                               cr->stroke ();
-                               cr->restore ();
-                       }
-
-                       // add normalization gain factor here (for want of a better place)
-                       if (p->normalized) {
-                               const float ndb = accurate_coefficient_to_dB (p->norm_gain_factor);
-                               layout->set_font_description (UIConfiguration::instance ().get_SmallFont ());
+                               // x-Axis labels
+                               layout->set_font_description (UIConfiguration::instance ().get_SmallMonospaceFont ());
                                layout->set_alignment (Pango::ALIGN_LEFT);
-                               layout->set_text (string_compose (_("Normalization Gain: %1 dB"), std::setprecision (2), std::showpos, std::fixed, ndb));
-                               layout->get_pixel_size (w, h);
-                               cr->set_operator (Cairo::OPERATOR_OVER);
+                               for (int g = -53; g <= -8; g += 5) {
+                                       // grid-lines. [110] -59LUFS .. [650]: -5 LUFS
+                                       layout->set_text (string_compose ("%1", std::setw(3), std::setfill(' '), g));
+                                       layout->get_pixel_size (w, h);
+
+                                       cr->set_operator (Cairo::OPERATOR_OVER);
+                                       Gtkmm2ext::rounded_rectangle (cr,
+                                                       rint ((g + 59.0) * 10.0 - h * .5), 5,
+                                                       h + 2, w + 2, 4);
+                                       const float pk = (g + 59.0) / 54.0;
+                                       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 ();
+                                       cr->set_source_rgba (.9, .9, .9, 1.0);
+                                       cr->move_to (rint ((g + 59.0) * 10.0 - h * .5), w + 6.0);
+                                       cr->rotate (M_PI / -2.0);
+                                       layout->show_in_cairo_context (cr);
+                                       cr->restore ();
+
+                                       cr->set_operator (Cairo::OPERATOR_ADD);
+                                       cr->save ();
+                                       cr->set_source_rgba (.3, .3, .3, 1.0);
+                                       cr->set_dash (dashes, 1.0);
+                                       cr->set_line_cap (Cairo::LINE_CAP_ROUND);
+                                       cr->move_to (rint ((g + 59.0) * 10.0) + .5, w + 8.0);
+                                       cr->line_to (rint ((g + 59.0) * 10.0) + .5, hh);
+                                       cr->stroke ();
+                                       cr->restore ();
+                               }
+
+                       } else {
+                               layout->set_alignment (Pango::ALIGN_CENTER);
+                               layout->set_font_description (UIConfiguration::instance ().get_LargeFont ());
+                               layout->set_text (_("Not\nAvailable"));
                                layout->get_pixel_size (w, h);
-                               Gtkmm2ext::rounded_rectangle (cr, 5, hh - h - 4, w + 2, h + 2, 4);
-                               cr->set_source_rgba (.1, .1, .1, 0.7);
-                               cr->fill ();
-                               cr->set_source_rgba (.3, .7, .3, 1.0);
-                               cr->move_to (6, hh - h - 3);
+                               cr->move_to (rint ((510 - w) * .5), rint ((hh - h) * .5));
                                layout->show_in_cairo_context (cr);
                        }
 
                        hist->flush ();
 
+                       if (png_surface) {
+                               Cairo::RefPtr<Cairo::Context> pcx = Cairo::Context::create (png_surface);
+                               pcx->set_source (nums, 0, png_y0);
+                               pcx->paint ();
+                               pcx->set_source (hist, (png_w - 540) / 2, png_y0);
+                               pcx->paint ();
+                               pcx->set_source (ebur, png_w - mnw, png_y0);
+                               pcx->paint ();
+                               png_y0 += hh + 4;
+                       }
+
                        CimgArea *nu = manage (new CimgArea (nums));
                        CimgArea *eb = manage (new CimgArea (ebur));
                        CimgArea *hi = manage (new CimgArea (hist));
@@ -458,6 +606,9 @@ ExportReport::ExportReport (Session* session, StatusPtr s)
                        VBox *lrb = manage (new VBox());
                        ToggleButton *log = manage (new ToggleButton (S_("Logscale|Lg")));
                        ToggleButton *rec = manage (new ToggleButton (S_("Rectified|Rf")));
+                       Gtkmm2ext::UI::instance()->set_tip (log, _("Logscale"));
+                       Gtkmm2ext::UI::instance()->set_tip (rec, _("Rectified"));
+
                        lrb->pack_start (*log, false, false, 5);
                        lrb->pack_end (*rec, false, false, 5);
                        log->signal_toggled ().connect (sigc::bind (sigc::mem_fun (*this, &ExportReport::on_logscale_toggled), log));
@@ -474,10 +625,10 @@ ExportReport::ExportReport (Session* session, StatusPtr s)
                        Cairo::RefPtr<Cairo::ImageSurface> wave_log;
                        Cairo::RefPtr<Cairo::ImageSurface> wave_rect;
                        Cairo::RefPtr<Cairo::ImageSurface> wave_lr;
-                       draw_waveform(wave, p, c, m_l, width, anw, lin[0], false, false);
-                       draw_waveform(wave_log, p, c, m_l, width, anw, lin[0], true, false);
-                       draw_waveform(wave_rect, p, c, m_l, width, anw, lin[0], false, true);
-                       draw_waveform(wave_lr, p, c, m_l, width, anw, lin[0], true, true);
+                       draw_waveform(wave, p, c, m_l, width, anw, waveh2, false, false);
+                       draw_waveform(wave_log, p, c, m_l, width, anw, waveh2, true, false);
+                       draw_waveform(wave_rect, p, c, m_l, width, anw, waveh2, false, true);
+                       draw_waveform(wave_lr, p, c, m_l, width, anw, waveh2, true, true);
 
                        CimgWaveArea *wv = manage (new CimgWaveArea (wave, wave_log, wave_rect, wave_lr, m_l, width));
 
@@ -486,6 +637,13 @@ ExportReport::ExportReport (Session* session, StatusPtr s)
                        wv->seek_playhead.connect (sigc::bind<0> (sigc::mem_fun (*this, &ExportReport::audition_seek), page));
                        wtbl->attach (*wv, 0, 1, wrow, wrow + 1, SHRINK, SHRINK);
                        ++wrow;
+
+                       if (png_surface) {
+                               Cairo::RefPtr<Cairo::Context> pcx = Cairo::Context::create (png_surface);
+                               pcx->set_source (wave, 0, png_y0);
+                               pcx->paint ();
+                               png_y0 += 2 * waveh2 + 4;
+                       }
                }
 
                if (channels > 0 && file_length > 0 && sample_rate > 0)
@@ -534,7 +692,7 @@ ExportReport::ExportReport (Session* session, StatusPtr s)
                        layout->set_text (_("Time"));
                        cr->set_source_rgba (.9, .9, .9, 1.0);
                        layout->get_pixel_size (w, h);
-                       cr->move_to (rint (m_l - w - anw - 2), rint (.5 * (height - h)));
+                       cr->move_to (rint (m_l - w - 8), rint (.5 * (height - h)));
                        layout->show_in_cairo_context (cr);
 
                        ytme->flush ();
@@ -543,12 +701,19 @@ ExportReport::ExportReport (Session* session, StatusPtr s)
                        tm->seek_playhead.connect (sigc::bind<0> (sigc::mem_fun (*this, &ExportReport::audition_seek), page));
                        wtbl->attach (*tm, 0, 1, wrow, wrow + 1, SHRINK, SHRINK);
                        ++wrow;
+
+                       if (png_surface) {
+                               Cairo::RefPtr<Cairo::Context> pcx = Cairo::Context::create (png_surface);
+                               pcx->set_source (ytme, 0, png_y0);
+                               pcx->paint ();
+                               png_y0 += height + 4;
+                       }
                }
 
                {
                        /* Draw Spectrum */
+                       const size_t height = specth;
                        const size_t swh = sizeof (p->spectrum) / sizeof (float);
-                       const size_t height = sizeof (p->spectrum[0]) / sizeof (float);
                        const size_t width = swh / height;
 
                        Cairo::RefPtr<Cairo::ImageSurface> spec = Cairo::ImageSurface::create (Cairo::FORMAT_ARGB32, m_l + width, height);
@@ -565,8 +730,8 @@ ExportReport::ExportReport (Session* session, StatusPtr s)
                        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 ();
                                }
@@ -576,7 +741,7 @@ ExportReport::ExportReport (Session* session, StatusPtr s)
                        layout->set_font_description (UIConfiguration::instance ().get_SmallerFont ());
                        layout->set_text (_("Hz"));
                        layout->get_pixel_size (w, h);
-                       cr->move_to (rint (m_l - h - anw - 2), rint ((height + w) * .5));
+                       cr->move_to (rint (m_l - h - anw - 10), rint ((height + w) * .5));
                        cr->set_source_rgba (.9, .9, .9, 1.0);
                        cr->save ();
                        cr->rotate (M_PI / -2.0);
@@ -626,8 +791,8 @@ ExportReport::ExportReport (Session* session, StatusPtr s)
 
                        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 ();
                        }
@@ -654,6 +819,14 @@ ExportReport::ExportReport (Session* session, StatusPtr s)
                        wtbl->attach (*sp, 0, 1, wrow, wrow + 1, SHRINK, SHRINK);
                        wtbl->attach (*an, 1, 2, wrow, wrow + 1, SHRINK, SHRINK);
                        ++wrow;
+
+                       if (png_surface) {
+                               Cairo::RefPtr<Cairo::Context> pcx = Cairo::Context::create (png_surface);
+                               pcx->set_source (spec, 0, png_y0);
+                               pcx->paint ();
+                               pcx->set_source (scale, png_w - m_r, png_y0);
+                               pcx->paint ();
+                       }
                }
 
                timeline[page] = playhead_widgets;
@@ -668,6 +841,13 @@ ExportReport::ExportReport (Session* session, StatusPtr s)
                img->hide();
                pages.pages ().push_back (Notebook_Helpers::TabElem (*vb, *tab));
                pages.signal_switch_page().connect (sigc::mem_fun (*this, &ExportReport::on_switch_page));
+
+               if (png_surface) {
+                       assert (with_file && !path.empty ());
+                       std::string imgpath = Glib::build_filename (Glib::path_get_dirname (path), PBD::basename_nosuffix (path) + ".png");
+                       PBD::info << string_compose(_("Writing Export Analysis Image: %1."), imgpath) << endmsg;
+                       png_surface->write_to_png (imgpath);
+               }
        }
 
        pages.set_show_tabs (true);
@@ -683,14 +863,18 @@ ExportReport::ExportReport (Session* session, StatusPtr s)
                _session->the_auditioner()->AuditionProgress.connect(auditioner_connections, invalidator (*this), boost::bind (&ExportReport::audition_progress, this, _1, _2), gui_context());
        }
 
-       play_btn = add_button (Stock::MEDIA_PLAY, RESPONSE_ACCEPT);
-       stop_btn = add_button (Stock::MEDIA_STOP, RESPONSE_ACCEPT);
+       if (_session && with_file) {
+               play_btn = add_button (Stock::MEDIA_PLAY, RESPONSE_ACCEPT);
+               stop_btn = add_button (Stock::MEDIA_STOP, RESPONSE_ACCEPT);
+       }
        add_button (Stock::CLOSE, RESPONSE_CLOSE);
 
        set_default_response (RESPONSE_CLOSE);
-       stop_btn->signal_clicked().connect (sigc::mem_fun (*this, &ExportReport::stop_audition));
-       play_btn->signal_clicked().connect (sigc::mem_fun (*this, &ExportReport::play_audition));
-       stop_btn->set_sensitive (false);
+       if (_session && with_file) {
+               stop_btn->signal_clicked().connect (sigc::mem_fun (*this, &ExportReport::stop_audition));
+               play_btn->signal_clicked().connect (sigc::mem_fun (*this, &ExportReport::play_audition));
+               stop_btn->set_sensitive (false);
+       }
        show_all ();
 }
 
@@ -713,12 +897,15 @@ ExportReport::run ()
 void
 ExportReport::open_folder (std::string p)
 {
-       PBD::open_uri (Glib::path_get_dirname(p));
+       PBD::open_folder (Glib::path_get_dirname(p));
 }
 
 void
 ExportReport::audition_active (bool active)
 {
+       if (!stop_btn || !play_btn) {
+               return;
+       }
        stop_btn->set_sensitive (active);
        play_btn->set_sensitive (!active);
 
@@ -774,7 +961,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 {
@@ -847,7 +1034,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;
@@ -886,11 +1073,10 @@ ExportReport::on_rectivied_toggled (Gtk::ToggleButton* b)
 }
 
 void
-ExportReport::draw_waveform (Cairo::RefPtr<Cairo::ImageSurface>& wave, ExportAnalysisPtr p, uint32_t c, int m_l, size_t width, int anw, int height, bool log, bool rect)
+ExportReport::draw_waveform (Cairo::RefPtr<Cairo::ImageSurface>& wave, ExportAnalysisPtr p, uint32_t c, int m_l, size_t width, int anw, int height_2, bool log, bool rect)
 {
        int w, h;
        Glib::RefPtr<Pango::Layout> layout = Pango::Layout::create (get_pango_context ());
-       const float height_2 = std::min (100, 8 * height / (int) p->n_channels); // TODO refine
        const float ht = 2.f * height_2;
 
        std::vector<double> dashes;
@@ -967,7 +1153,7 @@ ExportReport::draw_waveform (Cairo::RefPtr<Cairo::ImageSurface>& wave, ExportAna
                }
        }
 
-       // > 0dBFS
+       // >= 0dBFS
        cr->set_source_rgba (1.0, 0, 0, 1.0);
        for (size_t x = 0 ; x < width; ++x) {
                if (p->peaks[c][x].max >= 1.0) {
@@ -981,9 +1167,9 @@ ExportReport::draw_waveform (Cairo::RefPtr<Cairo::ImageSurface>& wave, ExportAna
        }
        cr->stroke ();
 
-       // > -1dBTP
+       // >= -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 ();