colin/sublime-music
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Closes #131, #185: fixed issue with next/prev in UI and dbus

Browse Source
This commit is contained in:
Sumner Evans
2020-07-25 19:35:27 -06:00
parent dd7bcf71e6
commit fee336ceeb
2 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
sublime/app.py
View File

@@ -645,7 +645,9 @@ class SublimeMusicApp(Gtk.Application):
self.app_config.state.playing = not self.app_config.state.playing self.app_config.state.playing = not self.app_config.state.playing
if self.player_manager.song_loaded: if self.player_manager.song_loaded and (
self.player_manager.current_song == self.app_config.state.current_song
):
self.player_manager.toggle_play() self.player_manager.toggle_play()
self.save_play_queue() self.save_play_queue()
else: else:
@@ -655,6 +657,9 @@ class SublimeMusicApp(Gtk.Application):
self.update_window() self.update_window()
def on_next_track(self, *args): def on_next_track(self, *args):
if self.app_config.state.current_song is None:
# This may happen due to DBUS, ignore.
return
# Handle song repeating # Handle song repeating
if self.app_config.state.repeat_type == RepeatType.REPEAT_SONG: if self.app_config.state.repeat_type == RepeatType.REPEAT_SONG:
song_index_to_play = self.app_config.state.current_song_index song_index_to_play = self.app_config.state.current_song_index
@@ -670,9 +675,17 @@ class SublimeMusicApp(Gtk.Application):
else: else:
song_index_to_play = self.app_config.state.current_song_index + 1 song_index_to_play = self.app_config.state.current_song_index + 1
self.play_song(song_index_to_play, reset=True) self.app_config.state.current_song_index = song_index_to_play
self.app_config.state.song_progress = timedelta(0)
if self.player_manager.playing:
self.play_song(song_index_to_play, reset=True)
else:
self.update_window()
def on_prev_track(self, *args): def on_prev_track(self, *args):
if self.app_config.state.current_song is None:
# This may happen due to DBUS, ignore.
return
# Go back to the beginning of the song if we are past 5 seconds. # Go back to the beginning of the song if we are past 5 seconds.
# Otherwise, go to the previous song. # Otherwise, go to the previous song.
no_repeat = self.app_config.state.repeat_type == RepeatType.NO_REPEAT no_repeat = self.app_config.state.repeat_type == RepeatType.NO_REPEAT
@@ -689,12 +702,17 @@ class SublimeMusicApp(Gtk.Application):
# Go back to the beginning of the song. # Go back to the beginning of the song.
song_index_to_play = self.app_config.state.current_song_index song_index_to_play = self.app_config.state.current_song_index
self.play_song( self.app_config.state.current_song_index = song_index_to_play
song_index_to_play, self.app_config.state.song_progress = timedelta(0)
reset=True, if self.player_manager.playing:
# search backwards for a song to play if offline self.play_song(
playable_song_search_direction=-1, song_index_to_play,
) reset=True,
# search backwards for a song to play if offline
playable_song_search_direction=-1,
)
else:
self.update_window()
@dbus_propagate() @dbus_propagate()
def on_repeat_press(self, *args): def on_repeat_press(self, *args):

2
sublime/players/manager.py
View File

@@ -35,6 +35,7 @@ class PlayerManager:
player_device_change_callback: Callable[[PlayerDeviceEvent], None], player_device_change_callback: Callable[[PlayerDeviceEvent], None],
config: Dict[str, Dict[str, Union[Type, Tuple[str, ...]]]], config: Dict[str, Dict[str, Union[Type, Tuple[str, ...]]]],
): ):
self.current_song: Optional[Song] = None
self.on_timepos_change = on_timepos_change self.on_timepos_change = on_timepos_change
self.on_track_end = on_track_end self.on_track_end = on_track_end
self.config = config self.config = config
@@ -153,6 +154,7 @@ class PlayerManager:
current_player.set_muted(muted) current_player.set_muted(muted)
def play_media(self, uri: str, progress: timedelta, song: Song): def play_media(self, uri: str, progress: timedelta, song: Song):
self.current_song = song
if current_player := self._get_current_player(): if current_player := self._get_current_player():
current_player.play_media(uri, progress, song) current_player.play_media(uri, progress, song)