Entertainer Media Center

Merge lp:~mblayman/entertainer/videos-1.0 into lp:entertainer/future

  1. videos-1.0
  2. Merge into entertainer-future
Proposed by Matt Layman
Status: Merged
Merged at revision: not available
Proposed branch: lp:~mblayman/entertainer/videos-1.0
Merge into: lp:entertainer/future
Prerequisite: lp:~mblayman/entertainer/photos-1.0
Diff against target: 216 lines (+50/-27)
8 files modified
entertainerlib/client/media_player.py (+1/-1)
entertainerlib/gui/screens/factory.py (+6/-8)
entertainerlib/gui/screens/movie.py (+6/-2)
entertainerlib/gui/screens/tv_episodes.py (+1/-0)
entertainerlib/gui/screens/video_osd.py (+31/-16)
entertainerlib/gui/tabs/movies_tab.py (+2/-0)
entertainerlib/gui/tabs/series_tab.py (+1/-0)
entertainerlib/gui/tabs/video_clips_tab.py (+2/-0)
To merge this branch: bzr merge lp:~mblayman/entertainer/videos-1.0
Reviewer Review Type Date Requested Status
Entertainer Release Team Pending
Review via email: mp+16469@code.launchpad.net

Commit message

All video screens have been fixed for clutter 1.0.

To post a comment you must log in.
Revision history for this message
Matt Layman (mblayman) wrote :

