From f7d75c240408afff949d75a031d55c5dee3932d4 Mon Sep 17 00:00:00 2001 From: DYefremov Date: Sun, 20 Oct 2019 23:46:25 +0300 Subject: [PATCH] slight refactoring of stream play --- app/ui/main_app_window.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/ui/main_app_window.py b/app/ui/main_app_window.py index 08da7b26..85cc0642 100644 --- a/app/ui/main_app_window.py +++ b/app/ui/main_app_window.py @@ -1542,11 +1542,18 @@ class Application(Gtk.Application): @run_idle def on_player_play(self, item=None): - url = self.get_stream_url() - self.update_player_buttons() - if not url: - return - self.play(url) + path, column = self._fav_view.get_cursor() + if path: + row = self._fav_model[path][:] + if row[Column.FAV_TYPE] != BqServiceType.IPTV.name: + self.show_error_dialog("Not allowed in this context!") + return + + url = get_iptv_url(row, Profile(self._profile)) + self.update_player_buttons() + if not url: + return + self.play(url) def play(self, url): if not self._player: @@ -1565,13 +1572,6 @@ class Application(Gtk.Application): self._player_box.set_visible(True) GLib.idle_add(self._player.play, url, priority=GLib.PRIORITY_LOW) - def get_stream_url(self): - path, column = self._fav_view.get_cursor() - if path: - row = self._fav_model[path][:] - if row[5] == BqServiceType.IPTV.name: - return get_iptv_url(row, Profile(self._profile)) - def on_player_stop(self, item=None): if self._player: self._player.stop()