<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en">
<head>
<meta content="text/html; charset=US-ASCII" http-equiv="Content-Type">
<title>
GitLab
</title>
<style>img {
max-width: 100%; height: auto;
}
</style>
</head>
<body>
<div class="content">
<h3>
PulseAudio Marge Bot pushed to branch master
at <a href="https://gitlab.freedesktop.org/pulseaudio/pulseaudio">PulseAudio / pulseaudio</a>
</h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/7580ef31a1730d035385df4127b0aa25e8e9c590">7580ef31</a></strong>
<div>
<span>by Alper Nebi Yasak</span>
<i>at 2021-06-30T15:09:14+00:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">alsa-ucm: Log about the correct path value when probing volumes
These two log messages are most likely intended for the path that was
just tried, but they are mistakenly printing the name of the port's
current path. Fix them.
Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/594>
</pre>
</li>
</ul>
<h4>1 changed file:</h4>
<ul>
<li class="file-stats">
<a href="#644a348846ae02065ff04e4571fdf47667774531">
src/modules/alsa/alsa-ucm.c
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="644a348846ae02065ff04e4571fdf47667774531">
<a href="https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/7580ef31a1730d035385df4127b0aa25e8e9c590#644a348846ae02065ff04e4571fdf47667774531"><strong>src/modules/alsa/alsa-ucm.c</strong></a>
<hr>
<table class="code white" style="font-family: monospace; font-size: 90%;" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder match" id="" style="line-height: 1.6;">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="962" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="962" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="line_content match" style="padding-left: 0.5em; padding-right: 0.5em; color: rgba(0,0,0,0.3);" bgcolor="#fafafa">@@ -962,10 +962,10 @@ static void probe_volumes(pa_hashmap *hash, bool is_sink, snd_pcm_t *pcm_handle,</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="962" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
962
</td>
<td class="new_line diff-line-num" data-linenumber="962" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
962
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC962" class="line" lang="c"></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="963" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
963
</td>
<td class="new_line diff-line-num" data-linenumber="963" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
963
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC963" class="line" lang="c"> <span class="n" style="color: #333;">PA_HASHMAP_FOREACH_KV</span><span class="p">(</span><span class="n" style="color: #333;">profile</span><span class="p">,</span> <span class="n" style="color: #333;">path</span><span class="p">,</span> <span class="n" style="color: #333;">data</span><span class="o" style="font-weight: 600;">-></span><span class="n" style="color: #333;">paths</span><span class="p">,</span> <span class="n" style="color: #333;">state2</span><span class="p">)</span> <span class="p">{</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="964" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
964
</td>
<td class="new_line diff-line-num" data-linenumber="964" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
964
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC964" class="line" lang="c"> <span class="k" style="font-weight: 600;">if</span> <span class="p">(</span><span class="n" style="color: #333;">pa_alsa_path_probe</span><span class="p">(</span><span class="n" style="color: #333;">path</span><span class="p">,</span> <span class="nb" style="color: #0086b3;">NULL</span><span class="p">,</span> <span class="n" style="color: #333;">mixer_handle</span><span class="p">,</span> <span class="n" style="color: #333;">ignore_dB</span><span class="p">)</span> <span class="o" style="font-weight: 600;"><</span> <span class="mi" style="color: #099;">0</span><span class="p">)</span> <span class="p">{</span></span>
</pre>
</td>
</tr>
<tr class="line_holder old" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num old" data-linenumber="965" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
965
</td>
<td class="new_line diff-line-num old" data-linenumber="965" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb">
<pre style="margin: 0;">-<span id="LC965" class="line" lang="c"> <span class="n" style="color: #333;">pa_log_warn</span><span class="p">(</span><span class="s" style="color: #d14;">"Could not probe path: %s, using s/w volume"</span><span class="p">,</span> <span class="n" style="color: #333;"><span class="idiff left deletion">data</span></span><span class="o" style="font-weight: 600;"><span class="idiff right deletion">-></span></span><span class="n" style="color: #333;">path</span><span class="o" style="font-weight: 600;">-></span><span class="n" style="color: #333;">name</span><span class="p">);</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num new" data-linenumber="966" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
</td>
<td class="new_line diff-line-num new" data-linenumber="965" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
965
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC965" class="line" lang="c"> <span class="n" style="color: #333;">pa_log_warn</span><span class="p">(</span><span class="s" style="color: #d14;">"Could not probe path: %s, using s/w volume"</span><span class="p">,</span> <span class="n" style="color: #333;">path</span><span class="o" style="font-weight: 600;">-></span><span class="n" style="color: #333;">name</span><span class="p">);</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="966" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
966
</td>
<td class="new_line diff-line-num" data-linenumber="966" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
966
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC966" class="line" lang="c"> <span class="n" style="color: #333;">pa_hashmap_remove</span><span class="p">(</span><span class="n" style="color: #333;">data</span><span class="o" style="font-weight: 600;">-></span><span class="n" style="color: #333;">paths</span><span class="p">,</span> <span class="n" style="color: #333;">profile</span><span class="p">);</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="967" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
967
</td>
<td class="new_line diff-line-num" data-linenumber="967" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
967
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC967" class="line" lang="c"> <span class="p">}</span> <span class="k" style="font-weight: 600;">else</span> <span class="k" style="font-weight: 600;">if</span> <span class="p">(</span><span class="o" style="font-weight: 600;">!</span><span class="n" style="color: #333;">path</span><span class="o" style="font-weight: 600;">-></span><span class="n" style="color: #333;">has_volume</span><span class="p">)</span> <span class="p">{</span></span>
</pre>
</td>
</tr>
<tr class="line_holder old" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num old" data-linenumber="968" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
968
</td>
<td class="new_line diff-line-num old" data-linenumber="968" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb">
<pre style="margin: 0;">-<span id="LC968" class="line" lang="c"> <span class="n" style="color: #333;">pa_log_warn</span><span class="p">(</span><span class="s" style="color: #d14;">"Path %s is not a volume control"</span><span class="p">,</span> <span class="n" style="color: #333;"><span class="idiff left deletion">data</span></span><span class="o" style="font-weight: 600;"><span class="idiff right deletion">-></span></span><span class="n" style="color: #333;">path</span><span class="o" style="font-weight: 600;">-></span><span class="n" style="color: #333;">name</span><span class="p">);</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num new" data-linenumber="969" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
</td>
<td class="new_line diff-line-num new" data-linenumber="968" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
968
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC968" class="line" lang="c"> <span class="n" style="color: #333;">pa_log_warn</span><span class="p">(</span><span class="s" style="color: #d14;">"Path %s is not a volume control"</span><span class="p">,</span> <span class="n" style="color: #333;">path</span><span class="o" style="font-weight: 600;">-></span><span class="n" style="color: #333;">name</span><span class="p">);</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="969" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
969
</td>
<td class="new_line diff-line-num" data-linenumber="969" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
969
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC969" class="line" lang="c"> <span class="n" style="color: #333;">pa_hashmap_remove</span><span class="p">(</span><span class="n" style="color: #333;">data</span><span class="o" style="font-weight: 600;">-></span><span class="n" style="color: #333;">paths</span><span class="p">,</span> <span class="n" style="color: #333;">profile</span><span class="p">);</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="970" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
970
</td>
<td class="new_line diff-line-num" data-linenumber="970" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
970
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC970" class="line" lang="c"> <span class="p">}</span> <span class="k" style="font-weight: 600;">else</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="971" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
971
</td>
<td class="new_line diff-line-num" data-linenumber="971" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
971
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC971" class="line" lang="c"> <span class="n" style="color: #333;">pa_log_debug</span><span class="p">(</span><span class="s" style="color: #d14;">"Set up h/w volume using '%s' for %s:%s"</span><span class="p">,</span> <span class="n" style="color: #333;">path</span><span class="o" style="font-weight: 600;">-></span><span class="n" style="color: #333;">name</span><span class="p">,</span> <span class="n" style="color: #333;">profile</span><span class="p">,</span> <span class="n" style="color: #333;">port</span><span class="o" style="font-weight: 600;">-></span><span class="n" style="color: #333;">name</span><span class="p">);</span></span>
</pre>
</td>
</tr>
</table>
<br>
</li>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #666;">
—
<br>
<a href="https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/7580ef31a1730d035385df4127b0aa25e8e9c590">View it on GitLab</a>.
<br>
You're receiving this email because of your account on gitlab.freedesktop.org.
If you'd like to receive fewer emails, you can
adjust your notification settings.
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Commit","url":"https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/7580ef31a1730d035385df4127b0aa25e8e9c590"}}</script>
</p>
</div>
</body>
</html>