mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

drop #ifdef ENABLE_FLAC

Browse Source
This commit is contained in:
martii
2013-10-31 21:38:06 +01:00
committed by [CST] Focus
parent e41f122970
commit bf694d32f1
3 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/driver/audiodec/basedec.cpp
View File

@@ -27,9 +27,6 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#ifdef ENABLE_FLAC
#include <flacdec.h>
#endif
#include <linux/soundcard.h> #include <linux/soundcard.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>

6
src/gui/audioplayer.cpp
View File

@@ -220,9 +220,7 @@ void CAudioPlayerGui::Init(void)
audiofilefilter.addFilter("m3u"); audiofilefilter.addFilter("m3u");
audiofilefilter.addFilter("ogg"); audiofilefilter.addFilter("ogg");
audiofilefilter.addFilter("wav"); audiofilefilter.addFilter("wav");
#ifdef ENABLE_FLAC
audiofilefilter.addFilter("flac"); audiofilefilter.addFilter("flac");
#endif
} }
m_SMSKeyInput.setTimeout(AUDIOPLAYERGUI_SMSKEY_TIMEOUT); m_SMSKeyInput.setTimeout(AUDIOPLAYERGUI_SMSKEY_TIMEOUT);
} }
@@ -1305,9 +1303,7 @@ bool CAudioPlayerGui::openFilebrowser(void)
|| (files->getType() == CFile::FILE_OGG) || (files->getType() == CFile::FILE_OGG)
|| (files->getType() == CFile::FILE_MP3) || (files->getType() == CFile::FILE_MP3)
|| (files->getType() == CFile::FILE_WAV) || (files->getType() == CFile::FILE_WAV)
#ifdef ENABLE_FLAC
|| (files->getType() == CFile::FILE_FLAC) || (files->getType() == CFile::FILE_FLAC)
#endif
) )
{ {
CAudiofileExt audiofile(files->Name, CAudiofileExt audiofile(files->Name,
@@ -1398,9 +1394,7 @@ bool CAudioPlayerGui::openFilebrowser(void)
|| fileType == CFile::FILE_MP3 || fileType == CFile::FILE_MP3
|| fileType == CFile::FILE_OGG || fileType == CFile::FILE_OGG
|| fileType == CFile::FILE_WAV || fileType == CFile::FILE_WAV
#ifdef ENABLE_FLAC
|| fileType == CFile::FILE_FLAC || fileType == CFile::FILE_FLAC
#endif
) )
{ {
CAudiofileExt audioFile(filename,fileType); CAudiofileExt audioFile(filename,fileType);

2
src/gui/filebrowser.cpp
View File

@@ -1295,9 +1295,7 @@ void CFileBrowser::paintItem(unsigned int pos)
case CFile::FILE_MP3: case CFile::FILE_MP3:
case CFile::FILE_OGG: case CFile::FILE_OGG:
case CFile::FILE_WAV: case CFile::FILE_WAV:
#ifdef ENABLE_FLAC
case CFile::FILE_FLAC: case CFile::FILE_FLAC:
#endif
fileicon = NEUTRINO_ICON_MP3; fileicon = NEUTRINO_ICON_MP3;
// color = COL_MENUCONTENT_TEXT; // color = COL_MENUCONTENT_TEXT;
break; break;