<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/147cda57499dd2b43007ae5be28f712bcf5c4812">https://github.com/macports/macports-ports/commit/147cda57499dd2b43007ae5be28f712bcf5c4812</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 147cda57499 qmmp: new port in audio, a Qt-based player
</span>147cda57499 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 147cda57499dd2b43007ae5be28f712bcf5c4812
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Sat May 18 16:05:03 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> qmmp: new port in audio, a Qt-based player
</span>---
audio/qmmp/Portfile | 193 ++++++++++++++++++++++++++
audio/qmmp/files/patch-CMakeLists.diff | 101 ++++++++++++++
audio/qmmp/files/patch-fix-include.diff | 13 ++
audio/qmmp/files/patch-powerpc.diff | 232 ++++++++++++++++++++++++++++++++
4 files changed, 539 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/qmmp/Portfile b/audio/qmmp/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e47b2f29a49
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/qmmp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,193 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name qmmp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories audio multimedia
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Qt-based multimedia player
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description {*}${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt4 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 0.12.18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set branch [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 52f494a9df2dded4fbdd25a297b7247da847b792 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 cd778a945ee0c5f334ef79aa3333354ff14492ffbf6aa9bc2848c6ee341a7f69 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1466561
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-CMakeLists.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform powerpc {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-powerpc.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_HAL=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_MONOTOSTEREO=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_UDISKS2=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Temporarily disabling these, since they fail to build.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Undefined symbols: "QX11Info::display()", referenced from:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Notifier::hasFullscreenWindow() const in notifier.cpp.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # moc_statusiconpopupwidget.cpp: error: ‘StatusIconPopupWidget’ has not been declared
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # qobject.h: error: ‘QScopedPointer<QObjectData, QScopedPointerDeleter<QObjectData> > QObject::d_ptr’ is protected
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # moc_statusiconpopupwidget.cpp: error: ‘QProgressBar’ has not been declared
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_NOTIFIER=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_STATICON=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 1.6.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.depends_component qtmultimedia qttools sqlite-plugin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 ed63de6c26bc5ce72eb1936aca7d3fd48f834245 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 50da39f9d73ca385171ca4eda6a475613eb5409d5df0785e03108ead59fe1ecd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1375048
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_HISTORY=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_PIPEWIRE=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Enabling only for Qt5 for now, see above:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_NOTIFIER=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_STATICON=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set branch [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://qmmp.ylsoftware.com
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites ${homepage}/files/qmmp/${branch}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Avoid arbitrary prefix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-fix-include.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:curl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:desktop-file-utils \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:enca \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:faad2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libavcodec.dylib:ffmpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:flac \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libarchive \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libbs2b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libcddb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libcdio \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libcdio-paranoia \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libmms \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libmodplug \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libmpcdec \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libogg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libopus \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsndfile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libvorbis \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:soxr \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:taglib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:wavpack \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libX11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-xorgproto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_AAC=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_ALSA=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_ANALYZER=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_ARCHIVE=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_BS2B=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_CDA=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_CONVERTER=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_COPYPASTE=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_COVER=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_CROSSFADE=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_CUE=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_CURL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_ENCA=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_FFMPEG=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_FILEOPS=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_FILEWRITER=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_FLAC=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_GME=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_GNOMEHOTKEY=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_HOTKEY=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_JACK=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_KDENOTIFY=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_LADSPA=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_LYRICS=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_MAD=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_MPG123=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_MIDI=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_MODPLUG=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_MPC=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_MPLAYER=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_MPRIS=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_NULL=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_OPUS=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_OSS4=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_PROJECTM=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_PULSE=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_QSUI=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_QTMULTIMEDIA=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_RGSCAN=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_SB=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_SCROBBLER=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_SHOUT=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_SID=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_SKINNED=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_SNDFILE=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_SOXR=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_STEREO=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_TRACKCHANGE=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_UDISKS=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_VORBIS=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_WAVPACK=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant mad conflicts mpg123 description "Use libmad for MPEG decoding" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libmad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_MAD=OFF -DUSE_MAD=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant mpg123 conflicts mad description "Use libmad for MPEG decoding" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:mpg123
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_MPG123=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant pulse description "Enable PulseAudio output" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pulseaudio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_PULSE=OFF -DUSE_PULSE=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant shout description "Enable Icecast output" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libshout
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_SHOUT=OFF -DUSE_SHOUT=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset mpg123]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ +mad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/qmmp/files/patch-CMakeLists.diff b/audio/qmmp/files/patch-CMakeLists.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3dc970922a7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/qmmp/files/patch-CMakeLists.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,101 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt 2024-04-18 20:36:35.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2024-05-18 10:49:51.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -84,10 +84,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ execute_process(COMMAND find ${CMAKE_CURRENT_SOURCE_DIR} -name *.ts COMMAND xargs ${QT_LRELEASE_EXECUTABLE} -silent)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF(SVN_VERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-IF(${CMAKE_SYSTEM_NAME} MATCHES Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(CMAKE_INSTALL_LIBDIR "qmmp.app/Contents/Frameworks" CACHE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#IF(${CMAKE_SYSTEM_NAME} MATCHES Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# SET(CMAKE_INSTALL_LIBDIR "qmmp.app/Contents/Frameworks" CACHE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(PLUGIN_DIR "${CMAKE_INSTALL_LIBDIR}/qmmp-${QMMP_VERSION_MAJOR}.${QMMP_VERSION_MINOR}" CACHE STRING "plugin path")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -101,10 +100,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_subdirectory(src/qmmpui)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_subdirectory(src/plugins)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_subdirectory(src/app)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #Hack for MacOS X to run fix_mac_libs.sh script after installation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_subdirectory(src/mac)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# #Hack for MacOS X to run fix_mac_libs.sh script after installation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# add_subdirectory(src/mac)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(MAD_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(MPEG_DECODERS "MAD")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/app/CMakeLists.txt 2024-04-18 20:36:35.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/app/CMakeLists.txt 2024-05-18 10:59:23.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,17 +39,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the UI file won't be wrapped!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ADD_EXECUTABLE(qmmp MACOSX_BUNDLE ${app_SRCS} ${app_RCC_SRCS} ${app_HDRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ADD_EXECUTABLE(qmmp ${app_SRCS} ${app_RCC_SRCS} ${app_HDRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(qmmp ${QT_LIBRARIES} libqmmp libqmmpui)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET_TARGET_PROPERTIES(qmmp PROPERTIES OUTPUT_NAME qmmp${APP_NAME_SUFFIX})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_dependencies(qmmp libqmmpui libqmmp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-IF(${CMAKE_SYSTEM_NAME} MATCHES Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(MACOSX_BUNDLE_GUI_IDENTIFIER "com.ylsoftware.qmmp")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(MACOSX_BUNDLE_ICON_FILE "icons.icns")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install(TARGETS qmmp${APP_NAME_SUFFIX} DESTINATION .)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install(FILES images/mac/icons.icns DESTINATION ./qmmp.app/Contents/Resources)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ELSE()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#IF(${CMAKE_SYSTEM_NAME} MATCHES Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# set(MACOSX_BUNDLE_GUI_IDENTIFIER "com.ylsoftware.qmmp")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# set(MACOSX_BUNDLE_ICON_FILE "icons.icns")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# install(TARGETS qmmp${APP_NAME_SUFFIX} DESTINATION .)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# install(FILES images/mac/icons.icns DESTINATION ./qmmp.app/Contents/Resources)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ELSE()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(TARGETS qmmp DESTINATION ${CMAKE_INSTALL_BINDIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(FILES qmmp${APP_NAME_SUFFIX}.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(FILES images/16x16/qmmp${APP_NAME_SUFFIX}.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/16x16/apps)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -65,4 +65,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(FILES qmmp-enqueue${APP_NAME_SUFFIX}.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(FILES qmmp-dir${APP_NAME_SUFFIX}.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF(USE_DIR_ASSOC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/qmmp/CMakeLists.txt 2024-04-18 20:36:35.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/qmmp/CMakeLists.txt 2024-05-18 12:40:28.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -148,7 +148,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-IF(NOT ${CMAKE_SYSTEM_NAME} MATCHES Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#IF(NOT ${CMAKE_SYSTEM_NAME} MATCHES Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(APP_NAME_SUFFIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(FILES ${libqmmp_DEVEL_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/qmmp${APP_NAME_SUFFIX}/qmmp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(QMMP_INCLUDE_DIR ${CMAKE_INSTALL_FULL_INCLUDEDIR}/qmmp${APP_NAME_SUFFIX})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -158,4 +158,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/qmmp.pc.in ${CMAKE_CURRENT_BINARY_DIR}/qmmp${APP_NAME_SUFFIX}.pc @ONLY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qmmp${APP_NAME_SUFFIX}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/qmmpui/CMakeLists.txt 2024-04-18 20:36:35.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/qmmpui/CMakeLists.txt 2024-05-18 12:38:11.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -152,7 +152,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-IF(NOT ${CMAKE_SYSTEM_NAME} MATCHES Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#IF(NOT ${CMAKE_SYSTEM_NAME} MATCHES Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(APP_NAME_SUFFIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(FILES ${libqmmpui_DEVEL_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/qmmp${APP_NAME_SUFFIX}/qmmpui)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(QMMP_INCLUDE_DIR ${CMAKE_INSTALL_FULL_INCLUDEDIR}/qmmp${APP_NAME_SUFFIX})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -162,4 +162,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/qmmpui.pc.in ${CMAKE_CURRENT_BINARY_DIR}/qmmpui${APP_NAME_SUFFIX}.pc @ONLY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qmmpui${APP_NAME_SUFFIX}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ENDIF()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/qmmp/files/patch-fix-include.diff b/audio/qmmp/files/patch-fix-include.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..835f49ab06a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/qmmp/files/patch-fix-include.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt 2024-04-18 20:36:35.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2024-05-18 12:43:03.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,10 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake_minimum_required(VERSION 2.8.6 FATAL_ERROR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ project(qmmp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#freebsd support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-include_directories(SYSTEM /usr/local/include)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #macports support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /opt/local/include)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/qmmp/files/patch-powerpc.diff b/audio/qmmp/files/patch-powerpc.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6092c9a65c7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/qmmp/files/patch-powerpc.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,232 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/qmmp/audioparameters.cpp 2024-04-18 20:36:35.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/qmmp/audioparameters.cpp 2024-05-18 14:01:04.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,7 +24,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AudioParameters::AudioParameters()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_srate = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- m_format = Qmmp::PCM_S16LE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m_format = Qmmp::PCM_S16BE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_sz = 2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_precision = 16;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/qmmp/qmmpsettings.cpp 2024-04-18 20:36:35.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/qmmp/qmmpsettings.cpp 2024-05-18 14:02:04.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,7 +42,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ settings.endGroup();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //audio settings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_aud_software_volume = settings.value("Output/software_volume", false).toBool();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- m_aud_format = (Qmmp::AudioFormat) settings.value("Output/format", Qmmp::PCM_S16LE).toInt();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m_aud_format = (Qmmp::AudioFormat) settings.value("Output/format", Qmmp::PCM_S16BE).toInt();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_aud_dithering = settings.value("Output/dithering", true).toBool();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_volume_step = settings.value("Output/volume_step", 5).toInt();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //cover settings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/qmmpui/configdialog.cpp 2024-04-18 20:36:35.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/qmmpui/configdialog.cpp 2024-05-18 14:02:46.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -64,9 +64,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_ui->replayGainModeComboBox->addItem (tr("Track"), QmmpSettings::REPLAYGAIN_TRACK);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_ui->replayGainModeComboBox->addItem (tr("Album"), QmmpSettings::REPLAYGAIN_ALBUM);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_ui->replayGainModeComboBox->addItem (tr("Disabled"), QmmpSettings::REPLAYGAIN_DISABLED);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- m_ui->bitDepthComboBox->addItem("16", Qmmp::PCM_S16LE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- m_ui->bitDepthComboBox->addItem("24", Qmmp::PCM_S24LE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- m_ui->bitDepthComboBox->addItem("32", Qmmp::PCM_S32LE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m_ui->bitDepthComboBox->addItem("16", Qmmp::PCM_S16BE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m_ui->bitDepthComboBox->addItem("24", Qmmp::PCM_S24BE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m_ui->bitDepthComboBox->addItem("32", Qmmp::PCM_S32BE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef Q_OS_WIN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_ui->bitDepthComboBox->addItem("32 (float)", Qmmp::PCM_FLOAT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/plugins/Output/pulseaudio/outputpulseaudio.cpp 2024-04-18 20:36:35.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/plugins/Output/pulseaudio/outputpulseaudio.cpp 2024-05-18 13:59:30.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -94,14 +94,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case Qmmp::PCM_S8:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ss.format = PA_SAMPLE_U8;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case Qmmp::PCM_S16LE:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ss.format = PA_SAMPLE_S16LE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case Qmmp::PCM_S16BE:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ss.format = PA_SAMPLE_S16BE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case Qmmp::PCM_S24LE:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ss.format = PA_SAMPLE_S24_32LE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case Qmmp::PCM_S24BE:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ss.format = PA_SAMPLE_S24_32BE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case Qmmp::PCM_S32LE:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ss.format = PA_SAMPLE_S32LE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case Qmmp::PCM_S32BE:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ss.format = PA_SAMPLE_S32BE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case Qmmp::PCM_FLOAT:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef PA_SAMPLE_FLOAT32NE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -109,7 +109,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ss.format = PA_SAMPLE_S16LE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ss.format = PA_SAMPLE_S16BE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ss.channels = map.count();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/plugins/Output/qtmultimedia/outputqtmultimedia.cpp 2024-04-18 20:36:35.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/plugins/Output/qtmultimedia/outputqtmultimedia.cpp 2024-05-18 13:57:34.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,7 +41,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QAudioFormat qformat;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qformat.setCodec("audio/pcm");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qformat.setFrequency(freq);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- qformat.setByteOrder(QAudioFormat::LittleEndian);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ qformat.setByteOrder(QAudioFormat::BigEndian);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qformat.setChannels(map.size());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qformat.setSampleType(QAudioFormat::SignedInt);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -54,15 +54,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qformat.setSampleSize(8);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bytes_per_sample = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case Qmmp::PCM_S16LE:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case Qmmp::PCM_S16BE:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qformat.setSampleSize(16);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bytes_per_sample = 2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case Qmmp::PCM_S24LE:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case Qmmp::PCM_S24BE:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qformat.setSampleSize(24);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bytes_per_sample = 4;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case Qmmp::PCM_S32LE:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case Qmmp::PCM_S32BE:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qformat.setSampleSize(32);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bytes_per_sample = 4;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/plugins/General/converter/converter.cpp 2024-04-18 20:36:35.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/plugins/General/converter/converter.cpp 2024-05-18 14:34:52.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -290,7 +290,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AudioParameters ap = decoder->audioParameters();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AudioConverter inConverter, outConverter;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qint64 len, total = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Qmmp::AudioFormat outFormat = Qmmp::PCM_S16LE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Qmmp::AudioFormat outFormat = Qmmp::PCM_S16BE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int percent = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int prev_percent = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int samples = 0, output_at = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -300,13 +300,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inConverter.configure(ap.format());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(use16bit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- outFormat = Qmmp::PCM_S16LE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ outFormat = Qmmp::PCM_S16BE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if(ap.sampleSize() == 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ outFormat = Qmmp::PCM_S8;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if(ap.sampleSize() == 2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- outFormat = Qmmp::PCM_S16LE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ outFormat = Qmmp::PCM_S16BE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if(ap.sampleSize() == 4)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- outFormat = Qmmp::PCM_S32LE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ outFormat = Qmmp::PCM_S32BE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ outConverter.configure(outFormat);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/plugins/Input/aac/decoder_aac.cpp 2024-04-18 20:36:35.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/plugins/Input/aac/decoder_aac.cpp 2024-05-18 14:35:32.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -131,7 +131,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memmove(m_input_buf, m_input_buf + res, m_input_at - res);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_input_at -= res;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ setProperty(Qmmp::FORMAT_NAME, "AAC");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- configure(freq, chan, Qmmp::PCM_S16LE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ configure(freq, chan, Qmmp::PCM_S16BE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qDebug("DecoderAAC: initialize succes");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/plugins/Input/cdaudio/decoder_cdaudio.cpp 2024-04-18 20:36:35.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/plugins/Input/cdaudio/decoder_cdaudio.cpp 2024-05-18 14:36:04.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -455,7 +455,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qDebug("DecoderCDAudio: using cd audio capable drive \"%s\"", qPrintable(device_path));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- configure(44100, 2, Qmmp::PCM_S16LE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ configure(44100, 2, Qmmp::PCM_S16BE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_bitrate = 1411;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_totalTime = tracks[track_at].info.duration();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_first_sector = tracks[track_at].first_sector;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp 2024-04-18 20:36:35.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp 2024-05-18 14:36:47.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -324,11 +324,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case AV_SAMPLE_FMT_S16:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case AV_SAMPLE_FMT_S16P:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- format = Qmmp::PCM_S16LE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ format = Qmmp::PCM_S16BE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case AV_SAMPLE_FMT_S32:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case AV_SAMPLE_FMT_S32P:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- format = Qmmp::PCM_S32LE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ format = Qmmp::PCM_S32BE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case AV_SAMPLE_FMT_FLT:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case AV_SAMPLE_FMT_FLTP:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/plugins/Input/flac/decoder_flac.cpp 2024-04-18 20:36:35.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/plugins/Input/flac/decoder_flac.cpp 2024-05-18 14:37:16.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -451,11 +451,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure(m_data->sample_rate, chmap, Qmmp::PCM_S8);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 16:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- configure(m_data->sample_rate, chmap, Qmmp::PCM_S16LE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ configure(m_data->sample_rate, chmap, Qmmp::PCM_S16BE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 24:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 32:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- configure(m_data->sample_rate, chmap, Qmmp::PCM_S32LE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ configure(m_data->sample_rate, chmap, Qmmp::PCM_S32BE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/plugins/Input/modplug/decoder_modplug.cpp 2024-04-18 20:36:35.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/plugins/Input/modplug/decoder_modplug.cpp 2024-05-18 14:37:39.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -94,7 +94,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_soundFile->Create((uchar*) m_input_buf.data(), m_input_buf.size());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_bitrate = m_soundFile->GetNumChannels();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_totalTime = (qint64) m_soundFile->GetSongTime() * 1000;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- configure(m_freq, m_chan, (m_bps == 8 ? Qmmp::PCM_S8 : Qmmp::PCM_S16LE));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ configure(m_freq, m_chan, (m_bps == 8 ? Qmmp::PCM_S8 : Qmmp::PCM_S16BE));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/plugins/Input/wildmidi/decoder_wildmidi.cpp 2024-04-18 20:36:35.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/plugins/Input/wildmidi/decoder_wildmidi.cpp 2024-05-18 14:39:11.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -62,7 +62,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_sample_rate = WildMidiHelper::instance()->sampleRate();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _WM_Info *wm_info = WildMidi_GetInfo(midi_ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_totalTime = (qint64)wm_info->approx_total_samples * 1000 / WildMidiHelper::instance()->sampleRate();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- configure(m_sample_rate, 2, Qmmp::PCM_S16LE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ configure(m_sample_rate, 2, Qmmp::PCM_S16BE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qDebug("DecoderWildMidi: initialize succes");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/qmmp/decoder.h 2024-04-18 20:36:35.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/qmmp/decoder.h 2024-05-18 14:31:20.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -185,14 +185,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * @param map Map of channels.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * @param f Audio format.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- void configure(quint32 srate, const ChannelMap &map, Qmmp::AudioFormat f = Qmmp::PCM_S16LE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ void configure(quint32 srate, const ChannelMap &map, Qmmp::AudioFormat f = Qmmp::PCM_S16BE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Use this function inside initialize() reimplementation to tell other plugins about audio parameters.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * @param srate Sample rate.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * @param channels Number of channels (internal channel sequence).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * @param f Audio format.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- void configure(quint32 srate, int channels, Qmmp::AudioFormat f = Qmmp::PCM_S16LE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ void configure(quint32 srate, int channels, Qmmp::AudioFormat f = Qmmp::PCM_S16BE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Use this function inside initialize() reimplementation to tell other plugins about audio parameters.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * @param p Audio parameters.
</span></pre><pre style='margin:0'>
</pre>