summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayer.cpp2
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp37
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.h1
-rw-r--r--noncore/multimedia/opieplayer2/xinevideowidget.cpp68
-rw-r--r--noncore/multimedia/opieplayer2/xinevideowidget.h15
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
@@ -73,3 +73,3 @@ void MediaPlayer::setPlaying( bool play ) {
if ( !play ) {
- //mediaPlayerState->setPaused( TRUE );
+ // mediaPlayerState->setPaused( FALSE );
return;
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
@@ -86,3 +86,5 @@ QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) {
videoFrame = new XineVideoWidget ( this, "Video frame" );
+
connect ( videoFrame, SIGNAL( videoResized ( const QSize & )), this, SIGNAL( videoResized ( const QSize & )));
+ connect ( videoFrame, SIGNAL( clicked () ), this, SLOT ( backToNormal() ) );
@@ -345,4 +347,3 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
} else {
- // setToggleButton( i, TRUE );
- // mediaPlayerState->setPlaying( videoButtons[i].isDown );
+ return;
}
@@ -380,16 +381,22 @@ void VideoWidget::showEvent( QShowEvent* ) {
+ void VideoWidget::backToNormal() {
+ mediaPlayerState->setFullscreen( FALSE );
+ makeVisible();
+ }
+
void VideoWidget::makeVisible() {
- if ( mediaPlayerState->fullscreen() ) {
- setBackgroundMode( QWidget::NoBackground );
- showFullScreen();
- resize( qApp->desktop()->size() );
- slider->hide();
- videoFrame-> setGeometry ( 0, 0, width ( ), height ( ));
- } else {
- showNormal();
- showMaximized();
- slider->show();
- videoFrame->setGeometry( QRect( 10, 20, 220, 160 ) );
- qApp->processEvents();
- }
+ if ( mediaPlayerState->fullscreen() ) {
+ setBackgroundMode( QWidget::NoBackground );
+ showFullScreen();
+ resize( qApp->desktop()->size() );
+ slider->hide();
+ videoFrame-> setGeometry ( 0, 0, width ( ), height ( ));
+
+ } else {
+ showNormal();
+ showMaximized();
+ slider->show();
+ videoFrame->setGeometry( QRect( 0, 30, 240, 170 ) );
+ qApp->processEvents();
+ }
}
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
@@ -68,2 +68,3 @@ public slots:
void makeVisible();
+ void backToNormal();
void setPosition( long );
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 @@
                This file is part of the Opie Project
-
+
              Copyright (c) 2002 Max Reiss <harlekin@handhelds.org>
@@ -31,3 +31,3 @@
Boston, MA 02111-1307, USA.
-
+
*/
@@ -52,3 +52,3 @@ static inline void memcpy_rev ( void *dst, void *src, size_t len )
- len >>= 1;
+ len >>= 1;
while ( len-- )
@@ -69,5 +69,5 @@ static inline void memcpy_step_rev ( void *dst, void *src, size_t len, size_t st
len >>= 1;
-
+
((char *) src ) += ( len * step );
-
+
while ( len-- ) {
@@ -115,5 +115,5 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
// qWarning ( "paintevent\n" );
-
+
QArray <QRect> qt_bug_workaround_clip_rects;
-
+
{
@@ -125,5 +125,5 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
uchar *frame = m_buff; // rot == 0 ? m_buff : m_buff + ( m_thisframe. height ( ) - 1 ) * m_bytes_per_line_frame;
-
+
QRect framerect = qt_screen-> mapToDevice ( QRect ( mapToGlobal ( m_thisframe. topLeft ( )), m_thisframe. size ( )), QSize ( qt_screen-> width ( ), qt_screen-> height ( )));
-
+
qt_bug_workaround_clip_rects. resize ( dp. numRects ( ));
@@ -132,8 +132,8 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
const QRect &clip = dp. rect ( i );
-
+
qt_bug_workaround_clip_rects [i] = qt_screen-> mapFromDevice ( clip, QSize ( qt_screen-> width ( ), qt_screen-> height ( )));
-
- uchar *dst = fb + ( clip. x ( ) * m_bytes_per_pixel ) + ( clip. y ( ) * m_bytes_per_line_fb );
+
+ uchar *dst = fb + ( clip. x ( ) * m_bytes_per_pixel ) + ( clip. y ( ) * m_bytes_per_line_fb );
uchar *src = frame;
-
+
switch ( rot ) {
@@ -149,3 +149,3 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
uint clipwidth = clip. width ( ) * m_bytes_per_pixel;
-
+
if ( clip. left ( ) < framerect. left ( ))
@@ -154,3 +154,3 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
rightfill = (( clip. right ( ) - framerect. right ( )) * m_bytes_per_pixel ) <? clipwidth;
-
+
framefill = clipwidth - ( leftfill + rightfill );
@@ -164,3 +164,3 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
memset ( dst, 0, leftfill );
-
+
if ( framefill ) {
@@ -172,3 +172,3 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
}
- }
+ }
if ( rightfill )
@@ -176,5 +176,5 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
}
-
+
dst += m_bytes_per_line_fb;
-
+
switch ( rot ) {
@@ -188,3 +188,3 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
}
- //qWarning ( " ||| painting |||" );
+ //qWarning ( " ||| painting |||" );
{
@@ -193,3 +193,3 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
- for ( int i = qt_bug_workaround_clip_rects. size ( ) - 1; i >= 0; i-- ) {
+ for ( int i = qt_bug_workaround_clip_rects. size ( ) - 1; i >= 0; i-- ) {
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 * )
bool fs = ( s == qApp-> desktop ( )-> size ( ));
-
+
m_rotation = fs ? -qt_screen-> transformOrientation ( ) : 0;
-
+
if ( fs && qt_screen-> isTransformed ( )) {
- s = qt_screen-> mapToDevice ( s );
+ s = qt_screen-> mapToDevice ( s );
}
@@ -241,3 +241,3 @@ void XineVideoWidget::resizeEvent ( QResizeEvent * )
// qDebug ( "\n\nResize: %dx%d, Rot: %d", s.width(),s.height(),m_rotation );
-
+
emit videoResized ( s );
@@ -249,7 +249,8 @@ void XineVideoWidget::mousePressEvent ( QMouseEvent *me )
QWidget *p = parentWidget ( );
-
+
if ( p ) {
- QMouseEvent pme ( QEvent::MouseButtonPress, mapToParent ( me-> pos ( )), me-> globalPos ( ), me-> button ( ), me-> state ( ));
-
- QApplication::sendEvent ( p, &pme );
+ // QMouseEvent pme ( QEvent::MouseButtonPress, mapToParent ( me-> pos ( )), me-> globalPos ( ), me-> button ( ), me-> state ( ));
+
+ // QApplication::sendEvent ( p, &pme );
+ // emit clicked();
}
@@ -260,7 +261,8 @@ void XineVideoWidget::mouseReleaseEvent ( QMouseEvent *me )
QWidget *p = parentWidget ( );
-
+
if ( p ) {
- QMouseEvent pme ( QEvent::MouseButtonRelease, mapToParent ( me-> pos ( )), me-> globalPos ( ), me-> button ( ), me-> state ( ));
-
- QApplication::sendEvent ( p, &pme );
+ // QMouseEvent pme ( QEvent::MouseButtonRelease, mapToParent ( me-> pos ( )), me-> globalPos ( ), me-> button ( ), me-> state ( ));
+
+ // QApplication::sendEvent ( p, &pme );
+ emit clicked();
}
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
@@ -49,3 +49,3 @@ public:
void clear() ;
-
+
protected:
@@ -54,11 +54,12 @@ protected:
- void mousePressEvent ( QMouseEvent *e );
- void mouseReleaseEvent ( QMouseEvent *e );
+ void mousePressEvent ( QMouseEvent *e );
+ void mouseReleaseEvent ( QMouseEvent *e );
signals:
- void videoResized ( const QSize &s );
-
+ void clicked();
+ void videoResized ( const QSize &s );
+
private:
- QRect m_lastframe;
- QRect m_thisframe;
+ QRect m_lastframe;
+ QRect m_thisframe;