Branch 6 of clutter 1.0 transition.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'entertainerlib/client/media_player.py'
2--- entertainerlib/client/media_player.py 2009-12-22 03:15:23 +0000
3+++ entertainerlib/client/media_player.py 2009-12-22 03:15:25 +0000
4@@ -516,7 +516,7 @@
5 def get_texture(self):
6 '''Get media's texture. This is a video texture or album art texture.'''
7 if self.media.get_type() == Playable.VIDEO_STREAM:
8- return clutter.CloneTexture(self.video_texture)
9+ return clutter.Clone(self.video_texture)
10
11 elif self.media.get_type() == Playable.AUDIO_STREAM:
12 url = self.media.get_album_art_url()
13
14=== modified file 'entertainerlib/gui/screens/factory.py'
15--- entertainerlib/gui/screens/factory.py 2009-12-22 03:15:23 +0000
16+++ entertainerlib/gui/screens/factory.py 2009-06-17 02:49:44 +0000
17@@ -1,26 +1,24 @@
18 # Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
19 '''ScreenFactory - Create correct screen based on the type provided.'''
20
21-# XXX: laymansterms - comment out most of the imports to control how much of
22-# clutter needs to be converted
23 from entertainerlib.gui.screens.artist import Artist
24 from entertainerlib.gui.screens.album import Album
25 from entertainerlib.gui.screens.audio_play import AudioPlay
26-#from entertainerlib.gui.screens.disc import Disc
27+from entertainerlib.gui.screens.disc import Disc
28 from entertainerlib.gui.screens.feed import Feed
29 from entertainerlib.gui.screens.feed_entry import FeedEntry
30 from entertainerlib.gui.screens.main import Main
31-#from entertainerlib.gui.screens.movie import Movie
32+from entertainerlib.gui.screens.movie import Movie
33 from entertainerlib.gui.screens.music import Music
34 from entertainerlib.gui.screens.photo import Photo
35 from entertainerlib.gui.screens.photo_albums import PhotoAlbums
36 from entertainerlib.gui.screens.photographs import Photographs
37 from entertainerlib.gui.screens.question import Question
38 from entertainerlib.gui.screens.rss import Rss
39-#from entertainerlib.gui.screens.tv_episodes import TvEpisodes
40-#from entertainerlib.gui.screens.tv_series import TvSeries
41-#from entertainerlib.gui.screens.video import Video
42-#from entertainerlib.gui.screens.video_osd import VideoOSD
43+from entertainerlib.gui.screens.tv_episodes import TvEpisodes
44+from entertainerlib.gui.screens.tv_series import TvSeries
45+from entertainerlib.gui.screens.video import Video
46+from entertainerlib.gui.screens.video_osd import VideoOSD
47 from entertainerlib.gui.screens.weather import WeatherScreen
48
49
50
51=== modified file 'entertainerlib/gui/screens/movie.py'
52--- entertainerlib/gui/screens/movie.py 2009-08-04 01:09:03 +0000
53+++ entertainerlib/gui/screens/movie.py 2009-12-22 03:15:25 +0000
54@@ -84,10 +84,14 @@
55
56 # Stars (rating)
57 star = Texture(self.theme.getImage("star"))
58+ star.hide()
59+ self.add(star)
60 star2 = Texture(self.theme.getImage("star2"))
61+ star2.hide()
62+ self.add(star2)
63
64 for i in range(self.movie.get_rating()):
65- tex = clutter.CloneTexture(star)
66+ tex = clutter.Clone(star)
67 tex.set_position(
68 self.get_abs_x(0.47) + (self.get_abs_x(0.0366) * i),
69 self.get_abs_y(0.17))
70@@ -96,7 +100,7 @@
71
72 dark_star = 5 - self.movie.get_rating()
73 for i in range(dark_star):
74- tex = clutter.CloneTexture(star2)
75+ tex = clutter.Clone(star2)
76 tex.set_position(self.get_abs_x(0.47) + (self.get_abs_x(0.0366) * \
77 (i+ self.movie.get_rating())), self.get_abs_y(0.17))
78 tex.set_size(self.get_abs_x(0.024), self.get_abs_y(0.04))
79
80=== modified file 'entertainerlib/gui/screens/tv_episodes.py'
81--- entertainerlib/gui/screens/tv_episodes.py 2009-08-04 01:09:03 +0000
82+++ entertainerlib/gui/screens/tv_episodes.py 2009-12-22 03:15:25 +0000
83@@ -100,6 +100,7 @@
84 self.menu.selected_userdata.get_title(),
85 font_weight="bold")
86 self.title.set_ellipsize(pango.ELLIPSIZE_END)
87+ self.title.set_line_wrap(False)
88 self.title.width = 0.4
89 self.add(self.title)
90
91
92=== modified file 'entertainerlib/gui/screens/video_osd.py'
93--- entertainerlib/gui/screens/video_osd.py 2009-08-16 21:10:50 +0000
94+++ entertainerlib/gui/screens/video_osd.py 2009-12-22 03:15:25 +0000
95@@ -55,23 +55,38 @@
96 '''Create the pause, seek-backward & seek-forward textures.'''
97 self.pause_texture = Texture(
98 self.theme.getImage("media-playback-pause"), 0.5, 0.5)
99- self.pause_texture.set_anchor_point_from_gravity(
100- clutter.GRAVITY_CENTER)
101+ self.pause_texture.set_anchor_point_from_gravity(clutter.GRAVITY_CENTER)
102 self.pause_texture.hide()
103 self.add(self.pause_texture)
104
105- pause_timeline = clutter.Timeline(fps=20, duration=2000)
106- pause_timeline.set_loop(True)
107- alpha_pause = clutter.Alpha(pause_timeline, clutter.sine_func)
108+ pause_in_time = clutter.Timeline(1000)
109+ in_alpha_pause = clutter.Alpha(pause_in_time, clutter.EASE_IN_OUT_SINE)
110
111- self.pause_opacity = clutter.BehaviourOpacity(alpha=alpha_pause,
112+ self.pause_in_opacity = clutter.BehaviourOpacity(alpha=in_alpha_pause,
113 opacity_start=100, opacity_end=255)
114- self.pause_scale = clutter.BehaviourScale(1.0, 1.0, 1.4, 1.4,
115- alpha_pause)
116-
117- self.pause_opacity.apply(self.pause_texture)
118- self.pause_scale.apply(self.pause_texture)
119- pause_timeline.start()
120+ self.pause_in_scale = clutter.BehaviourScale(1.0, 1.0, 1.4, 1.4,
121+ in_alpha_pause)
122+
123+ self.pause_in_opacity.apply(self.pause_texture)
124+ self.pause_in_scale.apply(self.pause_texture)
125+
126+ pause_out_time = clutter.Timeline(1000)
127+ out_alpha_pause = clutter.Alpha(pause_out_time,
128+ clutter.EASE_IN_OUT_SINE)
129+
130+ self.pause_out_opacity = clutter.BehaviourOpacity(alpha=out_alpha_pause,
131+ opacity_start=255, opacity_end=100)
132+ self.pause_out_scale = clutter.BehaviourScale(1.4, 1.4, 1.0, 1.0,
133+ out_alpha_pause)
134+
135+ self.pause_out_opacity.apply(self.pause_texture)
136+ self.pause_out_scale.apply(self.pause_texture)
137+
138+ self.score = clutter.Score()
139+ self.score.set_loop(True)
140+ self.score.append(timeline=pause_in_time)
141+ self.score.append(timeline=pause_out_time, parent=pause_in_time)
142+ self.score.start()
143
144 self.seekbackward_texture = Texture(
145 self.theme.getImage("media-seek-backward"), 0.1, 0.5)
146@@ -80,9 +95,9 @@
147 self.seekbackward_texture.set_opacity(0)
148 self.add(self.seekbackward_texture)
149
150- self.seekbackward_timeline = clutter.Timeline(fps=120, duration=1000)
151+ self.seekbackward_timeline = clutter.Timeline(1000)
152 alpha_seekbackward = clutter.Alpha(self.seekbackward_timeline,
153- clutter.smoothstep_inc_func)
154+ clutter.EASE_IN_OUT_SINE)
155
156 self.seekbackward_opacity = clutter.BehaviourOpacity(
157 alpha=alpha_seekbackward, opacity_start=255, opacity_end=0)
158@@ -95,9 +110,9 @@
159 self.seekforward_texture.set_opacity(0)
160 self.add(self.seekforward_texture)
161
162- self.seekforward_timeline = clutter.Timeline(fps=120, duration=1000)
163+ self.seekforward_timeline = clutter.Timeline(1000)
164 alpha_seekforward = clutter.Alpha(self.seekforward_timeline,
165- clutter.smoothstep_inc_func)
166+ clutter.EASE_IN_OUT_SINE)
167
168 self.seekforward_opacity = clutter.BehaviourOpacity(
169 alpha=alpha_seekforward, opacity_start=255, opacity_end=0)
170
171=== modified file 'entertainerlib/gui/tabs/movies_tab.py'
172--- entertainerlib/gui/tabs/movies_tab.py 2009-07-29 03:09:34 +0000
173+++ entertainerlib/gui/tabs/movies_tab.py 2009-12-22 03:15:25 +0000
174@@ -94,11 +94,13 @@
175 self.movie_title = Label(0.042, "title", 0.2, 0.75, "",
176 font_weight="bold")
177 self.movie_title.set_ellipsize(pango.ELLIPSIZE_END)
178+ self.movie_title.set_line_wrap(False)
179 self.movie_title.width = 0.5
180 self.add(self.movie_title)
181
182 self.movie_info = Label(0.034, "subtitle", 0.2, 0.8, "")
183 self.movie_info.set_ellipsize(pango.ELLIPSIZE_END)
184+ self.movie_info.set_line_wrap(False)
185 self.movie_info.width = 0.5
186 self.add(self.movie_info)
187
188
189=== modified file 'entertainerlib/gui/tabs/series_tab.py'
190--- entertainerlib/gui/tabs/series_tab.py 2009-07-29 03:09:34 +0000
191+++ entertainerlib/gui/tabs/series_tab.py 2009-12-22 03:15:25 +0000
192@@ -93,6 +93,7 @@
193 self.series_title = Label(0.042, "title", 0.2, 0.75, "",
194 font_weight="bold")
195 self.series_title.set_ellipsize(pango.ELLIPSIZE_END)
196+ self.series_title.set_line_wrap(False)
197 self.series_title.width = 0.5
198 self.add(self.series_title)
199
200
201=== modified file 'entertainerlib/gui/tabs/video_clips_tab.py'
202--- entertainerlib/gui/tabs/video_clips_tab.py 2009-07-29 03:09:34 +0000
203+++ entertainerlib/gui/tabs/video_clips_tab.py 2009-12-22 03:15:25 +0000
204@@ -93,11 +93,13 @@
205 self.clip_title = Label(0.042, "title", 0.15, 0.77, "",
206 font_weight="bold")
207 self.clip_title.set_ellipsize(pango.ELLIPSIZE_END)
208+ self.clip_title.set_line_wrap(False)
209 self.clip_title.width = 0.5
210 self.add(self.clip_title)
211
212 self.clip_info = Label(0.034, "subtitle", 0.15, 0.85, "")
213 self.clip_info.set_ellipsize(pango.ELLIPSIZE_END)
214+ self.clip_info.set_line_wrap(False)
215 self.clip_info.width = 0.5
216 self.add(self.clip_info)
217

Subscribers

People subscribed via source and target branches