Differential D29312 Diff 81614 src/qml/microphoneindicator.cpp

Changeset View

Standalone View

View Options

src/qml/microphoneindicator.cpp

Context not available.
140 } 140​ }
141 } 141​ }
142 142​
143 m_sni->setTitle(i18n("Microphone")); 143​ m_sni->setTitle(i18n("Audio monitor"));
144 m_sni->setIconByName(iconName); 144​ m_sni->setIconByName(iconName);
145 145​
146 QString tooltip = i18nc("App is using mic", "%1 is using the microphone", names.constFirst()); 146​ QString tooltip = i18nc("App is monitoring audio", "%1 is monitoring an audio stream", names.constFirst());
147 if (names.count() > 1) { 147​ if (names.count() > 1) {
148 tooltip = i18nc("List of apps is using mic", "%1 are using the microphone", names.join(i18nc("list separator", ", "))); 148​ tooltip = i18nc(
149​ "List of apps are monitoring audio", "%1 are monitoring an audio stream",
150​ names.join(i18nc("list separator", ", "))
151​ );
149 } 152​ }
150 153​
151 m_sni->setToolTip(QIcon::fromTheme(iconName), i18n("Microphone"), tooltip); 154​ m_sni->setToolTip(QIcon::fromTheme(iconName), i18n("Audio monitor"), tooltip);
152 155​
153 if (m_muteAction) { 156​ if (m_muteAction) {
154 m_muteAction->setChecked(allMuted); 157​ m_muteAction->setChecked(allMuted);
Context not available.
261 264​
262QStringList MicrophoneIndicator::appNames() const 265​QStringList MicrophoneIndicator::appNames() const
263{ 266​{
264 // If there are no microphones present, there's nothing to record ​
ngrahamUnsubmitted
Not Done

I don't think this needs to be removed. If an app is "monitoring audio" but there 's no audio recording device, that it hardly matters, right?

ngraham: I don't think this needs to be removed. If an app is "monitoring audio" but there 's no audio…
kurmikonAuthorUnsubmitted
Not Done

First of all, I'm not a c++ developer, I just changed strings, I don't even know what m_sourceModel is. I assume it's a structure listing input sinks, so if you don't have microphones connected, you won't see the indicator, right?

If I assumed right, this is useless I think, because when you connect a microphone, the indicator will show PulseEffects even if nothing is recording from the mic. Plus, some systems have microphone integrated, always connected, so it's useless in this case.

The point is: you want to show applications using microphones? So, show only them, and not monitor sinks.

Since it seems that can't be achieved, show everything is monitoring an audio stream, including applications using microphone and monitor sinks. So, if there's no audio recording device, show monitor sinks (if they are present).

kurmikon: First of all, I'm not a c++ developer, I just changed strings, I don't even know what…
265 if (m_sourceModel->rowCount() == 0) { ​
266 return QStringList(); ​
267 } ​
268 ​
269 static const int s_nameRole = m_sourceOutputModel->role(QByteArrayLiteral("Name")); 267​ static const int s_nameRole = m_sourceOutputModel->role(QByteArrayLiteral("Name"));
270 Q_ASSERT(s_nameRole > -1); 268​ Q_ASSERT(s_nameRole > -1);
271 static const int s_clientRole = m_sourceOutputModel->role(QByteArrayLiteral("Client")); 269​ static const int s_clientRole = m_sourceOutputModel->role(QByteArrayLiteral("Client"));
Context not available.