mcvsoftware/socializer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Play is now play/pause in the player menu. Removed stop item

Browse Source
This commit is contained in:
Manuel Cortez 2019-01-21 16:48:51 -06:00
parent d8096a3695
commit d6a87bc426
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/controller/mainController.py
View File

@ -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_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_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_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_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_volume_up, menuitem=self.window.player_volume_up)
widgetUtils.connect_event(self.window, widgetUtils.MENU, self.menu_mute, menuitem=self.window.player_mute) widgetUtils.connect_event(self.window, widgetUtils.MENU, self.menu_mute, menuitem=self.window.player_mute)
@ -598,14 +597,14 @@ class Controller(object):
os.chdir("../../") os.chdir("../../")
def menu_play_pause(self, *args, **kwargs): def menu_play_pause(self, *args, **kwargs):
if player.player.check_is_playing() != False: if player.player.stream != None:
return player.player.pause() return player.player.pause()
b = self.get_current_buffer()
if hasattr(b, "play_next"):
b.play_audio()
else: else:
b = self.search("me_audio") b = self.get_current_buffer()
b.play_audio() if hasattr(b, "play_audio"):
b.play_audio()
else:
self.search("me_audio").play_audio()
def menu_play_next(self, *args, **kwargs): def menu_play_next(self, *args, **kwargs):
b = self.get_current_buffer() b = self.get_current_buffer()
@ -628,9 +627,6 @@ class Controller(object):
else: else:
self.search("me_audio").play_all() self.search("me_audio").play_all()
def menu_stop(self, *args, **kwargs):
player.player.stop()
def menu_volume_down(self, *args, **kwargs): def menu_volume_down(self, *args, **kwargs):
player.player.volume = player.player.volume-5 player.player.volume = player.player.volume-5