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

[Samuel Buffet]

The video screen is now reactive to pointer events.

[Samuel Buffet (samuel-buffet)]

Matt,

Here is a branch to give the videoOSD texture reactive capacities.

By a single click on it, it's possible to play/pause a video.
It is also possible to seek forward or backward through a video by "click slide and release".
The seek progression is a function of the horizontal distance since the first click.

Some related modification have been done to the player and a simplification of the videoOSD texture as well.

Samuel-

[lp:~samuel-buffet/entertainer/reactive_videoOSD]

390. By Samuel Buffet on 2009-06-25

Merged with trunk 386.

[Matt Layman (mblayman)]

I really love the one click pause feature. That's definitely my favorite part about this branch. Anyway, time for some review comments:

main.py:
 * The connect to 'refresh' could now be one line.

progress_bar.py:
 * I found the two lines `self._progess = None; self.progress = 0` to be a bit confusing. I realize now that the second line is actually calling the property setter function, but it wasn't very clear to me that that was happening until I hunted around. Could you please add a comment there to help remove that confusion? Something like "# Call the property setter." between the two lines.
 * _reset_auto_display_timeout docstring has odd spacing and is missing a period.
 * The progress bar does not update its position after a seek while the media was paused. I mentioned this to you on IRC.

media_player.py:
 * _internal_timer_callback docstring doesn't really make sense anymore (because it's not just emitting a position-changed event).
 * The amount of calls to _internal_timer_callback and the frequency at which they occur kind of bothers me. A media player object is created when Entertainer starts and the way this init is written means that we *never* stop calling that timer (which fires every 1/5 of a second). That seems pretty resource intensive to me. Any ideas of how to make this timer only run when media is *actually* playing (because I think that is the only time when it is really needed)?
 * Is the is_reactive property logically backwards? I must confess that I am confused by it. In the init, self.is_reactive is set to False, then a few lines later, self.video_texture.set_reactive(True). I don't get it.
 * The video_texture connects mix " and ' quote marks. Could you pick one or the other?
 * position += self._seek_step -> What if you're seeking backwards? Should it decrement instead? Also, what is position was 1 and then you just added the seek_step to it. Would gstreamer complain?

General:
 * Can you think of any worthwhile tests for some of this?

review: Needs Information

[lp:~samuel-buffet/entertainer/reactive_videoOSD]

391. By Samuel Buffet on 2009-06-28

Modifications according to Matt's comments.

[Samuel Buffet (samuel-buffet)]

Matt,

> main.py:
> * The connect to 'refresh' could now be one line.

Modified.

> progress_bar.py:
> * I found the two lines `self._progess = None; self.progress = 0` to be a bit
> confusing. I realize now that the second line is actually calling the property
> setter function, but it wasn't very clear to me that that was happening until
> I hunted around. Could you please add a comment there to help remove that
> confusion? Something like "# Call the property setter." between the two lines.

I have added a comment there to explain that I set the progress property to initialize the widget.

> * _reset_auto_display_timeout docstring has odd spacing and is missing a
> period.

Yes, Fixed.

> * The progress bar does not update its position after a seek while the media
> was paused. I mentioned this to you on IRC.

Yes you're right. Unfortunatly, fix is not as trivial as expected at the widget level. I think that's because we do to much gstreamer queries. I plan to make another branch for that if you're okay.

> media_player.py:
> * _internal_timer_callback docstring doesn't really make sense anymore
> (because it's not just emitting a position-changed event).

Right, I've modified that docstring.

> * The amount of calls to _internal_timer_callback and the frequency at which
> they occur kind of bothers me. A media player object is created when
> Entertainer starts and the way this init is written means that we *never* stop
> calling that timer (which fires every 1/5 of a second). That seems pretty
> resource intensive to me. Any ideas of how to make this timer only run when
> media is *actually* playing (because I think that is the only time when it is
> really needed)?

Well, I don't really see the point here because I think we don't have to be afraid of timers like that. The tasks done here are very*100 limited for a CPU. But the fix is trivial so I've done the modification (but it's an added complexity!)

