summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-08-11 12:26:54 (UTC)
committer harlekin <harlekin>2002-08-11 12:26:54 (UTC)
commitc7c84fd736d1ae29f0d9e51f781e1d94f0c39334 (patch) (side-by-side diff)
tree830ed00d66ae074ca6db8ddd820ab2a68d1a1a2b
parentc20e4302b915bcba07b468874e9795d37d2eaa03 (diff)
downloadopie-c7c84fd736d1ae29f0d9e51f781e1d94f0c39334.zip
opie-c7c84fd736d1ae29f0d9e51f781e1d94f0c39334.tar.gz
opie-c7c84fd736d1ae29f0d9e51f781e1d94f0c39334.tar.bz2
make it compile again
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index a4e6b6e..9b88299 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -172,49 +172,49 @@ QPixmap *combineVImageWithBackground( QImage img, QPixmap bg, QPoint offset ) {
p.drawTiledPixmap( pix.rect(), bg, offset );
p.drawImage( 0, 0, img );
return new QPixmap( pix );
}
QPixmap *maskVPixToMask( QPixmap pix, QBitmap mask ) {
QPixmap *pixmap = new QPixmap( pix );
pixmap->setMask( mask );
return pixmap;
}
void VideoWidget::resizeEvent( QResizeEvent * ) {
int h = height();
int w = width();
int Vh = 160;
//videoFrame->height();
int Vw = 220;
//videoFrame->width();
// songInfo.setGeometry( QRect( 2, 10, w - 4, 20 ) );
slider->setFixedWidth( w - 110 );
slider->setGeometry( QRect( 15, h - 30, w - 90, 20 ) );
slider->setBackgroundOrigin( QWidget::ParentOrigin );
slider->setFocusPolicy( QWidget::NoFocus );
-make slider->setBackgroundPixmap( *pixBg );
+ slider->setBackgroundPixmap( *pixBg );
// time.setGeometry( QRect( w - 85, h - 30, 70, 20 ) );
xoff = 0;// ( imgUp->width() ) / 2;
yoff = 180;//(( Vh - imgUp->height() ) / 2) - 10;
QPoint p( xoff, yoff );
QPixmap *pixUp = combineVImageWithBackground( *imgUp, *pixBg, p );
QPixmap *pixDn = combineVImageWithBackground( *imgDn, *pixBg, p );
for ( int i = 0; i < 7; i++ ) {
if ( !masks[i]->isNull() ) {
delete buttonPixUp[i];
delete buttonPixDown[i];
buttonPixUp[i] = maskVPixToMask( *pixUp, *masks[i] );
buttonPixDown[i] = maskVPixToMask( *pixDn, *masks[i] );
}
}
delete pixUp;
delete pixDn;
}
static bool videoSliderBeingMoved = FALSE;
@@ -440,27 +440,27 @@ void VideoWidget::keyReleaseEvent( QKeyEvent *e) {
break;
case Key_Up:
// toggleButton(5);
// emit moreClicked();
// emit moreReleased();
// toggleButton(5);
break;
case Key_Right:
mediaPlayerState->setNext();
break;
case Key_Left:
mediaPlayerState->setPrev();
break;
case Key_Escape:
break;
};
}
XineVideoWidget* VideoWidget::vidWidget() {
return videoFrame;
}
-void VideoWidget::setFullscreen ( bool b ) {
+void VideoWidget::setFullscreen ( bool b ) {
setToggleButton( VideoFullscreen, b );
}