MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-24 06:05:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Oops... last batch of stuff that was in -pre1, but not tagged as such

Browse Source
This commit is contained in:
Ron Pedde 2004-10-25 03:15:35 +00:00
parent ecb1d762d2
commit 8af2421541
6 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
admin-root/config.html
View File

@ -56,6 +56,11 @@ take effect.
<TD>Rescan Interval</TD> <TD>Rescan Interval</TD>
<TD><INPUT TYPE="TEXT" @READONLY@ NAME="RESCAN_INTERVAL" VALUE="@RESCAN_INTERVAL@"></TD> <TD><INPUT TYPE="TEXT" @READONLY@ NAME="RESCAN_INTERVAL" VALUE="@RESCAN_INTERVAL@"></TD>
</TR> </TR>
<TR>
<TD>Process .m3u Files</TD>
<TD><INPUT TYPE="TEXT" @READONLY@ NAME="PROCESS_M3U" VALUE="@PROCESS_M3U@"></TD>
</TR>
</TABLE> </TABLE>
<INPUT TYPE="SUBMIT" NAME="SUBMIT" VALUE="Submit"> <INPUT TYPE="SUBMIT" NAME="SUBMIT" VALUE="Submit">
</FORM> </FORM>

2
configure.in
View File

@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_INIT(config.h.in) AC_INIT(config.h.in)
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(mt-daapd,0.2.1-cvs) AM_INIT_AUTOMAKE(mt-daapd,0.2.1-pre1)
dnl Checks for programs. dnl Checks for programs.
AC_PROG_CC AC_PROG_CC

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
mt-daapd (0.2.1-pre1) unstable; urgency=low
* Add support for background filesystem scans
* More aac and id3 tags
* Various bug fixes
-- Ron Pedde <ron@pedde.com> Sat, 23 Oct 2004 19:10:00 -0500
mt-daapd (0.2.0) unstable; urgency=low mt-daapd (0.2.0) unstable; urgency=low
* Add gdbm database * Add gdbm database
* Add support for .m4a and .m4p * Add support for .m4a and .m4p

3
src/configfile.c
View File

@ -95,6 +95,7 @@ CONFIGELEMENT config_elements[] = {
#endif #endif
{ 1,1,0,CONFIG_TYPE_STRING,"servername",(void*)&config.servername,config_emit_string }, { 1,1,0,CONFIG_TYPE_STRING,"servername",(void*)&config.servername,config_emit_string },
{ 1,0,0,CONFIG_TYPE_INT,"rescan_interval",(void*)&config.rescan_interval,config_emit_int }, { 1,0,0,CONFIG_TYPE_INT,"rescan_interval",(void*)&config.rescan_interval,config_emit_int },
{ 1,0,0,CONFIG_TYPE_INT,"process_m3u",(void*)&config.rescan_interval,config_emit_int },
{ 1,0,0,CONFIG_TYPE_STRING,"playlist",(void*)&config.playlist,config_emit_string }, { 1,0,0,CONFIG_TYPE_STRING,"playlist",(void*)&config.playlist,config_emit_string },
{ 1,0,0,CONFIG_TYPE_STRING,"extensions",(void*)&config.extensions,config_emit_string }, { 1,0,0,CONFIG_TYPE_STRING,"extensions",(void*)&config.extensions,config_emit_string },
{ 1,0,0,CONFIG_TYPE_STRING,"password",(void*)&config.readpassword, config_emit_string }, { 1,0,0,CONFIG_TYPE_STRING,"password",(void*)&config.readpassword, config_emit_string },
@ -169,6 +170,7 @@ int config_read(char *file) {
config.artfilename=NULL; config.artfilename=NULL;
config.logfile=NULL; config.logfile=NULL;
config.rescan_interval=0; config.rescan_interval=0;
config.process_m3u=0;
/* DWB: use alloced space so it can be freed without errors */ /* DWB: use alloced space so it can be freed without errors */
config.extensions=strdup(".mp3"); config.extensions=strdup(".mp3");
@ -312,6 +314,7 @@ int config_write(WS_CONNINFO *pwsc) {
fprintf(configfile,"extensions\t%s\n",ws_getvar(pwsc,"extensions")); fprintf(configfile,"extensions\t%s\n",ws_getvar(pwsc,"extensions"));
fprintf(configfile,"db_dir\t\t%s\n",ws_getvar(pwsc,"db_dir")); fprintf(configfile,"db_dir\t\t%s\n",ws_getvar(pwsc,"db_dir"));
fprintf(configfile,"rescan_interval\t%s\n",ws_getvar(pwsc,"rescan_interval")); fprintf(configfile,"rescan_interval\t%s\n",ws_getvar(pwsc,"rescan_interval"));
fprintf(configfile,"process_m3u\t%s\n",ws_getvar(pwsc,"process_m3u"));
fclose(configfile); fclose(configfile);
return 0; return 0;

1
src/daapd.h
View File

@ -38,6 +38,7 @@ typedef struct tag_config {
char *web_root; char *web_root;
int port; int port;
int rescan_interval; int rescan_interval;
int process_m3u;
char *adminpassword; char *adminpassword;
char *readpassword; char *readpassword;
char *mp3dir; char *mp3dir;

3
src/mp3-scanner.c
View File

@ -366,7 +366,8 @@ int scan_path(char *path) {
} else { } else {
/* process the file */ /* process the file */
if(strlen(pde->d_name) > 4) { if(strlen(pde->d_name) > 4) {
if(strcasecmp(".m3u",(char*)&pde->d_name[strlen(pde->d_name) - 4]) == 0) { if((strcasecmp(".m3u",(char*)&pde->d_name[strlen(pde->d_name) - 4]) == 0) &&
config.process_m3u){
/* we found an m3u file */ /* we found an m3u file */
scan_static_playlist(path, pde, &sb); scan_static_playlist(path, pde, &sb);
} else if (strcasestr(config.extensions, } else if (strcasestr(config.extensions,