64 lines
2.5 KiB
Diff
64 lines
2.5 KiB
Diff
|
diff -r -u /tmp/audacity-minsrc-2.1.1/src/effects/vamp/LoadVamp.cpp audacity-minsrc-2.1.1/src/effects/vamp/LoadVamp.cpp
|
||
|
|
--- audacity-minsrc-2.1.1/src/effects/vamp/LoadVamp.cpp 2015-07-10 19:35:40.000000000 +0200
|
||
|
|
+++ audacity-minsrc-2.1.1/src/effects/vamp/LoadVamp.cpp 2016-06-17 11:18:54.897140407 +0200
|
||
|
|
@@ -266,7 +266,7 @@
|
||
|
|
Plugin *vp = PluginLoader::getInstance()->loadPlugin(key, 48000); // rate doesn't matter here
|
||
|
|
if (!vp)
|
||
|
|
{
|
||
|
|
- return false;
|
||
|
|
+ return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
// We limit the listed plugin outputs to those whose results can
|
||
|
|
diff -r -u /tmp/audacity-minsrc-2.1.1/src/import/ImportFLAC.cpp audacity-minsrc-2.1.1/src/import/ImportFLAC.cpp
|
||
|
|
--- audacity-minsrc-2.1.1/src/import/ImportFLAC.cpp 2015-07-10 19:35:40.000000000 +0200
|
||
|
|
+++ audacity-minsrc-2.1.1/src/import/ImportFLAC.cpp 2016-06-17 11:17:46.555821274 +0200
|
||
|
|
@@ -296,7 +296,7 @@
|
||
|
|
int cnt;
|
||
|
|
wxFile binaryFile;
|
||
|
|
if (!binaryFile.Open(filename)) {
|
||
|
|
- return false; // File not found
|
||
|
|
+ return NULL; // File not found
|
||
|
|
}
|
||
|
|
|
||
|
|
#ifdef USE_LIBID3TAG
|
||
|
|
@@ -313,7 +313,7 @@
|
||
|
|
|
||
|
|
if (cnt == wxInvalidOffset || strncmp(buf, FLAC_HEADER, 4) != 0) {
|
||
|
|
// File is not a FLAC file
|
||
|
|
- return false;
|
||
|
|
+ return NULL;
|
||
|
|
}
|
||
|
|
|
||
|
|
// Open the file for import
|
||
|
|
diff -r -u /tmp/audacity-minsrc-2.1.1/src/WaveTrack.cpp audacity-minsrc-2.1.1/src/WaveTrack.cpp
|
||
|
|
--- audacity-minsrc-2.1.1/src/WaveTrack.cpp 2015-07-10 19:35:40.000000000 +0200
|
||
|
|
+++ audacity-minsrc-2.1.1/src/WaveTrack.cpp 2016-06-17 11:17:12.099156221 +0200
|
||
|
|
@@ -2561,7 +2561,7 @@
|
||
|
|
const sampleCount len0 = mPTrack->GetBestBlockSize(start0);
|
||
|
|
wxASSERT(len0 <= mBufferSize);
|
||
|
|
if (!mPTrack->Get(samplePtr(mBuffers[0].data), floatSample, start0, len0))
|
||
|
|
- return false;
|
||
|
|
+ return 0;
|
||
|
|
mBuffers[0].start = start0;
|
||
|
|
mBuffers[0].len = len0;
|
||
|
|
if (!fillSecond &&
|
||
|
|
@@ -2587,7 +2587,7 @@
|
||
|
|
const sampleCount len1 = mPTrack->GetBestBlockSize(start1);
|
||
|
|
wxASSERT(len1 <= mBufferSize);
|
||
|
|
if (!mPTrack->Get(samplePtr(mBuffers[1].data), floatSample, start1, len1))
|
||
|
|
- return false;
|
||
|
|
+ return 0;
|
||
|
|
mBuffers[1].start = start1;
|
||
|
|
mBuffers[1].len = len1;
|
||
|
|
mNValidBuffers = 2;
|
||
|
|
@@ -2637,7 +2637,7 @@
|
||
|
|
// Very big request!
|
||
|
|
// Fall back to direct fetch
|
||
|
|
if (!mPTrack->Get(buffer, format, start, remaining))
|
||
|
|
- return false;
|
||
|
|
+ return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
return mOverlapBuffer.ptr();
|