MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-04-03 03:10:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Various win32 fixes

Browse Source
This commit is contained in:
Ron Pedde 2006-10-04 04:33:27 +00:00
parent 5509a8cffd
commit 4a9d8993b3
8 changed files with 303 additions and 6 deletions

14
src/plugins/out-daap.c

@ -42,6 +42,8 @@
#include "out-daap.h" #include "out-daap.h"
#include "out-daap-proto.h" #include "out-daap-proto.h"
#undef strsep /* FIXME */
/** /**
* Hold the inf for the output serializer * Hold the inf for the output serializer
*/ */
@ -235,6 +237,14 @@ void out_daap_cleanup(PRIVINFO *ppi) {
free(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 * 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")); tempstring=strdup(_ppi->ws_getvar(pwsc,"dmap.itemid"));
current=(unsigned char*)tempstring; current=(unsigned char*)tempstring;
while((token=strsep((char**)(char*)&current,","))) { while((token=_strsep((char**)(char*)&current,","))) {
if(token) { if(token) {
/* FIXME: error handling */ /* FIXME: error handling */
_ppi->db_add_playlist_item(NULL,playlist_id,atoi(token)); _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; current=(unsigned char *)tempstring;
/* this looks strange, but gets rid of gcc 4 warnings */ /* this looks strange, but gets rid of gcc 4 warnings */
while((token=strsep((char**)(char*)&current,","))) { while((token=_strsep((char**)(char*)&current,","))) {
if(token) { if(token) {
/* FIXME: Error handling */ /* FIXME: Error handling */
_ppi->db_delete_playlist_item(NULL,playlist_id,atoi(token)); _ppi->db_delete_playlist_item(NULL,playlist_id,atoi(token));

1
src/plugins/ssc-wma.cpp

@ -89,7 +89,6 @@ PLUGIN_INFO _pi = {
PLUGIN_VERSION, /* version */ PLUGIN_VERSION, /* version */
PLUGIN_TRANSCODE, /* type */ PLUGIN_TRANSCODE, /* type */
"ssc-wma/" VERSION, /* server */ "ssc-wma/" VERSION, /* server */
NULL, /* url */
NULL, /* output fns */ NULL, /* output fns */
NULL, /* event fns */ NULL, /* event fns */
&_ptfn, /* fns */ &_ptfn, /* fns */

8
win32/mt-daapd.sln

@ -23,6 +23,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssc-wma", "ssc-wma\ssc-wma.
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
EndProjectSection EndProjectSection
EndProject 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 Global
GlobalSection(SolutionConfiguration) = preSolution GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug Debug = Debug
@ -53,6 +57,10 @@ Global
{C1EF5133-DFB3-4FEC-B999-3655DBB14785}.Debug.Build.0 = Debug|Win32 {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.ActiveCfg = Release|Win32
{C1EF5133-DFB3-4FEC-B999-3655DBB14785}.Release.Build.0 = 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 EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection EndGlobalSection

3
win32/mt-daapd.vcproj

@ -147,9 +147,6 @@
<File <File
RelativePath="..\src\db-sql.c"> RelativePath="..\src\db-sql.c">
</File> </File>
<File
RelativePath="..\src\dispatch.c">
</File>
<File <File
RelativePath="..\src\dynamic-art.c"> RelativePath="..\src\dynamic-art.c">
</File> </File>

4
win32/out-daap/out-daap.def Normal file

@ -0,0 +1,4 @@
LIBRARY out-daap
EXPORTS
plugin_info

103
win32/out-daap/out-daap.rc.templ Normal file

@ -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

162
win32/out-daap/out-daap.vcproj Normal file

@ -0,0 +1,162 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="7.10"
Name="out-daap"
ProjectGUID="{C1EF5133-DFB3-4FEC-B999-3655DBB14786}"
Keyword="Win32Proj">
<Platforms>
<Platform
Name="Win32"/>
</Platforms>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="..\Debug"
IntermediateDirectory="Debug"
ConfigurationType="2"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..;..\..\src"
PreprocessorDefinitions="HAVE_CONFIG_H"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="4"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)/out-daap.dll"
LinkIncremental="2"
ModuleDefinitionFile="out-daap.def"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/out-daap.pdb"
SubSystem="2"
ImportLibrary="$(OutDir)/out-daap.lib"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="..\Release"
IntermediateDirectory="Release"
ConfigurationType="2"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..;..\..\src"
PreprocessorDefinitions="HAVE_CONFIG_H"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)/out-daap.dll"
LinkIncremental="1"
ModuleDefinitionFile="out-daap.def"
GenerateDebugInformation="TRUE"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/out-daap.lib"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="">
<File
RelativePath="..\..\src\plugins\compat.c">
</File>
<File
RelativePath="..\..\src\plugins\out-daap-db.c">
</File>
<File
RelativePath="..\..\src\plugins\out-daap-proto.c">
</File>
<File
RelativePath="..\..\src\plugins\out-daap.c">
</File>
<File
RelativePath=".\out-daap.def">
</File>
</Filter>
<Filter
Name="Header Files"
Filter="">
<File
RelativePath="..\..\src\plugins\out-daap-db.h">
</File>
<File
RelativePath="..\..\src\plugins\out-daap-proto.h">
</File>
<File
RelativePath="..\..\src\plugins\out-daap.h">
</File>
<File
RelativePath=".\resource.h">
</File>
</Filter>
<Filter
Name="Resource Files"
Filter="">
<File
RelativePath=".\out-daap.rc">
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

14
win32/out-daap/resource.h Normal file

@ -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