summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/multimedia/opieplayer/videowidget.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/core/multimedia/opieplayer/videowidget.cpp b/core/multimedia/opieplayer/videowidget.cpp
index e851044..2396ed5 100644
--- a/core/multimedia/opieplayer/videowidget.cpp
+++ b/core/multimedia/opieplayer/videowidget.cpp
@@ -89,3 +89,2 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
89 89
90 // odebug << "skin path " + skinPath << oendl;
91 90
@@ -118,3 +117,2 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
118 } 117 }
119 // odebug << "finished loading first pics" << oendl;
120 for ( int i = 0; i < 7; i++ ) { 118 for ( int i = 0; i < 7; i++ ) {
@@ -124,3 +122,2 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
124 122
125
126 QWidget *d = QApplication::desktop(); 123 QWidget *d = QApplication::desktop();
@@ -130,3 +127,2 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
130 if( (width != pixBg->width() ) || (height != pixBg->height() ) ) { 127 if( (width != pixBg->width() ) || (height != pixBg->height() ) ) {
131// odebug << "<<<<<<<< scale image >>>>>>>>>>>>" << oendl;
132 QImage img; 128 QImage img;
@@ -135,6 +131,5 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
135 } 131 }
136 setBackgroundPixmap( *pixBg );
137 132
133 setBackgroundPixmap( *pixBg );
138 currentFrame = new QImage( 220 + 2, 160, (QPixmap::defaultDepth() == 16) ? 16 : 32 ); 134 currentFrame = new QImage( 220 + 2, 160, (QPixmap::defaultDepth() == 16) ? 16 : 32 );
139
140 slider = new QSlider( Qt::Horizontal, this ); 135 slider = new QSlider( Qt::Horizontal, this );
@@ -142,3 +137,4 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
142 slider->setMaxValue( 1 ); 137 slider->setMaxValue( 1 );
143 slider->setBackgroundPixmap( Resource::loadPixmap( backgroundPix ) ); 138
139 slider->setBackgroundPixmap( *pixBg );
144 slider->setFocusPolicy( QWidget::NoFocus ); 140 slider->setFocusPolicy( QWidget::NoFocus );
@@ -160,4 +156,5 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
160 setFullscreen( mediaPlayerState->fullscreen() ); 156 setFullscreen( mediaPlayerState->fullscreen() );
161// setPaused( mediaPlayerState->paused() ); 157// setPlaying( mediaPlayerState->playing() );
162 setPlaying( mediaPlayerState->playing() ); 158 // if(this->x() < 0 || this->y() < 0)
159 // this->move(0,0);
163} 160}
@@ -474,2 +471,6 @@ bool VideoWidget::playVideo() {
474 471
472 QWidget *d = QApplication::desktop();
473 int d_width = d->width();
474 int d_height = d->height();
475
475 ColorFormat format = (dd == 16) ? RGB565 : BGRA8888; 476 ColorFormat format = (dd == 16) ? RGB565 : BGRA8888;
@@ -485,4 +486,4 @@ bool VideoWidget::playVideo() {
485 486
486 w = 320; 487 w = d_width; //320;
487 h = 240; 488 h = d_height; //240;
488 489
@@ -527,5 +528,4 @@ bool VideoWidget::playVideo() {
527 QPainter p(this); 528 QPainter p(this);
528 529 w = d_width; //320;
529 w = 320; 530 h = d_height; //240;
530 h = 240;
531 531