Enable Menu > Quit to work again after startup on macOS

[ardour.git] / gtk2_ardour / export_report.cc

diff --git a/gtk2_ardour/export_report.cc b/gtk2_ardour/export_report.cc
index 5840597554ab908efa2c1feb06b924f2a94db0aa..8c3274c82d3594b68da31ad0889356e45b7750d3 100644 (file)
--- a/gtk2_ardour/export_report.cc
+++ b/gtk2_ardour/export_report.cc
@@ -1,19 +1,20 @@
 /*
- * Copyright (C) 2016 Robin Gareus <robin@gareus.org>
+ * Copyright (C) 2016-2017 Paul Davis <paul@linuxaudiosystems.com>
+ * Copyright (C) 2016-2018 Robin Gareus <robin@gareus.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <algorithm>
@@ -123,9 +124,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 +142,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 +183,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;
@@ -961,7 +966,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 {
@@ -986,7 +991,7 @@ ExportReport::audition (std::string path, unsigned n_chn, int page)
        PBD::PropertyList plist;
 
        plist.add (ARDOUR::Properties::start, 0);
-       plist.add (ARDOUR::Properties::length, srclist[0]->length(srclist[0]->timeline_position()));
+       plist.add (ARDOUR::Properties::length, srclist[0]->length(srclist[0]->natural_position()));
        plist.add (ARDOUR::Properties::name, rname);
        plist.add (ARDOUR::Properties::layer, 0);
 
@@ -1034,7 +1039,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;
@@ -1169,7 +1174,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 ();