mirror of
https://github.com/owntone/owntone-server.git
synced 2024-12-24 22:25:56 -05:00
logoing changes
This commit is contained in:
parent
a1c2a47f2b
commit
ee5955cb30
10
CREDITS
10
CREDITS
@ -119,5 +119,11 @@ Patrick Kolla
|
||||
slomo (from the forums)
|
||||
* Musepack tag parsing support.
|
||||
|
||||
dtln
|
||||
* fix for newer mplayer
|
||||
Anders Betner
|
||||
* Web interface mojo -- ajaxy web config and playlist editor
|
||||
|
||||
MikeC
|
||||
* Win32 panel configurator
|
||||
|
||||
MikeK
|
||||
* OSX Preference pane/helper, and OSX packaging
|
||||
|
@ -119,3 +119,11 @@ Patrick Kolla
|
||||
slomo (from the forums)
|
||||
* Musepack tag parsing support.
|
||||
|
||||
Anders Betner
|
||||
* Web interface mojo -- ajaxy web config and playlist editor
|
||||
|
||||
MikeC
|
||||
* Win32 panel configurator
|
||||
|
||||
MikeK
|
||||
* OSX Preference pane/helper, and OSX packaging
|
||||
|
BIN
admin-root/ff_logo_182.gif
Normal file
BIN
admin-root/ff_logo_182.gif
Normal file
Binary file not shown.
After Width: | Height: | Size: 3.1 KiB |
@ -1,7 +1,7 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
|
||||
<head>
|
||||
<title>mt-daapd</title>
|
||||
<title>Firefly Media Server</title>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
||||
<link rel="stylesheet" type="text/css" href="mt-daapd.css" />
|
||||
@ispage config.html:<script type="text/javascript" src="lib-js/prototype.js"></script>:@
|
||||
@ -25,8 +25,8 @@
|
||||
<table class="main" border="0" width="100%" summary="Main navigation"><tr>
|
||||
<td class="navi">
|
||||
|
||||
<a href="http://www.mt-daapd.org/" title="link to project home">
|
||||
<img src="mt-daapd.png" width="182" height="71" alt="mt-daap logo"/>
|
||||
<a href="http://www.fireflymediaserver.org/" title="link to project home">
|
||||
<img src="ff_logo_182.gif" width="182" height="47" alt="mt-daap logo"/>
|
||||
</a>
|
||||
|
||||
<div class="ministatus">Version @VERSION@</div>
|
||||
@ -37,7 +37,7 @@
|
||||
<div class="navilink"><a class="@ispage config.html:naviselected:navi@" href="config.html">config</a></div>
|
||||
<div class="navilink"><a class="@ispage status.html:naviselected:navi@" href="status.html">status</a></div>
|
||||
<div class="navilink"><a class="@ispage smart.html:naviselected:navi@" href="smart.html">smart</a></div>
|
||||
<div class="navilink"><a class="@ispage feedback.html:naviselected:navi@" href="feedback.html">feedback</a></div>
|
||||
<!-- <div class="navilink"><a class="@ispage feedback.html:naviselected:navi@" href="feedback.html">feedback</a></div> -->
|
||||
<div class="navilink"><a class="@ispage thanks.html:naviselected:navi@" href="thanks.html">thanks</a></div>
|
||||
</div>
|
||||
|
||||
@ -49,8 +49,9 @@
|
||||
|
||||
<div class="naviheader">Links</div>
|
||||
<div class="navibox">
|
||||
<div class="navilink"><a class="navi" href="http://www.mt-daapd.org/">mt-daapd home</a></div>
|
||||
<div class="navilink"><a class="navi" href="http://svn.sourceforge.net/viewcvs.cgi/mt-daapd/">mt-daapd svn</a></div>
|
||||
<div class="navilink"><a class="navi"
|
||||
href="http://www.fireflymediaserver.org/">firefly home</a></div>
|
||||
<div class="navilink"><a class="navi" href="http://svn.sourceforge.net/viewcvs.cgi/mt-daapd/">source code</a></div>
|
||||
<div class="navilink"><a class="@ispage gpl-license.html:naviselected:navi@" href="gpl-license.html">GPL license</a></div>
|
||||
<div class="navilink"><a class="@ispage aspl-license.html:naviselected:navi@" href="aspl-license.html">ASPL license</a></div>
|
||||
</div>
|
||||
|
@ -2,17 +2,23 @@
|
||||
|
||||
<h1>Welcome</h1>
|
||||
<p class="description">
|
||||
This is the administrative web interface for mt-daapd, version @version@.
|
||||
This is the administrative web interface for the Firefly Media Server,
|
||||
version @version@.
|
||||
</p>
|
||||
|
||||
<h3>About</h3>
|
||||
<p class="description">
|
||||
mt-daapd is a multi-threaded pthreads implementation of Apple's DAAP
|
||||
server. It works for me, it might work for you, too. No promises
|
||||
though. See the section below titled "No Warranty". This work,
|
||||
Firefly is an open-source media server for the Roku SoundBridge and
|
||||
Apple iTunes. It runs on POSIX platforms as well as Win32. It supports
|
||||
server-side transcoding and other advanced features. While every effort
|
||||
is taken to ensure quality, this software is released without warranty as
|
||||
described by the GNU General Public License. See the section below
|
||||
titled "No Warranty". This work,
|
||||
although released under the GNU General Public License, is Copyright
|
||||
© 2003-2005 Ron Pedde. All Rights reserved. See the link labeled
|
||||
<a href="gpl-license.html">GPL License</a> for more information.
|
||||
© 2003-2006 Ron Pedde and others. See source file headers for
|
||||
more information. See the link named
|
||||
<a href="gpl-license.html">GPL License</a> for more details on the
|
||||
licensing of this software.
|
||||
</p>
|
||||
|
||||
<h3>Legal Info</h3>
|
||||
|
Binary file not shown.
Before Width: | Height: | Size: 17 KiB |
@ -1,7 +1,7 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
|
||||
<html>
|
||||
<head>
|
||||
<title>mt-daapd playlist wizard</title>
|
||||
<title>firefly playlist wizard</title>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
||||
<link rel="stylesheet" type="text/css" href="mt-daapd.css" />
|
||||
</head>
|
||||
|
@ -127,7 +127,7 @@ int os_init(int foreground, char *runas) {
|
||||
*/
|
||||
void os_deinit(void) {
|
||||
DPRINTF(E_LOG,L_MAIN,"Stopping signal handler\n");
|
||||
if(!pthread_kill(_os_signal_tid,SIGINT)) {
|
||||
if(!pthread_kill(_os_signal_tid,SIGTERM)) {
|
||||
pthread_join(_os_signal_tid,NULL);
|
||||
}
|
||||
}
|
||||
@ -347,6 +347,7 @@ void *_os_signal_handler(void *arg) {
|
||||
(sigaddset(&intmask, SIGCLD) == -1) ||
|
||||
(sigaddset(&intmask, SIGINT) == -1) ||
|
||||
(sigaddset(&intmask, SIGHUP) == -1) ||
|
||||
(sigaddset(&intmask, SIGTERM) == -1) ||
|
||||
(sigwait(&intmask, &sig) == -1)) {
|
||||
DPRINTF(E_FATAL,L_MAIN,"Error waiting for signals. Aborting\n");
|
||||
} else {
|
||||
@ -357,8 +358,9 @@ void *_os_signal_handler(void *arg) {
|
||||
while (wait3(&status, WNOHANG, NULL) > 0) {
|
||||
}
|
||||
break;
|
||||
case SIGTERM:
|
||||
case SIGINT:
|
||||
DPRINTF(E_LOG,L_MAIN,"Got INT signal. Notifying daap server.\n");
|
||||
DPRINTF(E_LOG,L_MAIN,"Got shutdown signal. Notifying daap server.\n");
|
||||
config.stop=1;
|
||||
return NULL;
|
||||
break;
|
||||
@ -395,7 +397,8 @@ int _os_start_signal_handler(pthread_t *handler_tid) {
|
||||
if((sigemptyset(&set) == -1) ||
|
||||
(sigaddset(&set,SIGINT) == -1) ||
|
||||
(sigaddset(&set,SIGHUP) == -1) ||
|
||||
(sigaddset(&set,SIGCLD) == -1) ||
|
||||
(sigaddset(&set,SIGCLD) == -1) ||
|
||||
(sigaddset(&set,SIGTERM) == -1) ||
|
||||
(sigprocmask(SIG_BLOCK, &set, NULL) == -1)) {
|
||||
DPRINTF(E_LOG,L_MAIN,"Error setting signal set\n");
|
||||
return -1;
|
||||
|
Loading…
Reference in New Issue
Block a user