Commit Graph

929 Commits

Author SHA1 Message Date
casey langen
c803d2b671 A small bugfix to restore volume after switching transports. 2016-12-27 01:15:40 -08:00
casey langen
1dbdf73c5c Fixed *nix and macOS compile. 2016-12-27 01:12:01 -08:00
casey langen
153f12326c Added UI to switch between transport types at runtime! Needs to be
converted to a ListOverlay, but it works!
2016-12-27 01:07:29 -08:00
casey langen
9c9b003dab Fixed DirectSoundOut to not stop after draining -- no longer necessary
because Drain() is fixed, and it's actually causing issues with gapless
playback.
2016-12-27 01:07:03 -08:00
casey langen
ca455e108b Jeeze one of these times I'll get this right. 2016-12-26 22:04:32 -08:00
casey langen
d85251a02f - Fixed WasapiOut pause/resume behavior, slightly broken after reducing lock
contention.
- Fixed DirectSoundOut pause/resume behavior
- Fixed CrossfadeTransport to call player->Play() after resuming the
  output. This was causing the player to wait a while for a timeout before
  writing buffers instead of continuing to write them immediately.
2016-12-26 21:57:39 -08:00
casey langen
4fd664b08a - Fixed Crossfader to adjust for time spent actually adjusting the
output's volume

- Reduced lock contention in WasapiOut and DirectSoundOut by caching
  AddRef()'d copies of important interfaces in the ::Play() methods.
2016-12-26 15:22:49 -08:00
casey langen
6bffe8a54d Adjusted Crossfader's number of ticks per second to make smoothing fader on output drivers that do software mixing (like ALSA) 2016-12-26 14:13:10 -08:00
casey langen
a02f94ef0c * Added correct Latency() calculation to AlsaOut
* Changed default Linux output device to PulseAudio
2016-12-26 10:59:56 -08:00
Casey Langen
7dc7cf5062 When crossfading, make sure the output is drained before shutting it down. 2016-12-26 10:03:45 -08:00
casey langen
f618e15abb Fixed a race condition and a dead lock. Also removed a bit of extraneous locking in Player. 2016-12-25 23:37:03 -08:00
casey langen
5f64b205cf Hide the main window immediately on exit in the Win32 build. This allows
us to cross fade the audio out without appearing to be frozen.
2016-12-25 20:44:18 -08:00
Casey Langen
eb175cd66c When using the CrossfadeTransport, fade music out if stopped (or the app is exited). 2016-12-25 19:21:57 -08:00
casey langen
105a72457e Sane implementation of DirectSoundOut::Drain() -- just write silence to
the playback buffer until it's full.
2016-12-25 11:06:23 -08:00
casey langen
df339ab61f Fixes to DirectSoundOut::Drain() and WasapiOut::Drain() -- why do the
Windows APIs make this so difficult??
2016-12-25 01:19:02 -08:00
Casey Langen
32fced8274 Fixed PulseOut and also bumped all output plugin versions. 2016-12-25 00:03:13 -08:00
casey langen
f25fb85c16 Added IOutput::Drain() and implementations for all the output devices.
Call this method at the very end of the Player threadProc, just before
destroying the instance.
2016-12-24 23:56:53 -08:00
casey langen
39086c6145 Fixed bugs in auto-stop when arriving at the end of the playlist. 2016-12-24 22:10:49 -08:00
casey langen
01c9b6cb3b Some more low-level surgery:
1. Player now manages a list of listeners so more than one client can be
notified of events.
2. Crossfader no longer awkwardly receives Player events via the
Transport, it attaches and detaches to the player as appropriate.
3. Renamed Player::PlayerEventListener => Player::EventListener, and added
stubbed implementations for all the listener methods.
2016-12-24 20:53:52 -08:00
Casey Langen
698227cff1 Fixed Player::Detach() logic for CrossfadeTransport. Also simplified a bit of Player instance reset checks in GaplessTransport. 2016-12-24 18:13:56 -08:00
casey langen
ad390fb6f1 Ensure GaplessTransport always detaches from before destroying players. 2016-12-24 17:31:32 -08:00
casey langen
27270e1cf7 Oops, fixed equality check in Player::Detach() 2016-12-24 17:20:32 -08:00
casey langen
ddfe18cbda Added safe listener detach logic to Player and added it to
GaplessTransport.
2016-12-24 17:17:45 -08:00
casey langen
4356397f40 Fixed the CrossfadeTransport to work properly with muted streams -- or
streams that become muted during the fading process.
2016-12-24 14:09:16 -08:00
casey langen
e2ef4dda3f Added MessageQueue::Contains() and modified MessageQueue::Remove() to
return the number of elements removed.
2016-12-24 14:09:16 -08:00
Casey Langen
8ea81ae9a8 More state management fixes in CoreAudioOut.cpp -- it no longer glitches when pausing/resuming/stopping using the CrossfadeTransport. 2016-12-24 13:03:11 -08:00
casey langen
0184f1c8e8 Tweaked CoreAudioOut state flags to be more similar to most of the other
outputs.
2016-12-24 12:49:05 -08:00
casey langen
cfee726c02 * Fixed a memory leak in WasapiOut
* Added a new OnPlayerPrepared() callback method to the Player's listener
interface.

