diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2011-04-25 15:15:15 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2011-04-25 15:15:15 +0000 |
| commit | 7699456a952d6aa2904115e0041699090774545b (patch) | |
| tree | 51588630a4b2feb90e258cb8c9082f3e44dc8a3b /src/plugins | |
| parent | 3f6b469fac96a6f1187b6022fac28aa26faee230 (diff) | |
| download | qmmp-7699456a952d6aa2904115e0041699090774545b.tar.gz qmmp-7699456a952d6aa2904115e0041699090774545b.tar.bz2 qmmp-7699456a952d6aa2904115e0041699090774545b.zip | |
removed unused code
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2172 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp | 7 | ||||
| -rw-r--r-- | src/plugins/Input/ffmpeg/settingsdialog.cpp | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp index d1b6c4c76..dde7257e5 100644 --- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp +++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp @@ -78,14 +78,7 @@ const DecoderProperties DecoderFFmpegFactory::properties() const { QSettings settings(Qmmp::configFile(), QSettings::IniFormat); QStringList filters; -#if (LIBAVCODEC_VERSION_INT >= ((51<<16)+(44<<8)+0)) filters << "*.wma" << "*.ape"; -#else - filters << "*.wma"; -#endif -#if (LIBAVCODEC_VERSION_INT >= ((52<<16)+(20<<8)+0)) - filters << "*.shn"; -#endif filters = settings.value("FFMPEG/filters", filters).toStringList(); DecoderProperties properties; properties.name = tr("FFmpeg Plugin"); diff --git a/src/plugins/Input/ffmpeg/settingsdialog.cpp b/src/plugins/Input/ffmpeg/settingsdialog.cpp index e714fba47..3d6a9c56f 100644 --- a/src/plugins/Input/ffmpeg/settingsdialog.cpp +++ b/src/plugins/Input/ffmpeg/settingsdialog.cpp @@ -38,7 +38,6 @@ SettingsDialog::SettingsDialog(QWidget *parent) QStringList filters; filters << "*.wma"; filters << "*.ape"; - filters << "*.shn"; filters = settings.value("FFMPEG/filters", filters).toStringList(); avcodec_init(); avcodec_register_all(); @@ -60,6 +59,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) ui.raCheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_RA_288)); ui.raCheckBox->setChecked(filters.contains("*.ra") && avcodec_find_decoder(CODEC_ID_RA_288)); ui.shCheckBox->setChecked(filters.contains("*.shn") && avcodec_find_decoder(CODEC_ID_SHORTEN)); + ui.ac3CheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_AC3)); ui.ac3CheckBox->setChecked(filters.contains("*.ac3") && avcodec_find_decoder(CODEC_ID_AC3)); } |