From e7d04dbd6b850f1deaaa34ad4836fe9317ecbc2e Mon Sep 17 00:00:00 2001
From: Ron Pedde <ron@pedde.com>
Date: Sun, 28 May 2006 06:36:28 +0000
Subject: [PATCH] Add support for flac metatag reading and playback on win32.

---
 src/scan-flac.c              |  7 +++++--
 win32/mt-daapd.vcproj        | 11 +++++++----
 win32/nsi/mt-daapd.nsi.templ |  2 ++
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/scan-flac.c b/src/scan-flac.c
index 4355228d..8268eb3d 100644
--- a/src/scan-flac.c
+++ b/src/scan-flac.c
@@ -33,9 +33,12 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <netinet/in.h>  /* htons and friends */
+#ifndef WIN32
+# include <netinet/in.h>  /* htons and friends */
+# include <dirent.h>      /* why here?  For osx 10.2, of course! */
+#endif
+
 #include <sys/stat.h>
-#include <dirent.h>      /* why here?  For osx 10.2, of course! */
 
 #include "restart.h"
 #include "daapd.h"
diff --git a/win32/mt-daapd.vcproj b/win32/mt-daapd.vcproj
index 24e641c1..a6e4e2b2 100644
--- a/win32/mt-daapd.vcproj
+++ b/win32/mt-daapd.vcproj
@@ -21,7 +21,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="$(InputDir),..\src,.,.."
-				PreprocessorDefinitions="HAVE_CONFIG_H;ZLIB_DLL;_WINDOWS"
+				PreprocessorDefinitions="HAVE_CONFIG_H;ZLIB_DLL;_WINDOWS;FLAC"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="5"
@@ -33,7 +33,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="zdll.lib libid3tag.lib gnu_regex.lib pthreadVC2.lib wsock32.lib sqlite3.lib sqlite.lib dnssd.lib"
+				AdditionalDependencies="zdll.lib libid3tag.lib gnu_regex.lib pthreadVC2.lib wsock32.lib sqlite3.lib sqlite.lib dnssd.lib libFLAC.lib"
 				OutputFile="$(OutDir)/mt-daapd.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
@@ -74,7 +74,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="$(InputDir),..\src,.,.."
-				PreprocessorDefinitions="HAVE_CONFIG_H;ZLIB_DLL;_WINDOWS"
+				PreprocessorDefinitions="HAVE_CONFIG_H;ZLIB_DLL;_WINDOWS;FLAC"
 				RuntimeLibrary="4"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -84,7 +84,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="zdll.lib libid3tag.lib gnu_regex.lib pthreadVC2.lib wsock32.lib sqlite3.lib sqlite.lib dnssd.lib"
+				AdditionalDependencies="zdll.lib libid3tag.lib gnu_regex.lib pthreadVC2.lib wsock32.lib sqlite3.lib sqlite.lib dnssd.lib libFLAC.lib"
 				OutputFile="$(OutDir)/mt-daapd.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
@@ -188,6 +188,9 @@
 			<File
 				RelativePath="..\src\scan-aac.c">
 			</File>
+			<File
+				RelativePath="..\src\scan-flac.c">
+			</File>
 			<File
 				RelativePath="..\src\scan-mp3.c">
 			</File>
diff --git a/win32/nsi/mt-daapd.nsi.templ b/win32/nsi/mt-daapd.nsi.templ
index 3469a945..71ed1367 100644
--- a/win32/nsi/mt-daapd.nsi.templ
+++ b/win32/nsi/mt-daapd.nsi.templ
@@ -120,6 +120,7 @@ Section "MainSection" SEC01
   File "${DLL_SOURCE}\avutil.dll"
   File "${DLL_SOURCE}\avcodec.dll"
   File "${DLL_SOURCE}\avformat.dll"
+  File "${DLL_SOURCE}\libFLAC.dll"
 
   SetOutPath "$2\plugins"
   File "${MTD_SOURCE}\rsp.dll"
@@ -409,6 +410,7 @@ Section Uninstall
   Delete "$INSTDIR\avutil.dll"
   Delete "$INSTDIR\avcodec.dll"
   Delete "$INSTDIR\avformat.dll"
+  Delete "$INSTDIR\libFLAC.dll"
   Delete "$INSTDIR\plugins\rsp.dll"
   Delete "$INSTDIR\plugins\w32-event.dll"
   Delete "$INSTDIR\plugins\ssc-ffmpeg.dll"