changeset 2594:2de306979a2a sv_v4.2

Minor updates to debug and other wording for 4.2; fix failure to show plugin population warning dialog
author Chris Cannam
date Fri, 14 Aug 2020 10:48:29 +0100
parents bc882961a233
children 72bab0a558c9
files CHANGELOG INSTALL.txt README.md main/NetworkPermissionTester.cpp repoint-lock.json
diffstat 5 files changed, 18 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGELOG	Fri Aug 14 10:39:02 2020 +0100
+++ b/CHANGELOG	Fri Aug 14 10:48:29 2020 +0100
@@ -1,5 +1,5 @@
 
-Changes in Sonic Visualiser v4.2 (August 2020) since the previous release 4.1:
+Changes in Sonic Visualiser v4.2 (14 August 2020) since the previous release 4.1:
 
  - Speed up startup, especially on Windows and especially when a lot
    of plugins are installed. Plugins are now scanned after the main
--- a/INSTALL.txt	Fri Aug 14 10:39:02 2020 +0100
+++ b/INSTALL.txt	Fri Aug 14 10:48:29 2020 +0100
@@ -2,16 +2,18 @@
 How to compile Sonic Visualiser from source
 ===========================================
 
-(NOTE: Refer also to .travis.yml and .appveyor.yml to see what the
-continuous-integration processes do to run a build)
+(NOTE: Refer also to .travis.yml and .appveyor.yml to how the
+continuous-integration processes run a build)
 
-On Windows and Mac is it actually easier to build from a checkout of
+On Windows and Mac it is perhaps easier to build from a checkout of
 the Mercurial repository (be sure to update to the appropriate tag if
 you need a specific release) than it is to build from an official
 Sonic Visualiser source release package. This is because the
 repository checkout pulls in some required library builds, while the
 source package contains only Sonic Visualiser code.
 
+On Linux it is simpler to build from a source package.
+
 
 Windows
 -------
@@ -90,17 +92,13 @@
 For the rest, if you happen to be using a Debian-based Linux, you
 probably want to apt install something like the following packages:
 
-build-essential libbz2-dev libfftw3-dev libfishsound1-dev
-libid3tag0-dev liblo-dev liblrdf0-dev libmad0-dev liboggz2-dev
-libopus-dev libopusfile-dev libpulse-dev libsamplerate-dev
-libsndfile-dev libsord-dev libxml2-utils portaudio19-dev qt5-default
-libqt5svg5-dev raptor2-utils librubberband-dev libcapnp-dev git mercurial
-autoconf automake libtool mlton
+build-essential libbz2-dev libfftw3-dev libfishsound1-dev libid3tag0-dev liblo-dev liblrdf0-dev libmad0-dev liboggz2-dev libopus-dev libopusfile-dev libpulse-dev libsamplerate-dev libsndfile-dev libsord-dev libxml2-utils portaudio19-dev qt5-default libqt5svg5-dev raptor2-utils librubberband-dev capnproto libcapnp-dev git mercurial autoconf automake libtool mlton
 
 If you are building Sonic Visualiser from a repository checkout, then
 the configure script will use Repoint to obtain further checkouts of
-various modules. You will need to have a SML compiler installed for
-this to work, such as SML/NJ, MLton, or Poly/ML - hence the presence
-of mlton in the Debian package list above. This is not necessary when
-building from an official Sonic Visualiser source release.
+various dependencies. You will need to have a SML compiler installed
+for this to work, such as SML/NJ, MLton, or Poly/ML - hence the
+presence of mlton in the Debian package list above. This is not
+necessary when building from an official Sonic Visualiser source
+release.
 
--- a/README.md	Fri Aug 14 10:39:02 2020 +0100
+++ b/README.md	Fri Aug 14 10:48:29 2020 +0100
@@ -50,7 +50,7 @@
 Christian Landone, Mathieu Barthet, Dan Stowell, Jesus Corral Garcia,
 Matthias Mauch, and Craig Sapp.
 
-Code copyright 2005-2007 Chris Cannam and copyright 2006-2019 Queen
+Code copyright 2005-2007 Chris Cannam and copyright 2006-2020 Queen
 Mary, University of London, except where indicated in the individual
 source files.
 
--- a/main/NetworkPermissionTester.cpp	Fri Aug 14 10:39:02 2020 +0100
+++ b/main/NetworkPermissionTester.cpp	Fri Aug 14 10:48:29 2020 +0100
@@ -81,8 +81,8 @@
         QString postamble;
         postamble = QCoreApplication::translate
             ("NetworkPermissionTester",
-             "<p><b>No personal information will be sent, no tracking is carried out, and no individual information will be shared with anyone else.</b> We will however make aggregate counts of distinct requests for usage reporting.</p>"
-             "<p>We recommend that you allow this, because it makes Sonic Visualiser more useful to you and supports the public funding of this work. But if you do not wish to allow it, please un-check the box below.<br></p>");
+             "<p><b>No personal information will be sent, no tracking is carried out, and no information will be shared with anyone else.</b></p>"
+             "<p>We recommend that you allow this, because it makes Sonic Visualiser more useful to you. But if you do not wish to allow it, please un-check the box below.<br></p>");
         
         QLabel *label = new QLabel;
         label->setWordWrap(true);
--- a/repoint-lock.json	Fri Aug 14 10:39:02 2020 +0100
+++ b/repoint-lock.json	Fri Aug 14 10:48:29 2020 +0100
@@ -4,13 +4,13 @@
       "pin": "0e32c328b02a"
     },
     "svcore": {
-      "pin": "bdab3a921d5d"
+      "pin": "f803d3c33f76"
     },
     "svgui": {
-      "pin": "cbbb411da977"
+      "pin": "f67e9e12e101"
     },
     "svapp": {
-      "pin": "ee430e9ffccc"
+      "pin": "1089d65c585d"
     },
     "checker": {
       "pin": "e839338d3869"