author | harlekin <harlekin> | 2002-08-15 20:51:11 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-08-15 20:51:11 (UTC) |
commit | be99f951c39d19a6e9923103434afdb293741d35 (patch) (unidiff) | |
tree | 4fe4d6cc51eee0bbdd53c9b353624d104929f08b /noncore | |
parent | 157b5b1209b656960fc0b27fc077eb36a77b2c3f (diff) | |
download | opie-be99f951c39d19a6e9923103434afdb293741d35.zip opie-be99f951c39d19a6e9923103434afdb293741d35.tar.gz opie-be99f951c39d19a6e9923103434afdb293741d35.tar.bz2 |
click in fullscreen leeds to going back to the normal videowidget now
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.cpp | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 37 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.h | 1 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinevideowidget.cpp | 68 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinevideowidget.h | 15 |
5 files changed, 67 insertions, 56 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp index 93819f2..22afe19 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp | |||
@@ -71,7 +71,7 @@ void MediaPlayer::play() { | |||
71 | 71 | ||
72 | void MediaPlayer::setPlaying( bool play ) { | 72 | void MediaPlayer::setPlaying( bool play ) { |
73 | if ( !play ) { | 73 | if ( !play ) { |
74 | //mediaPlayerState->setPaused( TRUE ); | 74 | // mediaPlayerState->setPaused( FALSE ); |
75 | return; | 75 | return; |
76 | } | 76 | } |
77 | 77 | ||
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index 238770b..c2080e6 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -84,7 +84,9 @@ QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) { | |||
84 | setCaption( tr("OpiePlayer - Video") ); | 84 | setCaption( tr("OpiePlayer - Video") ); |
85 | 85 | ||
86 | videoFrame = new XineVideoWidget ( this, "Video frame" ); | 86 | videoFrame = new XineVideoWidget ( this, "Video frame" ); |
87 | |||
87 | connect ( videoFrame, SIGNAL( videoResized ( const QSize & )), this, SIGNAL( videoResized ( const QSize & ))); | 88 | connect ( videoFrame, SIGNAL( videoResized ( const QSize & )), this, SIGNAL( videoResized ( const QSize & ))); |
89 | connect ( videoFrame, SIGNAL( clicked () ), this, SLOT ( backToNormal() ) ); | ||
88 | 90 | ||
89 | Config cfg("OpiePlayer"); | 91 | Config cfg("OpiePlayer"); |
90 | cfg.setGroup("Options"); | 92 | cfg.setGroup("Options"); |
@@ -343,8 +345,7 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
343 | mediaPlayerState->setPaused( TRUE ); | 345 | mediaPlayerState->setPaused( TRUE ); |
344 | return; | 346 | return; |
345 | } else { | 347 | } else { |
346 | // setToggleButton( i, TRUE ); | 348 | return; |
347 | // mediaPlayerState->setPlaying( videoButtons[i].isDown ); | ||
348 | } | 349 | } |
349 | } | 350 | } |
350 | 351 | ||
@@ -378,20 +379,26 @@ void VideoWidget::showEvent( QShowEvent* ) { | |||
378 | } | 379 | } |
379 | 380 | ||
380 | 381 | ||
382 | void VideoWidget::backToNormal() { | ||
383 | mediaPlayerState->setFullscreen( FALSE ); | ||
384 | makeVisible(); | ||
385 | } | ||
386 | |||
381 | void VideoWidget::makeVisible() { | 387 | void VideoWidget::makeVisible() { |
382 | if ( mediaPlayerState->fullscreen() ) { | 388 | if ( mediaPlayerState->fullscreen() ) { |
383 | setBackgroundMode( QWidget::NoBackground ); | 389 | setBackgroundMode( QWidget::NoBackground ); |
384 | showFullScreen(); | 390 | showFullScreen(); |
385 | resize( qApp->desktop()->size() ); | 391 | resize( qApp->desktop()->size() ); |
386 | slider->hide(); | 392 | slider->hide(); |
387 | videoFrame-> setGeometry ( 0, 0, width ( ), height ( )); | 393 | videoFrame-> setGeometry ( 0, 0, width ( ), height ( )); |
388 | } else { | 394 | |
389 | showNormal(); | 395 | } else { |
390 | showMaximized(); | 396 | showNormal(); |
391 | slider->show(); | 397 | showMaximized(); |
392 | videoFrame->setGeometry( QRect( 10, 20, 220, 160 ) ); | 398 | slider->show(); |
393 | qApp->processEvents(); | 399 | videoFrame->setGeometry( QRect( 0, 30, 240, 170 ) ); |
394 | } | 400 | qApp->processEvents(); |
401 | } | ||
395 | } | 402 | } |
396 | 403 | ||
397 | 404 | ||
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h index b35558b..990fa5f 100644 --- a/noncore/multimedia/opieplayer2/videowidget.h +++ b/noncore/multimedia/opieplayer2/videowidget.h | |||
@@ -66,6 +66,7 @@ public slots: | |||
66 | void setPlaying( bool b); | 66 | void setPlaying( bool b); |
67 | void setFullscreen( bool b ); | 67 | void setFullscreen( bool b ); |
68 | void makeVisible(); | 68 | void makeVisible(); |
69 | void backToNormal(); | ||
69 | void setPosition( long ); | 70 | void setPosition( long ); |
70 | void setLength( long ); | 71 | void setLength( long ); |
71 | void setView( char ); | 72 | void setView( char ); |
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 | |||
@@ -1,7 +1,7 @@ | |||
1 | 1 | ||
2 | /* | 2 | /* |
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> |
6 | Copyright (c) 2002 LJP <> | 6 | Copyright (c) 2002 LJP <> |
7 | Copyright (c) 2002 Holger Freyther <zecke@handhelds.org> | 7 | Copyright (c) 2002 Holger Freyther <zecke@handhelds.org> |
@@ -29,7 +29,7 @@ | |||
29 | If not, write to the Free Software Foundation, | 29 | If not, write to the Free Software Foundation, |
30 | Inc., 59 Temple Place - Suite 330, | 30 | Inc., 59 Temple Place - Suite 330, |
31 | Boston, MA 02111-1307, USA. | 31 | Boston, MA 02111-1307, USA. |
32 | 32 | ||
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include <qimage.h> | 35 | #include <qimage.h> |
@@ -50,7 +50,7 @@ static inline void memcpy_rev ( void *dst, void *src, size_t len ) | |||
50 | { | 50 | { |
51 | ((char *) src ) += len; | 51 | ((char *) src ) += len; |
52 | 52 | ||
53 | len >>= 1; | 53 | len >>= 1; |
54 | while ( len-- ) | 54 | while ( len-- ) |
55 | *((short int *) dst )++ = *--((short int *) src ); | 55 | *((short int *) dst )++ = *--((short int *) src ); |
56 | } | 56 | } |
@@ -67,9 +67,9 @@ static inline void memcpy_step ( void *dst, void *src, size_t len, size_t step ) | |||
67 | static inline void memcpy_step_rev ( void *dst, void *src, size_t len, size_t step ) | 67 | static inline void memcpy_step_rev ( void *dst, void *src, size_t len, size_t step ) |
68 | { | 68 | { |
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-- ) { |
74 | ((char *) src ) -= step; | 74 | ((char *) src ) -= step; |
75 | *((short int *) dst )++ = *((short int *) src ); | 75 | *((short int *) dst )++ = *((short int *) src ); |
@@ -113,9 +113,9 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) | |||
113 | } | 113 | } |
114 | else { | 114 | else { |
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 | { |
120 | QDirectPainter dp ( this ); | 120 | QDirectPainter dp ( this ); |
121 | 121 | ||
@@ -123,19 +123,19 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) | |||
123 | 123 | ||
124 | uchar *fb = dp. frameBuffer ( ); | 124 | uchar *fb = dp. frameBuffer ( ); |
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 ( )); |
130 | 130 | ||
131 | for ( int i = dp. numRects ( ) - 1; i >= 0; i-- ) { | 131 | for ( int i = dp. numRects ( ) - 1; i >= 0; i-- ) { |
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 ) { |
140 | case 0: src += ( (( clip. x ( ) - framerect. x ( )) * m_bytes_per_pixel ) + (( clip. y ( ) - framerect. y ( )) * m_bytes_per_line_frame ) ); break; | 140 | case 0: src += ( (( clip. x ( ) - framerect. x ( )) * m_bytes_per_pixel ) + (( clip. y ( ) - framerect. y ( )) * m_bytes_per_line_frame ) ); break; |
141 | case 1: src += ( (( clip. y ( ) - framerect. y ( )) * m_bytes_per_pixel ) + (( clip. x ( ) - framerect. x ( )) * m_bytes_per_line_frame ) + (( framerect. height ( ) - 1 ) * m_bytes_per_pixel ) ); break; | 141 | case 1: src += ( (( clip. y ( ) - framerect. y ( )) * m_bytes_per_pixel ) + (( clip. x ( ) - framerect. x ( )) * m_bytes_per_line_frame ) + (( framerect. height ( ) - 1 ) * m_bytes_per_pixel ) ); break; |
@@ -147,12 +147,12 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) | |||
147 | uint framefill = 0; | 147 | uint framefill = 0; |
148 | uint rightfill = 0; | 148 | uint rightfill = 0; |
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 ( )) |
152 | leftfill = (( framerect. left ( ) - clip. left ( )) * m_bytes_per_pixel ) <? clipwidth; | 152 | leftfill = (( framerect. left ( ) - clip. left ( )) * m_bytes_per_pixel ) <? clipwidth; |
153 | if ( clip. right ( ) > framerect. right ( )) | 153 | if ( clip. right ( ) > framerect. right ( )) |
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 ); |
157 | 157 | ||
158 | for ( int y = clip. top ( ); y <= clip. bottom ( ); y++ ) { | 158 | for ( int y = clip. top ( ); y <= clip. bottom ( ); y++ ) { |
@@ -162,7 +162,7 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) | |||
162 | else { | 162 | else { |
163 | if ( leftfill ) | 163 | if ( leftfill ) |
164 | memset ( dst, 0, leftfill ); | 164 | memset ( dst, 0, leftfill ); |
165 | 165 | ||
166 | if ( framefill ) { | 166 | if ( framefill ) { |
167 | switch ( rot ) { | 167 | switch ( rot ) { |
168 | case 0: memcpy ( dst + leftfill, src, framefill ); break; | 168 | case 0: memcpy ( dst + leftfill, src, framefill ); break; |
@@ -170,13 +170,13 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) | |||
170 | case 2: memcpy_rev ( dst + leftfill, src, framefill ); break; | 170 | case 2: memcpy_rev ( dst + leftfill, src, framefill ); break; |
171 | case 3: memcpy_step_rev ( dst + leftfill, src, framefill, m_bytes_per_line_frame ); break; | 171 | case 3: memcpy_step_rev ( dst + leftfill, src, framefill, m_bytes_per_line_frame ); break; |
172 | } | 172 | } |
173 | } | 173 | } |
174 | if ( rightfill ) | 174 | if ( rightfill ) |
175 | memset ( dst + leftfill + framefill, 0, rightfill ); | 175 | memset ( dst + leftfill + framefill, 0, rightfill ); |
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 ) { |
181 | case 0: src += m_bytes_per_line_frame; break; | 181 | case 0: src += m_bytes_per_line_frame; break; |
182 | case 1: src -= m_bytes_per_pixel; break; | 182 | case 1: src -= m_bytes_per_pixel; break; |
@@ -186,12 +186,12 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) | |||
186 | } | 186 | } |
187 | } | 187 | } |
188 | } | 188 | } |
189 | //qWarning ( " ||| painting |||" ); | 189 | //qWarning ( " ||| painting |||" ); |
190 | { | 190 | { |
191 | // QVFB hack by MArtin Jones | 191 | // QVFB hack by MArtin Jones |
192 | QPainter p ( this ); | 192 | QPainter p ( this ); |
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 ) ); |
196 | } | 196 | } |
197 | } | 197 | } |
@@ -231,15 +231,15 @@ void XineVideoWidget::resizeEvent ( QResizeEvent * ) | |||
231 | { | 231 | { |
232 | QSize s = size ( ); | 232 | QSize s = size ( ); |
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 | } |
240 | 240 | ||
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 ); |
244 | } | 244 | } |
245 | 245 | ||
@@ -247,22 +247,24 @@ void XineVideoWidget::resizeEvent ( QResizeEvent * ) | |||
247 | void XineVideoWidget::mousePressEvent ( QMouseEvent *me ) | 247 | void XineVideoWidget::mousePressEvent ( QMouseEvent *me ) |
248 | { | 248 | { |
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 | } |
256 | } | 257 | } |
257 | 258 | ||
258 | void XineVideoWidget::mouseReleaseEvent ( QMouseEvent *me ) | 259 | void XineVideoWidget::mouseReleaseEvent ( QMouseEvent *me ) |
259 | { | 260 | { |
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 | } |
267 | } | 269 | } |
268 | 270 | ||
diff --git a/noncore/multimedia/opieplayer2/xinevideowidget.h b/noncore/multimedia/opieplayer2/xinevideowidget.h index 2fc627d..c5101da 100644 --- a/noncore/multimedia/opieplayer2/xinevideowidget.h +++ b/noncore/multimedia/opieplayer2/xinevideowidget.h | |||
@@ -47,20 +47,21 @@ public: | |||
47 | void setImage( QImage* image ); | 47 | void setImage( QImage* image ); |
48 | void setImage( uchar* image, int width, int height, int linestep); | 48 | void setImage( uchar* image, int width, int height, int linestep); |
49 | void clear() ; | 49 | void clear() ; |
50 | 50 | ||
51 | protected: | 51 | protected: |
52 | void paintEvent( QPaintEvent* p ); | 52 | void paintEvent( QPaintEvent* p ); |
53 | void resizeEvent ( QResizeEvent *r ); | 53 | void resizeEvent ( QResizeEvent *r ); |
54 | 54 | ||
55 | void mousePressEvent ( QMouseEvent *e ); | 55 | void mousePressEvent ( QMouseEvent *e ); |
56 | void mouseReleaseEvent ( QMouseEvent *e ); | 56 | void mouseReleaseEvent ( QMouseEvent *e ); |
57 | 57 | ||
58 | signals: | 58 | signals: |
59 | void videoResized ( const QSize &s ); | 59 | void clicked(); |
60 | 60 | void videoResized ( const QSize &s ); | |
61 | |||
61 | private: | 62 | private: |
62 | QRect m_lastframe; | 63 | QRect m_lastframe; |
63 | QRect m_thisframe; | 64 | QRect m_thisframe; |
64 | 65 | ||
65 | uchar* m_buff; | 66 | uchar* m_buff; |
66 | int m_bytes_per_line_fb; | 67 | int m_bytes_per_line_fb; |