Commit Graph

149 Commits

Author SHA1 Message Date
Thomas Adamcik
da7ec9b202 core: Cleanup track ended event handling
Trigger playback ended on:
- stream changed
- EOS
- stop via stream changed events

Old behavior was to manually trigger on:
- next
- prev
- play with other track and old state != STOPPED
- stop
2015-11-19 22:45:55 +01:00
Stein Magnus Jodal
587f2ac3d9 compat: Make more urlparse usage py2+3 compatible 2015-10-29 22:57:18 +01:00
Stein Magnus Jodal
93899c8599 Merge pull request #1288 from adamcik/feature/implement-gapless
Gapless part 1
2015-10-07 23:32:31 +02:00
Thomas Adamcik
0169ce7cad core: Make sure the about-to-finish callback gets run in the actor.
When about to finish gets called we are running in some GStreamer thread. Our
audio code then calls the shim core callback which is responsible for
transferring our execution to the core actor thread and waiting for the
response. From this point we do normal actor calls to the backend(s) which in
turn call into the audio actor. Since the initial audio code that was called is
outside the actor this should never deadlock due to this loop.
2015-10-06 22:45:06 +02:00
Thomas Adamcik
1ca548ece7 core: Fix typos in comments 2015-10-05 21:41:15 +02:00
Stein Magnus Jodal
22264071e4 core, mpd: Start tlid/songid counting at 1
The original MPD server starts at 1. upmpdcli has issues with Mopidy
starting at 0 instead, as 0 is special in its context.

As noone should care exactly what core's TLIDs are, I opted to start
counting both core TLID and MPD songid from 1, instead of just
increasing TLID with 1 in the MPD frontend to get a valid songid. This
also keeps it easier to debug across the MPD/core boundary.
2015-09-24 22:35:59 +02:00
Thomas Adamcik
7f4e77f36f core: Update to using _change in play and fix playback ended event 2015-09-16 23:44:36 +02:00
Thomas Adamcik
592b728e32 core: Refactor previous() to use pending_track for state changes 2015-09-04 17:16:39 +02:00
Thomas Adamcik
2cd9903a54 core: Refactor next() to use pending_track for state changes 2015-09-04 16:08:54 +02:00
Thomas Adamcik
e12ea662da Merge branch 'develop' into feature/implement-gapless 2015-09-02 21:03:17 +02:00
Stein Magnus Jodal
0bf67e296f core: Log full backend exception 2015-07-25 14:34:40 +02:00
Thomas Adamcik
3fe9f7b3a7 Merge branch 'develop' into feature/implement-gapless
Conflicts:
	mopidy/commands.py
	mopidy/core/playback.py
	tests/core/test_playback.py
	tests/local/test_playback.py
2015-07-22 20:00:46 +02:00
Stein Magnus Jodal
0ebfeb5a5b core: Normalize negative seek positions
This reverts a change between 1.0 and 1.1, so no changelog.

Fixes #1180
2015-07-22 12:15:38 +02:00
Stein Magnus Jodal
749c8baceb Merge branch 'v1.0.x' into develop
Conflicts:
	mopidy/core/library.py
	tests/core/test_playback.py
2015-06-25 23:15:35 +02:00
Thomas Adamcik
1d636ce59e core: Make sure track gets changed while paused 2015-05-20 23:26:55 +02:00
Stein Magnus Jodal
d8bcd7f273 Rename mopidy.utils to mopidy.internal 2015-05-07 23:15:56 +02:00
Thomas Adamcik
4d608dd431 core: Add get_current_tlid shortcut 2015-05-06 23:00:53 +02:00
Thomas Adamcik
30f56abc66 core: Add "one-of" validation for number of kwargs 2015-04-25 00:56:11 +02:00
Thomas Adamcik
996af72af7 docs: Refresh PlaybackController documentation 2015-04-24 00:14:22 +02:00
Thomas Adamcik
a62293c316 core: Add play(tlid) support 2015-04-22 20:55:51 +02:00
Thomas Adamcik
324bec1f4a core: Validate core API calls 2015-04-14 23:45:56 +02:00
Thomas Adamcik
11c9aa4ad0 Merge branch 'develop' into feature/implement-gapless
Conflicts:
	mopidy/backend.py
	mopidy/commands.py
	mopidy/core/actor.py
	mopidy/core/playback.py
	tests/audio/test_actor.py
	tests/core/test_playback.py
	tests/local/test_playback.py
