Merge branch 'master' into master-tx

This commit is contained in:
Lennart Poettering 2008-09-09 15:39:11 +03:00
commit 52b7f2d131
2 changed files with 7 additions and 1 deletions

View File

@ -38,6 +38,10 @@ General Public License for more details.</p>
<h2><a name="news">News</a></h2> <h2><a name="news">News</a></h2>
<div class="news-date">Tue Sep 9
2008: </div> <p class="news-text"><a href="@PACKAGE_URL@pavucontrol-0.9.7.tar.gz">Version
0.9.7</a> released; show volume meter for each stream and device.</p>
<div class="news-date">Fri Mar 28 <div class="news-date">Fri Mar 28
2008: </div> <p class="news-text"><a href="@PACKAGE_URL@pavucontrol-0.9.6.tar.gz">Version 2008: </div> <p class="news-text"><a href="@PACKAGE_URL@pavucontrol-0.9.6.tar.gz">Version
0.9.6</a> released; draw radio buttons instead of check boxes when 0.9.6</a> released; draw radio buttons instead of check boxes when
@ -125,7 +129,7 @@ compilation and <tt>make install</tt> (as root) for installation of
<p>If you want to be notified whenever I release a new version of this software use the subscription feature of <a href="http://freshmeat.net/projects/pavucontrol/">Freshmeat</a>.</p> <p>If you want to be notified whenever I release a new version of this software use the subscription feature of <a href="http://freshmeat.net/projects/pavucontrol/">Freshmeat</a>.</p>
<hr/> <hr/>
<address class="grey">Lennart Poettering &lt;@PACKAGE_BUGREPORT@&gt;, Mar 2008</address> <address class="grey">Lennart Poettering &lt;@PACKAGE_BUGREPORT@&gt;, September 2008</address>
</body> </body>
</html> </html>

View File

@ -1093,6 +1093,7 @@ void MainWindow::createMonitorStreamForSource(uint32_t source_idx) {
memset(&attr, 0, sizeof(attr)); memset(&attr, 0, sizeof(attr));
attr.fragsize = sizeof(float); attr.fragsize = sizeof(float);
attr.maxlength = (uint32_t) -1;
snprintf(t, sizeof(t), "%u", source_idx); snprintf(t, sizeof(t), "%u", source_idx);
@ -1129,6 +1130,7 @@ void MainWindow::createMonitorStreamForSinkInput(uint32_t sink_input_idx, uint32
memset(&attr, 0, sizeof(attr)); memset(&attr, 0, sizeof(attr));
attr.fragsize = sizeof(float); attr.fragsize = sizeof(float);
attr.maxlength = (uint32_t) -1;
snprintf(t, sizeof(t), "%u", monitor_source_idx); snprintf(t, sizeof(t), "%u", monitor_source_idx);