Adapt to undocumented hack (passing 0:0 in tv to mean "now") that probably got introd...

[catta] / avahi-sharp / ServiceTypeBrowser.cs

diff --git a/avahi-sharp/ServiceTypeBrowser.cs b/avahi-sharp/ServiceTypeBrowser.cs
index ab6a8668183d852a84ab0aa7997c084d09f350b5..754b9b151066e7769711583a7805e95b9949fd26 100644 (file)
--- a/avahi-sharp/ServiceTypeBrowser.cs
+++ b/avahi-sharp/ServiceTypeBrowser.cs
@@ -26,7 +26,8 @@ using System.Runtime.InteropServices;
 namespace Avahi
 {
     internal delegate void ServiceTypeBrowserCallback (IntPtr browser, int iface, Protocol proto, BrowserEvent bevent,
-                                                       IntPtr type, IntPtr domain, IntPtr userdata);
+                                                       IntPtr type, IntPtr domain, LookupResultFlags flags,
+                                                       IntPtr userdata);
     
     public struct ServiceTypeInfo
     {
@@ -34,11 +35,12 @@ namespace Avahi
         public Protocol Protocol;
         public string Domain;
         public string ServiceType;
+        public LookupResultFlags Flags;
     }
 
     public delegate void ServiceTypeInfoHandler (object o, ServiceTypeInfo info);
     
-    public class ServiceTypeBrowser : IDisposable
+    public class ServiceTypeBrowser : BrowserBase, IDisposable
     {
         private IntPtr handle;
         private ArrayList infos = new ArrayList ();
@@ -46,6 +48,7 @@ namespace Avahi
         private int iface;
         private Protocol proto;
         private string domain;
+        private LookupFlags flags;
         private ServiceTypeBrowserCallback cb;
 
         private ArrayList addListeners = new ArrayList ();
@@ -53,7 +56,8 @@ namespace Avahi
         
         [DllImport ("avahi-client")]
         private static extern IntPtr avahi_service_type_browser_new (IntPtr client, int iface, int proto,
-                                                                     IntPtr domain, ServiceTypeBrowserCallback cb,
+                                                                     IntPtr domain, LookupFlags flags,
+                                                                     ServiceTypeBrowserCallback cb,
                                                                      IntPtr userdata);
 
         [DllImport ("avahi-client")]
@@ -92,16 +96,18 @@ namespace Avahi
         {
         }
 
-        public ServiceTypeBrowser (Client client, string domain) : this (client, -1, Protocol.Unspecified, domain)
+        public ServiceTypeBrowser (Client client, string domain) : this (client, -1, Protocol.Unspecified,
+                                                                         domain, LookupFlags.None)
         {
         }
-        
-        public ServiceTypeBrowser (Client client, int iface, Protocol proto, string domain)
+
+        public ServiceTypeBrowser (Client client, int iface, Protocol proto, string domain, LookupFlags flags)
         {
             this.client = client;
             this.iface = iface;
             this.proto = proto;
             this.domain = domain;
+            this.flags = flags;
             cb = OnServiceTypeBrowserCallback;
         }
 
@@ -123,7 +129,7 @@ namespace Avahi
 
             lock (client) {
                 IntPtr domainPtr = Utility.StringToPtr (domain);
-                handle = avahi_service_type_browser_new (client.Handle, iface, (int) proto, domainPtr,
+                handle = avahi_service_type_browser_new (client.Handle, iface, (int) proto, domainPtr, flags,
                                                          cb, IntPtr.Zero);
                 Utility.Free (domainPtr);
             }
@@ -142,7 +148,8 @@ namespace Avahi
         }
 
         private void OnServiceTypeBrowserCallback (IntPtr browser, int iface, Protocol proto, BrowserEvent bevent,
-                                                   IntPtr type, IntPtr domain, IntPtr userdata)
+                                                   IntPtr type, IntPtr domain, LookupResultFlags flags,
+                                                   IntPtr userdata)
         {
 
             ServiceTypeInfo info;
@@ -150,19 +157,26 @@ namespace Avahi
             info.Protocol = proto;
             info.Domain = Utility.PtrToString (domain);
             info.ServiceType = Utility.PtrToString (type);
+            info.Flags = flags;
 
             infos.Add (info);
-            
-            if (bevent == BrowserEvent.Added) {
+
+            switch (bevent) {
+            case BrowserEvent.Added:
                 infos.Add (info);
 
                 foreach (ServiceTypeInfoHandler handler in addListeners)
                     handler (this, info);
-            } else {
+                break;
+            case BrowserEvent.Removed:
                 infos.Remove (info);
 
                 foreach (ServiceTypeInfoHandler handler in removeListeners)
                     handler (this, info);
+                break;
+            default:
+                EmitBrowserEvent (bevent);
+                break;
             }
         }
     }