banshee r3231 - in trunk/musicbrainz-sharp/src/MusicBrainz: . MusicBrainz

[scottp svn gnome org]

Author: scottp
Date: Wed Feb 13 05:12:21 2008
New Revision: 3231
URL: http://svn.gnome.org/viewvc/banshee?rev=3231&view=rev

Log:
* src/MusicBrainz/MusicBrainz/MusicBrainzObject.cs,
  src/MusicBrainz/MusicBrainz/Label.cs,
  src/MusicBrainz/MusicBrainz/Release.cs,
  src/MusicBrainz/MusicBrainz/DiscLinux.cs,
  src/MusicBrainz/MusicBrainz/Track.cs,
  src/MusicBrainz/MusicBrainz/MusicBrainzItem.cs,
  src/MusicBrainz/MusicBrainz/Query.cs: More aesthetic use of
  nullable types.

Modified:
   trunk/musicbrainz-sharp/src/MusicBrainz/ChangeLog
   trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz.mdp
   trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/DiscLinux.cs
   trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Label.cs
   trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/MusicBrainzItem.cs
   trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/MusicBrainzObject.cs
   trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Query.cs
   trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Release.cs
   trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Track.cs

Modified: trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz.mdp
==============================================================================
--- trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz.mdp	(original)
+++ trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz.mdp	Wed Feb 13 05:12:21 2008
@@ -34,7 +34,7 @@
     <ProjectReference type="Gac" localcopy="True" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
     <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   </References>
-  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile.am" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../..">
+  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../..">
     <BuildFilesVar Sync="True" Name="SOURCES" />
     <DeployFilesVar />
     <ResourcesVar Name="REFERENCES" />

Modified: trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/DiscLinux.cs
==============================================================================
--- trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/DiscLinux.cs	(original)
+++ trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/DiscLinux.cs	Wed Feb 13 05:12:21 2008
@@ -52,14 +52,12 @@
             return read_toc_entry(fd, CDROMREADTOCENTRY, ref entry);
         }
         
-        [StructLayout(LayoutKind.Sequential, Pack = 0)]
         struct cdrom_tochdr
         {
             public byte cdth_trk0;
             public byte cdth_trk1;
         }
         
-        [StructLayout(LayoutKind.Sequential, Pack = 0)]
         struct cdrom_tocentry
         {
             public byte cdte_track;
@@ -69,7 +67,6 @@
             public byte cdte_datamode;
         }
         
-        [StructLayout(LayoutKind.Sequential, Pack = 0)]
         struct cdrom_multisession
         {
             public int lba;

Modified: trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Label.cs
==============================================================================
--- trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Label.cs	(original)
+++ trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Label.cs	Wed Feb 13 05:12:21 2008
@@ -61,7 +61,7 @@
                     this.type = type;
                     break;
                 }
-            return this.type.HasValue;
+            return this.type != null;
         }
 
         protected override bool HandleXml(XmlReader reader)

Modified: trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/MusicBrainzItem.cs
==============================================================================
--- trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/MusicBrainzItem.cs	(original)
+++ trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/MusicBrainzItem.cs	Wed Feb 13 05:12:21 2008
@@ -71,15 +71,15 @@
                 builder.Append("&artistid=");
                 builder.Append(artist_id);
             }
-            if(release_type.HasValue) {
+            if(release_type != null) {
                 builder.Append("&releasetypes=");
                 builder.Append(Utilities.EnumToString(release_type.Value));
             }
-            if(release_status.HasValue) {
-                builder.Append(release_type.HasValue ? "+" : "&releasetypes=");
+            if(release_status != null) {
+                builder.Append(release_type != null ? "+" : "&releasetypes=");
                 builder.Append(release_status);
             }
-            if(count.HasValue) {
+            if(count != null) {
                 builder.Append("&count=");
                 builder.Append(count.Value);
             }

Modified: trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/MusicBrainzObject.cs
==============================================================================
--- trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/MusicBrainzObject.cs	(original)
+++ trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/MusicBrainzObject.cs	Wed Feb 13 05:12:21 2008
@@ -183,9 +183,9 @@
         
         protected T GetPropertyOrDefault<T>(ref T? field_reference, T default_value) where T : struct
         {
-            if(!field_reference.HasValue)
+            if(field_reference == null)
                 LoadMissingData();
-            return field_reference.HasValue ? field_reference.Value : default_value;
+            return field_reference ?? default_value;
         }
         
         protected T GetPropertyOrNew<T>(ref T field_reference) where T : class, new()

Modified: trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Query.cs
==============================================================================
--- trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Query.cs	(original)
+++ trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Query.cs	Wed Feb 13 05:12:21 2008
@@ -63,7 +63,7 @@
         public int Count
         {
             get {
-                if(!count.HasValue && ResultsWindow == null)
+                if(count == null && ResultsWindow == null)
                     { } // just accessing ResultsWindow will give count a value
                 return count.Value;
             }

Modified: trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Release.cs
==============================================================================
--- trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Release.cs	(original)
+++ trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Release.cs	Wed Feb 13 05:12:21 2008
@@ -183,7 +183,7 @@
             string type_string = reader["type"];
             if(type_string != null) {
                 foreach(string token in type_string.Split(' ')) {
-                    if(!this.type.HasValue) {
+                    if(this.type == null) {
                         bool found = false;
                         foreach(ReleaseType type in Enum.GetValues(typeof(ReleaseType)) as ReleaseType[])
                             if(type.ToString() == token) {
@@ -202,7 +202,7 @@
                         }
                 }
             }
-            return this.type.HasValue || this.status.HasValue;
+            return this.type != null || this.status != null;
         }
 
         protected override bool HandleXml(XmlReader reader)
@@ -331,7 +331,7 @@
         int? track_number;
         internal int TrackNumber
         {
-            get { return track_number.HasValue ? track_number.Value : -1; }
+            get { return track_number != null ? track_number.Value : -1; }
         }
 
         #endregion

Modified: trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Track.cs
==============================================================================
--- trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Track.cs	(original)
+++ trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Track.cs	Wed Feb 13 05:12:21 2008
@@ -61,11 +61,11 @@
                 builder.Append("&releaseid=");
                 builder.Append(release_id);
             }
-            if(duration.HasValue) {
+            if(duration != null) {
                 builder.Append("&duration=");
                 builder.Append(duration.Value);
             }
-            if(track_number.HasValue) {
+            if(track_number != null) {
                 builder.Append("&tracknumber=");
                 builder.Append(track_number.Value);
             }