Changeset 141 for trunk/sonorous/uk.co.matbooth.sonorous/src/uk/co/matbooth/sonorous/zones/Zone.java

Timestamp:

31/12/09 02:27:54 (8 months ago)

Author:

mbooth

Message:

Sonorous now responds to its first UPnP event -- changing the zone name on another controller is reflected in Sonorous! Hurray!

Files:

• trunk/sonorous/uk.co.matbooth.sonorous/src/uk/co/matbooth/sonorous/zones/Zone.java (modified) (5 diffs)

trunk/sonorous/uk.co.matbooth.sonorous/src/uk/co/matbooth/sonorous/zones/Zone.java

@@ -8 +8 @@
 package uk.co.matbooth.sonorous.zones;
 
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
 import java.util.ArrayList;
 import java.util.Dictionary;
@@ -22 +24 @@
  */
 public class Zone implements UPnPEventListener {
+    private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
+
+    /**
+     * The device tree this zone is based on.
+     */
     private final DeviceNode rootNode;
 
     /**
-     * List of all the services we want to subscribe to.
+     * List of all the services provided by the device tree that we want to
+     * subscribe to.
      */
     private static final String SERVICES[] = { "urn:upnp-org:serviceId:DeviceProperties",
-            "urn:upnp-org:serviceId:ZoneGroupTopology", };
+//          "urn:upnp-org:serviceId:ZoneGroupTopology", // TODO
+    };
 
     /**
@@ -36 +45 @@
     private final List<String[]> subscriptions = new ArrayList<String[]>();
 
+    private String zoneName = "";
+
     public Zone(DeviceNode device) {
         rootNode = device;
@@ -42 +53 @@
     public String getRootUDN() {
         return rootNode.getUDN();
+    }
+
+    public String getZoneName() {
+        return zoneName;
     }
 
@@ -62 +77 @@
     }
 
+    /**
+     * Implement UPnPEventListener. Update the zone's properties and fire off
+     * property change events.
+     */
     public void notifyUPnPEvent(String deviceId, String serviceId, Dictionary events) {
-        Enumeration en = events.keys();
-        System.out.println();
-        System.out.println("Event!");
-        System.out.println("UDN: " + deviceId);
-        System.out.println("ServiceID: " + serviceId);
-        for (; en.hasMoreElements();) {
-            String ssvName = (String) en.nextElement();
-            Object value = events.get(ssvName);
-            System.out.println("Variable: " + ssvName + " = " + value);
+        if (serviceId.equals("urn:upnp-org:serviceId:DeviceProperties")) {
+            for (Enumeration<String> keys = events.keys(); keys.hasMoreElements();) {
+                String key = keys.nextElement();
+                if (key.equals("ZoneName"))
+                    pcs.firePropertyChange(key, zoneName, zoneName = (String) events
+                            .get(key));
+            }
+            // return;
+        }
+        if (serviceId.equals("urn:upnp-org:serviceId:ZoneGroupTopology")) {
+            for (Enumeration<String> keys = events.keys(); keys.hasMoreElements();) {
+
+            }
+            // return;
         }
     }
+
+    /**
+     * Adds a listener to receive property change events from this zone.
+     * 
+     * @param listener
+     *            a PropertyChangeListener implementation
+     */
+    public void addPropertyChangeListener(PropertyChangeListener listener) {
+        pcs.addPropertyChangeListener(listener);
+    }
+
+    /**
+     * Removes the specified listener so that it no longer receives property
+     * change events from this zone.
+     * 
+     * @param listener
+     *            a PropertyChangeListener implementation
+     */
+    public void removePropertyChangeListener(PropertyChangeListener listener) {
+        pcs.removePropertyChangeListener(listener);
+    }
+
 }