author | alwin <alwin> | 2005-04-10 22:00:26 (UTC) |
---|---|---|
committer | alwin <alwin> | 2005-04-10 22:00:26 (UTC) |
commit | ad2f1bd57cbfb0fdaf4d348ee3a70d3ea370d5d1 (patch) (unidiff) | |
tree | 1028d369feda50bfdad0f2531577a4daa261b0e1 /noncore/multimedia | |
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 | 18 |
1 files changed, 6 insertions, 12 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 @@ | |||
1 | |||
2 | /* | 1 | /* |
3 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
@@ -216,4 +215,7 @@ void XineVideoWidget::paintEvent2 ( QPaintEvent * ) | |||
216 | int middle_h = _vh/2; | 215 | int middle_h = _vh/2; |
217 | m_thisframe.setRect(width()/2-middle_w,height()/2-middle_h,_vw,_vh); | 216 | m_thisframe.setRect(width()/2-middle_w,height()/2-middle_h,_vw,_vh); |
217 | |||
218 | { | ||
219 | // is this stuff realy needed? it seems working without, too. | ||
218 | QRect topFill,rightFill,leftFill,downFill; | 220 | QRect topFill,rightFill,leftFill,downFill; |
219 | topFill. setRect(0,0 ,width(),m_thisframe.top()); | 221 | topFill. setRect(0,0 ,width(),m_thisframe.top()); |
@@ -234,4 +236,6 @@ void XineVideoWidget::paintEvent2 ( QPaintEvent * ) | |||
234 | p.fillRect(leftFill,black); | 236 | p.fillRect(leftFill,black); |
235 | } | 237 | } |
238 | |||
239 | } | ||
236 | uchar *fb = dp. frameBuffer ( ); | 240 | uchar *fb = dp. frameBuffer ( ); |
237 | uchar *frame = m_buff; | 241 | uchar *frame = m_buff; |
@@ -268,11 +272,4 @@ void XineVideoWidget::paintEvent2 ( QPaintEvent * ) | |||
268 | } | 272 | } |
269 | } | 273 | } |
270 | |||
271 | |||
272 | { | ||
273 | // QVFB hack by Martin Jones | ||
274 | // We need to "touch" all affected clip rects with a normal QPainter in addition to the QDirectPainter | ||
275 | p.fillRect(QRect(mapFromGlobal (m_thisframe. topLeft ( )), m_thisframe.size ()),QBrush(NoBrush)); | ||
276 | } | ||
277 | } | 274 | } |
278 | } | 275 | } |
@@ -312,7 +309,4 @@ void XineVideoWidget::setVideoFrame ( uchar* img, int w, int h, int bpl ) | |||
312 | m_buff = 0; | 309 | m_buff = 0; |
313 | } | 310 | } |
314 | } else if (l==0){ | ||
315 | delete[] m_buff; | ||
316 | m_buff = 0; | ||
317 | } | 311 | } |
318 | m_lastsize = l; | 312 | m_lastsize = l; |
@@ -324,5 +318,5 @@ void XineVideoWidget::setVideoFrame ( uchar* img, int w, int h, int bpl ) | |||
324 | } // Release Mutex | 318 | } // Release Mutex |
325 | 319 | ||
326 | paintEvent2(0); | 320 | if (m_buff) paintEvent2(0); |
327 | } | 321 | } |
328 | 322 | ||