-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 38 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.h | 10 |
2 files changed, 23 insertions, 25 deletions
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index 41dddb7..c0039b1 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -97,12 +97,12 @@ MediaWidget( mediaPlayerState, parent, name ), scaledWidth( 0 ), scaledHeight( 0 | |||
97 | skin = cfg.readEntry("Skin","default"); | 97 | skin = cfg.readEntry("Skin","default"); |
98 | 98 | ||
99 | QString skinPath = "opieplayer2/skins/" + skin; | 99 | QString skinPath = "opieplayer2/skins/" + skin; |
100 | pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); | 100 | pixBg = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); |
101 | imgUp = new QImage( Resource::loadImage( QString("%1/skinV_up").arg(skinPath) ) ); | 101 | imgUp = QImage( Resource::loadImage( QString("%1/skinV_up").arg(skinPath) ) ); |
102 | imgDn = new QImage( Resource::loadImage( QString("%1/skinV_down").arg(skinPath) ) ); | 102 | imgDn = QImage( Resource::loadImage( QString("%1/skinV_down").arg(skinPath) ) ); |
103 | 103 | ||
104 | imgButtonMask = new QImage( imgUp->width(), imgUp->height(), 8, 255 ); | 104 | imgButtonMask = QImage( imgUp.width(), imgUp.height(), 8, 255 ); |
105 | imgButtonMask->fill( 0 ); | 105 | imgButtonMask.fill( 0 ); |
106 | 106 | ||
107 | for ( int i = 0; i < 7; i++ ) { | 107 | for ( int i = 0; i < 7; i++ ) { |
108 | QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath + "/skinV_mask_" + skinV_mask_file_names[i] + ".png" ); | 108 | QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath + "/skinV_mask_" + skinV_mask_file_names[i] + ".png" ); |
@@ -110,10 +110,10 @@ MediaWidget( mediaPlayerState, parent, name ), scaledWidth( 0 ), scaledHeight( 0 | |||
110 | 110 | ||
111 | if ( !masks[i]->isNull() ) { | 111 | if ( !masks[i]->isNull() ) { |
112 | QImage imgMask = masks[i]->convertToImage(); | 112 | QImage imgMask = masks[i]->convertToImage(); |
113 | uchar **dest = imgButtonMask->jumpTable(); | 113 | uchar **dest = imgButtonMask.jumpTable(); |
114 | for ( int y = 0; y < imgUp->height(); y++ ) { | 114 | for ( int y = 0; y < imgUp.height(); y++ ) { |
115 | uchar *line = dest[y]; | 115 | uchar *line = dest[y]; |
116 | for ( int x = 0; x < imgUp->width(); x++ ) { | 116 | for ( int x = 0; x < imgUp.width(); x++ ) { |
117 | if ( !qRed( imgMask.pixel( x, y ) ) ) | 117 | if ( !qRed( imgMask.pixel( x, y ) ) ) |
118 | line[x] = i + 1; | 118 | line[x] = i + 1; |
119 | } | 119 | } |
@@ -126,7 +126,7 @@ MediaWidget( mediaPlayerState, parent, name ), scaledWidth( 0 ), scaledHeight( 0 | |||
126 | buttonPixDown[i] = NULL; | 126 | buttonPixDown[i] = NULL; |
127 | } | 127 | } |
128 | 128 | ||
129 | setBackgroundPixmap( *pixBg ); | 129 | setBackgroundPixmap( pixBg ); |
130 | 130 | ||
131 | slider = new QSlider( Qt::Horizontal, this ); | 131 | slider = new QSlider( Qt::Horizontal, this ); |
132 | slider->setMinValue( 0 ); | 132 | slider->setMinValue( 0 ); |
@@ -150,10 +150,6 @@ VideoWidget::~VideoWidget() { | |||
150 | delete buttonPixDown[i]; | 150 | delete buttonPixDown[i]; |
151 | } | 151 | } |
152 | 152 | ||
153 | delete pixBg; | ||
154 | delete imgUp; | ||
155 | delete imgDn; | ||
156 | delete imgButtonMask; | ||
157 | for ( int i = 0; i < 7; i++ ) { | 153 | for ( int i = 0; i < 7; i++ ) { |
158 | delete masks[i]; | 154 | delete masks[i]; |
159 | } | 155 | } |
@@ -184,7 +180,7 @@ void VideoWidget::resizeEvent( QResizeEvent * ) { | |||
184 | slider->setGeometry( QRect( 15, h - 22, w - 90, 20 ) ); | 180 | slider->setGeometry( QRect( 15, h - 22, w - 90, 20 ) ); |
185 | slider->setBackgroundOrigin( QWidget::ParentOrigin ); | 181 | slider->setBackgroundOrigin( QWidget::ParentOrigin ); |
186 | slider->setFocusPolicy( QWidget::NoFocus ); | 182 | slider->setFocusPolicy( QWidget::NoFocus ); |
187 | slider->setBackgroundPixmap( *pixBg ); | 183 | slider->setBackgroundPixmap( pixBg ); |
188 | 184 | ||
189 | xoff = 0;// ( imgUp->width() ) / 2; | 185 | xoff = 0;// ( imgUp->width() ) / 2; |
190 | if(w>h) | 186 | if(w>h) |
@@ -193,8 +189,8 @@ void VideoWidget::resizeEvent( QResizeEvent * ) { | |||
193 | yoff = 185;//(( Vh - imgUp->height() ) / 2) - 10; | 189 | yoff = 185;//(( Vh - imgUp->height() ) / 2) - 10; |
194 | QPoint p( xoff, yoff ); | 190 | QPoint p( xoff, yoff ); |
195 | 191 | ||
196 | QPixmap *pixUp = combineVImageWithBackground( *imgUp, *pixBg, p ); | 192 | QPixmap *pixUp = combineVImageWithBackground( imgUp, pixBg, p ); |
197 | QPixmap *pixDn = combineVImageWithBackground( *imgDn, *pixBg, p ); | 193 | QPixmap *pixDn = combineVImageWithBackground( imgDn, pixBg, p ); |
198 | 194 | ||
199 | for ( int i = 0; i < 7; i++ ) { | 195 | for ( int i = 0; i < 7; i++ ) { |
200 | if ( !masks[i]->isNull() ) { | 196 | if ( !masks[i]->isNull() ) { |
@@ -291,9 +287,9 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
291 | int x = event->pos().x() - xoff; | 287 | int x = event->pos().x() - xoff; |
292 | int y = event->pos().y() - yoff; | 288 | int y = event->pos().y() - yoff; |
293 | 289 | ||
294 | bool isOnButton = ( x > 0 && y > 0 && x < imgButtonMask->width() | 290 | bool isOnButton = ( x > 0 && y > 0 && x < imgButtonMask.width() |
295 | && y < imgButtonMask->height() | 291 | && y < imgButtonMask.height() |
296 | && imgButtonMask->pixelIndex( x, y ) == i + 1 ); | 292 | && imgButtonMask.pixelIndex( x, y ) == i + 1 ); |
297 | 293 | ||
298 | if ( isOnButton && !videoButtons[i].isHeld ) { | 294 | if ( isOnButton && !videoButtons[i].isHeld ) { |
299 | videoButtons[i].isHeld = TRUE; | 295 | videoButtons[i].isHeld = TRUE; |
@@ -386,7 +382,7 @@ void VideoWidget::makeVisible() { | |||
386 | } else { | 382 | } else { |
387 | showNormal(); | 383 | showNormal(); |
388 | showMaximized(); | 384 | showMaximized(); |
389 | setBackgroundPixmap( *pixBg ); | 385 | setBackgroundPixmap( pixBg ); |
390 | QWidget *d = QApplication::desktop(); | 386 | QWidget *d = QApplication::desktop(); |
391 | int w = d->width(); | 387 | int w = d->width(); |
392 | int h = d->height(); | 388 | int h = d->height(); |
@@ -431,7 +427,7 @@ void VideoWidget::paintEvent( QPaintEvent * pe) { | |||
431 | QPixmap pix( pe->rect().size() ); | 427 | QPixmap pix( pe->rect().size() ); |
432 | QPainter p( &pix ); | 428 | QPainter p( &pix ); |
433 | p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() ); | 429 | p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() ); |
434 | p.drawTiledPixmap( pe->rect(), *pixBg, pe->rect().topLeft() ); | 430 | p.drawTiledPixmap( pe->rect(), pixBg, pe->rect().topLeft() ); |
435 | for ( int i = 0; i < numVButtons; i++ ) { | 431 | for ( int i = 0; i < numVButtons; i++ ) { |
436 | paintButton( &p, i ); | 432 | paintButton( &p, i ); |
437 | } | 433 | } |
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h index 149c78e..ae0e687 100644 --- a/noncore/multimedia/opieplayer2/videowidget.h +++ b/noncore/multimedia/opieplayer2/videowidget.h | |||
@@ -35,6 +35,8 @@ | |||
35 | #define VIDEO_WIDGET_H | 35 | #define VIDEO_WIDGET_H |
36 | 36 | ||
37 | #include <qwidget.h> | 37 | #include <qwidget.h> |
38 | #include <qimage.h> | ||
39 | #include <qpixmap.h> | ||
38 | #include "xinevideowidget.h" | 40 | #include "xinevideowidget.h" |
39 | 41 | ||
40 | #include "mediawidget.h" | 42 | #include "mediawidget.h" |
@@ -95,10 +97,10 @@ protected: | |||
95 | 97 | ||
96 | private: | 98 | private: |
97 | // Ticker songInfo; | 99 | // Ticker songInfo; |
98 | QPixmap *pixBg; | 100 | QPixmap pixBg; |
99 | QImage *imgUp; | 101 | QImage imgUp; |
100 | QImage *imgDn; | 102 | QImage imgDn; |
101 | QImage *imgButtonMask; | 103 | QImage imgButtonMask; |
102 | QBitmap *masks[7]; | 104 | QBitmap *masks[7]; |
103 | QPixmap *buttonPixUp[7]; | 105 | QPixmap *buttonPixUp[7]; |
104 | QPixmap *buttonPixDown[7]; | 106 | QPixmap *buttonPixDown[7]; |