<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="12" style="border: 1px #c9c399 solid; border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px;">
<tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="https://git.reviewboard.kde.org/r/127540/">https://git.reviewboard.kde.org/r/127540/</a>
</td>
</tr>
</table>
<br />
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">Also can you please rebase the review?</p></pre>
<br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; border-collapse: collapse; margin: 2px padding: 2px;">
<thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; font-size: 9pt; padding: 4px 8px; text-align: left;">
<a href="https://git.reviewboard.kde.org/r/127540/diff/2/?file=455585#file455585line28" style="color: black; font-weight: bold; text-decoration: underline;">applet/contents/ui/StreamListItem.qml</a>
<span style="font-weight: normal;">
(Diff revision 2)
</span>
</th>
</tr>
</thead>
<tbody>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">28</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="k">label:</span> <span class="nx">i18nc</span><span class="p">(</span><span class="s2">"label of stream items"</span><span class="p">,</span> <span class="s2">"%1: %2"</span><span class="p">,</span> <span class="nx">PulseObject</span><span class="p">.</span><span class="nx">client</span><span class="p">.</span><span class="nx">name</span><span class="p">,</span> <span class="nx">PulseObject</span><span class="p">.</span><span class="nx">name</span><span class="p">)</span></pre></td>
<th bgcolor="#e9eaa8" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">28</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="k">label:</span> <span class="nx">PulseObject</span><span class="p">.</span><span class="nx">virtualStream</span> <span class="o">?</span> <span class="k">PulseObject.name</span></pre></td>
</tr>
</tbody>
</table>
<div style="margin-left: 2em;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">This should check for client not being null instead.</p></pre>
</div>
</div>
<br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; border-collapse: collapse; margin: 2px padding: 2px;">
<thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; font-size: 9pt; padding: 4px 8px; text-align: left;">
<a href="https://git.reviewboard.kde.org/r/127540/diff/2/?file=455587#file455587line55" style="color: black; font-weight: bold; text-decoration: underline;">src/kcm/package/contents/ui/StreamListItem.qml</a>
<span style="font-weight: normal;">
(Diff revision 2)
</span>
</th>
</tr>
</thead>
<tbody>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">55</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="k">text:</span> <span class="nx"><span class="hl">i18nc</span></span><span class="p"><span class="hl">(</span></span><span class="s2"><span class="hl">"label of stream items"</span></span><span class="p"><span class="hl">,</span></span><span class="hl"> </span><span class="s2"><span class="hl">"%1: %2"</span></span><span class="p"><span class="hl">,</span></span><span class="hl"> </span><span class="nx">PulseObject</span><span class="p">.</span><span class="nx"><span class="hl">client</span></span><span class="p"><span class="hl">.</span></span><span class="nx"><span class="hl">name</span></span><span class="p"><span class="hl">,</span></span> <span class="nx">PulseObject</span><span class="p">.</span><span class="nx">name</span><span class="p"><span class="hl">)</span></span></pre></td>
<th bgcolor="#e9eaa8" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">55</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="k">text:</span> <span class="nx">PulseObject</span><span class="p">.</span><span class="nx"><span class="hl">virtualStream</span></span><span class="hl"> </span><span class="o"><span class="hl">?</span></span> <span class="k">PulseObject.name</span></pre></td>
</tr>
</tbody>
</table>
<div style="margin-left: 2em;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">Same as above: <code style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: normal;margin: 0;line-height: inherit;">PulseObject.client ? .. : ..</code></p></pre>
</div>
</div>
<br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; border-collapse: collapse; margin: 2px padding: 2px;">
<thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; font-size: 9pt; padding: 4px 8px; text-align: left;">
<a href="https://git.reviewboard.kde.org/r/127540/diff/2/?file=455589#file455589line38" style="color: black; font-weight: bold; text-decoration: underline;">src/kcm/package/contents/ui/main.qml</a>
<span style="font-weight: normal;">
(Diff revision 2)
</span>
</th>
</tr>
</thead>
<tbody>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">38</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="k"><span class="hl">m</span>odel:</span> <span class="nx">SinkInputModel</span> <span class="p">{}</span></pre></td>
<th bgcolor="#e9eaa8" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">38</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="k"><span class="hl">sourceM</span>odel:</span> <span class="nx">SinkInputModel</span> <span class="p">{}</span></pre></td>
</tr>
</tbody>
</table>
<div style="margin-left: 2em;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">I think this is also not needed, you should be able to do:</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;"><div class="codehilite" style="background: #f8f8f8"><pre style="line-height: 125%">model<span style="color: #666666">:</span> NonVirtualStreamFilterModel <span style="color: #666666">{</span>
sourceModel<span style="color: #666666">:</span> SinkInputModel <span style="color: #666666">{}</span>
<span style="color: #666666">}</span>
</pre></div>
</p></pre>
</div>
</div>
<br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; border-collapse: collapse; margin: 2px padding: 2px;">
<thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; font-size: 9pt; padding: 4px 8px; text-align: left;">
<a href="https://git.reviewboard.kde.org/r/127540/diff/2/?file=455590#file455590line64" style="color: black; font-weight: bold; text-decoration: underline;">src/pulseaudio.h</a>
<span style="font-weight: normal;">
(Diff revision 2)
</span>
</th>
</tr>
</thead>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2"></font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>
<th bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">64</font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="n">class</span> <span class="n">Q_DECL_EXPORT</span> <span class="nl">AbstractStreamModel</span> <span class="p">:</span> <span class="n">public</span> <span class="n">AbstractModel</span></pre></td>
</tr>
</tbody>
</table>
<div style="margin-left: 2em;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">I think this change (adding AbstractStreamModel) is not needed.</p></pre>
</div>
</div>
<br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; border-collapse: collapse; margin: 2px padding: 2px;">
<thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; font-size: 9pt; padding: 4px 8px; text-align: left;">
<a href="https://git.reviewboard.kde.org/r/127540/diff/2/?file=455595#file455595line34" style="color: black; font-weight: bold; text-decoration: underline;">src/qml/plugin.cpp</a>
<span style="font-weight: normal;">
(Diff revision 2)
</span>
</th>
</tr>
</thead>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2"></font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>
<th bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">34</font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="n">qmlRegisterUncreatableType</span><span class="o"><</span><span class="n">QPulseAudio</span><span class="o">::</span><span class="n">AbstractStreamModel</span><span class="o">></span><span class="p">(</span><span class="n">uri</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="mi">1</span><span class="p">,</span> <span class="s">"AbstractStreamModel"</span><span class="p">,</span></pre></td>
</tr>
</tbody>
</table>
<div style="margin-left: 2em;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">This should not be registered.</p></pre>
</div>
</div>
<br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; border-collapse: collapse; margin: 2px padding: 2px;">
<thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; font-size: 9pt; padding: 4px 8px; text-align: left;">
<a href="https://git.reviewboard.kde.org/r/127540/diff/2/?file=455597#file455597line38" style="color: black; font-weight: bold; text-decoration: underline;">src/stream.h</a>
<span style="font-weight: normal;">
(Diff revision 2)
</span>
</th>
</tr>
</thead>
<tbody>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">38</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="n">class</span><span class="hl"> </span><span class="n"><span class="hl">Q_DECL_EXPORT</span></span> <span class="nl">Stream</span> <span class="p">:</span> <span class="n">public</span> <span class="n">VolumeObject</span></pre></td>
<th bgcolor="#e9eaa8" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">38</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="n">class</span> <span class="nl">Stream</span> <span class="p">:</span> <span class="n">public</span> <span class="n">VolumeObject</span></pre></td>
</tr>
</tbody>
</table>
<div style="margin-left: 2em;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">Unrelated</p></pre>
</div>
</div>
<br />
<p>- David Rosca</p>
<br />
<p>On April 5th, 2016, 5:23 p.m. UTC, Yoann Laissus wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="12" style="border: 1px #888a85 solid; border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px;">
<tr>
<td>
<div>Review request for Plasma.</div>
<div>By Yoann Laissus.</div>
<p style="color: grey;"><i>Updated April 5, 2016, 5:23 p.m.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
plasma-pa
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">Virtual streams appear when virtual devices are defined in PulseAudio configuration (eg: combined output for classic analog and HDMI)
Those virtual streams aren't properly shown in both the KCM and the applet, producing ghost entries.</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">Screens attached.</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">I added a new property to the Stream object to identify if a stream is real or not.
Then, a proxy model takes care of the filtering in the KCM and the applet.
For now, only real devices are shown. But we could add a combobox later, at least in the KCM, to be able to display Virtual, Real or both kind of streams. (like pavucontrol)</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">The branch is here : https://quickgit.kde.org/?p=clones%2Fplasma-pa%2Flaissus%2Fplasma-pa.git&a=shortlog&h=014d6925b0911f9db2dc5f55cec5e5a9a84df8c9</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">PS : Other review requests are coming (sink selection for streams) but needs some rebasing with David Rosca's latest patches.</p></pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>applet/contents/ui/StreamListItem.qml <span style="color: grey">(a47be1cb65d634e49bb9d97f11853ff667f9aa7d)</span></li>
<li>applet/contents/ui/main.qml <span style="color: grey">(cbe63ced145cd6e755511d025df84a536976eac4)</span></li>
<li>src/kcm/package/contents/ui/StreamListItem.qml <span style="color: grey">(c9ec36c31ef55dbc0281d9807f45f0e48bb4cc41)</span></li>
<li>src/kcm/package/contents/ui/StreamView.qml <span style="color: grey">(b08c87a2452cadd13bae5b0b94b57c3d8f531b3b)</span></li>
<li>src/kcm/package/contents/ui/main.qml <span style="color: grey">(3360201dd8e2a4b5ab03c82c94e5c79d8af9ea4c)</span></li>
<li>src/pulseaudio.h <span style="color: grey">(9fc9656e84ee4761d9e8dd9d2a7b8c9d0af9e517)</span></li>
<li>src/pulseaudio.cpp <span style="color: grey">(14887849a04ff2fb3ded5d0d5e60ec3ce4c40745)</span></li>
<li>src/qml/CMakeLists.txt <span style="color: grey">(0c2edb305d2745fd857a552c058cf1b7e652f3eb)</span></li>
<li>src/qml/ClientIcon.qml <span style="color: grey">(83545a1a446c6c07611cb59cdc8a7f11e81407e3)</span></li>
<li>src/qml/NonVirtualStreamFilterModel.qml <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/qml/plugin.cpp <span style="color: grey">(5743253f9a7b8283d2bcbeeb081d0706ba4c7b12)</span></li>
<li>src/qml/qmldir <span style="color: grey">(88715cac57d6b8c9c6854caa54b0e3d3f773014a)</span></li>
<li>src/stream.h <span style="color: grey">(b5e09ebaaa0b812f3db81e269671640c783e7c87)</span></li>
<li>src/stream.cpp <span style="color: grey">(d8f390805e96bbc2dc69ca02520c049b2ca0a4b6)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/127540/diff/" style="margin-left: 3em;">View Diff</a></p>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">File Attachments </h1>
<li><a href="https://git.reviewboard.kde.org/media/uploaded/files/2016/03/31/fd74b564-2e56-45e2-88b9-6bf526f98311__Screenshot_20160331_225655.png">KCM</a></li>
<li><a href="https://git.reviewboard.kde.org/media/uploaded/files/2016/03/31/44b3c277-ee01-4dbf-99f7-dc27edc592e9__Screenshot_20160331_225554.png">Applet</a></li>
<li><a href="https://git.reviewboard.kde.org/media/uploaded/files/2016/03/31/5a872915-dd32-4558-9e4e-947f92f75a70__Screenshot_20160331_231548.png">pavucontrol</a></li>
<li><a href="https://git.reviewboard.kde.org/media/uploaded/files/2016/03/31/cdf983ea-032f-4246-95b8-ba9a4d228ccd__Screenshot_20160331_232502.png">KCM</a></li>
<li><a href="https://git.reviewboard.kde.org/media/uploaded/files/2016/03/31/1a3d3e3a-6078-445d-84c4-8929cb6243a8__Screenshot_20160331_232444.png">Applet</a></li>
</ul>
</td>
</tr>
</table>
</div>
</body>
</html>