author | alwin <alwin> | 2005-04-13 12:55:44 (UTC) |
---|---|---|
committer | alwin <alwin> | 2005-04-13 12:55:44 (UTC) |
commit | cb10570b4118161a066b741c2674d8d522670623 (patch) (unidiff) | |
tree | 149a5c77bc252443efe658e61717e47cee786f59 | |
parent | be565a8eb0c602e5173b71cf71ba510a7a7f4520 (diff) | |
download | opie-cb10570b4118161a066b741c2674d8d522670623.zip opie-cb10570b4118161a066b741c2674d8d522670623.tar.gz opie-cb10570b4118161a066b741c2674d8d522670623.tar.bz2 |
sometimes the display must painted black - we'll just use memset
'cause working on fb itself so we'll not interfer with qpaint
from main thread
-rw-r--r-- | noncore/multimedia/opieplayer2/xinevideowidget.cpp | 24 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinevideowidget.h | 3 |
2 files changed, 25 insertions, 2 deletions
diff --git a/noncore/multimedia/opieplayer2/xinevideowidget.cpp b/noncore/multimedia/opieplayer2/xinevideowidget.cpp index b27b8e1..7c98ce5 100644 --- a/noncore/multimedia/opieplayer2/xinevideowidget.cpp +++ b/noncore/multimedia/opieplayer2/xinevideowidget.cpp | |||
@@ -117,5 +117,5 @@ static inline void memcpy_step_rev ( void *_dst, void *_src, size_t len, size_t | |||
117 | 117 | ||
118 | XineVideoWidget::XineVideoWidget ( QWidget* parent, const char* name ) | 118 | XineVideoWidget::XineVideoWidget ( QWidget* parent, const char* name ) |
119 | : QWidget ( parent, name, WRepaintNoErase | WResizeNoErase ) | 119 | : QWidget ( parent, name, WRepaintNoErase | WResizeNoErase ),old_framerect(0,0,0,0),old_size(0,0) |
120 | { | 120 | { |
121 | setBackgroundMode ( NoBackground ); | 121 | setBackgroundMode ( NoBackground ); |
@@ -132,5 +132,5 @@ XineVideoWidget::XineVideoWidget ( QWidget* parent, const char* name ) | |||
132 | XineVideoWidget::~XineVideoWidget ( ) | 132 | XineVideoWidget::~XineVideoWidget ( ) |
133 | { | 133 | { |
134 | ThreadUtil::AutoLock a(m_bufmutex); | 134 | #if 0 |
135 | if (m_buff) { | 135 | if (m_buff) { |
136 | delete[]m_buff; | 136 | delete[]m_buff; |
@@ -138,4 +138,5 @@ XineVideoWidget::~XineVideoWidget ( ) | |||
138 | m_buff = 0; | 138 | m_buff = 0; |
139 | } | 139 | } |
140 | #endif | ||
140 | if (m_logo) { | 141 | if (m_logo) { |
141 | delete m_logo; | 142 | delete m_logo; |
@@ -145,4 +146,5 @@ XineVideoWidget::~XineVideoWidget ( ) | |||
145 | void XineVideoWidget::clear ( ) | 146 | void XineVideoWidget::clear ( ) |
146 | { | 147 | { |
148 | #if 0 | ||
147 | ThreadUtil::AutoLock a(m_bufmutex); | 149 | ThreadUtil::AutoLock a(m_bufmutex); |
148 | if (m_buff) { | 150 | if (m_buff) { |
@@ -151,4 +153,5 @@ void XineVideoWidget::clear ( ) | |||
151 | m_buff = 0; | 153 | m_buff = 0; |
152 | } | 154 | } |
155 | #endif | ||
153 | repaint ( false ); | 156 | repaint ( false ); |
154 | } | 157 | } |
@@ -211,4 +214,16 @@ void XineVideoWidget::paintEvent2 ( QPaintEvent * ) | |||
211 | uchar * dst = fb+framerect.y()*m_bytes_per_line_fb+framerect.x()*m_bytes_per_pixel; | 214 | uchar * dst = fb+framerect.y()*m_bytes_per_line_fb+framerect.x()*m_bytes_per_pixel; |
212 | 215 | ||
216 | /* clean up the fb screen when shrinking the image only! */ | ||
217 | if (old_framerect.isValid() && old_size.width()==width()&&old_size.height()==height() && | ||
218 | (old_framerect.width()>framerect.width() || old_framerect.height()>framerect.height())) { | ||
219 | uchar*_dst = fb+old_framerect.y()*m_bytes_per_line_fb+old_framerect.x()*m_bytes_per_pixel; | ||
220 | for (int z=0;z<old_framerect.height();++z) { | ||
221 | memset(_dst,0,m_bytes_per_line_fb); | ||
222 | _dst+=m_bytes_per_line_fb; | ||
223 | } | ||
224 | } | ||
225 | old_framerect=framerect; | ||
226 | old_size = size(); | ||
227 | |||
213 | if (framerect.height()!=m_framesize.height()) { | 228 | if (framerect.height()!=m_framesize.height()) { |
214 | odebug << "Hoehm: " << framerect.height() << " <-> " << m_framesize.height() << oendl; | 229 | odebug << "Hoehm: " << framerect.height() << " <-> " << m_framesize.height() << oendl; |
@@ -266,4 +281,5 @@ void XineVideoWidget::setVideoFrame ( uchar* img, int w, int h, int bpl ) | |||
266 | bool rot90 = (( -m_rotation ) & 1 ); | 281 | bool rot90 = (( -m_rotation ) & 1 ); |
267 | int l = h*bpl; | 282 | int l = h*bpl; |
283 | #if 0 | ||
268 | if (l!=m_lastsize) { | 284 | if (l!=m_lastsize) { |
269 | if (m_buff) { | 285 | if (m_buff) { |
@@ -278,9 +294,13 @@ void XineVideoWidget::setVideoFrame ( uchar* img, int w, int h, int bpl ) | |||
278 | } | 294 | } |
279 | } | 295 | } |
296 | #endif | ||
280 | m_lastsize = l; | 297 | m_lastsize = l; |
281 | m_framesize = QSize(w,h); | 298 | m_framesize = QSize(w,h); |
299 | #if 0 | ||
282 | if (m_buff && m_lastsize) { | 300 | if (m_buff && m_lastsize) { |
283 | memcpy(m_buff,img,m_lastsize); | 301 | memcpy(m_buff,img,m_lastsize); |
284 | } | 302 | } |
303 | #endif | ||
304 | m_buff = img; | ||
285 | m_bytes_per_line_frame = bpl; | 305 | m_bytes_per_line_frame = bpl; |
286 | if (m_buff) paintEvent2(0); | 306 | if (m_buff) paintEvent2(0); |
diff --git a/noncore/multimedia/opieplayer2/xinevideowidget.h b/noncore/multimedia/opieplayer2/xinevideowidget.h index a0ec5bc..f240b1c 100644 --- a/noncore/multimedia/opieplayer2/xinevideowidget.h +++ b/noncore/multimedia/opieplayer2/xinevideowidget.h | |||
@@ -35,4 +35,5 @@ | |||
35 | 35 | ||
36 | #include <qwidget.h> | 36 | #include <qwidget.h> |
37 | #include <qrect.h> | ||
37 | 38 | ||
38 | #include "lib.h" | 39 | #include "lib.h" |
@@ -58,4 +59,6 @@ protected: | |||
58 | virtual void paintEvent(QPaintEvent*); | 59 | virtual void paintEvent(QPaintEvent*); |
59 | virtual void resizeEvent ( QResizeEvent *r ); | 60 | virtual void resizeEvent ( QResizeEvent *r ); |
61 | QRect old_framerect; | ||
62 | QSize old_size; | ||
60 | 63 | ||
61 | void mouseReleaseEvent ( QMouseEvent *e ); | 64 | void mouseReleaseEvent ( QMouseEvent *e ); |