MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-11-10 14:09:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

Wire up DAAP support

Browse Source
This commit is contained in:
Julien BLACHE
2009-04-28 17:52:11 +02:00
parent 00876facde
commit c071a58c3c
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/httpd.c
View File

@@ -41,6 +41,7 @@
#include "conffile.h" #include "conffile.h"
#include "httpd.h" #include "httpd.h"
#include "httpd_rsp.h" #include "httpd_rsp.h"
#include "httpd_daap.h"
/* /*
@@ -564,6 +565,13 @@ webface_cb(struct evhttp_request *req, void *arg)
{ {
rsp_request(req); rsp_request(req);
free(uri);
return;
}
else if (daap_is_request(req, uri))
{
daap_request(req);
free(uri); free(uri);
return; return;
} }
@@ -613,6 +621,14 @@ httpd_init(void)
return -1; return -1;
} }
ret = daap_init();
if (ret < 0)
{
DPRINTF(E_FATAL, L_HTTPD, "DAAP protocol init failed\n");
goto daap_fail;
}
ret = pipe2(exit_pipe, O_CLOEXEC); ret = pipe2(exit_pipe, O_CLOEXEC);
if (ret < 0) if (ret < 0)
{ {
@@ -680,6 +696,8 @@ httpd_init(void)
close(exit_pipe[0]); close(exit_pipe[0]);
close(exit_pipe[1]); close(exit_pipe[1]);
pipe_fail: pipe_fail:
daap_deinit();
daap_fail:
rsp_deinit(); rsp_deinit();
return -1; return -1;
@@ -709,6 +727,7 @@ httpd_deinit(void)
} }
rsp_deinit(); rsp_deinit();
daap_deinit();
close(exit_pipe[0]); close(exit_pipe[0]);
close(exit_pipe[1]); close(exit_pipe[1]);