Index: CMakeLists.txt =================================================================== --- CMakeLists.txt +++ CMakeLists.txt @@ -22,6 +22,7 @@ include(ECMGeneratePriFile) include(GenerateExportHeader) include(ECMPackageConfigHelpers) +include(ECMQtDeclareLoggingCategory) # Version Setup Index: src/CMakeLists.txt =================================================================== --- src/CMakeLists.txt +++ src/CMakeLists.txt @@ -61,6 +61,8 @@ kcompactdisc_p.cpp phonon_interface.cpp ) +ecm_qt_declare_logging_category(KCD_LIB_SRCS HEADER kcd_logging.h IDENTIFIER KCD CATEGORY_NAME org.kde.libkcompactdisc) +ecm_qt_declare_logging_category(KCD_LIB_SRCS HEADER kcd_playlist_logging.h IDENTIFIER KCD_PLAYLIST CATEGORY_NAME org.kde.libkcompactdisc.playlist) if (USE_WMLIB) set(KCD_LIB_SRCS ${KCD_LIB_SRCS} wmlib_interface.cpp ${wmlib_SRCS} ${wmlib_audio_SRCS}) Index: src/kcompactdisc.cpp =================================================================== --- src/kcompactdisc.cpp +++ src/kcompactdisc.cpp @@ -46,7 +46,7 @@ //get a list of all devices that are Cdrom foreach(const Solid::Device &device, Solid::Device::listFromType(Solid::DeviceInterface::OpticalDrive)) { - qDebug() << device.udi().toLatin1().constData(); + qCDebug(KCD) << device.udi().toLatin1().constData(); const Solid::Block *b = device.as(); if(!b) { @@ -106,17 +106,17 @@ QString KCompactDisc::urlToDevice(const QUrl &deviceUrl) { if(deviceUrl.scheme() == QLatin1String( "media" ) || deviceUrl.scheme() == QLatin1String( "system" )) { - qDebug() << "Asking mediamanager for " << deviceUrl.fileName(); + qCDebug(KCD) << "Asking mediamanager for " << deviceUrl.fileName(); QDBusInterface mediamanager( QLatin1String( "org.kde.kded" ), QLatin1String( "/modules/mediamanager" ), QLatin1String( "org.kde.MediaManager" ) ); QDBusReply reply = mediamanager.call(QLatin1String( "properties" ), deviceUrl.fileName()); QStringList properties = reply; if(!reply.isValid() || properties.count() < 6) { - qCritical() << "Invalid reply from mediamanager" << endl; + qCCritical(KCD) << "Invalid reply from mediamanager" << endl; return deviceUrl.path(); } else { - qDebug() << "Reply from mediamanager " << properties[5]; + qCDebug(KCD) << "Reply from mediamanager " << properties[5]; return properties[5]; } } else if(deviceUrl.scheme() == QLatin1String( "file" )) { @@ -531,7 +531,7 @@ { const QString as = digitalPlayback ? audioSystem : QLatin1String("cdin"); const QString ad = digitalPlayback ? audioDevice : QString(); - qDebug() << "Device init: " << deviceName << ", " << as << ", " << ad; + qCDebug(KCD) << "Device init: " << deviceName << ", " << as << ", " << ad; if(d_ptr->moveInterface(deviceName, as, ad)) { setVolume(volume); @@ -545,14 +545,14 @@ void KCompactDisc::setVolume(unsigned volume) { Q_D(KCompactDisc); - qDebug() << "change volume: " << volume; + qCDebug(KCD) << "change volume: " << volume; d->setVolume(volume); } void KCompactDisc::setBalance(unsigned balance) { Q_D(KCompactDisc); - qDebug() << "change balance: " << balance; + qCDebug(KCD) << "change balance: " << balance; d->setBalance(balance); } Index: src/kcompactdisc_p.h =================================================================== --- src/kcompactdisc_p.h +++ src/kcompactdisc_p.h @@ -29,7 +29,8 @@ #include #include "kcompactdisc.h" -Q_DECLARE_LOGGING_CATEGORY(CD_PLAYLIST) +#include "kcd_logging.h" +#include "kcd_playlist_logging.h" class KCompactDiscPrivate : public QObject { Index: src/kcompactdisc_p.cpp =================================================================== --- src/kcompactdisc_p.cpp +++ src/kcompactdisc_p.cpp @@ -27,8 +27,6 @@ #include -Q_LOGGING_CATEGORY(CD_PLAYLIST, "cd.playlist") - KCompactDiscPrivate::KCompactDiscPrivate(KCompactDisc *p, const QString& dev) : m_infoMode(KCompactDisc::Synchronous), m_deviceName(dev), @@ -69,8 +67,8 @@ KCompactDiscPrivate *pOld, *pNew; - qDebug() << "switch from " << q->d_ptr->m_interface << " on " << q->d_ptr->m_deviceName; - qDebug() << " to " << audioSystem << " on " << deviceName; + qCDebug(KCD) << "switch from " << q->d_ptr->m_interface << " on " << q->d_ptr->m_deviceName; + qCDebug(KCD) << " to " << audioSystem << " on " << deviceName; /* switch temporary to dummy implementation */ if(q->d_ptr != this) { @@ -114,7 +112,7 @@ unsigned selected = 0, size = m_tracks; bool rejected = false; - qCDebug(CD_PLAYLIST) << "Playlist has " << size << " entries\n"; + qCDebug(KCD_PLAYLIST) << "Playlist has " << size << " entries\n"; m_playlist.clear(); for(unsigned i = 0; i < size; ++i) { if(m_randomPlaylist) { @@ -128,12 +126,12 @@ m_playlist.append(selected); } - qCDebug(CD_PLAYLIST) << "dump playlist"; + qCDebug(KCD_PLAYLIST) << "dump playlist"; QList::const_iterator it; for(it = m_playlist.constBegin(); it != m_playlist.constEnd(); ++it) { - qCDebug(CD_PLAYLIST) << " " << *it; + qCDebug(KCD_PLAYLIST) << " " << *it; } - qCDebug(CD_PLAYLIST) << "dump playlist end"; + qCDebug(KCD_PLAYLIST) << "dump playlist end"; } unsigned KCompactDiscPrivate::getNextTrackInPlaylist() Index: src/phonon_interface.cpp =================================================================== --- src/phonon_interface.cpp +++ src/phonon_interface.cpp @@ -100,7 +100,7 @@ bool KPhononCompactDiscPrivate::createInterface() { - qDebug() << "createInterface called"; + qCDebug(KCD) << "createInterface called"; Solid::Device opticalDevice(m_udi); Solid::OpticalDrive *opticalDrive = opticalDevice.as(); @@ -126,11 +126,11 @@ if(!m_producerWidget) { Solid::Device opticalDevice(m_udi); Solid::OpticalDrive *opticalDrive = opticalDevice.as(); - qDebug() << "producer called, opticalDrive is " << opticalDrive; + qCDebug(KCD) << "producer called, opticalDrive is " << opticalDrive; if(opticalDrive) { Solid::OpticalDisc *opticalDisc = opticalDevice.as(); - qDebug() << "opticalDisc " << opticalDisc; + qCDebug(KCD) << "opticalDisc " << opticalDisc; //if(opticalDisc && (opticalDisc->availableContent() == Solid::OpticalDisc::Audio)) { m_producerWidget = new ProducerWidget(this, m_udi); stateChanged(m_producerWidget->m_media->state(), Phonon::StoppedState); @@ -159,7 +159,7 @@ if(!producer()) return; - qDebug() << "play track " << track << " position " << position; + qCDebug(KCD) << "play track " << track << " position " << position; m_producerWidget->m_mediaController->setCurrentTitle(track); m_producerWidget->m_media->seek(SEC2MS(position)); @@ -240,8 +240,8 @@ return; QMultiMap data = m_producerWidget->m_media->metaData(); - qDebug() << "METADATA"; - //qDebug() << data; + qCDebug(KCD) << "METADATA"; + //qCDebug(KCD) << data; m_trackArtists[0] = data.take(QLatin1String( "ARTIST" )); m_trackTitles[0] = data.take(QLatin1String( "ALBUM" )); @@ -291,7 +291,7 @@ m_discPosition = m_trackPosition; // Update the current playing position. if(m_seek) { - qDebug() << "seek: " << m_seek << " trackPosition " << m_trackPosition; + qCDebug(KCD) << "seek: " << m_seek << " trackPosition " << m_trackPosition; if(abs((long)(m_trackExpectedPosition - m_trackPosition)) > m_seek) m_seek = 0; else @@ -305,7 +305,7 @@ void KPhononCompactDiscPrivate::stateChanged(Phonon::State newstate, Phonon::State) { - qDebug() << "stateChanged with state " << newstate; + qCDebug(KCD) << "stateChanged with state " << newstate; KCompactDisc::DiscStatus status; Q_Q(KCompactDisc); @@ -325,9 +325,9 @@ default: if(m_tracks == 0) { m_tracks = m_producerWidget->m_mediaController->availableTitles(); - qDebug() << "Got " << m_tracks << " tracks from media controller"; + qCDebug(KCD) << "Got " << m_tracks << " tracks from media controller"; if(m_tracks > 0) { - qDebug() << "New disc with " << m_tracks << " tracks"; + qCDebug(KCD) << "New disc with " << m_tracks << " tracks"; make_playlist(); Index: src/wmlib_interface.cpp =================================================================== --- src/wmlib_interface.cpp +++ src/wmlib_interface.cpp @@ -106,7 +106,7 @@ lastTrack = firstTrack + 1; lastTrack = TRACK_VALID(lastTrack) ? lastTrack : WM_ENDTRACK; - qDebug() << "play track " << firstTrack << " position " + qCDebug(KCD) << "play track " << firstTrack << " position " << position << endl; wm_cd_play(m_handle, firstTrack, position, lastTrack); @@ -221,7 +221,7 @@ if(m_tracks == 0) { m_tracks = wm_cd_getcountoftracks(m_handle); if(m_tracks > 0) { - qDebug() << "New disc with " << m_tracks << " tracks"; + qCDebug(KCD) << "New disc with " << m_tracks << " tracks"; m_discId = wm_cddb_discid(m_handle); for(i = 1; i <= m_tracks; ++i) { @@ -241,10 +241,10 @@ m_trackTitles.append(ki18n("Track %1").subs(i, 2).toString()); } -qDebug() << "m_tracks " << m_tracks; -qDebug() << "m_trackStartFrames " << m_trackStartFrames; -qDebug() << "m_trackArtists " << m_trackArtists; -qDebug() << "m_trackTitles " << m_trackTitles; +qCDebug(KCD) << "m_tracks " << m_tracks; +qCDebug(KCD) << "m_trackStartFrames " << m_trackStartFrames; +qCDebug(KCD) << "m_trackArtists " << m_trackArtists; +qCDebug(KCD) << "m_trackTitles " << m_trackTitles; emit q->discChanged(m_tracks); @@ -262,7 +262,7 @@ m_discPosition = wm_get_cur_pos_abs(m_handle) - FRAMES2SEC(m_trackStartFrames[0]); // Update the current playing position. if(m_seek) { - qDebug() << "seek: " << m_seek << " trackPosition " << m_trackPosition; + qCDebug(KCD) << "seek: " << m_seek << " trackPosition " << m_trackPosition; if(abs((long)(m_trackExpectedPosition - m_trackPosition)) > m_seek) m_seek = 0; else @@ -306,7 +306,7 @@ info = wm_cd_get_cdtext(m_handle); if(!info || !info->valid || (unsigned)info->count_of_entries != (m_tracks + 1)) { - qDebug() << "no or invalid CDTEXT"; + qCDebug(KCD) << "no or invalid CDTEXT"; return; } @@ -318,9 +318,9 @@ m_trackTitles[i] =QLatin1String( reinterpret_cast(info->blocks[0]->name[i]) ); } - qDebug() << "CDTEXT"; - qDebug() << "m_trackArtists " << m_trackArtists; - qDebug() << "m_trackTitles " << m_trackTitles; + qCDebug(KCD) << "CDTEXT"; + qCDebug(KCD) << "m_trackArtists " << m_trackArtists; + qCDebug(KCD) << "m_trackTitles " << m_trackTitles; emit q->discInformation(KCompactDisc::Cdtext); } Index: tests/testkcd.cpp =================================================================== --- tests/testkcd.cpp +++ tests/testkcd.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #include @@ -26,28 +27,28 @@ void doTest() { - qDebug() << "Starting test"; + qInfo() << "Starting test"; mKcd->setDevice(mKcd->defaultCdromDeviceName(), 50, true, "phonon"); - qDebug() << ""; + qInfo() << ""; - qDebug() << "We have" << mKcd->audioSystems().size() << "audo systems available:"; + qInfo() << "We have" << mKcd->audioSystems().size() << "audo systems available:"; for (auto system: mKcd->audioSystems()) { - qDebug() << system; + qInfo() << system; } - qDebug() << ""; + qInfo() << ""; - qDebug() << "We have" << mKcd->cdromDeviceNames().size() << "cdrom drives available:"; + qInfo() << "We have" << mKcd->cdromDeviceNames().size() << "cdrom drives available:"; for (auto cdrom: mKcd->cdromDeviceNames()) { - qDebug() << cdrom; + qInfo() << cdrom; } - qDebug() << ""; + qInfo() << ""; - qDebug() << "The current cdrom drive loaded is:" << mKcd->deviceName(); - qDebug() << "The disc device node url is:" << mKcd->deviceUrl(); - qDebug() << "The disc status is" << mKcd->discStatus(); - qDebug() << "Does the drive have a disc in it:" << !mKcd->isNoDisc(); - qDebug() << "The number of tracks in the disc:" << mKcd->tracks(); - qDebug() << "The current track no:" << mKcd->trackPosition(); + qInfo() << "The current cdrom drive loaded is:" << mKcd->deviceName(); + qInfo() << "The disc device node url is:" << mKcd->deviceUrl(); + qInfo() << "The disc status is" << mKcd->discStatus(); + qInfo() << "Does the drive have a disc in it:" << !mKcd->isNoDisc(); + qInfo() << "The number of tracks in the disc:" << mKcd->tracks(); + qInfo() << "The current track no:" << mKcd->trackPosition(); qApp->exit(); } @@ -59,9 +60,12 @@ int main(int argc, char **argv) { + if (!qEnvironmentVariableIsSet("QT_LOGGING_RULES")) { + qputenv("QT_LOGGING_RULES", QByteArrayLiteral("org.kde.libkcompactdisc=true")); + } QCoreApplication app(argc, argv); - qDebug() << "Testing libKF5CompactDisc"; + qInfo() << "Testing libKF5CompactDisc"; TestKCD test; QMetaObject::invokeMethod(&test, "doTest", Qt::QueuedConnection);