Merge remote-tracking branch 'topfs2/gsoc_2011'

mono · Jan 17, 2012 · 68f45f4 · 68f45f4
2 parents 95eeda3 + 4dfe70d
commit 68f45f4
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 18 deletions.
diff --git a/src/Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.csproj b/src/Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.csproj
@@ -22,7 +22,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>

diff --git a/...r1/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.csproj b/...r1/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.csproj
@@ -9,7 +9,6 @@
     <OutputType>Library</OutputType>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <RootNamespace>Mono.Upnp.Dcp.MSMediaReceiverRegistrar1</RootNamespace>
-    <BaseDirectory>.</BaseDirectory>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -19,7 +18,6 @@
     <DefineConstants>DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <ConsolePause>false</ConsolePause>
     <AssemblyName>Mono.Upnp.Dcp.MSMediaReceiverRegistrar1</AssemblyName>
   </PropertyGroup>

diff --git a/...rver1.FileSystem.ConsoleServer/Mono.Upnp.Dcp.MediaServer1.FileSystem.ConsoleServer.csproj b/...rver1.FileSystem.ConsoleServer/Mono.Upnp.Dcp.MediaServer1.FileSystem.ConsoleServer.csproj
@@ -19,7 +19,6 @@
     <DefineConstants>DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <Commandlineparameters>-f "mac2: upnp" -n "Windows Media Connect" "/Users/lunchtimemama/Music/Rdio Downloads"</Commandlineparameters>
     <Externalconsole>true</Externalconsole>
     <EnvironmentVariables>

diff --git a/...erver1/Mono.Upnp.Dcp.MediaServer1.FileSystem/Mono.Upnp.Dcp.MediaServer1.FileSystem.csproj b/...erver1/Mono.Upnp.Dcp.MediaServer1.FileSystem/Mono.Upnp.Dcp.MediaServer1.FileSystem.csproj
@@ -22,7 +22,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>

diff --git a/...diaServer1.FileSystem/Mono.Upnp.Dcp.MediaServer1.FileSystem/FileSystemContentDirectory.cs b/...diaServer1.FileSystem/Mono.Upnp.Dcp.MediaServer1.FileSystem/FileSystemContentDirectory.cs
@@ -156,7 +156,7 @@ protected static int VisitResults<T> (Action<T> consumer, IList<T> objects, int
                 throw new ArgumentNullException ("objects");
             }
 
-            var endIndex = System.Math.Min (startIndex + requestCount, objects.Count);
+            var endIndex = requestCount > 0 ? System.Math.Min (startIndex + requestCount, objects.Count) : objects.Count;
             for (var i = startIndex; i < endIndex; i++) {
                 consumer (objects[i]);
             }

diff --git a/...p.Dcp.MediaServer1.GtkClient/Mono.Upnp.Dcp.MediaServer1.GtkClient/ContentDirectoryInfo.cs b/...p.Dcp.MediaServer1.GtkClient/Mono.Upnp.Dcp.MediaServer1.GtkClient/ContentDirectoryInfo.cs
@@ -168,7 +168,7 @@ void HandleObjectsSelectionChanged (object sender, EventArgs e)
         }
     }
 
