Diffstat (limited to 'noncore/multimedia/opieplayer2/xinevideowidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/xinevideowidget.cpp | 68 |
1 files changed, 35 insertions, 33 deletions
diff --git a/noncore/multimedia/opieplayer2/xinevideowidget.cpp b/noncore/multimedia/opieplayer2/xinevideowidget.cpp index d65006b..3e28e54 100644 --- a/noncore/multimedia/opieplayer2/xinevideowidget.cpp +++ b/noncore/multimedia/opieplayer2/xinevideowidget.cpp | |||
@@ -3,3 +3,3 @@ | |||
3 | This file is part of the Opie Project | 3 | This file is part of the Opie Project |
4 | 4 | ||
5 | Copyright (c) 2002 Max Reiss <harlekin@handhelds.org> | 5 | Copyright (c) 2002 Max Reiss <harlekin@handhelds.org> |
@@ -31,3 +31,3 @@ | |||
31 | Boston, MA 02111-1307, USA. | 31 | Boston, MA 02111-1307, USA. |
32 | 32 | ||
33 | */ | 33 | */ |
@@ -52,3 +52,3 @@ static inline void memcpy_rev ( void *dst, void *src, size_t len ) | |||
52 | 52 | ||
53 | len >>= 1; | 53 | len >>= 1; |
54 | while ( len-- ) | 54 | while ( len-- ) |
@@ -69,5 +69,5 @@ static inline void memcpy_step_rev ( void *dst, void *src, size_t len, size_t st | |||
69 | len >>= 1; | 69 | len >>= 1; |
70 | 70 | ||
71 | ((char *) src ) += ( len * step ); | 71 | ((char *) src ) += ( len * step ); |
72 | 72 | ||
73 | while ( len-- ) { | 73 | while ( len-- ) { |
@@ -115,5 +115,5 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) | |||
115 | // qWarning ( "paintevent\n" ); | 115 | // qWarning ( "paintevent\n" ); |
116 | 116 | ||
117 | QArray <QRect> qt_bug_workaround_clip_rects; | 117 | QArray <QRect> qt_bug_workaround_clip_rects; |
118 | 118 | ||
119 | { | 119 | { |
@@ -125,5 +125,5 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) | |||
125 | uchar *frame = m_buff; // rot == 0 ? m_buff : m_buff + ( m_thisframe. height ( ) - 1 ) * m_bytes_per_line_frame; | 125 | uchar *frame = m_buff; // rot == 0 ? m_buff : m_buff + ( m_thisframe. height ( ) - 1 ) * m_bytes_per_line_frame; |
126 | 126 | ||
127 | QRect framerect = qt_screen-> mapToDevice ( QRect ( mapToGlobal ( m_thisframe. topLeft ( )), m_thisframe. size ( )), QSize ( qt_screen-> width ( ), qt_screen-> height ( ))); | 127 | QRect framerect = qt_screen-> mapToDevice ( QRect ( mapToGlobal ( m_thisframe. topLeft ( )), m_thisframe. size ( )), QSize ( qt_screen-> width ( ), qt_screen-> height ( ))); |
128 | 128 | ||
129 | qt_bug_workaround_clip_rects. resize ( dp. numRects ( )); | 129 | qt_bug_workaround_clip_rects. resize ( dp. numRects ( )); |
@@ -132,8 +132,8 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) | |||
132 | const QRect &clip = dp. rect ( i ); | 132 | const QRect &clip = dp. rect ( i ); |
133 | 133 | ||
134 | qt_bug_workaround_clip_rects [i] = qt_screen-> mapFromDevice ( clip, QSize ( qt_screen-> width ( ), qt_screen-> height ( ))); | 134 | qt_bug_workaround_clip_rects [i] = qt_screen-> mapFromDevice ( clip, QSize ( qt_screen-> width ( ), qt_screen-> height ( ))); |
135 | 135 | ||
136 | uchar *dst = fb + ( clip. x ( ) * m_bytes_per_pixel ) + ( clip. y ( ) * m_bytes_per_line_fb ); | 136 | uchar *dst = fb + ( clip. x ( ) * m_bytes_per_pixel ) + ( clip. y ( ) * m_bytes_per_line_fb ); |
137 | uchar *src = frame; | 137 | uchar *src = frame; |
138 | 138 | ||
139 | switch ( rot ) { | 139 | switch ( rot ) { |
@@ -149,3 +149,3 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) | |||
149 | uint clipwidth = clip. width ( ) * m_bytes_per_pixel; | 149 | uint clipwidth = clip. width ( ) * m_bytes_per_pixel; |
150 | 150 | ||
151 | if ( clip. left ( ) < framerect. left ( )) | 151 | if ( clip. left ( ) < framerect. left ( )) |
@@ -154,3 +154,3 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) | |||
154 | rightfill = (( clip. right ( ) - framerect. right ( )) * m_bytes_per_pixel ) <? clipwidth; | 154 | rightfill = (( clip. right ( ) - framerect. right ( )) * m_bytes_per_pixel ) <? clipwidth; |
155 | 155 | ||
156 | framefill = clipwidth - ( leftfill + rightfill ); | 156 | framefill = clipwidth - ( leftfill + rightfill ); |
@@ -164,3 +164,3 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) | |||
164 | memset ( dst, 0, leftfill ); | 164 | memset ( dst, 0, leftfill ); |
165 | 165 | ||
166 | if ( framefill ) { | 166 | if ( framefill ) { |
@@ -172,3 +172,3 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) | |||
172 | } | 172 | } |
173 | } | 173 | } |
174 | if ( rightfill ) | 174 | if ( rightfill ) |
@@ -176,5 +176,5 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) | |||
176 | } | 176 | } |
177 | 177 | ||
178 | dst += m_bytes_per_line_fb; | 178 | dst += m_bytes_per_line_fb; |
179 | 179 | ||
180 | switch ( rot ) { | 180 | switch ( rot ) { |
@@ -188,3 +188,3 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) | |||
188 | } | 188 | } |
189 | //qWarning ( " ||| painting |||" ); | 189 | //qWarning ( " ||| painting |||" ); |
190 | { | 190 | { |
@@ -193,3 +193,3 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) | |||
193 | 193 | ||
194 | for ( int i = qt_bug_workaround_clip_rects. size ( ) - 1; i >= 0; i-- ) { | 194 | for ( int i = qt_bug_workaround_clip_rects. size ( ) - 1; i >= 0; i-- ) { |
195 | p. fillRect ( QRect ( mapFromGlobal ( qt_bug_workaround_clip_rects [i]. topLeft ( )), qt_bug_workaround_clip_rects [i]. size ( )), QBrush ( NoBrush ) ); | 195 | p. fillRect ( QRect ( mapFromGlobal ( qt_bug_workaround_clip_rects [i]. topLeft ( )), qt_bug_workaround_clip_rects [i]. size ( )), QBrush ( NoBrush ) ); |
@@ -233,7 +233,7 @@ void XineVideoWidget::resizeEvent ( QResizeEvent * ) | |||
233 | bool fs = ( s == qApp-> desktop ( )-> size ( )); | 233 | bool fs = ( s == qApp-> desktop ( )-> size ( )); |
234 | 234 | ||
235 | m_rotation = fs ? -qt_screen-> transformOrientation ( ) : 0; | 235 | m_rotation = fs ? -qt_screen-> transformOrientation ( ) : 0; |
236 | 236 | ||
237 | if ( fs && qt_screen-> isTransformed ( )) { | 237 | if ( fs && qt_screen-> isTransformed ( )) { |
238 | s = qt_screen-> mapToDevice ( s ); | 238 | s = qt_screen-> mapToDevice ( s ); |
239 | } | 239 | } |
@@ -241,3 +241,3 @@ void XineVideoWidget::resizeEvent ( QResizeEvent * ) | |||
241 | // qDebug ( "\n\nResize: %dx%d, Rot: %d", s.width(),s.height(),m_rotation ); | 241 | // qDebug ( "\n\nResize: %dx%d, Rot: %d", s.width(),s.height(),m_rotation ); |
242 | 242 | ||
243 | emit videoResized ( s ); | 243 | emit videoResized ( s ); |
@@ -249,7 +249,8 @@ void XineVideoWidget::mousePressEvent ( QMouseEvent *me ) | |||
249 | QWidget *p = parentWidget ( ); | 249 | QWidget *p = parentWidget ( ); |
250 | 250 | ||
251 | if ( p ) { | 251 | if ( p ) { |
252 | QMouseEvent pme ( QEvent::MouseButtonPress, mapToParent ( me-> pos ( )), me-> globalPos ( ), me-> button ( ), me-> state ( )); | 252 | // QMouseEvent pme ( QEvent::MouseButtonPress, mapToParent ( me-> pos ( )), me-> globalPos ( ), me-> button ( ), me-> state ( )); |
253 | 253 | ||
254 | QApplication::sendEvent ( p, &pme ); | 254 | // QApplication::sendEvent ( p, &pme ); |
255 | // emit clicked(); | ||
255 | } | 256 | } |
@@ -260,7 +261,8 @@ void XineVideoWidget::mouseReleaseEvent ( QMouseEvent *me ) | |||
260 | QWidget *p = parentWidget ( ); | 261 | QWidget *p = parentWidget ( ); |
261 | 262 | ||
262 | if ( p ) { | 263 | if ( p ) { |
263 | QMouseEvent pme ( QEvent::MouseButtonRelease, mapToParent ( me-> pos ( )), me-> globalPos ( ), me-> button ( ), me-> state ( )); | 264 | // QMouseEvent pme ( QEvent::MouseButtonRelease, mapToParent ( me-> pos ( )), me-> globalPos ( ), me-> button ( ), me-> state ( )); |
264 | 265 | ||
265 | QApplication::sendEvent ( p, &pme ); | 266 | // QApplication::sendEvent ( p, &pme ); |
267 | emit clicked(); | ||
266 | } | 268 | } |