Merge lp:~docky-core/docky/sound into lp:docky

[Rico Tzschichholz]

add Sound docklet and some refactoring of the Menu classes.

pulseaudio-sharp still has some mainloop issues. But it could be considered has a minor problem.

[Alex Chmyr (achmyr)]

 I've merged sound branch changes into mainline and built it, when it
 first time starts, volume icon is a default (white gtk icon), after
 any action (volume change, right-click) it starts show normally, please take a look to logs in bug attached

[lp:~docky-core/docky/sound]

1777. By Rico Tzschichholz on 2011-06-11

merge trunk 1813

1778. By Rico Tzschichholz on 2012-02-04

merge trunk 1825

1779. By Rico Tzschichholz on 2012-02-04

refresh Sound.csproj

Unmerged revisions

1779. By Rico Tzschichholz on 2012-02-04

refresh Sound.csproj

1778. By Rico Tzschichholz on 2012-02-04

merge trunk 1825

1777. By Rico Tzschichholz on 2011-06-11

merge trunk 1813

1776. By Rico Tzschichholz on 2011-01-26

rename MenuItem property to MItem of MenuItemWidget

1775. By Rico Tzschichholz on 2011-01-26

revert change in Context_Extension

1774. By Rico Tzschichholz on 2011-01-26

add Sound docklet

