From bfc72eac163ed28e321f163c8077eea39ede9d79 Mon Sep 17 00:00:00 2001 From: ejurgensen Date: Thu, 29 Jan 2015 22:32:40 +0100 Subject: [PATCH] forked-daapd: update to 22.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Espen Jürgensen --- sound/forked-daapd/Makefile | 6 +- sound/forked-daapd/files/forked-daapd.conf | 74 +++++++++++++++++++--- 2 files changed, 67 insertions(+), 13 deletions(-) diff --git a/sound/forked-daapd/Makefile b/sound/forked-daapd/Makefile index 3e3ae9a4e..48214831e 100644 --- a/sound/forked-daapd/Makefile +++ b/sound/forked-daapd/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=forked-daapd -PKG_VERSION:=22.0 -PKG_RELEASE:=20141022 -PKG_REV:=61a4da215c05b621951aa3903d7d390fd1839537 +PKG_VERSION:=22.2 +PKG_RELEASE:=20150129 +PKG_REV:=77f206c11855d2d84688a6e7cd9c8932e8a89205 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) diff --git a/sound/forked-daapd/files/forked-daapd.conf b/sound/forked-daapd/files/forked-daapd.conf index e0b3c0ccb..63c0ac3db 100644 --- a/sound/forked-daapd/files/forked-daapd.conf +++ b/sound/forked-daapd/files/forked-daapd.conf @@ -2,28 +2,37 @@ # # For regular use, the most important setting to configure is "directories", # which should be the location of your media. Whatever user you have set as -# "uid" must have read access to this location. Also make sure to add the user. -# If the location is a network mount, please see the README. +# "uid" must have read access to this location. If the location is a network +# mount, please see the README. # # In all likelihood, that's all you need to do! general { # Username + # Make sure the user has read access to the library directories you set + # below, and full access to the databases, log and local audio uid = "daapd" - logfile = "/var/log/forked-daapd.log" + # Database location - db_path = "/var/run/forked-daapd.db" +# db_path = "/var/cache/forked-daapd/songs3.db" + + # Log file and level # Available levels: fatal, log, warning, info, debug, spam + logfile = "/var/log/forked-daapd.log" loglevel = log + # Admin password for the non-existent web interface admin_password = "unused" + # Enable/disable IPv6 ipv6 = no - # Location of DAAP cache - daapcache_path = "/var/run/daapcache.db" + + # Location of cache database +# cache_path = "/var/cache/forked-daapd/cache.db" + # DAAP requests that take longer than this threshold (in msec) get their # replies cached for next time. Set to 0 to disable caching. -# daapcache_threshold = 1000 +# cache_daap_threshold = 1000 } # Library configuration @@ -31,8 +40,10 @@ library { # Name of the library as displayed by the clients # %h: hostname, %v: version name = "My Music on %h" + # TCP port to listen on. Default port is 3689 (daap) port = 3689 + # Password for the library. Optional. # password = "" @@ -80,11 +91,22 @@ library { # forked-daapd will look for jpg and png files with these base names # artwork_basenames = { "artwork", "cover", "Folder" } + # Enable searching for artwork corresponding to each individual media + # file instead of only looking for album artwork. This is disabled by + # default to reduce cache size. +# artwork_individual = false + # File types the scanner should ignore # Non-audio files will never be added to the database, but here you # can prevent the scanner from even probing them. This might improve - # scan time. By default .db and .ini are ignored. -# filetypes_ignore = { ".db", ".ini" } + # scan time. By default .db, .ini, .db-journal and .pdf are ignored. +# filetypes_ignore = { ".db", ".ini", ".db-journal", ".pdf" } + + # File paths the scanner should ignore + # If you want to exclude files on a more advanced basis you can enter + # one or more POSIX regular expressions, and any file with a matching + # path will be ignored. +# filepath_ignore = { "myregex" } # Disable startup file scanning # When forked-daapd starts it will do an initial file scan of your @@ -93,7 +115,7 @@ library { # initial file scan and save some system ressources. Disabling this scan # may lead to forked-daapd's database coming out of sync with the # library. If that happens read the instructions in the README on how - # to trigger a full rescan. + # to trigger a rescan. # filescan_disable = false # Should iTunes metadata override ours? @@ -110,8 +132,10 @@ library { audio { # Name - used in the speaker list in Remote nickname = "OpenWrt" + # Audio device name for local audio output # card = "default" + # Mixer channel to use for volume control - ALSA/Linux only # If not set, PCM will be used if available, otherwise Master. # mixer = "" @@ -123,6 +147,7 @@ audio { # forked-daapd's volume goes to 11! If that's more than you can handle # you can set a lower value here # max_volume = 11 + # AirPlay password # password = "s1kr3t" #} @@ -131,9 +156,38 @@ audio { spotify { # Directory where user settings should be stored (credentials) # settings_dir = "/var/cache/forked-daapd/libspotify" + # Cache directory # cache_dir = "/tmp" + # Set preferred bitrate for music streaming # 0: No preference (default), 1: 96kbps, 2: 160kbps, 3: 320kbps # bitrate = 0 } + +# SQLite configuration (allows to modify the operation of the SQLite databases) +# Make sure to read the SQLite documentation for the corresponding PRAGMA statements as +# changing them from the defaults may increase the possibility of database corruptions! +# By default the SQLite default values are used. +sqlite { + # Cache size in number of db pages for the library database + # (SQLite default page size is 1024 bytes and cache size is 2000 pages) +# pragma_cache_size_library = 2000 + + # Cache size in number of db pages for the daap cache database + # (SQLite default page size is 1024 bytes and cache size is 2000 pages) +# pragma_cache_size_cache = 2000 + + # Sets the journal mode for the database + # DELETE (default), TRUNCATE, PERSIST, MEMORY, WAL, OFF +# pragma_journal_mode = DELETE + + # Change the setting of the "synchronous" flag + # 0: OFF, 1: NORMAL, 2: FULL (default) +# pragma_synchronous = 2 + + # Should the database be vacuumed on startup? (increases startup time, + # but may reduce database size). Default is yes. +# vacuum = yes +} +