Hello community,
here is the log from the commit of package libkcompactdisc for openSUSE:Factory
checked in at 2020-12-17 16:56:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libkcompactdisc (Old)
and /work/SRC/openSUSE:Factory/.libkcompactdisc.new.5145 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkcompactdisc"
Thu Dec 17 16:56:26 2020 rev:50 rq:855266 version:20.12.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libkcompactdisc/libkcompactdisc.changes
2020-11-10 13:38:15.972615034 +0100
+++
/work/SRC/openSUSE:Factory/.libkcompactdisc.new.5145/libkcompactdisc.changes
2020-12-17 16:56:43.337179130 +0100
@@ -1,0 +2,26 @@
+Sat Dec 5 23:17:36 UTC 2020 - Luca Beltrame <[email protected]>
+
+- Update to 20.12.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/releases/2020-12-apps-update
+- No code change since 20.11.90
+
+-------------------------------------------------------------------
+Fri Nov 27 15:17:50 UTC 2020 - Christophe Giboudeaux <[email protected]>
+
+- Update to 20.11.90
+ * New feature release
+- No code change since 20.11.80
+
+-------------------------------------------------------------------
+Sat Nov 14 00:02:49 UTC 2020 - Christophe Giboudeaux <[email protected]>
+
+- Update to 20.11.80
+ * New feature release
+- Changes since 20.08.3:
+ * Drop no longer needed dependency on KCoreAddons
+ * Port away from KRandomSequence
+ * Fix for the CD not being recognised if it is not in the first drive
+
+-------------------------------------------------------------------
Old:
----
libkcompactdisc-20.08.3.tar.xz
libkcompactdisc-20.08.3.tar.xz.sig
New:
----
libkcompactdisc-20.12.0.tar.xz
libkcompactdisc-20.12.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libkcompactdisc.spec ++++++
--- /var/tmp/diff_new_pack.Lc1nU4/_old 2020-12-17 16:56:44.021179863 +0100
+++ /var/tmp/diff_new_pack.Lc1nU4/_new 2020-12-17 16:56:44.025179867 +0100
@@ -21,7 +21,7 @@
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print
$1"."$2}')}
%bcond_without lang
Name: libkcompactdisc
-Version: 20.08.3
+Version: 20.12.0
Release: 0
Summary: CD drive library for KDE Platform
License: GPL-2.0-or-later
@@ -31,13 +31,12 @@
BuildRequires: alsa-devel
BuildRequires: extra-cmake-modules
BuildRequires: xz
-BuildRequires: cmake(KF5CoreAddons)
BuildRequires: cmake(KF5I18n)
-BuildRequires: cmake(KF5KDELibs4Support)
BuildRequires: cmake(KF5Solid)
BuildRequires: cmake(Phonon4Qt5)
BuildRequires: cmake(Qt5Core)
BuildRequires: cmake(Qt5DBus)
+BuildRequires: cmake(Qt5Widgets)
%if %{with lang}
Source1:
https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
Source2: applications.keyring
++++++ libkcompactdisc-20.08.3.tar.xz -> libkcompactdisc-20.12.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkcompactdisc-20.08.3/CMakeLists.txt
new/libkcompactdisc-20.12.0/CMakeLists.txt
--- old/libkcompactdisc-20.08.3/CMakeLists.txt 2020-11-03 01:38:11.000000000
+0100
+++ new/libkcompactdisc-20.12.0/CMakeLists.txt 2020-09-14 03:00:43.000000000
+0200
@@ -1,14 +1,13 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5)
-project(libkcompactdisc)
+project(KCompactDisc VERSION 5.0.0)
-set(REQUIRED_QT_VERSION 5.4.0)
-set(PROJECT_VERSION "16.08.0")
-set(KF5_DEP_VERSION "5.24.0") # handled by release scripts
+set(QT_MIN_VERSION "5.12.0")
+set(KF_MIN_VERSION "5.68.0")
# Dependencies
include(FeatureSummary)
-find_package(ECM 5.24.0 NO_MODULE)
+find_package(ECM ${KF_MIN_VERSION} NO_MODULE)
set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake
Modules." URL "https://commits.kde.org/extra-cmake-modules";)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
@@ -21,12 +20,12 @@
include(ECMSetupVersion)
include(ECMGeneratePriFile)
include(GenerateExportHeader)
-include(ECMPackageConfigHelpers)
+include(CMakePackageConfigHelpers)
# Version Setup
ecm_setup_version(
- "5.0.0"
+ ${KCompactDisc_VERSION}
VARIABLE_PREFIX KCOMPACTDISC
VERSION_HEADER ${CMAKE_CURRENT_BINARY_DIR}/kcompactdisc_version.h
PACKAGE_VERSION_FILE
${CMAKE_CURRENT_BINARY_DIR}/KF5CompactDiscConfigVersion.cmake
@@ -35,18 +34,31 @@
# Qt5, KF5 and Phonon Packages
-find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Core DBus)
-find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS CoreAddons Solid I18n)
+find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core DBus)
+find_package(KF5 ${KF_MIN_VERSION} REQUIRED COMPONENTS
+ Solid
+ I18n
+)
find_package(Phonon4Qt5 4.8.0 CONFIG REQUIRED)
# Sources
-include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_BINARY_DIR}
+add_definitions(
+ -DQT_DISABLE_DEPRECATED_BEFORE=0x050C00
+ -DQT_DEPRECATED_WARNINGS_SINCE=0x060000
+ -DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054400
+ -DKF_DEPRECATED_WARNINGS_SINCE=0x060000
+ -DQT_NO_FOREACH
+ -DQT_NO_KEYWORDS
+ -DQT_NO_URL_CAST_FROM_STRING
+ -DQT_NO_CAST_FROM_ASCII
+ -DQT_NO_CAST_TO_ASCII
+ -DQT_NO_CAST_FROM_BYTEARRAY
+ -DQT_STRICT_ITERATORS
+ -DQT_USE_QSTRINGBUILDER
+ -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT
)
-
add_subdirectory(src)
if(BUILD_TESTING)
add_subdirectory(tests)
@@ -56,7 +68,7 @@
set(CMAKECONFIG_INSTALL_DIR ${CMAKECONFIG_INSTALL_PREFIX}/KF5CompactDisc)
-ecm_configure_package_config_file(
+configure_package_config_file(
${CMAKE_CURRENT_SOURCE_DIR}/KF5CompactDiscConfig.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/KF5CompactDiscConfig.cmake
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
@@ -83,6 +95,6 @@
COMPONENT Devel
)
-feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
-
ki18n_install(po)
+
+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libkcompactdisc-20.08.3/KF5CompactDiscConfig.cmake.in
new/libkcompactdisc-20.12.0/KF5CompactDiscConfig.cmake.in
--- old/libkcompactdisc-20.08.3/KF5CompactDiscConfig.cmake.in 2020-09-14
01:49:52.000000000 +0200
+++ new/libkcompactdisc-20.12.0/KF5CompactDiscConfig.cmake.in 2020-09-14
03:00:43.000000000 +0200
@@ -1,10 +1,6 @@
@PACKAGE_INIT@
-find_dependency(Qt5Core @QT5_REQUIRED_VERSION@)
-find_dependency(Qt5DBus @QT5_REQUIRED_VERSION@)
-find_dependency(KF5CoreAddons @KF5_REQUIRED_VERSION@)
-find_dependency(KF5Solid @KF5_REQUIRED_VERSION@)
-find_dependency(KF5I18n @KF5_REQUIRED_VERSION@)
-find_dependency(Phonon4Qt5 4.8.0)
+include(CMakeFindDependencyMacro)
+find_dependency(Qt5Core @QT_MIN_VERSION@)
include(${CMAKE_CURRENT_LIST_DIR}/KF5CompactDiscTargets.cmake)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkcompactdisc-20.08.3/po/zh_CN/libkcompactdisc.po
new/libkcompactdisc-20.12.0/po/zh_CN/libkcompactdisc.po
--- old/libkcompactdisc-20.08.3/po/zh_CN/libkcompactdisc.po 2020-11-03
01:38:11.000000000 +0100
+++ new/libkcompactdisc-20.12.0/po/zh_CN/libkcompactdisc.po 2020-12-04
01:13:38.000000000 +0100
@@ -3,7 +3,7 @@
"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2019-05-20 03:09+0200\n"
-"PO-Revision-Date: 2020-10-08 19:23\n"
+"PO-Revision-Date: 2020-11-10 15:04\n"
"Last-Translator: \n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkcompactdisc-20.08.3/src/CMakeLists.txt
new/libkcompactdisc-20.12.0/src/CMakeLists.txt
--- old/libkcompactdisc-20.08.3/src/CMakeLists.txt 2020-09-14
01:49:52.000000000 +0200
+++ new/libkcompactdisc-20.12.0/src/CMakeLists.txt 2020-09-14
03:00:43.000000000 +0200
@@ -1,5 +1,3 @@
-include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDES})
-
## Compiler flags
add_definitions(-DTRANSLATION_DOMAIN=\"libkcompactdisc\")
@@ -78,20 +76,22 @@
)
target_link_libraries(KF5CompactDisc
- Qt5::DBus
- KF5::CoreAddons
- KF5::Solid
- KF5::I18n
- Phonon::phonon4qt5
+ PUBLIC
+ Qt5::Core
+ PRIVATE
+ Qt5::DBus
+ KF5::Solid
+ KF5::I18n
+ Phonon::phonon4qt5
)
if (HAVE_ALSA)
- target_link_libraries(KF5CompactDisc ${ALSA_LIBRARY})
+ target_link_libraries(KF5CompactDisc PRIVATE ${ALSA_LIBRARY})
endif ()
if (USE_WMLIB)
find_package(Threads)
- target_link_libraries(KF5CompactDisc ${CMAKE_THREAD_LIBS_INIT})
+ target_link_libraries(KF5CompactDisc PRIVATE ${CMAKE_THREAD_LIBS_INIT})
endif (USE_WMLIB)
target_include_directories(KF5CompactDisc INTERFACE
"$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KCompactDisc>")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkcompactdisc-20.08.3/src/kcompactdisc.cpp
new/libkcompactdisc-20.12.0/src/kcompactdisc.cpp
--- old/libkcompactdisc-20.08.3/src/kcompactdisc.cpp 2020-09-14
01:49:52.000000000 +0200
+++ new/libkcompactdisc-20.12.0/src/kcompactdisc.cpp 2020-09-14
03:00:43.000000000 +0200
@@ -45,7 +45,8 @@
QUrl url;
//get a list of all devices that are Cdrom
- foreach(const Solid::Device &device,
Solid::Device::listFromType(Solid::DeviceInterface::OpticalDrive)) {
+ const auto devices =
Solid::Device::listFromType(Solid::DeviceInterface::OpticalDrive);
+ for (const Solid::Device &device : devices) {
qDebug() << device.udi().toLatin1().constData();
const Solid::Block *b = device.as<Solid::Block>();
@@ -166,9 +167,8 @@
QUrl result = nameUrls.value(cdromDeviceName);
if (!result.isValid())
{
- const QUrl passedUrl(cdromDeviceName);
- foreach(const QUrl &url, nameUrls)
- {
+ const QUrl passedUrl = QUrl::fromLocalFile(cdromDeviceName);
+ for (const QUrl &url : nameUrls) {
if (url == passedUrl)
{
return passedUrl;
@@ -508,14 +508,14 @@
Q_D(KCompactDisc);
d->m_randomPlaylist = random;
d->make_playlist();
- emit randomPlaylistChanged(d->m_randomPlaylist);
+ Q_EMIT randomPlaylistChanged(d->m_randomPlaylist);
}
void KCompactDisc::setLoopPlaylist(bool loop)
{
Q_D(KCompactDisc);
d->m_loopPlaylist = loop;
- emit loopPlaylistChanged(d->m_loopPlaylist);
+ Q_EMIT loopPlaylistChanged(d->m_loopPlaylist);
}
void KCompactDisc::setAutoMetadataLookup(bool autoMetadata)
@@ -555,5 +555,3 @@
qDebug() << "change balance: " << balance;
d->setBalance(balance);
}
-
-#include "kcompactdisc.moc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkcompactdisc-20.08.3/src/kcompactdisc_p.cpp
new/libkcompactdisc-20.12.0/src/kcompactdisc_p.cpp
--- old/libkcompactdisc-20.08.3/src/kcompactdisc_p.cpp 2020-09-14
01:49:52.000000000 +0200
+++ new/libkcompactdisc-20.12.0/src/kcompactdisc_p.cpp 2020-09-14
03:00:43.000000000 +0200
@@ -44,7 +44,7 @@
m_trackExpectedPosition(0),
m_seek(0),
- m_randSequence(0),
+ m_randSequence(QRandomGenerator::global()->generate()),
m_loopPlaylist(false),
m_randomPlaylist(false),
m_autoMetadata(true),
@@ -119,7 +119,7 @@
for(unsigned i = 0; i < size; ++i) {
if(m_randomPlaylist) {
do {
- selected = 1 + m_randSequence.getLong(size);
+ selected = 1 + m_randSequence.bounded(size);
rejected = (m_playlist.indexOf(selected) != -1);
} while(rejected == true);
} else {
@@ -212,7 +212,7 @@
}
}
- emit q->discStatusChanged(status);
+ Q_EMIT q->discStatusChanged(status);
}
return false;
@@ -251,7 +251,7 @@
m_trackArtists.clear();
m_trackTitles.clear();
m_trackStartFrames.clear();
- emit q->discChanged(m_tracks);
+ Q_EMIT q->discChanged(m_tracks);
}
unsigned KCompactDiscPrivate::trackLength(unsigned)
@@ -305,5 +305,3 @@
void KCompactDiscPrivate::queryMetadata()
{
}
-
-#include "kcompactdisc_p.moc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkcompactdisc-20.08.3/src/kcompactdisc_p.h
new/libkcompactdisc-20.12.0/src/kcompactdisc_p.h
--- old/libkcompactdisc-20.08.3/src/kcompactdisc_p.h 2020-09-14
01:49:52.000000000 +0200
+++ new/libkcompactdisc-20.12.0/src/kcompactdisc_p.h 2020-09-14
03:00:43.000000000 +0200
@@ -25,8 +25,8 @@
#include <QList>
#include <QLoggingCategory>
#include <QtGlobal>
+#include <QRandomGenerator>
-#include <krandomsequence.h>
#include "kcompactdisc.h"
Q_DECLARE_LOGGING_CATEGORY(CD_PLAYLIST)
@@ -61,7 +61,7 @@
QStringList m_trackArtists;
QStringList m_trackTitles;
- KRandomSequence m_randSequence;
+ QRandomGenerator m_randSequence;
QList<unsigned> m_playlist;
bool m_loopPlaylist;
bool m_randomPlaylist;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkcompactdisc-20.08.3/src/phonon_interface.cpp
new/libkcompactdisc-20.12.0/src/phonon_interface.cpp
--- old/libkcompactdisc-20.08.3/src/phonon_interface.cpp 2020-09-14
01:49:52.000000000 +0200
+++ new/libkcompactdisc-20.12.0/src/phonon_interface.cpp 2020-09-14
03:00:43.000000000 +0200
@@ -54,9 +54,9 @@
};
ProducerWidget::ProducerWidget(KPhononCompactDiscPrivate *p, const QString
&Udi) :
- m_media(0),
- m_output(0),
- m_mediaController(0)
+ m_media(nullptr),
+ m_output(nullptr),
+ m_mediaController(nullptr)
{
m_media = new MediaObject(this);
connect(m_media, SIGNAL(metaDataChanged()), SLOT(updateMetaData()));
@@ -86,7 +86,7 @@
KPhononCompactDiscPrivate::KPhononCompactDiscPrivate(KCompactDisc *p,
const QString &dev) :
KCompactDiscPrivate(p, dev),
- m_producerWidget(NULL),
+ m_producerWidget(nullptr),
m_udi(KCompactDisc::cdromDeviceUdi(dev))
{
m_interface = QLatin1String("phonon");
@@ -95,7 +95,7 @@
KPhononCompactDiscPrivate::~KPhononCompactDiscPrivate()
{
delete m_producerWidget;
- m_producerWidget = NULL;
+ m_producerWidget = nullptr;
}
bool KPhononCompactDiscPrivate::createInterface()
@@ -110,7 +110,7 @@
m_deviceVendor = opticalDevice.vendor();
m_deviceModel = opticalDevice.product();
- emit q->discChanged(0);
+ Q_EMIT q->discChanged(0);
producer();
@@ -163,7 +163,7 @@
m_producerWidget->m_mediaController->setCurrentTitle(track);
m_producerWidget->m_media->seek(SEC2MS(position));
- emit m_producerWidget->m_media->play();
+ Q_EMIT m_producerWidget->m_media->play();
}
void KPhononCompactDiscPrivate::pause()
@@ -171,7 +171,7 @@
if(!producer())
return;
- emit m_producerWidget->m_media->pause();
+ Q_EMIT m_producerWidget->m_media->pause();
}
void KPhononCompactDiscPrivate::stop()
@@ -179,7 +179,7 @@
if(!producer())
return;
- emit m_producerWidget->m_media->stop();
+ Q_EMIT m_producerWidget->m_media->stop();
}
void KPhononCompactDiscPrivate::eject()
@@ -249,7 +249,7 @@
m_trackArtists[m_track] = data.take(QLatin1String( "ARTIST" ));
m_trackTitles[m_track] = data.take(QLatin1String( "TITLE" ));
- emit q->discInformation(KCompactDisc::PhononMetadata);
+ Q_EMIT q->discInformation(KCompactDisc::PhononMetadata);
}
KCompactDisc::DiscStatus
KPhononCompactDiscPrivate::discStatusTranslate(Phonon::State state)
@@ -280,7 +280,7 @@
if(track != m_track) {
m_track = track;
m_discLength = trackLength(m_track);
- emit q->playoutTrackChanged(m_track);
+ Q_EMIT q->playoutTrackChanged(m_track);
/* phonon gives us Metadata only per Track */
if(m_autoMetadata)
@@ -299,7 +299,7 @@
}
if(!m_seek) {
- emit q->playoutPositionChanged(m_trackPosition);
+ Q_EMIT q->playoutPositionChanged(m_trackPosition);
}
}
@@ -338,7 +338,7 @@
m_trackTitles.append(ki18n("Track %1").subs(i, 2).toString());
}
- emit q->discChanged(m_tracks);
+ Q_EMIT q->discChanged(m_tracks);
if(m_autoMetadata)
queryMetadata();
@@ -349,6 +349,3 @@
}
}
}
-
-#include "phonon_interface.moc"
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libkcompactdisc-20.08.3/src/wmlib/audio/audio_phonon.cpp
new/libkcompactdisc-20.12.0/src/wmlib/audio/audio_phonon.cpp
--- old/libkcompactdisc-20.08.3/src/wmlib/audio/audio_phonon.cpp
2020-09-14 01:49:52.000000000 +0200
+++ new/libkcompactdisc-20.12.0/src/wmlib/audio/audio_phonon.cpp
2020-09-14 03:00:43.000000000 +0200
@@ -104,7 +104,7 @@
void LibWMPcmPlayer::setNextBuffer(struct cdda_block *blk)
{
- emit nextBuffer(blk);
+ Q_EMIT nextBuffer(blk);
m_mutex.lock();
m_readyToPlay.wait(&m_mutex);
m_mutex.unlock();
@@ -113,7 +113,7 @@
void LibWMPcmPlayer::playBuffer(struct cdda_block *blk)
{
if(m_cmd != WM_CDM_PLAYING) {
- emit cmdChanged(WM_CDM_PLAYING);
+ Q_EMIT cmdChanged(WM_CDM_PLAYING);
m_cmd = WM_CDM_PLAYING;
}
writeData(QByteArray(blk->buf, blk->buflen));
@@ -123,7 +123,7 @@
void LibWMPcmPlayer::pause(void)
{
if(m_cmd != WM_CDM_PAUSED) {
- emit cmdChanged(WM_CDM_PAUSED);
+ Q_EMIT cmdChanged(WM_CDM_PAUSED);
m_cmd = WM_CDM_PAUSED;
m_readyToPlay.wakeAll();
@@ -133,7 +133,7 @@
void LibWMPcmPlayer::stop(void)
{
if(m_cmd != WM_CDM_STOPPED) {
- emit cmdChanged(WM_CDM_STOPPED);
+ Q_EMIT cmdChanged(WM_CDM_STOPPED);
m_cmd = WM_CDM_STOPPED;
m_readyToPlay.wakeAll();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libkcompactdisc-20.08.3/src/wmlib/audio/audio_phonon.h
new/libkcompactdisc-20.12.0/src/wmlib/audio/audio_phonon.h
--- old/libkcompactdisc-20.08.3/src/wmlib/audio/audio_phonon.h 2020-09-14
01:49:52.000000000 +0200
+++ new/libkcompactdisc-20.12.0/src/wmlib/audio/audio_phonon.h 2020-09-14
03:00:43.000000000 +0200
@@ -40,7 +40,7 @@
QByteArray wavHeader() const;
void setNextBuffer(struct cdda_block *blk);
-public slots:
+public Q_SLOTS:
void playBuffer(struct cdda_block *blk);
void pause(void);
void stop(void);
@@ -51,7 +51,7 @@
void reset();
void needData();
-signals:
+Q_SIGNALS:
void cmdChanged(int cmd);
void nextBuffer(struct cdda_block *blk);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkcompactdisc-20.08.3/src/wmlib_interface.cpp
new/libkcompactdisc-20.12.0/src/wmlib_interface.cpp
--- old/libkcompactdisc-20.08.3/src/wmlib_interface.cpp 2020-09-14
01:49:52.000000000 +0200
+++ new/libkcompactdisc-20.12.0/src/wmlib_interface.cpp 2020-09-14
03:00:43.000000000 +0200
@@ -38,7 +38,7 @@
KWMLibCompactDiscPrivate::KWMLibCompactDiscPrivate(KCompactDisc *p,
const QString &dev, const QString &audioSystem, const QString
&audioDevice) :
KCompactDiscPrivate(p, dev),
- m_handle(NULL),
+ m_handle(nullptr),
m_audioSystem(audioSystem),
m_audioDevice(audioDevice)
{
@@ -54,18 +54,18 @@
bool KWMLibCompactDiscPrivate::createInterface()
{
- QString devicePath;
-
- devicePath = KCompactDisc::cdromDeviceUrl(m_deviceName).path();
+ const QString devicePath =
KCompactDisc::cdromDeviceUrl(m_deviceName).path();
// Debug.
- //wm_cd_set_verbosity(WM_MSG_LEVEL_DEBUG | WM_MSG_CLASS_ALL);
+ if (qEnvironmentVariableIsSet("KCOMPACTDISC_WMLIB_DEBUG")) {
+ wm_cd_set_verbosity(WM_MSG_LEVEL_DEBUG | WM_MSG_CLASS_ALL);
+ }
int status = wm_cd_init(
devicePath.toLatin1().data(),
m_audioSystem.toLatin1().data(),
m_audioDevice.toLatin1().data(),
- NULL,
+ nullptr,
&m_handle);
if(!WM_CDS_ERROR(status)) {
@@ -74,7 +74,7 @@
m_deviceRevision = QLatin1String(wm_drive_revision(m_handle));
Q_Q(KCompactDisc);
- emit q->discChanged(0);
+ Q_EMIT q->discChanged(0);
if (m_infoMode == KCompactDisc::Asynchronous) {
timerExpired();
@@ -84,7 +84,7 @@
return true;
}
- m_handle = NULL;
+ m_handle = nullptr;
return false;
}
@@ -246,7 +246,7 @@
qDebug() << "m_trackArtists " << m_trackArtists;
qDebug() << "m_trackTitles " << m_trackTitles;
- emit q->discChanged(m_tracks);
+ Q_EMIT q->discChanged(m_tracks);
if(m_autoMetadata)
queryMetadata();
@@ -270,8 +270,8 @@
}
if(!m_seek) {
- emit q->playoutPositionChanged(m_trackPosition);
- //emit q->playoutDiscPositionChanged(m_discPosition);
+ Q_EMIT q->playoutPositionChanged(m_trackPosition);
+ //Q_EMIT q->playoutDiscPositionChanged(m_discPosition);
}
// Per-event processing.
@@ -279,7 +279,7 @@
if(m_track != track) {
m_track = track;
- emit q->playoutTrackChanged(m_track);
+ Q_EMIT q->playoutTrackChanged(m_track);
}
break;
@@ -322,7 +322,5 @@
qDebug() << "m_trackArtists " << m_trackArtists;
qDebug() << "m_trackTitles " << m_trackTitles;
- emit q->discInformation(KCompactDisc::Cdtext);
+ Q_EMIT q->discInformation(KCompactDisc::Cdtext);
}
-
-#include "wmlib_interface.moc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkcompactdisc-20.08.3/tests/testkcd.cpp
new/libkcompactdisc-20.12.0/tests/testkcd.cpp
--- old/libkcompactdisc-20.08.3/tests/testkcd.cpp 2020-09-14
01:49:52.000000000 +0200
+++ new/libkcompactdisc-20.12.0/tests/testkcd.cpp 2020-09-14
03:00:43.000000000 +0200
@@ -12,7 +12,7 @@
public:
- explicit TestKCD(QObject *parent = 0) :
+ explicit TestKCD(QObject *parent = nullptr) :
QObject(parent),
mKcd(new KCompactDisc(KCompactDisc::Asynchronous))
{}
@@ -22,12 +22,12 @@
mKcd->deleteLater();
}
- public slots:
+ public Q_SLOTS:
void doTest()
{
qDebug() << "Starting test";
- mKcd->setDevice(mKcd->defaultCdromDeviceName(), 50, true, "phonon");
+ mKcd->setDevice(mKcd->defaultCdromDeviceName(), 50, true,
QStringLiteral("phonon"));
qDebug() << "";
qDebug() << "We have" << mKcd->audioSystems().size() << "audo systems
available:";
_______________________________________________
openSUSE Commits mailing list -- [email protected]
To unsubscribe, email [email protected]
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/[email protected]