> * Is the is_reactive property logically backwards? I must confess that I am
> confused by it. In the init, self.is_reactive is set to False, then a few
> lines later, self.video_texture.set_reactive(True). I don't get it.

Yeah, I've renamed it to is_reactive_allowed to limit confusion. This variable is used to neutralize the reactive commands when the video texture of the player is on the background on other screen but video_osd screen.

Indeed, it would be a very bad user experience imho if we were able pause/seek on other screens.

> * The video_texture connects mix " and ' quote marks. Could you pick one or
> the other?

Yep, it's fixed.

> * position += self._seek_step -> What if you're seeking backwards? Should it
> decrement instead? Also, what is position was 1 and then you just added the
> seek_step to it. Would gstreamer complain?

No in fact because I've protected it against bad values. Check the set_media_position method, I've added test on the position parameter.

> General:
> * Can you think of any worthwhile tests for some of this?

Yes, that is really something I have in mind. The main issue is that we need to start a clutter main loop during our tests. Otherwise events won't work. Even timeout...

[Matt Layman (mblayman)]

>> * The progress bar does not update its position after a seek while the media
>> was paused. I mentioned this to you on IRC.
>
>Yes you're right. Unfortunatly, fix is not as trivial as expected at the widget level. I think >that's because we do to much gstreamer queries. I plan to make another branch for that if you're >okay.

Okay, that's fine with me. I'd rather see this branch land in a mostly working state with a couple of minor issues than to hold it back until it's absolutely perfect.

>> * The amount of calls to _internal_timer_callback and the frequency at which
>> they occur kind of bothers me. A media player object is created when
>> Entertainer starts and the way this init is written means that we *never* stop
>> calling that timer (which fires every 1/5 of a second). That seems pretty
>> resource intensive to me. Any ideas of how to make this timer only run when
>> media is *actually* playing (because I think that is the only time when it is
>> really needed)?
>
>Well, I don't really see the point here because I think we don't have to be afraid of timers like >that. The tasks done here are very*100 limited for a CPU. But the fix is trivial so I've done the >modification (but it's an added complexity!)

Thanks for applying this fix anyway. It may not seem like much, but since the level of effort to fix it was minimal, I think it was worth it in this case.

>> * Is the is_reactive property logically backwards? I must confess that I am
>> confused by it. In the init, self.is_reactive is set to False, then a few
>> lines later, self.video_texture.set_reactive(True). I don't get it.
>
>Yeah, I've renamed it to is_reactive_allowed to limit confusion. This variable is used to >neutralize the reactive commands when the video texture of the player is on the background on >other screen but video_osd screen.
>
>Indeed, it would be a very bad user experience imho if we were able pause/seek on other screens.

Okay, that helped a lot. I agree that it would be bad if users were able to pause/seek on other screens (outside of keyboard methods, of course).

>> * position += self._seek_step -> What if you're seeking backwards? Should it
>> decrement instead? Also, what is position was 1 and then you just added the
>> seek_step to it. Would gstreamer complain?
>
>No in fact because I've protected it against bad values. Check the set_media_position method, >I've added test on the position parameter.

