Commit Graph

2692 Commits

Author SHA1 Message Date
chme
c23cbde6ac fixup - remove unused enum, remove unused local variable, remove
duplicate error log for failure in create_virtual_path, remove
unnecessary empty lines
2016-01-24 18:51:22 +01:00
chme
171e30aead [mpd] use qualifier in select queries, return error message if an error
occurs (otherwise this results in a segfault)
2016-01-24 18:51:22 +01:00
chme
2611d06ab7 [mpd] add support for commands 'listall' and 'listallinfo' 2016-01-24 18:51:22 +01:00
chme
7703a997c4 [db/filescanner/spotify] Replace filelist-view with separate
directories-table
to increase the performance of the mpd command 'lsinfo'
2016-01-24 18:51:22 +01:00
chme
3740486348 [db] Move database upgrade logic to separate file 2016-01-24 18:51:22 +01:00
chme
1d69a3de90 [mpd] Add fallback to IPv4 if IPv6 failed 2016-01-24 18:51:22 +01:00
chme
9a1c8409cf [mpd] optimize query selecting files for virtual_path to use the index 2016-01-24 18:51:21 +01:00
ejurgensen
5f2fe87351 [spotify] Move purge so Spotify files get cleared even on empty .spotify (closes #219) 2016-01-17 15:29:31 +01:00
chme
532e9c3a32 [spotify/artwork] Remove spotify songs after playlist update and delete
cached artwork for removed spotify songs
2016-01-16 17:02:57 +01:00
ejurgensen
0f58495e0d [cache] Prevent log errors if cache disabled 2016-01-09 01:26:59 +01:00
ejurgensen
d356a0ae5c [spotify] Split artwork_get so we don't wait for artwork callback in the Spotify thread (which might be playing) 2016-01-09 00:36:30 +01:00
ejurgensen
22a1e16c12 [artwork] Move timebase back, it must be set for the AVCodecContext for libav (and older versions of ffmpeg?) 2016-01-07 23:42:27 +01:00
ejurgensen
3a31074c07 [spotify] Increase artwork timeout slightly 2016-01-07 23:11:19 +01:00
ejurgensen
1b24a86169 [artwork] Tidy up artwork.c and handle remaining ffmpeg deprecated warning 2016-01-07 22:48:04 +01:00
ejurgensen
89e3864035 [spotify] Wait for Spotify artwork now that the worker gets artwork async for the player thread 2016-01-07 22:25:25 +01:00
ejurgensen
d56576094a [artwork] Do like libav says: "Using AVStream.codec.time_base as a timebase hint to the muxer is deprecated. Set AVStream.time_base instead." 2016-01-06 23:02:43 +01:00
ejurgensen
1f1d79025d [artwork] Keep a raw Spotify source image in case rescaling is not required 2016-01-06 22:39:32 +01:00
ejurgensen
0d55e055c0 [ffmpeg] Update most deprecated functions 2016-01-05 23:22:01 +01:00
ejurgensen
7caf8cc66a [artwork] Add ability to rescale Spotify (should improve caching so we don't save too large images) 2016-01-05 21:44:44 +01:00
ejurgensen
9a0a390a73 [artwork] Get rid of legacy libav/ffmpeg support in artwork.c 2016-01-03 12:24:21 +01:00
ejurgensen
c3d9f65f8b [artwork] Adjust existing code to new structure 2016-01-03 12:24:20 +01:00
ejurgensen
238ee3c122 [artwork] Refactor artwork to make it easier to add new backends (WIP) 2016-01-03 12:24:20 +01:00
ejurgensen
599fb20e0b [cache] Fix return values in cache_artwork_get_impl 2016-01-03 12:24:20 +01:00
ejurgensen
6cabbc4ab7 [httpd] Add fallback to IPv4 if v6 fails 2015-12-21 21:52:21 +01:00
chme
32e1923b39 [mpd] make global event_base static 2015-12-19 09:09:50 +01:00
chme
3b7e1b2737 [mpd] Add missing close for command pipe on deinit 2015-12-19 08:46:38 +01:00
ejurgensen
e8ea00896d [listener] Fix #205 where listener_remove could break the linked list and orphan some cb's 2015-12-16 23:16:58 +01:00
ejurgensen
6e58af75cf [http_daapd] Add option to hide albums/artists with just one track 2015-12-12 23:28:48 +01:00
chme
40da57346f [mpd] fix duplicate return of 'nextsong', 'nextsongid' and return
item-id as 'nextsongid'
2015-12-12 09:26:55 +01:00
chme
6d1d2a485c [mpd] fix seek command
Compare the position of the song to be seeked with the position of the
current playing one
2015-12-12 09:26:44 +01:00
ejurgensen
93a6765c8c [transcode] Fix freeze problem where av_read_frame would block on broken connections 2015-12-09 20:00:09 +01:00
ejurgensen
100cecce3f [mpd] Add missing db_query_end (was causing database locks) 2015-12-06 20:22:12 +01:00
ejurgensen
d43b306212 [config] Change ipv6 default to enabled 2015-12-03 22:08:55 +01:00
ejurgensen
7a4ce2f68d [http] Title and artist were swapped when reading ICY packet metadata 2015-11-29 00:55:30 +01:00
chme
b2d2e9286f [mpd] implement range support for 'delete' command 2015-11-22 12:06:01 +01:00
chme
6d720dec94 [queue] Ignore moving an item to its current position (would results in
an invalid queue)
2015-11-22 07:08:59 +01:00
chme
8fc8d08b42 [player] Add missing notification of playlist changes after removing an
item from the playlist
2015-11-21 14:23:06 +01:00
chme
10fceb6d3f [mpd] Fix segfault executing "decoders" command 2015-11-21 14:23:06 +01:00
ejurgensen
9cc4927d50 Merge pull request #198 from chme/mpdzeroconf
[mpd] Announce mpd support with avahi/zeroconf
2015-11-07 08:11:32 +01:00
chme
2195db0800 [mpd] Announce mpd support with avahi/zeroconf 2015-11-06 19:50:18 +01:00
chme
461a956288 [mpd] Return the correct values for number of songs, artists, albums and
song length sum in the "stats" command (wrong values are still reported
for uptime, db_update and playtime)
2015-11-06 19:11:00 +01:00
chme
0e0fbd006f [queue] fix segfault if query for queue-items returned an empty result
set

This happen for example if a wrong path is passed in "mpc add
[virtual_path]"
2015-11-01 12:47:04 +01:00
chme
350944cddd [mpd] fix seekid command
Seeking with the seekid command for the currently playing item got
broken after introducing the item-id (comparison of item-id passed from
client to db-id)
2015-11-01 12:06:18 +01:00
chme
7b5c80acf4 [queue] If the playing item is not in the queue anymore, the next item
should be the first item in the queue

This solves the problem that after clearing the queue and adding new
items while playing, aborts playback when skipped to the next item.
2015-11-01 11:59:39 +01:00
chme
abc689a7e1 [mpd] fix sort in queue after adding songs with findadd and searchadd
commands

Always add songs sorted by artist, album, disc, track. Adding by title
is almost never the expected order of songs.
2015-11-01 11:46:54 +01:00
chme
d0232a2315 [mpd] Return playlists if lsinfo is called with an empty path (same
handling as if the path is the root directory "/")
2015-10-31 12:53:52 +01:00
ejurgensen
316af87189 Merge pull request #193 from chme/mpd
[mpd] Add support for moveid and close command
2015-10-31 11:31:27 +01:00
ejurgensen
6ba350e406 Merge pull request #192 from chme/history
[dacp] Fix playing from history for Remote
2015-10-31 11:31:10 +01:00
chme
ba63157429 [mpd] Add 'close' command (ignore the command and does not send a
response)
2015-10-31 07:56:52 +01:00
chme
f9c6aa6c48 [mpd] Implement command moveid (movings items in the queue by item-id) 2015-10-31 07:56:51 +01:00
chme
1c409846d5 [player/queue] Add player commands to move queue-items by item-id 2015-10-31 07:56:50 +01:00
chme
c2ba2f6779 [dacp] Fix playing from history for Remote 2015-10-31 06:18:05 +01:00
ejurgensen
7894a4d85f [transcode] Don't push NULL frames to filtergraph when flushing, can lead to segfault 2015-10-25 19:59:06 +01:00
chme
94895b8eed [player] if source is not pausable (http-streams or pipe) abort playback
on pause command 

This restores the behaviour before the queue/player-refactoring.
2015-10-25 09:00:47 +01:00
ejurgensen
43893dff48 Merge pull request #189 from chme/mpd
Fix item-id in mpd commands "playlistid", "playlistinfo", "plchanges"
2015-10-24 09:05:58 +02:00
chme
51eb423065 [mpd] Fix item-id in playlist items 2015-10-24 06:06:24 +02:00
ejurgensen
3e80e5c517 [transcode] Don't pass error to player on eof + some comments and cleaning 2015-10-22 22:09:19 +02:00
ejurgensen
e20d2c544d [transcode] Comments and raise MAX_BAD_PACKETS to 5 2015-10-22 21:01:43 +02:00
ejurgensen
058b2fb0d6 [transcode] Improve decoding to allow for decoder special cases, like decoders not processing
entire packets, rejecting packets and not returning frames. Should fix issue with network
streams not opening.
2015-10-21 23:53:21 +02:00
ejurgensen
9853b8f9bd Merge pull request #188 from chme/playerfixes
Playerfixes
2015-10-19 22:15:43 +02:00
chme
551f441273 [dacp] Fix playing from playspec request 2015-10-19 21:55:43 +02:00
chme
7592462571 [player] Fix segfault if reading from source failed for all queue items 2015-10-19 21:33:43 +02:00
ejurgensen
55104015e0 Full removal of libevent 1 legacy code. Also drop pipe() in FreeBSD, since pipe2 is available now. 2015-10-19 21:15:29 +02:00
chme
48691748cd [mpd] fix log message if binding of artwork http server failed 2015-10-18 14:25:29 +02:00
ejurgensen
2a610812a5 Refactor transcode.c so it can actually transcode + use new capability to support mp3 streaming.
Also includes the skeleton for perhaps supporting video in the future. Adds more fine-grained
ffmpeg/libav compability checks. Dependency on libavresample/libswresample exchanged with
dependency on libavfilter, which seems more versatile.
2015-10-09 23:58:27 +02:00
James Le Cuirot
7cf35d1e8b
Allow ANTLR 3.5 to work
This involves a harmless backwards-compatible adjustment to the
grammar. I can't explain why this is necessary but this might help.

http://stackoverflow.com/questions/20057063/follow-set-in-is-undefined-in-generated-parser
2015-10-05 23:10:45 +01:00
chme
199b765a7d [player] Store item-ids in history to allow start of playback from the
previously played items in dacp
2015-10-04 08:05:37 +02:00
chme
b19a7280b9 [player] remove unused player_queue struct 2015-10-04 08:05:37 +02:00
chme
fbce3a7d57 [player] Confusing naming of ids cleaned up 2015-10-04 08:05:37 +02:00
chme
ba3385b0ec [queue] Remove queue_info and queue_item_info structs 2015-10-04 08:05:37 +02:00
chme
35df9455b9 [queue] Fix memory leak in queue_make_item 2015-10-04 08:05:36 +02:00
chme
100e08da9d Rename make_queue functions 2015-10-04 08:05:36 +02:00
chme
064dfef2de [player] cleanup metadata_trigger
metadata_trigger is always called for the current streaming item and
source_open makes sure that the stream_start and output_start values are
set correctly
2015-10-04 08:05:36 +02:00
chme
64698eb3a4 [player] Some minor cleanup (error handling, comments) 2015-10-04 08:05:36 +02:00
chme
a06424a701 [mpd] Expose queue-item-id instead of dbmfi-id in mpd commands
[player] Reshuffle on end of playlist and repeat mode is "repeat all"
2015-10-04 07:59:58 +02:00
chme
cb2805800b [player] Fix segfault if pause requested in the last two seconds of the
last item in the playqueue (cur_streaming is already NULL)
2015-10-04 07:59:58 +02:00
chme
2b037b67d9 [player] Combine stream_stop and stream_cleanup into one function 2015-10-04 07:59:58 +02:00
chme
e44a160b9a [player] Improve error handling 2015-10-04 07:59:58 +02:00
chme
4595a2f4a6 [player] Add missing metadata trigger on item change (after eof) 2015-10-04 07:59:58 +02:00
chme
c8a61015fc [dacp] Fix playing of radio streams after queue refactoring 2015-10-04 07:59:58 +02:00
chme
f4faac3cc8 [spotify] Remove duplicate method "resume" in favor of "play" 2015-10-04 07:59:58 +02:00
chme
58069e67f8 [player/spotify] adjust spotify integration to refactoring of player 2015-10-04 07:59:58 +02:00
chme
e1147c00a1 [player] Refactor player to better fit the queue refactor 2015-10-04 07:59:58 +02:00
chme
1f53d7ab1a [queue] Refactor queue handling
Decouple the playing/streaming item from the queue. Move all queue
related functions to seperate file queue.h/c.
Introduce internal item "head" to make iterating over the play-queue and
shuffle-queue easier.
2015-10-04 07:59:57 +02:00
chme
10d7097f98 [player] rename "queue_*"-functions to "playerqueue_*" (avoid naming
conflicts with later introduced separate queue file
2015-10-04 07:57:39 +02:00
chme
1fbedaa54f [player] Refactor queue_get 2015-10-04 07:57:38 +02:00
chme
f0a6a48599 [player] Refactor queue_remove functions 2015-10-04 07:57:38 +02:00
chme
8e1834cdea Rename make_queue function and set as static 2015-10-04 07:57:38 +02:00
chme
1812848ee1 Move client protocol specific make_queue functions out of player.c/h 2015-10-04 07:57:38 +02:00
ejurgensen
cba9bc05e9 Expire sessions without strict timeout (closes #163) 2015-10-03 10:00:42 +02:00
ejurgensen
ebba164a0d Change MPD deinit position so it matches the init order, and so it will not get called if httpd fails to start 2015-09-29 23:14:44 +02:00
ejurgensen
5125e24cfe Let db_build_query_index_clause() always return an initialized idx, even on failure 2015-09-29 22:51:23 +02:00
chme
cf70c514b6 Fix memory leak if index clause is used 2015-09-29 22:43:32 +02:00
chme
a1e2f53ab1 Fix memory leak if index clause is used 2015-09-29 22:42:53 +02:00
chme
0245813d34 Fix memory leak when parsing smart playlists 2015-09-29 22:42:30 +02:00
chme
1ed240d92c Fix memory leak due to missing free for evconnlistener 2015-09-29 22:42:09 +02:00
ejurgensen
6c26d87997 Make some global vars in lastfm.c static 2015-09-28 21:22:51 +02:00
ejurgensen
4db6318a82 Fix issue where volume gets set to -1 on startup of raop devices 2015-09-27 15:24:04 +02:00
ejurgensen
50bcdd2551 Plug minor memleaks in cache.c 2015-09-23 22:29:17 +02:00
ejurgensen
294d7a270f Protect against possible segfault if the artwork pixel format is unknown
- thank you groinwood for reporting this bug
2015-08-24 21:27:55 +02:00
ejurgensen
317ad2ba41 Always treat podcasts, audiobooks and compilations as audio, even if video stream is present 2015-08-05 22:36:28 +02:00
ejurgensen
68912efa1f Enable resuming playback from saved position for certain media kinds (eg audiobooks) 2015-08-04 22:33:32 +02:00
ejurgensen
7881df67f6 Hack to push live ICY metadata/artwork to remote clients 2015-07-31 14:43:22 +02:00
ejurgensen
1fe6521aff Remove libevent 1 support in httpd_dacp 2015-07-30 22:50:11 +02:00
ejurgensen
3ba76e8f40 Remove libevent 1 support in httpd_daap 2015-07-29 23:05:47 +02:00
ejurgensen
7e9cf80ec0 Reorganize configure.ac according to subject (and my taste) 2015-07-21 23:00:55 +02:00
ejurgensen
bf72547b9b Drop legacy FLAC, Musepack and WMA file scanners (ffmpeg/libav can do this now) 2015-07-21 22:16:50 +02:00
chme
c6851eac9b [mpd] use the same image size as in raop_metadata_prepare (max 600x600)
to increase artwork cache hits
2015-07-18 07:34:48 +02:00
chme
1ab318d725 [mpd] support serving artwork over http 2015-07-18 07:17:21 +02:00
ejurgensen
d870b97142 Remove LastFM thread now that it can run from the worker thread 2015-06-27 23:24:07 +02:00
ejurgensen
b6703ab7cd Don't retrieve ICY StreamUrls without jpg/png extension (don't want to risk initiating a major, useless download) 2015-06-20 23:11:18 +02:00
ejurgensen
ec0ba2c5fa Fix problem where the http client would ignore the last line in a m3u because of missing CRLF (issue #169) 2015-06-18 23:03:11 +02:00
chme
ceca9135c5 [mpd] add special handling to command "lsinfo" if the root directory was
passed as argument.

Clients like ympd and ncmpcpp are relying on this (deprecated) behavior
2015-06-14 07:11:17 +02:00
chme
b9b3671d58 [mpd] add support for command "decoders" 2015-06-14 07:11:17 +02:00
chme
426e827712 [mpd] Return whole queue for command "playlistinfo" if given argument is
-1 (not a valid position in the queue)
2015-06-13 14:38:56 +02:00
ejurgensen
879c2ef350 Avoid cache regeneration triggering during db_query_run (in case the query is long running, like db_files_update_songalbumid might be) 2015-06-08 23:07:56 +02:00
ejurgensen
335517a2e8 Prevent this database deadlock:
1. bulk scan begins transaction, locking the db
2. cache regeneration is triggered, but waits for db to unlock
3. bulk scan calls cache_artwork_ping, which can't return because cache thread is waiting
-> scan thread is waiting for cache thread, which is waiting for scan thread
2015-06-08 22:24:33 +02:00
ejurgensen
4fffc057b6 Change queue_remove() to fix segfault because source_head/shuffle_head could become invalid, and to protect against invalid input in general (ref issue #160).
Also try to failsafe source_position() and implement next_ps() all around.
2015-06-08 00:21:49 +02:00
ejurgensen
3dde23e060 Include terminating null in u8_normalize - not necessary now, but just to be safe 2015-06-06 14:47:54 +02:00
ejurgensen
6224fdb025 UTF-8 conversion was returning string without null termination (thank you @stephan-01010011, ref pr #168) 2015-06-06 14:22:24 +02:00
ejurgensen
a9437acc1a Rework pr #162 to avoid mem leaks and string termination problems 2015-06-05 23:55:57 +02:00
ejurgensen
7d231b992b Fix typo 2015-06-04 22:17:49 +02:00
ejurgensen
cd14522915 Swap misplaced args in db.c 2015-06-04 22:10:30 +02:00
ejurgensen
271c5ff344 Change DB upgrade from v18->v19 to v18->v18.01 2015-06-04 21:58:01 +02:00
chme
7cd96690c0 Remove file extension for playlists from virtual_path during scan and
update db to v19 removing the file extensions from the stored playlists

An existing file extension in the virtual path leads to wrong entries in
MPDroid (and mpd does also not return the file extension).
2015-06-04 08:11:46 +02:00
ejurgensen
3655e26703 Code style 2015-06-02 23:10:04 +02:00
ejurgensen
64ef66f030 Merge pull request #162 from stephan-01010011/master
Fixed bug that caused icy header metadata to be not correctly encoded
2015-06-03 00:05:56 +03:00
ejurgensen
7a0dfef136 Add sub-sorting when sort=artists, because otherwise Tunesremote SE will not play the artist's tracks in proper order 2015-06-01 23:36:16 +02:00
stephan-01010011
32727bd296 Fixed bug that caused icy header metadata to be not correctly
encoded/converted. Characters above x7F were replaced by '?' character
although the rfc defines a ISO−8859−1 encoding for descriptive
field-content.

According to rfc2616 the field-content is defined as follows:
<the OCTETs making up the field-value and consisting of either *TEXT or
combinations of token, separators, and quoted-string>
The TEXT rule is only used for descriptive field contents and values
that are not intended to be interpreted by the message parser. Words of
*TEXT MAY contain characters from character sets other than ISO- 8859-1
only when encoded according to the rules of RFC 2047.

In the previous implementation the icy metadata was converted based on
fromcode "ascii".

Following incoming icy header field-values should be encoded as
"ISO−8859−1" before adding them to the metadata structure.

- misc.c unicode_fixup_string enhanced by an additional parameter to
define the fromcode
- misc.h unicode_fixup_string prototype updated
- filescanner.c function fixup_tags updated to stay compatible to the
previous implementation using fromcode "ascii"
- db.c function unicode_fixup_mfi updated to stay compatible to the
previous implementation using fromcode "ascii"
- http.c function metadata_header_get enhanced to encode the header
field-content as "ISO−8859−1" to comply with rfc2616
2015-05-31 14:05:31 +01:00
chme
7f09438621 [mpd] support "date" argument in find and search commands 2015-05-30 05:56:53 +02:00
chme
2a04740ca2 [mpd] support "file" argument in list command 2015-05-30 05:56:52 +02:00
chme
4299de5ac7 [mpd] implement plchanges to report all songs in the queue as changed
(ignores the playlist version parameter).

This is necessary in order to get mpd clients (e. g. sonata) relying on
this command to display the queue.
2015-05-30 05:33:32 +02:00
ejurgensen
4a50a7a326 [spotify] Improve Spotify loading efficiency and set time_added so smart playlists will work 2015-05-29 19:47:53 +02:00
ejurgensen
40d7d044be Lower log severity of message in spotify.c 2015-05-27 20:32:27 +02:00
ejurgensen
a1e417c571 Rename count_info to fix issue #157 2015-05-26 21:24:10 +02:00
ejurgensen
8dd1e0fde2 Fix problem introduced with commit 475d5db where genres and composers don't get sorted 2015-05-26 21:10:28 +02:00
ejurgensen
79cdfebf34 Merge pull request #150 from chme/mpdidle
Add support for mpd idle command
2015-05-21 22:31:03 +02:00
ejurgensen
d6828b90fc Merge pull request #149 from chme/mpdcommands
Add support for additional mpd commands
2015-05-21 22:30:49 +02:00
chme
8c12929b91 Added source code comments, return error value if adding/removing a
listener failed
2015-05-21 07:57:18 +02:00
chme
0b73233197 [mpd] remove libevent1 support 2015-05-21 07:15:05 +02:00
chme
1cde19b5b6 [smartpl] add "grouping" field to smart playlist grammar 2015-05-21 06:22:55 +02:00
ejurgensen
6176f7f4a2 Fix bug where files being copied into library with eg. Samba will get scanned
before writing has finished, which may result in no metadata for the file
2015-05-20 22:38:26 +02:00
chme
41a08d1931 [mpd] rework listener events to use a bit map 2015-05-18 20:12:18 +02:00
chme
baffe49887 refactor use for loop to remove item from linked list 2015-05-13 11:37:09 +02:00
chme
3886ec6638 Add version number for playlist (queue)
This is necessary to return a valid playlist id for mpd status command.
2015-05-09 07:46:33 +02:00
chme
aa4a12cabe add events for playlist (queue), volume, speaker, options
(random/shuffle) changes
2015-05-09 07:46:33 +02:00
chme
d2c7c87191 use listener logic to send dacp update requests 2015-05-09 07:46:33 +02:00
chme
7097dd15eb allow removing of listeners 2015-05-09 07:46:33 +02:00
chme
1714f3dee4 [mpd] move include of libevent from mpd.h to mpd.c 2015-05-09 07:46:33 +02:00
chme
36499f4997 [player] added some source code comments 2015-05-09 07:46:33 +02:00