WindowsStore: MPfm.Library now builds correctly. However, the WinRT i…

…mplementation of DatabaseFacade is not completed yet. Related to issue #423.
ycastonguay · Sep 11, 2013 · 36f7a1f · 36f7a1f
1 parent 1c82b8c
commit 36f7a1f
Show file tree

Hide file tree

Showing 9 changed files with 395 additions and 371 deletions.
diff --git a/MPfm/MPfm.Core/MPfm.Core.WindowsStore.csproj b/MPfm/MPfm.Core/MPfm.Core.WindowsStore.csproj
@@ -35,7 +35,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\ARM\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;NETFX_CORE;WINDOWSSTORE</DefineConstants>
     <NoWarn>;2008</NoWarn>
     <DebugType>full</DebugType>
     <PlatformTarget>ARM</PlatformTarget>
@@ -57,7 +57,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;NETFX_CORE;WINDOWSSTORE</DefineConstants>
     <NoWarn>;2008</NoWarn>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
@@ -79,7 +79,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;NETFX_CORE;WINDOWSSTORE</DefineConstants>
     <NoWarn>;2008</NoWarn>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>

diff --git a/MPfm/MPfm.Library/Database/DatabaseFacade.cs b/MPfm/MPfm.Library/Database/DatabaseFacade.cs
@@ -902,8 +902,14 @@ public int GetAudioFilePlayCountFromHistory(Guid audioFileId)
             string query = "SELECT COUNT(*) FROM History WHERE AudioFileId = '" + audioFileId.ToString() + "'";
             object value = _gateway.ExecuteScalar(query);
 
-            // Check value for null
-            if (value == DBNull.Value)
+            bool isNull = false;
+            #if WINDOWSSTORE
+            isNull = value == null;
+            #else
+            isNull = value == DBNull.Value;
+            #endif
+
+            if (isNull)
             {
                 // No play count
                 return 0;
@@ -940,8 +946,13 @@ public int GetAudioFilePlayCountFromHistory(Guid audioFileId)
             string query = "SELECT TOP 1 FROM History WHERE AudioFileId = '" + audioFileId.ToString() + "' ORDER BY EventDateTime";
             object value = _gateway.ExecuteScalar(query);
 
-            // Check value for null
-            if (value == DBNull.Value)
+            bool isNull = false;
+#if WINDOWSSTORE
+            isNull = value == null;
+#else
+            isNull = value == DBNull.Value;
+#endif
+            if (isNull)
             {
                 // No last played value
                 return null;