From d6a87bc42658d3ed270ec419a9ffda2822dc4f6f Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Mon, 21 Jan 2019 16:48:51 -0600 Subject: [PATCH] Play is now play/pause in the player menu. Removed stop item --- src/controller/mainController.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/controller/mainController.py b/src/controller/mainController.py index 6b012d0..4a49371 100644 --- a/src/controller/mainController.py +++ b/src/controller/mainController.py @@ -147,7 +147,6 @@ class Controller(object): widgetUtils.connect_event(self.window, widgetUtils.MENU, self.menu_play_next, menuitem=self.window.player_next) widgetUtils.connect_event(self.window, widgetUtils.MENU, self.menu_play_previous, menuitem=self.window.player_previous) widgetUtils.connect_event(self.window, widgetUtils.MENU, self.menu_play_all, menuitem=self.window.player_play_all) - widgetUtils.connect_event(self.window, widgetUtils.MENU, self.menu_stop, menuitem=self.window.player_stop) widgetUtils.connect_event(self.window, widgetUtils.MENU, self.menu_volume_down, menuitem=self.window.player_volume_down) widgetUtils.connect_event(self.window, widgetUtils.MENU, self.menu_volume_up, menuitem=self.window.player_volume_up) widgetUtils.connect_event(self.window, widgetUtils.MENU, self.menu_mute, menuitem=self.window.player_mute) @@ -598,14 +597,14 @@ class Controller(object): os.chdir("../../") def menu_play_pause(self, *args, **kwargs): - if player.player.check_is_playing() != False: + if player.player.stream != None: return player.player.pause() - b = self.get_current_buffer() - if hasattr(b, "play_next"): - b.play_audio() else: - b = self.search("me_audio") - b.play_audio() + b = self.get_current_buffer() + if hasattr(b, "play_audio"): + b.play_audio() + else: + self.search("me_audio").play_audio() def menu_play_next(self, *args, **kwargs): b = self.get_current_buffer() @@ -628,9 +627,6 @@ class Controller(object): else: self.search("me_audio").play_all() - def menu_stop(self, *args, **kwargs): - player.player.stop() - def menu_volume_down(self, *args, **kwargs): player.player.volume = player.player.volume-5