Commit Graph

2677 Commits

Author SHA1 Message Date
ejurgensen b605dc2fc3 Spelling mistake 2015-01-10 19:19:45 +01:00
ejurgensen a96af67a30 Some fixing up of prev commit 2015-01-10 00:45:19 +01:00
ejurgensen bfa9f4d5cf Upgrade db schema to v16 2015-01-10 00:08:50 +01:00
ejurgensen 2208c021aa Improve browse queries (credit @chme)
Adjusted re-commit of commit ec47c6e730
2015-01-09 23:59:38 +01:00
ejurgensen 27a2fabb56 Modify groups queries and improve index 2015-01-09 23:04:50 +01:00
ejurgensen ea598bfeaf Remove upgrade paths for indices (since they don't have any data anyway), and instead implement db_create_indices and db_drop_indices to reduce redundancy 2015-01-09 00:28:06 +01:00
chme 1981237638 Improve select for files table by removing f.media_kind = 32 from the
queries (forked_daapd has no media_kind = 32).
2015-01-08 22:44:09 +01:00
chme 46f770b52d Improve selects for files table by removing the (f.album <> '' AND
f.album IS NOT NULL) from the where clause for album and artist. These
are unnecessary because forked-daapd makes sure that an artist or album
name exists.
2015-01-08 22:43:29 +01:00
ejurgensen ad48ccb804 Revert "Merge branch 'db' of git://github.com/chme/forked-daapd into chme-db"
This reverts commit b8d5e32160, reversing
changes made to 5a02f926e3.
2015-01-08 22:40:47 +01:00
ejurgensen b8d5e32160 Merge branch 'db' of git://github.com/chme/forked-daapd into chme-db
Conflicts:
	src/artwork.c
2015-01-08 22:34:45 +01:00
ejurgensen 5a02f926e3 Fix bug in float to string conversion of raop volume (credit @andreas-p, issue #84) 2015-01-08 22:03:53 +01:00
ejurgensen 70f05049e8 Change text for severity log from ERROR to LOG
To avoid this startup message:
[ERROR]     main: Forked Media Server Version 22.1 taking off
2015-01-07 21:50:24 +01:00
ejurgensen 3b38bee45b Fix wrong log domain 2015-01-06 23:26:29 +01:00
ejurgensen a9bc1a21dc Merge pull request #75 from couteau/ownartwork (and additional artwork.c overhaul) 2015-01-04 22:41:00 +01:00
ejurgensen 103ce0887a Misc artwork fixup 2015-01-04 19:38:13 +01:00
ejurgensen 73bbe831e6 artwork.c overhaul and avoid "Error reading artwork" message when there is no artwork
- try to align return values in artwork.c
2015-01-04 15:12:46 +01:00
chme 6a2dc2d538 log severity in logfile and console 2015-01-03 18:00:31 +01:00
ejurgensen 0d7ec13ede Merge branch 'ownartwork' of @couteau and various modifications (see pr #75) 2015-01-03 00:31:48 +01:00
ejurgensen 2879458e98 Fix for issue #62 (slow internet streams), credit @chme 2015-01-02 23:24:44 +01:00
ejurgensen d55d194201 Remove misplaced quotes 2015-01-01 22:28:26 +01:00
Stuart C. Naifeh f3e21956c4 Add configuration option to disable individual artwork 2014-12-30 10:38:03 -05:00
chme ec47c6e730 optimize queries and indexes for composer/genre 2014-12-29 09:24:29 +01:00
chme 5cb06980e3 Optimize the indexes on the files table to speed up select queries 2014-12-29 09:24:29 +01:00
chme 12b46ad94d Improve select for files table by removing f.media_kind = 32 from the
queries (forked_daapd has no media_kind = 32).
2014-12-29 09:24:29 +01:00
chme fedf571d34 Improve selects for files table by removing the (f.album <> '' AND
f.album IS NOT NULL) from the where clause for album and artist. These
are unnecessary because forked-daapd makes sure that an artist or album
name exists.
2014-12-29 09:24:28 +01:00
chme e321e5137f db update v16 and cache update v2 2014-12-29 09:24:28 +01:00
chme 31870fe046 improve selects for files table by removing the join to the groups table 2014-12-29 09:24:28 +01:00
ejurgensen a69619a5a7 Implement is_remote() and change how transcode_needed() is used
transcode_needed() was getting called needlessly in http_daapd.c,
because 1) once it is determined that a given codec needs transcoding
for a given client there is no reason to call and check again, 2)
transcoding is irrelevant for remotes. Also some cleaning up of
user_agent_filter().
2014-12-28 23:37:12 +01:00
ejurgensen 3e412b5e65 Remove misplaced quotes in db_group_type_bypersistentid() 2014-12-28 23:32:21 +01:00
ejurgensen 4de5f7c19c Fix login/logout problem in spotify.c (see issue #68) 2014-12-28 21:08:52 +01:00
chme 7889d92a81 Identify "android" user-agent as a remote client in transcode_needed()
(similar to the check in user_agent_filter())
2014-12-28 09:37:19 +01:00
chme 3208315503 fix delete query for removing files if a spotify playlist is deleted 2014-12-27 21:44:25 +01:00
Stuart C. Naifeh 431ecdb197 Cache individual artwork 2014-12-27 11:40:52 -05:00
Stuart C. Naifeh 9e9ffe6809 Update cache api, version, and logic to support caching of individual as
well as group artwork
2014-12-27 10:48:12 -05:00
Stuart C. Naifeh 2171a1f2b3 Re-add support for individual artwork 2014-12-27 09:44:16 -05:00
Justin Maggard cdb0048082 Fix invalid read on empty string queries. 2014-12-17 15:03:23 -08:00
Justin Maggard 4efca3660f Fix bad free when encountering an error fetching query results. 2014-12-17 15:03:23 -08:00
Justin Maggard e431b04310 Lower log level for missing revision-number in client update request. This is some clients' normal behavior, so we shouldn't need to need to see a message about it in the error log. 2014-12-17 15:03:23 -08:00
ejurgensen 9b7a22ab0a Avoid threading issue in both ffmpeg and libav that prevents decoding embedded png's 2014-12-09 22:31:41 +01:00
chme 2e5d234ac5 [artwork] do not add cache entry if reading artwork failed 2014-12-07 07:39:27 +01:00
ejurgensen 6f2f44168d Some config file polish (now that it's being updated anyway) 2014-11-17 22:53:52 +01:00
ejurgensen 9d9c82b6b1 Shorten timeout waiting for audio to Spotify 2014-11-11 20:22:39 +01:00
ejurgensen 5e4f449179 Add a timeout waiting for audio to Spotify 2014-11-11 11:59:40 +01:00
ejurgensen f74774f5f7 Be more generous with Spotify image resolution now that the cache protects against poor reponse times 2014-11-11 11:37:03 +01:00
chme 7578bb1205 Artwork caching (pull request #61), and also:
- introduced new section in config file for sqlite pragma settings,
added config for artwork cache
- added setting of pragma synchronous, cache size and journal mode to
daap cache
2014-11-10 22:53:08 +01:00
ejurgensen f24ab29098 Extend cache rebuild to 60 seconds so we are more certain that the library is 'idle' 2014-10-16 22:15:35 +02:00
ejurgensen 9508eba62e Return silence if the pipe read was blocked (credit bfitz) 2014-10-07 19:55:28 +02:00
ejurgensen 88fcfa061d Add compability with ffmpeg's libswresample 2014-10-02 22:48:50 +02:00
ejurgensen 4857f21644 Merge branch 'freebsd': New timing mechanism (issue #46)
- also some libevent 2 adjustments
2014-09-30 21:39:02 +02:00
ejurgensen 376f0ed1c0 Minor fix 2014-09-30 18:55:32 +02:00
ejurgensen 495aebec40 Fix bug where it would hang because it looked for artwork in named pipes
- also some refactoring of the artwork code to diminish redundancy
2014-09-29 23:40:38 +02:00
ejurgensen 513e38dcda Proper update to libevent 2 (artwork, avio_evbuffer, dmap_common, transcode) 2014-09-28 22:44:45 +02:00
ejurgensen 661a557500 Proper update to libevent 2 in spotify.h and pipe.h 2014-09-28 22:26:23 +02:00
ejurgensen a3a689573f Better define in player.c 2014-09-28 22:14:30 +02:00
ejurgensen 1ffbfd8c45 Proper update to libevent 2 in player.c 2014-09-28 22:09:22 +02:00
ejurgensen 965df4fdfc Delete event after disarming timer (maybe not necessary, but for safety) 2014-09-28 15:30:52 +02:00
ejurgensen cf5b702460 Fix malplaced declaration 2014-09-27 23:12:18 +02:00
ejurgensen 4078542eb4 Forgot an include 2014-09-27 23:08:43 +02:00
ejurgensen 29265d6170 Drop special FreeBSD stream period 2014-09-27 23:08:24 +02:00
ejurgensen 861635eb4d timer_delete() instead of close() for FreeBSD timer 2014-09-27 23:05:22 +02:00
ejurgensen 65110a9f39 Fix FreeBSD sound timing problems 2014-09-27 22:59:19 +02:00
ejurgensen dafa26a48a Protect against uinitialized var if query is empty 2014-09-26 23:13:17 +02:00
ejurgensen ca3fada215 Fix ALSA audio problem where threshold will not be reset because
commit 7462290 decreased the value of pcm_pos
2014-09-19 22:18:07 +02:00
ejurgensen 27e7148405 Use STOB() in player.c since it is defined right in player.h 2014-09-19 22:14:31 +02:00
ejurgensen f543b768ac Merge pull request #41 from chme/skipprev
rfc: Change behavior of skip to previous song
2014-09-12 21:45:15 +02:00
ejurgensen 2fc681a971 Add condition for FreeBSD, ignore SCHED_BATCH in filescanner.c 2014-09-12 17:52:08 +02:00
ejurgensen 8c9793d9ef Fix filescanner bugs:
- stop init-rescan/full-rescan from running twice
- set thread priority to batch
- don't request libevent to loop when the loop is already running
2014-09-11 22:41:07 +02:00
ejurgensen 5bfe4673f5 Add a function in filescanner.c to enumerate certain file types
Fixes bug where init-rescan and full-rescan would run twice because
two inotify events get triggered by eg 'touch xxx.init-rescan'
2014-09-10 22:16:52 +02:00
ejurgensen 97910f3a99 Fix bug where LastFM session key in db was ignored 2014-09-08 23:13:12 +02:00
ejurgensen be7a6c7b1e Don't try to login to Spotify if the filescanner got an exit signal 2014-09-08 22:45:05 +02:00
ejurgensen 94c5352db6 Remove EVLOOP_ONCE calls in filescanner
These calls generate error messages when the loop is already running, which
will be the case when using init-rescan or full-rescan. The only purpose
of these calls seems to be to check for exit signals from the main thread
during a startup bulk scan, where the loop is not running yet. However, we
can check for an exit signal by just setting/checking scan_exit.

This commit also removes the unused filescanner_status().
2014-09-08 21:57:52 +02:00
ejurgensen d2d85b29f4 Lower the priority of the thread so forked-daapd may still respond
during file scan on low power devices
2014-09-07 13:48:03 +02:00
ejurgensen 2545aedc2a Avoid duplicate rows in the admin table 2014-08-27 22:12:42 +02:00
ejurgensen ae3b5077ec Add support for .pls playlists 2014-08-27 21:57:16 +02:00
ejurgensen 1b51fcf07c Rename filescanner_m3u to _playlist, because we are going to add
support for pls
2014-08-27 21:54:28 +02:00
ejurgensen b26e507baa Fix memleak in DAAP cache 2014-08-25 22:05:44 +02:00
ejurgensen 271e2c29e1 Add some libevent 1 compability 2014-08-24 14:51:41 +02:00
ejurgensen d157aca620 Save response times in DB and show in log (for debugging) 2014-08-24 12:43:32 +02:00
ejurgensen 31ef4d4e13 Add slow DAAP queries to cache automatically 2014-08-24 01:23:23 +02:00
ejurgensen cf091e8d8b Adjust daapcache so it serves User-Agent to httpd_daap's reply handlers 2014-08-23 00:02:01 +02:00
ejurgensen 624dd40c59 Include DAAP queries from Retune and TunesRemote+ for caching
+ misc fixing up
2014-08-22 22:51:13 +02:00
ejurgensen f997aca452 More DAAP cache adjustments 2014-08-21 23:06:52 +02:00
ejurgensen eac718ea0f Some more daap cache triggers 2014-08-21 10:14:24 +02:00
ejurgensen 76231cac0f Experimental caching of playlist 1 2014-08-21 10:01:47 +02:00
ejurgensen 7623de1ac4 Allow const char tags and handle null requests in dmap_common 2014-08-21 09:59:59 +02:00
ejurgensen 39b9c4fc33 Make DAAP cache use and location configurable 2014-08-20 23:09:23 +02:00
ejurgensen f3a19fce8e Add DAAP cache backend 2014-08-20 00:21:48 +02:00
ejurgensen a594455e09 Add db_query_run() to get rid of some redundancy in db.c 2014-08-18 00:20:23 +02:00
ejurgensen 6d8e4c67aa Support for LastFM scrobbling (issue #19) 2014-08-15 23:36:54 +02:00
ejurgensen 21cf3ab7d3 Add trimwhitespace(), keyval sorting and alloc to misc functions
- features required by the LastFM module
2014-08-15 22:56:39 +02:00
ejurgensen d5efc2dcb3 Add db interface to update the admin table 2014-08-15 22:54:47 +02:00
ejurgensen b0807b168e Preproc defines in evhttp_compat.h to protect against double inclusion 2014-08-15 22:53:47 +02:00
Marlies Heijkoop bbb21b0bad Don't segfault on invalid utf8 while sorting
`strmblen` returns -1 on invalid sequences, which causes a segfault when passed as length to `stpncpy`.
2014-08-14 20:06:45 +02:00
chme 05e6402dc6 Fix skip to next song while the last song in Up Next is playing
(introduced in a6c2a25)
2014-08-02 07:25:18 +02:00
chme 974c6e6323 add missing "#undef Q_TMPL" 2014-07-27 11:16:00 +02:00
chme a6c2a25642 If reshuffling with repeat all songs in queue active, set shuffle-head
to current playing song. Previously the shuffle-head was set to the next
song after the current, therefor the UpNext-queue appeared empty after
adding new songs to the queue.
2014-07-25 18:51:34 +02:00
chme 87b415b0d4 Fix segfault on reshuffling one item 2014-07-25 18:25:20 +02:00
chme 5065c3e4a0 Use query parameter if queuefilter parameter is unkown 2014-07-19 08:45:40 +02:00
chme 49a985391d Ignore queuefilter on playqueue-edit-add if mode = 0 (add to up next) 2014-07-19 08:44:27 +02:00
chme 74622904e3 local audio: do not add pcm_buf_threshold to pcm_pos (leads to wrong
position in Remote)
2014-07-17 20:14:21 +02:00
chme 4d79a85780 Change behavior of skip to previous song to start the current song from
the beginning, if it is playing for more than 3 seconds
2014-07-17 20:14:21 +02:00
chme fe2abfd123 clear queue on playback abort 2014-07-17 20:12:19 +02:00
chme 9527e06f71 reshuffle only songs in the UpNext queue 2014-07-17 20:12:19 +02:00
chme 46c0239a79 Added options to modify the operation of the SQLite database (through PRAGMA statements)
- set cache size (in number of pages)
- set synchronous flag
- set journal mode
2014-07-13 10:35:38 +02:00
ejurgensen 17ffdc56ad Fix bug where streams with sample rate < 44100 stop too early (with libav 10+)
- avresample_convert should be passed max samples to convert, not
number of samples in input (which for low sample rates is lower
than output)
2014-07-06 23:31:20 +02:00
ejurgensen 129c00c3d1 Change some playlist scanner log levels 2014-06-23 01:51:32 +02:00
ejurgensen 0a2d2273bd Remove build warning caused by data type mismatch 2014-06-22 22:29:45 +02:00
ejurgensen 7810f16361 Fix bug where it will wait endlessly if a Spotify track is paused the last few
seconds of a track (after new track has been opened)
2014-06-22 22:27:52 +02:00
ejurgensen a860907202 Another preprocesser condition for OpenWrt compability 2014-06-16 23:46:30 +02:00
ejurgensen 2247fadbfa Some preprocessor conditions for compability on OpenWrt 2014-06-16 23:31:44 +02:00
ejurgensen a181b515f2 Merge branch 'dev' 2014-06-11 23:10:52 +02:00
ejurgensen d993bc3750 Defer loading Spotify playlists until bulk scan is complete
(because of database locking issues)
2014-06-10 22:49:44 +02:00
ejurgensen 1bd11d2895 Fix so permission changes in the library are handled (issue #8) 2014-06-09 23:42:02 +02:00
ejurgensen 30aa93479d Merge branch: libevent compability improvements 2014-06-02 21:59:50 +02:00
ejurgensen 844a9b43c9 Fixup new libav 10 icy extraction 2014-06-02 21:51:50 +02:00
ejurgensen ada7ccca8f Change log level of .remote message to ease pairing troubleshooting 2014-06-02 21:08:24 +02:00
ejurgensen 116289f5b7 Libav 10 (and ffmpeg) now has native support for ICY metadata 2014-06-02 00:00:52 +02:00
ejurgensen b566c41a36 Setting log level to info gave a lot of meaningless db.c messages 2014-06-01 23:58:44 +02:00
ejurgensen c740e6e3b0 Make compatible with libevent 2.0 by crippling streaming and ICY metadata (see issue #30) 2014-05-30 23:39:03 +02:00
ejurgensen 5b4ef31758 Migrate all evhttp to non-deprecated libevent2
- well except a troublemaker in httpd_daap.c (req->flags &= ~EVHTTP_PROXY_REQUEST)
2014-05-29 23:22:00 +02:00
ejurgensen 22d37f240b ICY scanner modifications 2014-05-29 11:50:56 +02:00
chme a4fbeed81e Added comments to queue_clear and queue_empty 2014-05-29 09:45:04 +02:00
ejurgensen 02c23b0065 Better thread sync, cleanup and libevent compability in ICY filescanner 2014-05-26 23:38:19 +02:00
chme b7cb0da2c2 Modifications to the playqueue-clear command:
- do not stop playback when clearing the UpNext queue
- clear history, if mode=0x68697374 ("hist")
2014-05-24 07:34:59 +02:00
ejurgensen aa8344d14d Some filesystems have mtime=0 (Seafile), so add check for stamp before
letting the scanner exit with just a db ping
2014-05-21 22:31:05 +02:00
ejurgensen 519a673503 Extra error check 2014-05-20 22:45:25 +02:00
ejurgensen 8468f55910 Honor the "ek" (encryption) flag for RAOP_DEV_OTHER + slight rewrite of raop_device_cb 2014-05-18 17:19:50 +02:00
chme f60be3c8af Do not use queryfilter on "play next" and "add to up next" commands 2014-05-18 09:04:17 +02:00
chme a1b09903c0 - Fix crash when calling add-next and cur_playing/cur_streaming are NULL
- Append songs after cur_streaming
2014-05-17 14:13:18 +02:00
ejurgensen dafc748bfd Clear watches from db on init-rescan 2014-05-14 21:39:25 +02:00
ejurgensen 915719f0f8 Fix Spotify exemption from purge during init-rescan 2014-05-14 20:44:07 +02:00
ejurgensen 6b0c5997bf Fixup init-rescan 2014-05-13 22:14:19 +02:00
ejurgensen c1be585469 Extra log message for debugging apparent db locking issue 2014-05-13 22:02:32 +02:00
ejurgensen a7d0a603b3 Excempt Spotify items from rescan purge 2014-05-13 20:57:37 +02:00
ejurgensen 851b57017d Add option to trigger startup scan, rename force-rescan and better cleanup in full rescan 2014-05-11 23:55:18 +02:00
ejurgensen 0aa8416a21 Reset inotify when force-rescan is triggered 2014-05-11 23:44:15 +02:00
ejurgensen 5a5163e699 Move db_analyze/db_hook_post_scan (credit @chme) 2014-05-11 23:17:29 +02:00
ejurgensen a5b2fbc0fe Wrap bulk scan in a db transaction (credit @chme) 2014-05-11 23:13:09 +02:00
ejurgensen 44c3dba3d9 queue_remove was removing wrong item 2014-05-06 22:55:59 +02:00
ejurgensen 305c1a141c Indentation 2014-05-04 22:36:37 +02:00
chme 7e43a42c88 Remove dead code: playback_next_bh and playback_prev_bh are only called
during playback_pause. In playback_pause "cur_playing" is always set to
NULL so that in playback_next_bh and playback_prev_bh only the
else-clause can become true.
2014-05-04 05:45:53 +02:00
chme 79646c78e4 fixup indentation 2014-05-03 20:16:51 +02:00
chme 8036a5a6d3 fixes for playqueue-contents 2014-05-03 20:16:51 +02:00
chme 5f307c7ce1 Added support for playqueue-contents with negativ span value (returns the previously played songs) 2014-05-03 20:16:51 +02:00
ejurgensen 20539c0c08 Remove unused variable in queue_next_add 2014-04-30 23:33:42 +02:00
ejurgensen a2f90a997c Make sure albums/artists appear the same despite different capitalization 2014-04-30 23:30:08 +02:00
chme eab4c1c3d2 Fix "play next" command - the queue was not circular anymore due the
missing setting of pl_prev of the next song and start the shuffle-queue
with ps_shuffle
2014-04-23 20:44:40 +02:00
ejurgensen 8eb6b46ed2 Adjustments to queue_move/queue_remove, mostly for consistency 2014-04-21 21:21:40 +02:00
ejurgensen 748ce1413f Revert msed to 0 for now 2014-04-20 23:34:04 +02:00
chme 4c5abdac5e add songs for album or artist ordered by album 2014-04-20 11:03:49 +02:00
chme 2391838ea1 announce support of playlist editing by setting "msed" to 1 2014-04-20 07:33:28 +02:00
chme 01cc83f819 respect coding convention and changed log level 2014-04-20 06:43:01 +02:00
chme 32c3b57fcd added support for the playqueueedit add next command 2014-04-19 09:12:58 +02:00
chme 475a2f4e8f added support for the playqueueedit remove command 2014-04-19 08:35:07 +02:00
chme c3c2c421d2 added support for the playqueueedit move command 2014-04-19 08:09:32 +02:00
ejurgensen 365c5a3bc9 Only queue the rest of the album on quirky query 2014-04-18 22:39:17 +02:00
ejurgensen 2c16b070ed Make the update of playcount non-blocking for playback
- otherwise slow updates would disrupt streaming when switching track
2014-04-18 22:31:37 +02:00
ejurgensen 35e9b3dc30 Fix bug in m3u scanner 2014-04-18 13:08:31 +02:00
ejurgensen c7aaf6eff3 Forgot a spotify enabled condition 2014-04-05 22:30:35 +02:00
ejurgensen c47287a556 Support for Spotify artwork 2014-04-04 23:14:43 +02:00
ejurgensen 1be543b00a Only cache available Spotify tracks 2014-04-03 20:44:36 +02:00
ejurgensen d722b18817 Add optional request-session-id to login request
- should make it easier to write curl scripts to control forked-daapd
since you avoid the need to parse the replies just to find a valid
session id
2014-04-01 22:47:04 +02:00
ejurgensen 7e2f47f9ca Minor adjustment so Valgrind is happy with string handling in user_agent_filter 2014-04-01 21:51:07 +02:00
ejurgensen a3f0145561 Open nonblock so it won't hang if other end is absent 2014-04-01 21:43:30 +02:00
ejurgensen 16756a6632 Clean up old allocations in pipe.c before allocating 2014-03-31 13:13:24 +02:00
ejurgensen 6062ca014b Make the player able to stream from pipes 2014-03-31 13:10:18 +02:00
ejurgensen 9efc97d702 Add support for query-modifier=containers in DACP playqueue-edit 2014-03-31 01:53:46 +02:00
ejurgensen 8740249e05 Clear up some code in filescanner.c 2014-03-31 00:04:03 +02:00
ejurgensen 0c79a02e93 Fix error in filescanner when renaming files. Allow scanner to add
fifos (named pipes) for later Shairport integration.
2014-03-30 23:44:30 +02:00
ejurgensen 49498800ba Add config option for preferred Spotify bitrate. README update. 2014-03-29 22:26:46 +01:00
ejurgensen aef908b093 Don't announce support for playlist editing 2014-03-28 20:44:19 +01:00
ejurgensen 7d410fb6e7 Disable aeMk in databases reply since we don't calculate it properly 2014-03-28 19:25:15 +01:00
ejurgensen 35f8dd4233 DAAP modifications to properly show media kind shares in iTunes 2014-03-26 23:59:28 +01:00
ejurgensen 3ff4fa77be Merge branch 'libevent2' into dev 2014-03-24 04:59:08 +01:00
ejurgensen c01bb54b79 Poor man's natural sort
- sort a1, a2, a11, a21, a100 instead of a1, a11, a100, a2, a21
2014-03-24 04:56:36 +01:00
ejurgensen 87f8b204df Rewrite spotify to use libevent for better reliability 2014-03-23 21:45:06 +01:00
ejurgensen 7c3da47eb7 Small DAAP changes to align with iTunes 2014-03-23 00:23:34 +01:00
ejurgensen 708b76ce1e Play only a single item when playspec has item-spec (Podcasts/Audiobooks) 2014-03-21 23:38:14 +01:00
ejurgensen c01698e462 Filescanner should not watch for IN_MODIFY
- it is bad for performance (triggers many db selects) and is
useless anyway.
2014-03-21 22:57:56 +01:00
ejurgensen 3f1edc0082 Oops 2014-03-18 11:35:47 +01:00
ejurgensen 9484c43601 Prevent notify_main_thread from mucking with SPOTIFY_EVENT before an
event has been processed
2014-03-18 11:31:48 +01:00
ejurgensen 59b6462ba6 Small logging change 2014-03-18 10:01:06 +01:00
ejurgensen 4ab7ea6e31 Reduce Spotify logging a bit 2014-03-18 09:57:49 +01:00
ejurgensen c3f05671b2 Spotify: When track ends, empty buffer before stopping. Also some
safeguards against indefinite waits and null pointer dereferencing.
2014-03-17 22:25:47 +01:00
ejurgensen 8b97d7fdd8 Forgot to remove some debug messages in mdns_avahi.c 2014-03-16 23:14:30 +01:00
ejurgensen ae70bf58fc Make mdns_avahi.c fully compliant with libevent 2, so it doesn't
complain in the logs about missing event base for event_del_
2014-03-16 23:11:21 +01:00
chme d5c6f1f72f Use EVBUFFER_EOL_CRLF for evbuffer_readln to make sure that the end of
the rtsp-header (an empty line) is recognized
2014-03-13 23:34:34 +01:00
ejurgensen 687f349927 Let configure check libevent version and include according to version 2014-03-13 23:33:35 +01:00
ejurgensen 5c40b2344c Another filescanner bug fix after Spotify commit 2014-03-12 22:59:47 +01:00
ejurgensen f6e9ddbc41 Repair legacy filescanners (broken by libav conditions) 2014-03-12 22:54:30 +01:00
ejurgensen 81b285a79e Fix horrible filescanner bug I introduced with the Spotify commit 2014-03-12 21:48:04 +01:00
ejurgensen 7ed6cc98c3 Add support for Spotify (squashed commit), and:
- Try to not return items which a client can't play
    - Remove inotify subscription to IN_MODIFY and IN_CREATE
    - Fix crash on unknown codec type in transcode.c
    - Probably added some new bugs...
2014-03-11 23:20:29 +01:00
ejurgensen 190f91114e Support songartistid (asri) in group requests and queuefilter=artist
- credit misenhower of wp8remote.com
2014-02-21 20:39:57 +01:00
ejurgensen 7997377deb Adjust for libav 10 API
With libav 10 the API is (again...) changed, adjust for that and
add the appropriate version conditions
2014-02-17 23:05:24 +01:00
ejurgensen 1ec1528f3b Mimic iTunes and reply 204 No Content to playqueue-edit&add 2014-02-13 15:46:24 +01:00
ejurgensen 23a7e82a1f Add support for max volume for AirPlay devices (raop) 2014-02-09 16:07:00 +01:00
ejurgensen 258163e6ce hi-res timer commit broke FreeBSD. This attempts to go back to the
old code for FreeBSD.
2014-02-08 22:59:07 +01:00
ejurgensen 01f290cc2a Replace AirTunes with AirPlay in doc and log messages 2014-02-07 22:10:40 +01:00
Justin Maggard 0ec6e2f072 Extend support for kernels without high-res timers to 64-bit platforms. 2014-02-05 18:15:17 -08:00
Anthony Doko 949cf3808d Add support for embedded platforms that don't have high-res timers. 2014-02-05 18:11:10 -08:00
Justin Maggard 0426aa2d08 Fix issue with many WMA audio files not being recognized 2014-02-05 17:44:01 -08:00
Justin Maggard 5c8b28cda4 Fix crash with an empty buffer 2014-02-05 17:38:14 -08:00
Justin Maggard f9a76aeb1a Add User-Agent detection for iTunes video playback on OSX
iTunes on OSX has a different User-Agent when playing back video
files.  Detect this so we can deterimine his codec support.
2014-02-05 17:34:27 -08:00
Justin Maggard 2f04529165 Don't use chunked encoding on range requests
If the client is requesting a partial file, don't use chunked
encoding.  This makes video files work in iTunes.
2014-02-05 17:32:09 -08:00
ejurgensen 3c941ca0e1 iTunes will drop the connection if user seeks during playback, but
no reason to log that on default log level
2014-02-03 23:12:19 +01:00
ejurgensen 3064509f62 HTTP Range header may be in the form 'bytes=12345-' (no end offset) 2014-02-03 22:02:20 +01:00
ejurgensen 4842751527 Reduce log level verbosity when no real error (eg no md field) 2014-02-03 21:54:46 +01:00
ejurgensen 6ad43e2369 Merge branch 'useragent' 2014-01-30 21:45:58 +01:00
ejurgensen 7314d0de0d Add config option to disable initial file scan 2014-01-28 22:40:07 +01:00
ejurgensen 785383861b ffmpeg/libav conditions for CodecID and AVCODEC_MAX_AUDIO_FRAME_SIZE (thanks @freultwah) 2014-01-27 21:24:08 +01:00
ejurgensen 21fe5ac3a6 Don't reject daap login if no user-agent (for Roomie remote) 2014-01-27 20:43:22 +01:00
ejurgensen 6decdf4eaf Some more Remote pairing logging 2014-01-27 20:36:54 +01:00
ejurgensen 5d6d7c7f82 Only allocate transcode resample buffer once, but make it large 2014-01-19 23:27:39 +01:00
ejurgensen c2c072eb58 Plug bad mem leak if using libavcodec 54.35 (libav9) or above 2014-01-19 23:09:40 +01:00
ejurgensen dd4ebfc42e Make sure there are no remnants from last upgrade before upgrading the db 2014-01-15 18:29:57 +01:00
ejurgensen ae51922f57 Try to autoselect a non-selected raop device if no valid output was
selected. This should make life easier for users of Remote on iPhone
where speakers can only be selected after playback has started (I
think...)
2014-01-13 23:24:45 +01:00
ejurgensen 827c8c787e Reduce ffmpeg/libav log messages on default log level
- the messages are useless anyway, since we don't echo the name of
the file the message concerns
2014-01-13 22:01:54 +01:00
ejurgensen 3f33f33310 Add preprocessor macro FFMPEG_INCOMPATIBLE_API and use it, so
we use avcodec_find_best_pix_fmt_of_list for ffmpeg. Also rearrange
ffmpeg/libav libraries according to ffmpeg FAQ.
2014-01-12 22:34:57 +01:00
ejurgensen 60f43c94c9 Change embedded artwork libav preprocessor conditions 2014-01-11 23:37:04 +01:00
ejurgensen 2d4de9dd75 Add misc.h include to artwork and correct safe_atoi32 call 2014-01-11 23:34:03 +01:00
ejurgensen eac404fa3a Add artwork field to db (upgrade to v15). Set field when embedded
artwork found by the filescanner. Reenable support for embedded
artwork in group requests.
2014-01-11 23:05:29 +01:00
ejurgensen 77893f5521 Disable support for embedded artwork (groups) for now - it's too slow 2014-01-11 00:35:35 +01:00
ejurgensen 6e1cbac18f Merge branch 'libav9' 2014-01-10 21:54:03 +01:00
ejurgensen fc44eeb80f Remove url encoding in filescanner_icy 2014-01-10 21:22:04 +01:00
ejurgensen c7c7f835b7 Another libav preprocessor condition 2014-01-09 23:13:40 +01:00
ejurgensen 9c5c3a6625 Merge branch 'master' into libav9 2014-01-09 23:02:07 +01:00
ejurgensen 47c61454b6 Minor log message change 2014-01-09 23:01:21 +01:00
ejurgensen da59d0c578 Support for embedded artwork (groups) and misc cleaning up 2014-01-09 22:58:11 +01:00
ejurgensen 416b89f51a Use avcodec_find_best_pix_fmt2 (avcodec_find_best_pix_fmt deprecated in libav9) 2014-01-09 21:39:05 +01:00
ejurgensen 95b67668b4 Forgot libav preprocessor condition 2014-01-09 21:11:01 +01:00
ejurgensen a6b586a0ce Support for embedded artwork (items only) 2014-01-09 21:07:27 +01:00
ejurgensen a1236f4400 Lower log level of message "Failed to retrieve artwork..." 2014-01-08 22:13:20 +01:00
ejurgensen b4e1e380e6 Up the level of the Remote discovery pairing log message 2014-01-07 00:06:46 +01:00
ejurgensen 9ac23dcbd0 Downgrade "No CSeq in reply" log message level 2014-01-06 23:48:00 +01:00
ejurgensen 672885faaf Merge branch 'master' into libav9 2014-01-06 21:47:20 +01:00
ejurgensen efd4d56de5 Fix a few missing libav conditions 2014-01-06 21:41:30 +01:00
ejurgensen 7079e524b6 Fix bug where dbmfi is referenced after being freed 2014-01-05 22:56:44 +01:00
ejurgensen a42377991d Use songartistid instead of album_artist for playlist query 2014-01-05 14:20:42 +01:00
ejurgensen 9c90abf603 Allow 0 as an initial value of revision-number 2014-01-03 22:22:21 +01:00
ejurgensen edaa8fe4f2 Add libav version conditions 2014-01-02 22:49:18 +01:00
ejurgensen 21584fa1ff Minor adjustment of log message in transcode.c 2013-12-30 23:47:41 +01:00
ejurgensen 8663641e84 Account for no channel_layout (resample) + add free decode frame 2013-12-30 23:16:30 +01:00
ejurgensen 3a8936cd26 Change to libav 9 resampling (avresample)
Some of the previous libav stuff removed, re-add later
2013-12-30 13:03:53 +01:00
ejurgensen 73b2d08400 Rework of transcode.c for libav 9. Resampling is broken in this commit. 2013-12-30 00:40:16 +01:00
ejurgensen b42b1f98d7 Adjust filescanner to ignore streams with embedded artwork 2013-12-29 20:44:32 +01:00
ejurgensen c8a631212c Fix ffmpeg/libav logging (almost everything was being logged no matter
what the log level because many ffmpeg log messages have levels in
between the fixed values)
2013-12-26 23:06:34 +01:00
ejurgensen 02a73e3638 Artwork support for iTunes 11 (credit @torta) and related improvements 2013-12-25 23:06:41 +01:00
ejurgensen 371ed3070c Add seek to standard db queries 2013-12-19 20:26:38 +01:00
ejurgensen 39420b909a Support for daap.songartistid 2013-12-18 19:26:27 +01:00
ejurgensen ab86e30be4 Fix bug where sort fields were not implemented in group replies 2013-12-18 19:14:39 +01:00
ejurgensen 392f34bf85 Don't announce smart playlists with no items 2013-12-17 23:27:37 +01:00
ejurgensen fe16a9ca4e Merge branch 'audiobooks' into db_upgrade_14 2013-12-17 21:03:26 +01:00
ejurgensen dbb043198d Upgrade database to version 14 (artist groups and seek)
- add songartistid to support artist groups
- add corresponding trigger
- add seek field for later use (to save playback position)
- add G_ARTISTS and adjust queries
- add smart playlists Podcasts/Audiobooks with db upgrade
2013-12-17 20:58:55 +01:00
ejurgensen ec2637285d In group?group-type=artists type queries return better persistent id
- this is a temporary solution until real persistent id's can be
used. This change uses a hash of album_artist instead of returning
a fixed value of 1. Thank you SquallyDoc, author of Retune, for
helping out with this and suggesting this solution.
2013-12-16 22:29:47 +01:00
ejurgensen a925268d50 Include groups table in database purge 2013-12-16 22:21:04 +01:00
ejurgensen e79e11108e Ignore duplicate tags in DAAP requests 2013-12-16 22:09:18 +01:00
ejurgensen b5247aab1d Don't cast to char with malloc and some error handling 2013-12-15 22:15:45 +01:00
ejurgensen b3ea04a047 Some cleaning up in group handling in db.c in prep for artist groups 2013-12-15 21:47:49 +01:00
ejurgensen d1a51ef45d 1) Protect against uninitialised fl in daap_sort_build and 2) Don't
add blank items in daap group reply
2013-12-12 23:27:50 +01:00
ejurgensen a4f9920a09 Fix error in boundary check in raop.c: raop_v2_resend_range
- this prevents crashing when using AirBubble as speaker
- also lower log level to warning
2013-12-11 23:11:50 +01:00
ejurgensen a35f6c4376 Basic audiobook support 2013-12-08 23:03:03 +01:00
ejurgensen 2765a12f76 Forgot composer-sort and two instances of strip_article() 2013-12-05 22:46:12 +01:00
ejurgensen a102d3f138 Set sort headers from sort fields in db 2013-12-05 21:56:02 +01:00
ejurgensen 34a5fdb2ab Sort by name if sort=releasedate (Podcasts)
We don't know release date, so use name since it's better than random
2013-12-04 21:29:58 +01:00
ejurgensen c6119c5aa5 Force sane sorting in group replies
(because Hyperfine Remote will ask for artists sorted by album...)
2013-12-03 23:35:36 +01:00
ejurgensen a30069c0c7 Honor sorting in more daap replies and some minor restructuring of http_daapd.c 2013-12-03 23:16:07 +01:00
ejurgensen 91ab072e51 Merge branch 'force_rescan' 2013-12-03 23:13:43 +01:00
ejurgensen 26fe40cb18 Ignore article (The/A/An) when sorting 2013-12-02 22:20:34 +01:00
ejurgensen 161338752c Support for genre tag in dacp playqueue-edit queuefilter 2013-12-02 22:19:12 +01:00
ejurgensen 10e4a138a3 Fix crash after special (malformed?) TunesRemote SE daap request
Request has comma before &query:
/databases/1/containers/1/items?session-id=100&meta=dmap.itemname,[...],daap.songcompilation,&query=('com.apple...
2013-12-02 20:55:16 +01:00
ejurgensen 8882374a75 Disable instead of purging when root library dir is not present 2013-11-30 23:12:09 +01:00
ejurgensen 414817031d Configurable library names
Names of Library, Music, Movies, TV Shows and Podcasts made configurable
2013-11-30 12:57:38 +01:00
ejurgensen adc9c03763 Allow user to trigger full rescan with a .force-rescan file 2013-11-29 22:48:53 +01:00
ejurgensen 0fd65b285d Fix some ffmpeg/libav compiler conditions 2013-11-25 19:43:17 +01:00
ejurgensen 4ffe10994d Merge branch 'raop_enc_md' 2013-11-23 23:11:42 +01:00
ejurgensen 795aa50553 Merge branch 'remote4' 2013-11-23 23:11:32 +01:00
ejurgensen c360bdd5bd Also account for playqueue-edit?...queuefilter=album:(null) 2013-11-23 23:05:13 +01:00
ejurgensen 1199a459ac Obey device "md" (metadata) tag - credit @couteau
- original patch https://gist.github.com/couteau/7532531
2013-11-23 11:25:30 +01:00
ejurgensen dea8d02c76 Downgrade log message severity 2013-11-23 11:04:10 +01:00
ejurgensen 9760a43ccf Add support for mode 2 (shuffle) in playqueue-edit and -contents 2013-11-22 22:05:55 +01:00
ejurgensen afd25b79d9 Support for playqueue-edit 2013-11-22 16:41:57 +01:00
ejurgensen 4d542f9e22 Set some dmap_send_error messages to "Invalid request" 2013-11-21 23:44:37 +01:00
ejurgensen 83a89edfd0 Small changes in playqueue-edit wrapper 2013-11-21 23:41:29 +01:00
ejurgensen a4c16741d9 Better support for playqueue-edit (command add, mode 1)
- reply message not fixed
2013-11-21 23:33:03 +01:00
ejurgensen ecd8b5d940 Misc work on httpd_dacp for support of playqueue-*
- playqueue-edit still working poorly, but added documentation
2013-11-17 23:15:50 +01:00
ejurgensen d85eb171cb Lower log level to spam for metadata message in httpd_daap.c 2013-11-16 22:52:53 +01:00
ejurgensen 0576643ae5 Use artist in Up Next 2013-11-16 22:33:12 +01:00
ejurgensen f42bbd37e1 Add basic support for playqueue-contents (real reply) and add placeholder
for playqueue-edit
2013-11-14 23:14:58 +01:00
ejurgensen 7bb2fef25f Lower log level to spam for DMAP investigation and add dmap_add_raw_uint32() for later use 2013-11-14 23:08:20 +01:00
ejurgensen 28b485c595 Fix malformed DAAP packages 2013-11-10 12:35:24 +01:00
ejurgensen 00a790c0c1 Fix typo and add more comments 2013-11-09 23:58:18 +01:00
ejurgensen f71954eb43 Add dummy playqueue-contents support 2013-11-09 23:51:36 +01:00
ejurgensen a3f251b3be Be case insensitive when checking file name extensions 2013-11-09 21:54:24 +01:00
ejurgensen 0d5fef60e6 Add empty DACP property get for media-kind and extended-media-kind 2013-11-07 22:45:12 +01:00
ejurgensen afa35ac55c Don't assume max_h==max_w (a target aspect ratio of 1) when sending artwork
- Remote 4 will send max_w=128 and max_h=160 for artwork in the Album tab
2013-11-06 23:52:19 +01:00
ejurgensen 862cde3849 Merge branch 'podcast'
Conflicts:
	src/conffile.c
2013-10-29 21:47:23 +01:00
ejurgensen 84b8a7653d Enable play count with Remote
The purpose is to get the "Unplayed" tab for Podcasts in Remote
working, which requires that we increase the counter even when
playback is with Remote/RAOP (and not just iTunes streaming, which
was already working)
2013-10-26 23:13:02 +02:00
ejurgensen 766177bf10 File types to ignore during scan made configurable 2013-10-26 20:59:05 +02:00
ejurgensen 209d17c148 Rework of podcast and compilation scanning
- identify podcasts by config path
- always set album_artist to empty for podcasts
- album_artist for compilations made configurable
- clean up media type enumeration
2013-10-24 23:14:26 +02:00
ejurgensen 55db599c5e Add Folder.jpg/png to list of default artwork file names 2013-10-22 21:19:11 +02:00
ejurgensen 74c7e6ceda Add support for daap.songuserplaycount
It's used to give proper replies to Remote when it asks for unplayed
Podcasts. Maps to play_count in the database, which already existed
(very good forward thinking by the original authors).
2013-10-21 22:54:45 +02:00
ejurgensen c935f8cc3b Extend conditions identifying podcasts (media_kind=4)
- if path contains "/Podcasts/"
- if iTunes XML says it's a podcast
2013-10-21 22:52:04 +02:00
ejurgensen b23571d88b Plug memory leak in artwork.c 2013-10-20 14:03:00 +02:00
ejurgensen c70496bb58 Accept item-spec in playspec requests 2013-10-19 11:07:10 +02:00
ejurgensen eb1e827f1d Fix for Podcast detection - if there is no metadata 2013-10-19 10:11:33 +02:00
ejurgensen 6eaf47a8d6 Show items with genre=Podcast as Podcast items in Remote
- also add Podcast smart playlist to default playlists
2013-10-18 23:07:40 +02:00
ejurgensen cc6d5670d7 Merge branch 'm3u_extinf' 2013-10-17 22:36:07 +02:00
ejurgensen 3db0cde42a Add log message for when the filescanner completes initial scan 2013-10-17 22:08:18 +02:00
ejurgensen 01df6d458a Always add URL items in M3U playlists, even if ressource is unavailable during scanning 2013-10-16 22:34:11 +02:00
ejurgensen 115c35e856 Change M3U metadata mapping 2013-10-16 22:33:01 +02:00
ejurgensen 06701ae6ea Log message modification - filescanner.c 2013-10-16 22:07:30 +02:00
ejurgensen d891c6a7a4 Read EXTINF metadata (without regex) 2013-10-16 11:09:24 +02:00
ejurgensen 3e484f1cae Fixed problems with free in m3u-scanner 2013-10-15 23:40:06 +02:00
ejurgensen d710e6ee95 Add support for M3U metadata (extinf) 2013-10-15 13:36:11 +02:00
ejurgensen 6fb718b55e Fix for Apple TV update 6.0
- don't send Apple Challenge and RSA/AES key/iv if no encryption
- assume no password if no pw field
- clean up some indentation in raop.c
2013-10-13 21:48:15 +02:00
ejurgensen 347c10d7ae Allow compiling under FreeBSD - thank you @freultwah 2013-09-27 21:25:22 +02:00
ejurgensen 9704a1e65d Bug fix when trying to restart single song in playlist
cur_streaming may be null, so can't address cur_streaming->ctx
2013-09-25 20:14:13 +02:00
ejurgensen 43ed5ef7ba Merge branch 'icymetadata' 2013-09-25 20:12:24 +02:00
ejurgensen 548141e723 Add support for getting Shoutcast (ICY) metadata from internet streams 2013-09-24 22:27:49 +02:00
ejurgensen 743da81ba8 Replace avcodec_encode_video with evcodec_encode_video2 2013-09-08 12:55:31 +02:00
ejurgensen 3471b6c147 Cleaning up deprecated ffmpeg/libav 2013-09-07 23:39:22 +02:00
ejurgensen c1c171e21f Include for av_rescale_q was missing
- and has been for a while, it seems
2013-09-04 22:33:47 +02:00
ejurgensen 04ae27f914 Autoselecting local audio just messes up speaker selection. 2013-08-31 12:47:13 +02:00
ejurgensen 736d19f924 Fix error in c897761ee3
Changed the way it's detected if speaker id is hex or dec
2013-08-31 11:03:15 +02:00
ejurgensen c897761ee3 Merge branch 'fix_groups' into hyperfine 2013-08-30 22:28:24 +02:00
ejurgensen 83edef0f01 Fixes two issues with Hyperfine Remote for Android
1. H. Remote uses the playpause command to both play and pause,
but forked-daapd would only support play, not pause.
2. H. Remote sends speaker id's in decimal, not in hex like other
remotes. Fixed so forked-daapd will understand both.
2013-08-30 21:50:31 +02:00
ejurgensen 9b190fe282 Fix group-type-type 2013-08-29 22:43:59 +02:00
ejurgensen 95fc525beb Add support for artist group request (experimental)
The purpose of this is mainly to support Hyperfine Remote for Android
2013-08-29 22:00:37 +02:00
ejurgensen 799fe9e684 Addendum to commit f4cc74e7fb, now allow only alphanum AND / 2013-08-27 22:38:02 +02:00
ejurgensen f4cc74e7fb Don't process lines beginning with non-alphanumerical chars, since
they might mess things up.
2013-08-27 22:20:26 +02:00
ejurgensen fe79922c6e Forgot return value 2013-08-21 23:30:30 +02:00
ejurgensen 55d7224053 The iTunes playlist scanner improvements in 0abc9f0 resulted in too
many database lookups. This is a more efficient version.
2013-08-21 23:18:45 +02:00
ejurgensen 9d0962407a The m3u playlist scanner improvements in commit 6e9cf3a resulted in
too many database lookups. This is a more efficient version.
2013-08-21 23:16:25 +02:00
ejurgensen 0abc9f04f2 Make the iTunes XML scanner more flexible when trying to match paths
in the XML file with paths in the library. Also simplyfies the code.
2013-08-20 22:46:21 +02:00
ejurgensen 6e9cf3a243 This makes the scanner more flexible when matching paths in playlists
with the library paths.
2013-08-20 21:58:35 +02:00
ejurgensen abb0908c6f Save playlist item's URL in the database's URL-column 2013-08-19 21:30:08 +02:00
ejurgensen b6df68b75b Fix: Clearing retransmit buffer after player stop could crash due
to reading pointer from free'd memory (in raop.c). Also added some
safeguards against passing invalid file descripters to close()
in player.c.
2013-08-17 23:05:50 +02:00
ejurgensen 5a0879de7f Merge branch 'streaming' 2013-08-15 22:02:33 +02:00
ejurgensen 68c4650fef Revert "Exclude streams/URLs (data_kind = 1) from most listings."
This reverts commit 8260841f17.
2013-08-15 21:46:20 +02:00
ejurgensen 8260841f17 Exclude streams/URLs (data_kind = 1) from most listings. 2013-08-15 20:16:33 +02:00
ejurgensen 4552acba7e Adds support for URLs (streaming) in m3u playlist files.
Also added a few file types that the filescanner should ignore.
2013-08-14 23:40:55 +02:00
ejurgensen f6f3057930 Fix indentation 2013-08-14 20:32:46 +02:00
ejurgensen 5f041b59eb Fix .url files crashing forked-daapd and remove "support" for these.
An .url file would lead to a crash due to codectype being null. This
is fixed with this commit, but at the same time support for these
files is completely removed, since even with the bug fixed .url
(and .pls) files would not stream.
2013-08-14 20:29:18 +02:00
ejurgensen cbdab26b53 Fix .url files crashing forked-daapd and remove "support" for these.
An .url file would lead to a crash due to codectype being null. This
is fixed with this commit, but at the same time support for these
files is completely removed, since even with the bug fixed .url
(and .pls) files would not stream.
2013-08-14 20:23:49 +02:00
ejurgensen 3215d32b57 AirFoil will not return CSeq, so skip checking if it's missing 2013-08-13 22:11:21 +02:00
Scott Atkinson b52bd94380 Update to support some older, encrytped APEs
Some APEs report their am value as something like `AirPort4,107` (Old
version) or `AirPort10,115` (new version). (There is some evidence in
the player.c code that some old APEs do not report an AM value at all,
but all three of mine do.

As far as I can tell, the following is true of APEs with AM values:
- am="AirPort4..." - Encrypted (so devtype should remove
`RAOP_DEV_APEX_80211N`)
- am="Airport10..." - Not encrypted (so devtype should be set to
`OTHER`)

So, I suggest the following change to line 28:
```
else if (strncmp(p, "AirPort4", strlen("AirPort4")) != 0)
```

There may be other flavors of APEs that may fail this test, but it's
the best I can suggest with the devices I have.
2013-07-26 10:24:08 +02:00
ejurgensen 66acc06c83 Merge branch 'cfgartwork' 2013-07-22 22:41:13 +02:00
ejurgensen 86cf922615 Prefer album artist even when DAAP says artist 2013-07-22 22:30:55 +02:00
ejurgensen 48b7cd9a05 Adds looking for artwork named [directory name].{png,jpg} 2013-07-14 20:54:23 +02:00
ejurgensen 0b571765d3 Artwork file names made configurable 2013-07-13 12:31:01 +02:00
ejurgensen 0f3cf27f57 Also look for artwork in folder.jpg 2013-07-05 12:21:14 +02:00
Kai Elwert 49ab2a3ce4 Allow playback on non apple airplay devices 2013-07-04 14:57:00 +02:00
ejurgensen 9172a1618d Removed avcodec_init, obsolete in ffmpeg 0.11 2013-05-24 20:57:42 +02:00
ejurgensen fa965dee75 Changed SAMPLE_FMT_S16 for ffmpeg 0.11 2013-05-24 20:33:26 +02:00
Thijs Reus 6c7fa8f299 Now artists/albums are properly sorted and grouped 2013-05-24 18:51:57 +02:00
Thijs Reus 6b0fde9dba Fixed RemoteApp communication which broke for Remote 3.0 due to some new properties in the query 2013-05-24 18:44:57 +02:00
Craig Markwardt c2e6eeda32 Fixes for Amarok and Banshee clients which don't send
revision-number in their update request.

Details: Banshee (v1.6.1) and Amarok client players send an
update request but do not send the revision-number parameter.
iTunes version 10 (and perhaps earlier) does send this parameter.
See: https://github.com/jasonmc/forked-daapd/issues/78

Fix: function daap_reply_update() now warns when revision-number
is not submitted by the client, but does not reply with an error.
In that case the server assumes a revision-number which insures
an update is sent back to the client.

Testing:
I verified that the following clients were able to connect succesfully
and retrieve a library listing:
  * iTunes 10.5.2
  * iTunes 10.4.2
  * iTunes 9.7.1
  * Rhythmbox 0.12.8
  * Banshee 1.6.1
I can't test with Amarok since I don't have this client.
2012-01-02 04:22:39 -05:00
Craig Markwardt bd10978d52 Fixes for iTunes v10.5 time-outs.
Details:

iTunes v10.5 clients changed how they responded to DAAP
protocol, and started disconnecting when the forked-daapd server
sent an empty "refresh" reply ("mupd" protocol).  This problem is
also coupled with session-timeout ("mstm" and "msal"); when these
server capabilities were enabled, iTunes 10.x clients did not poll
for updates and eventually disconnected.

I investigated DAAP network packets using Wireshark.  I found that
a true iTunes server sends a set of server capabilities in a specific
order, and order matters to the client.  When the correct order is used,
the client correctly polls for updates and does not disconnect.

This change:
  1. Send server capabilities in different order (daap_reply_server_info).
  2. Disables 5-minute update refresh.
  3. Disables 30-minute inactivity time-out.

Testing:
This server version successfully stayed connected to the
following clients:
  * iTunes 10.5.2
  * iTunes 10.4.2
  * iTunes 9.7.1
  * Rhythmbox 0.12.8
The clients stayed connected for at least several hours,
sometimes days, with activity or no activity.
2012-01-02 02:15:18 -05:00
Julien BLACHE 4be0d86aa0 Revert "Disable session expiration"
This reverts commit c70caad87e.
2011-09-10 18:44:37 +02:00
Julien BLACHE 9f06848d43 Reply to update requests periodically to avoid 30-minute iTunes timeout
Craig Markwardt <craig.markwardt@gmail.com> found out that the 30-minute
timeout in iTunes was caused by the lack of reply to update requests.

We now send out replies every 5 minutes, avoiding the timeout and
disconnection.

Thanks to Craig for digging into this, producing code to demonstrate the fix
and trying out a few more ideas for update support beyond this fix.
2011-09-10 18:37:16 +02:00
Julien BLACHE ad4e15c362 Handle database upgrade v12 -> v13 2011-09-10 12:56:30 +02:00
Julien BLACHE efcd463946 Add indexes for playlists 2011-09-10 12:56:30 +02:00
Julien BLACHE 664067fd88 Rewrite group queries, remove JOIN, add index
SQLite has trouble optimizing the query when written with JOIN, but does
pretty well using the indexes when written without JOIN. Add an index for
the query, too.
2011-09-10 12:56:30 +02:00
Julien BLACHE cbc7108fcf Use table aliases in all queries, update RSP & DAAP filters to match 2011-09-10 12:56:30 +02:00
Julien BLACHE 617c026060 Add covering indexes for *{,_sort} fields
These indexes help queries searching on these fields and will act as covering
indexes for sort strings, too.
2011-09-10 12:56:30 +02:00
Julien BLACHE becdfdb062 Add new indexes for general speedup
An index on songalbumid helps for joins on songalbumid on the files table; a
covering index on disabled+media_kind+songalbumid helps in numerous queries
all over the place.
2011-09-10 12:56:30 +02:00
Julien BLACHE 1dfd27090e Speedup startup rescan 2011-09-10 12:56:30 +02:00
Julien BLACHE 96c367f556 Kill useless database indexes 2011-09-10 12:56:30 +02:00
Julien BLACHE 333b7710bc Queries must hit SQLITE_DONE to execute profiling callback 2011-09-10 12:56:30 +02:00
Julien BLACHE d05634fddd Print query execution time in milliseconds 2011-09-10 12:56:29 +02:00
Julien BLACHE a2b7b811b8 Add query plan to DB profiling callback 2011-09-10 12:56:29 +02:00
Julien BLACHE 181b1e772f Add a logdomain for DB performance data 2011-09-10 12:56:29 +02:00
Peter Carmichael 6e10252021 Perform post-bulk-scan DB maintenance 2011-09-10 12:56:29 +02:00
Julien BLACHE 1909623d43 Run ANALYZE after DB startup 2011-09-10 12:56:29 +02:00
Peter Carmichael 3caae459be Add DB maintenance routines 2011-09-10 12:56:29 +02:00
Julien BLACHE 0b2df54524 libav 0.7: switch to generic AVDictionary for metadata handling 2011-09-10 12:48:14 +02:00
Julien BLACHE a2f409dd0a libav 0.7: use av_dump_format() instead of dump_format() 2011-09-10 12:48:14 +02:00
Julien BLACHE ed20d3f7de libav 0.7: use av_get_bytes_per_sample() instead of av_get_bits_per_sample_fmt() 2011-09-10 12:48:14 +02:00
Julien BLACHE bb8f9de8ec libav 0.7: use avformat_write_header() instead of av_write_header() 2011-09-10 12:48:14 +02:00
Julien BLACHE dbe22c2c02 libav 0.7: use avformat_open_input() instead of av_open_input_file() 2011-09-10 12:48:14 +02:00
Julien BLACHE 4472f9e955 Fix infinite loop on unknown DACP property
Missing strtok_r() call in the !dpm case.
2011-08-15 12:50:43 +02:00
Julien BLACHE bea6bc762a Update copyright message 2011-07-09 12:12:59 +02:00
Julien BLACHE f08c18a5ed Add config knob for mixer channel name (ALSA/Linux only)
In some complex ALSA setups, using PCM or Master is not the right thing
to do, so allow a custom mixer element name to be specified in the config
file for this use case.

Request and initial patch by Kurt Vanderlinden <kurt.vanderlinden@skynet.be>.
2011-07-09 12:12:58 +02:00
Julien BLACHE 77cb2d403b Remove getpwnam() call, use runas_{uid,gid} from conffile.h 2011-07-09 12:12:58 +02:00
Julien BLACHE 4b950aa151 Remove getpwnam() call from logger, use runas_{uid,gid} from conffile.h 2011-07-09 12:02:09 +02:00
Julien BLACHE a40f3f0629 Resolve runas username when loading configuration and export uid/gid 2011-07-09 12:02:09 +02:00
Julien BLACHE 6feac7dd45 Do not elevate privileges to reopen the log file
Instead, set ownership and permissions at startup and rely on logrotate
recreating a new log file with appropriate permissions after that.
2011-07-09 12:02:09 +02:00
Julien BLACHE 8310bc226d Plug leaks, avahi_strdup() not necessary here 2011-07-09 11:54:55 +02:00
Julien BLACHE 87bd2b8ec4 Plug leak of pl_base 2011-07-09 11:54:55 +02:00
Julien BLACHE e2390f9d22 Initialize sockaddr before binding 2011-07-09 11:54:55 +02:00
Julien BLACHE 17d4153b81 Adapt for new input methods in ANTLR 3.4 2011-06-24 19:34:11 +02:00
Julien BLACHE 55d6205cf8 Add explicit initialization for return values
Plain types were automatically initialized to NULL up to and including
ANTLR 3.2, but this changed (for the better) in later versions.
2011-06-24 19:34:05 +02:00
Julien BLACHE 759cc55b0f Fix bad parameters in I_LAST index clause 2011-06-05 11:04:57 +02:00
Julien BLACHE de4d5d0f4c libav 0.7: Metadata string for disc can be "disc/totaldisc"
Pointed out by Raivo Hool; since we don't have a choice of performing or
not performing the metadata conversion, we will get "disc/totaldisc" for
ID3 files.
2011-06-04 12:09:38 +02:00
Julien BLACHE 1bea809078 Make disc parsing code generic, too 2011-06-04 12:08:50 +02:00
Julien BLACHE a453e0e4ac libav 0.7: Use AVIO with libavformat >= 53 2011-06-02 22:16:53 +02:00
Julien BLACHE 6aa45c0b0c libav 0.7: Add AVIO interface to evbuffer, replacing ffmpeg_url_evbuffer 2011-06-02 22:16:53 +02:00
Julien BLACHE 6797e65861 libav 0.7: Silence const vs. non-const warning 2011-06-02 22:16:53 +02:00
Julien BLACHE 74b7c69828 libav 0.7: Metadata string for track can be "track/totaltrack" 2011-06-02 22:16:53 +02:00
Julien BLACHE 57e569aeb5 Make track parsing code generic 2011-06-02 22:16:53 +02:00
Julien BLACHE 3caf3df662 libav 0.7: Add new generic metadata names 2011-06-02 22:16:53 +02:00
Julien BLACHE b46afdc150 libav 0.7: Calling av_metadata_conv() is no longer needed 2011-06-02 22:16:52 +02:00
Julien BLACHE b1d31feb53 libav 0.7: Switch from av_get_bits_per_sample_format() to ..._fmt() 2011-06-02 22:16:52 +02:00
Julien BLACHE ecf064082f libav 0.7: Use skip_frame instead of hurry_up 2011-06-02 22:16:52 +02:00
Julien BLACHE b203f1ea1f libav 0.7: Replace CODEC_TYPE_* with AVMEDIA_TYPE_* 2011-06-02 22:09:42 +02:00
Julien BLACHE d8685846d0 Update documentation and build system for libav
We are using libav after the ffmpeg/libav fork during the 0.6 series.
2011-06-02 22:06:44 +02:00
Julien BLACHE ec5ace7dc9 Reset hurry_up to 0 after we acquired a frame with known PTS 2011-06-02 22:06:44 +02:00
Julien BLACHE 4f3635e354 Handle SQLITE_SCHEMA error in db_exec()
This happens under database load with many concurrent threads doing updates;
queries failing with SQLITE_SCHEMA at step time need to retried from scratch
until they succeeded or hit a best-effort limit of 5 retries.
2011-05-28 10:48:31 +02:00
Julien BLACHE 4594cc3d63 Enhance db_exec() error messages 2011-05-28 10:46:41 +02:00
Julien BLACHE 75dc4106a8 Remove byte-order mark from UTF-8 strings
The byte-order marks are useless for UTF-8, but that doesn't mean we don't
find them in the wild. Get rid of them, they confuse the hell out of the
collation functions.

Reported by Kai Elwert.
2011-04-30 18:59:29 +02:00
Julien BLACHE 2cd56dfc6d Bail out early on if artwork format is not supported 2011-04-30 11:41:12 +02:00
Julien BLACHE 52dcd4cb10 Add default case to address family switch for maximum compiler happiness 2011-04-30 11:41:12 +02:00
Julien BLACHE 0dac53f25c Kill unused variable len 2011-04-30 11:41:12 +02:00
Julien BLACHE a70a45d925 Fix DAAP songlist generation after code move to dmap_common
Handling of the sort tags was left into httpd_daap.c where the code runs
after the song is added to the songlist - effectively adding the sort tags
to the *next* song, leading to incorrect sort tags on the current song.
2011-04-28 18:25:14 +02:00
Julien BLACHE 49a9ff64dc Use st->size instead of sb.st_size which is only valid for raw files 2011-04-24 19:03:47 +02:00
Julien BLACHE 2cead60432 Remove unused prev variable 2011-04-24 18:43:58 +02:00
Julien BLACHE f86915f15e Fix typo, goto before ret assignment 2011-04-24 18:40:32 +02:00
Julien BLACHE 88280217a4 Remove useless assignments in while() conditions 2011-04-24 18:29:04 +02:00
Julien BLACHE d8f4efe126 Remove unused lib variable 2011-04-24 18:25:30 +02:00
Julien BLACHE 97433dc5ef Whitespace fixup 2011-04-16 10:17:03 +02:00
Julien BLACHE a981fa0a45 Ensure mfi->title is proper UTF-8 when set to mfi->fname 2011-04-16 10:16:28 +02:00
Julien BLACHE a116e2ad1f Perform Unicode fixup before tags fixup
fixup_tags() must not be exposed to non-UTF-8 strings as it runs some of
the strings through Unicode normalization for sort tags.
2011-04-16 10:12:29 +02:00
Julien BLACHE 53588f36af Wire up metadata handling in player and RAOP
This enables sending out metadata to AppleTV.
2011-04-09 10:11:35 +02:00
Julien BLACHE d208ca79d4 Add support for metadata handling in player 2011-04-09 10:11:35 +02:00
Julien BLACHE e3b756c730 Document progress values for AppleTV metadata 2011-04-09 10:11:35 +02:00
Julien BLACHE 1c861a6662 Add support for AppleTV AirTunes metadata in RAOP
The AppleTV gets sent the song metadata (DMAP data), artwork and progress
data during AirTunes streaming. Add support for this in RAOP.
2011-04-09 10:11:35 +02:00
Julien BLACHE 627062cab8 Add wants_metadata flag to struct raop_session 2011-04-09 10:11:35 +02:00
Julien BLACHE 718d1e9487 Migrate file metadata encoding to DMAP common code 2011-04-09 10:11:35 +02:00
Julien BLACHE 07df6bb4aa Move dmap_add_field() to DMAP common code 2011-04-09 10:11:35 +02:00
Julien BLACHE 39542aee27 Move DMAP fields list and hash table to DMAP common code 2011-04-09 10:11:34 +02:00
Julien BLACHE c792b942a0 Add logdomain for common DMAP code 2011-04-09 10:11:34 +02:00
Julien BLACHE 52691d6c4d Rename dmap_helpers.[ch] to dmap_common.[ch] 2011-04-09 10:11:34 +02:00
Julien BLACHE 075bb99742 Introduce artwork_get_item_filename() 2011-04-09 10:11:34 +02:00
Julien BLACHE 6949859ff1 Add caiv tag to video-capable devices in speaker list 2011-04-09 10:11:34 +02:00
Julien BLACHE db67f4ed6f Set has_video flag for AppleTV devices 2011-04-09 10:11:34 +02:00
Julien BLACHE f3e7836453 Introduce struct spk_flags to reduce argument count for enumeration callback 2011-04-09 10:11:34 +02:00
Julien BLACHE c1fae0012d Add support for DOS-encoded pairing files 2011-04-07 21:01:16 +02:00
Julien BLACHE a576033497 Rework album_artist/album_artist_sort handling
artist_sort tends to be more and more widespread, so try to reuse artist_sort
if possible instead of deriving album_artist_sort from album_artist
unconditionally.
2011-04-07 19:53:55 +02:00
Julien BLACHE 54c5314712 Handle empty files table when upgrading from schema v11 -> v12 2011-04-06 18:38:53 +02:00
Julien BLACHE 7984b4baea Document RAOP request queueing 2011-04-03 10:45:10 +02:00
Julien BLACHE 961b2484b8 Re-establish closecb only when no requests are in flight 2011-04-03 10:45:03 +02:00
Julien BLACHE ef52e922b2 Turn req_in_flight into a counter 2011-04-03 10:44:18 +02:00
Julien BLACHE a4f02ed08d Manage CSeq in raop_add_headers() 2011-04-03 10:43:37 +02:00
Julien BLACHE 7fcb8e4447 Check reply CSeq against request CSeq 2011-04-03 10:42:49 +02:00
Julien BLACHE f097d80d6a Add optional RTP-Info parameter to raop_send_req_set_parameter() 2011-04-03 10:42:42 +02:00
Julien BLACHE 9c43a9a900 Make SET_PARAMETER content-type an argument to raop_send_req_set_parameter() 2011-04-03 09:54:12 +02:00
Julien BLACHE 7927707bdb Rework ANTLR3 integration into the build system 2011-04-02 09:52:19 +02:00
Julien BLACHE e23f02c7c0 Replace AVL tree in DAAP by a static hash using gperf 2011-04-02 09:52:19 +02:00
Julien BLACHE cbb1669ee1 Replace AVL tree in DACP by a static hash using gperf 2011-04-02 09:52:19 +02:00
Julien BLACHE 7e35068d46 Move RSP query hash table inside RSP2SQL 2011-04-02 09:52:19 +02:00