Skip to content

Commit

Permalink
Fix build with DEBUG_ASSERT_UNREACHABLE()
Browse files Browse the repository at this point in the history
  • Loading branch information
@daschuer
daschuer committed Jan 9, 2025
1 parent 39944d3 commit b5f3fe7
Show file tree
Hide file tree
Showing 10 changed files with 45 additions and 44 deletions.
2 changes: 1 addition & 1 deletion src/analyzer/plugins/analyzerqueenmarykey.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ bool AnalyzerQueenMaryKey::initialize(mixxx::audio::SampleRate sampleRate) {

if (!ChromaticKey_IsValid(iKey)) {
qWarning() << "No valid key detected in analyzed window:" << iKey;
DEBUG_ASSERT(!"iKey is invalid");
DEBUG_ASSERT_UNREACHABLE(!"iKey is invalid");
return false;
}
const auto key = static_cast<ChromaticKey>(iKey);
Expand Down
1 change: 0 additions & 1 deletion src/effects/backends/effectprocessor.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,6 @@ class EffectProcessorImpl : public EffectProcessor {
}
}

DEBUG_ASSERT(requiredVectorSize > 0);
auto& outputChannelStates = m_channelStateMatrix[inputChannel];
DEBUG_ASSERT(outputChannelStates.size() == 0);
outputChannelStates.reserve(requiredVectorSize);
Expand Down
6 changes: 4 additions & 2 deletions src/engine/effects/engineeffectsdelay.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,12 @@ class EngineEffectsDelay final : public EngineObject {
/// a zero delay. When is the delay set, the EngineEffectsDelay::process
/// method works with this set delay value until the value is changed.
void setDelayFrames(SINT delayFrames) {
VERIFY_OR_DEBUG_ASSERT(delayFrames >= 0) {
if (delayFrames < 0) {
DEBUG_ASSERT_UNREACHABLE(false);
delayFrames = 0;
}
VERIFY_OR_DEBUG_ASSERT(delayFrames <= kMaxDelayFrames) {
if (delayFrames > kMaxDelayFrames) {
DEBUG_ASSERT_UNREACHABLE(false);
delayFrames = kMaxDelayFrames;
}

Expand Down
12 changes: 6 additions & 6 deletions src/library/dao/autodjcratesdao.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ TrackId AutoDJCratesDAO::getRandomTrackId() {
AUTODJACTIVETRACKS_TABLE);
if (!oQuery.exec()) {
LOG_FAILED_QUERY(oQuery);
DEBUG_ASSERT(!"failed query");
DEBUG_ASSERT_UNREACHABLE(!"failed query");
return TrackId();
}
int iUnplayedTracks = 0;
Expand Down Expand Up @@ -649,7 +649,7 @@ TrackId AutoDJCratesDAO::getRandomTrackId() {
oQuery.bindValue (":active", iActiveTracks);
if (!oQuery.exec()) {
LOG_FAILED_QUERY(oQuery);
DEBUG_ASSERT(!"failed query");
DEBUG_ASSERT_UNREACHABLE(!"failed query");
return TrackId();
}
if (oQuery.next()) {
Expand Down Expand Up @@ -680,7 +680,7 @@ TrackId AutoDJCratesDAO::getRandomTrackIdFromAutoDj(int percentActive) {
" WHERE " AUTODJCRATESTABLE_AUTODJREFS " > 0" );
if (!oQuery.exec()) {
LOG_FAILED_QUERY(oQuery);
DEBUG_ASSERT(!"failed query");
DEBUG_ASSERT_UNREACHABLE(!"failed query");
return TrackId();
}
VERIFY_OR_DEBUG_ASSERT(oQuery.next()) {
Expand Down Expand Up @@ -720,7 +720,7 @@ TrackId AutoDJCratesDAO::getRandomTrackIdFromAutoDj(int percentActive) {
oQuery.bindValue (":active", iActiveTracks);
if (!oQuery.exec()) {
LOG_FAILED_QUERY(oQuery);
DEBUG_ASSERT(!"failed query");
DEBUG_ASSERT_UNREACHABLE(!"failed query");
return TrackId();
}
if (oQuery.next()) {
Expand Down Expand Up @@ -1185,7 +1185,7 @@ TrackId AutoDJCratesDAO::getRandomTrackIdFromLibrary(int iPlaylistId) {
oQuery.bindValue(":id",iPlaylistId);
if (!oQuery.exec()) {
LOG_FAILED_QUERY(oQuery);
DEBUG_ASSERT(!"failed query");
DEBUG_ASSERT_UNREACHABLE(!"failed query");
return TrackId();
}
int iTotalTracks = 0;
Expand Down Expand Up @@ -1249,7 +1249,7 @@ TrackId AutoDJCratesDAO::getRandomTrackIdFromLibrary(int iPlaylistId) {
oQuery.bindValue(":offset", offset);
if (!oQuery.exec()) {
LOG_FAILED_QUERY(oQuery);
DEBUG_ASSERT(!"failed query");
DEBUG_ASSERT_UNREACHABLE(!"failed query");
return TrackId();
}
if (oQuery.next()) {
Expand Down
4 changes: 2 additions & 2 deletions src/library/dao/cuedao.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ QList<CuePointer> CueDAO::getCuesForTrack(TrackId trackId) const {
kLogger.warning()
<< "Failed to load cues of track"
<< trackId;
DEBUG_ASSERT(!"failed query");
DEBUG_ASSERT_UNREACHABLE(!"failed query");
return cues;
}
QMap<int, CuePointer> hotCuesByNumber;
Expand Down Expand Up @@ -234,7 +234,7 @@ void CueDAO::saveTrackCues(
kLogger.warning()
<< "Failed to delete orphaned cues of track"
<< trackId;
DEBUG_ASSERT(!"failed query");
DEBUG_ASSERT_UNREACHABLE(!"failed query");
return;
}
if (query.numRowsAffected() > 0) {
Expand Down
2 changes: 1 addition & 1 deletion src/library/dao/directorydao.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ DirectoryDAO::AddResult DirectoryDAO::addDirectory(
kLogger.warning()
<< "Failed to remove obsolete child directory"
<< oldDir.location();
DEBUG_ASSERT(!"removeDirectory failed");
DEBUG_ASSERT_UNREACHABLE(!"removeDirectory failed");
continue;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/library/dao/settingsdao.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ bool SettingsDAO::setValue(const QString& name, const QVariant& value) const {
kLogger.warning()
<< "Failed to set" << name << "=" << value
<< query.lastError();
DEBUG_ASSERT(!"Failed query");
DEBUG_ASSERT_UNREACHABLE(!"Failed query");
return false;
}
return true;
Expand Down
56 changes: 28 additions & 28 deletions src/library/dao/trackdao.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ void markTrackLocationsAsDeleted(const QSqlDatabase& database, const QString& di
if (!query.exec()) {
LOG_FAILED_QUERY(query)
<< "Couldn't mark tracks in" << directory << "as deleted.";
DEBUG_ASSERT(!"Failed query");
DEBUG_ASSERT_UNREACHABLE(!"Failed query");
}
}

Expand Down Expand Up @@ -152,7 +152,7 @@ TrackId TrackDAO::getTrackIdByLocation(const QString& location) const {
query.bindValue(":location", location);
if (!query.exec()) {
LOG_FAILED_QUERY(query);
DEBUG_ASSERT(!"Failed query");
DEBUG_ASSERT_UNREACHABLE(!"Failed query");
return {};
}
if (!query.next()) {
Expand Down Expand Up @@ -201,7 +201,7 @@ QList<TrackId> TrackDAO::resolveTrackIds(
"(location varchar (512))");
if (!query.exec()) {
LOG_FAILED_QUERY(query);
DEBUG_ASSERT(!"Failed query");
DEBUG_ASSERT_UNREACHABLE(!"Failed query");
return trackIds;
}

Expand All @@ -211,7 +211,7 @@ QList<TrackId> TrackDAO::resolveTrackIds(
"VALUES " + pathList.join(','));
if (!query.exec()) {
LOG_FAILED_QUERY(query);
DEBUG_ASSERT(!"Failed query");
DEBUG_ASSERT_UNREACHABLE(!"Failed query");
}

if (flags & ResolveTrackIdFlag::AddMissing) {
Expand All @@ -225,7 +225,7 @@ QList<TrackId> TrackDAO::resolveTrackIds(
"WHERE playlist_import.location = track_locations.location)");
if (!query.exec()) {
LOG_FAILED_QUERY(query);
DEBUG_ASSERT(!"Failed query");
DEBUG_ASSERT_UNREACHABLE(!"Failed query");
}
const int locationColumn = query.record().indexOf("location");
while (query.next()) {
Expand Down Expand Up @@ -273,7 +273,7 @@ QList<TrackId> TrackDAO::resolveTrackIds(
query.prepare("DROP TABLE IF EXISTS playlist_import");
if (!query.exec()) {
LOG_FAILED_QUERY(query);
DEBUG_ASSERT(!"Failed query");
DEBUG_ASSERT_UNREACHABLE(!"Failed query");
}

return trackIds;
Expand All @@ -286,7 +286,7 @@ QSet<QString> TrackDAO::getAllTrackLocations() const {
"INNER JOIN library on library.location = track_locations.id");
if (!query.exec()) {
LOG_FAILED_QUERY(query);
DEBUG_ASSERT(!"Failed query");
DEBUG_ASSERT_UNREACHABLE(!"Failed query");
}

int locationColumn = query.record().indexOf("location");
Expand All @@ -309,7 +309,7 @@ QString TrackDAO::getTrackLocation(TrackId trackId) const {
query.bindValue(":id", trackId.toVariant());
if (!query.exec()) {
LOG_FAILED_QUERY(query);
DEBUG_ASSERT(!"Failed query");
DEBUG_ASSERT_UNREACHABLE(!"Failed query");
return "";
}
const int locationColumn = query.record().indexOf("location");
Expand Down Expand Up @@ -686,7 +686,7 @@ bool insertTrackLibrary(
LOG_FAILED_QUERY(*pTrackLibraryInsert)
<< "Failed to insert new track into library:"
<< fileInfo;
DEBUG_ASSERT(!"Failed query");
DEBUG_ASSERT_UNREACHABLE(!"Failed query");
return false;
}
return true;
Expand Down Expand Up @@ -987,7 +987,7 @@ QList<TrackRef> TrackDAO::getAllTrackRefs(const QDir& rootDir) const {
query.bindValue(":locationPathPrefix", locationPathPrefix);
if (!query.exec()) {
LOG_FAILED_QUERY(query) << "could not get tracks within directory:" << locationPathPrefix;
DEBUG_ASSERT(!"Failed query");
DEBUG_ASSERT_UNREACHABLE(!"Failed query");
}

QList<TrackRef> trackRefs;
Expand Down Expand Up @@ -1419,7 +1419,7 @@ TrackPointer TrackDAO::getTrackById(TrackId trackId) const {
if (!query.exec()) {
LOG_FAILED_QUERY(query)
<< QString("getTrack(%1)").arg(trackId.toString());
DEBUG_ASSERT(!"Failed query");
DEBUG_ASSERT_UNREACHABLE(!"Failed query");
return nullptr;
}

Expand Down Expand Up @@ -1495,7 +1495,7 @@ TrackPointer TrackDAO::getTrackById(TrackId trackId) const {
int recordCount = queryRecord.count();
if (recordCount != columnsCount) {
recordCount = math_min(recordCount, columnsCount);
DEBUG_ASSERT(!"Failed query");
DEBUG_ASSERT_UNREACHABLE(!"Failed query");
}
for (int i = 0; i < recordCount; ++i) {
TrackPopulatorFn populator = columns[i].populator;
Expand Down Expand Up @@ -1696,7 +1696,7 @@ bool TrackDAO::updateTrack(const Track& track) const {

if (!query.exec()) {
LOG_FAILED_QUERY(query);
DEBUG_ASSERT(!"Failed query");
DEBUG_ASSERT_UNREACHABLE(!"Failed query");
return false;
}

Expand Down Expand Up @@ -1732,7 +1732,7 @@ void TrackDAO::invalidateTrackLocationsInLibrary() const {
if (!query.exec()) {
LOG_FAILED_QUERY(query)
<< "Couldn't mark tracks in library as needing verification.";
DEBUG_ASSERT(!"Failed query");
DEBUG_ASSERT_UNREACHABLE(!"Failed query");
}
}

Expand All @@ -1747,7 +1747,7 @@ void TrackDAO::markTrackLocationsAsVerified(const QStringList& locations) const
if (!query.exec()) {
LOG_FAILED_QUERY(query)
<< "Couldn't mark track locations as verified.";
DEBUG_ASSERT(!"Failed query");
DEBUG_ASSERT_UNREACHABLE(!"Failed query");
}
}

Expand All @@ -1763,7 +1763,7 @@ void TrackDAO::markTracksInDirectoriesAsVerified(const QStringList& directories)
if (!query.exec()) {
LOG_FAILED_QUERY(query)
<< "Couldn't mark tracks in" << directories.size() << "directories as verified.";
DEBUG_ASSERT(!"Failed query");
DEBUG_ASSERT_UNREACHABLE(!"Failed query");
}
}

Expand All @@ -1776,7 +1776,7 @@ void TrackDAO::markUnverifiedTracksAsDeleted() {
QSet<TrackId> trackIds;
if (!query.exec()) {
LOG_FAILED_QUERY(query) << "Couldn't find unverified tracks";
DEBUG_ASSERT(!"Failed query");
DEBUG_ASSERT_UNREACHABLE(!"Failed query");
}
while (query.next()) {
trackIds.insert(TrackId(query.value(query.record().indexOf("id"))));
Expand All @@ -1788,7 +1788,7 @@ void TrackDAO::markUnverifiedTracksAsDeleted() {
if (!query.exec()) {
LOG_FAILED_QUERY(query)
<< "Couldn't mark unverified tracks as deleted.";
DEBUG_ASSERT(!"Failed query");
DEBUG_ASSERT_UNREACHABLE(!"Failed query");
}
}

Expand Down Expand Up @@ -1854,7 +1854,7 @@ bool TrackDAO::detectMovedTracks(
"WHERE fs_deleted=1");
if (!oldTrackQuery.exec()) {
LOG_FAILED_QUERY(oldTrackQuery);
DEBUG_ASSERT(!"Failed query");
DEBUG_ASSERT_UNREACHABLE(!"Failed query");
return false;
}
QSqlRecord oldTrackQueryRecord = oldTrackQuery.record();
Expand Down Expand Up @@ -1883,7 +1883,7 @@ bool TrackDAO::detectMovedTracks(
newTrackQuery.bindValue(":duration", duration);
if (!newTrackQuery.exec()) {
LOG_FAILED_QUERY(newTrackQuery);
DEBUG_ASSERT(!"Failed query");
DEBUG_ASSERT_UNREACHABLE(!"Failed query");
continue;
}
const auto newTrackIdColumn = newTrackQuery.record().indexOf("track_id");
Expand Down Expand Up @@ -1957,7 +1957,7 @@ bool TrackDAO::detectMovedTracks(
LOG_FAILED_QUERY(query);
// Last chance to skip this entry, i.e. nothing has been
// deleted or updated yet!
DEBUG_ASSERT(!"Failed query");
DEBUG_ASSERT_UNREACHABLE(!"Failed query");
continue;
}
}
Expand All @@ -1972,7 +1972,7 @@ bool TrackDAO::detectMovedTracks(
query.bindValue(":oldid", relocatedTrack.updatedTrackRef().getId().toVariant());
if (!query.exec()) {
LOG_FAILED_QUERY(query);
DEBUG_ASSERT(!"Failed query");
DEBUG_ASSERT_UNREACHABLE(!"Failed query");
}
}

Expand All @@ -1983,7 +1983,7 @@ bool TrackDAO::detectMovedTracks(
query.bindValue(":id", oldTrackLocationId.toVariant());
if (!query.exec()) {
LOG_FAILED_QUERY(query);
DEBUG_ASSERT(!"Failed query");
DEBUG_ASSERT_UNREACHABLE(!"Failed query");
}
}

Expand All @@ -2006,7 +2006,7 @@ void TrackDAO::hideAllTracks(const QDir& rootDir) const {
query.bindValue(":locationPathPrefix", locationPathPrefix);
if (!query.exec()) {
LOG_FAILED_QUERY(query) << "could not get tracks within directory:" << rootDir;
DEBUG_ASSERT(!"Failed query");
DEBUG_ASSERT_UNREACHABLE(!"Failed query");
}

QStringList trackIds;
Expand All @@ -2019,7 +2019,7 @@ void TrackDAO::hideAllTracks(const QDir& rootDir) const {
"WHERE id in (%1)").arg(trackIds.join(",")));
if (!query.exec()) {
LOG_FAILED_QUERY(query);
DEBUG_ASSERT(!"Failed query");
DEBUG_ASSERT_UNREACHABLE(!"Failed query");
}
}

Expand All @@ -2041,7 +2041,7 @@ bool TrackDAO::verifyRemainingTracks(
"WHERE needs_verification = 1");
if (!query.exec()) {
LOG_FAILED_QUERY(query);
DEBUG_ASSERT(!"Failed query");
DEBUG_ASSERT_UNREACHABLE(!"Failed query");
return false;
}

Expand Down Expand Up @@ -2119,7 +2119,7 @@ void TrackDAO::detectCoverArtForTracksWithoutCover(volatile const bool* pCancel,
if (!query.exec()) {
LOG_FAILED_QUERY(query)
<< "failed looking for tracks with unknown cover art";
DEBUG_ASSERT(!"Failed query");
DEBUG_ASSERT_UNREACHABLE(!"Failed query");
return;
}

Expand All @@ -2142,7 +2142,7 @@ void TrackDAO::detectCoverArtForTracksWithoutCover(volatile const bool* pCancel,
if (source == CoverInfo::USER_SELECTED) {
qWarning() << "PROGRAMMING ERROR! detectCoverArtForTracksWithoutCover()"
<< "got a USER_SELECTED track. Skipping.";
DEBUG_ASSERT(!"Failed query");
DEBUG_ASSERT_UNREACHABLE(!"Failed query");
continue;
}
tracksWithoutCover.append(track);
Expand Down
2 changes: 1 addition & 1 deletion src/track/cueinfo.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ void assertEndPosition(
break;
case CueType::Beat: // unused
default:
DEBUG_ASSERT(!"Unknown Loop Type");
DEBUG_ASSERT_UNREACHABLE(!"Unknown Loop Type");
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/track/serato/tags.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ void SeratoTags::setCueInfos(const QList<CueInfo>& cueInfos, double timingOffset
case CueType::Loop:
if (!cueInfoSeratoAdjusted.getEndPositionMillis().has_value()) {
qWarning() << "Loop Cue" << hotcueIndex << "has no end position";
DEBUG_ASSERT(false);
DEBUG_ASSERT_UNREACHABLE(false);
continue;
}
hotcueIndex -= kLoopImportIndexOffset;
Expand Down

0 comments on commit b5f3fe7

Please sign in to comment.