* More work on the crossfader. It kind of works now in some cases. Still a
ways to go...
2016-12-24 01:01:08 -08:00
casey langen
5b5399322f Ensure the Player's listener is zero'd out as part of Player::Destroy().
Also cleaned up a couple small warnings.
2016-12-23 21:38:16 -08:00
Casey Langen
483dfa65cd Fixed Linux compile. 2016-12-23 20:25:49 -08:00
Casey Langen
40e9fc90c3 Fixed macos compile. 2016-12-23 18:58:18 -08:00
casey langen
1f0b306987 More incremental work to support a crossfading transport. 2016-12-23 18:37:07 -08:00
casey langen
06a83344b7 - Fixed DirectSoundOut to fallback to software mixing if necessary
- Fixed WasapiOut to do local stream volume control, instead of session
  (i.e. app-wide) volume control.
2016-12-23 18:36:19 -08:00
casey langen
5f7f2ac0e0 Fixed bug in Player::Destroy() that could try to detach an already
detached thread, leading to a crash.
2016-12-23 16:09:48 -08:00
casey langen
167d7aeb1c Added missing CrossfadeTransport and Crossfader source files. 2016-12-23 12:57:24 -08:00
casey langen
25e752892c - Fixed a bug in Player mixpoint dispatch
- Fixed MessageQueue::WaitAndDispatch() time arithmetic
2016-12-23 12:56:24 -08:00
casey langen
5cd3a8de10 Properly implemented play/pause semantics in output plugins (only WaveOut
was doing it properly!)
2016-12-23 12:53:57 -08:00
casey langen
a6372b3c92 A bunch of changes, some of which are still untested:
1. Added IDecoder::GetDuration() methods. Implemented it for all decoders.
2. Modified NomadDecoder to properly resolve duration for mp3 files that
do not have valid Xing headers (borrowed TagLib code)
3. Added IStream::GetDuration(), IPlayer::GetDuration(), and
ITransport::GetDuration()
4. Stubbed out a CrossfaderTransport (untested, unimplemented)
5. Added the concept of "MixPoints" to Player, so clients can be notified
when playback reaches certain points. (untested)
6. Started fleshing out a Crossfader implementation that uses a background
thread and a MessageQueue (untested)
7. Modified TransportWindow to pull the decoder's duration, then fallback
to the library duration if unavailable.
8. Added IDataStream::Seekable(), implemented in LocalFileStream.
2016-12-23 01:36:49 -08:00
Casey Langen
4b53439d68 Fixed macos compile. 2016-12-21 16:48:27 -08:00
casey langen
25fa580bde - Moved MessageQueue and friends into the core so it can be reused for
other things like timers and processing threads
- Cleaned up Player's listener interface a bit, and removed some more
  complexity from GaplessTransport
2016-12-21 16:41:44 -08:00
casey langen
1a00c83c7b Added MessageQueue::WaitAndDispatch(), which should be usable for
timer-like functionality.
2016-12-21 00:02:20 -08:00
casey langen
3aa4871e62 MessageQueue itself is no longer a singleton. However, Window has a static
instance.
2016-12-20 22:54:13 -08:00
casey langen
b832b96688 Simplified GaplessTransport -- we no longer need to keep around the weird
list of active players -- only the one that's actually active and the next
one.
2016-12-20 22:27:13 -08:00
casey langen
95fc9c725b Ensure the state flag in DirectSoundOut.h is an atomic. 2016-12-19 22:57:50 -08:00
casey langen
00bcb09a94 Version bump. 2016-12-19 22:52:37 -08:00
casey langen
35335632e8 Added a very simple shell script used to archive builds for distribution. 2016-12-19 22:50:37 -08:00
casey langen
928a74e4d5 OK, hopefully really fixed the volume -> attenuation conversion. Used VLC
as a reference implementation.
2016-12-19 16:24:20 -08:00
casey langen
cd15ece9f0 Fixed volume -> attenuation conversion in DirectSoundOut. 2016-12-18 19:40:11 -08:00
casey langen
d27b911ede - Added DirectSoundOut plugin for Windows
- Updated WasapiOut to pre-calculate the stream latency
2016-12-18 17:15:00 -08:00
casey langen
60f8d5ab50 Fixed broken CMakeLists install script. 2016-12-14 22:06:56 -08:00