b8758a2aa2
Move DAAP query hash table inside DAAP2SQL
2011-04-02 09:52:19 +02:00
303a3329eb
Replace AVL tree in DAAP query by a static hash using gperf
2011-04-02 09:52:19 +02:00
ac95530585
Check for gperf, add support to the build system
2011-04-02 09:52:18 +02:00
ac73ee0ce5
Enable and handle JPEG artwork in DACP
2011-04-01 22:04:09 +02:00
204c9681ca
Enable and handle JPEG artwork in DAAP
2011-04-01 22:02:51 +02:00
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
5cf5cac9c2
Fix misuse of RAOP_CONNECTED in session state test
2011-03-27 17:04:24 +02:00
5bad343278
Rename RAOP callbacks for consistency
2011-03-26 11:45:17 +01:00
c2579dc0a6
Bring raop_send_req_flush() prototype in line with others
2011-03-26 11:45:17 +01:00
0d58903913
Add missing header
2011-03-26 11:45:17 +01:00
e5b4c1146e
Handle database upgrade v11 -> v12
2011-03-24 19:23:08 +01:00
9759eeba71
Remove database upgrade for schema version before 10 (v0.12)
2011-03-21 18:48:00 +01:00
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
f5b167080b
Use title_sort for DAAP sort headers
2011-03-21 18:48:00 +01:00
4dce6390ea
Switch to using db_query_fetch_string_sort() in daap_reply_browse()
2011-03-21 18:48:00 +01:00
e226c38d4f
Add db_query_fetch_string_sort() to fetch string+sortstring results
2011-03-21 18:48:00 +01:00
d8bf5eedce
db_build_query_browse() query changes ("DISTINCT %s, %s", field, field)
2011-03-21 18:48:00 +01:00
bf86cf45bd
Always include sort tags in songlist
2011-03-21 18:47:59 +01:00
9e5015ffc8
Switch sort clauses to *_sort fields
2011-03-21 18:47:59 +01:00
91a5250143
Reindent md_map_id3, no code changes
2011-03-21 18:47:59 +01:00
aa3829854b
Pick up ID3 sort tags
2011-03-21 18:47:59 +01:00
3162028c41
Handle sort tags in fixup_tags()
...
Ensure the sort tags are filled and normalized.
2011-03-21 18:47:59 +01:00
373c5584af
Add sort tags to the database
2011-03-21 18:47:59 +01:00
3a71d7b15d
Add netinet/in.h, needed on FreeBSD
2011-03-21 18:46:28 +01:00
c66496176e
Fix debug message loglevel
2011-03-21 18:41:38 +01:00
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
1e1952a5ef
Better fixup_tags() handling for TV shows
2011-03-20 12:48:14 +01:00
0d0877de9c
Honour IPv6 config option in player/RAOP
2011-03-20 12:20:07 +01:00
69fe64c277
Honour IPv6 config option for HTTP services
2011-03-20 12:19:39 +01:00
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
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
bcbda9bc4e
Browse records for IPv6 addresses regardless of the underlying protocol
2011-03-15 19:20:38 +01:00
d8b7980fe4
Do not ask mDNS for IPv6 addresses if RAOP can't use IPv6
2011-03-15 19:20:38 +01:00
ec7c3d108c
Let player know about IPv6 status in RAOP
2011-03-15 19:20:38 +01:00
2c1755f025
Don't start record browser if address family not requested
2011-03-15 19:20:38 +01:00
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
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
e08c42b3c0
Player wants IPv4/IPv6/IPv6LL from mDNS for _raop._tcp
2011-03-10 21:08:25 +01:00
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
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
2f2582800e
evhttp: Handle IPv6 scoped addresses
2011-03-10 21:08:24 +01:00
09a981807b
Avoid leaking addr on error
2011-03-10 21:08:24 +01:00
eeb5a7974d
Trim metadata strings on files INSERT/UPDATE
2011-03-08 18:55:51 +01:00
69396f3da0
Kill bogus comments
2011-03-07 19:51:43 +01:00
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
83d966df09
Fix typo in RAOP debug message
2011-03-04 20:47:36 +01:00
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
1a11efec58
Use sys/endian.h on FreeBSD
2011-02-23 20:44:49 +01:00
86a90fe81f
Fix conversion to per-command lock & condition for FreeBSD
...
Leftover from commit 7f79ca5709
2011-02-23 19:09:26 +01:00
f1ab254b47
Silence non-const vs. const warning with FFmpeg 0.6
2011-02-23 19:01:59 +01:00
cbc3605425
Use avcodec_decode_video2() when available (FFmpeg 0.6)
2011-02-23 19:01:46 +01:00
396edc9ad8
Use av_guess_format() when available (FFmpeg 0.6)
2011-02-23 19:00:59 +01:00
67daf3259a
Use avcodec_decode_audio3() when available (FFmpeg 0.6)
2011-02-23 18:26:42 +01:00
868be734b8
Don't scan artwork files
...
Based on a patch from Dominic Evans <oldmanuk@gmail.com>.
2011-02-06 17:54:32 +01:00
4806b2c20c
Link against librt for clock_gettime()
...
Reported by Dominic Evans <oldmanuk@gmail.com>.
2011-02-06 17:54:32 +01:00
1110324000
Explicitely check for and link against libgpg-error
...
We use gpg-error directly, so we need to check for it and link against
it explicitely; so far it's been brought in by libgcrypt.
Reported by Dominic Evans <oldmanuk@gmail.com>.
2011-02-06 17:54:29 +01:00
dfe65c07b7
Split out CFLAGS and CPPFLAGS
2011-02-06 17:53:47 +01:00
43674f1d47
Break long lines
2011-02-06 17:29:39 +01:00
da0d118de4
Reset album_artist after iTunes scan if set to Unknown artist.
2010-12-18 19:29:26 +01:00
c92c8aae25
Grab a few more metadata from iTunes playlists
2010-12-18 14:33:25 +01:00
fa299a9be9
Add debug message for RTSP requests
2010-12-12 15:06:57 +01:00
2011c33526
Cosmetic fix to RAOP device type strings
2010-12-12 10:27:04 +01:00
00c6de15ae
Make player_playback_stop() a synchronous call for real
...
Also, don't stop RAOP devices, just FLUSH them; this saves time when we
restart playback soon after stopping.
2010-12-12 10:25:21 +01:00
507cdb00e8
Rename playback_stop() to playback_abort() and make it an internal helper
2010-12-12 10:12:39 +01:00
dc31d75801
Fix endless loop on source errors under some REPEAT settings
...
Let source_read() propagate errors so playback_write() can abort if a
source error occurs.
2010-12-12 10:00:43 +01:00
1e9078182d
Fix RAOP volume printing
...
Partial revert of 4ac75a316a
2010-12-07 12:49:48 +01:00
02ea6f4823
Downgrade volume computations to float (from double)
...
Although we lose precision, this is still enough for computing relative,
absolute and RAOP volume and will make a difference on embedded CPUs.
2010-12-04 16:15:49 +01:00
4ac75a316a
Modify RAOP volume computation and printing
...
Compute the absolute value and do not use floor() to print out the
volume.
2010-12-04 16:13:54 +01:00
d6d7450557
Bump DACP protocol version
2010-12-04 15:08:07 +01:00
76621797e2
Implement DACP volume interface for Remote 2.0
2010-12-04 15:08:07 +01:00
1372f90ce7
Send out per-speaker (relative) volume atom
2010-12-04 15:08:07 +01:00
5674314161
Support clear-first in cue play command
2010-12-04 15:08:07 +01:00
0df4ab4555
Implement master volume & per-speaker relative volume
...
Volume is set independently for each speaker relative to the master
volume. Methods allow to set speaker volume independently and in relation
to the master volume.
2010-12-04 15:08:07 +01:00
9e9c3e42cc
Rework RAOP volume setting to be per-speaker
...
Player now pilots RAOP volume setting directly on a per-speaker basis.
2010-12-04 15:08:06 +01:00
9bd6d459a2
Maintain per-speaker volume information
2010-12-04 15:08:06 +01:00
6f7b12b1f2
Handle database upgrade v10 -> v11
2010-12-04 15:08:06 +01:00
27c89cf312
Remove old db_config_* interface
2010-12-04 15:08:06 +01:00
9507f8d059
Switch speaker state-saving to new db_speaker_* interface
2010-12-04 15:08:06 +01:00
012e90b4a3
Add a dedicated table for speakers
2010-12-04 15:08:06 +01:00
7de9408a10
Make sure device is deselected before removing it
2010-12-02 19:56:26 +01:00
78df98ba35
Introduce speaker selection/deselection helpers
2010-12-02 19:56:26 +01:00
55f0c7cfcd
Rename volume to master_volume
2010-12-02 19:53:36 +01:00
edfcf955a7
Replace device autoselect deadline with a boolean flag
...
Devices can be autoselected until we first get into the PLAY_PLAYING state.
This avoids having to check the player state when adding devices.
2010-12-02 19:53:36 +01:00
25cdedc343
Remove device list lock (dev_lck)
...
No longer necessary now that all device list operations happen in the
player thread.
2010-12-02 19:53:36 +01:00
320d3b9dde
Manage devices entirely in the player thread
...
Provide non-blocking player commands to the mDNS callback to manage
the device list. All operations on the device list now happen in the
player thread.
2010-12-02 19:52:45 +01:00
389e3f1123
Introduce non-blocking commands
2010-12-02 19:51:50 +01:00
ec4299e6c7
Turn speaker enumeration into a sync command
2010-12-02 19:51:08 +01:00
418e818bee
Move code around, no functional changes
2010-11-28 17:37:48 +01:00
c3e24a0d9a
Hide get_pos() debug messages behind DEBUG_SYNC
2010-11-28 17:33:19 +01:00
12daf7237e
Downgrade debug message priority
2010-11-28 17:33:07 +01:00
45e3d55ee0
Enumerate all active or advertised speakers
...
We need to include speakers that are currently active in our enumeration,
even if they're not advertising anymore; until the session is declared failed
by RAOP, we are streaming to this device, even if it's not advertising
anymore - which may be a temporary condition.
2010-11-28 17:33:00 +01:00
c70caad87e
Disable session expiration
...
Auto-logout currently doesn't work as expected and breaks streaming etc once
the timeout occurs. Disable it until we can make it work as expected.
Maybe we'll need to upgrade the DAAP version.
2010-11-11 10:44:57 +01:00
8cc3d4841f
Move last_active check into raop_device_find_or_new()
...
Removes some of the clutter in the mDNS callback and ensures the check is only
done for new devices.
2010-11-02 19:13:46 +01:00
6bfc4a65e2
Implement sort=artist for DACP/player
2010-10-26 18:06:36 +02:00
204a756283
Fallback to the Master mixer element if PCM is not available
...
When using PulseAudio through ALSA, the mixer doesn't have a PCM element;
fallback to Master in this case.
2010-10-24 18:53:58 +02:00
4f164b939c
Add support for JPEG artwork and cover.{png,jpg} album artwork
2010-10-24 18:44:53 +02:00
ee10bcf968
Rework target size determination
...
Move the code out of artwork_rescale() and into artwork_get(). Properly
implement "PNG prefers even row count" to avoid artifacts.
2010-10-24 17:38:12 +02:00
2be812e04d
Fix 32bit MurmurHash64 routines
...
Properly handle the tail of the data buffer, accessing the tail as an
unsigned char array instead of a uint32_t array.
Issue spotted by Peter Carmichael.
2010-10-23 18:36:10 +02:00
65c8924898
Add daap.songalbumartist to the list of supported DAAP query fields
2010-10-09 16:32:27 +02:00
e5af78fe9f
Implement sort=artist for DAAP queries
2010-10-09 16:06:00 +02:00
ee7b976eeb
Advertise DAAP updates support in server-info
...
We don't send out DAAP updates, but Remote requires this to work.
2010-10-09 15:54:53 +02:00
a8e7a7aeeb
Fix missing command_init() call in player_playback_next()
2010-10-07 21:06:40 +02:00
aa33b520ed
Identify RAOP device type
...
Identify the device type in the mDNS callback and decide features & quirk
in RAOP based on the identified device type.
2010-10-07 21:06:40 +02:00
3abf62179e
Implement RAOP retransmission
2010-10-06 19:30:04 +02:00
10a0b16573
Implement RAOP retransmit buffer
2010-10-06 19:30:03 +02:00
faea2d33a1
Split out RAOP packet sending
2010-10-06 19:30:03 +02:00
385375cdc6
Add RAOP control request handler
2010-10-06 19:30:03 +02:00
a2329dfd3a
Use djb_hash(libname) as the RTP SSRC ID
2010-10-03 17:01:08 +02:00
f13a83147d
Move code around, no functional changes
2010-10-02 13:18:12 +02:00
65a75dd85f
Do not use a scoped address in SDP payload
2010-10-02 12:41:45 +02:00
309ad6060e
RAOP device discovery rework, rework add/update
2010-09-30 19:24:34 +02:00
48de711301
RAOP device discovery rework, remove add/remove branch & reindent
2010-09-30 19:18:49 +02:00
999066d703
RAOP device discovery rework, split remove code
2010-09-30 19:15:17 +02:00
01df67ceb6
Move last_active check into the device add case
2010-09-30 19:08:43 +02:00
cd8686be82
Add DB profiling support
2010-09-29 18:56:38 +02:00
5c81144beb
Revert to standard SQLite functions for DB startup, creation and upgrade
...
No need to use the blocking variants here as there is no concurrency during
DB startup.
2010-09-29 18:26:31 +02:00
b79cf13c95
Remove custom collation and custom daap_songalbumid() function code
2010-09-28 18:39:43 +02:00
da0011de3b
Load our SQLite extension
2010-09-28 18:38:10 +02:00
a4c74c2063
Use AF_UNSPEC instead of -1 as error code for family
2010-09-26 14:52:41 +02:00
a3d549bd37
Reduce stack usage for boolean flags
2010-09-25 20:57:10 +02:00
50a9a3690f
RAOP auth quirk for old (802.11g) AirPort Express
2010-09-25 20:57:10 +02:00
cc4e271de1
Add Authorization header to all RTSP requests
2010-09-25 20:57:10 +02:00
2d139d77a5
Export evrtsp_method()
2010-09-25 20:57:10 +02:00
d0e0700a13
Move code around, no functional changes
2010-09-25 20:57:10 +02:00
6f642f487b
Rework WWW-Authenticate header parsing
...
Make it work for both
WWW-Authenticate: Digest realm="raop", nonce="518C974C3847DEAE59B1FE0609C437C702C4BEFE"
and
WWW-Authenticate: Digest realm="raop" nonce="3328882a152ab0b51bc16b15a038b3bb"
802.11g and 802.11n AirPort Express, respectively.
2010-09-25 20:57:10 +02:00
f7c2bf756a
Remove duplicate mstm tag in server-info reply
2010-09-18 22:50:26 +02:00
8411aa48b7
Keep Avahi code inside mdns_avahi.c
2010-09-18 17:25:50 +02:00
7ba3b23f63
Rename mdns_avahi.h to mdns.h
2010-09-18 17:24:34 +02:00
33d51f0652
Add key/value functions & data types
2010-09-18 17:24:33 +02:00
aa57931879
Fix typo in goto label name
2010-09-17 12:21:05 +02:00
d5d1a2d3cb
Move code around, no functional changes
2010-09-15 19:05:39 +02:00
b05d173139
Add a lock manager callback for ffmpeg
2010-09-15 18:20:23 +02:00
235e13ef70
Call avcodec_init()
2010-09-15 18:17:35 +02:00
748a208796
Fix gcrypt_init_fail error path
...
Set ret to EXIT_FAILURE and swap the gcrypt_init_fail and signal_block_fail
labels so they appear in the correct (reverse) order. No impact.
2010-09-15 18:05:20 +02:00
75fb755db7
Assign ms to target_pts to ensure full 64bit computation of target_pts
...
Clang produced interesting results without this (or casting ms to int64_t),
as the seek target got mis-computed and fell short of the requested seek
target in ms (ex. wanted 18569 ms -> got 555 ms).
2010-09-13 22:06:53 +02:00
115ded61d0
Move code around, no functional changes
...
Assign start_time right at the start, making the target_pts computation more
obvious wrt start_time and showing the symmetry of the target_pts and got_pts
computations.
2010-09-13 22:06:52 +02:00
d1af41f0e7
Fix got_pts computation wrt start_time
...
Substract start_time from got_pts after actually getting got_pts, and then
rescale the result.
2010-09-13 22:06:12 +02:00
bff494ac5d
Use a union for command argument in struct player_command
2010-09-13 19:08:29 +02:00
7f79ca5709
Modify player commands to use per-command lock & condition
...
This makes the player commands usable in a concurrent multithread setup, which
was not the case with the global command+lock+condition due to the time it
could take the player thread to act upon the command event. This left a wide
open window for race conditions with other threads locking cmd_lck before the
player thread had a go at it.
2010-09-13 19:07:00 +02:00
942f3e4aad
Modify player-to-DACP status update communication
...
Have DACP set a callback (through a sync_command() setter) into the player
instead of setting an fd without any locking. All the code now lies in DACP
instead of being split between DACP and the player.
2010-09-13 18:40:41 +02:00
b78b90ad0e
Remove useless #include <evhttp.h>
2010-09-12 18:43:22 +02:00
01b42d3108
Fix typo, checking for evbuf instead of update
2010-09-12 17:31:31 +02:00
c6c53e6a28
Fix integer type mismatch in SQL query
...
sample_count is uint64, not int.
2010-09-10 20:58:10 +02:00
b1e57f8f6a
Factor out common code in RSP
2010-09-10 18:47:43 +02:00
0cb62fdabf
Bind IPv4 server first, to avoid v4compat
2010-09-10 18:47:43 +02:00
e9b8fd8bd7
Check for both ip6-localhost and localhost
2010-09-10 18:47:42 +02:00
053b8df4ba
Factor out common code to increase playcount while streaming
2010-09-10 18:47:42 +02:00
b0a8e879e4
Remove useless check
2010-09-10 18:47:42 +02:00
71bf8390b0
Constify http_reply_401
2010-09-10 18:47:42 +02:00
535d691a4a
Fix full_uri memory leak in error path
2010-09-10 18:47:42 +02:00
0137b202f0
Allow use of pre-generated ANTLR3 parsers when antlr3 is not available
2010-09-04 12:57:10 +02:00
dd6fd6ceec
Use rm -f to clean up ANTLR-generated files
2010-09-04 12:01:30 +02:00
e90e81cdf5
Remove no-op "OR REPLACE"
2010-09-04 11:38:15 +02:00
f50e17b60f
Take disc number into account for track ordering inside albums
2010-09-04 11:33:30 +02:00
ebd673601d
Set an empty album_artist for songs part of a compilation if not set
...
Songs in a compilation must all have the same album_artist and album (due to
songalbumid); if a song in a compilation doesn't have an album_artist, set it
to an empty string instead of defaulting to the value of artist. This is less
likely to break the compilation.
2010-09-04 11:04:49 +02:00
de8884c8df
Add sort-headers support to DAAP song lists
2010-09-04 10:58:25 +02:00
ee294753e1
Add sort-headers support to DAAP groups query
2010-08-29 12:07:08 +02:00
8a2d76895c
Add sort-headers support to DAAP browse query
2010-08-29 12:07:08 +02:00
eaaaec91a1
Introduce DAAP sort-headers helpers
2010-08-29 12:07:07 +02:00
d4f341aff0
Handle include-sort-headers parameter in DAAP queries
2010-08-29 12:07:07 +02:00
9dec6d23be
Use DAAP collation in sort clauses
2010-08-29 12:07:07 +02:00
5dd58ea7a8
Use DAAP collation for browse queries
2010-08-29 12:07:07 +02:00
b5e3163d35
Use DAAP collation for group queries
2010-08-29 12:07:07 +02:00
f79dbc93cb
Introduce DAAP-specific collation function for SQLite
2010-08-29 12:07:07 +02:00
471f750a8c
Rework error handling where an oom variable was used
...
The oom-specific message was actually never used as it was hidden by
ret being < 0 and that condition was tested before oom.
2010-08-29 12:05:02 +02:00
1eec8e1a7b
Modify groups query to group by album name and with COLLATE NOCASE
2010-08-14 11:58:21 +02:00
dce9eb8d1f
Use COLLATE NOCASE for browse queries
2010-08-14 11:55:11 +02:00
1d35afbe62
Fixup file modes
2010-08-06 17:27:56 +02:00
ca72ee5926
Handle sort parameter in DAAP queries
...
This is used by Remote for the Title view.
2010-08-05 18:28:02 +02:00
5d69a8e34c
Consolidate sort clauses
2010-08-05 18:28:02 +02:00
20486ee0dd
Implement sorting for smart playlists queries
...
This will be used by the Title view in Remote.
2010-08-05 18:25:34 +02:00
ac427025b5
Remember selected output devices accross restarts
...
Save the selected devices to the DB at exit and automatically re-select them
the next time, provided:
- the player is not running already when the device appears
- the device appears no later than 5 minutes after startup
2010-08-04 19:17:21 +02:00
058e2e9b2b
Add config variables save/test/clear for 64bit integer as hex string
2010-08-04 19:17:21 +02:00
e373f83660
Kill useless memset() call
2010-08-04 19:01:53 +02:00
b3294c5079
Fix debug message typo
2010-08-03 19:11:41 +02:00
7d480faecd
Properly stop playback if playback cannot start to reset player state
...
If the playback cannot start for a reason of another, the player state
needs to be reset by calling playback_stop().
2010-08-03 19:09:50 +02:00
d9f5e2aa40
Set playlist ID when queueing a playlist via DACP playspec
2010-07-31 12:32:14 +02:00
ec1fc46c01
Include playlist ID in nowplaying
2010-07-31 12:31:56 +02:00
98aaa7c5fa
Maintain current playlist ID in the player state
...
cur_plid is 0 if not playing a playlist and takes the playlist ID otherwise.
2010-07-31 12:30:51 +02:00
94b4cd2459
Add support for shuffle in DACP playspec request
2010-07-31 12:09:13 +02:00
fa0ee0553a
Implement DACP playspec request
2010-07-31 12:09:13 +02:00
4a160e8ad1
Add player_queue_make_pl() for playlist-based queues
2010-07-31 12:09:13 +02:00
4347731133
Add mpco to playlists, hardcode to 0 for now
2010-07-31 10:40:39 +02:00
931c0aac29
Map mper to playlist id for playlists
2010-07-31 10:39:41 +02:00
055fe8f442
Make player_queue_make() generic and introduce player_queue_make_daap()
2010-07-31 10:30:45 +02:00
2e6ed82e14
Fix debug message
2010-07-31 10:30:45 +02:00
9a01a0e0d7
Kill RAOP sessions at deinit
2010-07-30 22:18:06 +02:00
58f4f2d345
Stop playstatus update event at deinit
2010-07-30 22:16:55 +02:00
3148ec8209
Stop command event and timer event (if running) at deinit
2010-07-30 22:16:07 +02:00
7df92ae6bd
Stop inotify event at deinit
2010-07-30 22:15:38 +02:00
25ee24d2be
Properly deinit DAAP sessions
...
Call event_del() before freeing the session when clearing the AVL tree. Caused
an infinite loop in event_base_free() in httpd_deinit().
2010-07-30 21:52:04 +02:00
f6a9e1f7f4
Kill update request connections during deinit
...
Avoid leaving active requests on the HTTP server before shutting it down.
2010-07-30 21:42:53 +02:00
51f879cb32
Turn flags into bitfields to reduce struct sizes
2010-07-30 19:09:09 +02:00
9cb4aaa921
Look out for AppleTV and flag the device for unencrypted streaming
...
The AppleTV has been reported as not using the encryption. Not actually
tested as I don't have an AppleTV to test with.
2010-07-30 19:09:09 +02:00
f5bcc82afb
Rework password handling in RAOP mDNS browser callback
2010-07-30 19:09:09 +02:00
7a09ee4092
Add support for streaming unencrypted audio
2010-07-30 19:09:09 +02:00
e106beb631
Rename, rearrange and make more use of the AIRTUNES_V2_* #defines
2010-07-30 18:34:59 +02:00
27b44dfe09
Fixup error handling for player & httpd startup
2010-07-30 17:47:23 +02:00
09485b0ed8
Update evrtsp based on evhttp 1.4.14b
...
Up from 1.4.10.
2010-07-23 18:28:50 +02:00
e376a5c5ad
Update evhttp to 1.4.14b
...
Up from 1.4.10.
2010-07-23 18:28:42 +02:00
81d09ed234
Account for new evhttp behaviour on failed incoming connections
...
The evcon associated with a request is freed by evhttp when the connection
fails. Protect against a NULL evcon when handling the connection failure.
2010-07-23 18:28:29 +02:00
e396906fee
Protect db_perthread_deinit() against NULL hdl
2010-07-17 14:41:11 +02:00
a678f5c99b
Relax Audio-Latency header check
...
Older G-only AirPort Express devices do not have an Audio-Latency header in
their RECORD reply.
2010-07-17 08:27:36 +02:00
47bd255ffc
Do not add AirTunes devices that don't support AirTunes v2
...
Filter based on the tp field of the mDNS TXT record.
2010-07-17 08:05:06 +02:00
4512a7ce9e
Do not add service browser to the list if browser creation fails
2010-07-16 18:36:16 +02:00
4544dc152b
Coding-style fix
2010-07-16 18:36:09 +02:00
3cbca1dd07
seteuid(0) for reopening the log file
2010-07-14 13:06:32 +02:00
c4e4db0728
Complete IPv6 handling in the timing sync service
...
This commit adds the missing bits that should have been part of
commit efbea91ed4
2010-07-11 20:30:00 +02:00
98ba2fb63d
Handle link-local addresses
...
Discard IPv4 link-local addresses; IPv4LL doesn't work on most systems, so the
address are effectively useless to us.
Turn IPv6 link-local addresses into scoped addresses by appending the interface
name to the address.
2010-07-10 12:36:47 +02:00
e2712cae0d
Handle IPv6 scoped addresses
2010-07-10 12:36:47 +02:00
deae610965
evrtsp: Handle IPv6 scoped addresses
2010-07-10 12:36:40 +02:00
01cde2c50c
Cleanup debug message
2010-07-10 12:26:31 +02:00
65d365197a
Use $(ANTLR) variable instead of substitution to invoke ANTLR
...
This makes it possible to override the value when calling make.
2010-06-26 12:20:49 +02:00
8e31fd6672
Kill extra semi-colon
2010-06-21 19:19:13 +02:00
691e6a8c93
Fix | vs. |= typo
2010-06-21 19:18:52 +02:00
3b7a71527a
Check & fix UTF-8 strings before adding/updating files
2010-06-21 17:50:09 +02:00
35d6ac4cfa
Add unicode_fixup_mfi() to check & reencode UTF-8 fields in struct media_file_info
2010-06-21 17:50:09 +02:00
da0c10a392
Add unicode_fixup_string() to check & reencode UTF-8 strings
2010-06-21 17:50:09 +02:00
b7aac26444
Check for GNU libunistring and use it
2010-06-21 17:50:09 +02:00
7d858d6c9f
Add support for IPv6 RAOP sessions
2010-05-14 17:38:16 +02:00
b1d265b0ea
Add IPv6 support for AirTunes streaming
2010-05-14 17:38:10 +02:00
efbea91ed4
Run control and timing services on v4 and v6
...
Add pointers to the RAOP services (control & timing) to raop_session;
depending on the family, raop_session_make() will set them to the proper
services.
2010-05-14 17:38:05 +02:00
4a199cdcce
Introduce struct raop_service for timing & control services
2010-05-14 17:38:00 +02:00
b8238e6a78
Add IPv6 support to player and RAOP for device discovery
2010-05-14 17:37:55 +02:00
c9818e9269
Add IPv6 support to Remote pairing agent
2010-05-14 17:37:13 +02:00
588b328b45
IPv4 binding failure is fatal in all cases
...
IPv4 and IPv6 are bound separately; IPv6 may fail if unsupported, IPv4
must always succeed.
2010-05-14 17:36:58 +02:00
ed38ce7dd1
Add IPv6 support to evrtsp
2010-05-14 17:36:41 +02:00
74c4dd1ea3
Add IPv6 support to evhttp
...
Just the bits we need.
2010-05-14 17:36:36 +02:00
4bd09cba62
Browse and resolve mDNS services on both IPv4 and IPv6
2010-05-14 17:36:29 +02:00
c2ae855a28
Always re-add timing event instead of returning on error
2010-05-13 17:16:44 +02:00
143b612c97
Fix REPEAT_OFF behaviour on single-item playlists
2010-05-09 09:52:09 +02:00
576e1cc9ef
Check for player status after playback_write()
...
playback_write() can actually stop the player, so check that this did
not happen.
2010-05-09 09:24:05 +02:00
4ebbe3696f
Fix integer parameter check for 32bit platforms
...
Replace strtol() with strtoll() as we need to handle 64bit values for
daap.songalbumid at least.
2010-05-09 09:00:44 +02:00
84279b817d
Kill two open-coded instances of safe_atou32()
2010-05-09 08:55:50 +02:00
1a829d69a0
Do not free evrtsp_request after make_request() call
...
At that point, the request has been added to the connection and will be
freed when the connection is freed.
2010-05-08 12:16:54 +02:00
6de5c64670
Do not free evhttp_request after make_request() call
...
At that point, the request has been added to the connection and will be
freed when the connection is freed.
2010-05-08 12:05:52 +02:00
c2977fd61d
Protect playback_start() againt empty playlist
2010-05-05 19:19:16 +02:00
682e495ed0
Protect shuffle against empty player playlist
2010-05-05 19:17:36 +02:00
36f0d0a76e
Implement DACP setproperty for dacp.userrating
2010-05-05 19:13:22 +02:00
eb66a56e1d
Pass query parameters to DACP property setters
2010-05-05 19:13:15 +02:00
f38ff924d7
Add safe_hextou32()
2010-05-05 19:13:15 +02:00
548cd2a150
Use httpd_send_reply() instead of evhttp_send_reply() where pertinent
...
gzip replies where useful; artwork should not be compressed, as PNGs are
already compressed and that would be a waste of time.
2010-05-03 19:11:55 +02:00
13c9de3ed1
Introduce httpd_send_reply() with gzip capability
2010-05-03 19:11:55 +02:00
33936bacfa
Check for zlib and use it
2010-05-03 18:19:41 +02:00
0982b9fbbb
Make vlogger() static; unneeded outside of logger.c
2010-05-03 18:19:40 +02:00
b615946989
Default sound card for FreeBSD
2010-05-02 11:45:16 +02:00
882b42f83c
Port player to FreeBSD
...
The kqueue/kevent timers are no replacement for timerfd, so unfortunately this
doesn't work well at all. Need a higher resolution timer.
2010-05-02 11:45:16 +02:00
e49421b04b
Integrate OSS4 local audio output
2010-05-02 11:45:16 +02:00
8c0649e066
Add OSS4 local audio output implementation
2010-05-02 11:45:15 +02:00
d38db5868c
Implement jumping in DACP cue play command
2010-05-02 11:45:15 +02:00
c11752e9a6
Honor dacp.shufflestate parameter in cue play command
2010-05-02 11:45:15 +02:00
9f84fd9794
Wire up DACP setproperty for dacp.shufflestate
2010-05-02 11:45:15 +02:00
a74caeed82
Wire up DACP setproperty for dacp.repeatstate
2010-05-02 11:45:15 +02:00
7751c23f18
Implement DACP setproperty for dacp.playingtime
2010-05-02 11:45:15 +02:00
6eca3a98d8
Implement DACP setproperty
2010-05-02 11:45:15 +02:00
297c86c453
Implement DACP getproperty and DACP properties core code
2010-05-02 11:45:15 +02:00
b73631bb5c
Introduce helpers for DACP nowplaying & playingtime
2010-05-02 11:45:15 +02:00
505b7a2ade
Wire up nextitem and previtem
2010-05-02 11:45:15 +02:00
b4a5ba6f3c
Wire up pause and playpause
2010-05-02 11:45:15 +02:00
f5e84d6950
Implement DACP nowplayingartwork
2010-05-02 11:45:15 +02:00
9c569f10a9
Implement playstatus updates
2010-05-02 11:45:15 +02:00
b72948e027
Rework playstatusupdate reply
...
Introduce make_playstatusupdate() and use player_get_status() to get the
player status. Implement the full playstatusupdate reply.
2010-05-02 11:45:15 +02:00
ca2ee21d84
Implement DACP cue requests
2010-05-02 11:45:15 +02:00
bb5703d878
Implement DACP setspeakers
2010-05-02 11:45:14 +02:00
aa20a2e485
Implement DACP getspeakers
2010-05-02 11:45:14 +02:00
d036fa306e
Wire up player
2010-05-02 11:45:14 +02:00
87861b54ea
Build audio player
2010-05-02 11:45:14 +02:00
f7886c87cb
Add Airport Express device section
2010-05-02 11:45:14 +02:00
f93090a713
Add audio section to the config file
2010-05-02 11:45:14 +02:00
ffcf100c00
Replace rng_rand_range() with GLib's g_rand_int_range() that works better
2010-05-02 11:45:14 +02:00
5e9c245e39
Add random number generator and related functions
2010-05-02 11:45:14 +02:00
47589ff34a
Add audio player
2010-05-02 11:45:14 +02:00
53c20c2f1c
Add ALSA-based local audio output support
2010-05-02 11:44:43 +02:00
d335b2d331
Add RAOP implementation, with AirTunes v2 streaming
2010-05-02 11:44:43 +02:00
992eb9009a
Add evrtsp - RTSP implementation on top of libevent, derived from evhttp
2010-05-02 11:44:43 +02:00
8427707afc
Create evbase_httpd before protocol handlers init
...
DACP needs the httpd event base at init time.
2010-05-02 11:44:43 +02:00
dc95a04562
Add optional sorting clause to Q_ITEMS
2010-05-02 11:44:43 +02:00
4dc8f11887
Handle database upgrade v9 -> v10
2010-05-02 11:44:43 +02:00
74cc5a7a13
Add config variables save/fetch for integer variables
2010-05-02 11:44:43 +02:00
49b7a96eec
Add safe_hextou64()
2010-05-02 11:44:43 +02:00
7a02215d0d
Add Base64 encoding routines
2010-05-02 11:44:43 +02:00
1849601d56
Add a log handler for libasound
2010-05-02 11:44:43 +02:00
ff7e6aa533
Add logdomains for player, RAOP and local audio
2010-05-02 11:21:08 +02:00
17daace67f
Add seek support to transcode
2010-05-02 11:21:08 +02:00
9fb7ec8e5c
Make the WAV header optional
2010-05-02 11:21:08 +02:00
e3fb8f00cf
Maintain libhash in the conffile module
2010-05-02 11:21:07 +02:00
27acda871a
Constify dmap_add_string() parameter
2010-05-02 11:21:07 +02:00
bccc6da87f
Set closecb to NULL on update requests' connections at deinit
...
Otherwise the closecb is called when the connection is closed/freed during
deinit, and this happens in the HTTP cleanup after the DAAP and DACP cleanups
have run, leading to spurious "struct update_request not found" messages.
2010-05-02 11:21:07 +02:00
17b1e1a7bf
Fix size_t in snprintf()
2010-05-02 10:17:22 +02:00
f696aa321e
Fix error message in db_file_add()
2010-05-02 08:23:21 +02:00
465c10ded3
Rework database version check to error out on newer databases
2010-05-02 08:23:21 +02:00
00d6381f15
Introduce and use db_blocking_{prepare_v2,step}
...
Make use of the SQLite3 unlock notify API to wait for the database to
become available. From the SQLite3 sample code for the unlock notify API.
This requires SQLite3 to be built with SQLITE_ENABLE_UNLOCK_NOTIFY.
2010-05-02 08:23:21 +02:00
f9454aa4a3
Introduce db_exec(), replacing sqlite3_exec()
2010-05-02 08:23:21 +02:00
dc18860dc5
Enable SQLite3 shared-cache mode
...
This requires SQLite 3.5.0+ for per-process (as opposed to per-thread)
shared-cache support.
It also enables the use of the unlock notify API.
2010-05-02 08:22:41 +02:00
d2932896a3
Switch SQLite3 to SQLITE_CONFIG_MULTITHREAD mode
2010-05-02 08:22:41 +02:00
0411720a58
Perform explicit sqlite3 init/deinit
2010-04-26 18:24:09 +02:00
4551d530f9
Lower logging level for files with no metadata
2010-04-10 11:23:11 +02:00
ce8fe19627
Add handlers for ID3v2 track and disc fields
2010-04-10 11:21:04 +02:00
61f5b6d833
Run two passes for gathering metadata
...
The extra md_map needs to be used before the generic md_map because
the extra md_map needs to be used before av_metadata_conv while the
generic md_map needs to be used after av_metadata_conv. This allows
handling of things like ID3v2 track fields which get mapped to the
generic track field by av_metadata_conv but actually contain both
track number and the total number of tracks on the disc.
Note: modified from Dustin's original patch.
2010-04-10 11:15:16 +02:00
b8b205e7f2
Add function pointer for metadata handler to struct metadata_map
2010-04-10 10:59:29 +02:00
b219b912f2
Split out VORBIS field names into a dedicated extra md_map
2010-04-10 10:55:52 +02:00
f36261be65
Add album_artist to the generic md_map
...
The generic metadata field name is album_artist and not albumartist; that, or we
previously missed that field.
2010-04-10 10:55:52 +02:00
a5bdb9d59a
Identify TDRC as coming from ID3v2.4
2010-04-10 10:55:46 +02:00
1df0258055
Demote "could not find requested meta field" message to E_WARN
2010-04-10 09:46:48 +02:00
5475c18308
Remove FLAC-specific raw mode
...
Older versions of ffmpeg did not support raw FLAC streams properly and needed
to be fed the raw stream manually; looks like it's been fixed in ffmpeg 0.5.
2010-03-28 16:19:30 +02:00
887d1bf5ca
Small clarification in transcode_cleanup()
2010-03-28 16:14:36 +02:00
21e564e493
Add the DISCTOTAL tag for formats using VORBIS comments
2010-03-27 12:08:49 +01:00
e87f46e95c
Add the TRACKTOTAL tag for format using VORBIS comments
2010-03-25 21:40:17 +01:00
b7ec65963d
Constify data tables where possible
2010-03-25 21:40:17 +01:00
c545e52374
Simplify streams handling
...
Keep pointers to the streams instead of the stream number.
2010-03-25 21:40:17 +01:00
6677b3435d
Call av_metadata_conv() to convert metadata to ffmpeg's generic format
...
This is actually needed for everything to work properly, but it only really
started breaking with newer versions of ffmpeg where more demuxers have been
completely ported over to the metadata API.
2010-03-25 21:40:17 +01:00
04e8f5cfd6
Split TV show tags out of the generic md_map
2010-03-25 21:39:41 +01:00
27a095b606
Split ID3 tags out of the generic md_map
2010-03-25 21:38:19 +01:00
52e38dd76a
Allow a secondary metadata map for metadata extraction
2010-03-25 21:38:19 +01:00
4da80edc3f
Pick up metadata from the selected stream(s) in addition to the file itself
...
OGG has per-stream metadata; recent versions of ffmpeg report metadata
per-stream in this case.
2010-03-25 21:38:19 +01:00
c2f64e4280
Split metadata extraction out of scan_metadata_ffmpeg()
2010-03-25 21:38:19 +01:00
d71fa2b72e
Replace av_read_packet() (obsolete) by av_read_frame()
...
Fixes MP3 playback, probably others too.
2010-03-25 20:28:23 +01:00
e6d75534d7
Make database location a configuration item
2010-03-21 11:33:05 +01:00
6c6a3a7935
Make a note to remove ID3v2 tag names ASAP
2010-03-21 11:27:55 +01:00
6424a1fe95
Add ID3v2.2 tag names
2010-03-21 11:21:43 +01:00
39dfa4dae1
Mark ID3v2.3 metadata tag names as such
2010-03-21 11:18:10 +01:00
4996965b34
Handle database upgrade v8 -> v9
2010-03-19 19:14:34 +01:00
19b6780a3c
Remove provisions for multi-library support
...
It is now clear that multi-library support will not happen, so remove whatever
provisions were in the code for that.
It comes with a small change to the configuration file, too.
With this, DB schema version went to 9.
2010-03-19 19:09:18 +01:00
d6285eef40
Add audio resampling to the audio decoding code
...
Transcoded (decoded) files will now always come out in signed, little endian,
16bit, 44100 Hz, stereo format regardless of the format of the input file.
This in effect fixes transcoding (and playback on some devices) for files that
do not match this format.
There's probably a discussion to be had regarding handling of 48 kHz and 96 kHz
content, though, as downsampling to 44.1 kHz to have the client or final output
device upsample again is clearly not an optimal solution.
2010-03-15 18:38:33 +01:00
8375ac75ca
Rework error handling in transcode_setup()
...
Add the setup_fail_codec label and jump to it if an error occurs once the
codec has been opened. In the raw input codepath, don't use this label until
the file is properly opened, as it also closes the fd and frees the raw
buffer.
This also fixes a file descriptor leak in the case where an error happened
after the file was opened in the raw input codepath.
2010-03-15 18:35:29 +01:00
db0690afa1
Use int16_t for decoded audio data buffers
2010-03-15 18:34:14 +01:00
9e8403061c
Add TPE2 -> albumartist ID3v2 mapping
...
Reported by Ace Jones.
2010-03-10 17:11:08 +01:00
5da807f829
Add ID3v2 tags to the metadata table
...
ffmpeg doesn't convert ID3v2 tag names to generic metadata names, so
add the ID3v2 tag names to the table to pick them up.
This fixes scanning of MP3 files in various cases.
More in this post and its attachment:
<http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/2009-September/076213.html >
Thanks to Raivo Hool for bringing up the issue and fix.
2010-03-07 19:18:06 +01:00
ece7c0d071
Handle DAAP extra_data requests for groups/items artwork
2010-03-07 15:45:52 +01:00
0eca9b4313
Add artwork handling routines
...
External artwork only, until ffmpeg supports embedded artwork.
2010-03-07 15:45:47 +01:00
666ce98055
Add a logdomain for artwork handling
2010-03-07 15:23:40 +01:00
ca1c72651f
Bump log prefix size to 8
2010-03-07 15:23:40 +01:00
b0e10fb97d
Add groups queries
2010-03-07 15:23:40 +01:00
641e5462cc
Rename pl_id member of struct query_params
2010-03-07 15:23:40 +01:00
6a144cd670
Add db_file_path_byid()
2010-03-07 11:13:38 +01:00
1f5efe038b
Register ffmpeg evbuffer URL handler
2010-03-07 11:13:38 +01:00
a1ef2ab243
FFmpeg "evbuffer:0x..." URLProtocol implementation
...
Implement a URL handler to output data to an evbuffer from ffmpeg.
2010-03-07 11:13:38 +01:00
119525e612
Add a logger callback for FFmpeg log messages
2010-03-07 11:13:38 +01:00
4c48dbad28
Add a logdomain for ffmpeg
2010-03-07 11:13:38 +01:00
107ec85578
Constify the format string of logging functions
2010-03-07 11:13:38 +01:00
07146e3261
Handle database upgrade v7 -> v8
2010-03-06 19:10:49 +01:00
224ef48137
Make album groups persistent
...
Store groups (only album groups supported at the moment) in the DB,
so their ids are persistent for the duration of the forked-daapd session.
Those ids are used to, among other things, retrieve artwork, so we must
provide ourselves some persistence here.
This brings us to schema version 8.
2010-03-06 19:02:49 +01:00
88dde32fc7
Recompute all songalbumids at startup
...
Due to the two Murmur64 implementations for 64 and 32bit machines, the
hash is not compatible when moving the SQLite DB between 32/64 bit hosts.
So we'll recompute all the songalbumids at startup, just in case.
2010-03-06 18:59:58 +01:00
0e9a8674d9
Handle database upgrade v6 -> v7
2010-03-06 17:29:48 +01:00
facb9957d8
Move daap_songalbumid() to its now-unique callsite
2010-03-06 17:29:48 +01:00
748cca63be
Maintain songalbumid inside the files table
...
songalbumid is used a lot in queries from Remote; computing the hash for
each row is a major waste of time on big libraries and slow machines, so
let's store the hash in the table.
This brings us to schema version 7.
2010-03-06 17:29:37 +01:00
20c57d5289
Implement DAAP auto-logout
...
And advertise it.
2010-03-06 10:30:59 +01:00
8c2def5ef5
Move daap_session_kill() higher up
...
No functional changes.
2010-03-06 10:29:53 +01:00
affbae1c47
Make evbase_httpd non-static
...
Make the httpd event base available to httpd protocol handlers.
2010-03-06 10:27:39 +01:00
c9e91532b3
Get rid of the intermediate buffer in itunes_pairing_hash()
...
No need to build the string to be hashed in advance, it can just
be written piece by piece to the md.
2010-02-22 17:49:24 +01:00
2dde2f180d
Revert "Add a fail_cb to evhttp_request for connection failures"
...
The fail_cb extension was actually never needed; we've migrated away from
it, so let's clean that up now.
This reverts commit 1ffcbdae27
2010-02-14 09:36:55 +01:00
18abda3a97
Use evhttp_connection's closecb instead of our fail_cb extension
...
The closecb callback of evhttp_connection does what we need, so no need
to use that extension anymore.
2010-02-14 09:34:29 +01:00
a92dc076e8
Add a test facility for DMAP
...
Add a /dmap-test handler that sends back a list containing test values
for all standard DMAP types (string + all integer types).
2010-02-10 18:29:26 +01:00
056f4b6997
Reindent dmap_add_field()
...
Fix indentation in dmap_add_field(), no functional changes.
2010-02-10 18:29:26 +01:00
3280fd5cf9
Get rid of magic hash values for filtering query parameters
...
Some metadata were filtered out from the reply by directly checking
for their hash, including the hash value in the code. Remove the magic
values and compare dfm->field against the relevant dmap_* field as for
other special cases.
2010-02-10 18:29:26 +01:00
2524eb0f8f
Rework special cases in daap_reply_songlist_generic()
...
Use a pointer comparison instead of strcmp(), now that the fields
have been separated out from the field map.
2010-02-10 18:29:26 +01:00
3df34fe9a8
Remove mper special case in daap_reply_groups()
...
mper was so far the only LONG we really cared about, but dmap_add_field()
now has proper support all DMAP types. This special case can go.
2010-02-10 18:29:26 +01:00
cfabc9a456
Update DMAP fields
...
Update field types, add new fields (commented out). This fixes a number
of mis-assigned types. Update generated from the result of a /content-codes
request.
2010-02-10 18:29:26 +01:00
b4b89dd937
Break out the dmap_field_map struct into two structs
...
Introduce struct dmap_field holding the field tag, description and
DMAP type and use it in struct dmap_field_map to replace the tag,
desc and type fields.
This enables semi-automated updates of the DMAP fields information
from the output of a /content-codes request.
2010-02-10 18:29:20 +01:00
d8bd8e5381
Rewrite dmap_add_field() to handle properly all DMAP types
2010-02-10 18:21:32 +01:00
20d08d8a49
Add safe_atou32() and safe_atou64()
2010-02-10 18:21:32 +01:00
0607e82a42
Add missing DMAP types and correct existing types
...
Most of the unsigned DMAP types were missing and assignments were incorrect
between signed and unsigned types. Fix all of this, and add (preliminary)
support for the new types.
2010-02-10 18:21:32 +01:00
d4fb2091c8
Use an enum for DMAP types
2010-02-10 18:21:32 +01:00
42dd7ddd00
Kill code redundant with dmap_add_field()
...
This code in daap_reply_songlist_generic() is redundant with code
in (new) dmap_add_field() and can be removed, with a tweak: we must
ensure the val integer is always 0 if not used to override a value in
the transcoding case.
2010-02-10 18:21:32 +01:00
a5a46b8a53
Fix lseek() return value handling
...
lseek() returns an off_t and not an int, using an int to store and
test the return value means we'll error out when the position in the file
gets past INT_MAX.
2010-02-10 18:19:32 +01:00
2b4f07195a
Kill leftover includes
2010-02-06 07:25:44 +01:00
71a40c5149
Simplify the iTunes pairing hash using standard MD5
...
The pairing hash actually uses standard MD5, so let's simplify the
code by using a standard MD5 implementation. Now that function is
readable and understandable by mere mortals.
Thanks to Jeff Sharkey for posting that simplified version.
2010-02-05 18:39:03 +01:00
2f385bff2c
Add libgcrypt, check for it and perform global initialization
2010-02-05 18:38:39 +01:00
cb4320791b
Use eventfd instead of pipes if available
...
eventfd has less overhead than a pipe, works as a counter and uses a
single fd. Use it on Linux if available (that should be pretty much
always given the glibc and kernel requirements).
2010-02-04 18:52:13 +01:00
274dccf66c
Reduce STREAM_CHUNK_SIZE to a more manageable 64k
...
512k might be a bit too much, as it can take time to read 512k from the
filesystem (and we're using a blocking read) or from the decoder. Going
down to 64k will make this more manageable and improve the response time
when streaming to multiple clients at the same time.
2010-02-02 21:09:56 +01:00
848dd41993
serve_file() is broken due to evbuffer_read()
...
If we ever need to serve files for a web interface or otherwise, serve_file()
will need to be fixed to not use evbuffer_read().
2010-02-02 21:09:56 +01:00
6e5f49bdf9
Use transcode variable to check for transcoding status
2010-02-02 21:09:56 +01:00
825569dc88
Rework failure path in httpd_stream_file()
...
Kill code duplication, make it all clearer.
2010-02-02 21:09:56 +01:00
f0239951e1
Replace evbuffer_read(); should not be applied to files
...
evbuffer_read() is really meant to read from sockets and not regular
files. It also looks like evbuffer_read() was causing issues with large
files, locking up a little below 2 GB for an unknown reason (couldn't
reproduce).
2010-02-02 21:09:56 +01:00
1a3620d0a4
Handle DMAP long type properly in dmap_add_field()
2010-02-02 21:09:56 +01:00
58faeaceca
Integer types cleanup
...
Try to be a bit more strict about integer types, use off_t or int64_t for
file size and file offsets.
Replace safe_ato*() by safe_atoi32() and safe_atoi64(), fix integer types
at call sites to match.
2010-02-02 21:09:56 +01:00
5d41d2d99c
Move file_size to an int64_t, matching other types (off_t)
2010-02-02 21:09:55 +01:00
516909545b
Include config.h in all C files
2010-02-02 21:09:55 +01:00
1df7ec1b7c
Use posix_fadvise() to hint the OS when streaming raw file
...
Hinting the OS about our behaviour shouldn't make a big difference in
performance but it will help the OS manage its disk cache and can reduce
memory pressure on small systems.
2010-02-02 21:09:55 +01:00
8ac5f48fe6
Wire up DACP support
2010-01-30 17:30:22 +01:00
a52ff42697
Introduce stub DACP protocol implementation
2010-01-30 17:30:22 +01:00
168144c1e0
Make daap_session_find() non-static so DACP can use it
2010-01-30 17:30:22 +01:00
9f1c849241
Add logdomain for DACP
2010-01-30 17:30:22 +01:00
44bf308701
Waive HTTP authentication on the library for Remote
...
DAAP queries from Remote won't need HTTP authentication as they all
require a valid session-id; Remote can only obtain a valid session-id
if its pairing-guid is known to us (it did pair successfully with us).
2010-01-30 17:30:22 +01:00
e016ced119
Authenticate Remote clients by their pairing-guid
...
Remote clients have a waiver for HTTP authentication; they are authenticated
by their pairing-guid given during the pairing process.
2010-01-30 17:30:22 +01:00
115d28e24a
Parse pairing response and save pairing GUID
...
The pairing GUID will be used later on to authenticate the Remote
instance when it logs in.
2010-01-30 17:30:22 +01:00
b35c4749a2
Maintain a db connection in main.c for Remote pairing agent
2010-01-30 17:30:22 +01:00
dfa3db7732
Use struct pairing_info in struct remote_info
2010-01-30 17:30:22 +01:00
d384bc13a3
Handle database upgrade v5 -> v6
2010-01-30 17:30:22 +01:00
762d80e0bb
Add Remote pairing info storage facility
...
This brings schema_version to 6.
2010-01-30 17:30:22 +01:00
07a71b4e94
Reorganize httpd_daap
...
Some code moved around for clarity, no functional changes.
2010-01-30 17:30:22 +01:00
7ec27a30eb
Use DMAP routines from dmap_helpers.c
2010-01-30 17:30:22 +01:00
eca166feaa
Move DMAP routines to a dedicated module
2010-01-30 17:30:22 +01:00
29fb23893d
DAAP update request requires a session-id
2010-01-30 17:30:21 +01:00
b9a2e10272
Modify DAAP update request debug messages
2010-01-30 17:30:21 +01:00
2924a98f1a
Fix pairing_cb() - readd event after pairing
2010-01-30 17:30:21 +01:00
2c6ceac486
Rework code flow in httpd_gen_cb()
2010-01-30 17:30:21 +01:00
78275ae432
Remove useless include
2010-01-30 17:30:21 +01:00
42f39938d5
Start implementing DAAP updates
...
Stall update requests if revision-number == current revision. This is a
first step that is necessary to get clients to work properly (eg Remote).
2010-01-28 19:20:00 +01:00
7ddd135e2b
Extend close detection to incoming connections
...
Stock evhttp has no means to detect when an incoming connection gets
closed by the client; it will notice the connection has gone down only
when sending back a reply.
For DAAP update requests working as a push mechanism with an HTTP request
stalled by the server until there actually is an update available, we need
to be notified when a connection goes down so we can perform proper cleanup
and not retain memory.
Do so by extending the close detection mechanism used for outgoing connections
and the connection failure callback we already have in place for streaming.
2010-01-28 19:19:31 +01:00
f425eddb62
Clean up remote list at deinit
2010-01-28 19:19:16 +01:00
4321cffc87
Make queries on daap.songalbumid:0 a no-op
...
Remote makes queries with daap.songalbumid:0, which doesn't make sense. Make
that a no-op.
2010-01-27 18:31:13 +01:00
21098d4c89
Fix query and path for playlist #1
...
The query was erroneously put into the path column; also change the query
for 1 = 1 instead of disabled = 0 which is redundant.
2010-01-27 18:29:59 +01:00
b5b9f92d97
Fix HTTP error return in daap_session_find()
2010-01-27 12:18:22 +01:00
eae5370c08
Log HTTP (non-DAAP, non-RSP) requests
2010-01-26 18:15:08 +01:00
4701817333
Replace strlcpy() with evutil_snprintf() in evhttp
...
Get rid of strlcpy() and its implementation entirely, it doesn't buy anything
over snprintf(). Use evutil_snprintf() so as to match the rest of the code.
2010-01-26 17:54:45 +01:00
98cb978b9b
Set capability atoms to true in server-info reply
...
Capability atoms like mslr, msbr and friends should be set to true; it
seems their presence in the reply is actually enough, though.
2010-01-25 18:33:25 +01:00
7e3b6957b2
Move the pairing agent to the main thread
...
The pairing agent doesn't need a thread of its own, the main thread can host
it. Move it there and save a thread.
2010-01-25 17:55:11 +01:00
854abd8026
Specify field width for pairing hash
...
No field width was specified when the 128bit hash is converted to a string;
make sure we get 8 hex digits per 32bit hash component.
2010-01-25 17:51:17 +01:00
e6234c35ad
Fix field width for 64bit library name hash
...
Was 8 hex digits, should have been 16 hex digits.
2010-01-25 17:47:37 +01:00
672e4697ae
Handle database schema upgrade from v4 to v5
...
Force a library rescan to fixup media_kind for regular videos.
2010-01-24 11:16:31 +01:00
12e0c9268d
Unspecified videos are "movies", media_kind=2
...
media_kind=2 (Movies) indicates a regular video, that is, a video that
isn't a TV Show (media_kind=64).
Also fix up the system playlist for Movies, and that brings us to DB
schema_version 5.
2010-01-24 11:11:08 +01:00
f85fa927c8
Dereference library directories before processing
...
The filescanner dereferences symlinks as it encounters them, but it did
not dereference the top-level library directories given in the config.
Also the playlist scanner always dereferences the filenames.
As a result, there was a mismatch between the paths in the files table and
the paths in the playlistitems table if the library directory given in the
config contain a symlink somewhere along the way.
2010-01-24 10:54:52 +01:00
022bebe1d9
Send back mslr in server-info reply, indicating login is required
...
At least FrontRow honours this atom of the server-info reply.
2010-01-24 10:53:49 +01:00
4aa207533e
Ignore empty lines in M3U playlists
2010-01-23 18:41:54 +01:00
d3fe586d5b
Remove a special case for playlist #1
...
Not needed anymore, now that playlist #1 has been turned into a smart
playlist.
2010-01-22 19:02:29 +01:00
1af1cf51c7
Return special playlists in playlist list response
2010-01-21 17:56:44 +01:00
67b3a8c2da
Handle database schema upgrade from v3 to v4
2010-01-21 17:54:50 +01:00
3fef4334bb
Add support for smart playlists and some default ones
...
Add system playlists for Music, Movies, TV Shows, equivalent to iTunes.
2010-01-21 17:52:51 +01:00
fefdb23409
Simplify DB init routine
2010-01-21 17:51:44 +01:00
944bf3f132
Check database version first, if that fails, try DB init
...
Doing it the other way around is a guaranteed way to run into issues when
a schema upgrade is needed.
2010-01-21 17:51:00 +01:00
87abc3f432
Avoid useless double attempt at converting string to integer
...
Fixup dmap_add_field() and one of its callers to avoid making two useless
attempts at converting a string to an integer in some cases.
2010-01-20 18:34:36 +01:00
ba251b16ae
Start keeping track of DAAP sessions
...
This will soon be required as we'll need to keep some knowledge about
the session in some cases. This also makes us a bit more compliant.
2010-01-20 18:24:52 +01:00
f126b04521
Tell libavl to free() ITML <-> DB mappings
...
The mappings should be free()d with the standard free() when we are
done with the tree. This fixes a memory leak.
2010-01-20 18:19:51 +01:00
2cb67743fc
Add service type to the "ALL FOR NOW" message
2010-01-20 18:17:04 +01:00
d47c205452
Feed .remote files to the Remote pairing agent
2010-01-17 10:52:58 +01:00
3c7456f545
Add Remote pairing services start/stop
2010-01-17 10:52:58 +01:00
c191aff5cd
Add remote_pairing.[ch] to sources
2010-01-17 10:52:58 +01:00
625b8e3177
Add a pairing agent for Remote
...
Remote is the iPod/iPhone application that can act as a remote control for
iTunes. Remote must be paired with an iTunes instance before it can control
it; this pairing process includes a challenge/response autentication.
This pairing agent makes it possible to pair Remote with a forked-daapd
instance. It is the very first step for Remote support.
2010-01-17 10:52:58 +01:00
04f4622086
Add generic mDNS browsing + resolving facility
2010-01-17 10:52:58 +01:00
2b2ec87e7e
Add the "remote" logdomain for Remote pairing
2010-01-17 10:52:58 +01:00
73fa690fd4
Advertise the _touch-able._tcp service
...
_touch-able._tcp is the service used by Remote.app to discover and identify
libraries it interacts with.
2010-01-17 10:52:58 +01:00
d228e0dcb8
Rename servername variable to a more appropriate libname
2010-01-17 10:52:58 +01:00
b918d14e38
Fix group_entries list traversal
2010-01-17 10:52:58 +01:00
dd1712abdc
Use glibc endianness-related headers if available
...
BSD headers aren't working properly on kFreeBSD, so use the glibc ones.
2010-01-17 10:52:58 +01:00
bf2c2b68c0
Revert "Remove default playlist & special case"
...
This reverts commit af95cee79b
2010-01-14 17:39:56 +01:00
af95cee79b
Remove default playlist & special case
...
The default playlist (called "Library") doesn't actually have a purpose; I
though it was needed for RSP (SoundBridge) but it doesn't look like it makes
any difference with or without this playlist.
2010-01-13 19:56:15 +01:00
1b34c9d555
Always set media_kind, for real
...
The problem is, you can't set INITIAL values for the file scanner, because
the filescanner doesn't fill in values on top of already existing values.
2010-01-13 19:45:04 +01:00
ed3dbc1f35
Fill in the watch_info struct only when it's needed
2010-01-12 18:50:04 +01:00
364b22c030
Implement directory rescanning on top of kqueue/kevent for FreeBSD
2010-01-12 18:45:44 +01:00
69bae139bb
Make push_dir()/pop_dir() accept a stack as first argument
2010-01-12 18:45:31 +01:00
79cdb4f9aa
Make forked-daapd build on GNU/kFreeBSD
2010-01-10 17:49:01 +01:00
d96cdd7400
Add DAAP request handler for databases/###/groups (albums)
...
As of now we only support album groups, but there may be more than
album groups.
2010-01-10 14:43:23 +01:00
5cfbe75bae
Add database code for groups queries
2010-01-10 14:43:22 +01:00
e033d35195
Rework error handling in daap_reply_playlists()
...
Kill a bit of code duplication in the error handling.
2010-01-10 14:43:22 +01:00
ac82b176a0
Rework error handling in daap_reply_songlist_generic()
...
Kill a bit of code duplication in the error handling.
2010-01-10 14:43:22 +01:00
cac2c032f6
Add the daap.songalbumartist DMAP field
2010-01-10 12:11:00 +01:00
e948f69d0d
Add safe_atoull()
2010-01-10 12:09:29 +01:00
5b5e142c22
Replace inotify with kqueue on FreeBSD - stub
...
Start replacing inotify in the filescanner with kqueue. Only a stub at
this point, kqueue/kevent doesn't deliver nearly as much information
as inotify does. This will require some work, and someone willing to
do that work.
2010-01-09 13:48:52 +01:00
9695c11186
Add an opaque pointer to watch_info
...
Used on FreeBSD to hold a pointer to the kevent struct.
2010-01-09 13:45:33 +01:00
5681793534
Replace signalfd with kqueue for FreeBSD
2010-01-09 13:44:56 +01:00
8d7c566d95
Use m_realpath(path) instead of realpath(path, NULL)
2010-01-09 13:44:10 +01:00
b9d8a5880a
Introduce m_realpath() to replace realpath(path, NULL)
2010-01-09 13:43:29 +01:00
3724f943b9
Use sys/endian.h on FreeBSD
2010-01-09 13:42:59 +01:00
99df67b53c
Include sys/param.h for PATH_MAX
2010-01-09 13:42:23 +01:00
6c38cd2ef5
Add missing sys/types.h & sys/stat.h for stat & friends
2010-01-09 13:41:51 +01:00
6033e29348
Use standard pipe() syscall on non-Linux platforms
2010-01-09 13:41:14 +01:00
2f99797d9a
Use sizeof(void *) instead of __WORDSIZE
2010-01-09 13:39:45 +01:00
613717f6b8
Fix a format string mismatch (long vs uint64_t)
2010-01-09 13:38:41 +01:00
cdf0e2f9a5
Fix incorrect log domain
2010-01-09 11:14:23 +01:00
cefa51b5c6
Fix signal handler - readd event to event loop
2010-01-09 11:03:16 +01:00
11f6b1e78f
Kill duplicate fclose()
2010-01-09 11:00:41 +01:00
5887cc2e27
Kill dead variables in signal_cb()
2010-01-08 12:29:13 +01:00
fc971974f0
Fill in media_kind=1 for music
...
Also move item_kind initialization further up.
2010-01-06 18:41:27 +01:00
974a74a833
Update copyright notices for 2010
2010-01-05 19:34:00 +01:00
60a06dfb0a
Change album and album_artist column definitions to be NOT NULL
...
Unfortunately SQLite doesn't support adding constraints with ALTER TABLE,
so this constraint cannot be added upon upgrade.
2010-01-05 19:23:52 +01:00
26d603aa61
Introduce generic database upgrade function
2010-01-05 19:18:30 +01:00
db0bff61c7
Remove -y option, as it doesn't actually exist
2010-01-05 18:32:00 +01:00
d273c72a4b
Add database upgrade to populate album_artist for every file
...
Bump schema_version to 3, even though this isn't exactly a schema upgrade.
2010-01-05 18:25:23 +01:00
67e3739bc2
Allow DMAP queries on daap.songalbumid
2010-01-05 18:25:23 +01:00
f2965f8ac6
Make daap_songalbumid available as a function inside SQLite
2010-01-05 18:25:18 +01:00
d3350713d1
Return daap.songalbumid as a hash of the album_artist + album
...
iPhone remote will later want to query by album. Instead of doing a
fulltext query, it uses a 64-bit hash of the album + album_artist. It
is not necessary to use the same hash algorithm that iTunes uses. The
important thing is that we can later respond to a query=('daap.songalbumid:xxx')
with this value.
2010-01-04 18:00:05 +01:00
19a244095a
Add daap_songalbumid() to generate the songalbumid hash
...
Make it an inline function as it's a short function and has only got
2 call sites.
2010-01-04 17:59:21 +01:00
8ef57bbb41
Add the MurmurHash2, 64bit version
...
Hash algorithm by Austin Appleby, <http://murmurhash.googlepages.com >
2010-01-04 17:58:28 +01:00
e16d8a9747
Use the 'artist' field for 'album_artist' if there is no album artist set
2010-01-04 17:56:20 +01:00
117ee15e44
Add handler for DMAP extra_data requests
...
iPhone Remote uses the following requests to get cover art for
songs and albums:
/databases/#/items/#/extra_data/artwork
/databases/#/groups/#/extra_data/artwork
For now, we will return the valid and correct response that we
have "No content". In the future, the real artwork could be
extracted and returned here.
2010-01-03 18:55:32 +01:00
d20fdbda95
Cast pANTLR3_STRING to char * to avoid printf-format warnings
2009-12-31 22:21:56 +01:00
046e3d6d90
Fixup DPRINTF() format strings
2009-12-31 22:21:19 +01:00
5e338b033a
Add missing trk_id argument to DPRINTF() calls
2009-12-31 22:20:48 +01:00
61c6627713
Mark DPRINTF() as a printf-like function
2009-12-31 20:39:51 +01:00
207e85c6c0
Regain root privileges to unlink PID file at exit
2009-12-31 20:19:13 +01:00
1ac46983b9
Use setegid/seteuid to be able to regain root privileges
2009-12-31 20:19:13 +01:00
662ba32d35
Fix ret/iret variables usage
2009-12-31 20:12:36 +01:00
8feeecd895
Send a Content-Length header when plainly streaming a whole file
...
That is, don't send a Content-Length if we're decoding a whole file,
as we do not know the exact size in this case.
Based on a patch by Ace Jones.
2009-12-31 16:50:19 +01:00
a91b1ef46e
Reindent dmap_query_fields, no code changes.
2009-12-31 16:50:19 +01:00
ddc4c667ea
Enable DMAP queries on com.apple.itunes.mediakind
...
Used by Remote on the iPhone.
2009-12-31 16:41:10 +01:00
995c212dc7
Support query filter in playlist list query
...
iTunes uses query filters in DAAP containers requests, so support that here.
2009-12-30 18:53:55 +01:00
040e760789
Add support for Remote, the iPhone remote control for iTunes
...
Remote needs the same DAAP query quirk as iTunes and supports the
same codecs.
2009-12-30 18:49:52 +01:00
abbba5cf47
Fix typo in DAAP error message
2009-12-30 18:47:41 +01:00
76fc069f22
Fix missing argument to debug call
2009-12-30 18:46:41 +01:00
ff03c2679d
DMAP comparison against empty string needs to check against NULL too
...
'dmap.foo!:' -> (dmap.foo <> '' AND dmap.foo IS NOT NULL)
'dmap.foo:' -> (dmap.foo = '' OR dmap.foo IS NULL)
2009-12-29 22:04:49 +01:00
8025db2dc2
Allow negation operator for string comparisons in DMAP queries
2009-12-29 19:10:51 +01:00
f56884015f
Allow empty values in DMAP queries for string fields
2009-12-29 19:10:22 +01:00
371725b0da
Fix segfault in db_file_update
...
Fix wrong type (%Q instead of %d) for tv_episode_sort and tv_season_num in
the SQL query for db_file_update().
2009-12-27 08:19:16 +01:00
a52dcd264c
Force a full rescan after DB migration
2009-12-27 08:17:25 +01:00
7cb0eec5d5
Don't increase play count if not streaming at least half of the file
...
When streaming AAC/MP4 files that aren't stream-optimized (metadata at the
end of the file), clients will seek through the file to grab the metadata
prior to playing the file, causing the play count to increase by 2 or 3.
To counter that, do not increase play count if not streaming at least half
of the file.
2009-12-26 09:57:37 +01:00
403153f64b
Reindent the dmap_fields table, no code changes
2009-12-26 09:28:28 +01:00
000e13b7ee
Return TV metadata in DMAP response
2009-12-26 09:23:13 +01:00
66716841ea
Handle database schema upgrade from v1 to v2
2009-12-26 09:20:51 +01:00
42a7715c69
Reindent data tables, no code changes
2009-12-26 08:44:55 +01:00
a0ec19ada6
Add TV metadata to the database
...
With this, we're bumping SCHEMA_VERSION to 2.
2009-12-26 08:39:39 +01:00
2ae6fcd864
Pick up TV-related metadata in MP4 video files
...
TV-related metadata as found in TV shows bought on the iTunes store, for
instance.
At the time of writing, ffmpeg doesn't support this yet. Until it does,
contact Ace Jones <ace.jones1@yahoo.com> for patches and instructions.
2009-12-26 08:31:12 +01:00
a0b015f1e4
Accomodate TV meta-data in internal structures
...
Add new fields for TV-related metadata to struct media_file_info and
struct db_media_file_info.
2009-12-26 08:28:28 +01:00
30e07abae3
Check chdir() return value to silence a warning
2009-12-24 21:28:41 +01:00
d231faff2d
Handle DAAP activity request
...
Reply to the DAAP /activity request with 204 / No content. Used by iTunes to
ping the server while streaming.
2009-12-20 14:43:28 +01:00
72b1237500
Send a Content-Length header when streaming
...
Patch by Ace Jones <ace.jones1@yahoo.com>.
2009-12-08 21:46:47 +01:00
ff89ce0183
Add support for end offset in Range header
...
Honor end offset provided in the Range header and do not stream more than
what the client asked for.
Based on a patch by Ace Jones <ace.jones1@yahoo.com>.
2009-12-08 21:42:48 +01:00
b9e7df5be3
Return a proper Content-Type when streaming videos
...
Clients like Front Row expect video/<type> for video streaming, whereas iTunes
likes application/x-dmap-tagged when streaming audio.
Based on a patch by Ace Jones <ace.jones1@yahoo.com>.
2009-12-08 21:04:30 +01:00
df2cbea9b2
Add supported codec list for Front Row and QuickTime
...
Patch from Ace Jones <ace.jones1@yahoo.com>.
2009-12-08 20:45:57 +01:00
38c502cb7e
Properly close the raw file that was streamed when cleaning up after streaming
...
Report & fix by Ace Jones <ace.jones1@yahoo.com>
2009-12-08 19:54:48 +01:00
ab760903b1
Use stream_end() to do the cleanup in stream_fail_cb()
...
Introduce a new 'failed' parameter to stream_end() as some actions shouldn't
be done when cleaning up after a connection failure.
2009-12-08 19:52:51 +01:00
6114c31c61
Hook up iTunes library scanner
2009-11-28 10:55:43 +01:00
3154416415
Integrate iTunes library scanner as an optional component
2009-11-28 10:55:43 +01:00
d923e8d73b
Add iTunes Music Library XML scanner
2009-11-28 10:55:43 +01:00
3ff067da4e
Add itunes_overrides parameter
2009-11-28 10:55:43 +01:00
a6cbb2a8ec
Introduce db_file_id_byfilebase and db_file_id_byfile
...
File id lookup by basepath + filename and filename only.
2009-11-28 10:55:43 +01:00
66cd10dc52
Introduce db_file_id_byurl and share code with db_file_id_bypath
2009-11-28 10:55:42 +01:00
ecb2991881
Add db_pl_fetch_bytitlepath
2009-11-28 10:55:42 +01:00
04ce09e5be
Rename db_pl_add_item -> db_pl_add_item_bypath
...
For consistency with db_pl_add_item_byid & similar database functions.
2009-11-28 10:55:42 +01:00
a45f46f3eb
Introduce db_pl_add_item_byid()
2009-11-28 10:55:42 +01:00
1a397ca79b
Check that db_pl_fetch_byquery only gets 1 query result
2009-11-28 10:55:42 +01:00
6a1c01fa15
Allow playlists from different files to have the same title
2009-11-28 10:55:42 +01:00
8f07db5c10
Add support for FLAC files with ID3v2 tags.
...
Patch from Wolfgang Holler <woelfs@googlemail.com>.
2009-11-18 20:14:03 +01:00
946758cec7
Rework iTunes 9 absolute request uri fix
2009-11-14 11:23:03 +01:00
f8f183f2f6
Fixup iTunes 9 Request-URI before processing
...
iTunes 9 sends requests with a Request-URI like
daap://10.1.1.20:3689/server-info
The DAAP server expected the Request-URI to be just /server-info, and so
couldn't match the request to any handler.
In addition, evhttp would declare this request a proxy request which also
broke keep-alive handling resulting in the server closing the connection
after the reply. iTunes doesn't like that.
2009-11-13 21:53:47 +01:00
6cc9abadbd
Skip files that have no audio streams
2009-11-01 12:52:30 +01:00
9b56d51f92
Avoid divide-by-zero for files with duration < AV_TIME_BASE
2009-11-01 12:51:50 +01:00
c36b3c360d
Fix DAAP request regexps - IDs can (thankfully) be more than 1-digit long
2009-11-01 12:39:11 +01:00
9229f3dff9
Flush log as we go.
2009-10-04 12:08:46 +02:00
aa52f1d30b
Add license and copyright statement to -v/--version and usage message
2009-09-21 19:52:05 +02:00
11909725e2
Use ffmpeg's memory allocator for transcode buffer
...
ffmpeg's allocator ensures the allocated memory is properly aligned for
any kind of optimized operation used in ffmpeg.
2009-07-24 08:19:31 +02:00
2323fd302c
Fix memory leak (transcode buffer)
2009-07-24 08:18:53 +02:00
1bd3b3a076
Fix paths and rename the project
2009-06-12 13:00:34 +02:00
e1c0b6d4b7
Move *_offsetof() macro definitions to db.h
2009-06-11 23:17:17 +02:00
1f92052409
Rename the songs table
2009-06-11 23:03:53 +02:00
3cadbdb1e3
Remove unused db_file_fetch_bypath()
2009-06-11 20:46:11 +02:00
0ad20e5220
Rework process_media_file() and related DB support routines
...
Avoid pulling all the file info from the DB in process_media_file() as
anything besides the file id and timestamp is not used at all.
2009-06-11 20:44:22 +02:00
0a8c171187
Store playlist items paths instead of resolving to file ids
...
This allows for more dynamic playlists now that files can move
around while we're running.
2009-06-11 20:27:31 +02:00
3b7ff30c1b
Remove useless force_update field in media file info
2009-06-11 19:15:22 +02:00
c918c5c689
Always rescan directories to update playlists
2009-06-11 19:11:03 +02:00
538d81b402
Always rescan and update playlists
...
This is needed to keep relative playlist items up to date in the
database when the playlist file moves around.
2009-06-11 19:04:21 +02:00
c589d92b14
Use db_get_count() wherever applicable; simplify db_{pl,files}_get_count() prototypes
2009-06-11 18:41:50 +02:00
2d1c35b855
Count playlist items on the fly
2009-06-11 18:28:01 +02:00
30204cbb76
Remove unused toplevel watch attribute
2009-06-11 17:36:13 +02:00
c81b33bd02
Bring db_watch_delete_bywd() prototype back in line with other db_watch_delete_by*()
2009-06-11 17:35:32 +02:00
582f0e6746
Handle inotify events for directories
2009-06-11 17:35:25 +02:00
07e22d8870
Add watch query/enumeration
2009-06-11 16:44:49 +02:00
129ca8dfff
Add watch deletion by path/match/cookie routines
2009-06-11 16:15:35 +02:00
267ab7cb1a
Rename db_query_get_count() to db_get_count()
...
Make that a generic helper, given it's used outside queries.
2009-06-11 15:45:49 +02:00
cef1636415
Add watch-moving routines
2009-06-11 15:42:51 +02:00
87aa24454d
Add watch-marking routines
2009-06-11 15:24:10 +02:00
56127b3ecc
Add file and playlist disable-by-match routines
2009-06-11 15:09:10 +02:00
34b0c22e46
Handle symlink-to-directory creation
2009-06-11 13:51:19 +02:00
279fb95979
Watch for IN_CLOSE_WRITE in addition to IN_MODIFY and IN_CREATE
...
When receiving IN_CREATE or IN_MODIFY, there's no guarantee the file is
in its final state. Similarly, IN_MOVED_TO doesn't guarantee the file is
available when we receive it. And it actually isn't.
Watching for IN_CLOSE_WRITE fixes all that.
2009-06-11 13:45:02 +02:00
467b177c17
Handle IN_DELETE, IN_MOVED_FROM and IN_MOVED_TO for files
2009-06-10 22:28:59 +02:00
d63da9f08f
Add file and playlist enable/disable routines
2009-06-10 22:28:54 +02:00
9ff8913dd6
Add file and playlist deletion (by path) routines
2009-06-10 22:28:49 +02:00
ac96ac6baf
Move to the SQL database for storage of inotify watch info
2009-06-10 22:28:49 +02:00
a9697eccdf
Add storage of inotify watch info
2009-06-10 22:28:43 +02:00
bfa2488343
Add support for disabled files and playlists
2009-06-10 19:11:12 +02:00
177fb35d81
Add missing argument to DPRINTF() call
2009-06-10 19:11:12 +02:00
94421b0b1b
Handle IN_IGNORED events in inotify callback
2009-06-10 19:10:44 +02:00
cbab1f80e0
ie->len is 0 for events reported on the watch subject
...
ie->len is non-0 only when the event is being reported for a file or
directory inside a watched directory.
2009-06-10 19:10:37 +02:00
c8cc6bd603
Run event loop for each directory and each playlist when scanning in bulk mode
2009-06-10 19:04:18 +02:00
4e38d168e1
Set and check database schema version
2009-06-10 19:04:18 +02:00
ab1f9db6b3
Remove unused L_LOCK logdomain
2009-06-10 19:04:18 +02:00
7314dd21c7
Purge old files and playlists after bulk scan
2009-06-10 19:04:18 +02:00
4e3b29f502
Remove the old database code
2009-06-10 19:04:18 +02:00
a200703393
Switch to the new database code
2009-06-10 19:04:18 +02:00
f2c677462b
Add new database code
2009-06-10 19:04:12 +02:00
52d3fd1064
Clear evkeyvalq structs before use; fix crasher
2009-06-07 19:06:59 +02:00
149d5432c6
Rework error handling and cleanup
2009-06-07 19:06:59 +02:00
0ff33f12d6
Move mDNS services registration out of main()
2009-06-07 19:06:59 +02:00
f3c0145346
Move runas down into daemonize()
2009-06-07 19:06:59 +02:00
f39c48b989
Cleanup options and add long options
2009-06-07 19:06:59 +02:00
6e64e54429
General main.c cleanup
2009-06-07 19:06:59 +02:00
64cd2ee383
Factor out RSP query parameters handling
2009-06-07 19:06:59 +02:00
c59217f58e
Remove the unused L_PARSE logdomain
2009-06-07 19:06:58 +02:00
2cc5f6928e
Remove the unused smart parser
2009-06-07 19:06:58 +02:00
8b5a25c972
Remove/disable last users of the smart parser
2009-06-07 19:06:58 +02:00
91e34a77c8
Use the new ANTLR parser for RSP queries
2009-06-07 19:06:58 +02:00
f9d9964914
Add new ANTLR parser for RSP queries
...
This parser actually supports way more than is needed for RSP proper,
as mt-daapd was piggybacking on the RSP queries for its smart playlists.
As I don't have (yet?) the RSP specs, better safe than sorry here. This
will be revisited at some point. Or not.
2009-06-07 19:06:51 +02:00
272d8bca04
Fix error message
2009-06-07 19:06:51 +02:00
68c74e6a88
Replace the mxml RSP root element hack by a better one
...
There's no proper way to add attributes to the root XML element in mxml;
the best way to do that is to create the root element like we would
create any other element and put the whole "? ... ?" stuff in there.
2009-06-07 19:06:51 +02:00
4872077319
Make the file scanner non-recursive
2009-06-07 19:06:51 +02:00
ffb5a2fb06
Make wd2path static
2009-06-07 19:06:51 +02:00
977afbbc5e
Add workaround for empty XML tags in RSP replies
...
The SoundBridge does not support empty XML tags (<foo/>) and treats anything
containing such tags as invalid. Adding an empty string to the element works
around that, in that mxml won't produce empty tags in this case.
Hackish, but dealing with a hackish implementation on the other side :)
2009-06-07 19:06:51 +02:00
28350ae9a6
Look for a query or filter parameter in DAAP queries
...
The filter is passed in the query parameter if it's a search, but if it's
a browse it's in the filter parameter.
2009-06-07 19:06:51 +02:00
7642b1c6d7
Use the new ANTLR parser for DAAP queries
2009-06-07 19:06:50 +02:00
68db2ae7c2
Add new ANTLR parser for DAAP queries
2009-06-07 19:06:46 +02:00
cefd3f3d1d
Make dmap_fields_hash static
2009-06-01 18:01:24 +02:00
512731c9dc
Turn DPRINTF into a wrapper to a generic logging function
...
DPRINTF() made a generic logging function taking a va_list called
vlogger() and reimplemented as a wrapper on top of vlogger().
2009-06-01 16:01:47 +02:00
c3a5222f84
Log libevent errors through our own logger
2009-05-09 17:14:07 +02:00
11f18eaf6f
Remove unneeded log.c from evhttp copy
2009-05-09 17:14:07 +02:00
be0ac2b103
Add missing cleanup calls
2009-05-09 17:14:07 +02:00
7b3b538ea6
Rename L_REND to L_MDNS
2009-05-09 17:14:07 +02:00
d384f3c395
Rename E_INF to E_INFO
2009-05-09 17:14:07 +02:00
b6f23a8273
Remove old error logging facility
2009-05-09 17:14:07 +02:00
11fd038d16
Use new logger facility
2009-05-09 17:14:06 +02:00
3a2a218a0f
Introduce new logger
2009-05-09 17:14:01 +02:00
2127aff906
Use a single log domain on DPRINTF() calls
2009-05-05 20:28:40 +02:00
803ca7e59f
Rename foreground to background and change logic accordingly
2009-05-05 17:54:20 +02:00
10bb9dec57
Remove useless daapd.h
2009-05-05 16:22:11 +02:00
d2999aafec
Add missing stdint.h include to ff-dbstruct.h
2009-05-05 16:21:39 +02:00
c85f9ed7dd
Move main event base extern declaration to mdns_avahi.c where it's used
2009-05-05 16:10:49 +02:00
524bdd3f0d
Remove old config framwork include and wrappers
2009-05-05 16:10:44 +02:00
9fce6d7abd
Use new config framework in main.c
2009-05-05 15:53:36 +02:00
c1a2bf6fcf
Remove conf_*() usage in DB module
2009-05-05 15:45:48 +02:00
ed0ff0c136
Unlink PID file on exit
2009-05-04 17:51:42 +02:00
be4286b2e8
Remove -export-dynamic libtool flag now that we don't have plugins anymore
2009-05-04 17:48:31 +02:00
8e14495bc2
Remove unused struct tag_stats (STATS)
2009-05-03 13:33:16 +02:00
d1449a875b
Get rid of the global struct tag_config (CONFIG) config
2009-05-03 13:32:00 +02:00
2530c3512b
Rename webface_cb() to httpd_gen_cb()
2009-05-03 12:26:01 +02:00
cd6f87401a
Rename struct stream_chunk to struct stream_ctx
2009-05-03 12:19:04 +02:00
ed7c848702
Remove I/O layer
2009-05-03 12:10:17 +02:00
07fb43ca8c
Remove I/O layer init/deinit
2009-05-03 12:09:25 +02:00
f0ca987d78
Replace io_* routines by standard I/O functions
2009-05-03 12:08:14 +02:00
e8843a99aa
Remove util.[ch]
2009-05-03 11:38:32 +02:00
1e0ffb6808
Remove use of util_* routines, last user
2009-05-03 11:37:30 +02:00
9ef8acfa28
Remove old webserver
2009-05-03 11:20:12 +02:00
6aca074f82
Remove plugin infrastructure
2009-05-03 11:20:07 +02:00
baf529dbf2
Remove plugins directory
2009-05-03 11:20:02 +02:00
2be04db4d2
Remove RSP output plugin
2009-05-03 11:16:58 +02:00
ef1c2b2b89
Remove DAAP output plugin
2009-05-03 11:16:58 +02:00
89eead66f6
Remove ssc-ffmpeg plugin
2009-05-03 11:16:58 +02:00
417b5e0ce3
Remove ssc-script plugin
2009-05-03 11:16:58 +02:00
81cb0efa81
Stop loading plugins, we don't need plugins anymore
2009-05-03 11:16:58 +02:00
2fb7537346
Register RSP and DAAP services in main()
2009-05-03 11:16:58 +02:00
c76c8165ce
Enable httpd on the configured port
2009-05-03 11:16:58 +02:00
d46bb295c5
Disable old webserver
2009-05-03 11:16:58 +02:00
a1afb0d390
Use evhttp_send_reply_chunk_with_cb() to stream files
...
This evhttp extension makes it possible to schedule chunks one after
the other when (part of) the previous chunk has been written to the
client.
2009-05-03 11:16:58 +02:00
7a37732658
Add a variant of evhttp_send_reply_chunk() with a callback on evhttp_write_buffer()
...
evhttp_write_buffer() used by evhttp_send_reply_chunk() can take callback
executed when (part of) the buffer has been written. Using this callback to
schedule the next chunk avoids buffering large amounts of data in memory.
2009-05-03 11:16:58 +02:00
1d152decf7
Use evhttp_request->fail_cb to stop streaming if the client closes the connection
...
This is an extension to evhttp. Without this, we cannot know that the client
closes the connection, and we keep pushing chunks while the underlying
evhttp_request has been freed, leading to a segfault.
2009-05-03 11:16:57 +02:00
1ffcbdae27
Add a fail_cb to evhttp_request for connection failures
...
The callback will be executed if a failure (timeout, read error) is detected
on an incoming connection.
This can be used to detect a client closing the connection while engaged in a
chunked reply and actively pushing chunks to the client. Without this
notification, it is impossible to know if/when a connection gets closed and
react appropriately (ie. stop pushing chunks) resulting in a segfault.
2009-05-03 11:16:57 +02:00
e4fe084619
Use embedded evhttp
2009-05-03 11:16:57 +02:00
6bce4e08ca
Import evhttp from libevent 1.4.10
2009-05-03 11:16:57 +02:00
c9868175fd
Implement URI encoding quirk for iTunes and Roku
...
iTunes and Roku devices do not encode + as %2B in the query string and
do not encode space as + either in the query string (though at least the
Roku encode space as %20 everywhere). This needs to be worked around or
browse queries fail to parse because + was decoded as space when the query
really needs a + character.
2009-05-03 11:16:57 +02:00
09ef188d90
Add authentication to web interface, RSP and DAAP
2009-05-03 11:16:57 +02:00
dc68de86dd
Add HTTP Basic auth support
2009-05-03 11:16:57 +02:00
cd636cf42d
Add base64 decoding routine
2009-05-03 11:16:57 +02:00
7a601d7daa
Enable streaming of transcoded content
2009-05-03 11:16:57 +02:00
2c2498b6b4
Add transcoding infrastructure
2009-05-03 11:16:57 +02:00
22092f555b
Add L_XCODE log domain
...
Log domain for anything transcoding-related.
2009-05-03 11:16:57 +02:00
e5cc417e96
Add DJB hash function to misc.[ch] and use it
2009-05-03 11:16:51 +02:00
0a1c4545dc
Move safe_ato[il]() to misc.[ch]
2009-04-30 14:46:37 +02:00
91414c10d7
Use a hashtable for dmap fields lookup
...
The hashtable is built around an AVL tree and the DJB hash function;
the AVL tree is built at init time and the init routine checks for
collisions.
2009-04-30 13:57:40 +02:00
c071a58c3c
Wire up DAAP support
2009-04-30 13:57:40 +02:00
00876facde
Introduce DAAP protocol implementation
...
Same restrictions as RSP at the moment:
- no transcoding
- no authentication
2009-04-30 13:57:34 +02:00
f332f992aa
Document HTTP client quirks known to mt-daapd
2009-04-28 18:00:27 +02:00
651d946cc2
Implement RSP streaming.
2009-04-28 18:00:27 +02:00
Julien BLACHE
Kai Elwert
Raivo Hool
J. Aaron Pendergrass
Peter
John Thomson
Dustin King
Ace Jones