Skip to content

Commit

Permalink
Another bits of obsolete code
Browse files Browse the repository at this point in the history
  • Loading branch information
rdbende committed Dec 2, 2024
1 parent 6df5f72 commit e60ea89
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 10 deletions.
1 change: 0 additions & 1 deletion cozy/app_controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,5 +149,4 @@ def _on_main_window_event(self, event: str, data):
self._on_open_view(data, None)

def quit(self):
self.sleep_timer_view_model.destroy()
self.player.destroy()
1 change: 1 addition & 0 deletions cozy/media/player.py
Original file line number Diff line number Diff line change
Expand Up @@ -482,6 +482,7 @@ def volume_down(self):
self.volume = max(0, self.volume - 0.1)

def destroy(self):
self._stop_tick_thread()
self._gst_player.stop()

def _load_book(self, book: Book):
Expand Down
11 changes: 2 additions & 9 deletions cozy/view_model/sleep_timer_view_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,6 @@ def get_remaining_from_chapter(self) -> float | None:
)
return int(position / Gst.SECOND / book.playback_speed)

def destroy(self):
self._stop_timer()

def _start_timer(self):
self.stop_after_chapter = False
self._timer_running = True
Expand All @@ -103,28 +100,24 @@ def _stop_timer(self):
log.info("Stop Sleep Timer")
self._notify("timer_enabled")

def _stop_playback(self):
self._player.pause()

def _on_timer_tick(self):
self._remaining_seconds -= 1
self._notify_main_thread("remaining_seconds")
self._notify("remaining_seconds")

if self._remaining_seconds <= FADEOUT_DURATION and not self._fadeout_running:
self._fadeout_running = True
self._player.fadeout(FADEOUT_DURATION)

if self._remaining_seconds <= 0:
self._stop_timer()
self._stop_playback()
self._player.pause()

def _on_player_changed(self, event, _):
if event == "position":
if self._timer_running:
self._on_timer_tick()
elif event == "chapter-changed":
self.stop_after_chapter = False
self._notify("stop_after_chapter")

def _handle_system_power_event(self):
# TODO: This doesn't work in Flatpak. Either remove it completely, or make it conditional
Expand Down

0 comments on commit e60ea89

Please sign in to comment.