Merge lp:~samuel-buffet/entertainer/bug_281244 into lp:entertainer

[Samuel Buffet]

Media is now stopped before any other media is started (fixes bug #281244)

[Samuel Buffet (samuel-buffet)]

Hi again,

This is a possible fix for Bug #281244, and if it doesn't at least it fixes the one I had.

Jamie, does this makes a difference for you?

In fact I'm not able to reproduce Jamie's bug but I had another one that was probably of the same kind. Watching a video + stop + back + start another video and ... the video texture was freezed on the last frame of the first video.

So there was a kind of video texture initialization error.

adding 2 lines in the set_media method of the MediaPlayer:

one to stop before changing the uri
and setting media position to 0 after having setted the uri

... gives good results on my machine.

But as those lines are more Art than Science (I don't really understand why it seems to work and why it's needed), I think this fix has to be confirmed by everyone.

Cheers,
Samuel-

[Jamie Bennett (jamiebennett)]

Tested with trunk and with your branch Samuel. Your branch does in fact
fix the old bug and also the new one where starting a second video when
one is already in progress could hang entertainer.

 review approve

On Tue, 2009-04-21 at 16:55 +0000, Samuel Buffet wrote:
> Samuel Buffet has proposed merging lp:~samuel-buffet/entertainer/bug_281244 into lp:entertainer.
>
> Requested reviews:
> Entertainer Release Team (entertainer-releases)
>
> Hi again,
>
>
> This is a possible fix for Bug #281244, and if it doesn't at least it fixes the one I had.
>
> Jamie, does this makes a difference for you?
>
> In fact I'm not able to reproduce Jamie's bug but I had another one that was probably of the same kind. Watching a video + stop + back + start another video and ... the video texture was freezed on the last frame of the first video.
>
> So there was a kind of video texture initialization error.
>
> adding 2 lines in the set_media method of the MediaPlayer:
>
> one to stop before changing the uri
> and setting media position to 0 after having setted the uri
>
> ... gives good results on my machine.
>
> But as those lines are more Art than Science (I don't really understand why it seems to work and why it's needed), I think this fix has to be confirmed by everyone.
>
> Cheers,
> Samuel-

review: Approve

[Matt Layman (mblayman)]

Samuel,

I agree that these lines are probably more art than science. I have not had a chance to experiment with the branch and see what kind of performance it gives me. Once I get the chance, I'll come back with a review.

Obviously, there won't be anything to comment about in terms of code style. :)

-Matt

[Paul Hummer (rockstar)]

review: Approve

=== modified file 'entertainerlib/frontend/media_player.py'
--- entertainerlib/frontend/media_player.py	2009-02-08 08:44:46 +0000
+++ entertainerlib/frontend/media_player.py	2009-04-21 16:34:34 +0000
@@ -127,7 +127,9 @@
         # Set up media player for media
         if self.media.get_type() == Playable.AUDIO_STREAM \
             or self.media.get_type() == Playable.VIDEO_STREAM:
+            self.video_texture.set_playing(False)
             self.video_texture.set_uri(playable.get_uri())
+            self.video_texture.set_property("position", 0)
 
     def get_media(self):
         """