Skip to content

linux: fix connected device detection failure when using wireplumber 0.5.13 #417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jamescarter2001 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

linux: fix connected device detection failure when using wireplumber 0.5.13 #417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4048a2
fix connected device detection when using latest wireplumber version
jamescarter2001 Jan 4, 2026
69bb94b
apply CodeRabbit feedback
jamescarter2001 Jan 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions linux/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,7 @@ class AirPodsTrayApp : public QObject {
// On startup after reboot, activate A2DP profile for already connected AirPods
QTimer::singleShot(2000, this, [this, address]()
{
QString formattedAddress = address.toString().replace(":", "_");
mediaController->setConnectedDeviceMacAddress(formattedAddress);
mediaController->setConnectedDeviceMacAddress(address.toString());
mediaController->activateA2dpProfile();
LOG_INFO("A2DP profile activation attempted for AirPods found on startup");
});
Expand Down Expand Up @@ -427,7 +426,7 @@ public slots:
if (areAirpodsConnected() && m_deviceInfo && !m_deviceInfo->bluetoothAddress().isEmpty())
{
LOG_INFO("AirPods already connected after wake-up, re-activating A2DP profile");
mediaController->setConnectedDeviceMacAddress(m_deviceInfo->bluetoothAddress().replace(":", "_"));
mediaController->setConnectedDeviceMacAddress(m_deviceInfo->bluetoothAddress());

// Always activate A2DP profile after system wake since the profile might have been lost
QTimer::singleShot(1000, this, [this]()
Expand Down Expand Up @@ -494,9 +493,7 @@ private slots:
{
if (!address.isEmpty())
{
QString formattedAddress = address;
formattedAddress = formattedAddress.replace(":", "_");
mediaController->setConnectedDeviceMacAddress(formattedAddress);
mediaController->setConnectedDeviceMacAddress(address);
mediaController->activateA2dpProfile();
LOG_INFO("A2DP profile activation attempted for newly connected device");
}
Expand Down Expand Up @@ -738,7 +735,7 @@ private slots:
{
parseMetadata(data);
initiateMagicPairing();
mediaController->setConnectedDeviceMacAddress(m_deviceInfo->bluetoothAddress().replace(":", "_"));
mediaController->setConnectedDeviceMacAddress(m_deviceInfo->bluetoothAddress());
if (m_deviceInfo->getEarDetection()->oneOrMorePodsInEar()) // AirPods get added as output device only after this
{
mediaController->activateA2dpProfile();
Expand Down
6 changes: 3 additions & 3 deletions linux/media/mediacontroller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@ void MediaController::followMediaChanges() {
}

bool MediaController::isActiveOutputDeviceAirPods() {
QString defaultSink = m_pulseAudio->getDefaultSink();
LOG_DEBUG("Default sink: " << defaultSink);
return defaultSink.contains(connectedDeviceMacAddress);
QString defaultSinkMacAddress = m_pulseAudio->getDefaultSinkMacAddress();
LOG_DEBUG("Default sink MAC address: " << defaultSinkMacAddress);
return defaultSinkMacAddress == connectedDeviceMacAddress;
}

void MediaController::handleConversationalAwareness(const QByteArray &data) {
Expand Down
55 changes: 53 additions & 2 deletions linux/media/pulseaudiocontroller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,60 @@ QString PulseAudioController::getDefaultSink()
waitForOperation(op);
pa_operation_unref(op);
}

pa_threaded_mainloop_unlock(m_mainloop);

return data.sinkName;
}

QString PulseAudioController::getDefaultSinkMacAddress() {
return this->getMacAddressBySinkName(this->getDefaultSink());
}

QString PulseAudioController::getMacAddressBySinkName(const QString &sinkName)
{
if (!m_initialized) return QString();

struct CallbackData {
QString sinkMacAddress;
pa_threaded_mainloop *mainloop;
} data;
data.mainloop = m_mainloop;

auto callback = [](pa_context *c, const pa_sink_info *info, int eol, void *userdata)
{
CallbackData *d = static_cast<CallbackData*>(userdata);
if (eol > 0)
{
pa_threaded_mainloop_signal(d->mainloop, 0);
return;
}

const char *addr = pa_proplist_gets(
info->proplist,
"device.string"
);

if (addr)
{
d->sinkMacAddress = QString::fromUtf8(addr);
pa_threaded_mainloop_signal(d->mainloop, 0);
}
};
Comment on lines +128 to +147
Copy link

@coderabbitai coderabbitai bot Jan 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🔴 Critical

Critical: Mainloop signal missing when device.string property is absent.

If pa_proplist_gets returns NULL (property doesn't exist), the callback never signals the mainloop, causing waitForOperation to hang indefinitely. The mainloop must be signaled in all code paths.

🔎 Proposed fix 
     auto callback = [](pa_context *c, const pa_sink_info *info, int eol, void *userdata)
     {
         CallbackData *d = static_cast<CallbackData*>(userdata);
         if (eol > 0)
         {
             pa_threaded_mainloop_signal(d->mainloop, 0);
             return;
         }
 
         const char *addr = pa_proplist_gets(
         info->proplist,
         "device.string"
         );
 
         if (addr)
         {
             d->sinkMacAddress = QString::fromUtf8(addr);
-            pa_threaded_mainloop_signal(d->mainloop, 0);
         }
+        // Always signal, even if device.string is not present
+        pa_threaded_mainloop_signal(d->mainloop, 0);
     };
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
auto callback = [](pa_context *c, const pa_sink_info *info, int eol, void *userdata)
{
CallbackData *d = static_cast<CallbackData*>(userdata);
if (eol > 0)
{
pa_threaded_mainloop_signal(d->mainloop, 0);
return;
}
const char *addr = pa_proplist_gets(
info->proplist,
"device.string"
);
if (addr)
{
d->sinkMacAddress = QString::fromUtf8(addr);
pa_threaded_mainloop_signal(d->mainloop, 0);
}
};
auto callback = [](pa_context *c, const pa_sink_info *info, int eol, void *userdata)
{
CallbackData *d = static_cast<CallbackData*>(userdata);
if (eol > 0)
{
pa_threaded_mainloop_signal(d->mainloop, 0);
return;
}
const char *addr = pa_proplist_gets(
info->proplist,
"device.string"
);
if (addr)
{
d->sinkMacAddress = QString::fromUtf8(addr);
}
// Always signal, even if device.string is not present
pa_threaded_mainloop_signal(d->mainloop, 0);
};
🤖 Prompt for AI Agents 
In linux/media/pulseaudiocontroller.cpp around lines 128 to 147, the pa_context
callback currently only signals the pa_threaded_mainloop when eol>0 or when the
"device.string" property exists, which can leave waitForOperation hanging if the
property is absent; update the callback so it always signals the mainloop before
returning: after checking eol and after retrieving addr, ensure that in the
branch where addr is null you still call
pa_threaded_mainloop_signal(d->mainloop, 0) (and then return), so every code
path signals the mainloop exactly once.


pa_threaded_mainloop_lock(m_mainloop);
pa_operation *op = pa_context_get_sink_info_by_name(m_context, sinkName.toUtf8().constData(), callback, &data);
if (op)
{
waitForOperation(op);
pa_operation_unref(op);
}

pa_threaded_mainloop_unlock(m_mainloop);

return data.sinkMacAddress;
}

int PulseAudioController::getSinkVolume(const QString &sinkName)
{
if (!m_initialized) return -1;
Expand Down Expand Up @@ -215,8 +264,10 @@ QString PulseAudioController::getCardNameForDevice(const QString &macAddress)
}
if (info)
{
QString name = QString::fromUtf8(info->name);
if (name.startsWith("bluez") && name.contains(d->targetMac))
const QString name = QString::fromUtf8(info->name);
const QString macAddress = pa_proplist_gets(info->proplist, "device.string");

if (d->targetMac == macAddress)
{
d->cardName = name;
pa_threaded_mainloop_signal(d->mainloop, 0);
Expand Down
2 changes: 2 additions & 0 deletions linux/media/pulseaudiocontroller.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ class PulseAudioController : public QObject

bool initialize();
QString getDefaultSink();
QString getDefaultSinkMacAddress();
int getSinkVolume(const QString &sinkName);
bool setSinkVolume(const QString &sinkName, int volumePercent);
bool setCardProfile(const QString &cardName, const QString &profileName);
Expand All @@ -32,6 +33,7 @@ class PulseAudioController : public QObject
static void serverInfoCallback(pa_context *c, const pa_server_info *info, void *userdata);

bool waitForOperation(pa_operation *op);
QString getMacAddressBySinkName(const QString &sinkName);
};

#endif // PULSEAUDIOCONTROLLER_H