summaryrefslogtreecommitdiff
authoralwin <alwin>2005-04-10 22:00:26 (UTC)
committer alwin <alwin>2005-04-10 22:00:26 (UTC)
commitad2f1bd57cbfb0fdaf4d348ee3a70d3ea370d5d1 (patch) (side-by-side diff)
tree1028d369feda50bfdad0f2531577a4daa261b0e1
parentd133e1f4c2b820ca428438cb17f5477190d268b1 (diff)
downloadopie-ad2f1bd57cbfb0fdaf4d348ee3a70d3ea370d5d1.zip
opie-ad2f1bd57cbfb0fdaf4d348ee3a70d3ea370d5d1.tar.gz
opie-ad2f1bd57cbfb0fdaf4d348ee3a70d3ea370d5d1.tar.bz2
-restored file header
-removed obsolete stuff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/xinevideowidget.cpp18
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,4 +1,3 @@
-
/*
                This file is part of the Opie Project
@@ -215,6 +214,9 @@ void XineVideoWidget::paintEvent2 ( QPaintEvent * )
int middle_w = _vw/2;
int middle_h = _vh/2;
m_thisframe.setRect(width()/2-middle_w,height()/2-middle_h,_vw,_vh);
+
+ {
+ // 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());
@@ -233,6 +235,8 @@ void XineVideoWidget::paintEvent2 ( QPaintEvent * )
if (leftFill.isValid()) {
p.fillRect(leftFill,black);
}
+
+ }
uchar *fb = dp. frameBuffer ( );
uchar *frame = m_buff;
@@ -267,13 +271,6 @@ void XineVideoWidget::paintEvent2 ( QPaintEvent * )
dst += m_bytes_per_line_fb;
}
}
-
-
- {
- // 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));
- }
}
}
@@ -311,9 +308,6 @@ void XineVideoWidget::setVideoFrame ( uchar* img, int w, int h, int bpl )
} else {
m_buff = 0;
}
- } else if (l==0){
- delete[] m_buff;
- m_buff = 0;
}
m_lastsize = l;
m_framesize = QSize(w,h);
@@ -323,7 +317,7 @@ void XineVideoWidget::setVideoFrame ( uchar* img, int w, int h, int bpl )
m_bytes_per_line_frame = bpl;
} // Release Mutex
- paintEvent2(0);
+ if (m_buff) paintEvent2(0);
}
void XineVideoWidget::resizeEvent ( QResizeEvent * )