From 60eeac0b1092ce060fa4375dcba1dc566f3a3f33 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Sat, 27 Feb 2016 09:41:23 -0500 Subject: [PATCH] Remove changes not really needed to fix warnings, and which broke some builds --- src/import/ImportFLAC.cpp | 3 --- src/ondemand/ODDecodeFlacTask.cpp | 3 --- 2 files changed, 6 deletions(-) diff --git a/src/import/ImportFLAC.cpp b/src/import/ImportFLAC.cpp index 84be29987..b09de45a1 100644 --- a/src/import/ImportFLAC.cpp +++ b/src/import/ImportFLAC.cpp @@ -215,9 +215,6 @@ void MyFLACFile::metadata_callback(const FLAC__StreamMetadata *metadata) case FLAC__METADATA_TYPE_PICTURE: // ignore pictures case FLAC__METADATA_TYPE_UNDEFINED: // do nothing with this either break; - - case FLAC__MAX_METADATA_TYPE: // suppress compiler warning - wxASSERT(false); } } diff --git a/src/ondemand/ODDecodeFlacTask.cpp b/src/ondemand/ODDecodeFlacTask.cpp index 7b2277d8c..b42fffa1d 100644 --- a/src/ondemand/ODDecodeFlacTask.cpp +++ b/src/ondemand/ODDecodeFlacTask.cpp @@ -79,9 +79,6 @@ void ODFLACFile::metadata_callback(const FLAC__StreamMetadata *metadata) case FLAC__METADATA_TYPE_PICTURE: // ignore pictures case FLAC__METADATA_TYPE_UNDEFINED: // do nothing with this either break; - - case FLAC__MAX_METADATA_TYPE: // suppress compiler warning - break; } }