[banshee/windows] #ifdef out parts of libbanshee that the Windows compiler doesn't like. Add System.Core ref to Hyena



commit 1e77d9a7dbbd5fde2c8f6ff25a176e0574337a8b
Author: Gabriel Burt <gabriel burt gmail com>
Date:   Fri May 1 13:53:24 2009 -0500

    #ifdef out parts of libbanshee that the Windows compiler doesn't like.  Add System.Core ref to Hyena
---
 libbanshee/banshee-player-equalizer.c |    3 +++
 libbanshee/banshee-player-private.h   |    5 +++++
 src/Libraries/Hyena/Hyena.csproj      |    5 ++++-
 3 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/libbanshee/banshee-player-equalizer.c b/libbanshee/banshee-player-equalizer.c
index 79fc4ea..9e28d6d 100644
--- a/libbanshee/banshee-player-equalizer.c
+++ b/libbanshee/banshee-player-equalizer.c
@@ -71,12 +71,15 @@ _bp_equalizer_new (BansheePlayer *player)
                 return equalizer;
             }
             
+// TODO Windows compiler doesn't like this, I'm unsure why
+#ifndef WIN32
             GstElementFactory *efactory = gst_element_get_factory (equalizer);
             if (gst_plugin_feature_check_version (GST_PLUGIN_FEATURE (efactory), 0, 10, 9)) {
                 bp_debug ("Using system (gst-plugins-good) equalizer element");
                 player->equalizer_status = BP_EQ_STATUS_USE_SYSTEM;
                 return equalizer;
             }
+#endif
             
             bp_debug ("Buggy system equalizer found. gst-plugins-good 0.10.9 or better "
                 "required, or build Banshee with the built-in equalizer.");
diff --git a/libbanshee/banshee-player-private.h b/libbanshee/banshee-player-private.h
index 9ebdde6..d2a4334 100644
--- a/libbanshee/banshee-player-private.h
+++ b/libbanshee/banshee-player-private.h
@@ -64,7 +64,12 @@
 #define IS_BANSHEE_PLAYER(e) (e != NULL)
 #define SET_CALLBACK(cb_name) { if(player != NULL) { player->cb_name = cb; } }
 
+#ifdef WIN32
+// TODO Windows doesn't like the ... varargs
+#define bp_debug(x)
+#else
 #define bp_debug(x...) banshee_log_debug ("player", x)
+#endif
 
 typedef struct BansheePlayer BansheePlayer;
 
diff --git a/src/Libraries/Hyena/Hyena.csproj b/src/Libraries/Hyena/Hyena.csproj
index 2c47c68..3c3ab4e 100644
--- a/src/Libraries/Hyena/Hyena.csproj
+++ b/src/Libraries/Hyena/Hyena.csproj
@@ -10,7 +10,7 @@
     <AssemblyName>Hyena</AssemblyName>
     <SchemaVersion>2.0</SchemaVersion>
     <SourceAnalysisOverrideSettingsFile>C:\Documents and Settings\Administrator\Application Data\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
     <NoStdLib>False</NoStdLib>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
@@ -164,6 +164,9 @@
       <HintPath>..\..\..\winbin\MonoPosixHelper.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]