=== modified file 'Docky-2.sln'
--- Docky-2.sln	2011-12-22 15:47:35 +0000
+++ Docky-2.sln	2012-02-04 07:53:22 +0000
@@ -43,6 +43,8 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Clippy", "StandardPlugins\Clippy\Clippy.csproj", "{E15414F1-C6F7-4D3E-8D25-BF32F93D3818}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sound", "StandardPlugins\Sound\Sound.csproj", "{16B2B0E3-3437-4F07-958D-E961E132F5F5}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetworkMonitor", "StandardPlugins\NetworkMonitor\NetworkMonitor.csproj", "{6FC9E311-1829-440F-9A6C-70302B656156}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Docky.Widgets", "Docky.Widgets\Docky.Widgets.csproj", "{9CF2F475-7848-4333-9A35-93E8224653B3}"
@@ -55,6 +57,10 @@
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{16B2B0E3-3437-4F07-958D-E961E132F5F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{16B2B0E3-3437-4F07-958D-E961E132F5F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{16B2B0E3-3437-4F07-958D-E961E132F5F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{16B2B0E3-3437-4F07-958D-E961E132F5F5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2F5FDD02-4BDA-4E80-8B92-A8BD55FFBC81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2F5FDD02-4BDA-4E80-8B92-A8BD55FFBC81}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2F5FDD02-4BDA-4E80-8B92-A8BD55FFBC81}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -165,6 +171,7 @@
 		{AAD062AA-454A-4263-97E7-B6ED3020D84C} = {8D4EE2FA-9CF2-4890-B14A-1BA8752404FE}
 		{66939AAB-0832-4D2D-8282-3E29AA772B69} = {8D4EE2FA-9CF2-4890-B14A-1BA8752404FE}
 		{E15414F1-C6F7-4D3E-8D25-BF32F93D3818} = {8D4EE2FA-9CF2-4890-B14A-1BA8752404FE}
+		{16B2B0E3-3437-4F07-958D-E961E132F5F5} = {8D4EE2FA-9CF2-4890-B14A-1BA8752404FE}
 		{6FC9E311-1829-440F-9A6C-70302B656156} = {8D4EE2FA-9CF2-4890-B14A-1BA8752404FE}
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 
=== modified file 'Docky.CairoHelper/Cairo/Color_Extensions.cs'
--- Docky.CairoHelper/Cairo/Color_Extensions.cs	2009-12-06 05:14:01 +0000
+++ Docky.CairoHelper/Cairo/Color_Extensions.cs	2012-02-04 07:53:22 +0000
@@ -72,6 +72,11 @@
 			return new Cairo.Color (self.R, self.G, self.B, alpha);
 		}
 		
+		public static Cairo.Color Inverse (this Color self)
+		{
+			return new Cairo.Color (1.0 - self.R, 1.0 - self.G, 1.0 - self.B, self.A);
+		}
+		
 		// Basic Getters
 		public static double GetHue (this Color self)
 		{
 
=== modified file 'Docky.CairoHelper/Docky.CairoHelper/DockySurface.cs'
--- Docky.CairoHelper/Docky.CairoHelper/DockySurface.cs	2011-03-13 16:47:29 +0000
+++ Docky.CairoHelper/Docky.CairoHelper/DockySurface.cs	2012-02-04 07:53:22 +0000
@@ -76,6 +76,41 @@
 			Internal = image;
 		}
 
+		DockySurface (Gdk.Pixbuf pixbuf, int width, int height, int offset_x, int offset_y)
+		{
+			Width = width;
+			Height = height;
+			
+			Gdk.CairoHelper.SetSourcePixbuf (Context, pixbuf, offset_x, offset_y);
+			Context.Paint ();
+		}
+		
+		public DockySurface (Gdk.Pixbuf pixbuf) : this(pixbuf, pixbuf.Width, pixbuf.Height, 0, 0)
+		{
+		}
+		
+		public DockySurface (Gdk.Pixbuf pixbuf, bool square)
+		{
+			int width = pixbuf.Width;
+			int height = pixbuf.Height;
+			int offset_x = 0;
+			int offset_y = 0;
+			
+			if (!square) {
+				Width = width;
+				Height = height;
+			} else {
+				int size = (width >= height ? width : height);
+				offset_x = (size - width) / 2;
+				offset_y = (size - height) / 2;
+				Width = size;
+				Height = size;
+			}
+			
+			Gdk.CairoHelper.SetSourcePixbuf (Context, pixbuf, offset_x, offset_y);
+			Context.Paint ();
+		}
+		
 		public void ResetContext ()
 		{
 			if (context == null)
 
=== modified file 'Docky.Items/Docky.Items.csproj'
--- Docky.Items/Docky.Items.csproj	2011-12-22 15:47:35 +0000
+++ Docky.Items/Docky.Items.csproj	2012-02-04 07:53:22 +0000
@@ -98,6 +98,7 @@
     <Compile Include="Docky.Menus\MenuList.cs" />
     <Compile Include="Docky.Menus\IconMenuItem.cs" />
     <Compile Include="Docky.Items\IconEmblem.cs" />
+    <Compile Include="Docky.Menus\SliderMenuItem.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Docky.Services\Docky.Services.csproj">
 
=== added file 'Docky.Items/Docky.Menus/SliderMenuItem.cs'
--- Docky.Items/Docky.Menus/SliderMenuItem.cs	1970-01-01 00:00:00 +0000
+++ Docky.Items/Docky.Menus/SliderMenuItem.cs	2012-02-04 07:53:22 +0000
@@ -0,0 +1,72 @@
+//  
+//  Copyright (C) 2011 Rico Tzschichholz
+// 
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// 
+
+using System;
+
+namespace Docky.Menus
+{
+
+	public class PositionChangedEventArgs : EventArgs
+	{
+		public double NewPosition { get; private set; }
+		
+		public PositionChangedEventArgs (double new_position)
+		{
+			NewPosition = new_position;
+		}
+	}
+	
+	public class SliderMenuItem : MenuItem
+	{
+		public event EventHandler<PositionChangedEventArgs> PositionChanged;
+		
+		double position;
+		public double Position {
+			get { return position; }
+			set {
+				if (position == value)
+					return;
+				position = value;
+				if (PositionChanged != null)
+					PositionChanged (this, new PositionChangedEventArgs (position));
+			}
+		}
+		
+		public SliderMenuItem ()
+		{
+		}
+		
+		public SliderMenuItem (string text, double position, string icon) : this (text, position, icon, false)
+		{
+		}
+		
+		public SliderMenuItem (string text, double position, string icon, bool disabled) : base (text, icon, disabled)
+		{
+			this.position = position;
+		}
+		
+		public SliderMenuItem (string text, double position, string icon, EventHandler<PositionChangedEventArgs> onSlide) : this(text, position, icon)
+		{
+			PositionChanged += onSlide;
+		}
+		
+		public SliderMenuItem (string text, double position, string icon, EventHandler<PositionChangedEventArgs> onSlide, bool disabled) : this(text, position, icon, disabled)
+		{
+			PositionChanged += onSlide;
+		}
+	}
+}
 
=== modified file 'Docky.Items/Makefile.am'
--- Docky.Items/Makefile.am	2011-01-02 12:42:36 +0000
+++ Docky.Items/Makefile.am	2012-02-04 07:53:22 +0000
@@ -15,6 +15,7 @@
 	Docky.Menus/ProxyMenuItem.cs \
 	Docky.Menus/MenuList.cs \
 	Docky.Menus/SeparatorMenuItem.cs \
+	Docky.Menus/SliderMenuItem.cs \
 	Docky.Menus/WindowMenuItem.cs \
 	Docky.Menus/IconMenuItem.cs \
 	Docky.Items/WindowDockItem.cs \
 
=== modified file 'Docky.Services/Docky.Services/DrawingService.cs'
--- Docky.Services/Docky.Services/DrawingService.cs	2011-01-16 10:10:00 +0000
+++ Docky.Services/Docky.Services/DrawingService.cs	2012-02-04 07:53:22 +0000
@@ -172,7 +172,23 @@
 		}
 
 		/// <summary>
-		/// Load an icon specifying only the size.  Size will be  used for both width and height.
+		/// Load an icon at its native size.  Note when this is used on icons that are not files or resources 
+		/// an exception will be thrown.
+		/// </summary>
+		/// <param name="names">
+		/// A <see cref="System.String"/>
+		/// </param>
+		/// <returns>
+		/// A <see cref="Gdk.Pixbuf"/>
+		/// A <see cref="Docky.CairoHelper.DockySurface"/>
+		/// </returns>
+		public Gdk.Pixbuf LoadIcon (string names)
+		{
+			return LoadIcon (names, -1, -1);
+		}
+		
+		/// <summary>
+		/// Load an icon specifying only the size. Size will be used for both width and height.
 		/// </summary>
 		/// <param name="names">
 		/// A <see cref="System.String"/>
@@ -182,6 +198,7 @@
 		/// </param>
 		/// <returns>
 		/// A <see cref="Gdk.Pixbuf"/>
+		/// A <see cref="Docky.CairoHelper.DockySurface"/>
 		/// </returns>
 		public Gdk.Pixbuf LoadIcon (string names, int size)
 		{
@@ -189,21 +206,6 @@
 		}
 		
 		/// <summary>
-		/// Load an icon at its native size.  Note when this is used on icons that are not files or resources 
-		/// an exception will be thrown.
-		/// </summary>
-		/// <param name="names">
-		/// A <see cref="System.String"/>
-		/// </param>
-		/// <returns>
-		/// A <see cref="Gdk.Pixbuf"/>
-		/// </returns>
-		public Gdk.Pixbuf LoadIcon (string names)
-		{
-			return LoadIcon (names, -1);
-		}
-		
-		/// <summary>
 		/// Returns the string name of the supplied icon.
 		/// </summary>
 		/// <param name="icon">
 
=== modified file 'Docky/Docky.csproj'
--- Docky/Docky.csproj	2011-12-22 15:47:35 +0000
+++ Docky/Docky.csproj	2012-02-04 07:53:22 +0000
@@ -80,6 +80,8 @@
     <Compile Include="gtk-gui\Docky.ConfigurationWindow.cs" />
     <Compile Include="Docky\DockletTile.cs" />
     <Compile Include="Mono\Options.cs" />
+    <Compile Include="Docky\Menus\SliderMenuItemWidget.cs" />
+    <Compile Include="Docky\Menus\TextMenuItemWidget.cs" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
 
=== modified file 'Docky/Docky/Menus/DockItemMenu.cs'
--- Docky/Docky/Menus/DockItemMenu.cs	2010-10-15 15:32:36 +0000
+++ Docky/Docky/Menus/DockItemMenu.cs	2012-02-04 07:53:22 +0000
@@ -94,7 +94,7 @@
 						selected = NumberItems () - 1;
 					
 					UpdateSelected (selected);
-				} while (GetSelectedItem ().item.Disabled);
+				} while (GetSelectedItem ().MItem.Disabled);
 			} else if (evnt.Key == Gdk.Key.Down) {
 				do {
 					int selected = GetSelected () + 1;
@@ -103,9 +103,9 @@
 						selected = 0;
 					
 					UpdateSelected (selected);
-				} while (GetSelectedItem ().item.Disabled);
+				} while (GetSelectedItem ().MItem.Disabled);
 			} else if (evnt.Key == Gdk.Key.Return && GetSelectedItem () != null) {
-				MenuItem item = (GetSelectedItem () as MenuItemWidget).item;
+				MenuItem item = (GetSelectedItem () as MenuItemWidget).MItem;
 				if (!item.Disabled) {
 					item.SendClick ();
 					Hide ();
@@ -115,7 +115,7 @@
 			} else {
 				foreach (Gtk.Widget widget in (Container.Child as VBox).Children)
 					if (widget is MenuItemWidget) {
-						MenuItem item = (widget as MenuItemWidget).item;
+						MenuItem item = (widget as MenuItemWidget).MItem;
 						if (evnt.KeyValue == item.Mnemonic)
 							if (!item.Disabled) {
 								item.SendClick ();
@@ -177,16 +177,22 @@
 					
 					first = false;
 					vbox.PackStart (widget);
-				} else {
-					MenuItemWidget menuItem = new MenuItemWidget (item);
-					menuItem.SelectedChanged += HandleSelectedChanged;
-					menuItem.TextColor = textColor;
-					menuItem.MenuShowingIcons = hasIcon;
+				} else if (item is SliderMenuItem || item is MenuItem) {
+					MenuItemWidget widget;
+					
+					if (item is SliderMenuItem)
+						widget = new SliderMenuItemWidget (item as SliderMenuItem);
+					else
+						widget = new TextMenuItemWidget (item);
+
+					widget.SelectedChanged += HandleSelectedChanged;
+					widget.TextColor = textColor;
+					widget.MenuShowingIcons = hasIcon;
 					
 					first = false;
-					vbox.PackStart (menuItem, false, false, 0);
+					vbox.PackStart (widget, false, false, 0);
 					
-					width = Math.Max (width, menuItem.RequestedWidth);
+					width = Math.Max (width, widget.RequestedWidth);
 				}
 			}
 			vbox.SetSizeRequest (width, -1);
 
=== modified file 'Docky/Docky/Menus/MenuItemWidget.cs'
--- Docky/Docky/Menus/MenuItemWidget.cs	2011-02-08 07:28:57 +0000
+++ Docky/Docky/Menus/MenuItemWidget.cs	2012-02-04 07:53:22 +0000
@@ -1,6 +1,7 @@
 //  
 //  Copyright (C) 2009 Jason Smith, Robert Dyer
 //  Copyright (C) 2010 Robert Dyer
+//  Copyright (C) 2011 Rico Tzschichholz
 // 
 //  This program is free software: you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
@@ -28,22 +29,32 @@
 
 namespace Docky.Menus
 {
-	internal class MenuItemWidget : Gtk.EventBox
+	internal abstract class MenuItemWidget : Gtk.EventBox
 	{
-		const int MenuHeight = 22;
-		const int MinWidth = 100;
-		const int MaxWidth = 350;
-		const int FontSize = 11;
-		const int Padding = 4;
-		const int IconBuffer = Padding - 1;
-		
-		public MenuItem item;
+		public static MenuItemWidget NewFromMenuItem (MenuItem item)
+		{
+			return new TextMenuItemWidget (item);
+		}
+		
+		public static MenuItemWidget NewFromMenuItem (SliderMenuItem item)
+		{
+			return new SliderMenuItemWidget (item);
+		}
+		
+		protected const int MenuHeight = 22;
+		protected const int MinWidth = 100;
+		protected const int MaxWidth = 350;
+		protected const int FontSize = 11;
+		protected const int Padding = 4;
+		protected const int IconBuffer = Padding - 1;
+		
+		public MenuItem MItem { get; protected set; }
 		
 		public event EventHandler SelectedChanged;
 		
  		public bool Selected { get; set; }
 		
-		bool menu_icons = false;
+		protected bool menu_icons = false;
 		public bool MenuShowingIcons {
 			get {
 				return menu_icons;
@@ -58,18 +69,18 @@
 		
 		public Cairo.Color TextColor { get; set; }
 		
-		int TextWidth { get; set; }
+		protected int TextWidth { get; set; }
 		public int RequestedWidth { get; protected set; }
 		
-		DockySurface icon_surface, emblem_surface;
+		protected DockySurface icon_surface, emblem_surface;
 		
 		internal MenuItemWidget (MenuItem item) : base()
 		{
 			TextColor = new Cairo.Color (1, 1, 1);
-			this.item = item;
-			item.IconChanged += ItemIconChanged;
-			item.TextChanged += ItemTextChanged;
-			item.DisabledChanged += ItemDisabledChanged;
+			MItem = item;
+			MItem.IconChanged += ItemIconChanged;
+			MItem.TextChanged += ItemTextChanged;
+			MItem.DisabledChanged += ItemDisabledChanged;
 			
 			AddEvents ((int) Gdk.EventMask.AllEventsMask);
 			
@@ -77,10 +88,10 @@
 			VisibleWindow = false;
 			AboveChild = true;
 			
-			CalcTextWidth ();
+			SetSize ();
 		}
 		
-		void SetSize ()
+		protected void SetSize ()
 		{
 			RequestedWidth = TextWidth + 2 * Padding + 1;
 			if (MenuShowingIcons)
@@ -89,45 +100,17 @@
 			SetSizeRequest (RequestedWidth, MenuHeight);
 		}
 		
-		void CalcTextWidth ()
-		{
-			using (Pango.Layout layout = DockServices.Drawing.ThemedPangoLayout ()) {
-				char accel;
-				
-				string text = GLib.Markup.EscapeText (item.Text.Replace ("\n", ""));
-				if (item.Mnemonic.HasValue)
-					layout.SetMarkupWithAccel (text, '_', out accel);
-				else
-					layout.SetMarkup (text);
-				layout.FontDescription = Style.FontDescription;
-				layout.Ellipsize = Pango.EllipsizeMode.End;
-				layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels (FontSize);
-				layout.FontDescription.Weight = Pango.Weight.Bold;
-				
-				Pango.Rectangle logical, ink;
-				layout.GetPixelExtents (out ink, out logical);
-				
-				TextWidth = Math.Min (MaxWidth, Math.Max (MinWidth, logical.Width));
-				HasTooltip = TextWidth < logical.Width;
-				
-				layout.Context.Dispose ();
-			}
-			
-			SetSize ();
-		}
-
-		void ItemDisabledChanged (object sender, EventArgs e)
-		{
-			QueueDraw ();
-		}
-
-		void ItemTextChanged (object sender, EventArgs e)
-		{
-			CalcTextWidth ();
-			QueueDraw ();
-		}
-
-		void ItemIconChanged (object sender, EventArgs e)
+		protected virtual void ItemDisabledChanged (object sender, EventArgs e)
+		{
+			QueueDraw ();
+		}
+
+		protected virtual void ItemTextChanged (object sender, EventArgs e)
+		{
+			QueueDraw ();
+		}
+
+		protected virtual void ItemIconChanged (object sender, EventArgs e)
 		{
 			if (icon_surface != null)
 				icon_surface.Dispose ();
@@ -136,19 +119,24 @@
 			QueueDraw ();
 		}
 		
+		protected void OnSelectedChanged ()
+		{
+			if (SelectedChanged != null)
+				SelectedChanged (this, EventArgs.Empty);
+		}
+		
 		protected override bool OnButtonReleaseEvent (EventButton evnt)
 		{
-			if (!item.Disabled)
-				item.SendClick ();
-			return item.Disabled;
+			if (!MItem.Disabled)
+				MItem.SendClick ();
+			return MItem.Disabled;
 		}
 		
 		protected override bool OnMotionNotifyEvent (EventMotion evnt)
 		{
-			if (!item.Disabled && !Selected) {
+			if (!MItem.Disabled && !Selected) {
 				Selected = true;
-				if (SelectedChanged != null)
-					SelectedChanged (this, EventArgs.Empty);
+				OnSelectedChanged ();
 				QueueDraw ();
 			}
 			return false;
@@ -156,10 +144,9 @@
 		
 		protected override bool OnEnterNotifyEvent (EventCrossing evnt)
 		{
-			if (!item.Disabled && !Selected) {
+			if (!MItem.Disabled && !Selected) {
 				Selected = true;
-				if (SelectedChanged != null)
-					SelectedChanged (this, EventArgs.Empty);
+				OnSelectedChanged ();
 				QueueDraw ();
 			}
 			return false;
@@ -167,10 +154,9 @@
 
 		protected override bool OnLeaveNotifyEvent (EventCrossing evnt)
 		{
-			if (!item.Disabled && Selected) {
+			if (!MItem.Disabled && Selected) {
 				Selected = false;
-				if (SelectedChanged != null)
-					SelectedChanged (this, EventArgs.Empty);
+				OnSelectedChanged ();
 				QueueDraw ();
 			}
 			return base.OnLeaveNotifyEvent (evnt);
@@ -178,32 +164,68 @@
 		
 		protected override bool OnQueryTooltip (int x, int y, bool keyboard_tooltip, Tooltip tooltip)
 		{
-			tooltip.Text = item.Text;
+			tooltip.Text = MItem.Text;
 			return true;
 		}
 		
-		void PlaceSurface (Context cr, DockySurface surface, Gdk.Rectangle allocation)
+		protected void DrawMenuItemIcon (Context cr)
 		{
+			Gdk.Rectangle allocation = Allocation;
+			
 			int iconSize = allocation.Height - IconBuffer * 2;
-			
-			int x = allocation.X + Padding + ((iconSize - surface.Width) / 2);
-			int y = allocation.Y + IconBuffer + ((iconSize - surface.Height) / 2);
-			
-			cr.SetSource (surface.Internal, x, y);
+			int x = allocation.X + Padding;
+			int y = allocation.Y + IconBuffer;
+			
+			if (icon_surface == null || (icon_surface.Height != iconSize && icon_surface.Width != iconSize)) {
+				if (icon_surface != null)
+					icon_surface.Dispose ();
+				icon_surface = null;
+				if (MItem.ForcePixbuf == null)
+					icon_surface = LoadIcon (MItem.Icon, iconSize);
+				else
+					icon_surface = LoadIcon (MItem.ForcePixbuf, iconSize);
+			}
+			if (!string.IsNullOrEmpty (MItem.Emblem) 
+			    && (emblem_surface == null || (emblem_surface.Height != iconSize && emblem_surface.Width != iconSize))) {
+				if (emblem_surface != null)
+					emblem_surface.Dispose ();
+				emblem_surface = null;
+				if (!string.IsNullOrEmpty (MItem.Emblem))
+					emblem_surface = LoadIcon (MItem.Emblem, iconSize);
+			}
+			
+			if (icon_surface == null)
+				return;
+			
+			cr.Save ();
+			
+			cr.SetSource (icon_surface.Internal, x, y);
+			cr.PaintWithAlpha (MItem.Disabled ? 0.5 : 1);
+			
+			if (MItem.Bold) {
+				cr.Operator = Operator.Add;
+				cr.SetSource (icon_surface.Internal, x, y);
+				cr.PaintWithAlpha (.8);
+				cr.Operator = Operator.Over;
+			}
+			
+			if (emblem_surface != null) {
+				cr.SetSource (emblem_surface.Internal, x, y);
+				cr.Paint ();
+			}
+			
+			cr.Restore ();
 		}
 		
-		DockySurface LoadIcon (Pixbuf icon, int size)
+		protected DockySurface LoadIcon (Gdk.Pixbuf pbuf, int size)
 		{
-			DockySurface surface;
-			using (Gdk.Pixbuf pixbuf = icon.Copy ().ARScale (size, size)) {
-				surface = new DockySurface (pixbuf.Width, pixbuf.Height);
-				Gdk.CairoHelper.SetSourcePixbuf (surface.Context, pixbuf, 0, 0);
-				surface.Context.Paint ();
-			}
+			Gdk.Pixbuf pixbuf = pbuf.Copy ().ARScale (size, size);
+			DockySurface surface = new DockySurface (pixbuf, true);
+			pixbuf.Dispose ();
 			return surface;
 		}
 		
-		DockySurface LoadIcon (string icon, int size)
+		protected DockySurface LoadIcon (string icon, int size)
 		{
 			bool monochrome = icon.StartsWith ("[monochrome]");
 			if (monochrome)
@@ -225,85 +247,7 @@
 			return surface;
 		}
 		
-		protected override bool OnExposeEvent (EventExpose evnt)
-		{
-			if (!IsRealized)
-				return false;
-			
-			Gdk.Rectangle allocation = Allocation;
-			
-			int pixbufSize = allocation.Height - IconBuffer * 2;
-			if (item.ShowIcons && (icon_surface == null || (icon_surface.Height != pixbufSize && icon_surface.Width != pixbufSize))) {
-				if (icon_surface != null)
-					icon_surface.Dispose ();
-				if (emblem_surface != null)
-					emblem_surface.Dispose ();
-				
-				if (item.ForcePixbuf == null)
-					icon_surface = LoadIcon (item.Icon, pixbufSize);
-				else
-					icon_surface = LoadIcon (item.ForcePixbuf, pixbufSize);
-				
-				if (!string.IsNullOrEmpty (item.Emblem))
-					emblem_surface = LoadIcon (item.Emblem, pixbufSize);
-			}
-			
-			using (Cairo.Context cr = Gdk.CairoHelper.Create (evnt.Window)) {
-				if (Selected && !item.Disabled) {
-					cr.Rectangle (allocation.X, allocation.Y, allocation.Width, allocation.Height);
-					cr.Color = TextColor.SetAlpha (.1);
-					cr.Fill ();
-				}
-				
-				if (item.ShowIcons) {
-					PlaceSurface (cr, icon_surface, allocation);
-					cr.PaintWithAlpha (item.Disabled ? 0.5 : 1);
-					
-					if (item.Bold) {
-						cr.Operator = Operator.Add;
-						PlaceSurface (cr, icon_surface, allocation);
-						cr.PaintWithAlpha (.8);
-						cr.Operator = Operator.Over;
-					}
-					
-					if (!string.IsNullOrEmpty (item.Emblem)) {
-						PlaceSurface (cr, emblem_surface, allocation);
-						cr.Paint ();
-					}
-				}
-			
-				using (Pango.Layout layout = DockServices.Drawing.ThemedPangoLayout ()) {
-					char accel;
-					string text = GLib.Markup.EscapeText (item.Text.Replace ("\n", ""));
-					if (item.Mnemonic.HasValue)
-						layout.SetMarkupWithAccel (text, '_', out accel);
-					else
-						layout.SetMarkup (text);
-					layout.Width = Pango.Units.FromPixels (TextWidth);
-					layout.FontDescription = Style.FontDescription;
-					layout.Ellipsize = Pango.EllipsizeMode.End;
-					layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels (FontSize);
-					layout.FontDescription.Weight = Pango.Weight.Bold;
-					
-					Pango.Rectangle logical, ink;
-					layout.GetPixelExtents (out ink, out logical);
-					
-					int offset = Padding;
-					if (MenuShowingIcons)
-						offset += MenuHeight + Padding;
-					cr.MoveTo (allocation.X + offset, allocation.Y + (allocation.Height - logical.Height) / 2);
-					Pango.CairoHelper.LayoutPath (cr, layout);
-					cr.Color = TextColor.SetAlpha (item.Disabled ? 0.5 : 1);
-					cr.Fill ();
-					
-					layout.Context.Dispose ();
-				}
-				
-				(cr.Target as IDisposable).Dispose ();
-			}
-			
-			return true;
-		}
+		protected abstract override bool OnExposeEvent (EventExpose evnt);
 		
 		public override void Dispose ()
 		{
@@ -315,10 +259,10 @@
 				emblem_surface.Dispose ();
 			emblem_surface = null;
 			
-			item.IconChanged -= ItemIconChanged;
-			item.TextChanged -= ItemTextChanged;
-			item.DisabledChanged -= ItemDisabledChanged;
-			item = null;
+			MItem.IconChanged -= ItemIconChanged;
+			MItem.TextChanged -= ItemTextChanged;
+			MItem.DisabledChanged -= ItemDisabledChanged;
+			MItem = null;
 			
 			base.Dispose ();
 		}
 
=== added file 'Docky/Docky/Menus/SliderMenuItemWidget.cs'
--- Docky/Docky/Menus/SliderMenuItemWidget.cs	1970-01-01 00:00:00 +0000
+++ Docky/Docky/Menus/SliderMenuItemWidget.cs	2012-02-04 07:53:22 +0000
@@ -0,0 +1,224 @@
+//  
+//  Copyright (C) 2011 Rico Tzschichholz
+// 
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// 
+
+using System;
+using System.Collections.Generic;
+
+using Cairo;
+using Gdk;
+using Gtk;
+
+using Docky.Services;
+using Docky.CairoHelper;
+
+namespace Docky.Menus
+{
+	internal class SliderMenuItemWidget : MenuItemWidget
+	{
+		const int Size = 16;
+		const double StepSize = 0.03;
+		const bool Highlight = true;
+		
+		Gdk.Rectangle SliderArea { get; set; }
+		Gdk.Rectangle DragArea { get; set; }
+		bool DragActive { get; set; }
+		
+		internal SliderMenuItemWidget (SliderMenuItem item) : base(item)
+		{
+			item.PositionChanged += ItemPositionChanged;
+			HasTooltip = !string.IsNullOrEmpty (item.Text);
+			SliderArea = Gdk.Rectangle.Zero;
+			DragArea = Gdk.Rectangle.Zero;
+		}
+
+		void SetPositionFromCursor (double x, double y)
+		{
+			(MItem as SliderMenuItem).Position = 
+				Math.Max (0, Math.Min (1.0, 1.0 - (double) (SliderArea.X + SliderArea.Width - Size / 2 - x)
+				                       / (SliderArea.Width - Size)));
+		}
+		
+		void ItemPositionChanged (object sender, PositionChangedEventArgs e)
+		{
+			QueueDraw ();
+		}
+
+		protected override void ItemTextChanged (object sender, EventArgs e)
+		{
+			HasTooltip = !string.IsNullOrEmpty (MItem.Text);
+			QueueDraw ();
+		}
+
+		protected override bool OnButtonPressEvent (EventButton evnt)
+		{
+			if (!SliderArea.Contains ((int) evnt.X, (int) evnt.Y))
+				return false;
+			
+			if (DragArea.Contains ((int) evnt.X, (int) evnt.Y))
+				DragActive = true;
+
+			SetPositionFromCursor (evnt.X, evnt.Y);
+			
+			return false;
+		}
+		
+		protected override bool OnButtonReleaseEvent (EventButton evnt)
+		{
+			if (MItem.Disabled)
+				return false;
+			
+			DragActive = false;
+			
+			return true;
+		}
+		
+		protected override bool OnMotionNotifyEvent (EventMotion evnt)
+		{
+			base.OnMotionNotifyEvent (evnt);
+			
+			if (DragActive)
+				SetPositionFromCursor (evnt.X, evnt.Y);
+			
+			return false;
+		}
+		
+		protected override bool OnScrollEvent (EventScroll evnt)
+		{
+			if (!SliderArea.Contains ((int) evnt.X, (int) evnt.Y))
+				return false;
+			
+			switch (evnt.Direction) {
+			case ScrollDirection.Down:
+			case ScrollDirection.Left:
+				(MItem as SliderMenuItem).Position = 
+					Math.Max (0.0, Math.Min (1.0, (MItem as SliderMenuItem).Position - StepSize));
+				break;
+			case ScrollDirection.Up:
+			case ScrollDirection.Right:
+				(MItem as SliderMenuItem).Position = 
+					Math.Max (0.0, Math.Min (1.0, (MItem as SliderMenuItem).Position + StepSize));
+				break;
+			}
+			
+			QueueDraw ();
+			return false;
+		}
+		
+		protected override bool OnExposeEvent (EventExpose evnt)
+		{
+			if (!IsRealized)
+				return false;
+			
+			Gdk.Rectangle allocation = Allocation;
+			
+			using (Cairo.Context cr = Gdk.CairoHelper.Create (evnt.Window)) {
+				if (MItem.ShowIcons)
+					DrawMenuItemIcon (cr);
+
+				int offset = Padding;
+				if (MenuShowingIcons)
+					offset += MenuHeight + Padding;
+				
+				LinearGradient lg;
+				RadialGradient rg;
+				Cairo.Color white = new Cairo.Color (1, 1, 1, 1);
+				Cairo.Color black = new Cairo.Color (0, 0, 0, 1);
+				
+				double x = (int)(allocation.X + offset) + 0.5;
+				double y = (int)(allocation.Y + (MenuHeight - Size / 2.0) / 2.0) + 0.5;
+				double sliderwidth = allocation.Width - offset - Padding;
+				double sliderheight = Size / 2.0;
+				double px = (int)(allocation.X + offset + (allocation.Width - offset - Padding - Size) 
+				                  * (MItem as SliderMenuItem).Position) + 0.5;
+				double py = (int)(allocation.Y + (MenuHeight - Size) / 2.0) + 0.5;
+				
+				cr.LineWidth = 1.0;
+				
+				// draw marker
+				cr.RoundedRectangle (px, py, Size, Size, Size / 2.0);
+				rg = new RadialGradient (px + 1.66 * Size / 3.0, py + 1.66 * Size / 3.0, 0,
+				                         px + Size / 2.0, py + Size / 2.0, Size / 2.0);
+				rg.AddColorStop (0, white.SetAlpha (MItem.Disabled ? 0.4 : Selected ? 0.7 : 0.6));
+				rg.AddColorStop (1, black.SetAlpha (MItem.Disabled ? 0.2 : Selected ? 0.6 : 0.4));
+				cr.Pattern = rg;
+				cr.FillPreserve ();
+				rg.Destroy ();
+				cr.RoundedRectangle (x, y, sliderwidth, sliderheight, 0);
+				cr.FillRule = Cairo.FillRule.EvenOdd;
+				cr.Clip ();
+				
+				// background gradient round-box
+				cr.RoundedRectangle (x + 1, y + 1, sliderwidth - 2, sliderheight - 2, 4.5);
+				lg = new LinearGradient (x + 1, y + 1, x + 1, y + Size / 2.0);
+				lg.AddColorStop (0, black.SetAlpha (MItem.Disabled ? 0.2 : Selected ? 0.3 : 0.25));
+				lg.AddColorStop (1, black.SetAlpha (MItem.Disabled ? 0.05 : Selected ? 0.1 : 0.05));
+				cr.Pattern = lg;
+				cr.FillPreserve ();
+				lg.Destroy ();
+				// dark middle stroke
+				cr.Color = black.SetAlpha (MItem.Disabled ? 0.2 : Selected ? 0.4 : 0.25);
+				cr.Stroke ();
+				
+				// light outer stroke
+				cr.RoundedRectangle (x, y, sliderwidth, sliderheight, 5.0);
+				lg = new LinearGradient (x, y, x, y + Size / 2.0);
+				lg.AddColorStop (0, white.SetAlpha (0));
+				lg.AddColorStop (1, white.SetAlpha (MItem.Disabled ? 0.2 : Selected ? 0.5 : 0.3));
+				cr.Pattern = lg;
+				cr.Stroke ();
+				lg.Destroy ();
+
+				// dark inner stroke
+				cr.RoundedRectangle (x + 2, y + 2, sliderwidth - 4, sliderheight - 4, 4.0);
+				lg = new LinearGradient (x + 2, y + 2, x + 2, y + 2 + Size / 2.0);
+				lg.AddColorStop (0, black.SetAlpha (MItem.Disabled ? 0.05 : Selected ? 0.05 : 0.1));
+				lg.AddColorStop (1, black.SetAlpha (0));
+				cr.Pattern = lg;
+				cr.Stroke ();
+				lg.Destroy ();
+				
+				// colored indication of value
+				if (Highlight) {
+					Gdk.Color gdkColor = Style.Backgrounds [(int) StateType.Selected].SetMinimumValue (90);
+					Cairo.Color highlightColor = new Cairo.Color ((double) gdkColor.Red / ushort.MaxValue,
+					                                     (double) gdkColor.Green / ushort.MaxValue,
+					                                     (double) gdkColor.Blue / ushort.MaxValue,
+					                                     1.0);
+					cr.Color = (MItem.Disabled ? highlightColor.SetSaturation (0).SetAlpha (0.4) : 
+					            highlightColor.SetAlpha (Selected ? 1.0 : 0.95));
+					cr.RoundedRectangle (x + 2, y + 2, px - allocation.X - offset, Size / 2.0 - 4, 3.0);
+					cr.Fill ();
+				}
+				
+				//update the areas
+				SliderArea = new Gdk.Rectangle (offset, 0, (int)sliderwidth, MenuHeight);
+				DragArea = new Gdk.Rectangle ((int)px - allocation.X, (int)py - allocation.Y, Size, Size);
+				
+				(cr.Target as IDisposable).Dispose ();
+			}
+			
+			return true;
+		}
+		
+		public override void Dispose ()
+		{
+			(MItem as SliderMenuItem).PositionChanged -= ItemPositionChanged;
+			
+			base.Dispose ();
+		}
+	}
+}
 
=== added file 'Docky/Docky/Menus/TextMenuItemWidget.cs'
--- Docky/Docky/Menus/TextMenuItemWidget.cs	1970-01-01 00:00:00 +0000
+++ Docky/Docky/Menus/TextMenuItemWidget.cs	2012-02-04 07:53:22 +0000
@@ -0,0 +1,121 @@
+//  
+//  Copyright (C) 2009 Jason Smith, Robert Dyer
+//  Copyright (C) 2010 Robert Dyer
+//  Copyright (C) 2011 Rico Tzschichholz
+// 
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// 
+
+using System;
+using System.Collections.Generic;
+
+using Cairo;
+using Gdk;
+using Gtk;
+
+using Docky.Services;
+using Docky.CairoHelper;
+
+namespace Docky.Menus
+{
+	internal class TextMenuItemWidget : MenuItemWidget
+	{
+		internal TextMenuItemWidget (MenuItem item) : base(item)
+		{
+			CalcTextWidth ();
+		}
+		
+		protected void CalcTextWidth ()
+		{
+			using (Pango.Layout layout = DockServices.Drawing.ThemedPangoLayout ()) {
+				char accel;
+				
+				if (MItem.Mnemonic.HasValue)
+					layout.SetMarkupWithAccel (MItem.Text, '_', out accel);
+				else
+					layout.SetMarkup (MItem.Text);
+				layout.FontDescription = Style.FontDescription;
+				layout.Ellipsize = Pango.EllipsizeMode.End;
+				layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels (FontSize);
+				layout.FontDescription.Weight = Pango.Weight.Bold;
+				
+				Pango.Rectangle logical, ink;
+				layout.GetPixelExtents (out ink, out logical);
+				
+				TextWidth = Math.Min (MaxWidth, Math.Max (MinWidth, logical.Width));
+				HasTooltip = TextWidth < logical.Width;
+				
+				layout.Context.Dispose ();
+			}
+			
+			SetSize ();
+		}
+		
+		protected override void ItemTextChanged (object sender, EventArgs e)
+		{
+			CalcTextWidth ();
+			QueueDraw ();
+		}
+
+		protected override bool OnExposeEvent (EventExpose evnt)
+		{
+			if (!IsRealized)
+				return false;
+			
+			Gdk.Rectangle allocation = Allocation;
+			
+			using (Cairo.Context cr = Gdk.CairoHelper.Create (evnt.Window)) {
+				if (Selected && !MItem.Disabled) {
+					cr.Rectangle (allocation.X, allocation.Y, allocation.Width, allocation.Height);
+					cr.Color = TextColor.SetAlpha (.1);
+					cr.Fill ();
+				}
+				
+				if (MItem.ShowIcons)
+					DrawMenuItemIcon (cr);
+				
+				using (Pango.Layout layout = DockServices.Drawing.ThemedPangoLayout ()) {
+					char accel;
+					if (MItem.Mnemonic.HasValue)
+						layout.SetMarkupWithAccel (MItem.Text, '_', out accel);
+					else
+						layout.SetMarkup (MItem.Text);
+					layout.Width = Pango.Units.FromPixels (TextWidth);
+					layout.FontDescription = Style.FontDescription;
+					layout.Ellipsize = Pango.EllipsizeMode.End;
+					layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels (FontSize);
+					layout.FontDescription.Weight = Pango.Weight.Bold;
+					
+					Pango.Rectangle logical, ink;
+					layout.GetPixelExtents (out ink, out logical);
+					
+					int offset = Padding;
+					if (MenuShowingIcons)
+						offset += MenuHeight + Padding;
+					
+					cr.MoveTo (allocation.X + offset, allocation.Y + (allocation.Height - logical.Height) / 2);
+					Pango.CairoHelper.LayoutPath (cr, layout);
+					cr.Color = TextColor.SetAlpha (MItem.Disabled ? 0.5 : 1);
+					cr.Fill ();
+					
+					layout.Context.Dispose ();
+				}
+				
+				(cr.Target as IDisposable).Dispose ();
+			}
+			
+			return true;
+		}
+	}
+}
 
=== modified file 'Docky/Makefile.am'
--- Docky/Makefile.am	2010-12-01 21:43:00 +0000
+++ Docky/Makefile.am	2012-02-04 07:53:22 +0000
@@ -41,6 +41,8 @@
 	Docky/Menus/DockMenu.cs \
 	Docky/Menus/MenuItemWidget.cs \
 	Docky/Menus/SeparatorWidget.cs \
+	Docky/Menus/SliderMenuItemWidget.cs \
+	Docky/Menus/TextMenuItemWidget.cs \
 	Docky/Menus/DockItemMenu.cs
 
 RESOURCES = \
 
=== modified file 'Docky/gtk-gui/gui.stetic'
--- Docky/gtk-gui/gui.stetic	2011-12-22 15:47:35 +0000
+++ Docky/gtk-gui/gui.stetic	2012-02-04 07:53:22 +0000
@@ -5,12 +5,9 @@
     <target-gtk-version>2.12</target-gtk-version>
   </configuration>
   <import>
+    <widget-library name="notify-sharp, Version=0.4.0.0, Culture=neutral, PublicKeyToken=2df29c54e245917a" />
     <widget-library name="wnck-sharp, Version=2.20.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <widget-library name="gnomedesktop-sharp, Version=2.20.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <widget-library name="../../Docky.Services/bin/Debug/Docky.Services.dll" />
-    <widget-library name="../../Docky.Items/bin/Debug/Docky.Items.dll" />
-    <widget-library name="../../Docky.DBus/bin/Debug/Docky.DBus.dll" />
-    <widget-library name="../../Docky.Widgets/bin/Debug/Docky.Widgets.dll" />
     <widget-library name="../bin/Debug/Docky.exe" internal="true" />
   </import>
   <widget class="Gtk.Bin" id="Docky.Interface.DockPreferences" design-size="500 356">
 
=== modified file 'StandardPlugins/Makefile.am'
--- StandardPlugins/Makefile.am	2011-02-23 20:17:57 +0000
+++ StandardPlugins/Makefile.am	2012-02-04 07:53:22 +0000
@@ -12,6 +12,7 @@
 	NPR \
 	RecentDocuments \
 	SessionManager \
+	Sound \
 	Timer \
 	Trash \
 	Weather \
@@ -31,6 +32,7 @@
 	NPR \
 	RecentDocuments \
 	SessionManager \
+	Sound \
 	Timer \
 	Trash \
 	Weather \
 
=== added directory 'StandardPlugins/Sound'
=== added file 'StandardPlugins/Sound/Makefile.am'
--- StandardPlugins/Sound/Makefile.am	1970-01-01 00:00:00 +0000
+++ StandardPlugins/Sound/Makefile.am	2012-02-04 07:53:22 +0000
@@ -0,0 +1,45 @@
+# Simple component buildsystem
+include $(top_srcdir)/build.rules.docklets.mk
+
+ASSEMBLY = Sound
+
+FILES = \
+	src/SoundDockItem.cs \
+	src/SoundItemProvider.cs \
+	src/PulseAudio-Sharp/Channel.cs \
+	src/PulseAudio-Sharp/Client.cs \
+	src/PulseAudio-Sharp/Context.cs \
+	src/PulseAudio-Sharp/GLib.cs \
+	src/PulseAudio-Sharp/MainLoop.cs \
+	src/PulseAudio-Sharp/Operation.cs \
+	src/PulseAudio-Sharp/PropList.cs \
+	src/PulseAudio-Sharp/Sample.cs \
+	src/PulseAudio-Sharp/ServerInfo.cs \
+	src/PulseAudio-Sharp/Sink.cs \
+	src/PulseAudio-Sharp/SinkInput.cs \
+	src/PulseAudio-Sharp/UnmanagedCallbackManager.cs \
+	src/PulseAudio-Sharp/Util.cs \
+	src/PulseAudio-Sharp/Volume.cs
+	
+RESOURCES = \
+	Resources/Sound.addin.xml
+
+PROJECT_REFERENCES= \
+	Docky.CairoHelper \
+	Docky.Items \
+	Docky.Services
+
+REFERENCES =  \
+	System \
+	System.Core \
+	Mono.Posix \
+	$(MONO_CAIRO_LIBS) \
+	$(GTK_SHARP_20_LIBS) \
+	$(GLIB_SHARP_20_LIBS) \
+	$(GIO_SHARP_LIBS) \
+	$(WNCK_SHARP_10_LIBS) 
+
+EXTRA_DIST += Sound.dll.config
+
+plugin_DATA += Sound.dll.config
+
 
=== added directory 'StandardPlugins/Sound/Resources'
=== added file 'StandardPlugins/Sound/Resources/Sound.addin.xml.in'
--- StandardPlugins/Sound/Resources/Sound.addin.xml.in	1970-01-01 00:00:00 +0000
+++ StandardPlugins/Sound/Resources/Sound.addin.xml.in	2012-02-04 07:53:22 +0000
@@ -0,0 +1,25 @@
+<Addin 
+	id="Sound"
+	namespace="Docky"
+	version="1.0"
+	isroot="false"
+	defaultEnabled="false"
+	name="Sound"
+	description="Control your Pulseaudio volumes"
+	author="Rico Tzschichholz"
+	icon="preferences-desktop-sound"
+>
+ 
+ 	<Dependencies>
+		<Addin id="Items" version="1.0" />
+	</Dependencies>
+ 
+	<Runtime>
+		<Import assembly="Sound.dll"/>
+	</Runtime>
+	
+	<Extension path="/Docky/ItemProvider">
+		<ItemProvider type="Sound.SoundItemProvider" />
+	</Extension>	
+
+</Addin>
 
=== added file 'StandardPlugins/Sound/Sound.csproj'
--- StandardPlugins/Sound/Sound.csproj	1970-01-01 00:00:00 +0000
+++ StandardPlugins/Sound/Sound.csproj	2012-02-04 07:53:22 +0000
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.21022</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{16B2B0E3-3437-4F07-958D-E961E132F5F5}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Sound</RootNamespace>
+    <AssemblyName>Sound</AssemblyName>
+    <ReleaseVersion>2.2</ReleaseVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+      <Package>gtk-sharp-2.0</Package>
+    </Reference>
+    <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+      <Package>glib-sharp-2.0</Package>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Mono.Posix" />
+    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+      <Package>gtk-sharp-2.0</Package>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="src\SoundDockItem.cs" />
+    <Compile Include="src\SoundItemProvider.cs" />
+    <Compile Include="src\PulseAudio-Sharp\Channel.cs" />
+    <Compile Include="src\PulseAudio-Sharp\Context.cs" />
+    <Compile Include="src\PulseAudio-Sharp\GLib.cs" />
+    <Compile Include="src\PulseAudio-Sharp\MainLoop.cs" />
+    <Compile Include="src\PulseAudio-Sharp\Operation.cs" />
+    <Compile Include="src\PulseAudio-Sharp\PropList.cs" />
+    <Compile Include="src\PulseAudio-Sharp\Sample.cs" />
+    <Compile Include="src\PulseAudio-Sharp\ServerInfo.cs" />
+    <Compile Include="src\PulseAudio-Sharp\Sink.cs" />
+    <Compile Include="src\PulseAudio-Sharp\SinkInput.cs" />
+    <Compile Include="src\PulseAudio-Sharp\UnmanagedCallbackManager.cs" />
+    <Compile Include="src\PulseAudio-Sharp\Util.cs" />
+    <Compile Include="src\PulseAudio-Sharp\Volume.cs" />
+    <Compile Include="src\PulseAudio-Sharp\Client.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Docky.Items\Docky.Items.csproj">
+      <Project>{AB6E0EDD-6443-4F99-9EAC-DABC906F080D}</Project>
+      <Name>Docky.Items</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Docky.Services\Docky.Services.csproj">
+      <Project>{8A6E0EDD-6443-4F99-9EAC-D9CC906F080D}</Project>
+      <Name>Docky.Services</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <Folder Include="Resources\" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Sound.addin.xml" />
+  </ItemGroup>
+</Project>
 \ No newline at end of file
 
=== added file 'StandardPlugins/Sound/Sound.dll.config'
--- StandardPlugins/Sound/Sound.dll.config	1970-01-01 00:00:00 +0000
+++ StandardPlugins/Sound/Sound.dll.config	2012-02-04 07:53:22 +0000
@@ -0,0 +1,6 @@
+<configuration>
+	<dllmap dll="pulse-mainloop-glib" target="libpulse-mainloop-glib.so.0" />
+	<dllmap dll="pulse" target="libpulse.so.0" />
+</configuration>
+
+
 
=== added directory 'StandardPlugins/Sound/src'
=== added directory 'StandardPlugins/Sound/src/PulseAudio-Sharp'
=== added file 'StandardPlugins/Sound/src/PulseAudio-Sharp/Channel.cs'
--- StandardPlugins/Sound/src/PulseAudio-Sharp/Channel.cs	1970-01-01 00:00:00 +0000
+++ StandardPlugins/Sound/src/PulseAudio-Sharp/Channel.cs	2012-02-04 07:53:22 +0000
@@ -0,0 +1,133 @@
+//
+//  Copyright © 2009 Christopher James Halse Rogers <[e-mail]>
+//
+//  Channel.cs is a part of Pulseaudio#
+//
+//  Pulseaudio# is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU Lesser General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Pulseaudio# is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public License
+//  along with Pulseaudio#.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace Pulseaudio
+{
+    public enum ChannelPosition
+    {
+        Invalid = -1,
+        Mono = 0,
+
+        FrontLeft,               /* Apple calls this 'Left' */
+        FrontRight,              /* Apple calls this 'Right' */
+        FrontCenter,             /* Apple calls this 'Center' */
+
+        Left = FrontLeft,
+        Right = FrontRight,
+        Center = FrontCenter,
+
+        RearCentre,              /* Microsoft calls this 'Back Center', Apple calls this 'Center Surround' */
+        RearLeft,                /* Microsoft calls this 'Back Left', Apple calls this 'Left Surround' */
+        RearRight,               /* Microsoft calls this 'Back Right', Apple calls this 'Right Surround' */
+
+        LFE,                     /* Microsoft calls this 'Low Frequency', Apple calls this 'LFEScreen' */
+        SubWoofer = LFE,
+
+        FrontLeftOfCenter,       /* Apple calls this 'Left Center' */
+        FrontRightOfCenter,      /* Apple calls this 'Right Center */
+
+        SideLeft,                /* Apple calls this 'Left Surround Direct' */
+        SideRight,               /* Apple calls this 'Right Surround Direct' */
+
+        PA_CHANNEL_POSITION_AUX0,
+        PA_CHANNEL_POSITION_AUX1,
+        PA_CHANNEL_POSITION_AUX2,
+        PA_CHANNEL_POSITION_AUX3,
+        PA_CHANNEL_POSITION_AUX4,
+        PA_CHANNEL_POSITION_AUX5,
+        PA_CHANNEL_POSITION_AUX6,
+        PA_CHANNEL_POSITION_AUX7,
+        PA_CHANNEL_POSITION_AUX8,
+        PA_CHANNEL_POSITION_AUX9,
+        PA_CHANNEL_POSITION_AUX10,
+        PA_CHANNEL_POSITION_AUX11,
+        PA_CHANNEL_POSITION_AUX12,
+        PA_CHANNEL_POSITION_AUX13,
+        PA_CHANNEL_POSITION_AUX14,
+        PA_CHANNEL_POSITION_AUX15,
+        PA_CHANNEL_POSITION_AUX16,
+        PA_CHANNEL_POSITION_AUX17,
+        PA_CHANNEL_POSITION_AUX18,
+        PA_CHANNEL_POSITION_AUX19,
+        PA_CHANNEL_POSITION_AUX20,
+        PA_CHANNEL_POSITION_AUX21,
+        PA_CHANNEL_POSITION_AUX22,
+        PA_CHANNEL_POSITION_AUX23,
+        PA_CHANNEL_POSITION_AUX24,
+        PA_CHANNEL_POSITION_AUX25,
+        PA_CHANNEL_POSITION_AUX26,
+        PA_CHANNEL_POSITION_AUX27,
+        PA_CHANNEL_POSITION_AUX28,
+        PA_CHANNEL_POSITION_AUX29,
+        PA_CHANNEL_POSITION_AUX30,
+        PA_CHANNEL_POSITION_AUX31,
+
+        TopCenter,              /* Apple calls this 'Top Center Surround' */
+
+        TopFrontLeft,           /* Apple calls this 'Vertical Height Left' */
+        TopFrontRight,          /* Apple calls this 'Vertical Height Right' */
+        TopFrontCenter,         /* Apple calls this 'Vertical Height Center' */
+
+        TopRearLeft,            /* Microsoft and Apple call this 'Top Back Left' */
+        TopRearRight,           /* Microsoft and Apple call this 'Top Back Right' */
+        TopRearCenter,          /* Microsoft and Apple call this 'Top Back Center' */
+
+        PA_CHANNEL_POSITION_MAX
+    }
+
+    [StructLayout (LayoutKind.Sequential)]
+    public struct ChannelMap
+    {
+        public byte channels;
+        [MarshalAs (UnmanagedType.ByValArray, SizeConst=Constants.MaxChannels)]
+        public ChannelPosition [] map;
+
+        private void Init ()
+        {
+            map = new ChannelPosition[Constants.MaxChannels];
+            pa_channel_map_init (ref this);
+        }
+
+        public static ChannelMap StereoMapping ()
+        {
+            ChannelMap mapping = new ChannelMap ();
+            mapping.Init ();
+            pa_channel_map_init_stereo (ref mapping);
+            return mapping;
+        }
+
+        public static ChannelMap MonoMapping ()
+        {
+            ChannelMap mapping = new ChannelMap ();
+            mapping.Init ();
+            pa_channel_map_init_mono (ref mapping);
+            return mapping;
+        }
+
+        [DllImport ("pulse")]
+        private static extern void pa_channel_map_init (ref ChannelMap map);
+        [DllImport ("pulse")]
+        private static extern void pa_channel_map_init_stereo (ref ChannelMap map);
+        [DllImport ("pulse")]
+        private static extern void pa_channel_map_init_mono (ref ChannelMap map);
+    }
+}
 
=== added file 'StandardPlugins/Sound/src/PulseAudio-Sharp/Client.cs'
--- StandardPlugins/Sound/src/PulseAudio-Sharp/Client.cs	1970-01-01 00:00:00 +0000
+++ StandardPlugins/Sound/src/PulseAudio-Sharp/Client.cs	2012-02-04 07:53:22 +0000
@@ -0,0 +1,118 @@
+//
+//  Copyright © 2010 Rico Tzschichholz
+//
+//  Client.cs is a part of Pulseaudio#
+//
+//  Pulseaudio# is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU Lesser General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Pulseaudio# is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public License
+//  along with Pulseaudio#.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace Pulseaudio
+{
+    [StructLayout (LayoutKind.Sequential)]
+    public class ClientInfo
+    {
+        public UInt32 index;          /**< Index of the client */
+        IntPtr name;                  /**< Name of the client */
+        public UInt32 owner_module;   /**< Index of the owning module of this client, or PA_INVALID_INDEX */
+        IntPtr driver;                /**< Driver name. */
+        IntPtr proplist;              /**< Property list \since 0.9.11 */
+
+        public string Name {
+            get {
+                return Marshal.PtrToStringAnsi (name);
+            }
+        }
+
+        public string Driver {
+            get {
+                return Marshal.PtrToStringAnsi (driver);
+            }
+        }
+
+        public PropList Properties {
+            get {
+                return new PropList (proplist);
+            }
+        }
+
+        public ClientInfo()
+        {
+        }
+    }
+
+    public class Client : IDisposable {
+        private void UpdateFromInfo (ClientInfo i)
+        {
+            info = i;
+            Name = i.Name;
+            Driver = i.Driver;
+            Properties = i.Properties.Copy ();
+        }
+
+        private bool disposed = false;
+        private ClientInfo info;
+        private Context context;
+
+        public Client (Context c, ClientInfo info)
+        {
+            context = c;
+            this.info = info;
+            Name = info.Name;
+            Driver = info.Driver;
+            Properties = info.Properties.Copy ();
+        }
+
+        public void Dispose ()
+        {
+            Dispose (true);
+            GC.SuppressFinalize (this);
+        }
+
+        protected virtual void Dispose (bool explicitlyCalled)
+        {
+            if (!disposed) {
+                if (explicitlyCalled) {
+                }
+                disposed = true;
+            }
+        }
+
+        public string Name {
+            get; private set;
+        }
+
+        public string Driver {
+            get; private set;
+        }
+
+        public PropList Properties {
+            get; private set;
+        }
+
+        public UInt32 Index {
+            get {
+                return info.index;
+            }
+        }
+        
+        public UInt32 OwnerModule {
+            get {
+                return info.owner_module;
+            }
+        }        
+    }
+}
 
=== added file 'StandardPlugins/Sound/src/PulseAudio-Sharp/Context.cs'
--- StandardPlugins/Sound/src/PulseAudio-Sharp/Context.cs	1970-01-01 00:00:00 +0000
+++ StandardPlugins/Sound/src/PulseAudio-Sharp/Context.cs	2012-02-04 07:53:22 +0000
@@ -0,0 +1,655 @@
+//
+//  Copyright © 2009 Christopher James Halse Rogers <[e-mail]>
+//
+//  Context.cs is a part of Pulseaudio#
+//
+//  Pulseaudio# is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU Lesser General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Pulseaudio# is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public License
+//  along with Pulseaudio#.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+using System;
+using System.Runtime.InteropServices;
+using System.Collections.Generic;
+using System.Threading;
+using System.Reflection;
+
+namespace Pulseaudio
+{
+    public enum EventType {
+        Added,
+        Changed,
+        Removed,
+        Error
+    }
+
+    public class ServerEventArgs : EventArgs
+    {
+        public ServerEventArgs (EventType t, UInt32 index)
+        {
+            this.Type = t;
+            this.index = index;
+        }
+        public EventType Type { get; private set; }
+        public UInt32 index { get; private set; }
+    }
+
+    public class Context : IDisposable
+    {
+        private bool disposed = false;
+        private HandleRef context;
+        private MainLoop loop;
+        private UnmanagedCallbackManager cbManager;
+        private ContextNotifyCB notifyCB;
+        private SubscriptionEventCB eventCB;
+
+        public delegate void ConnectionStateHandler ();
+
+        public event ConnectionStateHandler Ready;
+        public event ConnectionStateHandler Connecting;
+
+        public Context ()
+        {
+            Init (Assembly.GetCallingAssembly ().GetName ().Name);
+        }
+
+        public Context (string clientName)
+        {
+            Init (clientName);
+        }
+
+        public void Dispose ()
+        {
+            Dispose (true);
+            GC.SuppressFinalize (this);
+        }
+
+        protected virtual void Dispose (bool explicitlyCalled)
+        {
+            if (!disposed) {
+                pa_context_set_state_callback (context, null, IntPtr.Zero);
+                pa_context_set_subscribe_callback (context, null, IntPtr.Zero);
+                _sinkEventHandler = null;
+                _sinkInputEventHandler = null;
+                _clientEventHandler = null;
+                pa_context_disconnect (context);
+                pa_context_unref (context);
+                if (explicitlyCalled) {
+                    loop.Dispose ();
+                } else {
+                    GC.ReRegisterForFinalize (loop);
+                }
+                disposed = true;
+            }
+        }
+
+        ~Context ()
+        {
+            Dispose (false);
+        }
+
+        private void Init (string clientName)
+        {
+            cbManager = new UnmanagedCallbackManager ();
+            loop = new GLibMainLoop ();
+            GC.SuppressFinalize (loop);
+            context = new HandleRef (this, pa_context_new (loop.GetAPI (), clientName));
+            notifyCB = ContextNotifyHandler;
+            pa_context_set_state_callback (context, notifyCB, new IntPtr (0));
+            eventCB = SubscriptionEventHandler;
+            pa_context_set_subscribe_callback (context, eventCB, IntPtr.Zero);
+        }
+
+        public void Connect ()
+        {
+            pa_context_connect (context, null, ContextConnectionFlags.None, new IntPtr (0));
+        }
+
+        public UInt32 ServerAPI {
+            get {
+                return pa_context_get_server_protocol_version (context);
+            }
+        }
+
+        public string Version {
+            get {
+                return "pulseaudio 0.9.16-test2";
+            }
+        }
+
+        public ConnectionState State {
+            get {
+                return pa_context_get_state (context);
+            }
+        }
+
+        [Flags]
+        public enum ContextConnectionFlags
+        {
+            None = 0,
+            NoAutoSpawn = 1,
+            NoFail= 2
+        }
+
+        private delegate void ContextNotifyCB (IntPtr context, IntPtr userdata);
+
+        private void ContextNotifyHandler (IntPtr unused, IntPtr userdata)
+        {
+            switch (pa_context_get_state (context)) {
+            case ConnectionState.Ready:
+                if (Ready != null) {
+                    Ready ();
+                }
+                break;
+            case ConnectionState.Connecting:
+                if (Connecting != null) {
+                    Connecting ();
+                }
+                break;
+            }
+        }
+
+        public enum ConnectionState {
+            Unconnected,    /**< The context hasn't been connected yet */
+            Connecting,     /**< A connection is being established */
+            Authorising,    /**< The client is authorizing itself to the daemon */
+            SettingName,    /**< The client is passing its application name to the daemon */
+            Ready,          /**< The connection is established, the context is ready to execute operations */
+            Failed,         /**< The connection failed or was disconnected */
+            Terminated      /**< The connection was terminated cleanly */
+        }
+
+
+        public Error LastError {
+            get {
+                return new Error (pa_context_errno (context));
+            }
+        }
+
+        [DllImport ("pulse")]
+        private static extern Error.Code pa_context_errno (HandleRef context);
+
+        public Operation EnumerateSinkInputs (SinkInputCallback cb)
+        {
+            int cookie = cbManager.NewCookie ();
+            Action<IntPtr, NativeSinkInputInfo, int, IntPtr> wrapped_cb = (IntPtr c, NativeSinkInputInfo info, int eol, IntPtr userdata) =>
+            {
+                if (eol == 0) {
+                    cb (new SinkInput (info, this), eol);
+                } else {
+                    cbManager.RemoveDelegate (cookie);
+                }
+            };
+            cbManager.AddDelegate (wrapped_cb, cookie);
+            return new Operation (pa_context_get_sink_input_info_list (context, wrapped_cb, IntPtr.Zero));
+        }
+
+        public delegate void SinkInputCallback (SinkInput info, int eol);
+        private delegate void pa_sink_input_info_cb (IntPtr context, NativeSinkInputInfo info, int eol, IntPtr userdata);
+
+        internal Operation EnumerateSinks (SinkInfoCallback cb)
+        {
+            int cookie = cbManager.NewCookie ();
+            Action<IntPtr, SinkInfo, int, IntPtr> wrapped_cb = (IntPtr c, SinkInfo info, int eol, IntPtr userdata) => {
+                cb (info, eol);
+                if (eol != 0) {
+                    cbManager.RemoveDelegate (cookie);
+                }
+            };
+            cbManager.AddDelegate (wrapped_cb, cookie);
+            try {
+                return new Operation (pa_context_get_sink_info_list (context, wrapped_cb, IntPtr.Zero));
+            } catch (ArgumentNullException) {
+                throw new Exception (String.Format ("Error enumerating sinks: {0}", LastError.Message));
+            }
+        }
+
+        internal delegate void SinkInfoCallback (SinkInfo info, int eol);
+        private delegate void pa_sink_info_cb (IntPtr context, SinkInfo info, int eol, IntPtr userdata);
+
+        public Operation EnumerateSinks (SinkCallback cb)
+        {
+            return EnumerateSinks ((SinkInfo info, int eol) => {
+                if (eol == 0) {
+                    cb (new Sink (this, info));
+                }
+            });
+        }
+
+        public delegate void SinkCallback (Sink s);
+
+        internal Operation GetSinkInfoByIndex (UInt32 index, SinkInfoCallback cb)
+        {
+            int cookie = cbManager.NewCookie ();
+            Action<IntPtr, SinkInfo, int, IntPtr> wrapped_cb = (IntPtr c, SinkInfo info, int eol, IntPtr userdata) => {
+                cb (info, eol);
+            };
+            cbManager.AddDelegate (wrapped_cb, cookie);
+            try {
+                return new Operation (pa_context_get_sink_info_by_index (context, index, wrapped_cb, IntPtr.Zero));
+            } catch (ArgumentNullException) {
+                throw new Exception (String.Format ("Error getting SinkInfo for index {0}: {1}", index, LastError.Message));
+            }
+        }
+
+        internal Operation GetSinkInfoByIndex (UInt32 index, Action<IntPtr, SinkInfo, int, IntPtr> cb)
+        {
+            try {
+                return new Operation (pa_context_get_sink_info_by_index (context, index, cb, IntPtr.Zero));
+            } catch (ArgumentNullException) {
+                throw new Exception (String.Format ("Error getting SinkInfo for index {0}: {1}", index, LastError.Message));
+            }
+        }
+
+        [DllImport ("pulse")]
+        private static extern IntPtr pa_context_get_sink_info_by_index (HandleRef context,
+                                                                        UInt32 index,
+                                                                        Action<IntPtr, SinkInfo, int, IntPtr> cb,
+                                                                        IntPtr userdata);
+
+        internal Operation GetSinkInputInfoByIndex (UInt32 index, NativeSinkInputInfoCallback cb)
+        {
+            int cookie = cbManager.NewCookie ();
+            Action<IntPtr, NativeSinkInputInfo, int, IntPtr> wrapped_cb = (IntPtr c, NativeSinkInputInfo info, int eol, IntPtr userdata) => {
+                cb (info, eol);
+            };
+            cbManager.AddDelegate (wrapped_cb, cookie);
+            try {
+                return new Operation (pa_context_get_sink_input_info (context, index, wrapped_cb, IntPtr.Zero));
+            } catch (ArgumentNullException) {
+                throw new Exception (String.Format ("Error getting SinkInputInfo for index {0}: {1}", index, LastError.Message));
+            }
+        }
+
+        internal delegate void NativeSinkInputInfoCallback (NativeSinkInputInfo info, int eol);
+        [DllImport ("pulse")]
+        private static extern IntPtr pa_context_get_sink_input_info (HandleRef context,
+                                                                     UInt32 index,
+                                                                     Action<IntPtr, NativeSinkInputInfo, int, IntPtr> cb,
+                                                                     IntPtr userdata);
+
+        public Operation SetSinkVolume (UInt32 index, Volume vol, OperationSuccessCallback cb)
+        {
+            int cookie = cbManager.NewCookie ();
+            Action<IntPtr, int, IntPtr> wrapped_cb = (IntPtr context, int success, IntPtr userdata) => {
+                cb (success);
+            };
+            cbManager.AddDelegate (wrapped_cb, cookie);
+            try {
+                return new Operation (pa_context_set_sink_volume_by_index (context,
+                                                                           index,
+                                                                           vol,
+                                                                           wrapped_cb,
+                                                                           IntPtr.Zero));
+            } catch (ArgumentNullException e) {
+                throw new Exception (String.Format ("Error setting sink volume: {0}", LastError.Message));
+            }
+        }
+        [DllImport("pulse")]
+        private static extern IntPtr pa_context_set_sink_volume_by_index(HandleRef context,
+                                                                         UInt32 idx,
+                                                                         Volume vol,
+                                                                         Action<IntPtr, int, IntPtr> cb,
+                                                                         IntPtr userdata);
+
+        public Operation SetSinkInputVolume (UInt32 index, Volume vol, OperationSuccessCallback cb)
+        {
+            int cookie = cbManager.NewCookie ();
+            Action<IntPtr, int, IntPtr> wrapped_cb = (IntPtr context, int success, IntPtr userdata) => {
+                cb (success);
+                cbManager.RemoveDelegate (cookie);
+            };
+            cbManager.AddDelegate (wrapped_cb, cookie);
+            try {
+                return new Operation (pa_context_set_sink_input_volume (context,
+                        index,
+                        vol,
+                        wrapped_cb,
+                        IntPtr.Zero));
+            } catch (ArgumentNullException) {
+                throw new Exception (String.Format ("Error setting sink input volume: {0}", LastError.Message));
+            }
+        }
+        [DllImport ("pulse")]
+        private static extern IntPtr pa_context_set_sink_input_volume (HandleRef context, UInt32 index, Volume vol, Action<IntPtr, int, IntPtr> cb, IntPtr userdata);
+
+
+        public Operation MoveSinkInputByIndex (UInt32 sinkInputIndex, UInt32 sinkIndex, OperationSuccessCallback cb)
+        {
+            int cookie = cbManager.NewCookie ();
+            Action<IntPtr, int, IntPtr> wrapped_cb = (IntPtr context, int success, IntPtr userdata) => {
+                cb (success);
+                cbManager.RemoveDelegate (cookie);
+            };
+            cbManager.AddDelegate (wrapped_cb, cookie);
+            try {
+                return new Operation (pa_context_move_sink_input_by_index (context,
+                        sinkInputIndex,
+                        sinkIndex,
+                        wrapped_cb,
+                        IntPtr.Zero));
+            } catch (ArgumentNullException) {
+                throw new Exception (String.Format ("Error moving SinkInput {0} to sink {1}: {2}", sinkInputIndex, sinkIndex, LastError.Message));
+            }
+        }
+        [DllImport ("pulse")]
+        private static extern IntPtr pa_context_move_sink_input_by_index (HandleRef context, UInt32 sinkInputIndex, UInt32 sinkIndex, Action<IntPtr, int, IntPtr> cb, IntPtr userdata);
+
+        
+        public Operation SetSinkMute (UInt32 index, bool mute, OperationSuccessCallback cb)
+        {
+            int cookie = cbManager.NewCookie ();
+            Action<IntPtr, int, IntPtr> wrapped_cb = (IntPtr context, int success, IntPtr userdata) => {
+                cb (success);
+            };
+            cbManager.AddDelegate (wrapped_cb, cookie);
+            try {
+                return new Operation (pa_context_set_sink_mute_by_index (context,
+                                                                         index,
+                                                                         mute ? 1 : 0,
+                                                                         wrapped_cb,
+                                                                         IntPtr.Zero));
+            } catch (ArgumentNullException e) {
+                throw new Exception (String.Format ("Error setting sink mute: {0}", LastError.Message));
+            }
+        }
+        [DllImport("pulse")]
+        private static extern IntPtr pa_context_set_sink_mute_by_index (HandleRef context, 
+                                                                        UInt32 idx, 
+                                                                        int mute, 
+                                                                        Action<IntPtr, int, IntPtr> cb, 
+                                                                        IntPtr userdata);
+        
+
+        public Operation EnumerateClients (ClientCallback cb)
+        {
+            return EnumerateClients ((ClientInfo info, int eol) => {
+                if (eol == 0) {
+                    cb (new Client (this, info));
+                }
+            });
+        }
+
+        public delegate void ClientCallback (Client c);
+        
+        internal Operation EnumerateClients (ClientInfoCallback cb)
+        {
+            int cookie = cbManager.NewCookie ();
+            Action<IntPtr, ClientInfo, int, IntPtr> wrapped_cb = (IntPtr c, ClientInfo info, int eol, IntPtr userdata) => {
+                cb (info, eol);
+                if (eol != 0) {
+                    cbManager.RemoveDelegate (cookie);
+                }
+            };
+            cbManager.AddDelegate (wrapped_cb, cookie);
+            try {
+                return new Operation (pa_context_get_client_info_list (context, wrapped_cb, IntPtr.Zero));
+            } catch (ArgumentNullException) {
+                throw new Exception (String.Format ("Error enumerating clients: {0}", LastError.Message));
+            }
+        }        
+        
+        internal delegate void ClientInfoCallback (ClientInfo info, int eol);
+        private delegate void pa_client_info_cb (IntPtr context, ClientInfo info, int eol, IntPtr userdata);
+        
+        internal Operation GetClientInfoByIndex (UInt32 index, ClientInfoCallback cb)
+        {
+            int cookie = cbManager.NewCookie ();
+            Action<IntPtr, ClientInfo, int, IntPtr> wrapped_cb = (IntPtr c, ClientInfo info, int eol, IntPtr userdata) => {
+                cb (info, eol);
+            };
+            cbManager.AddDelegate (wrapped_cb, cookie);
+            try {
+                return new Operation (pa_context_get_client_info (context, index, wrapped_cb, IntPtr.Zero));
+            } catch (ArgumentNullException) {
+                throw new Exception (String.Format ("Error getting ClientInfo for index {0}: {1}", index, LastError.Message));
+            }
+        }
+
+        internal Operation GetClientInfoByIndex (UInt32 index, Action<IntPtr, ClientInfo, int, IntPtr> cb)
+        {
+            try {
+                return new Operation (pa_context_get_client_info (context, index, cb, IntPtr.Zero));
+            } catch (ArgumentNullException) {
+                throw new Exception (String.Format ("Error getting ClientInfo for index {0}: {1}", index, LastError.Message));
+            }
+        }
+        [DllImport("pulse")]
+        private static extern IntPtr pa_context_get_client_info (HandleRef context, 
+                                                                 UInt32 idx, 
+                                                                 Action<IntPtr, ClientInfo, int, IntPtr> cb, 
+                                                                 IntPtr userdata);
+        [DllImport("pulse")]
+        private static extern IntPtr pa_context_get_client_info_list (HandleRef context, 
+                                                                      Action<IntPtr, ClientInfo, int, IntPtr> cb, 
+                                                                      IntPtr userdata);
+        
+        
+        public delegate void OperationSuccessCallback (int success);
+        private delegate void pa_context_success_cb (IntPtr context, int success, IntPtr userdata);
+
+        [DllImport ("pulse")]
+        private static extern IntPtr pa_context_new (IntPtr mainloop_api, string appName);
+        [DllImport ("pulse")]
+        private static extern int pa_context_connect (HandleRef context, string server, ContextConnectionFlags flags,
+                                                      IntPtr spawnApi);
+        [DllImport ("pulse")]
+        private static extern UInt32 pa_context_get_server_protocol_version (HandleRef context);
+        [DllImport ("pulse")]
+        private static extern void pa_context_set_state_callback (HandleRef context,
+                                                                  ContextNotifyCB cb,
+                                                                  IntPtr userdata);
+        [DllImport ("pulse")]
+        private static extern ConnectionState pa_context_get_state (HandleRef context);
+
+        [DllImport ("pulse")]
+        private static extern IntPtr pa_context_get_sink_input_info_list (HandleRef context,
+                                                                          Action<IntPtr, NativeSinkInputInfo, int, IntPtr> cb,
+                                                                          IntPtr userdata);
+        [DllImport ("pulse")]
+        private static extern IntPtr pa_context_get_sink_info_list (HandleRef context,
+                                                                    Action<IntPtr, SinkInfo, int, IntPtr> cb,
+                                                                    IntPtr userdata);
+        [DllImport ("pulse")]
+        private static extern void pa_context_unref (HandleRef context);
+        [DllImport ("pulse")]
+        private static extern void pa_context_disconnect (HandleRef context);
+
+        public delegate void ServerInfoCallback (ServerInfo info);
+        private delegate void pa_server_info_cb (IntPtr context, NativeServerInfo info, IntPtr userdata);
+        [DllImport ("pulse")]
+        private static extern IntPtr pa_context_get_server_info (HandleRef context,
+                                                                 Action<IntPtr, NativeServerInfo, IntPtr> cb,
+                                                                 IntPtr userdata);
+        public Operation GetServerInfo (ServerInfoCallback cb)
+        {
+            int cookie = cbManager.NewCookie ();
+            Action<IntPtr, NativeServerInfo, IntPtr> wrappedCallback = (_, info, __) => {
+                cb (new ServerInfo (info));
+                cbManager.RemoveDelegate (cookie);
+            };
+            cbManager.AddDelegate (wrappedCallback, cookie);
+            Operation opn;
+            try {
+                opn = new Operation (pa_context_get_server_info (context, wrappedCallback, IntPtr.Zero));
+            } catch (ArgumentNullException) {
+                throw new Exception (String.Format ("Error getting server info: {0}", LastError.Message));
+            }
+            return opn;
+        }
+
+
+        private readonly object eventHandlerLock = new object ();
+        private EventHandler<ServerEventArgs> _sinkEventHandler;
+        public event EventHandler<ServerEventArgs> SinkEvent {
+            add {
+                lock (eventHandlerLock) {
+                    if (_sinkEventHandler == null) {
+                        UpdateSubscriptions (SubscriptionMask.PA_SUBSCRIPTION_MASK_SINK);
+                    }
+                    _sinkEventHandler += value;
+                }
+            }
+            remove {
+                lock (eventHandlerLock) {
+                    _sinkEventHandler -= value;
+                    if (_sinkEventHandler == null) {
+                        UpdateSubscriptions (SubscriptionMask.PA_SUBSCRIPTION_MASK_SINK);
+                    }
+                }
+            }
+        }
+
+        private EventHandler<ServerEventArgs> _sinkInputEventHandler;
+        public event EventHandler<ServerEventArgs> SinkInputEvent {
+            add {
+                lock (eventHandlerLock) {
+                    if (_sinkInputEventHandler == null) {
+                        UpdateSubscriptions (SubscriptionMask.PA_SUBSCRIPTION_MASK_SINK_INPUT);
+                    }
+                    _sinkInputEventHandler += value;
+                }
+            }
+            remove {
+                lock (eventHandlerLock) {
+                    _sinkInputEventHandler -= value;
+                    if (_sinkInputEventHandler == null) {
+                        UpdateSubscriptions (SubscriptionMask.PA_SUBSCRIPTION_MASK_SINK_INPUT);
+                    }
+                }
+            }
+        }
+
+        private EventHandler<ServerEventArgs> _clientEventHandler;
+        public event EventHandler<ServerEventArgs> ClientEvent {
+            add {
+                lock (eventHandlerLock) {
+                    if (_clientEventHandler == null) {
+                        UpdateSubscriptions (SubscriptionMask.PA_SUBSCRIPTION_MASK_CLIENT);
+                    }
+                    _clientEventHandler += value;
+                }
+            }
+            remove {
+                lock (eventHandlerLock) {
+                    _clientEventHandler -= value;
+                    if (_clientEventHandler == null) {
+                        UpdateSubscriptions (SubscriptionMask.PA_SUBSCRIPTION_MASK_CLIENT);
+                    }
+                }
+            }
+        }
+        
+        private SubscriptionMask registeredEvents = SubscriptionMask.PA_SUBSCRIPTION_MASK_NULL;
+        private void UpdateSubscriptions (SubscriptionMask eventType)
+        {
+            if (registeredEvents != (registeredEvents ^ eventType)) {
+                registeredEvents = registeredEvents ^ eventType;
+                Operation opn = null;
+                try {
+                    opn = new Operation (pa_context_subscribe (context,
+                                                               registeredEvents,
+                                                               (_,__,___) => {;},
+                                                               IntPtr.Zero));
+                } catch (ArgumentNullException) {
+                    throw new Exception (String.Format ("Error subscribing to server events: {0}", LastError.Message));
+                } finally {
+                    if (opn != null) {
+                        opn.Dispose ();
+                    }
+                }
+            }
+        }
+
+        private void SubscriptionEventHandler (IntPtr context, SubscriptionEventMask e, UInt32 index, IntPtr userdata)
+        {
+            EventType action = EventType.Error;
+            EventHandler<ServerEventArgs> handler = null;
+            switch (e & SubscriptionEventMask.PA_SUBSCRIPTION_EVENT_TYPE_MASK) {
+            case SubscriptionEventMask.PA_SUBSCRIPTION_EVENT_CHANGE:
+                action = EventType.Changed;
+                break;
+            case SubscriptionEventMask.PA_SUBSCRIPTION_EVENT_NEW:
+                action = EventType.Added;
+                break;
+            case SubscriptionEventMask.PA_SUBSCRIPTION_EVENT_REMOVE:
+                action = EventType.Removed;
+                break;
+            }
+            switch (e & SubscriptionEventMask.PA_SUBSCRIPTION_EVENT_FACILITY_MASK) {
+            case SubscriptionEventMask.PA_SUBSCRIPTION_EVENT_SINK:
+                lock (eventHandlerLock) {
+                    handler = _sinkEventHandler;
+                }
+                break;
+            case SubscriptionEventMask.PA_SUBSCRIPTION_EVENT_SINK_INPUT:
+                lock (eventHandlerLock) {
+                    handler = _sinkInputEventHandler;
+                }
+                break;
+            case SubscriptionEventMask.PA_SUBSCRIPTION_EVENT_CLIENT:
+                lock (eventHandlerLock) {
+                    handler = _clientEventHandler;
+                }
+                break;
+            }
+            if (handler != null) {
+                handler (this, new ServerEventArgs (action, index));
+            }
+        }
+
+        private delegate void SubscriptionEventCB (IntPtr context, SubscriptionEventMask e, UInt32 index, IntPtr userdata);
+        [DllImport ("pulse")]
+        private static extern IntPtr pa_context_subscribe(HandleRef context,
+                                                          SubscriptionMask m,
+                                                          pa_context_success_cb cb,
+                                                          IntPtr userdata);
+        [DllImport ("pulse")]
+        private static extern void pa_context_set_subscribe_callback (HandleRef context,
+                                                                      SubscriptionEventCB cb,
+                                                                      IntPtr userData);
+
+        [Flags]
+        private enum SubscriptionMask : uint {
+            PA_SUBSCRIPTION_MASK_NULL = 0x0000U,/**< No events */
+            PA_SUBSCRIPTION_MASK_SINK = 0x0001U,/**< Sink events */
+            PA_SUBSCRIPTION_MASK_SOURCE = 0x0002U,/**< Source events */
+            PA_SUBSCRIPTION_MASK_SINK_INPUT = 0x0004U,/**< Sink input events */
+            PA_SUBSCRIPTION_MASK_SOURCE_OUTPUT = 0x0008U,/**< Source output events */
+            PA_SUBSCRIPTION_MASK_MODULE = 0x0010U,/**< Module events */
+            PA_SUBSCRIPTION_MASK_CLIENT = 0x0020U,/**< Client events */
+            PA_SUBSCRIPTION_MASK_SAMPLE_CACHE = 0x0040U,/**< Sample cache events */
+            PA_SUBSCRIPTION_MASK_SERVER = 0x0080U,/**< Other global server changes. */
+            PA_SUBSCRIPTION_MASK_AUTOLOAD = 0x0100U,/**< \deprecated Autoload table events. */
+            PA_SUBSCRIPTION_MASK_CARD = 0x0200U,/**< Card events. \since 0.9.15 */
+            PA_SUBSCRIPTION_MASK_ALL = 0x02ffU/**< Catch all events */
+        }
+        [Flags]
+        private enum SubscriptionEventMask : uint {
+            PA_SUBSCRIPTION_EVENT_SINK = 0x0000U,/**< Event type: Sink */
+            PA_SUBSCRIPTION_EVENT_SOURCE = 0x0001U,/**< Event type: Source */
+            PA_SUBSCRIPTION_EVENT_SINK_INPUT = 0x0002U,/**< Event type: Sink input */
+            PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT = 0x0003U,/**< Event type: Source output */
+            PA_SUBSCRIPTION_EVENT_MODULE = 0x0004U,/**< Event type: Module */
+            PA_SUBSCRIPTION_EVENT_CLIENT = 0x0005U,/**< Event type: Client */
+            PA_SUBSCRIPTION_EVENT_SAMPLE_CACHE = 0x0006U,/**< Event type: Sample cache item */
+            PA_SUBSCRIPTION_EVENT_SERVER = 0x0007U,/**< Event type: Global server change, only occurring with PA_SUBSCRIPTION_EVENT_CHANGE. */
+            PA_SUBSCRIPTION_EVENT_AUTOLOAD = 0x0008U,/**< \deprecated Event type: Autoload table changes. */
+            PA_SUBSCRIPTION_EVENT_CARD = 0x0009U,/**< Event type: Card \since 0.9.15 */
+            PA_SUBSCRIPTION_EVENT_FACILITY_MASK = 0x000FU,/**< A mask to extract the event type from an event value */
+            PA_SUBSCRIPTION_EVENT_NEW = 0x0000U,/**< A new object was created */
+            PA_SUBSCRIPTION_EVENT_CHANGE = 0x0010U,/**< A property of the object was modified */
+            PA_SUBSCRIPTION_EVENT_REMOVE = 0x0020U,/**< An object was removed */
+            PA_SUBSCRIPTION_EVENT_TYPE_MASK = 0x0030U/**< A mask to extract the event operation from an event value */
+        }
+    }
+}
 
=== added file 'StandardPlugins/Sound/src/PulseAudio-Sharp/GLib.cs'
--- StandardPlugins/Sound/src/PulseAudio-Sharp/GLib.cs	1970-01-01 00:00:00 +0000
+++ StandardPlugins/Sound/src/PulseAudio-Sharp/GLib.cs	2012-02-04 07:53:22 +0000
@@ -0,0 +1,65 @@
+//
+//  Copyright © 2009 Christopher James Halse Rogers <[e-mail]>
+//
+//  GLib.cs is a part of Pulseaudio#
+//
+//  Pulseaudio# is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU Lesser General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Pulseaudio# is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public License
+//  along with Pulseaudio#.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using Pulseaudio;
+using g = GLib;
+
+namespace Pulseaudio.GLib
+{
+    public static class GLibExtensions
+    {
+        public static void Wait (this Operation opn)
+        {
+			//FIXME this is an ugly hack to workaround the problem that MainContext.Iteration ()
+			//      seems to iterate not the right mainloop wich results in an endless loop where 
+			//      operation never leaves the Running state
+			bool timeout = false;
+			g::Timeout.Add (300, delegate {
+				timeout = true;
+				return false;
+			});            
+			while (!timeout && opn.State == Operation.Status.Running) {
+				g::MainContext.Iteration ();
+            }
+        }
+
+        public static void ConnectAndWait (this Context context)
+        {
+            ManualResetEvent ready = new ManualResetEvent (false);
+            context.Ready += delegate {
+                ready.Set ();
+            };
+            context.Connect ();
+			//FIXME this is an ugly hack to workaround the problem that MainContext.Iteration ()
+			//      seems to iterate not the right mainloop wich results in an endless loop where 
+			//      operation never leaves the Running state
+			bool timeout = false;
+			g::Timeout.Add (300, delegate {
+				timeout = true;
+				return false;
+			});            
+            while (!timeout && !ready.WaitOne (0, true)) {
+                while (g::MainContext.Iteration (false)) {};
+            }
+        }
+    }
+}
 
=== added file 'StandardPlugins/Sound/src/PulseAudio-Sharp/MainLoop.cs'
--- StandardPlugins/Sound/src/PulseAudio-Sharp/MainLoop.cs	1970-01-01 00:00:00 +0000
+++ StandardPlugins/Sound/src/PulseAudio-Sharp/MainLoop.cs	2012-02-04 07:53:22 +0000
@@ -0,0 +1,76 @@
+//
+//  Copyright © 2009 Christopher James Halse Rogers <[e-mail]>
+//
+//  MainLoop.cs is a part of Pulseaudio#
+//
+//  Pulseaudio# is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU Lesser General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Pulseaudio# is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public License
+//  along with Pulseaudio#.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace Pulseaudio
+{
+    public interface MainLoop : IDisposable
+    {
+        //TODO: Make this into an actual managed implementation of a Pulseaudio main loop
+        //For the moment, just require that we can get a pa_mainloop_api pointer out.
+        IntPtr GetAPI ();
+    }
+
+    public class GLibMainLoop : MainLoop
+    {
+        IntPtr pa_mainloop = IntPtr.Zero;
+        bool disposed = false;
+
+        public GLibMainLoop ()
+        {
+            pa_mainloop = pa_glib_mainloop_new (IntPtr.Zero);
+        }
+
+        public IntPtr GetAPI ()
+        {
+            if (disposed) {
+                throw new ObjectDisposedException ("GLibMainLoop", "GLibMainLoop used after being disposed!");
+            }
+            return pa_glib_mainloop_get_api (pa_mainloop);
+        }
+        
+        public void Dispose ()
+        {
+            Dispose (true);
+            GC.SuppressFinalize (this);
+        }
+
+        protected virtual void Dispose (bool explicitlyCalled)
+        {
+            if (!disposed) {
+                pa_glib_mainloop_free (pa_mainloop);
+                disposed = true;
+            }
+        }
+
+        ~GLibMainLoop ()
+        {
+            Dispose (false);
+        }
+
+        [DllImport ("pulse-mainloop-glib")]
+        private static extern IntPtr pa_glib_mainloop_new (IntPtr main_context);
+        [DllImport ("pulse-mainloop-glib")]
+        private static extern IntPtr pa_glib_mainloop_get_api (IntPtr pa_mainloop);
+        [DllImport ("pulse-mainloop-glib")]
+        private static extern void pa_glib_mainloop_free (IntPtr pa_mainloop);
+    }
+}
 
=== added file 'StandardPlugins/Sound/src/PulseAudio-Sharp/Operation.cs'
--- StandardPlugins/Sound/src/PulseAudio-Sharp/Operation.cs	1970-01-01 00:00:00 +0000
+++ StandardPlugins/Sound/src/PulseAudio-Sharp/Operation.cs	2012-02-04 07:53:22 +0000
@@ -0,0 +1,73 @@
+//
+//  Copyright © 2009 Christopher James Halse Rogers <[e-mail]>
+//
+//  Operation.cs is a part of Pulseaudio#
+//
+//  Pulseaudio# is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU Lesser General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Pulseaudio# is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public License
+//  along with Pulseaudio#.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace Pulseaudio
+{
+    public sealed class Operation : IDisposable
+    {
+        public enum Status
+        {
+            Running,
+            Done,
+            Cancelled
+        }
+
+        private HandleRef handle;
+        internal Operation(IntPtr handle)
+        {
+            if (handle == IntPtr.Zero) {
+                throw new ArgumentNullException ("handle", "Tried to create an Operation with null pa_operation pointer");
+            }
+            this.handle = new HandleRef (this, handle);
+        }
+
+        ~Operation ()
+        {
+            if (handle.Handle != IntPtr.Zero) {
+                pa_operation_unref (handle);
+            }
+        }
+
+        public void Dispose ()
+        {
+            pa_operation_unref (handle);
+            GC.SuppressFinalize (this);
+
+            handle = new HandleRef (this, IntPtr.Zero);
+        }
+
+        public Status State {
+            get {
+                return pa_operation_get_state (handle);
+            }
+        }
+
+        [DllImport ("pulse")]
+        private static extern void pa_operation_unref (HandleRef opn);
+        [DllImport ("pulse")]
+        private static extern Status pa_operation_get_state (HandleRef opn);
+        [DllImport ("pulse")]
+        private static extern void pa_operation_ref (HandleRef opn);
+        [DllImport ("pulse")]
+        private static extern void pa_operation_cancel (HandleRef opn);
+    }
+}
 
=== added file 'StandardPlugins/Sound/src/PulseAudio-Sharp/PropList.cs'
--- StandardPlugins/Sound/src/PulseAudio-Sharp/PropList.cs	1970-01-01 00:00:00 +0000
+++ StandardPlugins/Sound/src/PulseAudio-Sharp/PropList.cs	2012-02-04 07:53:22 +0000
@@ -0,0 +1,509 @@
+//
+//  Copyright © 2009 Christopher James Halse Rogers <[e-mail]>
+//
+//  PropList.cs is a part of Pulseaudio#
+//
+//  Pulseaudio# is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU Lesser General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Pulseaudio# is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public License
+//  along with Pulseaudio#.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+
+namespace Pulseaudio
+{
+    public enum Properties {
+        /// <summary>
+        /// For streams: localized media name, formatted as UTF-8. e.g. "Guns'N'Roses: Civil War".
+        /// </summary>
+        MediaName,
+        /// <summary>
+        /// For streams: localized media title if applicable, formatted as UTF-8. e.g. "Civil War"
+        /// </summary>
+        MediaTitle,
+        /// <summary>
+        /// For streams: localized media artist if applicable, formatted as UTF-8. e.g. "Guns'N'Roses"
+        /// </summary>
+        MediaArtist,
+        /// <summary>
+        /// For streams: localized media copyright string if applicable, formatted as UTF-8. e.g. "Evil Record Corp."
+        /// </summary>
+        MediaCopyright,
+        /// <summary>
+        /// For streams: localized media generator software string if applicable, formatted as UTF-8. e.g. "Foocrop AudioFrobnicator"
+        /// </summary>
+        MediaSoftware,
+        /// <summary>
+        /// For streams: media language if applicable, in standard POSIX format. e.g. "de_DE"
+        /// </summary>
+        MediaLanguage,
+        /// <summary>
+        /// For streams: source filename if applicable, in URI format or local path. e.g. "/home/lennart/music/foobar.ogg"
+        /// </summary>
+        MediaFilename,
+        /// <summary>
+        /// For streams: icon for the media. A binary blob containing PNG image data
+        /// </summary>
+        MediaIcon,
+        /// <summary>
+        /// For streams: an XDG icon name for the media. e.g. "audio-x-mp3"
+        /// </summary>
+        MediaIconName,
+        /// <summary>
+        /// For streams: logic role of this media. One of the strings "video", "music", "game", "event", "phone", "animation", "production", "a11y"
+        /// </summary>
+        MediaRole,
+        /// <summary>
+        /// For event sound streams: XDG event sound name. e.g. "message-new-email" (Event sound streams are those with media.role set to "event")
+        /// </summary>
+        EventID,
+        /// <summary>
+        /// For event sound streams: localized human readable one-line description of the event, formatted as UTF-8. e.g. "Email from [e-mail] received."
+        /// </summary>
+        EventDescription,
+        /// <summary>
+        /// For event sound streams: absolute horizontal mouse position on the screen if the event sound was triggered by a mouse click, integer formatted as text string. e.g. "865"
+        /// </summary>
+        EventMouseX,
+        /// <summary>
+        /// For event sound streams: absolute vertical mouse position on the screen if the event sound was triggered by a mouse click, integer formatted as text string. e.g. "432"
+        /// </summary>
+        EventMouseY,
+        /// <summary>
+        /// For event sound streams: relative horizontal mouse position on the screen if the event sound was triggered by a mouse click, float formatted as text string, ranging from 0.0 (left side of the screen) to 1.0 (right side of the screen). e.g. "0.65"
+        /// </summary>
+        EventMouseHPos,
+        /// <summary>
+        /// For event sound streams: relative vertical mouse position on the screen if the event sound was triggered by a mouse click, float formatted as text string, ranging from 0.0 (top of the screen) to 1.0 (bottom of the screen). e.g. "0.43"
+        /// </summary>
+        EventMouseVPos,
+        /// <summary>
+        /// For event sound streams: mouse button that triggered the event if applicable, integer formatted as string with 0=left, 1=middle, 2=right. e.g. "0"
+        /// </summary>
+        EventMouseButton,
+        /// <summary>
+        /// For streams that belong to a window on the screen: localized window title. e.g. "Totem Music Player"
+        /// </summary>
+        WindowName,
+        /// <summary>
+        /// For streams that belong to a window on the screen: a textual id for identifying a window logically. e.g. "org.gnome.Totem.MainWindow"
+        /// </summary>
+        WindowID,
+        /// <summary>
+        /// For streams that belong to a window on the screen: window icon. A binary blob containing PNG image data
+        /// </summary>
+        WindowIcon,
+        /// <summary>
+        /// For streams that belong to a window on the screen: an XDG icon name for the window. e.g. "totem"
+        /// </summary>
+        WindowIconName,
+        /// <summary>
+        /// For streams that belong to a window on the screen: absolute horizontal window position on the screen, integer formatted as text string. e.g. "865". \since 0.9.17
+        /// </summary>
+        WindowX,
+        /// <summary>
+        /// For streams that belong to a window on the screen: absolute vertical window position on the screen, integer formatted as text string. e.g. "343". \since 0.9.17
+        /// </summary>
+        WindowY,
+        /// <summary>
+        /// For streams that belong to a window on the screen: window width on the screen, integer formatted as text string. e.g. "365". \since 0.9.17
+        /// </summary>
+        WindowWidth,
+        /// <summary>
+        /// For streams that belong to a window on the screen: window height on the screen, integer formatted as text string. e.g. "643". \since 0.9.17
+        /// </summary>
+        WindowHeight,
+        /// <summary>
+        /// For streams that belong to a window on the screen: relative position of the window center on the screen, float formatted as text string, ranging from 0.0 (left side of the screen) to 1.0 (right side of the screen). e.g. "0.65". \since 0.9.17
+        /// </summary>
+        WindowHPos,
+        /// <summary>
+        /// For streams that belong to a window on the screen: relative position of the window center on the screen, float formatted as text string, ranging from 0.0 (top of the screen) to 1.0 (bottom of the screen). e.g. "0.43". \since 0.9.17
+        /// </summary>
+        WindowVPos,
+        /// <summary>
+        /// For streams that belong to a window on the screen: if the windowing system supports multiple desktops, a comma seperated list of indexes of the desktops this window is visible on. If this property is an empty string, it is visible on all desktops (i.e. 'sticky'). The first desktop is 0. e.g. "0,2,3" \since 0.9.18
+        /// </summary>
+        WindowDesktop,
+        /// <summary>
+        /// For streams that belong to an X11 window on the screen: the X11 display string. e.g. ":0.0"
+        /// </summary>
+        WindowX11Display,
+        /// <summary>
+        /// For streams that belong to an X11 window on the screen: the X11 screen the window is on, an integer formatted as string. e.g. "0"
+        /// </summary>
+        WindowX11Screen,
+        /// <summary>
+        /// For streams that belong to an X11 window on the screen: the X11 monitor the window is on, an integer formatted as string. e.g. "0"
+        /// </summary>
+        WindowX11Monitor,
+        /// <summary>
+        /// For streams that belong to an X11 window on the screen: the window XID, an integer formatted as string. e.g. "25632"
+        /// </summary>
+        WindowX11XID,
+        /// <summary>
+        /// For clients/streams: localized human readable application name. e.g. "Totem Music Player"
+        /// </summary>
+        ApplicationName,
+        /// <summary>
+        /// For clients/streams: a textual id for identifying an application logically. e.g. "org.gnome.Totem"
+        /// </summary>
+        ApplicationID,
+        /// <summary>
+        /// For clients/streams: a version string e.g. "0.6.88"
+        /// </summary>
+        ApplicationVersion,
+        /// <summary>
+        /// For clients/streams: an XDG icon name for the application. e.g. "totem"
+        /// </summary>
+        ApplicationIconName,
+        /// <summary>
+        /// For clients/streams: application language if applicable, in standard POSIX format. e.g. "de_DE"
+        /// </summary>
+        ApplicationLanguage,
+        /// <summary>
+        /// For clients/streams on UNIX: application process PID, an integer formatted as string. e.g. "4711"
+        /// </summary>
+        ApplicationPID,
+        /// <summary>
+        /// For clients/streams: application process name. e.g. "totem"
+        /// </summary>
+        ApplicationProcessBinary,
+        /// <summary>
+        /// For clients/streams: application user name. e.g. "lennart"
+        /// </summary>
+        ApplicationProcessUser,
+        /// <summary>
+        /// For clients/streams: host name the application runs on. e.g. "omega"
+        /// </summary>
+        ApplicationProcessHost,
+        /// <summary>
+        /// For clients/streams: the D-Bus host id the application runs on. e.g. "543679e7b01393ed3e3e650047d78f6e"
+        /// </summary>
+        ApplicationProcessMachineID,
+        /// <summary>
+        /// For clients/streams: an id for the login session the application runs in. On Unix the value of $XDG_SESSION_COOKIE. e.g. "543679e7b01393ed3e3e650047d78f6e-1235159798.76193-190367717"
+        /// </summary>
+        ApplicationProcessSessionID,
+        /// <summary>
+        /// For devices: device string in the underlying audio layer's format. e.g. "surround51:0"
+        /// </summary>
+        DeviceString,
+        /// <summary>
+        /// For devices: API this device is access with. e.g. "alsa"
+        /// </summary>
+        DeviceAPI,
+        /// <summary>
+        /// For devices: localized human readable device one-line description, e.g. "Foobar Industries USB Headset 2000+ Ultra"
+        /// </summary>
+        DeviceDescription,
+        /// <summary>
+        /// For devices: bus path to the device in the OS' format. e.g. "/sys/bus/pci/devices/0000:00:1f.2"
+        /// </summary>
+        DeviceBusPath,
+        /// <summary>
+        /// For devices: serial number if applicable. e.g. "4711-0815-1234"
+        /// </summary>
+        DeviceSerial,
+        /// <summary>
+        /// For devices: vendor ID if applicable. e.g. 1274
+        /// </summary>
+        DeviceVendorID,
+        /// <summary>
+        /// For devices: vendor name if applicable. e.g. "Foocorp Heavy Industries"
+        /// </summary>
+        DeviceVendorName,
+        /// <summary>
+        /// For devices: product ID if applicable. e.g. 4565
+        /// </summary>
+        DeviceProductID,
+        /// <summary>
+        /// For devices: product name if applicable. e.g. "SuperSpeakers 2000 Pro"
+        /// </summary>
+        DeviceProductName,
+        /// <summary>
+        /// For devices: device class. One of "sound", "modem", "monitor", "filter"
+        /// </summary>
+        DeviceClass,
+        /// <summary>
+        /// For devices: form factor if applicable. One of "internal", "speaker", "handset", "tv", "webcam", "microphone", "headset", "headphone", "hands-free", "car", "hifi", "computer", "portable"
+        /// </summary>
+        DeviceFormFactor,
+        /// <summary>
+        /// For devices: bus of the device if applicable. One of "isa", "pci", "usb", "firewire", "bluetooth"
+        /// </summary>
+        DeviceBus,
+        /// <summary>
+        /// For devices: an XDG icon name for the device. e.g. "sound-card-speakers-usb"
+        /// </summary>
+        DeviceIconName,
+        /// <summary>
+        /// For devices: access mode of the device if applicable. One of "mmap", "mmap_rewrite", "serial"
+        /// </summary>
+        DeviceAccessMode,
+        /// <summary>
+        /// For filter devices: master device id if applicable.
+        /// </summary>
+        DeviceMasterDevice,
+        /// <summary>
+        /// For devices: buffer size in bytes, integer formatted as string.
+        /// </summary>
+        DeviceBufferSize,
+        /// <summary>
+        /// For devices: fragment size in bytes, integer formatted as string.
+        /// </summary>
+        DeviceFragmentSize,
+        /// <summary>
+        /// For devices: profile identifier for the profile this devices is in. e.g. "analog-stereo", "analog-surround-40", "iec958-stereo", ...
+        /// </summary>
+        DeviceProfileName,
+        /// <summary>
+        /// For devices: human readable one-line description of the profile this device is in. e.g. "Analog Stereo", ...
+        /// </summary>
+        DeviceProfileDescription,
+        /// <summary>
+        /// For devices: intended use. A comma seperated list of roles (see PA_PROP_MEDIA_ROLE) this device is particularly well suited for, due to latency, quality or form factor. \since 0.9.16
+        /// </summary>
+        DeviceIntendedRoles,
+        /// <summary>
+        /// For modules: the author's name, formatted as UTF-8 string. e.g. "Lennart Poettering"
+        /// </summary>
+        ModuleAuthor,
+        /// <summary>
+        /// For modules: a human readable one-line description of the module's purpose formatted as UTF-8. e.g. "Frobnicate sounds with a flux compensator"
+        /// </summary>
+        ModuleDescription,
+        /// <summary>
+        /// For modules: a human readable usage description of the module's arguments formatted as UTF-8
+        /// </summary>
+        ModuleUsage,
+        /// <summary>
+        /// For modules: a version string for the module. e.g. "0.9.15"
+        /// </summary>
+        ModuleVersion
+    }
+
+    public class PropList : IDisposable
+    {
+        private static readonly Dictionary<Properties, string> propertyTable = new Dictionary<Properties, string> {
+            {Properties.MediaName, "media.name"},
+            {Properties.MediaTitle, "media.title"},
+            {Properties.MediaArtist, "media.artist"},
+            {Properties.MediaCopyright, "media.copyright"},
+            {Properties.MediaSoftware, "media.software"},
+            {Properties.MediaLanguage, "media.language"},
+            {Properties.MediaFilename, "media.filename"},
+            {Properties.MediaIconName, "media.icon_name"},
+            {Properties.MediaRole, "media.role"},
+            {Properties.EventID, "event.id"},
+            {Properties.EventDescription, "event.description"},
+            {Properties.EventMouseX, "event.mouse.x"},
+            {Properties.EventMouseY, "event.mouse.y"},
+            {Properties.EventMouseHPos, "event.mouse.hpos"},
+            {Properties.EventMouseVPos, "event.mouse.vpos"},
+            {Properties.EventMouseButton, "event.mouse.button"},
+            {Properties.WindowName, "window.name"},
+            {Properties.WindowID, "window.id"},
+            {Properties.WindowIconName, "window.icon_name"},
+            {Properties.WindowX, "window.x"},
+            {Properties.WindowY, "window.y"},
+            {Properties.WindowWidth, "window.width"},
+            {Properties.WindowHeight, "window.height"},
+            {Properties.WindowHPos, "window.hpos"},
+            {Properties.WindowVPos, "window.vpos"},
+            {Properties.WindowDesktop, "window.desktop"},
+            {Properties.WindowX11Display, "window.x11.display"},
+            {Properties.WindowX11Screen, "window.x11.screen"},
+            {Properties.WindowX11Monitor, "window.x11.monitor"},
+            {Properties.WindowX11XID, "window.x11.xid"},
+            {Properties.ApplicationName, "application.name"},
+            {Properties.ApplicationID, "application.id"},
+            {Properties.ApplicationVersion, "application.version"},
+            {Properties.ApplicationIconName, "application.icon_name"},
+            {Properties.ApplicationLanguage, "application.language"},
+            {Properties.ApplicationPID, "application.process.id"},
+            {Properties.ApplicationProcessBinary, "application.process.binary"},
+            {Properties.ApplicationProcessUser, "application.process.user"},
+            {Properties.ApplicationProcessHost, "application.process.host"},
+            {Properties.ApplicationProcessMachineID, "application.process.machine_id"},
+            {Properties.ApplicationProcessSessionID, "application.process.session_id"},
+            {Properties.DeviceString, "device.string"},
+            {Properties.DeviceAPI, "device.api"},
+            {Properties.DeviceDescription, "device.description"},
+            {Properties.DeviceBusPath, "device.bus_path"},
+            {Properties.DeviceSerial, "device.serial"},
+            {Properties.DeviceVendorID, "device.vendor.id"},
+            {Properties.DeviceVendorName, "device.vendor.name"},
+            {Properties.DeviceProductID, "device.product.id"},
+            {Properties.DeviceProductName, "device.product.name"},
+            {Properties.DeviceClass, "device.class"},
+            {Properties.DeviceFormFactor, "device.form_factor"},
+            {Properties.DeviceBus, "device.bus"},
+            {Properties.DeviceIconName, "device.icon_name"},
+            {Properties.DeviceAccessMode, "device.access_mode"},
+            {Properties.DeviceMasterDevice, "device.master_device"},
+            {Properties.DeviceBufferSize, "device.buffering.buffer_size"},
+            {Properties.DeviceFragmentSize, "device.buffering.fragment_size"},
+            {Properties.DeviceProfileName, "device.profile.name"},
+            {Properties.DeviceProfileDescription, "device.profile.description"},
+            {Properties.DeviceIntendedRoles, "device.intended_roles"},
+            {Properties.ModuleAuthor, "module.author"},
+            {Properties.ModuleDescription, "module.description"},
+            {Properties.ModuleUsage, "module.version"},
+            {Properties.ModuleVersion, "module.version"}
+        };
+        private HandleRef handle;
+        private bool needDispose;
+
+        public PropList ()
+        {
+            IntPtr listPtr = pa_proplist_new ();
+            if (listPtr == IntPtr.Zero) {
+                throw new NullReferenceException ();
+            }
+            handle = new HandleRef (this, listPtr);
+            needDispose = true;
+        }
+
+        /// <summary>
+        /// Internal-only PropList constructor taking an unmanaged pointer.
+        /// </summary>
+        /// <param name="listPtr">
+        /// A <see cref="IntPtr"/>.  Unmanaged pointer to a pa_proplist.
+        /// </param>
+        /// <remarks>
+        /// It is assumed that native code owns the pa_proplist pointer.  As such, it will not be free'd on Dispose ().
+        /// If the managed code should own this pointer, set needDispose to true after calling this constructor.
+        /// </remarks>
+        internal PropList (IntPtr listPtr)
+        {
+            if (listPtr == IntPtr.Zero) {
+                throw new NullReferenceException ();
+            }
+            handle = new HandleRef (this, listPtr);
+            needDispose = false;
+            GC.SuppressFinalize (this);
+        }
+
+        ~PropList ()
+        {
+            if (needDispose) {
+                pa_proplist_free (handle);
+            }
+        }
+
+        public void Dispose ()
+        {
+            if (needDispose) {
+                pa_proplist_free (handle);
+            }
+            handle = new HandleRef (this, IntPtr.Zero);
+            needDispose = false;
+
+            GC.SuppressFinalize (this);
+        }
+
+        public byte[] this[string key]
+        {
+            get {
+                IntPtr data = new IntPtr ();
+                IntPtr size = new IntPtr ();
+                pa_proplist_get (handle, key, ref data, ref size);
+
+                byte[] retVal = new byte[size.ToInt32 ()];
+                Marshal.Copy (data, retVal, 0, size.ToInt32 ());
+
+                return retVal;
+            }
+            set {
+                if (value == null) {
+                    throw new ArgumentNullException ("value", "Setting a PropList key to 'null' is unsupported");
+                }
+                pa_proplist_set (handle, key, value, new IntPtr (Marshal.SizeOf (value[0]) * value.Length));
+            }
+        }
+
+        public string this[Properties prop]
+        {
+            get {
+                return Marshal.PtrToStringAnsi (pa_proplist_gets (handle, propertyTable[prop]));
+            }
+            set {
+                pa_proplist_sets (handle, propertyTable[prop], value);
+            }
+        }
+
+        public bool Empty {
+            get {
+                // TODO: Work out why pa_proplist_isempty doesn't return 0 when the list is empty.
+                return (Count == 0);
+            }
+        }
+
+        public uint Count {
+            get {
+                return pa_proplist_size (handle);
+            }
+        }
+
+        public void Clear ()
+        {
+            pa_proplist_clear (handle);
+        }
+
+        public PropList Copy ()
+        {
+            PropList clone = new PropList (pa_proplist_copy (handle));
+            clone.needDispose = true;
+            GC.ReRegisterForFinalize (clone);
+            return clone;
+        }
+
+        public IEnumerable<string> Keys {
+            get {
+                IntPtr cookie = new IntPtr (0);
+                IntPtr key;
+                key = pa_proplist_iterate (handle, ref cookie);
+                while (key != IntPtr.Zero) {
+                    yield return Marshal.PtrToStringAnsi (key);
+                    key = pa_proplist_iterate (handle, ref cookie);
+                }
+                yield break;
+            }
+        }
+
+        [DllImport ("pulse")]
+        private static extern int pa_proplist_isempty (HandleRef list);
+        [DllImport ("pulse")]
+        private static extern IntPtr pa_proplist_new ();
+        [DllImport ("pulse")]
+        private static extern void pa_proplist_clear (HandleRef list);
+        [DllImport ("pulse")]
+        private static extern uint pa_proplist_size (HandleRef list);
+        [DllImport ("pulse")]
+        private static extern int pa_proplist_sets (HandleRef list, string key, string value);
+        [DllImport ("pulse")]
+        private static extern int pa_proplist_set (HandleRef list, string key, byte[] data, IntPtr size);
+        [DllImport ("pulse")]
+        private static extern IntPtr pa_proplist_gets (HandleRef list, string key);
+        [DllImport ("pulse")]
+        private static extern int pa_proplist_get (HandleRef list, string key, ref IntPtr data, ref IntPtr size);
+        [DllImport ("pulse")]
+        private static extern IntPtr pa_proplist_iterate (HandleRef list, ref IntPtr cookie);
+        [DllImport ("pulse")]
+        private static extern IntPtr pa_proplist_copy (HandleRef list);
+        [DllImport ("pulse")]
+        private static extern void pa_proplist_free (HandleRef list);
+    }
+}
 
=== added file 'StandardPlugins/Sound/src/PulseAudio-Sharp/Sample.cs'
--- StandardPlugins/Sound/src/PulseAudio-Sharp/Sample.cs	1970-01-01 00:00:00 +0000
+++ StandardPlugins/Sound/src/PulseAudio-Sharp/Sample.cs	2012-02-04 07:53:22 +0000
@@ -0,0 +1,89 @@
+//
+//  Copyright © 2009 Christopher James Halse Rogers <[e-mail]>
+//
+//  Sample.cs is a part of Pulseaudio#
+//
+//  Pulseaudio# is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU Lesser General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Pulseaudio# is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public License
+//  along with Pulseaudio#.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace Pulseaudio
+{
+    public enum SampleFormat
+    {
+        U8,
+        /**< Unsigned 8 Bit PCM */
+
+        ALAW,
+        /**< 8 Bit a-Law */
+
+        ULAW,
+        /**< 8 Bit mu-Law */
+
+        S16LE,
+        /**< Signed 16 Bit PCM, little endian (PC) */
+
+        S16BE,
+        /**< Signed 16 Bit PCM, big endian */
+
+        Float32LE,
+        /**< 32 Bit IEEE floating point, little endian (PC), range -1.0 to 1.0 */
+
+        Float32BE,
+        /**< 32 Bit IEEE floating point, big endian, range -1.0 to 1.0 */
+
+        S32LE,
+        /**< Signed 32 Bit PCM, little endian (PC) */
+
+        S32BE,
+        /**< Signed 32 Bit PCM, big endian */
+
+        S24LE,
+        /**< Signed 24 Bit PCM packed, little endian (PC). \since 0.9.15 */
+
+        S24BE,
+        /**< Signed 24 Bit PCM packed, big endian. \since 0.9.15 */
+
+        S24in32LE,
+        /**< Signed 24 Bit PCM in LSB of 32 Bit words, little endian (PC). \since 0.9.15 */
+
+        S24in32BE,
+        /**< Signed 24 Bit PCM in LSB of 32 Bit words, big endian. \since 0.9.15 */
+
+        Max,
+        /**< Upper limit of valid sample types */
+
+        Invalid = -1
+        /**< An invalid value */
+    }
+
+    [StructLayout (LayoutKind.Sequential)]
+    public struct SampleSpec
+    {
+        public SampleFormat format;
+        public UInt32 rate;
+        public Byte channels;
+
+        public UInt64 BytesPerSecond {
+            get {
+                return (UInt64) pa_bytes_per_second (ref this);
+            }
+        }
+
+        [DllImport ("pulse")]
+        private static extern UIntPtr pa_bytes_per_second (ref SampleSpec spec);
+    }
+}
 
=== added file 'StandardPlugins/Sound/src/PulseAudio-Sharp/ServerInfo.cs'
--- StandardPlugins/Sound/src/PulseAudio-Sharp/ServerInfo.cs	1970-01-01 00:00:00 +0000
+++ StandardPlugins/Sound/src/PulseAudio-Sharp/ServerInfo.cs	2012-02-04 07:53:22 +0000
@@ -0,0 +1,120 @@
+//
+//  ServerInfo.cs
+//
+//  Author:
+//       Christopher James Halse Rogers <[e-mail]>
+//
+//  Copyright © 2009 Christopher James Halse Rogers <[e-mail]>
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU Lesser General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace Pulseaudio
+{
+    [StructLayout(LayoutKind.Sequential)]
+    internal class NativeServerInfo
+    {
+        public IntPtr user_name;
+        public IntPtr host_name;
+        public IntPtr server_version;
+        public IntPtr server_name;
+        public SampleSpec sample_spec;
+        public IntPtr default_sink_name;
+        public IntPtr default_source_name;
+        public UInt32  cookie;
+        public ChannelMap channel_map;
+    }
+
+    public class ServerInfo
+    {
+        internal ServerInfo (NativeServerInfo info)
+        {
+            UserName = Marshal.PtrToStringAnsi (info.user_name);
+            HostName = Marshal.PtrToStringAnsi (info.host_name);
+            Version = Marshal.PtrToStringAnsi (info.server_version);
+            Name = Marshal.PtrToStringAnsi (info.server_name);
+            DefaultSampleSpec = info.sample_spec;
+            DefaultSinkName = Marshal.PtrToStringAnsi (info.default_sink_name);
+            DefaultSourceName = Marshal.PtrToStringAnsi (info.default_source_name);
+            Cookie = info.cookie;
+            DefaultChannelMap = info.channel_map;
+        }
+
+        /// <summary>
+        /// Name of the user running the daemon process
+        /// </summary>
+        public string UserName {
+            get;
+            private set;
+        }
+        /// <summary>
+        /// Host name of the machine the daemon is running on
+        /// </summary>
+        public string HostName {
+            get;
+            private set;
+        }
+        /// <summary>
+        /// Version string of the daemon
+        /// </summary>
+        public string Version {
+            get;
+            private set;
+        }
+        /// <summary>
+        /// Package name of the daemon (usually "pulseaudio")
+        /// </summary>
+        public string Name {
+            get;
+            private set;
+        }
+        /// <summary>
+        /// Default sample specification for this daemon
+        /// </summary>
+        public SampleSpec DefaultSampleSpec {
+            get;
+            private set;
+        }
+        /// <summary>
+        /// Name of the default sink for this daemon
+        /// </summary>
+        public string DefaultSinkName {
+            get;
+            private set;
+        }
+        /// <summary>
+        /// Name of the default source for this daemon
+        /// </summary>
+        public string DefaultSourceName {
+            get;
+            private set;
+        }
+        /// <summary>
+        /// A random cookie identifying this daemon process
+        /// </summary>
+        public UInt32 Cookie {
+            get;
+            private set;
+        }
+        /// <summary>
+        /// Default channel map for this server
+        /// </summary>
+        public ChannelMap DefaultChannelMap {
+            get;
+            private set;
+        }
+    }
+}
 
=== added file 'StandardPlugins/Sound/src/PulseAudio-Sharp/Sink.cs'
--- StandardPlugins/Sound/src/PulseAudio-Sharp/Sink.cs	1970-01-01 00:00:00 +0000
+++ StandardPlugins/Sound/src/PulseAudio-Sharp/Sink.cs	2012-02-04 07:53:22 +0000
@@ -0,0 +1,346 @@
+//
+//  Copyright © 2009 Christopher James Halse Rogers <[e-mail]>
+//
+//  Sink.cs is a part of Pulseaudio#
+//
+//  Pulseaudio# is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU Lesser General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Pulseaudio# is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public License
+//  along with Pulseaudio#.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+
+namespace Pulseaudio
+{
+    public enum SinkState {
+        Invalid = -1,
+        /**< This state is used when the server does not support sink state introspection \since 0.9.15 */
+
+        Running = 0,
+        /**< Running, sink is playing and used by at least one non-corked sink-input \since 0.9.15 */
+
+        Idle = 1,
+        /**< When idle, the sink is playing but there is no non-corked sink-input attached to it \since 0.9.15 */
+
+        Suspended = 2,
+        /**< When suspended, actual sink access can be closed, for instance \since 0.9.15 */
+    }
+
+    [Flags]
+    public enum SinkFlags {
+        HardwareVolume = 0x0001,
+        /**< Supports hardware volume control */
+
+        LatencyQuery = 0x0002,
+        /**< Supports latency querying */
+
+        IsHardware = 0x0004,
+        /**< Is a hardware sink of some kind, in contrast to
+         * "virtual"/software sinks \since 0.9.3 */
+
+        IsNetwork = 0x0008,
+        /**< Is a networked sink of some kind. \since 0.9.7 */
+
+        HardwareMute = 0x0010,
+        /**< Supports hardware mute control \since 0.9.11 */
+
+        dBVolume = 0x0020,
+        /**< Volume can be translated to dB with pa_sw_volume_to_dB()
+         * \since 0.9.11 */
+
+        FlatVolume = 0x0040,
+        /**< This sink is in flat volume mode, i.e. always the maximum of
+         * the volume of all connected inputs. \since 0.9.15 */
+
+        DynamicLatency = 0x0080
+        /**< The latency can be adjusted dynamically depending on the
+         * needs of the connected streams. \since 0.9.15 */
+    }
+
+    [StructLayout (LayoutKind.Sequential)]
+    public class SinkInfo
+    {
+        IntPtr name;                  /**< Name of the sink */
+        public UInt32 index;                 /**< Index of the sink */
+        IntPtr description;           /**< Description of this sink */
+        public SampleSpec sample_spec;       /**< Sample spec of this sink */
+        public ChannelMap channel_map;       /**< Channel map */
+        public UInt32 owner_module;          /**< Index of the owning module of this sink, or PA_INVALID_INDEX */
+        public Volume volume;         /**< Volume of the sink */
+        public int mute;                     /**< Mute switch of the sink */
+        public UInt32 monitor_source;        /**< Index of the monitor source connected to this sink */
+        IntPtr monitor_source_name;   /**< The name of the monitor source */
+        public UInt64 latency;               /**< Length of queued audio in the output buffer. */
+        IntPtr driver;                /**< Driver name. */
+        public SinkFlags flags;              /**< Flags */
+        IntPtr proplist;              /**< Property list \since 0.9.11 */
+        public UInt64 configured_latency;    /**< The latency this device has been configured to. \since 0.9.11 */
+        public UInt32 base_volume;           /**< Some kind of "base" volume that refers to unamplified/unattenuated volume in the context of the output device. \since 0.9.15 */
+        public SinkState state;              /**< State \since 0.9.15 */
+        public UInt32 n_volume_steps;        /**< Number of volume steps for sinks which do not support arbitrary volumes. \since 0.9.15 */
+        public UInt32 card;                  /**< Card index, or PA_INVALID_INDEX. \since 0.9.15 */
+
+        public string Name {
+            get {
+                return Marshal.PtrToStringAnsi (name);
+            }
+        }
+
+        public string Description {
+            get {                return Marshal.PtrToStringAnsi (description);
+            }
+        }
+
+        public string MonitorSourceName {
+            get {
+                return Marshal.PtrToStringAnsi (monitor_source_name);
+            }
+        }
+
+        public string Driver {
+            get {
+                return Marshal.PtrToStringAnsi (driver);
+            }
+        }
+
+        public PropList Properties {
+            get {
+                return new PropList (proplist);
+            }
+        }
+
+        public SinkInfo()
+        {
+        }
+    }
+
+    public class Sink : IDisposable {
+        private void UpdateFromInfo (SinkInfo i)
+        {
+            if (info.volume != i.volume || info.mute != i.mute) {
+                info = i;
+                Description = i.Description;
+                MonitorSourceName = i.MonitorSourceName;
+                Driver = i.Driver;
+                EventHandler<VolumeChangedEventArgs> handler;
+                lock (eventHandlerLock) {
+                    handler = _volumeChangedHandler;
+                }
+                if (handler != null) {
+                    handler (this, new VolumeChangedEventArgs (i.volume));
+                }
+            } else {
+                info = i;
+                Description = i.Description;
+                MonitorSourceName = i.MonitorSourceName;
+                Driver = i.Driver;
+            }
+        }
+
+        private bool disposed = false;
+        private SinkInfo info;
+        private Context context;
+
+        public Sink (Context c, SinkInfo info)
+        {
+            context = c;
+            this.info = info;
+            Name = info.Name;
+            Description = info.Description;
+            MonitorSourceName = info.MonitorSourceName;
+            Driver = info.Driver;
+            Properties = info.Properties.Copy ();
+            context.SinkEvent += HandleRawSinkEvent;
+        }
+
+        public void Dispose ()
+        {
+            Dispose (true);
+            GC.SuppressFinalize (this);
+        }
+
+        protected virtual void Dispose (bool explicitlyCalled)
+        {
+            if (!disposed) {
+                if (explicitlyCalled) {
+                    //Unregister our server info callbacks
+                    context.SinkEvent -= HandleRawSinkEvent;
+                }
+                disposed = true;
+            }
+        }
+
+        public string Name {
+            get; private set;
+        }
+
+        public string Description {
+            get; private set;
+        }
+
+        public PropList Properties {
+            get; private set;
+        }
+
+        public UInt32 Index {
+            get {
+                return info.index;
+            }
+        }
+
+        public SampleSpec SampleSpec {
+            get {
+                //SampleSpec is a struct, so this passes a copy.
+                return info.sample_spec;
+            }
+        }
+
+        public ChannelMap ChannelMap {
+            get {
+                //ChannelMap is a struct, so this returns a copy.
+                return info.channel_map;
+            }
+        }
+        public UInt32 OwnerModule {
+            get {
+                return info.owner_module;
+            }
+        }
+
+        public Volume Volume {
+            get {
+                return info.volume.Copy ();
+            }
+        }
+
+        public bool Mute {
+            get {
+                return (info.mute > 0);
+            }
+        }
+
+        public UInt32 MonitorSource {
+            get {
+                return info.monitor_source;
+            }
+        }
+
+        public string MonitorSourceName {
+            get; private set;
+        }
+
+        public UInt64 Latency {
+            get {
+                return info.latency;
+            }
+        }
+
+        public string Driver {
+            get; private set;
+        }
+
+        public SinkFlags Flags {
+            get {
+                return info.flags;
+            }
+        }
+
+        public UInt64 ConfiguredLatency {
+            get {
+                return info.configured_latency;
+            }
+        }
+
+        public UInt32 BaseVolume {
+            get {
+                return info.base_volume;
+            }
+        }
+
+        public SinkState State {
+            get {
+                return info.state;
+            }
+        }
+
+        public UInt32 NumVolumeSteps {
+            get {
+                return info.n_volume_steps;
+            }
+        }
+
+        public UInt32 Card {
+            get {
+                return info.card;
+            }
+        }
+
+        public delegate void VolumeCallback (Volume vol);
+        public Operation GetVolume (VolumeCallback cb)
+        {
+            return context.GetSinkInfoByIndex (info.index, (SinkInfo i, int eol) =>
+            {
+                if (eol == 0) {
+                    cb (i.volume);
+                }} );
+        }
+
+        public Operation SetVolume (Volume vol, Context.OperationSuccessCallback cb)
+        {
+            return context.SetSinkVolume (info.index, vol, cb);
+        }
+
+
+        private readonly object eventHandlerLock = new object ();
+        private EventHandler<VolumeChangedEventArgs> _volumeChangedHandler;
+        public event EventHandler<VolumeChangedEventArgs> VolumeChanged {
+            add {
+                lock (eventHandlerLock) {
+                    _volumeChangedHandler += value;
+                }
+            }
+            remove {
+                lock (eventHandlerLock) {
+                    _volumeChangedHandler -= value;
+                }
+            }
+        }
+
+        void HandleRawSinkEvent (object sender, ServerEventArgs e)
+        {
+            Context c = sender as Context;
+            if (e.Type == EventType.Changed) {
+                if (e.index == info.index) {
+                    Operation o = c.GetSinkInfoByIndex (info.index, (SinkInfo i, int eol) =>
+                    {
+                        if (eol == 0) {
+                            UpdateFromInfo (i);
+                        }});
+                    o.Dispose ();
+                }
+            }
+        }
+
+        public class VolumeChangedEventArgs : EventArgs
+        {
+            public VolumeChangedEventArgs (Volume vol)
+            {
+                newVolume = vol;
+            }
+
+            public Volume newVolume { get; private set; }
+        }
+    }
+}
 
=== added file 'StandardPlugins/Sound/src/PulseAudio-Sharp/SinkInput.cs'
--- StandardPlugins/Sound/src/PulseAudio-Sharp/SinkInput.cs	1970-01-01 00:00:00 +0000
+++ StandardPlugins/Sound/src/PulseAudio-Sharp/SinkInput.cs	2012-02-04 07:53:22 +0000
@@ -0,0 +1,179 @@
+//
+//  Copyright © 2009 Christopher James Halse Rogers <[e-mail]>
+//
+//  SinkInput.cs is a part of Pulseaudio#
+//
+//  Pulseaudio# is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU Lesser General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Pulseaudio# is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public License
+//  along with Pulseaudio#.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace Pulseaudio
+{
+    [StructLayout (LayoutKind.Sequential)]
+    internal class NativeSinkInputInfo
+    {
+        public UInt32 index;                        /**< Index of the sink input */
+        public IntPtr name;                         /**< Name of the sink input */
+        public UInt32 owner_module;                 /**< Index of the module this sink input belongs to, or PA_INVALID_INDEX when it does not belong to any module */
+        public UInt32 client;                       /**< Index of the client this sink input belongs to, or PA_INVALID_INDEX when it does not belong to any client */
+        public UInt32 sink;                         /**< Index of the connected sink */
+        public SampleSpec sample_spec;              /**< The sample specification of the sink input */
+        public ChannelMap channel_map;              /**< Channel map */
+        public Volume volume;                       /**< The volume of this sink input */
+        public UInt64 buffer_usec;                  /**< Latency due to buffering in sink input, see pa_latency_info for details */
+        public UInt64 sink_usec;                    /**< Latency of the sink device, see pa_latency_info for details */
+        public IntPtr resample_method;              /**< The resampling method used by this sink input. */
+        public IntPtr driver;                       /**< Driver name */
+        public int mute;                            /**< Stream muted \since 0.9.7 */
+        public IntPtr prop_handle;                  /**< Property list \since 0.9.11 */
+    }
+
+    public class SinkInput : IDisposable
+    {
+        private bool disposed = false;
+        private Context ctx;
+        private NativeSinkInputInfo info;
+
+        internal SinkInput (NativeSinkInputInfo info, Context c)
+        {
+            ctx = c;
+            this.info = info;
+            Name = Marshal.PtrToStringAnsi (info.name);
+            ResampleMethod = Marshal.PtrToStringAnsi (info.resample_method);
+            Driver = Marshal.PtrToStringAnsi (info.driver);
+            PropList temp = new PropList (info.prop_handle);
+            Properties = temp.Copy ();
+            ctx.SinkInputEvent += HandleSinkInputEvent;
+        }
+
+        public void Dispose ()
+        {
+            Dispose (true);
+            GC.SuppressFinalize (this);
+        }
+
+        public void Dispose (bool explicitlyCalled)
+        {
+            if (!disposed) {
+                if (explicitlyCalled) {
+                    Properties.Dispose ();
+                    ctx.SinkInputEvent -= HandleSinkInputEvent;
+                }
+                disposed = true;
+            }
+        }
+
+        public string Name {
+            get;
+            private set;
+        }
+
+        public string ResampleMethod {
+            get;
+            private set;
+        }
+
+        public string Driver {
+            get;
+            private set;
+        }
+
+        public UInt32 Index {
+            get { return info.index; }
+        }
+        public UInt32 OwnerModule {
+            get { return info.owner_module; }
+        }
+        public UInt32 Client {
+            get { return info.client; }
+        }
+        public UInt32 Sink {
+            get { return info.sink; }
+        }
+        public SampleSpec Spec {
+            get { return info.sample_spec; }
+        }
+        public ChannelMap Map {
+            get { return info.channel_map; }
+        }
+        public Volume Volume {
+            get { return info.volume.Copy (); }
+        }
+        public UInt64 BufferLatency {
+            get { return info.buffer_usec; }
+        }
+        public UInt64 SinkLatency {
+            get { return info.sink_usec; }
+        }
+        public bool Mute {
+            get { return (info.mute > 0); }
+        }
+        public PropList Properties {
+            get;
+            private set;
+        }
+
+        public Operation SetVolume (Volume v, Context.OperationSuccessCallback cb)
+        {
+            return ctx.SetSinkInputVolume (Index, v, cb);
+        }
+
+        public class VolumeChangedEventArgs : EventArgs
+        {
+            public VolumeChangedEventArgs (Volume vol)
+            {
+                newVolume = vol;
+            }
+
+            public Volume newVolume { get; private set; }
+        }
+
+        public event EventHandler<VolumeChangedEventArgs> VolumeChanged;
+
+        private void HandleSinkInputEvent (object sender, ServerEventArgs args)
+        {
+            Context c = sender as Context;
+            if (args.Type == EventType.Changed && args.index == Index && c != null) {
+                Operation o = ctx.GetSinkInputInfoByIndex (Index, (NativeSinkInputInfo i, int eol) => {
+                    if (eol == 0) {
+                        UpdateInfo (i);
+                    }
+                });
+                o.Dispose ();
+            }
+        }
+
+        private void UpdateInfo (NativeSinkInputInfo info)
+        {
+            if (this.info.volume != info.volume || this.info.mute != info.mute) {
+                this.info = info;
+                ResampleMethod = Marshal.PtrToStringAnsi (info.resample_method);
+                PropList temp = new PropList (info.prop_handle);
+                Properties = temp.Copy ();
+                EventHandler<VolumeChangedEventArgs> handler;
+                handler = VolumeChanged;
+                if (handler != null) {
+                    handler (this, new VolumeChangedEventArgs (info.volume));
+                }
+            } else {
+                this.info = info;
+                ResampleMethod = Marshal.PtrToStringAnsi (info.resample_method);
+                PropList temp = new PropList (info.prop_handle);
+                Properties = temp.Copy ();
+            }
+        }
+    }
+}
 
=== added file 'StandardPlugins/Sound/src/PulseAudio-Sharp/UnmanagedCallbackManager.cs'
--- StandardPlugins/Sound/src/PulseAudio-Sharp/UnmanagedCallbackManager.cs	1970-01-01 00:00:00 +0000
+++ StandardPlugins/Sound/src/PulseAudio-Sharp/UnmanagedCallbackManager.cs	2012-02-04 07:53:22 +0000
@@ -0,0 +1,84 @@
+//
+//  UnmanagedCallbackManager.cs
+//
+//  Author:
+//       Christopher James Halse Rogers <[e-mail]>
+//
+//  Copyright © 2010 Christopher James Halse Rogers <[e-mail]>
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU Lesser General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+using System;
+using System.Linq;
+using System.Collections.Generic;
+
+namespace Pulseaudio
+{
+    internal class UnmanagedCallbackManager
+    {
+        private Dictionary<int, Action> delegates;
+        private List<int> pendingCookies;
+
+        public UnmanagedCallbackManager ()
+        {
+            delegates = new Dictionary<int, Action> ();
+            pendingCookies = new List<int> ();
+        }
+
+        public void AddDelegate (Action act, int cookie)
+        {
+            if (pendingCookies.Contains (cookie)) {
+                delegates[cookie] = act;
+                pendingCookies.Remove (cookie);
+            } else {
+                throw new Exception ();
+            }
+        }
+
+        public void AddDelegate<T1, T2, T3, T4> (Action<T1, T2, T3, T4> act, int cookie)
+        {
+            AddDelegate (() => act(default(T1), default(T2), default(T3), default(T4)), cookie);
+        }
+
+        public void AddDelegate<T1, T2, T3> (Action<T1, T2, T3> act, int cookie)
+        {
+            AddDelegate (() => act(default (T1), default (T2), default (T3)), cookie);
+        }
+
+        public void RemoveDelegate (int cookie)
+        {
+            if (!delegates.ContainsKey (cookie)) {
+                throw new Exception ();
+            }
+            delegates.Remove (cookie);
+        }
+
+        public int PendingCallbackCount {
+            get {
+                return delegates.Count ();
+            }
+        }
+
+        public int NewCookie ()
+        {
+            int nextCookie, maxDelegateCookie, maxPendingCookie;
+            maxDelegateCookie = delegates.Count () == 0 ? 0 : delegates.Keys.Max ();
+            maxPendingCookie = pendingCookies.Count () == 0 ? 0 : pendingCookies.Max ();
+
+            nextCookie = Math.Max (maxDelegateCookie, maxPendingCookie) + 1;
+            pendingCookies.Add (nextCookie);
+            return nextCookie;
+        }
+    }
+}
 
=== added file 'StandardPlugins/Sound/src/PulseAudio-Sharp/Util.cs'
--- StandardPlugins/Sound/src/PulseAudio-Sharp/Util.cs	1970-01-01 00:00:00 +0000
+++ StandardPlugins/Sound/src/PulseAudio-Sharp/Util.cs	2012-02-04 07:53:22 +0000
@@ -0,0 +1,184 @@
+//
+//  Copyright © 2009 Christopher James Halse Rogers <[e-mail]>
+//
+//  Util.cs is a part of Pulseaudio#
+//
+//  Pulseaudio# is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU Lesser General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Pulseaudio# is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public License
+//  along with Pulseaudio#.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace Pulseaudio
+{
+    public enum ErrorCode {
+        OK = 0,                 /**< No error */
+        AccessFailure,          /**< Access failure */
+        UnknownCommand,         /**< Unknown command */
+        InvalidArgument,        /**< Invalid argument */
+        EntityExists,           /**< Entity exists */
+        NoSuchEntity,           /**< No such entity */
+        ConnectionRefused,      /**< Connection refused */
+        Protocol,               /**< Protocol error */
+        Timeout,                /**< Timeout */
+        NoAuthKey,              /**< No authorization key */
+        Internal,               /**< Internal error */
+        ConnectionTerminated,   /**< Connection terminated */
+        Killed,                 /**< Entity killed */
+        InvalidServer,          /**< Invalid server */
+        ModuleInitFailed,       /**< Module initialization failed */
+        BadState,               /**< Bad state */
+        NoData,                 /**< No data */
+        Version,                /**< Incompatible protocol version */
+        TooLarge,               /**< Data too large */
+        NotSupported,           /**< Operation not supported \since 0.9.5 */
+        Unknown,                /**< The error code was unknown to the client */
+        NoExtension,            /**< Extension does not exist. \since 0.9.12 */
+        Obsolete,               /**< Obsolete functionality. \since 0.9.15 */
+        NotImplemented,         /**< Missing implementation. \since 0.9.15 */
+        Forked,                 /**< The caller forked without calling execve() and tried to reuse the context. \since 0.9.15 */
+        IO,                     /**< An IO error happened. \since 0.9.16 */
+        PA_ERR_MAX              /**< Not really an error but the first invalid error code */
+    }
+
+    public class Error
+    {
+        public enum Code {
+            OK = 0,                 /**< No error */
+            AccessFailure,          /**< Access failure */
+            UnknownCommand,         /**< Unknown command */
+            InvalidArgument,        /**< Invalid argument */
+            EntityExists,           /**< Entity exists */
+            NoSuchEntity,           /**< No such entity */
+            ConnectionRefused,      /**< Connection refused */
+            Protocol,               /**< Protocol error */
+            Timeout,                /**< Timeout */
+            NoAuthKey,              /**< No authorization key */
+            Internal,               /**< Internal error */
+            ConnectionTerminated,   /**< Connection terminated */
+            Killed,                 /**< Entity killed */
+            InvalidServer,          /**< Invalid server */
+            ModuleInitFailed,       /**< Module initialization failed */
+            BadState,               /**< Bad state */
+            NoData,                 /**< No data */
+            Version,                /**< Incompatible protocol version */
+            TooLarge,               /**< Data too large */
+            NotSupported,           /**< Operation not supported \since 0.9.5 */
+            Unknown,                /**< The error code was unknown to the client */
+            NoExtension,            /**< Extension does not exist. \since 0.9.12 */
+            Obsolete,               /**< Obsolete functionality. \since 0.9.15 */
+            NotImplemented,         /**< Missing implementation. \since 0.9.15 */
+            Forked,                 /**< The caller forked without calling execve() and tried to reuse the context. \since 0.9.15 */
+            IO,                     /**< An IO error happened. \since 0.9.16 */
+            PA_ERR_MAX              /**< Not really an error but the first invalid error code */
+        }
+
+        private Code error;
+        private string error_string;
+
+        internal Error (Code error)
+        {
+            this.error = error;
+        }
+
+        public Code ErrorCode {
+            get {
+                return error;
+            }
+        }
+
+        public string Message {
+            get {
+                if (string.IsNullOrEmpty (error_string)) {
+                    error_string = Marshal.PtrToStringAnsi (pa_strerror (Convert.ToInt32 (error)));
+                }
+                return error_string;
+            }
+        }
+
+        public override string ToString ()
+        {
+            return string.Format("[Error: {0}]", Message);
+        }
+
+        public override bool Equals (object obj)
+        {
+            Error other = obj as Error;
+            if (other != null) {
+                return (error == other.error);
+            }
+            if (obj is Code) {
+                return error == (Code)obj;
+            }
+            return base.Equals (obj);
+        }
+
+        public bool Equals (Error b)
+        {
+            return error == b.error;
+        }
+
+        public override int GetHashCode ()
+        {
+            return error.GetHashCode ();
+        }
+
+        public static bool operator==(Error a, Code b)
+        {
+            return a.error == b;
+        }
+
+        public static bool operator!=(Error a, Code b)
+        {
+            return !(a==b);
+        }
+
+        public static bool operator==(Code a, Error b)
+        {
+            return b == a;
+        }
+
+        public static bool operator!=(Code a, Error b)
+        {
+            return !(a==b);
+        }
+
+        public static bool operator==(Error a, Error b)
+        {
+            if (Object.ReferenceEquals (a, b)) {
+                return true;
+            }
+            return a.error == b.error;
+        }
+
+        public static bool operator!=(Error a, Error b)
+        {
+            return !(a==b);
+        }
+
+        [DllImport ("pulse")]
+        private static extern IntPtr pa_strerror (int error);
+    }
+
+    public static class Util
+    {
+        public static string ErrorStringFromErrno (ErrorCode error)
+        {
+            return Marshal.PtrToStringAnsi (pa_strerror (Convert.ToInt32 (error)));
+        }
+
+        [DllImport ("pulse")]
+        private static extern IntPtr pa_strerror (int error);
+    }
+}
 
=== added file 'StandardPlugins/Sound/src/PulseAudio-Sharp/Volume.cs'
--- StandardPlugins/Sound/src/PulseAudio-Sharp/Volume.cs	1970-01-01 00:00:00 +0000
+++ StandardPlugins/Sound/src/PulseAudio-Sharp/Volume.cs	2012-02-04 07:53:22 +0000
@@ -0,0 +1,137 @@
+//
+//  Copyright © 2009 Christopher James Halse Rogers <[e-mail]>
+//
+//  Volume.cs is a part of Pulseaudio#
+//
+//  Pulseaudio# is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU Lesser General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Pulseaudio# is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public License
+//  along with Pulseaudio#.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+using System;
+using System.Text;
+using System.Runtime.InteropServices;
+
+namespace Pulseaudio
+{
+    public class Constants
+    {
+        public const int MaxChannels = 32;
+    }
+
+    [StructLayout (LayoutKind.Sequential)]
+    public class Volume
+    {
+        private Byte channels;
+        [MarshalAs (UnmanagedType.ByValArray, SizeConst=Constants.MaxChannels)]
+        private UInt32 [] values;
+
+        private static readonly UInt32 norm = 0x10000U;
+        private static readonly UInt32 mute = 0;
+
+        public Volume()
+        {
+            values = new uint[Constants.MaxChannels];
+            pa_cvolume_init (this);
+            channels = 2;
+        }
+
+        /// <summary>
+        /// Reset the volume of all channels to no change (100%)
+        /// </summary>
+        public void Reset ()
+        {
+            pa_cvolume_set (this, channels, norm);
+        }
+
+        /// <summary>
+        /// Set the volume of all channels.
+        /// </summary>
+        /// <param name="val">
+        /// A <see cref="System.Double"/>.  The nominal range is 0 - 1.0, with 0 corresponding to mute
+        /// and 1.0 corresponding to full volume (or, equivalently, no volume adjustment).
+        /// It is possible to set values > 1.0.  This is not an error, but is not generally a good idea.
+        /// </param>
+        public void Set (double val)
+        {
+            pa_cvolume_set (this, channels,  (UInt32)(val * norm));
+        }
+
+        public Volume Copy ()
+        {
+            Volume retVal = new Volume ();
+            retVal.channels = channels;
+            values.CopyTo (retVal.values, 0);
+            return retVal;
+        }
+
+        public override bool Equals (object obj)
+        {
+            if (obj is Volume) {
+                return (this as Volume) == (obj as Volume);
+            }
+            return false;
+        }
+
+        public override int GetHashCode ()
+        {
+            return base.GetHashCode ();
+        }
+
+        public static bool operator== (Volume a, Volume b)
+        {
+            return pa_cvolume_equal (a, b) != 0;
+        }
+        public static bool operator!= (Volume a, Volume b)
+        {
+            return !(a==b);
+        }
+
+        public override string ToString ()
+        {
+            StringBuilder buffer = new StringBuilder (PA_CVOLUME_SNPRINT_BUFFER_MAX);
+            pa_cvolume_snprint (buffer, new IntPtr (buffer.Capacity), this);
+            return buffer.ToString ();
+        }
+
+        public double ToScalarAvg ()
+        {
+            UInt32 rawVol = pa_cvolume_avg (this);
+            return ((((double)rawVol) - mute) / norm);
+        }
+
+        public void Modify (double amount)
+        {
+            if (amount > 0) {
+                pa_cvolume_inc (this, (UInt32)((amount - mute) * norm));
+            } else {
+                pa_cvolume_dec (this, (UInt32)((-amount - mute) * norm));
+            }
+        }
+
+        [DllImport ("pulse")]
+        private static extern int pa_cvolume_equal (Volume a, Volume b);
+        [DllImport ("pulse")]
+        private static extern void pa_cvolume_init ([Out] Volume a);
+        [DllImport ("pulse")]
+        private static extern void pa_cvolume_set ([In, Out] Volume vol, uint channels, UInt32 val);
+        [DllImport ("pulse")]
+        private static extern void pa_cvolume_snprint (System.Text.StringBuilder buffer, IntPtr bufferSize, Volume vol);
+        static readonly int PA_CVOLUME_SNPRINT_BUFFER_MAX = 320;
+        [DllImport ("pulse")]
+        private static extern UInt32 pa_cvolume_avg (Volume vol);
+        [DllImport ("pulse")]
+        private static extern void pa_cvolume_inc ([In, Out]Volume vol, UInt32 amount);
+        [DllImport ("pulse")]
+        private static extern void pa_cvolume_dec ([In, Out]Volume vol, UInt32 amount);
+    }
+}
 
=== added file 'StandardPlugins/Sound/src/SoundDockItem.cs'
--- StandardPlugins/Sound/src/SoundDockItem.cs	1970-01-01 00:00:00 +0000
+++ StandardPlugins/Sound/src/SoundDockItem.cs	2012-02-04 07:53:22 +0000
@@ -0,0 +1,537 @@
+//  
+//  Copyright (C) 2011 Rico Tzschichholz
+// 
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// 
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading;
+
+using Mono.Unix;
+
+using Cairo;
+using GLib;
+using Gdk;
+using Wnck;
+
+using Docky.Items;
+using Docky.Menus;
+using Docky.Services;
+using Docky.Services.Prefs;
+
+using Pulseaudio;
+using Pulseaudio.GLib;
+
+namespace Sound
+{
+	public class SoundDockItem : IconDockItem
+	{
+		static IPreferences prefs = DockServices.Preferences.Get <SoundDockItem> ();
+		
+		object update_lock = new object ();
+		
+		const string AlsaCommandVolumeDown = "amixer set Master 3%- /dev/null";
+		const string AlsaCommandVolumeUp = "amixer set Master 3%+ /dev/null";
+
+		Pulseaudio.Context pa_context;
+
+		List<SinkInput> PASinkInputs = new List<SinkInput> ();
+		public List<SinkInput> UsableSinkInputs {
+			get {
+				if (CurrentSink == null)
+					return new List<SinkInput> ();
+				return PASinkInputs.FindAll (si => si.Sink == CurrentSink.Index && UsableClients.Exists (c => c.Index == si.Client));
+			}
+		}
+
+		List<Client> PAClients = new List<Client> ();
+		public List<Client> UsableClients {
+			get {
+				if (CurrentSink == null)
+					return new List<Client> ();
+				return PAClients.FindAll (c => PASinkInputs.Exists (si => si.Sink == CurrentSink.Index && si.Client == c.Index));
+			}
+		}
+		
+		List<Sink> PASinks = new List<Sink> ();
+		Sink current_sink;
+		public Sink CurrentSink { 
+			get {
+				//TODO determine current user selected default sink
+				if (PASinks.Any () && (current_sink == null || !PASinks.Contains (current_sink))) {
+					int pref_index = prefs.Get<int> ("CurrentSinkIndex", 0);
+					current_sink = PASinks.Find (s => s.Index == pref_index);
+					
+					if (current_sink == null)
+						current_sink = PASinks.DefaultIfEmpty (null).FirstOrDefault ();
+
+					if (current_sink != null) {
+						current_sink.VolumeChanged += HandlePulseaudioSinkVolumeChanged;
+						prefs.Set<int> ("CurrentSinkIndex", (int)current_sink.Index);
+						OnVolumeChanged ();
+					}
+				}
+				return current_sink;
+			}
+			private set {
+				if (current_sink != null)
+					current_sink.VolumeChanged -= HandlePulseaudioSinkVolumeChanged;
+				
+				current_sink = value;
+				
+				if (current_sink != null) {
+					current_sink.VolumeChanged += HandlePulseaudioSinkVolumeChanged;
+					prefs.Set<int> ("CurrentSinkIndex", (int)current_sink.Index);
+				}
+				OnVolumeChanged ();
+			}
+		}
+
+		bool pa_try_reconnect = false;
+
+		bool IsPulseAudioAvailable {
+			get {
+				if (pa_try_reconnect && pa_context.State == Pulseaudio.Context.ConnectionState.Failed) {
+					lock (update_lock) {
+						Log<SoundDockItem>.Debug ("Reconnecting to Pulseaudio");
+						CurrentSink = null;
+						pa_context.Ready -= HandlePulseaudioContextReady;
+						pa_context.Dispose ();
+						pa_context = new Pulseaudio.Context ("Docky's Sound Docklet");
+						pa_context.Ready += HandlePulseaudioContextReady;
+						pa_context.Connect ();
+					}
+				}
+				return pa_context != null && pa_context.State == Pulseaudio.Context.ConnectionState.Ready && CurrentSink != null;
+			}
+		}
+		
+		public override string UniqueID ()
+		{
+			return "SoundControl";
+		}
+		
+		public SoundDockItem ()
+		{
+			HoverText = Catalog.GetString ("Volume Control");
+			Icon = "preferences-desktop-sound";
+
+			Log<SoundDockItem>.Debug ("Connecting to Pulseaudio");
+			pa_context = new Pulseaudio.Context ("Docky's Sound Docklet");
+			pa_context.Ready += HandlePulseaudioContextReady;
+			pa_context.Connect ();
+		}
+
+		void HandlePulseaudioContextReady ()
+		{
+			Log<SoundDockItem>.Debug ("Using Pulseaudio (API {0})", pa_context.ServerAPI);
+
+			InitializeSinkList ();
+			InitializeClientList ();
+			InitializeSinkInputList ();
+
+			pa_context.SinkEvent += HandlePulseaudioContextSinkEvent;
+			pa_context.SinkInputEvent += HandlePulseaudioContextSinkInputEvent;
+			pa_context.ClientEvent += HandlePulseaudioContextClientEvent;
+
+			// if we managed to connect once, we will retry if the connection gets lost
+			pa_try_reconnect = true;
+		}
+
+		void InitializeClientList ()
+		{
+			lock (PAClients) {
+				PAClients.ForEach (c => c.Dispose ());
+				PAClients.Clear ();
+				using (Operation o = pa_context.EnumerateClients ((Client client) => {
+					Log<SoundDockItem>.Debug ("Found Client \"{1}\" ({0})", client.Index, client.Name);
+					PAClients.Add (client);
+				}))
+				{
+					o.Wait ();
+				}
+			}
+		}		
+		
+		void HandlePulseaudioContextClientEvent (object sender, ServerEventArgs e)
+		{
+			lock (PAClients) {
+				if (e.Type == Pulseaudio.EventType.Removed) {
+					Client c = PAClients.Find (cl => cl.Index == e.index);
+					if (c != null) {
+						Log<SoundDockItem>.Debug ("Remove Client \"{1}\" ({0})", c.Index, c.Name);
+						PAClients.Remove (c);
+						c.Dispose ();
+					}
+				} else if (e.Type == Pulseaudio.EventType.Added) {
+					//TODO use index directly to get this particular Client
+					using (Operation o = pa_context.EnumerateClients ((Client client) => {
+						if (e.index == client.Index) {
+							Log<SoundDockItem>.Debug ("Add Client \"{1}\" ({0})", client.Index, client.Name);
+							PAClients.Add (client);
+						}
+					}))
+					{
+						o.Wait ();
+					}
+				}
+			}
+		}
+
+		void InitializeSinkInputList ()
+		{
+			lock (PASinkInputs) {
+				PASinkInputs.ForEach (si => si.Dispose ());
+				PASinkInputs.Clear ();
+				using (Operation o = pa_context.EnumerateSinkInputs ((SinkInput sinkinput, int eol) => {
+					if (eol == 0) {
+						Log<SoundDockItem>.Debug ("Found SinkInput {0} for Client {1} \"{2}\"", sinkinput.Index, sinkinput.Client, sinkinput.Name);
+						PASinkInputs.Add (sinkinput);
+					}
+				}))
+				{
+					o.Wait ();
+				}
+			}
+		}
+
+		void HandlePulseaudioContextSinkInputEvent (object sender, ServerEventArgs e)
+		{
+			lock (PASinkInputs) {
+				if (e.Type == Pulseaudio.EventType.Removed) {
+					SinkInput si = PASinkInputs.Find (sii => sii.Index == e.index);
+					if (si != null) {
+						Log<SoundDockItem>.Debug ("Remove SinkInput {0} for Client {1} \"{2}\"", si.Index, si.Client, si.Name);
+						PASinkInputs.Remove (si);
+						si.Dispose ();
+					}
+				} else if (e.Type == Pulseaudio.EventType.Added) {
+					//TODO use index directly to get this particular SinkInput
+					using (Operation o = pa_context.EnumerateSinkInputs ((SinkInput sinkinput, int eol) => {
+						if (eol == 0 && e.index == sinkinput.Index) {
+							Log<SoundDockItem>.Debug ("Add SinkInput {0} for Client {1} \"{2}\"", sinkinput.Index, sinkinput.Client, sinkinput.Name);
+							PASinkInputs.Add (sinkinput);
+						}
+					}))
+					{
+						o.Wait ();
+					}
+				}
+			}
+		}
+
+		void InitializeSinkList ()
+		{
+			lock (PASinks) {
+				PASinks.ForEach (s => {
+					s.VolumeChanged -= HandlePulseaudioSinkVolumeChanged;
+					s.Dispose ();	
+				});
+				PASinks.Clear ();
+				using (Operation o = pa_context.EnumerateSinks ((Sink sink) => {
+					Log<SoundDockItem>.Debug ("Found Device \"{1}\" ({0})", sink.Index, sink.Description);
+					PASinks.Add (sink);
+					//OnVolumeChanged ();
+				}))
+				{
+					o.Wait ();
+				}
+			}
+		}
+
+		void HandlePulseaudioContextSinkEvent (object sender, ServerEventArgs e)
+		{
+			lock (PASinks) {
+				if (e.Type == Pulseaudio.EventType.Removed) {
+					Sink s = PASinks.Find (si => si.Index == e.index);
+					if (s != null) {
+						Log<SoundDockItem>.Debug ("Remove Device \"{1}\" ({0})", s.Index, s.Description);
+						PASinks.Remove (s);
+						s.Dispose ();
+					}
+				} else if (e.Type == Pulseaudio.EventType.Added) {
+					//TODO use index to get this particular Sink
+					using (Operation o = pa_context.EnumerateSinks ((Sink sink) => {
+						if (e.index == sink.Index) {
+							Log<SoundDockItem>.Debug ("Add Device \"{1}\" ({0})", sink.Index, sink.Description);
+							PASinks.Add (sink);
+						}
+					}))
+					{
+						o.Wait ();
+					}
+				}
+			}
+		}
+
+		void HandlePulseaudioSinkVolumeChanged (object sender, Sink.VolumeChangedEventArgs e)
+		{
+			OnVolumeChanged ();
+		}
+
+		void OnVolumeChanged ()
+		{
+			if (!IsPulseAudioAvailable) {
+				HoverText = Catalog.GetString ("Volume Control");
+				Icon = "preferences-desktop-sound";
+				return;
+			}
+			
+			double volume = CurrentSink.Volume.ToScalarAvg ();
+			Icon = GetVolumeIcon (volume, CurrentSink.Mute);
+			HoverText = String.Format (Catalog.GetString ("Volume {0}%"), Math.Round (volume * 100)) 
+				+ (CurrentSink.Mute ? " (" + Catalog.GetString ("Muted") + ")" : "");
+		}
+
+		void PulseaudioChangeVolume (double val)
+		{
+			if (!IsPulseAudioAvailable)
+				return;
+
+			Pulseaudio.Volume vol = CurrentSink.Volume.Copy ();
+			vol.Modify (val);
+			
+			//TODO should we support 150% ?
+			if (vol.ToScalarAvg () < 0)
+				vol.Set (0);
+			else if (vol.ToScalarAvg () > 1)
+				vol.Set (1);
+
+			CurrentSink.SetVolume (vol, (int success) => {});
+		}
+
+		void PulseaudioSetVolume (double val) 
+		{
+			if (!IsPulseAudioAvailable)
+				return;
+
+			Pulseaudio.Volume vol = CurrentSink.Volume.Copy ();
+			vol.Set (val);
+			
+			//TODO should we support 150% ?
+			if (vol.ToScalarAvg () < 0)
+				vol.Set (0);
+			else if (vol.ToScalarAvg () > 1)
+				vol.Set (1);
+
+			CurrentSink.SetVolume (vol, (int success) => {});
+		}
+
+		void PulseaudioSetSinkInputVolume (SinkInput sinkinput, double val) 
+		{
+			if (!IsPulseAudioAvailable)
+				return;
+
+			Pulseaudio.Volume vol = sinkinput.Volume.Copy ();
+			vol.Set (val);
+			
+			//TODO should we support 150% ?
+			if (vol.ToScalarAvg () < 0)
+				vol.Set (0);
+			else if (vol.ToScalarAvg () > 1)
+				vol.Set (1);
+
+			sinkinput.SetVolume (vol, (int success) => {});
+		}
+		
+		string GetVolumeIcon (double volume, bool muted)
+		{
+			//audio-output-none-panel, audio-volume-high-panel, audio-volume-low-panel, audio-volume-low-zero-panel, 
+			//audio-volume-medium-panel, audio-volume-muted-blocked-panel, audio-volume-muted-panel
+			if (!PASinks.Any ())
+				return "audio-output-none-panel;;audio-volume-muted";
+			
+			if (muted)
+				return "audio-volume-muted-panel;;audio-volume-muted";
+			else if (volume <= 0.05)
+				return "audio-volume-low-zero-panel;;audio-volume-muted";
+			else if (volume < 0.2)
+				return "audio-volume-low-panel;;audio-volume-low";
+			else if (volume < 0.6)
+				return "audio-volume-medium-panel;;audio-volume-medium";
+			else
+				return "audio-volume-high-panel;;audio-volume-high";
+		}
+		
+		protected override void OnScrolled (Gdk.ScrollDirection direction, Gdk.ModifierType mod)
+		{
+			if (IsPulseAudioAvailable) {
+				if (direction == Gdk.ScrollDirection.Up) {
+					PulseaudioChangeVolume (0.03);
+				} else if (direction == Gdk.ScrollDirection.Down) {
+					PulseaudioChangeVolume (-0.03);
+				}
+			} else {
+				if (direction == Gdk.ScrollDirection.Up) {
+					SimpleExecute (AlsaCommandVolumeUp);
+				} else if (direction == Gdk.ScrollDirection.Down) {
+					SimpleExecute (AlsaCommandVolumeDown);
+				}
+			}
+		}
+		
+		public override MenuButton MenuButton {
+			get { return MenuButton.Left | MenuButton.Right; }
+		}
+		
+		protected override ClickAnimation OnClicked (uint button, Gdk.ModifierType mod, double xPercent, double yPercent)
+		{
+			if (button == 1 && IsPulseAudioAvailable) {
+				//TODO mute and unmute all sinks
+				pa_context.SetSinkMute (CurrentSink.Index, !CurrentSink.Mute, (int success) => {});
+			}
+			return ClickAnimation.None;
+		}
+		
+		protected override MenuList OnGetMenuItems ()
+		{
+			MenuList list = new MenuList ();
+			
+			list[MenuListContainer.Header].Add (new MenuItem (Catalog.GetString ("Sound Preferences..."), "gnome-volume-control;;multimedia-volume-control", (o, a) => { DockServices.System.Execute ("gnome-volume-control"); }));
+			
+			if (IsPulseAudioAvailable) {
+				// TODO only show them optionally
+				// show Output-Devices if there are more than one
+				if (PASinks.Count () > 1) {
+					list.SetContainerTitle (MenuListContainer.Actions, Catalog.GetString ("Available Outputs"));
+					foreach (Sink sink in PASinks) {
+						Sink s = sink;
+						MenuItem m;
+						if (CurrentSink == s)
+							m = new MenuItem (s.Description, "gtk-apply");
+						else
+							m = new MenuItem (s.Description, "", (o, a) => { CurrentSink = s; });
+						list[MenuListContainer.Actions].Add (m);
+					}
+				}
+	
+				// add Client list
+				if (PAClients.Any ()) {
+					//list.SetContainerTitle (MenuListContainer.RelatedItems, Catalog.GetString ("Playing Applications"));
+					foreach (Client client in UsableClients.OrderBy (c => c.Name)) {
+						// get DesktopItem from WindowMatcher for this PID
+						//int pid = int.Parse (pl[Properties.ApplicationPID]);
+						//DesktopItem di = null;
+						//Wnck.Window w = null;
+						//foreach (Wnck.Window window in Wnck.Screen.Default.Windows)
+						//	if (window.Pid == pid) {
+								//di = WindowMatcher.Default.DesktopItemForWindow (window);
+						//		w = window;							
+						//		break;
+						//	}
+						
+						string icon = client.Properties[Properties.ApplicationIconName];
+						if (string.IsNullOrEmpty (icon))
+							icon = "applications-multimedia";
+						
+						foreach (SinkInput sinkinput in UsableSinkInputs.FindAll (si => si.Client == client.Index).OrderBy (si => si.Name)) {
+							SinkInput si = sinkinput;
+							list[MenuListContainer.RelatedItems].Add (new SliderMenuItem (string.IsNullOrEmpty (si.Name) ? client.Name : string.Format ("{0} ({1})", client.Name, si.Name),
+							                                                              si.Volume.ToScalarAvg (), icon,
+							                                                              (o, e) => {
+								PulseaudioSetSinkInputVolume (si, e.NewPosition);
+							}));
+						}
+					}
+				}
+	
+				// add master volume control
+				//TODO mute and unmute all sinks ?
+				if (CurrentSink != null) {
+					list[MenuListContainer.Footer].Add (new MenuItem ((CurrentSink.Mute ? Catalog.GetString ("Unmute") : Catalog.GetString ("Mute")),
+					                                                  "" , 
+					                                                  (o, a) => { 
+						pa_context.SetSinkMute (CurrentSink.Index, !CurrentSink.Mute, (int success) => {});
+					}));
+					list[MenuListContainer.Footer].Add (new SliderMenuItem ("", CurrentSink.Volume.ToScalarAvg (),
+					                                         GetVolumeIcon (CurrentSink.Volume.ToScalarAvg (), CurrentSink.Mute),
+					                                         (o, e) => {
+						(o as MenuItem).Icon = GetVolumeIcon (e.NewPosition, (CurrentSink != null ? CurrentSink.Mute : true));
+						PulseaudioSetVolume (e.NewPosition);
+					}));
+				}
+			} else {
+				//TODO Alsa fallback
+			}
+			
+			return list;
+		}
+		
+		public void SimpleExecute (string executable)
+		{
+			try {
+				Log<SystemService>.Debug ("Calling: " + executable);
+				System.Diagnostics.Process proc = System.Diagnostics.Process.Start (executable);
+				proc.Dispose ();
+			} catch {
+				Log<SystemService>.Error ("Error executing '" + executable + "'");
+			}
+		}
+
+		#region Pulseaudio helper
+		public static void RunUntilEventSignal (Action action, EventWaitHandle until, string timeoutMessage)
+		{
+			var timeout = new EventWaitHandle (false, EventResetMode.AutoReset);
+			GLib.Timeout.Add (1000, () => {
+				timeout.Set ();
+				return false;
+			});
+			action ();
+			while (!until.WaitOne (0, true)) {
+				DrainEventLoop ();
+				if (timeout.WaitOne (0, true)) {
+					Log<SoundDockItem>.Error (timeoutMessage);
+				}
+			}
+		}
+
+		public static void DrainEventLoop ()
+		{
+			while (GLib.MainContext.Iteration (false)) {}
+		}		
+		#endregion
+		
+		#region IDisposable implementation
+		public override void Dispose ()
+		{
+			PAClients.ForEach (c => c.Dispose ());
+			PAClients.Clear ();
+			
+			PASinkInputs.ForEach (si => si.Dispose ());
+			PASinkInputs.Clear ();
+			
+			PASinks.ForEach (s => { 
+				s.VolumeChanged -= HandlePulseaudioSinkVolumeChanged; 
+				s.Dispose (); 
+			});
+			PASinks.Clear ();
+			
+			CurrentSink = null;
+			
+			pa_context.Ready -= HandlePulseaudioContextReady;
+			pa_context.SinkEvent -= HandlePulseaudioContextSinkEvent;
+			pa_context.SinkInputEvent -= HandlePulseaudioContextSinkInputEvent;
+			pa_context.ClientEvent -= HandlePulseaudioContextClientEvent;
+			pa_context.Dispose (); // all handlers are getting removed
+			
+			base.Dispose ();
+		}
+
+		#endregion
+	}
+}
 
=== added file 'StandardPlugins/Sound/src/SoundItemProvider.cs'
--- StandardPlugins/Sound/src/SoundItemProvider.cs	1970-01-01 00:00:00 +0000
+++ StandardPlugins/Sound/src/SoundItemProvider.cs	2012-02-04 07:53:22 +0000
@@ -0,0 +1,42 @@
+//  
+//  Copyright (C) 2011 Rico Tzschichholz
+// 
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// 
+
+using System;
+using System.Collections.Generic;
+
+using Docky.Items;
+
+namespace Sound
+{
+	public class SoundItemProvider : AbstractDockItemProvider
+	{
+		#region IDockItemProvider implementation
+		
+		public override string Name {
+			get {
+				return "Sound";
+			}
+		}
+		
+		#endregion
+
+		public SoundItemProvider ()
+		{
+			Items = new SoundDockItem ().AsSingle<AbstractDockItem> ();
+		}	
+	}
+}
 
=== modified file 'configure.ac'
--- configure.ac	2012-01-31 12:16:30 +0000
+++ configure.ac	2012-02-04 07:53:22 +0000
@@ -207,6 +207,8 @@
 StandardPlugins/RecentDocuments/Resources/RecentDocuments.addin.xml
 StandardPlugins/SessionManager/Makefile
 StandardPlugins/SessionManager/Resources/SessionManager.addin.xml
+StandardPlugins/Sound/Makefile
+StandardPlugins/Sound/Resources/Sound.addin.xml
 StandardPlugins/Timer/Makefile
 StandardPlugins/Timer/Resources/Timer.addin.xml
 StandardPlugins/Trash/Makefile
 
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2011-03-02 23:41:41 +0000
+++ po/POTFILES.in	2012-02-04 07:53:22 +0000
@@ -42,6 +42,7 @@
 StandardPlugins/NPR/src/StationDockItem.cs
 StandardPlugins/RecentDocuments/src/RecentFilesProvider.cs
 StandardPlugins/SessionManager/src/SessionActionsProvider.cs
+StandardPlugins/Sound/src/SoundDockItem.cs
 StandardPlugins/Timer/src/TimerDockItem.cs
 StandardPlugins/Timer/src/TimerMainDockItem.cs
 StandardPlugins/Trash/src/TrashDockItem.cs
 
=== modified file 'po/docky.pot'
--- po/docky.pot	2011-06-17 11:50:40 +0000
+++ po/docky.pot	2012-02-04 07:53:22 +0000
@@ -1274,6 +1274,36 @@
 msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
 
+#: ../StandardPlugins/Sound/src/SoundDockItem.cs:131
+#: ../StandardPlugins/Sound/src/SoundDockItem.cs:290
+msgid "Volume Control"
+msgstr ""
+
+#: ../StandardPlugins/Sound/src/SoundDockItem.cs:297
+#, csharp-format
+msgid "Volume {0}%"
+msgstr ""
+
+#: ../StandardPlugins/Sound/src/SoundDockItem.cs:298
+msgid "Muted"
+msgstr ""
+
+#: ../StandardPlugins/Sound/src/SoundDockItem.cs:405
+msgid "Sound Preferences..."
+msgstr ""
+
+#: ../StandardPlugins/Sound/src/SoundDockItem.cs:411
+msgid "Available Outputs"
+msgstr ""
+
+#: ../StandardPlugins/Sound/src/SoundDockItem.cs:452
+msgid "Unmute"
+msgstr ""
+
+#: ../StandardPlugins/Sound/src/SoundDockItem.cs:452
+msgid "Mute"
+msgstr ""
+
 #: ../StandardPlugins/Timer/src/TimerDockItem.cs:86
 #, csharp-format
 msgid "A timer set for {0} has expired."