[packages/qmmp] - new URLs, updated to 0.10.8 (latest version for Qt 4) - removed obsolete ffmpeg3 patch
qboosh
qboosh at pld-linux.org
Fri May 19 23:14:41 CEST 2017
commit 943076d30f7679ca348a1b52a70ee31bc79424f1
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri May 19 23:15:29 2017 +0200
- new URLs, updated to 0.10.8 (latest version for Qt 4)
- removed obsolete ffmpeg3 patch
ffmpeg3.patch | 195 -----------------------------------------------
qmmp.spec | 241 ++++++++++++++++++++++++++++++++++++++++++++--------------
2 files changed, 184 insertions(+), 252 deletions(-)
---
diff --git a/qmmp.spec b/qmmp.spec
index df87451..62c8a47 100644
--- a/qmmp.spec
+++ b/qmmp.spec
@@ -1,56 +1,97 @@
-Summary: XMMS like audio player written in Qt
+# TODO: Output/oss4 plugin (R: soundcard.h from OSS 4)
+Summary: XMMS like audio player based on Qt
Summary(hu.UTF-8): XMMS-szerű Qt alapú audio-lejátszó
-Summary(pl.UTF-8): Odtwarzacz muzyki w stylu XMMS napisany w Qt
+Summary(pl.UTF-8): Odtwarzacz muzyki w stylu XMMS oparty na Qt
Name: qmmp
-Version: 0.7.1
-Release: 5
-License: GPL v2
+Version: 0.10.8
+Release: 1
+License: GPL v2+
Group: X11/Applications/Multimedia
-Source0: http://qmmp.googlecode.com/files/%{name}-%{version}.tar.bz2
-# Source0-md5: d5ecc15134eefc1b8af4220540a65f19
-Patch0: ffmpeg3.patch
-URL: http://code.google.com/p/qmmp/
-BuildRequires: Qt3Support-devel
+Source0: http://qmmp.ylsoftware.com/files/%{name}-%{version}.tar.bz2
+# Source0-md5: 5504999a4a0ee477367871ff181be4d6
+URL: http://qmmp.ylsoftware.com/
+BuildRequires: Qt3Support-devel >= 4.6
BuildRequires: QtCore-devel >= 4.6
+BuildRequires: QtDBus-devel >= 4.6
BuildRequires: QtGui-devel >= 4.6
-BuildRequires: QtNetwork-devel
-BuildRequires: QtOpenGL-devel
+BuildRequires: QtMultimedia-devel >= 4.6
+BuildRequires: QtNetwork-devel >= 4.6
+BuildRequires: QtOpenGL-devel >= 4.6
BuildRequires: alsa-lib-devel >= 1.0.1
-BuildRequires: cmake
+BuildRequires: cmake >= 2.8.6
BuildRequires: curl-devel >= 7.16
BuildRequires: enca-devel >= 1.9
-BuildRequires: faad2-devel
-BuildRequires: ffmpeg-devel >= 0.4.9
+BuildRequires: faad2-devel >= 2.6.1
+# libavcodec>=53.34.0 libavformat>=53.20.0 libavutil>=51.21.0
+BuildRequires: ffmpeg-devel >= 0.9.1
BuildRequires: flac-devel >= 1.1.3
-BuildRequires: game-music-emu-devel
+BuildRequires: game-music-emu-devel >= 0.5.5
BuildRequires: gettext-tools
BuildRequires: jack-audio-connection-kit-devel >= 0.102.5
BuildRequires: libbs2b-devel >= 3.0.0
-BuildRequires: libcddb-devel
-BuildRequires: libcdio-devel
-BuildRequires: libcdio-devel
+BuildRequires: libcddb-devel >= 1.3.1
+BuildRequires: libcdio-devel >= 0.80
+BuildRequires: libcdio-paranoia-devel >= 0.90_10.2
BuildRequires: libmad-devel
BuildRequires: libmms-devel >= 0.4
BuildRequires: libmodplug-devel >= 0.8.4
BuildRequires: libmpcdec-devel >= 1.2.6
+BuildRequires: libogg-devel
BuildRequires: libprojectM-devel >= 2.0.0
BuildRequires: libsamplerate-devel >= 0.1.2
+BuildRequires: libsidplayfp-devel >= 1.0.3
BuildRequires: libsndfile-devel >= 1.0.17
+BuildRequires: libstdc++-devel
BuildRequires: libvorbis-devel
+BuildRequires: opus-devel >= 1.0.2
BuildRequires: opusfile-devel >= 0.2
+BuildRequires: pkgconfig
BuildRequires: pulseaudio-devel >= 0.9.15
-BuildRequires: qt4-linguist
-BuildRequires: rpmbuild(macros) >= 1.129
+BuildRequires: qt4-build >= 4.6.0
+BuildRequires: qt4-linguist >= 4.6.0
+BuildRequires: rpmbuild(macros) >= 1.605
BuildRequires: sed >= 4.0
-BuildRequires: taglib-devel >= 1.4.0
+BuildRequires: soxr-devel >= 0.1.0
+BuildRequires: taglib-devel >= 1.6
BuildRequires: wavpack-devel >= 4.41
-BuildRequires: wildmidi-devel
-Requires(post,postun): /sbin/ldconfig
+BuildRequires: wildmidi-devel >= 0.2.3.4
+BuildRequires: xorg-lib-libX11-devel
+Requires: Qt3Support >= 4.6
+Requires: QtCore >= 4.6
+Requires: QtDBus >= 4.6
+Requires: QtGui >= 4.6
+Requires: QtMultimedia >= 4.6
+Requires: QtNetwork >= 4.6
+Requires: QtOpenGL >= 4.6
+Requires: curl-libs >= 7.16
+Requires: enca-libs >= 1.9
+Requires: faad2-libs >= 2.6.1
+Requires: ffmpeg-libs >= 0.9.1
+Requires: flac >= 1.1.3
+Requires: game-music-emu >= 0.5.5
+Requires: jack-audio-connection-kit-libs >= 0.102.5
+Requires: libbs2b >= 3.0.0
+Requires: libcddb >= 1.3.1
+Requires: libcdio >= 0.80
+Requires: libcdio-paranoia >= 0.90_10.2
+Requires: libmms >= 0.4
+Requires: libmodplug >= 0.8.4
+Requires: libmpcdec >= 1.2.6
+Requires: libprojectM >= 2.0.0
+Requires: libsidplayfp >= 1.0.3
+Requires: libsndfile >= 1.0.17
+Requires: opus >= 1.0.2
+Requires: opusfile >= 0.2
+Requires: pulseaudio-libs >= 0.9.15
+Requires: soxr >= 0.1.0
+Requires: taglib >= 1.6
+Requires: wavpack >= 4.41
+Requires: wildmidi >= 0.2.3.4
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
Audio player that supports:
-- file formats among: Vorbis, FLAC, MPEG1, WMA, WAV,
+- file formats among: Vorbis, FLAC, MPEG1, WMA, WAV...
- plugins,
- Winamp and XMMS skins and more.
@@ -61,51 +102,41 @@ A lejátszó a következőket támogatja:
- Wnamp és XMMS szkinek és még sok mást.
%description -l pl.UTF-8
-Odtwarzacz audio wspierający:
-- formaty plikow m.in.: Vorbis, Flac, MPEG1, WMA, WAW, i inne,
+Odtwarzacz audio obsługujący m.in.:
+- formaty plikow m.in.: Vorbis, FLAC, MPEG1, WMA, WAV i inne,
- system wtyczek,
-- skórki z XMMS i Winampa, i więcej.
+- skórki z XMMS i Winampa.
%package devel
Summary: Header files for qmmp
Summary(pl.UTF-8): Pliki nagłówkowe qmmp
-License: GPL v2.1+
Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: QtCore-devel >= 4.6
+Requires: QtGui-devel >= 4.6
+Requires: QtNetwork-devel >= 4.6
%description devel
-Header files for qmmp
+Header files for qmmp.
%description devel -l pl.UTF-8
-Pliki nagłówkowe qmmp
-
+Pliki nagłówkowe qmmp.
%prep
%setup -q
-%patch0 -p1
%build
install -d build
cd build
-%cmake \
- -DCMAKE_INSTALL_PREFIX=%{_prefix} \
- -DLIB_INSTALL_DIR=%{_libdir} \
- -DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \
-%if "%{_lib}" == "lib64"
- -DLIB_SUFFIX=64 \
-%endif
- ..
+%cmake ..
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-cd build
-%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT \
- kde_htmldir=%{_kdedocdir} \
- kde_libs_htmldir=%{_kdedocdir}
-
+%{__make} -C build install \
+ DESTDIR=$RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
@@ -115,27 +146,123 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/libqmmp.so.0.*.*
+%doc AUTHORS COPYING.CC-by-sa_V4 ChangeLog ChangeLog.svn README
+%lang(ru) %doc ChangeLog.rus README.RUS
+%lang(uk) %doc README.UKR
+%attr(755,root,root) %{_bindir}/qmmp
+%attr(755,root,root) %{_libdir}/libqmmp.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libqmmp.so.0
-%attr(755,root,root) %{_libdir}/libqmmpui.so.0.*.*
+%attr(755,root,root) %{_libdir}/libqmmpui.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libqmmpui.so.0
-%attr(755,root,root) %{_libdir}/qmmp/
+%dir %{_libdir}/qmmp/CommandLineOptions
+%attr(755,root,root) %{_libdir}/qmmp/CommandLineOptions/lib*option.so
+%dir %{_libdir}/qmmp/Effect
+# R: libbs2b
+%attr(755,root,root) %{_libdir}/qmmp/Effect/libbs2b.so
+%attr(755,root,root) %{_libdir}/qmmp/Effect/libcrossfade.so
+%attr(755,root,root) %{_libdir}/qmmp/Effect/libladspa.so
+# R: soxr
+%attr(755,root,root) %{_libdir}/qmmp/Effect/libsoxr.so
+%attr(755,root,root) %{_libdir}/qmmp/Effect/libstereo.so
+%dir %{_libdir}/qmmp/Engines
+%attr(755,root,root) %{_libdir}/qmmp/Engines/libmplayer.so
+%dir %{_libdir}/qmmp/FileDialogs
+%attr(755,root,root) %{_libdir}/qmmp/FileDialogs/lib*dialog.so
+%dir %{_libdir}/qmmp/General
+# R: taglib
+%attr(755,root,root) %{_libdir}/qmmp/General/libconverter.so
+%attr(755,root,root) %{_libdir}/qmmp/General/libcopypaste.so
+%attr(755,root,root) %{_libdir}/qmmp/General/libcovermanager.so
+%attr(755,root,root) %{_libdir}/qmmp/General/libfileops.so
+%attr(755,root,root) %{_libdir}/qmmp/General/libgnomehotkey.so
+# R: QtDBus
+%attr(755,root,root) %{_libdir}/qmmp/General/libhal.so
+# R: libX11
+%attr(755,root,root) %{_libdir}/qmmp/General/libhotkey.so
+# R: QtDBus
+%attr(755,root,root) %{_libdir}/qmmp/General/libkdenotify.so
+%attr(755,root,root) %{_libdir}/qmmp/General/liblyrics.so
+# R: QtDBus
+%attr(755,root,root) %{_libdir}/qmmp/General/libmpris.so
+%attr(755,root,root) %{_libdir}/qmmp/General/libnotifier.so
+# R: taglib
+%attr(755,root,root) %{_libdir}/qmmp/General/librgscan.so
+%attr(755,root,root) %{_libdir}/qmmp/General/libscrobbler.so
+%attr(755,root,root) %{_libdir}/qmmp/General/libstatusicon.so
+%attr(755,root,root) %{_libdir}/qmmp/General/libstreambrowser.so
+%attr(755,root,root) %{_libdir}/qmmp/General/libtrackchange.so
+# R: QtDBus
+%attr(755,root,root) %{_libdir}/qmmp/General/libudisks2.so
+%dir %{_libdir}/qmmp/Input
+# R: faad2 taglib
+%attr(755,root,root) %{_libdir}/qmmp/Input/libaac.so
+# R: libcddb libcdio libcdio-paranoia
+%attr(755,root,root) %{_libdir}/qmmp/Input/libcdaudio.so
+# R: enca-libs
+%attr(755,root,root) %{_libdir}/qmmp/Input/libcue.so
+# R: ffmpeg-libs
+%attr(755,root,root) %{_libdir}/qmmp/Input/libffmpeg.so
+# R: flac taglib
+%attr(755,root,root) %{_libdir}/qmmp/Input/libflac.so
+# R: game-music-emu
+%attr(755,root,root) %{_libdir}/qmmp/Input/libgme.so
+# R: libmad taglib
+%attr(755,root,root) %{_libdir}/qmmp/Input/libmad.so
+# R: libmodplug
+%attr(755,root,root) %{_libdir}/qmmp/Input/libmodplug.so
+# R: libmpcdec taglib
+%attr(755,root,root) %{_libdir}/qmmp/Input/libmpc.so
+# R: opus opusfile taglib
+%attr(755,root,root) %{_libdir}/qmmp/Input/libopus.so
+# R: libsidplayfp
+%attr(755,root,root) %{_libdir}/qmmp/Input/libsid.so
+# R: libsndfile
+%attr(755,root,root) %{_libdir}/qmmp/Input/libsndfile.so
+# R: libvorbis taglib
+%attr(755,root,root) %{_libdir}/qmmp/Input/libvorbis.so
+# R: wavpack
+%attr(755,root,root) %{_libdir}/qmmp/Input/libwavpack.so
+# R: wildmidi
+%attr(755,root,root) %{_libdir}/qmmp/Input/libwildmidi.so
+%dir %{_libdir}/qmmp/Output
+# R: alsa-lib
+%attr(755,root,root) %{_libdir}/qmmp/Output/libalsa.so
+# R: jack-audio-connection-kit-libs soxr
+%attr(755,root,root) %{_libdir}/qmmp/Output/libjack.so
+%attr(755,root,root) %{_libdir}/qmmp/Output/libnull.so
+# R: pulseaudio-libs
+%attr(755,root,root) %{_libdir}/qmmp/Output/libpulseaudio.so
+# R: QtMultimedia
+%attr(755,root,root) %{_libdir}/qmmp/Output/libqtmultimedia.so
+%dir %{_libdir}/qmmp/PlayListFormats
+%attr(755,root,root) %{_libdir}/qmmp/PlayListFormats/lib*playlistformat.so
+%dir %{_libdir}/qmmp/Transports
+# R: curl-libs enca-libs
+%attr(755,root,root) %{_libdir}/qmmp/Transports/libhttp.so
+# R: libmms
+%attr(755,root,root) %{_libdir}/qmmp/Transports/libmms.so
+%dir %{_libdir}/qmmp/Ui
+%attr(755,root,root) %{_libdir}/qmmp/Ui/libqsui.so
+# R: libX11
+%attr(755,root,root) %{_libdir}/qmmp/Ui/libskinned.so
+%dir %{_libdir}/qmmp/Visual
+%attr(755,root,root) %{_libdir}/qmmp/Visual/libanalyzer.so
+%attr(755,root,root) %{_libdir}/qmmp/Visual/libprojectm.so
%{_desktopdir}/qmmp.desktop
-%{_desktopdir}/qmmp_cue.desktop
-%{_desktopdir}/qmmp_enqueue.desktop
%{_desktopdir}/qmmp_dir.desktop
+%{_desktopdir}/qmmp_enqueue.desktop
%dir %{_datadir}/qmmp
%dir %{_datadir}/qmmp/images
%{_datadir}/qmmp/images/*.png
-%{_iconsdir}/hicolor/*/apps/qmmp.png
-%{_iconsdir}/hicolor/scalable/apps/*.svgz
+%{_iconsdir}/hicolor/*x*/apps/qmmp.png
+%{_iconsdir}/hicolor/scalable/apps/qmmp.svgz
+%{_iconsdir}/hicolor/scalable/apps/qmmp-simple.svgz
%files devel
%defattr(644,root,root,755)
-%{_includedir}/qmmp
-%{_includedir}/qmmpui
%attr(755,root,root) %{_libdir}/libqmmp.so
%attr(755,root,root) %{_libdir}/libqmmpui.so
+%{_includedir}/qmmp
+%{_includedir}/qmmpui
%{_pkgconfigdir}/qmmp.pc
%{_pkgconfigdir}/qmmpui.pc
diff --git a/ffmpeg3.patch b/ffmpeg3.patch
deleted file mode 100644
index a26d798..0000000
--- a/ffmpeg3.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-diff -ur qmmp-0.7.1/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp qmmp-0.7.1.ffmpeg3/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
---- qmmp-0.7.1/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp 2013-05-31 11:03:32.000000000 +0200
-+++ qmmp-0.7.1.ffmpeg3/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp 2016-04-16 19:21:32.427821767 +0200
-@@ -187,9 +187,9 @@
- }
-
- if (c->channels > 0)
-- c->request_channels = qMin(2, c->channels);
-+ c->request_channel_layout = av_get_default_channel_layout(qMin(2, c->channels));
- else
-- c->request_channels = 2;
-+ c->request_channel_layout = av_get_default_channel_layout(2);
-
- av_dump_format(ic,0,0,0);
-
-@@ -207,11 +207,11 @@
- return false;
- }
-
-- m_decoded_frame = avcodec_alloc_frame();
-+ m_decoded_frame = av_frame_alloc();
-
- m_totalTime = input()->isSequential() ? 0 : ic->duration * 1000 / AV_TIME_BASE;
-
-- if(c->codec_id == CODEC_ID_SHORTEN) //ffmpeg bug workaround
-+ if(c->codec_id == AV_CODEC_ID_SHORTEN) //ffmpeg bug workaround
- m_totalTime = 0;
-
- Qmmp::AudioFormat format = Qmmp::PCM_UNKNOWM;
-@@ -236,7 +236,7 @@
- return false;
- }
-
-- configure(c->sample_rate, c->request_channels, format);
-+ configure(c->sample_rate, av_get_channel_layout_nb_channels(c->request_channel_layout), format);
-
- if(ic->bit_rate)
- m_bitrate = ic->bit_rate/1000;
-@@ -273,7 +273,7 @@
- return 0;
- qint64 len = qMin(m_output_at, maxSize);
-
-- if(av_sample_fmt_is_planar(c->sample_fmt) && c->request_channels > 1)
-+ if(av_sample_fmt_is_planar(c->sample_fmt) && av_get_channel_layout_nb_channels(c->request_channel_layout) > 1)
- {
- int bps = av_get_bytes_per_sample(c->sample_fmt);
- for(int i = 0; i < len >> 1; i+=bps)
-@@ -314,7 +314,7 @@
- int got_frame = 0;
- if((m_pkt.stream_index == wma_idx))
- {
-- avcodec_get_frame_defaults(m_decoded_frame);
-+ av_frame_unref(m_decoded_frame);
-
- int l = avcodec_decode_audio4(c, m_decoded_frame, &got_frame, &m_temp_pkt);
-
-@@ -372,7 +372,7 @@
- m_temp_pkt.size = 0;
- continue;
- }
-- if(m_seekTime && c->codec_id == CODEC_ID_APE)
-+ if(m_seekTime && c->codec_id == AV_CODEC_ID_APE)
- {
- int64_t rescaledPts = av_rescale(m_pkt.pts,
- AV_TIME_BASE * (int64_t)
-@@ -385,7 +385,7 @@
- m_seekTime = 0;
- }
-
-- if(m_skipBytes > 0 && c->codec_id == CODEC_ID_APE)
-+ if(m_skipBytes > 0 && c->codec_id == AV_CODEC_ID_APE)
- {
- while (m_skipBytes > 0)
- {
-@@ -414,7 +414,7 @@
- m_output_at = 0;
- m_temp_pkt.size = 0;
-
-- if(c->codec_id == CODEC_ID_SHORTEN || c->codec_id == CODEC_ID_TWINVQ)
-+ if(c->codec_id == AV_CODEC_ID_SHORTEN || c->codec_id == AV_CODEC_ID_TWINVQ)
- {
- if(m_pkt.data)
- av_free_packet(&m_pkt);
-@@ -425,7 +425,7 @@
- }
- else if(m_output_at == 0)
- {
-- if(c->codec_id == CODEC_ID_SHORTEN || c->codec_id == CODEC_ID_TWINVQ)
-+ if(c->codec_id == AV_CODEC_ID_SHORTEN || c->codec_id == AV_CODEC_ID_TWINVQ)
- continue;
-
- if(m_pkt.data)
-diff -ur qmmp-0.7.1/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp qmmp-0.7.1.ffmpeg3/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
---- qmmp-0.7.1/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp 2013-05-31 11:03:32.000000000 +0200
-+++ qmmp-0.7.1.ffmpeg3/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp 2016-04-16 19:21:58.867842241 +0200
-@@ -95,29 +95,29 @@
- filters = settings.value("FFMPEG/filters", filters).toStringList();
-
- //removed unsupported filters
-- if(!avcodec_find_decoder(CODEC_ID_WMAV1))
-+ if(!avcodec_find_decoder(AV_CODEC_ID_WMAV1))
- filters.removeAll("*.wma");
-- if(!avcodec_find_decoder(CODEC_ID_APE))
-+ if(!avcodec_find_decoder(AV_CODEC_ID_APE))
- filters.removeAll("*.ape");
-- if(!avcodec_find_decoder(CODEC_ID_TTA))
-+ if(!avcodec_find_decoder(AV_CODEC_ID_TTA))
- filters.removeAll("*.tta");
-- if(!avcodec_find_decoder(CODEC_ID_AAC))
-+ if(!avcodec_find_decoder(AV_CODEC_ID_AAC))
- filters.removeAll("*.aac");
-- if(!avcodec_find_decoder(CODEC_ID_MP3))
-+ if(!avcodec_find_decoder(AV_CODEC_ID_MP3))
- filters.removeAll("*.mp3");
-- if(!avcodec_find_decoder(CODEC_ID_AAC) && !avcodec_find_decoder(CODEC_ID_ALAC))
-+ if(!avcodec_find_decoder(AV_CODEC_ID_AAC) && !avcodec_find_decoder(AV_CODEC_ID_ALAC))
- filters.removeAll("*.m4a");
-- if(!avcodec_find_decoder(CODEC_ID_RA_288))
-+ if(!avcodec_find_decoder(AV_CODEC_ID_RA_288))
- filters.removeAll("*.ra");
-- if(!avcodec_find_decoder(CODEC_ID_SHORTEN))
-+ if(!avcodec_find_decoder(AV_CODEC_ID_SHORTEN))
- filters.removeAll("*.shn");
-- if(!avcodec_find_decoder(CODEC_ID_EAC3))
-+ if(!avcodec_find_decoder(AV_CODEC_ID_EAC3))
- filters.removeAll("*.ac3");
-- if(!avcodec_find_decoder(CODEC_ID_DTS))
-+ if(!avcodec_find_decoder(AV_CODEC_ID_DTS))
- filters.removeAll("*.dts");
-- if(!avcodec_find_decoder(CODEC_ID_TRUEHD))
-+ if(!avcodec_find_decoder(AV_CODEC_ID_TRUEHD))
- filters.removeAll("*.mka");
-- if(!avcodec_find_decoder(CODEC_ID_TWINVQ))
-+ if(!avcodec_find_decoder(AV_CODEC_ID_TWINVQ))
- filters.removeAll("*.vqf");
-
-
-diff -ur qmmp-0.7.1/src/plugins/Input/ffmpeg/settingsdialog.cpp qmmp-0.7.1.ffmpeg3/src/plugins/Input/ffmpeg/settingsdialog.cpp
---- qmmp-0.7.1/src/plugins/Input/ffmpeg/settingsdialog.cpp 2013-05-31 11:03:32.000000000 +0200
-+++ qmmp-0.7.1.ffmpeg3/src/plugins/Input/ffmpeg/settingsdialog.cpp 2016-04-16 19:22:24.964510907 +0200
-@@ -38,30 +38,30 @@
- QStringList filters;
- filters << "*.wma" << "*.ape" << "*.tta" << "*.m4a" << "*.ra" << "*.shn" << "*.vqf" << "*.ac3";
- filters = settings.value("FFMPEG/filters", filters).toStringList();
-- ui.wmaCheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_WMAV1));
-- ui.wmaCheckBox->setChecked(filters.contains("*.wma") && avcodec_find_decoder(CODEC_ID_WMAV1));
-- ui.apeCheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_APE));
-- ui.apeCheckBox->setChecked(filters.contains("*.ape") && avcodec_find_decoder(CODEC_ID_APE));
-- ui.ttaCheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_TTA));
-- ui.ttaCheckBox->setChecked(filters.contains("*.tta") && avcodec_find_decoder(CODEC_ID_TTA));
-- ui.aacCheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_AAC));
-- ui.aacCheckBox->setChecked(filters.contains("*.aac") && avcodec_find_decoder(CODEC_ID_AAC));
-- ui.mp3CheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_MP3));
-- ui.mp3CheckBox->setChecked(filters.contains("*.mp3") && avcodec_find_decoder(CODEC_ID_MP3));
-- ui.mp4CheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_AAC));
-- ui.mp4CheckBox->setChecked(filters.contains("*.m4a") && (avcodec_find_decoder(CODEC_ID_AAC)
-- || avcodec_find_decoder(CODEC_ID_ALAC)));
-- 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_EAC3));
-- ui.ac3CheckBox->setChecked(filters.contains("*.ac3") && avcodec_find_decoder(CODEC_ID_EAC3));
-- ui.dtsCheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_DTS));
-- ui.dtsCheckBox->setChecked(filters.contains("*.dts") && avcodec_find_decoder(CODEC_ID_DTS));
-- ui.mkaCheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_TRUEHD));
-- ui.mkaCheckBox->setChecked(filters.contains("*.mka") && avcodec_find_decoder(CODEC_ID_TRUEHD));
-- ui.vqfCheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_TWINVQ));
-- ui.vqfCheckBox->setChecked(filters.contains("*.vqf") && avcodec_find_decoder(CODEC_ID_TWINVQ));
-+ ui.wmaCheckBox->setEnabled(avcodec_find_decoder(AV_CODEC_ID_WMAV1));
-+ ui.wmaCheckBox->setChecked(filters.contains("*.wma") && avcodec_find_decoder(AV_CODEC_ID_WMAV1));
-+ ui.apeCheckBox->setEnabled(avcodec_find_decoder(AV_CODEC_ID_APE));
-+ ui.apeCheckBox->setChecked(filters.contains("*.ape") && avcodec_find_decoder(AV_CODEC_ID_APE));
-+ ui.ttaCheckBox->setEnabled(avcodec_find_decoder(AV_CODEC_ID_TTA));
-+ ui.ttaCheckBox->setChecked(filters.contains("*.tta") && avcodec_find_decoder(AV_CODEC_ID_TTA));
-+ ui.aacCheckBox->setEnabled(avcodec_find_decoder(AV_CODEC_ID_AAC));
-+ ui.aacCheckBox->setChecked(filters.contains("*.aac") && avcodec_find_decoder(AV_CODEC_ID_AAC));
-+ ui.mp3CheckBox->setEnabled(avcodec_find_decoder(AV_CODEC_ID_MP3));
-+ ui.mp3CheckBox->setChecked(filters.contains("*.mp3") && avcodec_find_decoder(AV_CODEC_ID_MP3));
-+ ui.mp4CheckBox->setEnabled(avcodec_find_decoder(AV_CODEC_ID_AAC));
-+ ui.mp4CheckBox->setChecked(filters.contains("*.m4a") && (avcodec_find_decoder(AV_CODEC_ID_AAC)
-+ || avcodec_find_decoder(AV_CODEC_ID_ALAC)));
-+ ui.raCheckBox->setEnabled(avcodec_find_decoder(AV_CODEC_ID_RA_288));
-+ ui.raCheckBox->setChecked(filters.contains("*.ra") && avcodec_find_decoder(AV_CODEC_ID_RA_288));
-+ ui.shCheckBox->setChecked(filters.contains("*.shn") && avcodec_find_decoder(AV_CODEC_ID_SHORTEN));
-+ ui.ac3CheckBox->setEnabled(avcodec_find_decoder(AV_CODEC_ID_EAC3));
-+ ui.ac3CheckBox->setChecked(filters.contains("*.ac3") && avcodec_find_decoder(AV_CODEC_ID_EAC3));
-+ ui.dtsCheckBox->setEnabled(avcodec_find_decoder(AV_CODEC_ID_DTS));
-+ ui.dtsCheckBox->setChecked(filters.contains("*.dts") && avcodec_find_decoder(AV_CODEC_ID_DTS));
-+ ui.mkaCheckBox->setEnabled(avcodec_find_decoder(AV_CODEC_ID_TRUEHD));
-+ ui.mkaCheckBox->setChecked(filters.contains("*.mka") && avcodec_find_decoder(AV_CODEC_ID_TRUEHD));
-+ ui.vqfCheckBox->setEnabled(avcodec_find_decoder(AV_CODEC_ID_TWINVQ));
-+ ui.vqfCheckBox->setChecked(filters.contains("*.vqf") && avcodec_find_decoder(AV_CODEC_ID_TWINVQ));
- }
-
- SettingsDialog::~SettingsDialog()
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qmmp.git/commitdiff/943076d30f7679ca348a1b52a70ee31bc79424f1
More information about the pld-cvs-commit
mailing list