Entertainer Media Center

Merge lp:~mblayman/entertainer/fix-media-player-typo into lp:entertainer

  1. fix-media-player-typo
  2. Merge into trunk
Proposed by Matt Layman
Status: Merged
Approved by: Paul Hummer
Approved revision: 354
Merged at revision: not available
Proposed branch: lp:~mblayman/entertainer/fix-media-player-typo
Merge into: lp:entertainer
Diff against target: None lines
To merge this branch: bzr merge lp:~mblayman/entertainer/fix-media-player-typo
Reviewer Review Type Date Requested Status
Samuel Buffet (community) Approve
Paul Hummer Approve
Review via email: mp+4746@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Matt Layman (mblayman) wrote :

This branch is a no brainer that fixes the mediaplayer variable typo that I introduced during one of my refactoring.

Revision history for this message
Paul Hummer (rockstar) wrote :

Ah, code looks good. I wish we could have regression tests against stuff like
this in the future.

 vote approve
 status approved

--
Paul Hummer
http://theironlion.net
1024/862FF08F C921 E962 58F8 5547 6723 0E8C 1C4D 8AC5 862F F08F

review: Approve
Revision history for this message
Matt Layman (mblayman) wrote :

Commit Message: A media player typo was fixed for the TV Episodes and Movie screens. (Matt Layman)

Revision history for this message
Samuel Buffet (samuel-buffet) wrote :

Matt,

The fix is ok and indeed regression tests would be good in the future.

Samuel,

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'entertainerlib/frontend/gui/screens/movie.py'
2--- entertainerlib/frontend/gui/screens/movie.py 2009-03-02 03:11:24 +0000
3+++ entertainerlib/frontend/gui/screens/movie.py 2009-03-21 22:43:10 +0000
4@@ -214,8 +214,8 @@
5 if self.menu.is_active():
6 item = self.menu.get_current_menuitem().get_userdata()
7 if item == "watch":
8- self.mediaplayer.set_media(self.movie)
9- self.mediaplayer.play()
10+ self.media_player.set_media(self.movie)
11+ self.media_player.play()
12 self.callback("video_osd")
13
14 def _handle_first_page(self):
15
16=== modified file 'entertainerlib/frontend/gui/screens/tv_episodes.py'
17--- entertainerlib/frontend/gui/screens/tv_episodes.py 2009-03-06 01:52:54 +0000
18+++ entertainerlib/frontend/gui/screens/tv_episodes.py 2009-03-21 22:43:10 +0000
19@@ -199,8 +199,8 @@
20 def _handle_select(self):
21 '''Handle UserEvent.NAVIGATE_SELECT.'''
22 episode = self.episode_menu.get_current_menuitem().get_userdata()
23- self.mediaplayer.set_media(episode)
24- self.mediaplayer.play()
25+ self.media_player.set_media(episode)
26+ self.media_player.play()
27 self.callback("video_osd")
28
29 def _handle_first_page(self):

Subscribers

People subscribed via source and target branches