Switching schema URI for RenderingControl, rollback Volume max value

jeraymond · Dec 18, 2012 · 6feb062 · 6feb062
1 parent afb0a7d
commit 6feb062
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/...ain/java/org/fourthline/cling/support/renderingcontrol/AbstractAudioRenderingControl.java b/...ain/java/org/fourthline/cling/support/renderingcontrol/AbstractAudioRenderingControl.java
@@ -64,7 +64,7 @@
                 sendEvents = false,
                 datatype = "ui2",
                 allowedValueMinimum = 0,
-                allowedValueMaximum = 15),
+                allowedValueMaximum = 100),
         @UpnpStateVariable(
                 name = "VolumeDB",
                 sendEvents = false,

diff --git a/...ourthline/cling/support/renderingcontrol/lastchange/RenderingControlLastChangeParser.java b/...ourthline/cling/support/renderingcontrol/lastchange/RenderingControlLastChangeParser.java
@@ -30,18 +30,9 @@
  */
 public class RenderingControlLastChangeParser extends LastChangeParser {
 
-    /*
-        TODO: UPNP VIOLATION: RenderingControl 1.0 specification schema says "/RCS" but examples
-        say "AVT_RCS", guess what most people use?
-     */
-    public static final String NAMESPACE_URI = "urn:schemas-upnp-org:metadata-1-0/AVT_RCS";
+    public static final String NAMESPACE_URI = "urn:schemas-upnp-org:metadata-1-0/RCS";
     public static final String SCHEMA_RESOURCE = "org/fourthline/cling/support/renderingcontrol/metadata-1.0-rcs.xsd";
 
-    /* TODO: Michaels changes?
-	public static final String NAMESPACE_URI = "urn:schemas-upnp-org:metadata-1-0/RCS/";
-    public static final String SCHEMA_RESOURCE = "org/teleal/cling/support/renderingcontrol/metadata-1.0-rcs.xsd";
-     */
-
     @Override
     protected String getNamespace() {
         return NAMESPACE_URI;

diff --git a/...ort/src/main/resources/org/fourthline/cling/support/renderingcontrol/metadata-1.0-rcs.xsd b/...ort/src/main/resources/org/fourthline/cling/support/renderingcontrol/metadata-1.0-rcs.xsd
@@ -2,10 +2,10 @@
 
 <!--
 TODO: UPNP VIOLATION: RenderingControl 1.0 specification schema says "/RCS" but examples
-say "AVT_RCS", guess what most people use?
+in the spec say "AVT_RCS". We had /AVT_RCS, now we have /RCS, let's see who complains.
 -->
-<xsd:schema targetNamespace="urn:schemas-upnp-org:metadata-1-0/AVT_RCS"
-            xmlns:rcs="urn:schemas-upnp-org:metadata-1-0/AVT_RCS"
+<xsd:schema targetNamespace="urn:schemas-upnp-org:metadata-1-0/RCS"
+            xmlns:rcs="urn:schemas-upnp-org:metadata-1-0/RCS"
             xmlns:xsd="http://www.w3.org/2001/XMLSchema"
             elementFormDefault="qualified"
             attributeFormDefault="unqualified">