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
Julien BLACHE
cc0555d986
Replace AVL tree in RSP query by a static hash using gperf
2011-04-02 09:52:19 +02:00
Julien BLACHE
b8758a2aa2
Move DAAP query hash table inside DAAP2SQL
2011-04-02 09:52:19 +02:00
Julien BLACHE
303a3329eb
Replace AVL tree in DAAP query by a static hash using gperf
2011-04-02 09:52:19 +02:00
Julien BLACHE
ac95530585
Check for gperf, add support to the build system
2011-04-02 09:52:18 +02:00
Julien BLACHE
ac73ee0ce5
Enable and handle JPEG artwork in DACP
2011-04-01 22:04:09 +02:00
Julien BLACHE
204c9681ca
Enable and handle JPEG artwork in DAAP
2011-04-01 22:02:51 +02:00
Julien BLACHE
c7209ab699
Add support for JPEG as a valid artwork output format
...
Reduce CPU usage by avoiding unneeded JPEG -> PNG conversions; it appears
all the clients we care about support JPEG as well as PNG.
2011-03-30 21:50:29 +02:00
Julien BLACHE
5cf5cac9c2
Fix misuse of RAOP_CONNECTED in session state test
2011-03-27 17:04:24 +02:00
Julien BLACHE
5bad343278
Rename RAOP callbacks for consistency
2011-03-26 11:45:17 +01:00
Julien BLACHE
c2579dc0a6
Bring raop_send_req_flush() prototype in line with others
2011-03-26 11:45:17 +01:00
Julien BLACHE
0d58903913
Add missing header
2011-03-26 11:45:17 +01:00
Julien BLACHE
e5b4c1146e
Handle database upgrade v11 -> v12
2011-03-24 19:23:08 +01:00
Julien BLACHE
9759eeba71
Remove database upgrade for schema version before 10 (v0.12)
2011-03-21 18:48:00 +01:00
Kai Elwert
cb9dc5ad7c
Add COLLATE DAAP to all char-type fields
...
As a consequence, we can remove the explicit COLLATE DAAP from sort
clauses, index definitions and queries.
2011-03-21 18:48:00 +01:00
Julien BLACHE
f5b167080b
Use title_sort for DAAP sort headers
2011-03-21 18:48:00 +01:00
Kai Elwert
4dce6390ea
Switch to using db_query_fetch_string_sort() in daap_reply_browse()
2011-03-21 18:48:00 +01:00
Kai Elwert
e226c38d4f
Add db_query_fetch_string_sort() to fetch string+sortstring results
2011-03-21 18:48:00 +01:00
Kai Elwert
d8bf5eedce
db_build_query_browse() query changes ("DISTINCT %s, %s", field, field)
2011-03-21 18:48:00 +01:00
Kai Elwert
bf86cf45bd
Always include sort tags in songlist
2011-03-21 18:47:59 +01:00
Kai Elwert
9e5015ffc8
Switch sort clauses to *_sort fields
2011-03-21 18:47:59 +01:00
Julien BLACHE
91a5250143
Reindent md_map_id3, no code changes
2011-03-21 18:47:59 +01:00
Kai Elwert
aa3829854b
Pick up ID3 sort tags
2011-03-21 18:47:59 +01:00
Kai Elwert
3162028c41
Handle sort tags in fixup_tags()
...
Ensure the sort tags are filled and normalized.
2011-03-21 18:47:59 +01:00
Kai Elwert
373c5584af
Add sort tags to the database
2011-03-21 18:47:59 +01:00
Raivo Hool
3a71d7b15d
Add netinet/in.h, needed on FreeBSD
2011-03-21 18:46:28 +01:00
Julien BLACHE
c66496176e
Fix debug message loglevel
2011-03-21 18:41:38 +01:00
J. Aaron Pendergrass
a13ea85267
Default to MPEG4 video/audio for unknown file types
...
ffmpeg has issues with DRM-afflicted files, leading to the files being
tagged with the unknown file type. This allows streaming those DRM-afflicted
files to iTunes.
2011-03-20 12:48:48 +01:00
J. Aaron Pendergrass
1e1952a5ef
Better fixup_tags() handling for TV shows
2011-03-20 12:48:14 +01:00
Julien BLACHE
0d0877de9c
Honour IPv6 config option in player/RAOP
2011-03-20 12:20:07 +01:00
Julien BLACHE
69fe64c277
Honour IPv6 config option for HTTP services
2011-03-20 12:19:39 +01:00
Julien BLACHE
f4d6287f17
Add IPv6 configuration option
...
Disabled in the default config file, but enabled by default if not specified,
for backward compatibility.
2011-03-20 12:10:51 +01:00
Julien BLACHE
1f2a1e65c0
Fixup URL files scanning
...
Do not proceed and scan the file with ffmpeg on error, bail out. Doing so,
don't free strings allocated inside the mfi as we'll call free_mfi() anyway.
Reported by Kai Elwert.
2011-03-18 21:19:51 +01:00
Julien BLACHE
bcbda9bc4e
Browse records for IPv6 addresses regardless of the underlying protocol
2011-03-15 19:20:38 +01:00
Julien BLACHE
d8b7980fe4
Do not ask mDNS for IPv6 addresses if RAOP can't use IPv6
2011-03-15 19:20:38 +01:00
Julien BLACHE
ec7c3d108c
Let player know about IPv6 status in RAOP
2011-03-15 19:20:38 +01:00
Julien BLACHE
2c1755f025
Don't start record browser if address family not requested
2011-03-15 19:20:38 +01:00
Julien BLACHE
d0fa636643
Properly take ownership of new device address
...
Added addresses are transferred from dev to the existing rd. Set the
address to NULL in dev to avoid free()ing it in device_free() a few lines
down the road.
2011-03-15 19:20:38 +01:00
Julien BLACHE
4868a3946f
Remote pairing wants IPv4 only from mDNS
...
The pairing process only listens on IPv4 at the moment.
2011-03-10 21:08:45 +01:00
Julien BLACHE
e08c42b3c0
Player wants IPv4/IPv6/IPv6LL from mDNS for _raop._tcp
2011-03-10 21:08:25 +01:00
Julien BLACHE
6cd59a1240
Introduce mDNS browser flags for address type selection
...
Allow each user to specify the address types that should be returned
through the mDNS browse callback.
2011-03-10 21:08:25 +01:00
Julien BLACHE
4f59533ccb
Perform manual hostname resolution by browsing mDNS RRs
...
The service resolver delivers a single IP address that doesn't always suit
our needs. To get all the addresses advertised, we have to look at the RRs
through the record browser; we can then apply our filters and extract the
addresses that fit.
2011-03-10 21:08:25 +01:00
Julien BLACHE
2f2582800e
evhttp: Handle IPv6 scoped addresses
2011-03-10 21:08:24 +01:00
Julien BLACHE
09a981807b
Avoid leaking addr on error
2011-03-10 21:08:24 +01:00
Julien BLACHE
eeb5a7974d
Trim metadata strings on files INSERT/UPDATE
2011-03-08 18:55:51 +01:00
Julien BLACHE
69396f3da0
Kill bogus comments
2011-03-07 19:51:43 +01:00
Julien BLACHE
652fa9371f
Add terminal \r\n sequence for RAOP volume control on 802.11g ApEx
...
The 802.11g ApEx seems to require a terminal \r\n sequence, otherwise it
just ignores the setting.
2011-03-04 21:20:07 +01:00
Julien BLACHE
83d966df09
Fix typo in RAOP debug message
2011-03-04 20:47:36 +01:00
Julien BLACHE
13e2b12f9e
Make proper use of IN6_ARE_ADDR_EQUAL()
...
Pass pointers to sin6_addr instead of passing sin6_addr.s6_addr32 which
isn't portable and isn't the proper way to use the macro anyway.
2011-02-24 19:51:37 +01:00
Raivo Hool
1a11efec58
Use sys/endian.h on FreeBSD
2011-02-23 20:44:49 +01:00
Raivo Hool
86a90fe81f
Fix conversion to per-command lock & condition for FreeBSD
...
Leftover from commit 7f79ca5709
2011-02-23 19:09:26 +01:00
Julien BLACHE
f1ab254b47
Silence non-const vs. const warning with FFmpeg 0.6
2011-02-23 19:01:59 +01:00
Julien BLACHE
cbc3605425
Use avcodec_decode_video2() when available (FFmpeg 0.6)
2011-02-23 19:01:46 +01:00