Diffstat (limited to 'noncore/multimedia/opieplayer2/xinevideowidget.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/xinevideowidget.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/noncore/multimedia/opieplayer2/xinevideowidget.cpp b/noncore/multimedia/opieplayer2/xinevideowidget.cpp index 3e28e54..bc95d86 100644 --- a/noncore/multimedia/opieplayer2/xinevideowidget.cpp +++ b/noncore/multimedia/opieplayer2/xinevideowidget.cpp @@ -132,24 +132,25 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) const QRect &clip = dp. rect ( i ); qt_bug_workaround_clip_rects [i] = qt_screen-> mapFromDevice ( clip, QSize ( qt_screen-> width ( ), qt_screen-> height ( ))); uchar *dst = fb + ( clip. x ( ) * m_bytes_per_pixel ) + ( clip. y ( ) * m_bytes_per_line_fb ); uchar *src = frame; switch ( rot ) { case 0: src += ( (( clip. x ( ) - framerect. x ( )) * m_bytes_per_pixel ) + (( clip. y ( ) - framerect. y ( )) * m_bytes_per_line_frame ) ); break; case 1: src += ( (( clip. y ( ) - framerect. y ( )) * m_bytes_per_pixel ) + (( clip. x ( ) - framerect. x ( )) * m_bytes_per_line_frame ) + (( framerect. height ( ) - 1 ) * m_bytes_per_pixel ) ); break; case 2: src += ( (( clip. x ( ) - framerect. x ( )) * m_bytes_per_pixel ) + (( clip. y ( ) - framerect. y ( )) * m_bytes_per_line_frame ) + (( framerect. height ( ) - 1 ) * m_bytes_per_line_frame ) ); break; case 3: src += ( (( clip. y ( ) - framerect. y ( )) * m_bytes_per_pixel ) + (( clip. x ( ) - framerect. x ( )) * m_bytes_per_line_frame ) ); break; + default: break; } uint leftfill = 0; uint framefill = 0; uint rightfill = 0; uint clipwidth = clip. width ( ) * m_bytes_per_pixel; if ( clip. left ( ) < framerect. left ( )) leftfill = (( framerect. left ( ) - clip. left ( )) * m_bytes_per_pixel ) <? clipwidth; if ( clip. right ( ) > framerect. right ( )) rightfill = (( clip. right ( ) - framerect. right ( )) * m_bytes_per_pixel ) <? clipwidth; @@ -160,37 +161,39 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) memset ( dst, 0, clipwidth ); } else { if ( leftfill ) memset ( dst, 0, leftfill ); if ( framefill ) { switch ( rot ) { case 0: memcpy ( dst + leftfill, src, framefill ); break; case 1: memcpy_step ( dst + leftfill, src, framefill, m_bytes_per_line_frame ); break; case 2: memcpy_rev ( dst + leftfill, src, framefill ); break; case 3: memcpy_step_rev ( dst + leftfill, src, framefill, m_bytes_per_line_frame ); break; + default: break; } } if ( rightfill ) memset ( dst + leftfill + framefill, 0, rightfill ); } dst += m_bytes_per_line_fb; switch ( rot ) { case 0: src += m_bytes_per_line_frame; break; case 1: src -= m_bytes_per_pixel; break; case 2: src -= m_bytes_per_line_frame; break; case 3: src += m_bytes_per_pixel; break; + default: break; } } } } //qWarning ( " ||| painting |||" ); { // QVFB hack by MArtin Jones QPainter p ( this ); for ( int i = qt_bug_workaround_clip_rects. size ( ) - 1; i >= 0; i-- ) { p. fillRect ( QRect ( mapFromGlobal ( qt_bug_workaround_clip_rects [i]. topLeft ( )), qt_bug_workaround_clip_rects [i]. size ( )), QBrush ( NoBrush ) ); } @@ -235,36 +238,36 @@ void XineVideoWidget::resizeEvent ( QResizeEvent * ) m_rotation = fs ? -qt_screen-> transformOrientation ( ) : 0; if ( fs && qt_screen-> isTransformed ( )) { s = qt_screen-> mapToDevice ( s ); } // qDebug ( "\n\nResize: %dx%d, Rot: %d", s.width(),s.height(),m_rotation ); emit videoResized ( s ); } -void XineVideoWidget::mousePressEvent ( QMouseEvent *me ) +void XineVideoWidget::mousePressEvent ( QMouseEvent * /*me*/ ) { QWidget *p = parentWidget ( ); if ( p ) { // QMouseEvent pme ( QEvent::MouseButtonPress, mapToParent ( me-> pos ( )), me-> globalPos ( ), me-> button ( ), me-> state ( )); // QApplication::sendEvent ( p, &pme ); // emit clicked(); } } -void XineVideoWidget::mouseReleaseEvent ( QMouseEvent *me ) +void XineVideoWidget::mouseReleaseEvent ( QMouseEvent * /*me*/ ) { QWidget *p = parentWidget ( ); if ( p ) { // QMouseEvent pme ( QEvent::MouseButtonRelease, mapToParent ( me-> pos ( )), me-> globalPos ( ), me-> button ( ), me-> state ( )); // QApplication::sendEvent ( p, &pme ); emit clicked(); } } |