2015-04-05 19:24:56 +02:00
Thomas Adamcik
bd1e822fea utils: Create warn and ignore deprecation warning helpers
This moves all the deprecation warnings messages to a central place so that it
is easy to match against them without having to redefine the same regex all
over the place.

Each message has been given a message id which is more or less
module.func:extra-info. This is not intended to be parsed, just used in tests
when using the ignore helper.
2015-03-30 23:48:08 +02:00
Thomas Adamcik
f4452b22db core: Minor readability improvement 2015-03-23 15:02:37 +01:00
Thomas Adamcik
6d22c4fd59 core: Remove set_current_tl_track 2015-03-23 00:50:05 +01:00
Thomas Adamcik
07f0453c6e core: Make event triggers internal 2015-03-23 00:50:05 +01:00
Thomas Adamcik
fd04cd918f core: Remove on_error_step from play arguments 2015-03-23 00:50:05 +01:00
Thomas Adamcik
ca02dbb676 core: Make change_track internal as it going away in 1.x 2015-03-23 00:50:05 +01:00
Thomas Adamcik
a74bc24bdc core: Protect against old clients that implement backend.play 2015-03-22 23:54:37 +01:00
Thomas Adamcik
efe9430c7a core: Update playback code to take change track into account.
This change has us checking the return value of change_track when deciding if
the play call was a success or if the track is unplayable. Which ensures that
the following can no longer happen: 1) play stream 2) play stream that fails
change_track 3) stream 1) continues playing. Correct behavior being the next
stream playing instead.
2015-03-22 22:12:51 +01:00
Thomas Adamcik
bbf52eede9 backend: Change playback API (breaking change!)
While trying to remove traces of stop calls in core to get gapless working I
found we had no way to switch to switch tracks without triggering a play. This
change fixes this by changing the backends playback provider API.

- play() now _only_ starts playback and does not take any arguments.
- prepare_change() has been added, this could have been avoided with a kwarg to
  change_track(track), but that would break more backends.
- core has been updated to call prepare_change+change_track+play as needed.
- tests have been updated to handle this change.

Longer term I hope to completely rework the playback API in backends, as 99% of
our backends only use change_track(track) to translate URIs. So we should make
simple case simple, and handle mopidy-spotify / appsrc in some other way.

Cherry picked from the WIP gapless branch.
2015-03-21 00:05:00 +01:00
Stein Magnus Jodal
861f60e6f1 core: Make history.add() private
Instead of changing the signature to add(uri, name) I opted for
renaming it to _add_track(track).

Since it's internal we may change it whenever we like to. Since you need
different logic for extracting an interesting name from a track and from
a ref or a stream title, it makes sense to add another method for adding
refs/stream titles to the history when that time comes.

Fixes #1056
2015-03-20 22:41:56 +01:00
Stein Magnus Jodal
c57f3ec9b2 core: Make tracklist.mark_*() private
Fixes #1058
2015-03-20 22:28:40 +01:00
Stein Magnus Jodal
a05c097106 docs: Change deprecated-in from 0.20 to 1.0
Fixes #1051
2015-03-18 22:00:00 +01:00
Thomas Adamcik
65f87e89f1 core: Update pending track handling and fix consume / gapless issue
- Pending track should only be triggered by stream_changed if there is one.
- Tracklist changed was incorrectly calling stop breaking tests and gapless
- Tests have been updated to capture and replay audio events. This should avoid
  test deadlocks while still using the audio fakes.
2015-03-16 23:50:08 +01:00
Stein Magnus Jodal
0f21e7425e Merge pull request #1039 from adamcik/bug/923/duration-as-int-or-none
core: Correctly handle missing duration in seek.
2015-03-15 21:26:16 +01:00
Thomas Adamcik
6adeea6009 core: Correctly handle missing duration in seek.
Seeks will now fail when the duration is None, this is an approximation to if
the track is seekable or not. This check is need as otherwise seeking a radio
stream will trigger the next track.

