diff --git a/src/plugins/out-daap.c b/src/plugins/out-daap.c
index ef317136..f78aac56 100644
--- a/src/plugins/out-daap.c
+++ b/src/plugins/out-daap.c
@@ -42,6 +42,8 @@
#include "out-daap.h"
#include "out-daap-proto.h"
+#undef strsep /* FIXME */
+
/**
* Hold the inf for the output serializer
*/
@@ -235,6 +237,14 @@ void out_daap_cleanup(PRIVINFO *ppi) {
free(ppi);
}
+char *_strsep(char **stringp, const char *delim) {
+ char *ret = *stringp;
+ if (ret == NULL) return(NULL); /* grrr */
+ if ((*stringp = strpbrk(*stringp, delim)) != NULL) {
+ *((*stringp)++) = '\0';
+ }
+ return(ret);
+}
/**
* Handles authentication for the daap server. This isn't the
@@ -771,7 +781,7 @@ void out_daap_addplaylistitems(WS_CONNINFO *pwsc, PRIVINFO *ppi) {
tempstring=strdup(_ppi->ws_getvar(pwsc,"dmap.itemid"));
current=(unsigned char*)tempstring;
- while((token=strsep((char**)(char*)¤t,","))) {
+ while((token=_strsep((char**)(char*)¤t,","))) {
if(token) {
/* FIXME: error handling */
_ppi->db_add_playlist_item(NULL,playlist_id,atoi(token));
@@ -846,7 +856,7 @@ void out_daap_deleteplaylistitems(WS_CONNINFO *pwsc, PRIVINFO *ppi) {
current=(unsigned char *)tempstring;
/* this looks strange, but gets rid of gcc 4 warnings */
- while((token=strsep((char**)(char*)¤t,","))) {
+ while((token=_strsep((char**)(char*)¤t,","))) {
if(token) {
/* FIXME: Error handling */
_ppi->db_delete_playlist_item(NULL,playlist_id,atoi(token));
diff --git a/src/plugins/ssc-wma.cpp b/src/plugins/ssc-wma.cpp
index 513c921a..4426f1d8 100644
--- a/src/plugins/ssc-wma.cpp
+++ b/src/plugins/ssc-wma.cpp
@@ -89,7 +89,6 @@ PLUGIN_INFO _pi = {
PLUGIN_VERSION, /* version */
PLUGIN_TRANSCODE, /* type */
"ssc-wma/" VERSION, /* server */
- NULL, /* url */
NULL, /* output fns */
NULL, /* event fns */
&_ptfn, /* fns */
diff --git a/win32/mt-daapd.sln b/win32/mt-daapd.sln
index fbb40622..7043c6c7 100644
--- a/win32/mt-daapd.sln
+++ b/win32/mt-daapd.sln
@@ -23,6 +23,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssc-wma", "ssc-wma\ssc-wma.
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "out-daap", "out-daap\out-daap.vcproj", "{C1EF5133-DFB3-4FEC-B999-3655DBB14786}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
@@ -53,6 +57,10 @@ Global
{C1EF5133-DFB3-4FEC-B999-3655DBB14785}.Debug.Build.0 = Debug|Win32
{C1EF5133-DFB3-4FEC-B999-3655DBB14785}.Release.ActiveCfg = Release|Win32
{C1EF5133-DFB3-4FEC-B999-3655DBB14785}.Release.Build.0 = Release|Win32
+ {C1EF5133-DFB3-4FEC-B999-3655DBB14786}.Debug.ActiveCfg = Debug|Win32
+ {C1EF5133-DFB3-4FEC-B999-3655DBB14786}.Debug.Build.0 = Debug|Win32
+ {C1EF5133-DFB3-4FEC-B999-3655DBB14786}.Release.ActiveCfg = Release|Win32
+ {C1EF5133-DFB3-4FEC-B999-3655DBB14786}.Release.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
diff --git a/win32/mt-daapd.vcproj b/win32/mt-daapd.vcproj
index 036ba96c..9a478e35 100644
--- a/win32/mt-daapd.vcproj
+++ b/win32/mt-daapd.vcproj
@@ -147,9 +147,6 @@
-
-
diff --git a/win32/out-daap/out-daap.def b/win32/out-daap/out-daap.def
new file mode 100644
index 00000000..55fbb8d6
--- /dev/null
+++ b/win32/out-daap/out-daap.def
@@ -0,0 +1,4 @@
+LIBRARY out-daap
+EXPORTS
+ plugin_info
+
diff --git a/win32/out-daap/out-daap.rc.templ b/win32/out-daap/out-daap.rc.templ
new file mode 100644
index 00000000..35313aed
--- /dev/null
+++ b/win32/out-daap/out-daap.rc.templ
@@ -0,0 +1,103 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+ "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+ "#include ""afxres.h""\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+ "\r\n"
+ "\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,0,$WCREV$
+ PRODUCTVERSION 1,0,0,$WCREV$
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0"
+ BEGIN
+ VALUE "Comments", "http://www.fireflymediaserver.org"
+ VALUE "CompanyName", "Ron Pedde"
+ VALUE "FileDescription", "DAAP Output Plugin"
+ VALUE "FileVersion", "1.0 svn-$WCREV$"
+ VALUE "InternalName", "out-daap"
+ VALUE "LegalCopyright", "Copyright (C) 2006 Ron Pedde"
+ VALUE "OriginalFilename", "out-daap.dll"
+ VALUE "ProductName", "Firefly Media Server"
+ VALUE "ProductVersion", "1.0 svn-$WCREV$"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
+
+#endif // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+
diff --git a/win32/out-daap/out-daap.vcproj b/win32/out-daap/out-daap.vcproj
new file mode 100644
index 00000000..70783324
--- /dev/null
+++ b/win32/out-daap/out-daap.vcproj
@@ -0,0 +1,162 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/win32/out-daap/resource.h b/win32/out-daap/resource.h
new file mode 100644
index 00000000..86393a63
--- /dev/null
+++ b/win32/out-daap/resource.h
@@ -0,0 +1,14 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by out-daap.rc
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE 101
+#define _APS_NEXT_COMMAND_VALUE 40001
+#define _APS_NEXT_CONTROL_VALUE 1001
+#define _APS_NEXT_SYMED_VALUE 101
+#endif
+#endif