diff --git a/CREDITS b/CREDITS index 66b64bcc..af23ebb4 100644 --- a/CREDITS +++ b/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 diff --git a/admin-root/CREDITS b/admin-root/CREDITS index 1a242372..af23ebb4 100644 --- a/admin-root/CREDITS +++ b/admin-root/CREDITS @@ -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 diff --git a/admin-root/ff_logo_182.gif b/admin-root/ff_logo_182.gif new file mode 100644 index 00000000..016661fd Binary files /dev/null and b/admin-root/ff_logo_182.gif differ diff --git a/admin-root/hdr.html b/admin-root/hdr.html index b9e9a9e0..a85e1b76 100644 --- a/admin-root/hdr.html +++ b/admin-root/hdr.html @@ -1,7 +1,7 @@ - mt-daapd + Firefly Media Server @ispage config.html::@ @@ -25,8 +25,8 @@
- -mt-daap logo + +mt-daap logo
Version @VERSION@
@@ -37,7 +37,7 @@
config
status
smart
-
feedback
+
thanks
@@ -49,8 +49,9 @@
Links
-
mt-daapd home
-
mt-daapd svn
+
firefly home
+
source code
GPL license
ASPL license
diff --git a/admin-root/index.html b/admin-root/index.html index bf941cdb..a3b82af6 100644 --- a/admin-root/index.html +++ b/admin-root/index.html @@ -2,17 +2,23 @@

Welcome

-This is the administrative web interface for mt-daapd, version @version@. +This is the administrative web interface for the Firefly Media Server, +version @version@.

About

-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 -GPL License for more information. +© 2003-2006 Ron Pedde and others. See source file headers for +more information. See the link named +GPL License for more details on the +licensing of this software.

Legal Info

diff --git a/admin-root/mt-daapd.png b/admin-root/mt-daapd.png deleted file mode 100644 index b09727fc..00000000 Binary files a/admin-root/mt-daapd.png and /dev/null differ diff --git a/admin-root/smartpopup.html b/admin-root/smartpopup.html index e7c1d1db..afe9cbbc 100755 --- a/admin-root/smartpopup.html +++ b/admin-root/smartpopup.html @@ -1,7 +1,7 @@ - mt-daapd playlist wizard + firefly playlist wizard diff --git a/src/os-unix.c b/src/os-unix.c index 89ea1239..51eb0a69 100644 --- a/src/os-unix.c +++ b/src/os-unix.c @@ -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;