If the track truly isn't seekable despite having a duration we should still
fail as GStreamer will reject the seek.
2015-03-15 11:29:07 +01:00
Stein Magnus Jodal
6f5ae2f9c4 docs: Fix syntax error in deprecation notices 2015-03-14 22:02:19 +01:00
Thomas Adamcik
4db4b4d63b core: Reduce stream metadata to just the title
The API I really want for this to support regular tracks, stream updates and
dynamic playlists is still unclear to me. As such I'm taking the KISS approach
and reducing this to just the stream title and nothing else.

If all goes as planed this will be replaced by playback_track_changed(tlid, ref)
style events and other improvements in a later version.
2015-03-13 23:56:51 +01:00
Thomas Adamcik
6fcd43891e core: Switch to reference based stream info.
- Adds tests for new behaviors in core.
- Adds stream name to MPD format (fixes #944)
- Adds 'stream_changed' core event (needs a new name/event)
- Adds 'get_stream_reference' (which I'm also unsure about)

The bits I'm unsure about are mostly with respect to #270, but I'm going ahead
with this commit so we can discuss the details in PR with this code as an
example.
2015-03-10 21:55:51 +01:00
Lasse Bigum
fbd534efbf Don't change to playing state when seeking in paused state
Do not switch state from paused to playing when seeking
2015-03-01 15:50:17 +01:00
Stein Magnus Jodal
42115c56f7 core: Add mixer controller (fixes: #962)
Deprecate volume and mute methods on playback controller.
2015-02-12 10:31:16 +01:00
Stein Magnus Jodal
8f8fa4d414 core: Emit deprecation warnings
The warnings appear as warning level log messages if running Python on
the mopidy/ directory like this:

    python -W all mopidy -v

or:

    python -W all mopidy -o loglevels/py.warnings=warning

We don't suppress warnings when Pykka is the caller in general, but just
when Pykka is looking at all properties to create its actor proxies.

When a deprecated property is used from another Pykka actor, only the
stack for the current actor thread is available for inspection, so the
warning cannot show where the actual call site in the other actor thread
is. Though, if the warnings are made exceptions with:

    python -W error mopidy

then the stack traces will include the frames from all involved actor
threads, showing where the original call site is.
2015-02-11 00:29:52 +01:00
Stein Magnus Jodal
5827e45c34 core: Use getters/setters internally in core
This fixes all the easy-to-track warnings.
2015-02-11 00:17:12 +01:00
Stein Magnus Jodal
352de135cd core: Deprecate properties (fixes #952) 2015-02-11 00:17:12 +01:00
Stein Magnus Jodal
1b6db5695d core: current_metadata_track is TlTrack, not Track 2015-02-10 23:43:16 +01:00
Thomas Adamcik
b0aebaf993 core: Make sure current_tl_track changes on stream change
- Adds stream changed handler to core
- Moves playback started trigger to stream changed
- Made about to finish store next track in _pending_tl_track
- Set the pending track as current in stream changed
- Adds tests for all of this and fixes existing tests
2015-01-23 00:14:30 +01:00
Thomas Adamcik
49f16704d8 core: Remove on_end_of_track from playback
This has been replaced by on_about_to_finish and on_end_of_stream.
Tests have been updated to reflect these changes.
2015-01-22 23:16:51 +01:00
Thomas Adamcik
edae29d769 core: Enable gapless playback
There is still quite a bit to be done is this area:

- We need to start tracking pending tracks as there is time window when we are
  decoding a new track but still playing the old one
  - Currently this breaks seek, next, prev during this time window
- The old on_end_of_track code needs to die.
- Stream changes need to trigger playing events and switch the pending track to
  current.
2015-01-21 23:42:34 +01:00
Thomas Adamcik
ccd91c0b72 core: Pass audio in to playback 2015-01-21 23:28:57 +01:00