From 7bb2417db3bc6215cc45feb1d55823f3b8fa0563 Mon Sep 17 00:00:00 2001
From: Leland Lucius <github@homerow.net>
Date: Wed, 22 Jul 2020 14:40:14 -0500
Subject: [PATCH] AUP3: Fix flushing of tracks/clips in AUP importer

---
 src/ProjectFileIO.cpp     |  3 +--
 src/SqliteSampleBlock.cpp |  1 -
 src/import/ImportAUP.cpp  | 11 +++--------
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/ProjectFileIO.cpp b/src/ProjectFileIO.cpp
index a5b390b92..faf7bee08 100644
--- a/src/ProjectFileIO.cpp
+++ b/src/ProjectFileIO.cpp
@@ -2460,7 +2460,6 @@ void DBConnection::CheckpointThread()
             mCheckpointCurrentPages.store( mCheckpointWaitingPages );
             mCheckpointWaitingPages = 0;
          }
-   wxLogDebug(wxT("thread pages %d"), mCheckpointCurrentPages.load());
 
          // And kick off the checkpoint. This may not checkpoint ALL frames
          // in the WAL.  They'll be gotten the next time around.
@@ -2486,7 +2485,7 @@ int DBConnection::CheckpointHook(void *data, sqlite3 *db, const char *schema, in
    std::lock_guard<std::mutex> guard(that->mCheckpointMutex);
    that->mCheckpointWaitingPages = pages;
    that->mCheckpointCondition.notify_one();
-wxLogDebug("hook pages %d", pages);
+
    return SQLITE_OK;
 }
 
diff --git a/src/SqliteSampleBlock.cpp b/src/SqliteSampleBlock.cpp
index 13b42d5fc..101c3c8be 100644
--- a/src/SqliteSampleBlock.cpp
+++ b/src/SqliteSampleBlock.cpp
@@ -303,7 +303,6 @@ void SqliteSampleBlock::SetSamples(samplePtr src,
                                    sampleFormat srcformat)
 {
    mSampleFormat = srcformat;
-
    mSampleCount = numsamples;
    mSampleBytes = mSampleCount * SAMPLE_SIZE(mSampleFormat);
    mSamples.reinit(mSampleBytes);
diff --git a/src/import/ImportAUP.cpp b/src/import/ImportAUP.cpp
index 565a94482..735547f38 100644
--- a/src/import/ImportAUP.cpp
+++ b/src/import/ImportAUP.cpp
@@ -503,16 +503,9 @@ void AUPImportFileHandle::HandleXMLEndTag(const wxChar *tag)
 
    struct node node = mHandlers.back();
 
-   if (wxStrcmp(tag, wxT("wavetrack")) == 0)
-   {
-      WaveTrack *wt = static_cast<WaveTrack *>(node.handler);
-
-      wt->Flush();
-   }
-   else if (wxStrcmp(tag, wxT("waveclip")) == 0)
+   if (wxStrcmp(tag, wxT("waveclip")) == 0)
    {
       mClip = static_cast<WaveClip *>(node.handler);
-      mClip->Flush();
       mClip->HandleXMLEndTag(tag);
    }
    else
@@ -1545,10 +1538,12 @@ bool AUPImportFileHandle::AddSamples(const FilePath &filename,
    if (mClip)
    {
       mClip->Append(bufptr, format, cnt);
+      mClip->Flush();
    }
    else if (mWaveTrack)
    {
       mWaveTrack->Append(bufptr, format, cnt);
+      mWaveTrack->Flush();
    }
 
    // Let the finally block know everything is good