Diffstat (limited to 'noncore/multimedia/opieplayer2/xinevideowidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/xinevideowidget.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/noncore/multimedia/opieplayer2/xinevideowidget.cpp b/noncore/multimedia/opieplayer2/xinevideowidget.cpp index 1ac9277..9e86041 100644 --- a/noncore/multimedia/opieplayer2/xinevideowidget.cpp +++ b/noncore/multimedia/opieplayer2/xinevideowidget.cpp | |||
@@ -268,37 +268,39 @@ void XineVideoWidget::setLogo ( QImage* logo ) | |||
268 | { | 268 | { |
269 | delete m_logo; | 269 | delete m_logo; |
270 | m_logo = logo; | 270 | m_logo = logo; |
271 | } | 271 | } |
272 | 272 | ||
273 | void XineVideoWidget::setVideoFrame ( uchar* img, int w, int h, int bpl ) | 273 | void XineVideoWidget::setVideoFrame ( uchar* img, int w, int h, int bpl ) |
274 | { | 274 | { |
275 | bool rot90 = (( -m_rotation ) & 1 ); | 275 | bool rot90 = (( -m_rotation ) & 1 ); |
276 | 276 | ||
277 | if ( rot90 ) { // if the rotation is 90 or 270 we have to swap width / height | 277 | if ( rot90 ) { // if the rotation is 90 or 270 we have to swap width / height |
278 | int d = w; | 278 | int d = w; |
279 | w = h; | 279 | w = h; |
280 | h = d; | 280 | h = d; |
281 | } | 281 | } |
282 | 282 | ||
283 | m_lastframe = m_thisframe; | 283 | m_lastframe = m_thisframe; |
284 | m_thisframe. setRect (( width ( ) - w ) / 2, ( height ( ) - h ) / 2, w , h ); | 284 | m_thisframe. setRect (( width ( ) - w ) / 2, ( height ( ) - h ) / 2, w , h ); |
285 | 285 | ||
286 | m_buff = img; | 286 | m_buff = img; |
287 | m_bytes_per_line_frame = bpl; | 287 | m_bytes_per_line_frame = bpl; |
288 | 288 | ||
289 | // only repaint the area that *really* needs to be repainted | 289 | // only repaint the area that *really* needs to be repainted |
290 | 290 | ||
291 | repaint ((( m_thisframe & m_lastframe ) != m_lastframe ) ? m_lastframe : m_thisframe, false ); | 291 | repaint ((( m_thisframe & m_lastframe ) != m_lastframe ) ? m_lastframe : m_thisframe, false ); |
292 | // ensure that we always have a valid frame! | ||
293 | m_buff = 0; | ||
292 | } | 294 | } |
293 | 295 | ||
294 | void XineVideoWidget::resizeEvent ( QResizeEvent * ) | 296 | void XineVideoWidget::resizeEvent ( QResizeEvent * ) |
295 | { | 297 | { |
296 | emit videoResized( videoSize() ); | 298 | emit videoResized( videoSize() ); |
297 | } | 299 | } |
298 | 300 | ||
299 | 301 | ||
300 | void XineVideoWidget::mouseReleaseEvent ( QMouseEvent * /*me*/ ) | 302 | void XineVideoWidget::mouseReleaseEvent ( QMouseEvent * /*me*/ ) |
301 | { | 303 | { |
302 | emit clicked(); | 304 | emit clicked(); |
303 | } | 305 | } |
304 | 306 | ||