From 75f8b2249cad94708ddb5bfff7361ea996d0c82b Mon Sep 17 00:00:00 2001
From: Pierre Ossman <ossman@cendio.se>
Date: Thu, 16 Feb 2006 13:00:42 +0000
Subject: Update to the new polypaudio API.

git-svn-id: file:///home/lennart/svn/public/paman/trunk@47 cdefa82f-4ce1-0310-97f5-ab6066f37c3c
---
 src/ServerInfoManager.hh | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

(limited to 'src/ServerInfoManager.hh')

diff --git a/src/ServerInfoManager.hh b/src/ServerInfoManager.hh
index df9f37a..fb6bacf 100644
--- a/src/ServerInfoManager.hh
+++ b/src/ServerInfoManager.hh
@@ -34,15 +34,14 @@ public:
     void update(const struct pa_sink_info &i);
     void showWindow();
     
-    Glib::ustring name, description;
+    Glib::ustring driver, name, description;
     uint32_t index;
     struct pa_sample_spec sample_spec;
     uint32_t monitor_source;
     uint32_t owner_module;
-    pa_volume_t volume;
+    pa_cvolume volume;
     pa_usec_t latency;
     Glib::ustring monitor_source_name;
-    pa_typeid_t _typeid;
 
     Gtk::TreeRowReference treeRef, sinkComboBoxTreeRef;
 
@@ -57,13 +56,12 @@ public:
     void update(const struct pa_source_info &i);
     void showWindow();
     
-    Glib::ustring name, description;
+    Glib::ustring driver, name, description;
     uint32_t index;
     struct pa_sample_spec sample_spec;
     uint32_t owner_module;
     uint32_t monitor_of_sink;
     pa_usec_t latency;
-    pa_typeid_t _typeid;
 
     Gtk::TreeRowReference treeRef;
     SourceWindow *window;
@@ -95,9 +93,8 @@ public:
     void showWindow();
     
     uint32_t index;
-    Glib::ustring name;
+    Glib::ustring driver, name;
     uint32_t owner_module;
-    pa_typeid_t _typeid;
 
     Gtk::TreeRowReference treeRef;
     ClientWindow *window;
@@ -112,16 +109,15 @@ public:
     void update(const struct pa_sink_input_info &i);
     void showWindow();
     
-    Glib::ustring name;
+    Glib::ustring driver, name;
     uint32_t index;
     struct pa_sample_spec sample_spec;
     uint32_t sink;
     uint32_t client;
     uint32_t owner_module;
-    pa_volume_t volume;
+    pa_cvolume volume;
     pa_usec_t buffer_usec, sink_usec;
     Glib::ustring resample_method;
-    pa_typeid_t _typeid;
 
     Gtk::TreeRowReference treeRef;
 
@@ -137,7 +133,7 @@ public:
     void update(const struct pa_source_output_info &i);
     void showWindow();
     
-    Glib::ustring name;
+    Glib::ustring driver, name;
     uint32_t index;
     struct pa_sample_spec sample_spec;
     uint32_t source;
@@ -145,7 +141,6 @@ public:
     uint32_t owner_module;
     pa_usec_t buffer_usec, source_usec;
     Glib::ustring resample_method;
-    pa_typeid_t _typeid;
 
     Gtk::TreeRowReference treeRef;
 
@@ -164,7 +159,8 @@ public:
     uint32_t index;
     Glib::ustring name;
     struct pa_sample_spec sample_spec;
-    uint32_t volume, duration, bytes;
+    uint32_t duration, bytes;
+    pa_cvolume volume;
     bool lazy;
     Glib::ustring filename;
 
@@ -210,8 +206,8 @@ public:
     void removeSourceOutputInfo(uint32_t index);
     void removeSampleInfo(uint32_t index);
 
-    void setSinkVolume(uint32_t index, uint32_t volume);
-    void setSinkInputVolume(uint32_t index, uint32_t volume);
+    void setSinkVolume(uint32_t index, pa_volume_t volume);
+    void setSinkInputVolume(uint32_t index, pa_volume_t volume);
 
     void showStatWindow();
 
-- 
cgit