Merge lp:~osomon/moovida/fix_player_exit into lp:moovida

Proposed by Olivier Tilloy
Status: Merged
Merged at revision: 1604
Proposed branch: lp:~osomon/moovida/fix_player_exit
Merge into: lp:moovida
Diff against target: 33 lines (+4/-1)
2 files modified
elisa-plugins/elisa/plugins/poblesec/errors_handling.py (+3/-0)
elisa-plugins/elisa/plugins/poblesec/player_video.py (+1/-1)
To merge this branch: bzr merge lp:~osomon/moovida/fix_player_exit
Reviewer Review Type Date Requested Status
Florian Boucault (community) code functional Approve
Fernando Casanova partial-functional code Approve
Review via email: mp+15313@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Olivier Tilloy (osomon) wrote :

This branch contains changes to fix a functional regression introduced by http://bazaar.launchpad.net/~elisa-developers/moovida/relook/revision/1601.

One of the symptoms of the regression was bug #488291. The patch that was committed with revision 1603 was in fact a mere workaround.

Another symptom was described by Peter on the developers' mailing list. See http://lists.moovida.com/pipermail/developers-list/2009-November/001748.html.

And there were potentially other undesirable side-effects.

The changes make the player exit only when the media cannot even be partly played, not every time the status of the player goes to STOPPED (which also happens when transitioning between media in a playlist).

Thanks for the review.

Revision history for this message
Olivier Tilloy (osomon) wrote :

I reported bug #489177 to track the issue.

Revision history for this message
Fernando Casanova (fcasanova) wrote :

Hi,

the patch fixes the problem with the tvseries playlist. Now after playing 1 tvepisode, the player stays on top and the playback continues.
Rgds,
   Fernando

review: Approve (partial-functional code)
Revision history for this message
Florian Boucault (fboucault) wrote :

Thank you!

review: Approve (code functional)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'elisa-plugins/elisa/plugins/poblesec/errors_handling.py'
2--- elisa-plugins/elisa/plugins/poblesec/errors_handling.py 2009-11-23 09:42:27 +0000
3+++ elisa-plugins/elisa/plugins/poblesec/errors_handling.py 2009-11-27 12:35:26 +0000
4@@ -57,6 +57,9 @@
5 else:
6 subtitle = _("Unfortunately Moovida cannot play the selected " \
7 "media.")
8+ if sender is main_controller.current_player:
9+ # Cannot even partly play the media, exit the player
10+ sender.exit()
11
12 if exception.missing_decoders:
13 details = _("Installing the following codecs should allow " \
14
15=== modified file 'elisa-plugins/elisa/plugins/poblesec/player_video.py'
16--- elisa-plugins/elisa/plugins/poblesec/player_video.py 2009-11-23 09:55:40 +0000
17+++ elisa-plugins/elisa/plugins/poblesec/player_video.py 2009-11-27 12:35:26 +0000
18@@ -1175,6 +1175,7 @@
19 def exit(self):
20 """
21 Exit the player by asking poblesec's main controller to hide it.
22+ It is assumed that the player is the currently visible one.
23 """
24 controllers = self.frontend.retrieve_controllers('/poblesec')
25 main = controllers[0]
26@@ -1396,7 +1397,6 @@
27 self.show_on_screen_display()
28 elif status == player.STOPPED:
29 self.background.clear()
30- self.exit()
31 return True
32
33 def _stop_monitoring(self, *args):

Subscribers

People subscribed via source and target branches