-    struct ItemRow
+    class ItemRow
     {
         public ItemRow (Item item, TreePath path)
         {

diff --git a/...rver1/Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.ContentDirectory1/Resource.cs b/...rver1/Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.ContentDirectory1/Resource.cs
@@ -98,7 +98,7 @@ public ResourceOptions GetOptions ()
         [XmlAttribute ("bitrate", OmitIfNull = true)]
         public virtual uint? BitRate { get; protected set; }
 
-        [XmlAttribute ("samplyFrequency", OmitIfNull = true)]
+        [XmlAttribute ("sampleFrequency", OmitIfNull = true)]
         public virtual uint? SampleFrequency { get; protected set; }
 
         [XmlAttribute ("bitsPerSample", OmitIfNull = true)]
@@ -107,7 +107,7 @@ public ResourceOptions GetOptions ()
         [XmlAttribute ("nrAudioChannels", OmitIfNull = true)]
         public virtual uint? NrAudioChannels { get; protected set; }
 
-        [XmlAttribute ("resolution", OmitIfNull = true)]
+        //[XmlAttribute ("resolution", OmitIfNull = true)]
         public virtual Resolution? Resolution { get; protected set; }
 
         [XmlAttribute ("colorDepth", OmitIfNull = true)]

diff --git a/...p/Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.csproj b/...p/Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.csproj
@@ -22,7 +22,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>

diff --git a/src/Mono.Upnp/Mono.Upnp.GtkClient/Mono.Upnp.GtkClient.csproj b/src/Mono.Upnp/Mono.Upnp.GtkClient/Mono.Upnp.GtkClient.csproj
@@ -19,7 +19,6 @@
     <DefineConstants>DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <EnvironmentVariables>
       <EnvironmentVariables>
         <Variable name="MONO_UPNP_DEBUG" value="TRUE" />

diff --git a/src/Mono.Upnp/Mono.Upnp/Mono.Upnp.Xml.Compilation/DelegateDeserializationCompiler.cs b/src/Mono.Upnp/Mono.Upnp/Mono.Upnp.Xml.Compilation/DelegateDeserializationCompiler.cs
@@ -93,22 +93,35 @@ protected override Deserializer CreateDeserializer ()
                 return context => context.Reader.ReadElementContentAsString ();
             } else if (Type == typeof (int)) {
                 return context => context.Reader.ReadElementContentAsInt ();
+            } else if (Type == typeof (uint)) {
+                return context => uint.Parse (context.Reader.ReadElementContentAsString ());
             } else if (Type == typeof (double)) {
                 return context => context.Reader.ReadElementContentAsDouble ();
             } else if (Type == typeof (bool)) {
                 return context => context.Reader.ReadElementContentAsBoolean ();
             } else if (Type == typeof (long)) {
                 return context => context.Reader.ReadElementContentAsLong ();
+            } else if (Type == typeof (ulong)) {
+                return context => ulong.Parse (context.Reader.ReadElementContentAsString ());
             } else if (Type == typeof (float)) {
                 return context => context.Reader.ReadElementContentAsFloat ();
             } else if (Type == typeof (decimal)) {
                 return context => context.Reader.ReadElementContentAsDecimal ();
             } else if (Type == typeof (DateTime)) {
                 return context => context.Reader.ReadElementContentAsDateTime ();
+            } else if (Type == typeof (TimeSpan)) {
+                return context => TimeSpan.Parse (context.Reader.ReadElementContentAsString ());
             } else if (Type == typeof (Uri)) {
                 return context => {
                     var url = context.Reader.ReadElementContentAsString ();
-                    return url.Length == 0 ? null : new Uri (url);
+                    if (url.Length != 0) {
+                        try {
+                            Uri uri = new Uri (url);
+                            return uri;
+                        } catch (Exception e) {
+                        }
+                    }
+                    return null;
                 };
             } else if (Type.IsEnum) {
                 var map = GetEnumMap (Type);
@@ -397,20 +410,36 @@ static Deserializer CreateAttributeDeserializer (Type type)
                 return context => context.Reader.ReadContentAsString ();
             } else if (type == typeof (int)) {
                 return context => context.Reader.ReadContentAsInt ();
+            } else if (type == typeof (uint)) {
+                return context => uint.Parse (context.Reader.ReadContentAsString ());
             } else if (type == typeof (double)) {
                 return context => context.Reader.ReadContentAsDouble ();
             } else if (type == typeof (bool)) {
                 return context => context.Reader.ReadContentAsBoolean ();
             } else if (type == typeof (long)) {
                 return context => context.Reader.ReadContentAsLong ();
+            } else if (type == typeof (ulong)) {
+                return context => ulong.Parse (context.Reader.ReadContentAsString ());
             } else if (type == typeof (float)) {
                 return context => context.Reader.ReadContentAsFloat ();
             } else if (type == typeof (decimal)) {
                 return context => context.Reader.ReadContentAsDecimal ();
             } else if (type == typeof (DateTime)) {
                 return context => context.Reader.ReadContentAsDateTime ();
+            } else if (type == typeof (TimeSpan)) {
+                return context => TimeSpan.Parse (context.Reader.ReadContentAsString ());
             } else if (type == typeof (Uri)) {
-                return context => new Uri (context.Reader.ReadContentAsString ());
+                return context => {
+                    var url = context.Reader.ReadContentAsString ();
+                    if (url.Length != 0) {
+                        try {
+                            Uri uri = new Uri (url);
+                            return uri;
+                        } catch (Exception e) {
+                        }
+                    }
+                    return null;     
+                };
             } else if (type.IsEnum) {
                 var map = GetEnumMap (type);
                 return context => map[context.Reader.ReadContentAsString ()];

diff --git a/src/Mono.Upnp/Mono.Upnp/Mono.Upnp.csproj b/src/Mono.Upnp/Mono.Upnp/Mono.Upnp.csproj
@@ -22,7 +22,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>

diff --git a/tests/Mono.Ssdp.Tests/Mono.Ssdp.Tests.csproj b/tests/Mono.Ssdp.Tests/Mono.Ssdp.Tests.csproj
@@ -19,7 +19,6 @@
     <DefineConstants>DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>

diff --git a/...Upnp.Dcp.MediaServer1.FileSystem.Tests/Mono.Upnp.Dcp.MediaServer1.FileSystem.Tests.csproj b/...Upnp.Dcp.MediaServer1.FileSystem.Tests/Mono.Upnp.Dcp.MediaServer1.FileSystem.Tests.csproj
@@ -19,7 +19,6 @@
     <DefineConstants>DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>

diff --git a/tests/Mono.Upnp.Dcp.MediaServer1.Tests/Mono.Upnp.Dcp.MediaServer1.Tests.csproj b/tests/Mono.Upnp.Dcp.MediaServer1.Tests/Mono.Upnp.Dcp.MediaServer1.Tests.csproj
@@ -21,7 +21,6 @@
     <DefineConstants>DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>

diff --git a/tests/Mono.Upnp.Tests/Mono.Upnp.Tests.csproj b/tests/Mono.Upnp.Tests/Mono.Upnp.Tests.csproj
@@ -20,7 +20,6 @@
     <DefineConstants>DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>