summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp1
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp20
2 files changed, 4 insertions, 17 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index cd53748..cce445b 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -1,8 +1,7 @@
-// code added by L. J. Potter Sat 03-02-2002 06:17:54
#define QTOPIA_INTERNAL_FSLP
#include <qpe/qcopenvelope_qws.h>
#include <qpe/qpemenubar.h>
#include <qpe/qpetoolbar.h>
#include <qpe/fileselector.h>
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index d3898a0..bce6b89 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -119,14 +119,14 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
setLength( mediaPlayerState->length() );
setPosition( mediaPlayerState->position() );
setFullscreen( mediaPlayerState->fullscreen() );
setPaused( mediaPlayerState->paused() );
setPlaying( mediaPlayerState->playing() );
- videoFrame = new XineVideoWidget( 200, 150 ,this, "Video frame" );
- videoFrame->setGeometry( QRect( 10, 20, 220, 160 ) );
+ videoFrame = new XineVideoWidget( 240, 155 ,this, "Video frame" );
+ videoFrame->setGeometry( QRect( 0, 15 , 240 ,170 ) );
}
VideoWidget::~VideoWidget() {
for ( int i = 0; i < 3; i++ ) {
delete pixmaps[i];
@@ -285,34 +285,22 @@ void VideoWidget::makeVisible() {
void VideoWidget::paintEvent( QPaintEvent * ) {
QPainter p( this );
if ( mediaPlayerState->fullscreen() ) {
// Clear the background
-// p.setBrush( QBrush( Qt::black ) );
- //p.drawRect( rect() );
+ p.setBrush( QBrush( Qt::black ) );
+ videoFrame->setGeometry( QRect( 0, 0 , 240 ,340 ) );
} else {
- // draw border
- qDrawShadePanel( &p, 4, 15, 230, 170, colorGroup(), TRUE, 5, NULL );
-
- // Clear the movie screen first
-// p.setBrush( QBrush( Qt::black ) );
-// p.drawRect( 9, 20, 220, 160 );
-
- // draw current frame (centrally positioned from scaling to maintain aspect ratio)
- //p.drawImage( 9 + (220 - scaledWidth) / 2, 20 + (160 - scaledHeight) / 2, *currentFrame, 0, 0, scaledWidth, scaledHeight );
-
// draw the buttons
for ( int i = 0; i < numButtons; i++ ) {
paintButton( &p, i );
}
-
// draw the slider
slider->repaint( TRUE );
-// videoFrame->repaint( TRUE );
}
}
void VideoWidget::closeEvent( QCloseEvent* ) {
mediaPlayerState->setList();