# HG changeset patch
# User Chris Cannam
# Date 1570629490 -3600
# Node ID ef0778016c88f46d5eb5fa78bff1e871bb685f50
# Parent  d3abe983e1c03b625b6bd7fa219ee85df91e406f
Version and beta warning

diff -r d3abe983e1c0 -r ef0778016c88 CHANGELOG
--- a/CHANGELOG	Wed Oct 09 14:02:01 2019 +0100
+++ b/CHANGELOG	Wed Oct 09 14:58:10 2019 +0100
@@ -1,3 +1,17 @@
+
+Changes in Tony 2.1 (Oct 2019) since the previous release 2.0:
+
+ - Fix problems reopening session files
+
+ - Add support for reading the Opus audio codec on all platforms
+
+ - Add support for WMA and AAC formats on 64-bit Windows. (AAC was
+   already supported on macOS.) Note that AAC support on Windows does
+   not support "gapless" import, i.e. removing the encoder gaps at
+   start and end of the stream
+
+ - Update platform builds with newer libraries and updated platform
+   support
 
 Changes in Tony 2.0 (23 Oct 2015) since the previous release 1.0:
 
diff -r d3abe983e1c0 -r ef0778016c88 main/MainWindow.cpp
--- a/main/MainWindow.cpp	Wed Oct 09 14:02:01 2019 +0100
+++ b/main/MainWindow.cpp	Wed Oct 09 14:58:10 2019 +0100
@@ -1264,6 +1264,8 @@
     Pane::registerShortcuts(*m_keyReference);
 
     updateLayerStatuses();
+    
+    QTimer::singleShot(500, this, SLOT(betaReleaseWarning()));
 }
 
 
@@ -3201,6 +3203,14 @@
 }
 
 void
+MainWindow::betaReleaseWarning()
+{
+    QMessageBox::information
+        (this, tr("Beta release"),
+         tr("<b>This is a beta release of %1</b><p>Please see the \"What's New\" option in the Help menu for a list of changes since the last proper release.</p>").arg(QApplication::applicationName()));
+}
+
+void
 MainWindow::help()
 {
     //!!! todo: help URL!
@@ -3293,14 +3303,6 @@
 void
 MainWindow::about()
 {
-    bool debug = false;
-    QString version = "(unknown version)";
-
-#ifdef BUILD_DEBUG
-    debug = true;
-#endif
-    version = tr("Release %1").arg(TONY_VERSION);
-
     QString aboutText;
 
     aboutText += tr("<h3>About Tony</h3>");
diff -r d3abe983e1c0 -r ef0778016c88 main/MainWindow.h
--- a/main/MainWindow.h	Wed Oct 09 14:02:01 2019 +0100
+++ b/main/MainWindow.h	Wed Oct 09 14:58:10 2019 +0100
@@ -158,6 +158,8 @@
     virtual void keyReference();
     virtual void whatsNew();
 
+    virtual void betaReleaseWarning();
+    
     virtual void newerVersionAvailable(QString);
 
     virtual void selectionChangedByUser();
diff -r d3abe983e1c0 -r ef0778016c88 main/main.cpp
--- a/main/main.cpp	Wed Oct 09 14:02:01 2019 +0100
+++ b/main/main.cpp	Wed Oct 09 14:58:10 2019 +0100
@@ -55,13 +55,15 @@
     // Avoid this happening more than once across threads
 
     cerr << "signalHandler: cleaning up and exiting" << endl;
-    cleanupMutex.lock();
-    if (!cleanedUp) {
-        TempDirectory::getInstance()->cleanup();
-        cleanedUp = true;
+
+    if (cleanupMutex.tryLock(5000)) {
+        if (!cleanedUp) {
+            TempDirectory::getInstance()->cleanup();
+            cleanedUp = true;
+        }
+        cleanupMutex.unlock();
     }
-    cleanupMutex.unlock();
-    cerr << "signalHandler: cleaned up" << endl;
+    
     exit(0);
 }
 
diff -r d3abe983e1c0 -r ef0778016c88 version.h
--- a/version.h	Wed Oct 09 14:02:01 2019 +0100
+++ b/version.h	Wed Oct 09 14:58:10 2019 +0100
@@ -1,1 +1,1 @@
-#define TONY_VERSION "2.1"
+#define TONY_VERSION "2.1-pre1"