spalencsar/bearwave
1
0
Fork 0
mirror of https://github.com/spalencsar/bearwave.git synced 2026-07-06 22:24:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix metadata overwrite and Wayland DBus crash

Browse Source
This commit is contained in:
Sebastian Palencsar
2026-05-25 14:50:11 +02:00
parent b8a2f11439
commit cc4a33a2ae
3 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/bearplayer.cpp
View File

@@ -131,6 +131,11 @@ void BearPlayer::onMetaDataChanged()
QString title = meta.stringValue(QMediaMetaData::Title); QString title = meta.stringValue(QMediaMetaData::Title);
// Ignore completely empty metadata from QMediaPlayer so we don't overwrite IcyReader
if (artist.isEmpty() && title.isEmpty()) {
return;
}
if (m_currentTrackArtist == artist && m_currentTrackTitle == title) { if (m_currentTrackArtist == artist && m_currentTrackTitle == title) {
return; return;
} }

5
src/icyreader.cpp
View File

@@ -56,8 +56,10 @@ void IcyReader::onReadyRead()
if (m_metaInt == 0) { if (m_metaInt == 0) {
if (m_reply->hasRawHeader("icy-metaint")) { if (m_reply->hasRawHeader("icy-metaint")) {
m_metaInt = m_reply->rawHeader("icy-metaint").toInt(); m_metaInt = m_reply->rawHeader("icy-metaint").toInt();
qDebug() << "ICYREADER: Found icy-metaint =" << m_metaInt;
} else { } else {
// No ICY metadata supported by stream // No ICY metadata supported by stream
qDebug() << "ICYREADER: No icy-metaint header found!";
return; return;
} }
} }
@@ -132,6 +134,9 @@ void IcyReader::parseMetaData(const QByteArray &metaData)
title = fullTitle; title = fullTitle;
} }
qDebug() << "ICYREADER: PARSED METADATA -> Artist:" << artist << "Title:" << title;
emit metaDataReceived(artist, title); emit metaDataReceived(artist, title);
} else {
qDebug() << "ICYREADER: Regex failed on string:" << metaString;
} }
} }

20
src/notificationmanager.cpp
View File

@@ -6,6 +6,8 @@
#include <QDBusReply> #include <QDBusReply>
#include <QDBusMessage> #include <QDBusMessage>
#include <QDBusConnection> #include <QDBusConnection>
#include <QDBusPendingCallWatcher>
#include <QDBusPendingReply>
#include <QDir> #include <QDir>
#include <QFile> #include <QFile>
#include <QCryptographicHash> #include <QCryptographicHash>
@@ -230,17 +232,21 @@ void NotificationManager::showNotification(const QString &station, const QString
<< hints << hints
<< -1; << -1;
QDBusReply<uint> dbusReply = notifyInterface.callWithArgumentList( QDBusPendingCall pcall = notifyInterface.asyncCallWithArgumentList(
QDBus::Block,
QStringLiteral("Notify"), QStringLiteral("Notify"),
args args
); );
if (dbusReply.isValid()) { QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pcall, this);
m_lastNotificationId = dbusReply.value(); connect(watcher, &QDBusPendingCallWatcher::finished, this, [this](QDBusPendingCallWatcher *watcher) {
} else { watcher->deleteLater();
qWarning() << "Failed to send notification via DBus:" << dbusReply.error().message(); QDBusPendingReply<uint> reply = *watcher;
} if (reply.isValid()) {
m_lastNotificationId = reply.value();
} else {
qWarning() << "Failed to send notification via DBus:" << reply.error().message();
}
});
} }
void NotificationManager::closeNotification() void NotificationManager::closeNotification()