From f98f6b457b8b5c1369b60685b85e93e9a48222fc Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 29 Sep 2004 20:13:57 +0000
Subject: update to polypaudio 0.6

git-svn-id: file:///home/lennart/svn/public/paman/trunk@39 cdefa82f-4ce1-0310-97f5-ab6066f37c3c
---
 configure.ac      | 4 ++--
 src/MainWindow.cc | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 063371f..3e44887 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,10 +45,10 @@ AC_SUBST(GUILIBS_LIBS)
 
 if test -d ../polypaudio ; then
    POLYP_CFLAGS='-I$(top_srcdir)/../polypaudio'
-   POLYP_LIBS='-L$(top_srcdir)/../polypaudio/polyp/.libs -lpolyp-0.5 -lpolyp-mainloop-0.5 -lpolyp-mainloop-glib-0.5 -lpolyp-error-0.5'
+   POLYP_LIBS='-L$(top_srcdir)/../polypaudio/polyp/.libs -lpolyp-0.6 -lpolyp-mainloop-0.6 -lpolyp-mainloop-glib-0.6 -lpolyp-error-0.6'
    echo "*** Found polypaudio in ../polypaudio, using that version ***"
 else
-   PKG_CHECK_MODULES(POLYP, [ polyplib >= 0.5 polyplib-glib-mainloop >= 0.5 ])
+   PKG_CHECK_MODULES(POLYP, [ polyplib >= 0.6 polyplib-glib-mainloop >= 0.6 ])
 fi
 
 AC_SUBST(POLYP_LIBS)
diff --git a/src/MainWindow.cc b/src/MainWindow.cc
index 46e083b..6e7bf8a 100644
--- a/src/MainWindow.cc
+++ b/src/MainWindow.cc
@@ -219,6 +219,7 @@ void MainWindow::updateInfo(SinkInputInfo &i) {
 }
 
 void MainWindow::updateInfo(SourceOutputInfo &i) {
+    char t[256];
     if (!i.treeRef) {
         SourceInfo *si = serverInfoManager->getSourceInfo(i.source);
         if (!si)
@@ -229,7 +230,9 @@ void MainWindow::updateInfo(SourceOutputInfo &i) {
     }
 
     Gtk::TreeRow row = *(deviceTreeStore->get_iter(i.treeRef.get_path()));
-    row[deviceTreeModelColumns.name] = i.name;
+    snprintf(t, sizeof(t), "#%i", i.index);
+    row[deviceTreeModelColumns.name] = t;
+    row[deviceTreeModelColumns.description] = i.name;
     row[deviceTreeModelColumns.index] = i.index;
     row[deviceTreeModelColumns.type] = ROW_TYPE_SOURCE_OUTPUT;
 
-- 
cgit