Skip to content

Cast: Fix next/previous track #22634

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
balloob merged 3 commits into from
Apr 3, 2019
Merged

Cast: Fix next/previous track #22634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa29106
Fix next/previous track
emontnemery Apr 1, 2019
cce3746
Bump pychromecast
emontnemery Apr 1, 2019
f1ce1c3
Update test, fixup
emontnemery Apr 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion homeassistant/components/cast/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from homeassistant import config_entries
from homeassistant.helpers import config_entry_flow

REQUIREMENTS = ['pychromecast==3.1.0']
REQUIREMENTS = ['pychromecast==3.2.0']

DOMAIN = 'cast'

Expand Down
27 changes: 19 additions & 8 deletions homeassistant/components/cast/media_player.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
from homeassistant.components.media_player.const import (
MEDIA_TYPE_MOVIE, MEDIA_TYPE_MUSIC, MEDIA_TYPE_TVSHOW, SUPPORT_NEXT_TRACK,
SUPPORT_PAUSE, SUPPORT_PLAY, SUPPORT_PLAY_MEDIA, SUPPORT_PREVIOUS_TRACK,
SUPPORT_STOP, SUPPORT_TURN_OFF, SUPPORT_TURN_ON, SUPPORT_VOLUME_MUTE,
SUPPORT_VOLUME_SET)
SUPPORT_SEEK, SUPPORT_STOP, SUPPORT_TURN_OFF, SUPPORT_TURN_ON,
SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET)
from homeassistant.const import (
CONF_HOST, EVENT_HOMEASSISTANT_STOP, STATE_IDLE, STATE_OFF, STATE_PAUSED,
STATE_PLAYING)
Expand All @@ -36,9 +36,9 @@

DEFAULT_PORT = 8009

SUPPORT_CAST = SUPPORT_PAUSE | SUPPORT_VOLUME_SET | SUPPORT_VOLUME_MUTE | \
SUPPORT_TURN_ON | SUPPORT_TURN_OFF | SUPPORT_PREVIOUS_TRACK | \
SUPPORT_NEXT_TRACK | SUPPORT_PLAY_MEDIA | SUPPORT_STOP | SUPPORT_PLAY
SUPPORT_CAST = SUPPORT_PAUSE | SUPPORT_PLAY | SUPPORT_PLAY_MEDIA | \
SUPPORT_STOP | SUPPORT_TURN_OFF | SUPPORT_TURN_ON | \
SUPPORT_VOLUME_MUTE | SUPPORT_VOLUME_SET

# Stores a threading.Lock that is held by the internal pychromecast discovery.
INTERNAL_DISCOVERY_RUNNING_KEY = 'cast_discovery_running'
Expand Down Expand Up @@ -931,12 +931,12 @@ def media_stop(self):
def media_previous_track(self):
"""Send previous track command."""
media_controller = self._media_controller()
media_controller.rewind()
media_controller.queue_prev()

def media_next_track(self):
"""Send next track command."""
media_controller = self._media_controller()
media_controller.skip()
media_controller.queue_next()

def media_seek(self, position):
"""Seek the media to a specific location."""
Expand Down Expand Up @@ -1130,7 +1130,18 @@ def app_name(self):
@property
def supported_features(self):
"""Flag media player features that are supported."""
return SUPPORT_CAST
support = SUPPORT_CAST
media_status, _ = self._media_status()

if media_status:
if media_status.supports_queue_next:
support |= SUPPORT_PREVIOUS_TRACK
if media_status.supports_queue_next:
support |= SUPPORT_NEXT_TRACK
if media_status.supports_seek:
support |= SUPPORT_SEEK
Copy link
Copy Markdown
Contributor Author

@emontnemery emontnemery Apr 1, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Setting this doesn't seem to make any difference to the frontend, is it not implemented?

Copy link
Copy Markdown
Member

@balloob balloob Apr 2, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nope


return support

@property
def media_position(self):
Expand Down
2 changes: 1 addition & 1 deletion requirements_all.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -980,7 +980,7 @@ pycfdns==0.0.1
pychannels==1.0.0

# homeassistant.components.cast
pychromecast==3.1.0
pychromecast==3.2.0

# homeassistant.components.cmus.media_player
pycmus==0.1.1
Expand Down
8 changes: 4 additions & 4 deletions tests/components/cast/test_media_player.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,16 +479,16 @@ async def test_dynamic_group_media_control(hass: HomeAssistantType):
group_media_status.player_is_playing = True
entity.new_dynamic_group_media_status(group_media_status)
entity.media_previous_track()
assert entity._dynamic_group_cast.media_controller.rewind.called
assert not chromecast.media_controller.rewind.called
assert entity._dynamic_group_cast.media_controller.queue_prev.called
assert not chromecast.media_controller.queue_prev.called

# Player is paused, dynamic group is playing -> Should not forward
player_media_status.player_is_playing = False
player_media_status.player_is_paused = True
entity.new_media_status(player_media_status)
entity.media_next_track()
assert not entity._dynamic_group_cast.media_controller.skip.called
assert chromecast.media_controller.skip.called
assert not entity._dynamic_group_cast.media_controller.queue_next.called
assert chromecast.media_controller.queue_next.called

# Player is in unknown state, dynamic group is playing -> Should forward
player_media_status.player_state = "UNKNOWN"
Expand Down