Ah, sorry, you're right. For some reason, I thought the position checking stuff was just a few lines above this section of code. I still don't know what happens in the seek backwards case (it seems to me like you'd want to decrement instead of increment), but I'm fine with this.

I understand about not being able to get tests in place. I wonder if there is any way we could simulate/mock events in a future branch.

review: Approve

[Paul Hummer (rockstar)]

`which trial` entertainerlib.tests
entertainerlib.tests.test_base
  BaseTest
    testCreate ... [OK]
    testGetAbsX ... [OK]
    testGetAbsY ... [OK]
entertainerlib.tests.test_configuration
  ConfigurationTest
    testBorg ... [OK]
    testCreate ... [OK]
    testGetCfgDir ... [OK]
    testGetSlideshowStep ... [OK]
    testGetStageHeight ... [OK]
    testGetStageWidth ... [OK]
    testGetThemeName ... [OK]
    testSetStageHeight ... [OK]
    testSetStageWidth ... [OK]
    testStartAutoServer ... [OK]
    testTrayIconEnabled ... [OK]
    test_create_dir ... [OK]
    test_hidden_files_folders ... [OK]
    test_sanitize ... [OK]
    test_taint ... [OK]
    test_taint_in_memory ... [OK]
    test_write_content_value ... [OK]
    test_write_preference_value ... [OK]
entertainerlib.tests.test_connection
  ConnectionServerTest
    testPortBinding ... [OK]
entertainerlib.tests.test_database
  DatabaseTest
    testCreate ... [OK]
    testUseExisting ... [OK]
entertainerlib.tests.test_feedconfigtools
  FeedConfigToolsTest
    testAddFeedsToWidget001 ... [OK]
    testAddFeedsToWidget002 ... [OK]
    testAddFileFeedsToWidget001 ... [OK]
    testAddFileFeedsToWidget002 ... [OK]
entertainerlib.tests.test_feedentryparser
  FeedEntryParserTest
    testConvert ... [OK]
    testStripNonPangoTags ... [OK]
    testStripTags001 ... [OK]
    testStripTags002 ... [OK]
entertainerlib.tests.test_frontendfeed
  FrontendFeedTest
    test_date ... [OK]
    test_description ... [OK]
    test_entries ... ...

=== modified file 'entertainerlib/frontend/gui/screens/main.py'
--- entertainerlib/frontend/gui/screens/main.py	2009-05-27 10:33:21 +0000
+++ entertainerlib/frontend/gui/screens/main.py	2009-05-28 19:44:40 +0000
@@ -31,7 +31,7 @@
         self.media_player = media_player
         self.media_player.connect("stop", self.update)
         self.media_player.connect("play", self.update)
-        self.media_player.connect('position_changed',
+        self.media_player.connect('refresh',
             self._update_preview_title)
 
         self.theme = self.config.theme
@@ -244,10 +244,10 @@
         Update screen widgets. This is called always when screen is poped from
         the screen history. Updates main menu widget.
         """
-        if self.media_player.is_playing() and \
+        if self.media_player.is_playing and \
                 (self.menu.get_index("playing") == -1):
             self.menu.add_item(_("Playing now..."), "playing")
-        elif not self.media_player.is_playing() and \
+        elif not self.media_player.is_playing and \
                 (self.menu.get_index("playing") != -1):
             self.menu.remove_item("playing")
 

=== modified file 'entertainerlib/frontend/gui/screens/video_osd.py'
--- entertainerlib/frontend/gui/screens/video_osd.py	2009-05-16 19:14:01 +0000
+++ entertainerlib/frontend/gui/screens/video_osd.py	2009-05-25 11:07:55 +0000
@@ -59,13 +59,13 @@
         self.pause_texture.hide()
         self.add(self.pause_texture)
 
-        pause_timeline = clutter.Timeline(fps=120, duration=2000)
+        pause_timeline = clutter.Timeline(fps=20, duration=2000)
         pause_timeline.set_loop(True)
         alpha_pause = clutter.Alpha(pause_timeline, clutter.sine_func)
 
         self.pause_opacity = clutter.BehaviourOpacity(alpha=alpha_pause,
-            opacity_start=0, opacity_end=255)
-        self.pause_scale = clutter.BehaviourScale(1.0, 1.0, 1.3, 1.3,
+            opacity_start=100, opacity_end=255)
+        self.pause_scale = clutter.BehaviourScale(1.0, 1.0, 1.4, 1.4,
             alpha_pause)
 
         self.pause_opacity.apply(self.pause_texture)
@@ -154,7 +154,7 @@
 
     def _handle_play_pause(self, event=None):
         '''Handle UserEvent.PLAYER_PLAY_PAUSE.'''
-        if self.media_player.is_playing():
+        if self.media_player.is_playing:
             self.pause_texture.hide()
         else:
             self.pause_texture.show()

=== modified file 'entertainerlib/frontend/gui/user_interface.py'
--- entertainerlib/frontend/gui/user_interface.py	2009-06-03 01:54:03 +0000
+++ entertainerlib/frontend/gui/user_interface.py	2009-06-05 05:12:59 +0000
@@ -94,10 +94,9 @@
             self.config.get_stage_width(), self.config.get_stage_height())
 
         # Initialize menu overlay texture
-        self.overlay_status = False
+        self.is_overlay = False
         self.menu_overlay = MenuOverlay(self.config.theme)
         self.menu_overlay.set_opacity(0)
-        self.menu_overlay.set_name("overlay")
         self.menu_overlay.set_size(
             self.config.get_stage_width(), self.config.get_stage_height())
         self.stage.add(self.menu_overlay)
@@ -258,36 +257,27 @@
         a video playing and menu showing at the same time. Overlay is not part
         of any specific screen. It is used for all screens when neccesary.
         """
-        self.overlay_status = True
-        if self.config.show_effects():
+        if not self.is_overlay:
+            self.is_overlay = True
             self.menu_overlay.fade_in()
-        else:
-            self.menu_overlay.set_opacity(255)
+            self.player.is_reactive = False
 
     def disable_menu_overlay(self):
         """
         Disable menu overlay. Overlay should be disabled when current screen is
         a type of Screen.OSD.
         """
-        self.overlay_status = False
-        if self.config.show_effects():
+        if self.is_overlay:
+            self.is_overlay = False
             self.menu_overlay.fade_out()
-        else:
-            self.menu_overlay.set_opacity(0)
-
-    def is_overlay(self):
-        """
-        Get menu overlay status.
-        @return boolean value. True if menu overlay is active, otherwise False.
-        """
-        return self.overlay_status
+            self.player.is_reactive = True
 
     def change_screen(self, screen, direction):
         '''Transition the given screen in the direction provided.'''
         # Enable/Disable menu overlay
-        if screen.kind == Screen.OSD and self.is_overlay():
+        if screen.kind == Screen.OSD:
             self.disable_menu_overlay()
-        elif screen.kind != Screen.OSD and not self.is_overlay():
+        else:
             self.enable_menu_overlay()
 
         # Add current screen to screen history
@@ -367,7 +357,7 @@
         if self.current.is_interested_in_play_action():
             self.current.execute_play_action()
         else:
-            if self.player.is_playing():
+            if self.player.is_playing:
                 self.player.pause()
                 self.current.handle_user_event(event)
             else:
@@ -390,7 +380,7 @@
 
     def _handle_player_stop(self, event):
         '''Handle UserEvent.PLAYER_STOP.'''
-        if self.player.is_playing():
+        if self.player.is_playing:
             self.player.stop()
             self.current.handle_user_event(event)
 

=== modified file 'entertainerlib/frontend/gui/widgets/menu_overlay.py'
--- entertainerlib/frontend/gui/widgets/menu_overlay.py	2009-05-10 06:24:43 +0000
+++ entertainerlib/frontend/gui/widgets/menu_overlay.py	2009-05-25 10:22:25 +0000
@@ -1,5 +1,5 @@
 # Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
-'''Texture that is displayed over video when menu is active'''
+'''Texture that is displayed over video when menu is active.'''
 
 import clutter
 
@@ -18,25 +18,17 @@
         """Initialize overlay texture."""
         Texture.__init__(self, filename = theme.getImage("menu_overlay"))
         self.timeline = clutter.Timeline(13, 26)
-        self.timeline.set_loop(False)
+        self.alpha = clutter.Alpha(self.timeline, clutter.smoothstep_inc_func)
+        self.behaviour = clutter.BehaviourOpacity(255, 0, self.alpha)
+        self.behaviour.apply(self)
 
     def fade_in(self):
-        """
-        Fade texture in. Animate texture's opacity from 0 to 255
-        """
-        self.alpha = clutter.Alpha(self.timeline, clutter.smoothstep_dec_func)
-        self.behaviour = clutter.BehaviourOpacity(255, 0, self.alpha)
-        self.behaviour.apply(self)
-        self.timeline.rewind()
+        """Fade texture in."""
+        self.behaviour.set_bounds(0, 255)
         self.timeline.start()
 
     def fade_out(self):
-        """
-        Fade texture out. Animate texture's opacity from 255 to 0
-        """
-        self.alpha = clutter.Alpha(self.timeline, clutter.smoothstep_inc_func)
-        self.behaviour = clutter.BehaviourOpacity(255, 0, self.alpha)
-        self.behaviour.apply(self)
-        self.timeline.rewind()
+        """Fade texture out."""
+        self.behaviour.set_bounds(255, 0)
         self.timeline.start()
 

=== modified file 'entertainerlib/frontend/gui/widgets/progress_bar.py'
--- entertainerlib/frontend/gui/widgets/progress_bar.py	2009-05-27 10:33:21 +0000
+++ entertainerlib/frontend/gui/widgets/progress_bar.py	2009-05-28 19:44:40 +0000
@@ -33,7 +33,6 @@
 
         self.set_position(self.get_abs_x(x), self.get_abs_y(y))
 
-        self._progress = 0
         self._color = self._color_to_cairo_color(
             self.config.theme.get_color(color))
 
@@ -65,6 +64,9 @@
         self._behaviour = clutter.BehaviourOpacity(0, 255, self._alpha)
         self._behaviour.apply(self)
 
+        self._progress = None
+        self.progress = 0
+
         # Preparation to pointer events handling.
         self._motion_handler = 0
         self.set_reactive(True)
@@ -81,9 +83,10 @@
     def _set_media_player(self, media_player):
         '''media_player property setter.'''
         self._media_player = media_player
-        self._media_player.connect('position_changed',
-            self._update_media_position)
+        self._media_player.connect('refresh', self._update_media_position)
         self._media_player.connect('stop', self._update_media_position)
+        self._media_player.connect('position-changed',
+            self._on_player_position_changed)
 
     media_player = property(_get_media_player, _set_media_player)
 
@@ -137,6 +140,13 @@
         self.visible = False
         return False
 
+    def _reset_auto_display_timeout(self):
+        '''Reset the timeout if auto_display =  True'''
+        if self._hide_timeout_key is not None:
+            gobject.source_remove(self._hide_timeout_key)
+        self._hide_timeout_key = gobject.timeout_add(3000,
+            self._hide_progress_bar)
+
     def _update_media_position(self, event=None):
         '''Update the media's position.'''
         if not self._progress_bar_moving:
@@ -268,12 +278,18 @@
         return False
 
     def _on_enter_event(self, stage, clutter_event):
-        '''Shows the button.'''
+        '''Shows the progress bar.'''
         if self.auto_display and not self._progress_bar_moving:
             self.visible = True
 
     def _on_leave_event(self, stage, clutter_event):
-        '''Hides the button.'''
+        '''Hides the progress bar.'''
         if self.auto_display and not self._progress_bar_moving:
             self.visible = False
 
+    def _on_player_position_changed(self, event=None):
+        '''Shows the progress bar.'''
+        if self.auto_display and not self._progress_bar_moving:
+            self.visible = True
+            self._reset_auto_display_timeout()
+

=== modified file 'entertainerlib/frontend/media_player.py'
--- entertainerlib/frontend/media_player.py	2009-05-26 17:32:56 +0000
+++ entertainerlib/frontend/media_player.py	2009-06-22 19:12:37 +0000
@@ -9,6 +9,7 @@
 import gobject
 import gst
 
+from entertainerlib.frontend.gui.widgets.motion_buffer import MotionBuffer
 from entertainerlib.frontend.gui.widgets.texture import Texture
 from entertainerlib.frontend.medialibrary.playable import Playable
 from entertainerlib.utils.logger import Logger
@@ -31,7 +32,8 @@
         'stop' : ( gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, () ),
         'skip-forward' : ( gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, () ),
         'skip-backward' : ( gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, () ),
-        'position_changed' : ( gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, () ),
+        'position-changed' : ( gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, () ),
+        'refresh' : ( gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, () ),
         }
 
     # Ratio constants
@@ -42,9 +44,17 @@
     ZOOM = 4
     INTELLIGENT = 5
 
+    MODE_NONE = 0
+    MODE_PLAYPAUSE = 1
+    MODE_SEEK = 2
+
     def __init__(self, stage, width, height):
         gobject.GObject.__init__(self)
 
+        self._motion_buffer = MotionBuffer()
+        self._event_mode = self.MODE_NONE
+        self._motion_handler = 0
+
         self.stage = stage               # Stage that displays textures
         # Stage background color when not playing
         self.bgcolor = stage.get_color()
@@ -58,7 +68,8 @@
         self.media = None                # Current media (Playable object)
         self.shuffle = False             # Shuffle mode
         self.repeat = False              # Repeat mode
-        self.playing = False             # Is media player currently playing
+        self.is_playing = False          # Is media player currently playing
+        self.is_reactive = False         # Is the video_texture reactive
 
         self.logger = Logger().getLogger('frontend.MediaPlayer')
 
@@ -68,10 +79,15 @@
         self.bus.add_signal_watch()
         self.bus.connect('message', self._on_gst_message)
 
-        self.video_texture.connect("size-change", self.change_ratio_callback)
-        self.video_texture.show()
+        gobject.timeout_add(200, self._internal_timer_callback)
 
-        gobject.timeout_add(500, self._emit_position_changed)
+        self.video_texture.set_reactive(True)
+        self.video_texture.connect("size-change", self._on_size_change)
+        self.video_texture.connect('scroll-event', self._on_scroll_event)
+        self.video_texture.connect("button-press-event",
+            self._on_button_press_event)
+        self.video_texture.connect('button-release-event',
+            self._on_button_release_event)
 
     def _on_gst_message(self, bus, message):
         '''
@@ -113,7 +129,7 @@
             self.playlist = None
 
         # If player is currently playing then we stop it
-        if self.is_playing():
+        if self.is_playing:
             self.stop()
 
         # Update media information
@@ -173,7 +189,7 @@
             return
 
         if self.media.get_type() == Playable.AUDIO_STREAM:
-            self.playing = True
+            self.is_playing = True
             self.video_texture.set_playing(True)
             self.emit('play')
 
@@ -182,20 +198,20 @@
             if (self.video_texture.get_parent() == None):
                 self.stage.add(self.video_texture)
             self.video_texture.lower_bottom()
-            self.playing = True
+            self.is_playing = True
             self.stage.set_color((0, 0, 0, 0))
             self.video_texture.set_playing(True)
             self.emit('play')
 
     def pause(self):
         '''Pause media player.'''
-        self.playing = False
+        self.is_playing = False
         self.video_texture.set_playing(False)
         self.emit('pause')
 
     def stop(self):
         '''Stop media player.'''
-        self.playing = False
+        self.is_playing = False
         if self.media.get_type() == Playable.VIDEO_STREAM:
             self.stage.set_color(self.bgcolor)
             self.stage.remove(self.video_texture)
@@ -248,10 +264,6 @@
                                      seek_ns)
             self.emit('skip-backward')
 
-    def is_playing(self):
-        '''Is media player currently playing.'''
-        return self.playing
-
     def get_media_position(self):
         '''Get current position of the play back.'''
         try:
@@ -277,6 +289,12 @@
 
     def set_media_position(self, position):
         '''Set position of the current media.'''
+        if position < 0.0:
+            position = 0.0
+
+        if position > 1.0:
+            position = 1.0
+
         if (self.media.get_type() == Playable.AUDIO_STREAM) or \
             (self.media.get_type() == Playable.VIDEO_STREAM):
             dur = self.playbin.query_duration(gst.FORMAT_TIME, None)[0]
@@ -331,7 +349,7 @@
             time_str = time_str + "0" + str(time_int)
         return time_str
 
-    def change_ratio_callback(self, texture, width, height):
+    def _on_size_change(self, texture, width, height):
         '''
         Callback for changing video texture's aspect ratio. This is called when
         video texture size changes.
@@ -467,9 +485,76 @@
             else:
                 return None
 
-    def _emit_position_changed(self):
+    def _internal_timer_callback(self):
         '''A `position-changed` event is regulary emited if media is playing.'''
-        if self.is_playing():
-            self.emit('position_changed')
+        if self.is_playing:
+            self.emit('refresh')
+
+        if self._event_mode == self.MODE_SEEK:
+            position = self.get_media_position()
+            position += self._seek_step
+            self.set_media_position(position)
+            self.emit('position-changed')
         return True
 
+    def _on_button_press_event(self, actor, event):
+        """`button-press` event handler."""
+        if not self.is_reactive:
+            return
+
+        clutter.grab_pointer(self.video_texture)
+        if not self.video_texture.handler_is_connected(self._motion_handler):
+            self._motion_handler = self.video_texture.connect('motion-event',
+            self._on_motion_event)
+
+        self._motion_buffer.start(event)
+        self._event_mode = self.MODE_PLAYPAUSE
+
+    def _on_button_release_event(self, actor, event):
+        """`button-press` event handler."""
+        if not self.is_reactive:
+            return
+
+        clutter.ungrab_pointer()
+        if self.video_texture.handler_is_connected(self._motion_handler):
+            self.video_texture.disconnect_by_func(self._on_motion_event)
+
+        if self._event_mode == self.MODE_PLAYPAUSE:
+            if self.is_playing:
+                self.pause()
+            else:
+                self.play()
+
+        self._event_mode = self.MODE_NONE
+
+    def _on_motion_event(self, actor, event):
+        """`motion-event` event handler."""
+        # threshold in pixels = the minimum distance we have to move before we
+        # consider a motion has started
+        motion_threshold = 20
+
+        self._motion_buffer.compute_from_start(event)
+        if self._motion_buffer.distance_from_start > motion_threshold:
+            self._motion_buffer.take_new_motion_event(event)
+            self._event_mode = self.MODE_SEEK
+            self._seek_step = float(self._motion_buffer.dx_from_start)
+            self._seek_step /= self.video_texture.get_width()
+            self._seek_step *= 0.01
+
+        return False
+
+    def _on_scroll_event(self, actor, event):
+        '''`scroll-event` event handler (mouse's wheel).'''
+        # +/- 2% per scroll event on the position of the media stream.
+        scroll_progress_ratio = 0.02
+
+        position = self.get_media_position()
+
+        if event.direction == clutter.SCROLL_DOWN:
+            position -= scroll_progress_ratio
+        else:
+            position += scroll_progress_ratio
+
+        self.set_media_position(position)
+        self.emit('position-changed')
+

=== modified file 'entertainerlib/tests/mock.py'
--- entertainerlib/tests/mock.py	2009-05-27 10:27:48 +0000
+++ entertainerlib/tests/mock.py	2009-05-28 19:44:40 +0000
@@ -136,21 +136,19 @@
         'stop' : ( gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, () ),
         'skip-forward' : ( gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, () ),
         'skip-backward' : ( gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, () ),
-        'position_changed' : ( gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, () ),
+        'position-changed' : ( gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, () ),
+        'refresh' : ( gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, () ),
         }
 
     def __init__(self, stage=None, width=None, height=None):
         '''Override any actual media player set up.'''
         gobject.GObject.__init__(self)
+        self.is_playing = False
 
     def has_media(self):
         '''See `MediaPlayer.has_media`.'''
         return False
 
-    def is_playing(self):
-        '''See `MediaPlayer.is_playing`.'''
-        return False
-
     def play(self):
         '''See `MediaPlayer.play`.'''
 

=== modified file 'entertainerlib/tests/test_progressbar.py'
--- entertainerlib/tests/test_progressbar.py	2009-05-17 12:26:38 +0000
+++ entertainerlib/tests/test_progressbar.py	2009-06-06 15:45:10 +0000
@@ -16,10 +16,6 @@
         self.media_player =  MockMediaPlayer()
         self.progress_bar.media_player = self.media_player
 
-    def tearDown(self):
-        '''Clean up after the test.'''
-        EntertainerTest.tearDown(self)
-
     def test_create(self):
         '''Test correct ProgressBar initialization.'''
         self.assertTrue(isinstance(self.progress_bar, ProgressBar))