[patch] 2.2.0-support-without-midi.patch

2.2.0-support-without-midi.patch (text/plain), 4.84 KB, created by Matt Whitlock on 2017-11-11 01:28:32 UTC

--- src/AudioIO.cpp~	2017-10-25 19:02:28.000000000 +0000
+++ src/AudioIO.cpp	2017-11-10 23:57:09.894239348 +0000
@@ -963,6 +963,7 @@
 };
 #endif
 
+#ifdef EXPERIMENTAL_MIDI_OUT
 // return the system time as a double
 static double streamStartTime = 0; // bias system time to small number
 
@@ -982,6 +983,7 @@
 
    return PaUtil_GetTime() - streamStartTime;
 }
+#endif
 
 const int AudioIO::StandardRates[] = {
    8000,
@@ -1790,6 +1792,7 @@
    }
 #endif
 
+#ifdef EXPERIMENTAL_MIDI_OUT
    // We use audio latency to estimate how far ahead of DACS we are writing
    if (mPortStreamV19 != NULL && mLastPaError == paNoError) {
       const PaStreamInfo* info = Pa_GetStreamInfo(mPortStreamV19);
@@ -1798,6 +1801,7 @@
       mAudioOutLatency = info->outputLatency;
       mSystemMinusAudioTimePlusLatency += mAudioOutLatency;
    }
+#endif
 
    return (mLastPaError == paNoError);
 }
@@ -1925,8 +1929,10 @@
 
    double playbackTime = 4.0;
 
+#ifdef EXPERIMENTAL_MIDI_OUT
    streamStartTime = 0;
    streamStartTime = SystemTime(mUsingAlsa);
+#endif
 
 #ifdef EXPERIMENTAL_SCRUBBING_SUPPORT
    bool scrubbing = (options.pScrubbingOptions != nullptr);
@@ -4619,13 +4625,13 @@
          (float *)alloca(framesPerBuffer*numPlaybackChannels * sizeof(float)) :
          (float *)outputBuffer;
 
+#ifdef EXPERIMENTAL_MIDI_OUT
    if (gAudioIO->mCallbackCount++ == 0) {
        // This is effectively mSystemMinusAudioTime when the buffer is empty:
        gAudioIO->mStartTime = SystemTime(gAudioIO->mUsingAlsa) - gAudioIO->mT0;
        // later, mStartTime - mSystemMinusAudioTime will tell us latency
    }
 
-#ifdef EXPERIMENTAL_MIDI_OUT
    /* GSW: Save timeInfo in case MidiPlayback needs it */
    gAudioIO->mAudioCallbackClockTime = PaUtil_GetTime();
 
@@ -5001,7 +5007,9 @@
                   : gAudioIO->mTime >= gAudioIO->mT1))
                   // PRL: singalling MIDI output complete is necessary if
                   // not USE_MIDI_THREAD, otherwise it's harmlessly redundant
+#ifdef EXPERIMENTAL_MIDI_OUT
                   gAudioIO->mMidiOutputComplete = true,
+#endif
                   callbackReturn = paComplete;
             }
             
@@ -5064,7 +5072,9 @@
 
                // PRL: singalling MIDI output complete is necessary if
                // not USE_MIDI_THREAD, otherwise it's harmlessly redundant
+#ifdef EXPERIMENTAL_MIDI_OUT
                gAudioIO->mMidiOutputComplete = true,
+#endif
                callbackReturn = paComplete;
             }
          }
--- src/Project.cpp~	2017-10-25 19:39:31.000000000 +0000
+++ src/Project.cpp	2017-11-11 00:35:48.925309313 +0000
@@ -461,9 +461,11 @@
          } );
 
          for (const auto &name : sortednames) {
+#ifdef USE_MIDI
             if (Importer::IsMidi(name))
                AudacityProject::DoImportMIDI(mProject, name);
             else
+#endif
                mProject->Import(name);
          }
 
@@ -3031,9 +3033,11 @@
    // FIXME: //v Surely we could be smarter about this, like checking much earlier that this is a .aup file.
    if (temp.Mid(0, 6) != wxT("<?xml ")) {
       // If it's not XML, try opening it as any other form of audio
+#ifdef USE_MIDI
       if (Importer::IsMidi(fileName))
          DoImportMIDI(this, fileName);
       else
+#endif
          Import(fileName);
       return;
    }
--- src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.cpp~	2017-08-31 21:30:45.000000000 +0000
+++ src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.cpp	2017-11-11 00:59:41.921182626 +0000
@@ -9,6 +9,9 @@
 **********************************************************************/
 
 #include "../../../../Audacity.h"
+
+#ifdef USE_MIDI
+
 #include "NoteTrackButtonHandle.h"
 
 #include "../../../../HitTestResult.h"
@@ -113,3 +116,4 @@
    return RefreshCode::RefreshNone;
 }
 
+#endif
--- src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp~	2017-08-31 21:30:45.000000000 +0000
+++ src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp	2017-11-11 01:00:23.218552664 +0000
@@ -9,6 +9,9 @@
 **********************************************************************/
 
 #include "../../../../Audacity.h"
+
+#ifdef USE_MIDI
+
 #include "NoteTrackVZoomHandle.h"
 #include "../../../../Experimental.h"
 #include "NoteTrackVRulerControls.h"
@@ -166,3 +169,5 @@
       TrackVRulerControls::DrawZooming
          ( dc, mRect, panelRect, mZoomStart, mZoomEnd );
 }
+
+#endif
--- src/tracks/ui/TimeShiftHandle.cpp~	2017-08-31 21:30:45.000000000 +0000
+++ src/tracks/ui/TimeShiftHandle.cpp	2017-11-11 00:31:44.146110340 +0000
@@ -604,7 +604,7 @@
       {
          trySnap = true;
          if (pTrack->GetKind() == Track::Wave) {
-            auto wt = static_cast<const WaveTrack *>(pTrack);
+            auto wt = static_cast<const WaveTrack *>(pTrack.get());
             const double rate = wt->GetRate();
             // set it to a sample point
             desiredSlideAmount = rint(desiredSlideAmount * rate) / rate;