<!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> <a href="https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/b76d835e590b8aa10d724c857ea7d135ba53d94e">b76d835e</a> <div> by Igor V. Kovalenko at 2021-01-04T12:19:07+00:00 </div> <pre class="commit-message" style="white-space: pre-wrap; margin: 0;">ladspa-sink: do not call pa_sink_suspend if PA_SINK_IS_LINKED is false While module-ladspa-sink is still being loaded and before pa_sink_put() is called there may be an attempt to reconfigure master sink when avoid-resampling is true. This breaks attempting to suspend ladspa-sink which is still in INIT state. Fix this by skipping pa_sink_suspend if PA_SINK_IS_LINKED is false. Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/445> </pre> </li> </ul> <h4>1 changed file:</h4> <ul> <li class="file-stats"> <a href="#f8453eca83e0d550431e8e60ffdc33168f06b261"> src/modules/module-ladspa-sink.c </a> </li> </ul> <h4>Changes:</h4> <li id="f8453eca83e0d550431e8e60ffdc33168f06b261"> <a href="https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/b76d835e590b8aa10d724c857ea7d135ba53d94e#f8453eca83e0d550431e8e60ffdc33168f06b261">src/modules/module-ladspa-sink.c</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="714" 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="714" 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">@@ -714,6 +714,9 @@ static void sink_input_suspend_cb(pa_sink_input *i, pa_sink_state_t old_state, p</td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="diff-line-num old_line" data-linenumber="714" 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"> 714 </td> <td class="diff-line-num new_line" data-linenumber="714" 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"> 714 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> pa_sink_input_assert_ref(i); </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="diff-line-num old_line" data-linenumber="715" 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"> 715 </td> <td class="diff-line-num new_line" data-linenumber="715" 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"> 715 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> pa_assert_se(u = i->userdata); </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="diff-line-num old_line" data-linenumber="716" 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"> 716 </td> <td class="diff-line-num new_line" data-linenumber="716" 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"> 716 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> </pre> </td> </tr> <tr class="line_holder new" id="" style="line-height: 1.6;"> <td class="diff-line-num new old_line" data-linenumber="717" 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="diff-line-num new new_line" data-linenumber="717" 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"> 717 </td> <td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0"> <pre style="margin: 0;">+ if (!PA_SINK_IS_LINKED(u->sink->state)) </pre> </td> </tr> <tr class="line_holder new" id="" style="line-height: 1.6;"> <td class="diff-line-num new old_line" data-linenumber="717" 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="diff-line-num new new_line" data-linenumber="718" 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"> 718 </td> <td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0"> <pre style="margin: 0;">+ return; </pre> </td> </tr> <tr class="line_holder new" id="" style="line-height: 1.6;"> <td class="diff-line-num new old_line" data-linenumber="717" 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="diff-line-num new new_line" data-linenumber="719" 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"> 719 </td> <td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0"> <pre style="margin: 0;">+ </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="diff-line-num old_line" data-linenumber="717" 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"> 717 </td> <td class="diff-line-num new_line" data-linenumber="720" 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"> 720 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> if (i->sink->state != PA_SINK_SUSPENDED || i->sink->suspend_cause == PA_SUSPEND_IDLE) </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="diff-line-num old_line" data-linenumber="718" 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"> 718 </td> <td class="diff-line-num new_line" data-linenumber="721" 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"> 721 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> pa_sink_suspend(u->sink, false, PA_SUSPEND_UNAVAILABLE); </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="diff-line-num old_line" data-linenumber="719" 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"> 719 </td> <td class="diff-line-num new_line" data-linenumber="722" 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"> 722 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> else </pre> </td> </tr> </table> </li> </div> <div class="footer" style="margin-top: 10px;"> — <a href="https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/b76d835e590b8aa10d724c857ea7d135ba53d94e">View it on GitLab</a>. 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/b76d835e590b8aa10d724c857ea7d135ba53d94e"}}</script> </div> </body> </html>