MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-26 06:03:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

start of UPnP functions

Browse Source
This commit is contained in:
Ron Pedde 2007-04-13 21:37:42 +00:00
parent 9ccc48eac9
commit 1f640234f5
5 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.in
View File

@ -45,6 +45,7 @@ rend_avahi=false
db_sqlite=false db_sqlite=false
db_sqlite3=false db_sqlite3=false
use_ffmpeg=false; use_ffmpeg=false;
use_upnp=false;
STATIC_LIBS=no STATIC_LIBS=no
CPPFLAGS="${CPPFLAGS} -g -Wall" CPPFLAGS="${CPPFLAGS} -g -Wall"
@ -117,6 +118,8 @@ AC_ARG_ENABLE(gdbm,[ --enable-gdbm Enable gdbm support],
AC_ARG_ENABLE(ffmpeg,[ --enable-ffmpeg Enable ffmpeg transcode support], AC_ARG_ENABLE(ffmpeg,[ --enable-ffmpeg Enable ffmpeg transcode support],
use_ffmpeg=true;) use_ffmpeg=true;)
AC_ARG_ENABLE(upnp,[ --enable-upnp Enable upnp support],
CPPFLAGS="${CPPFLAGS} -DUPNP"; use_upnp=true;)
AC_ARG_ENABLE(mem-debug,[ --enable-mem-debug Enable memory debugging], AC_ARG_ENABLE(mem-debug,[ --enable-mem-debug Enable memory debugging],
CPPFLAGS="${CPPFLAGS} -DDEBUG_MEM") CPPFLAGS="${CPPFLAGS} -DDEBUG_MEM")
@ -131,6 +134,8 @@ AM_CONDITIONAL(COND_SQLITE,test x$db_sqlite = xtrue)
AM_CONDITIONAL(COND_SQLITE3,test x$db_sqlite3 = xtrue) AM_CONDITIONAL(COND_SQLITE3,test x$db_sqlite3 = xtrue)
AM_CONDITIONAL(COND_GDBM,test x$use_gdbm = xtrue) AM_CONDITIONAL(COND_GDBM,test x$use_gdbm = xtrue)
AM_CONDITIONAL(COND_FFMPEG,test x$use_ffmpeg = xtrue) AM_CONDITIONAL(COND_FFMPEG,test x$use_ffmpeg = xtrue)
AM_CONDITIONAL(COND_UPNP,test x$use_upnp = xtrue)
#AM_CONDITIONAL(COND_NEED_STRCASESTR,false) #AM_CONDITIONAL(COND_NEED_STRCASESTR,false)
#AM_CONDITIONAL(COND_NEED_STRSEP,false) #AM_CONDITIONAL(COND_NEED_STRSEP,false)
AC_CHECK_FUNCS(strcasestr strsep) AC_CHECK_FUNCS(strcasestr strsep)

9
src/Makefile.am
View File

@ -54,6 +54,10 @@ if COND_GDBM
GDBM=db-gdbm.c db-gdbm.h GDBM=db-gdbm.c db-gdbm.h
endif endif
if COND_UPNP
UPNP=upnp.c upnp.h
endif
wavstreamer_SOURCES = wavstreamer.c wavstreamer_SOURCES = wavstreamer.c
mt_daapd_SOURCES = main.c daapd.h rend.h uici.c uici.h webserver.c \ mt_daapd_SOURCES = main.c daapd.h rend.h uici.c uici.h webserver.c \
@ -67,7 +71,8 @@ mt_daapd_SOURCES = main.c daapd.h rend.h uici.c uici.h webserver.c \
os-unix.h os-unix.c os.h plugin.c plugin.h db-sql-updates.c \ os-unix.h os-unix.c os.h plugin.c plugin.h db-sql-updates.c \
memdebug.c memdebug.h \ memdebug.c memdebug.h \
$(PRENDSRC) $(ORENDSRC) $(HRENDSRC) $(ARENDSRC) $(OGGVORBISSRC) \ $(PRENDSRC) $(ORENDSRC) $(HRENDSRC) $(ARENDSRC) $(OGGVORBISSRC) \
$(FLACSRC) $(MUSEPACKSRC) $(SQLITEDB) $(SQLITE3DB) $(SQLDB) $(GDBM) $(FLACSRC) $(MUSEPACKSRC) $(SQLITEDB) $(SQLITE3DB) $(SQLDB) $(GDBM) \
$(UPNP)
EXTRA_DIST = rend-howl.c rend-posix.c rend-osx.c scan-mpc.c \ EXTRA_DIST = rend-howl.c rend-posix.c rend-osx.c scan-mpc.c \
scan-ogg.c scan-flac.c db-sql.c db-sql.h \ scan-ogg.c scan-flac.c db-sql.c db-sql.h \
@ -75,4 +80,4 @@ EXTRA_DIST = rend-howl.c rend-posix.c rend-osx.c scan-mpc.c \
db-sql-sqlite3.h db-sql-sqlite3.c \ db-sql-sqlite3.h db-sql-sqlite3.c \
w32-eventlog.c w32-eventlog.h w32-service.c w32-service.h \ w32-eventlog.c w32-eventlog.h w32-service.c w32-service.h \
os-win32.h os-win32.c win32.h db-gdbm.c db-gdbm.h \ os-win32.h os-win32.c win32.h db-gdbm.c db-gdbm.h \
ff-plugins.h ff-dbstruct.h ff-plugins.h ff-dbstruct.h upnp.c upnp.h

8
src/main.c
View File

@ -88,6 +88,7 @@
#include "os.h" #include "os.h"
#include "plugin.h" #include "plugin.h"
#include "util.h" #include "util.h"
#include "upnp.h"
#ifdef HAVE_GETOPT_H #ifdef HAVE_GETOPT_H
# include "getopt.h" # include "getopt.h"
@ -421,6 +422,11 @@ int main(int argc, char *argv[]) {
DPRINTF(E_LOG,L_MAIN,"Firefly Version %s: Starting with debuglevel %d\n", DPRINTF(E_LOG,L_MAIN,"Firefly Version %s: Starting with debuglevel %d\n",
VERSION,err_getlevel()); VERSION,err_getlevel());
#ifdef UPNP
upnp_init();
#endif
/* load plugins before we drop privs? Maybe... let the /* load plugins before we drop privs? Maybe... let the
* plugins do stuff they might need to */ * plugins do stuff they might need to */
plugin_init(); plugin_init();
@ -583,6 +589,8 @@ int main(int argc, char *argv[]) {
config.reload = 1; /* force a reload on start */ config.reload = 1; /* force a reload on start */
while(!config.stop) { while(!config.stop) {
upnp_tick(); /* run the upnp loop */
if((conf_get_int("general","rescan_interval",0) && if((conf_get_int("general","rescan_interval",0) &&
(rescan_counter > conf_get_int("general","rescan_interval",0)))) { (rescan_counter > conf_get_int("general","rescan_interval",0)))) {
if((conf_get_int("general","always_scan",0)) || if((conf_get_int("general","always_scan",0)) ||

2
src/os-unix.h
View File

@ -9,10 +9,10 @@
#define PATHSEP '/' #define PATHSEP '/'
#define PATHSEP_STR "/" #define PATHSEP_STR "/"
#define OS_SOCKETTYPE unsigned int
/* unix-specific functions */ /* unix-specific functions */
extern int os_drop_privs(char *user); extern int os_drop_privs(char *user);
void os_set_pidfile(char *file); void os_set_pidfile(char *file);
#endif #endif

1
src/util.h
View File

@ -20,6 +20,7 @@ typedef enum {
l_conf, l_conf,
l_plugin, l_plugin,
l_memdebug, l_memdebug,
l_upnp,
l_last l_last
} ff_lock_t; } ff_lock_t;