Commit Graph

381 Commits

Author SHA1 Message Date
ejurgensen
cf5b702460 Fix malplaced declaration 2014-09-27 23:12:18 +02:00
ejurgensen
4078542eb4 Forgot an include 2014-09-27 23:08:43 +02:00
ejurgensen
861635eb4d timer_delete() instead of close() for FreeBSD timer 2014-09-27 23:05:22 +02:00
ejurgensen
65110a9f39 Fix FreeBSD sound timing problems 2014-09-27 22:59:19 +02:00
ejurgensen
27e7148405 Use STOB() in player.c since it is defined right in player.h 2014-09-19 22:14:31 +02:00
ejurgensen
f543b768ac Merge pull request #41 from chme/skipprev
rfc: Change behavior of skip to previous song
2014-09-12 21:45:15 +02:00
ejurgensen
6d8e4c67aa Support for LastFM scrobbling (issue #19) 2014-08-15 23:36:54 +02:00
chme
05e6402dc6 Fix skip to next song while the last song in Up Next is playing
(introduced in a6c2a25)
2014-08-02 07:25:18 +02:00
chme
a6c2a25642 If reshuffling with repeat all songs in queue active, set shuffle-head
to current playing song. Previously the shuffle-head was set to the next
song after the current, therefor the UpNext-queue appeared empty after
adding new songs to the queue.
2014-07-25 18:51:34 +02:00
chme
87b415b0d4 Fix segfault on reshuffling one item 2014-07-25 18:25:20 +02:00
chme
5065c3e4a0 Use query parameter if queuefilter parameter is unkown 2014-07-19 08:45:40 +02:00
chme
4d79a85780 Change behavior of skip to previous song to start the current song from
the beginning, if it is playing for more than 3 seconds
2014-07-17 20:14:21 +02:00
chme
fe2abfd123 clear queue on playback abort 2014-07-17 20:12:19 +02:00
chme
9527e06f71 reshuffle only songs in the UpNext queue 2014-07-17 20:12:19 +02:00
chme
a4fbeed81e Added comments to queue_clear and queue_empty 2014-05-29 09:45:04 +02:00
chme
b7cb0da2c2 Modifications to the playqueue-clear command:
- do not stop playback when clearing the UpNext queue
- clear history, if mode=0x68697374 ("hist")
2014-05-24 07:34:59 +02:00
ejurgensen
8468f55910 Honor the "ek" (encryption) flag for RAOP_DEV_OTHER + slight rewrite of raop_device_cb 2014-05-18 17:19:50 +02:00
chme
a1b09903c0 - Fix crash when calling add-next and cur_playing/cur_streaming are NULL
- Append songs after cur_streaming
2014-05-17 14:13:18 +02:00
ejurgensen
44c3dba3d9 queue_remove was removing wrong item 2014-05-06 22:55:59 +02:00
ejurgensen
305c1a141c Indentation 2014-05-04 22:36:37 +02:00
chme
7e43a42c88 Remove dead code: playback_next_bh and playback_prev_bh are only called
during playback_pause. In playback_pause "cur_playing" is always set to
NULL so that in playback_next_bh and playback_prev_bh only the
else-clause can become true.
2014-05-04 05:45:53 +02:00
chme
8036a5a6d3 fixes for playqueue-contents 2014-05-03 20:16:51 +02:00
chme
5f307c7ce1 Added support for playqueue-contents with negativ span value (returns the previously played songs) 2014-05-03 20:16:51 +02:00
ejurgensen
20539c0c08 Remove unused variable in queue_next_add 2014-04-30 23:33:42 +02:00
chme
eab4c1c3d2 Fix "play next" command - the queue was not circular anymore due the
missing setting of pl_prev of the next song and start the shuffle-queue
with ps_shuffle
2014-04-23 20:44:40 +02:00
ejurgensen
8eb6b46ed2 Adjustments to queue_move/queue_remove, mostly for consistency 2014-04-21 21:21:40 +02:00
chme
01cc83f819 respect coding convention and changed log level 2014-04-20 06:43:01 +02:00
chme
32c3b57fcd added support for the playqueueedit add next command 2014-04-19 09:12:58 +02:00
chme
475a2f4e8f added support for the playqueueedit remove command 2014-04-19 08:35:07 +02:00
chme
c3c2c421d2 added support for the playqueueedit move command 2014-04-19 08:09:32 +02:00
ejurgensen
365c5a3bc9 Only queue the rest of the album on quirky query 2014-04-18 22:39:17 +02:00
ejurgensen
6062ca014b Make the player able to stream from pipes 2014-03-31 13:10:18 +02:00
ejurgensen
9efc97d702 Add support for query-modifier=containers in DACP playqueue-edit 2014-03-31 01:53:46 +02:00
ejurgensen
708b76ce1e Play only a single item when playspec has item-spec (Podcasts/Audiobooks) 2014-03-21 23:38:14 +01:00
ejurgensen
3f1edc0082 Oops 2014-03-18 11:35:47 +01:00
ejurgensen
9484c43601 Prevent notify_main_thread from mucking with SPOTIFY_EVENT before an
event has been processed
2014-03-18 11:31:48 +01:00
ejurgensen
59b6462ba6 Small logging change 2014-03-18 10:01:06 +01:00
ejurgensen
7ed6cc98c3 Add support for Spotify (squashed commit), and:
- Try to not return items which a client can't play
    - Remove inotify subscription to IN_MODIFY and IN_CREATE
    - Fix crash on unknown codec type in transcode.c
    - Probably added some new bugs...
2014-03-11 23:20:29 +01:00
ejurgensen
190f91114e Support songartistid (asri) in group requests and queuefilter=artist
- credit misenhower of wp8remote.com
2014-02-21 20:39:57 +01:00
ejurgensen
23a7e82a1f Add support for max volume for AirPlay devices (raop) 2014-02-09 16:07:00 +01:00
ejurgensen
258163e6ce hi-res timer commit broke FreeBSD. This attempts to go back to the
old code for FreeBSD.
2014-02-08 22:59:07 +01:00
ejurgensen
01f290cc2a Replace AirTunes with AirPlay in doc and log messages 2014-02-07 22:10:40 +01:00
Anthony Doko
949cf3808d Add support for embedded platforms that don't have high-res timers. 2014-02-05 18:11:10 -08:00
ejurgensen
4842751527 Reduce log level verbosity when no real error (eg no md field) 2014-02-03 21:54:46 +01:00
ejurgensen
ae51922f57 Try to autoselect a non-selected raop device if no valid output was
selected. This should make life easier for users of Remote on iPhone
where speakers can only be selected after playback has started (I
think...)
2014-01-13 23:24:45 +01:00
ejurgensen
7079e524b6 Fix bug where dbmfi is referenced after being freed 2014-01-05 22:56:44 +01:00
ejurgensen
a42377991d Use songartistid instead of album_artist for playlist query 2014-01-05 14:20:42 +01:00
ejurgensen
161338752c Support for genre tag in dacp playqueue-edit queuefilter 2013-12-02 22:19:12 +01:00
ejurgensen
c360bdd5bd Also account for playqueue-edit?...queuefilter=album:(null) 2013-11-23 23:05:13 +01:00
ejurgensen
1199a459ac Obey device "md" (metadata) tag - credit @couteau
- original patch https://gist.github.com/couteau/7532531
2013-11-23 11:25:30 +01:00
ejurgensen
9760a43ccf Add support for mode 2 (shuffle) in playqueue-edit and -contents 2013-11-22 22:05:55 +01:00
ejurgensen
afd25b79d9 Support for playqueue-edit 2013-11-22 16:41:57 +01:00
ejurgensen
a4c16741d9 Better support for playqueue-edit (command add, mode 1)
- reply message not fixed
2013-11-21 23:33:03 +01:00
ejurgensen
f42bbd37e1 Add basic support for playqueue-contents (real reply) and add placeholder
for playqueue-edit
2013-11-14 23:14:58 +01:00
ejurgensen
84b8a7653d Enable play count with Remote
The purpose is to get the "Unplayed" tab for Podcasts in Remote
working, which requires that we increase the counter even when
playback is with Remote/RAOP (and not just iTunes streaming, which
was already working)
2013-10-26 23:13:02 +02:00
ejurgensen
6fb718b55e Fix for Apple TV update 6.0
- don't send Apple Challenge and RSA/AES key/iv if no encryption
- assume no password if no pw field
- clean up some indentation in raop.c
2013-10-13 21:48:15 +02:00
ejurgensen
9704a1e65d Bug fix when trying to restart single song in playlist
cur_streaming may be null, so can't address cur_streaming->ctx
2013-09-25 20:14:13 +02:00
ejurgensen
04ae27f914 Autoselecting local audio just messes up speaker selection. 2013-08-31 12:47:13 +02:00
ejurgensen
b6df68b75b Fix: Clearing retransmit buffer after player stop could crash due
to reading pointer from free'd memory (in raop.c). Also added some
safeguards against passing invalid file descripters to close()
in player.c.
2013-08-17 23:05:50 +02:00
Scott Atkinson
b52bd94380 Update to support some older, encrytped APEs
Some APEs report their am value as something like `AirPort4,107` (Old
version) or `AirPort10,115` (new version). (There is some evidence in
the player.c code that some old APEs do not report an AM value at all,
but all three of mine do.

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

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

There may be other flavors of APEs that may fail this test, but it's
the best I can suggest with the devices I have.
2013-07-26 10:24:08 +02:00
Kai Elwert
49ab2a3ce4 Allow playback on non apple airplay devices 2013-07-04 14:57:00 +02:00
Julien BLACHE
2cead60432 Remove unused prev variable 2011-04-24 18:43:58 +02:00
Julien BLACHE
53588f36af Wire up metadata handling in player and RAOP
This enables sending out metadata to AppleTV.
2011-04-09 10:11:35 +02:00
Julien BLACHE
d208ca79d4 Add support for metadata handling in player 2011-04-09 10:11:35 +02:00
Julien BLACHE
db67f4ed6f Set has_video flag for AppleTV devices 2011-04-09 10:11:34 +02:00
Julien BLACHE
f3e7836453 Introduce struct spk_flags to reduce argument count for enumeration callback 2011-04-09 10:11:34 +02:00
Julien BLACHE
0d0877de9c Honour IPv6 config option in player/RAOP 2011-03-20 12:20:07 +01:00
Julien BLACHE
d8b7980fe4 Do not ask mDNS for IPv6 addresses if RAOP can't use IPv6 2011-03-15 19:20:38 +01:00
Julien BLACHE
ec7c3d108c Let player know about IPv6 status in RAOP 2011-03-15 19:20:38 +01:00
Julien BLACHE
d0fa636643 Properly take ownership of new device address
Added addresses are transferred from dev to the existing rd. Set the
address to NULL in dev to avoid free()ing it in device_free() a few lines
down the road.
2011-03-15 19:20:38 +01:00
Julien BLACHE
e08c42b3c0 Player wants IPv4/IPv6/IPv6LL from mDNS for _raop._tcp 2011-03-10 21:08:25 +01:00
Julien BLACHE
6cd59a1240 Introduce mDNS browser flags for address type selection
Allow each user to specify the address types that should be returned
through the mDNS browse callback.
2011-03-10 21:08:25 +01:00
Raivo Hool
86a90fe81f Fix conversion to per-command lock & condition for FreeBSD
Leftover from commit 7f79ca5709
2011-02-23 19:09:26 +01:00
Julien BLACHE
2011c33526 Cosmetic fix to RAOP device type strings 2010-12-12 10:27:04 +01:00
Julien BLACHE
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
Julien BLACHE
507cdb00e8 Rename playback_stop() to playback_abort() and make it an internal helper 2010-12-12 10:12:39 +01:00
Julien BLACHE
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
Julien BLACHE
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
Julien BLACHE
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
Julien BLACHE
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
Julien BLACHE
9bd6d459a2 Maintain per-speaker volume information 2010-12-04 15:08:06 +01:00
Julien BLACHE
9507f8d059 Switch speaker state-saving to new db_speaker_* interface 2010-12-04 15:08:06 +01:00
Julien BLACHE
7de9408a10 Make sure device is deselected before removing it 2010-12-02 19:56:26 +01:00
Julien BLACHE
78df98ba35 Introduce speaker selection/deselection helpers 2010-12-02 19:56:26 +01:00
Julien BLACHE
55f0c7cfcd Rename volume to master_volume 2010-12-02 19:53:36 +01:00
Julien BLACHE
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
Julien BLACHE
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
Julien BLACHE
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
Julien BLACHE
389e3f1123 Introduce non-blocking commands 2010-12-02 19:51:50 +01:00
Julien BLACHE
ec4299e6c7 Turn speaker enumeration into a sync command 2010-12-02 19:51:08 +01:00
Julien BLACHE
418e818bee Move code around, no functional changes 2010-11-28 17:37:48 +01:00
Julien BLACHE
c3e24a0d9a Hide get_pos() debug messages behind DEBUG_SYNC 2010-11-28 17:33:19 +01:00
Julien BLACHE
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
Julien BLACHE
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
Kai Elwert
6bfc4a65e2 Implement sort=artist for DACP/player 2010-10-26 18:06:36 +02:00
Julien BLACHE
a8e7a7aeeb Fix missing command_init() call in player_playback_next() 2010-10-07 21:06:40 +02:00
Julien BLACHE
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
Julien BLACHE
309ad6060e RAOP device discovery rework, rework add/update 2010-09-30 19:24:34 +02:00
Julien BLACHE
48de711301 RAOP device discovery rework, remove add/remove branch & reindent 2010-09-30 19:18:49 +02:00
Julien BLACHE
999066d703 RAOP device discovery rework, split remove code 2010-09-30 19:15:17 +02:00
Julien BLACHE
01df67ceb6 Move last_active check into the device add case 2010-09-30 19:08:43 +02:00
Julien BLACHE
a3d549bd37 Reduce stack usage for boolean flags 2010-09-25 20:57:10 +02:00
Julien BLACHE
50a9a3690f RAOP auth quirk for old (802.11g) AirPort Express 2010-09-25 20:57:10 +02:00
Julien BLACHE
8411aa48b7 Keep Avahi code inside mdns_avahi.c 2010-09-18 17:25:50 +02:00
Julien BLACHE
7ba3b23f63 Rename mdns_avahi.h to mdns.h 2010-09-18 17:24:34 +02:00
Julien BLACHE
aa57931879 Fix typo in goto label name 2010-09-17 12:21:05 +02:00
Julien BLACHE
bff494ac5d Use a union for command argument in struct player_command 2010-09-13 19:08:29 +02:00
Julien BLACHE
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
Julien BLACHE
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
Julien BLACHE
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
Julien BLACHE
b3294c5079 Fix debug message typo 2010-08-03 19:11:41 +02:00
Julien BLACHE
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
Julien BLACHE
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
Julien BLACHE
94b4cd2459 Add support for shuffle in DACP playspec request 2010-07-31 12:09:13 +02:00
Kai Elwert
4a160e8ad1 Add player_queue_make_pl() for playlist-based queues 2010-07-31 12:09:13 +02:00
Kai Elwert
055fe8f442 Make player_queue_make() generic and introduce player_queue_make_daap() 2010-07-31 10:30:45 +02:00
Julien BLACHE
2e6ed82e14 Fix debug message 2010-07-31 10:30:45 +02:00
Julien BLACHE
3148ec8209 Stop command event and timer event (if running) at deinit 2010-07-30 22:16:07 +02:00
Julien BLACHE
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
Julien BLACHE
f5bcc82afb Rework password handling in RAOP mDNS browser callback 2010-07-30 19:09:09 +02:00
Julien BLACHE
7a09ee4092 Add support for streaming unencrypted audio 2010-07-30 19:09:09 +02:00
Julien BLACHE
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
Julien BLACHE
01cde2c50c Cleanup debug message 2010-07-10 12:26:31 +02:00
Julien BLACHE
b8238e6a78 Add IPv6 support to player and RAOP for device discovery 2010-05-14 17:37:55 +02:00
Julien BLACHE
4bd09cba62 Browse and resolve mDNS services on both IPv4 and IPv6 2010-05-14 17:36:29 +02:00
Julien BLACHE
143b612c97 Fix REPEAT_OFF behaviour on single-item playlists 2010-05-09 09:52:09 +02:00
Julien BLACHE
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
Julien BLACHE
c2977fd61d Protect playback_start() againt empty playlist 2010-05-05 19:19:16 +02:00
Julien BLACHE
682e495ed0 Protect shuffle against empty player playlist 2010-05-05 19:17:36 +02:00
Julien BLACHE
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
Julien BLACHE
47589ff34a Add audio player 2010-05-02 11:45:14 +02:00