From bf694d32f1c20ee7908a60ccd30c2b6cc3bcbf3b Mon Sep 17 00:00:00 2001 From: martii Date: Thu, 31 Oct 2013 21:38:06 +0100 Subject: [PATCH] drop #ifdef ENABLE_FLAC --- src/driver/audiodec/basedec.cpp | 3 --- src/gui/audioplayer.cpp | 6 ------ src/gui/filebrowser.cpp | 2 -- 3 files changed, 11 deletions(-) diff --git a/src/driver/audiodec/basedec.cpp b/src/driver/audiodec/basedec.cpp index 0d6067e41..9c041a6d1 100644 --- a/src/driver/audiodec/basedec.cpp +++ b/src/driver/audiodec/basedec.cpp @@ -27,9 +27,6 @@ #ifdef HAVE_CONFIG_H #include #endif -#ifdef ENABLE_FLAC -#include -#endif #include #include #include diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp index ceae77bee..6e3855293 100644 --- a/src/gui/audioplayer.cpp +++ b/src/gui/audioplayer.cpp @@ -220,9 +220,7 @@ void CAudioPlayerGui::Init(void) audiofilefilter.addFilter("m3u"); audiofilefilter.addFilter("ogg"); audiofilefilter.addFilter("wav"); -#ifdef ENABLE_FLAC audiofilefilter.addFilter("flac"); -#endif } m_SMSKeyInput.setTimeout(AUDIOPLAYERGUI_SMSKEY_TIMEOUT); } @@ -1305,9 +1303,7 @@ bool CAudioPlayerGui::openFilebrowser(void) || (files->getType() == CFile::FILE_OGG) || (files->getType() == CFile::FILE_MP3) || (files->getType() == CFile::FILE_WAV) -#ifdef ENABLE_FLAC || (files->getType() == CFile::FILE_FLAC) -#endif ) { CAudiofileExt audiofile(files->Name, @@ -1398,9 +1394,7 @@ bool CAudioPlayerGui::openFilebrowser(void) || fileType == CFile::FILE_MP3 || fileType == CFile::FILE_OGG || fileType == CFile::FILE_WAV -#ifdef ENABLE_FLAC || fileType == CFile::FILE_FLAC -#endif ) { CAudiofileExt audioFile(filename,fileType); diff --git a/src/gui/filebrowser.cpp b/src/gui/filebrowser.cpp index 01614f2fc..8dae63ad0 100644 --- a/src/gui/filebrowser.cpp +++ b/src/gui/filebrowser.cpp @@ -1295,9 +1295,7 @@ void CFileBrowser::paintItem(unsigned int pos) case CFile::FILE_MP3: case CFile::FILE_OGG: case CFile::FILE_WAV: -#ifdef ENABLE_FLAC case CFile::FILE_FLAC: -#endif fileicon = NEUTRINO_ICON_MP3; // color = COL_MENUCONTENT_TEXT; break;