author | alwin <alwin> | 2005-04-10 22:00:26 (UTC) |
---|---|---|
committer | alwin <alwin> | 2005-04-10 22:00:26 (UTC) |
commit | ad2f1bd57cbfb0fdaf4d348ee3a70d3ea370d5d1 (patch) (side-by-side diff) | |
tree | 1028d369feda50bfdad0f2531577a4daa261b0e1 /noncore | |
parent | d133e1f4c2b820ca428438cb17f5477190d268b1 (diff) | |
download | opie-ad2f1bd57cbfb0fdaf4d348ee3a70d3ea370d5d1.zip opie-ad2f1bd57cbfb0fdaf4d348ee3a70d3ea370d5d1.tar.gz opie-ad2f1bd57cbfb0fdaf4d348ee3a70d3ea370d5d1.tar.bz2 |
-restored file header
-removed obsolete stuff
-rw-r--r-- | noncore/multimedia/opieplayer2/xinevideowidget.cpp | 52 |
1 files changed, 23 insertions, 29 deletions
diff --git a/noncore/multimedia/opieplayer2/xinevideowidget.cpp b/noncore/multimedia/opieplayer2/xinevideowidget.cpp index 7f59085..78ebe19 100644 --- a/noncore/multimedia/opieplayer2/xinevideowidget.cpp +++ b/noncore/multimedia/opieplayer2/xinevideowidget.cpp @@ -1,3 +1,2 @@ - /* This file is part of the Opie Project @@ -216,21 +215,26 @@ void XineVideoWidget::paintEvent2 ( QPaintEvent * ) int middle_h = _vh/2; m_thisframe.setRect(width()/2-middle_w,height()/2-middle_h,_vw,_vh); - QRect topFill,rightFill,leftFill,downFill; - topFill. setRect(0,0 ,width(),m_thisframe.top()); - downFill.setCoords(0,m_thisframe.bottom(),width(),height()); - rightFill.setCoords(m_thisframe.right(),0,width(),height()); - leftFill.setCoords(0,0,m_thisframe.left(),height()); - - if (topFill.isValid()) { - p.fillRect(topFill,black); - } - if (downFill.isValid()) { - p.fillRect(downFill,black); - } - if (rightFill.isValid()) { - p.fillRect(rightFill,black); - } - if (leftFill.isValid()) { - p.fillRect(leftFill,black); + + { + // is this stuff realy needed? it seems working without, too. + QRect topFill,rightFill,leftFill,downFill; + topFill. setRect(0,0 ,width(),m_thisframe.top()); + downFill.setCoords(0,m_thisframe.bottom(),width(),height()); + rightFill.setCoords(m_thisframe.right(),0,width(),height()); + leftFill.setCoords(0,0,m_thisframe.left(),height()); + + if (topFill.isValid()) { + p.fillRect(topFill,black); + } + if (downFill.isValid()) { + p.fillRect(downFill,black); + } + if (rightFill.isValid()) { + p.fillRect(rightFill,black); + } + if (leftFill.isValid()) { + p.fillRect(leftFill,black); + } + } uchar *fb = dp. frameBuffer ( ); @@ -268,11 +272,4 @@ void XineVideoWidget::paintEvent2 ( QPaintEvent * ) } } - - - { - // QVFB hack by Martin Jones - // We need to "touch" all affected clip rects with a normal QPainter in addition to the QDirectPainter - p.fillRect(QRect(mapFromGlobal (m_thisframe. topLeft ( )), m_thisframe.size ()),QBrush(NoBrush)); - } } } @@ -312,7 +309,4 @@ void XineVideoWidget::setVideoFrame ( uchar* img, int w, int h, int bpl ) m_buff = 0; } - } else if (l==0){ - delete[] m_buff; - m_buff = 0; } m_lastsize = l; @@ -324,5 +318,5 @@ void XineVideoWidget::setVideoFrame ( uchar* img, int w, int h, int bpl ) } // Release Mutex - paintEvent2(0); + if (m_buff) paintEvent2(0); } |