Diffstat (limited to 'noncore/multimedia/opieplayer2/videowidget.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 226 |
1 files changed, 154 insertions, 72 deletions
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index 188b18d..419c3ae 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -34,2 +34,3 @@ | |||
34 | #include <qpe/resource.h> | 34 | #include <qpe/resource.h> |
35 | #include <qpe/mediaplayerplugininterface.h> | ||
35 | #include <qpe/config.h> | 36 | #include <qpe/config.h> |
@@ -60,19 +61,18 @@ static const int yo = 0; // movable y offset | |||
60 | struct MediaButton { | 61 | struct MediaButton { |
61 | int xPos, yPos; | ||
62 | bool isToggle, isHeld, isDown; | 62 | bool isToggle, isHeld, isDown; |
63 | int controlType; | ||
64 | }; | 63 | }; |
65 | 64 | ||
66 | |||
67 | // Layout information for the videoButtons (and if it is a toggle button or not) | ||
68 | MediaButton videoButtons[] = { | 65 | MediaButton videoButtons[] = { |
69 | { 5+0*32+xo, 200+yo, FALSE, FALSE, FALSE, 4 }, // previous | 66 | { FALSE, FALSE, FALSE }, // previous |
70 | { 5+1*32+xo, 200+yo, FALSE, FALSE, FALSE, 1 }, // stop | 67 | { FALSE, FALSE, FALSE }, // stop |
71 | { 5+2*32+xo, 200+yo, TRUE, FALSE, FALSE, 0 }, // play | 68 | { TRUE, FALSE, FALSE }, // play |
72 | { 5+3*32+xo, 200+yo, TRUE, FALSE, FALSE, 2 }, // pause | 69 | { TRUE, FALSE, FALSE }, // pause |
73 | { 5+4*32+xo, 200+yo, FALSE, FALSE, FALSE, 3 }, // next | 70 | { FALSE, FALSE, FALSE }, // next |
74 | { 5+5*32+xo, 200+yo, FALSE, FALSE, FALSE, 8 }, // playlist | 71 | { FALSE, FALSE, FALSE }, // playlist |
75 | { 5+6*32+xo, 200+yo, TRUE, FALSE, FALSE, 9 } // fullscreen | 72 | { TRUE, FALSE, FALSE } // fullscreen |
76 | }; | 73 | }; |
77 | 74 | ||
75 | const char *skinV_mask_file_names[7] = { | ||
76 | "stop","play","back","fwd","up","down","full" | ||
77 | }; | ||
78 | 78 | ||
@@ -84,20 +84,42 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) : | |||
84 | setCaption( tr("OpiePlayer - Video") ); | 84 | setCaption( tr("OpiePlayer - Video") ); |
85 | |||
86 | videoFrame = new XineVideoWidget ( this, "Video frame" ); | ||
87 | connect ( videoFrame, SIGNAL( videoResized ( const QSize & )), this, SIGNAL( videoResized ( const QSize & ))); | ||
88 | |||
85 | Config cfg("OpiePlayer"); | 89 | Config cfg("OpiePlayer"); |
86 | cfg.setGroup("VideoWidget"); | 90 | cfg.setGroup("VideoWidget"); |
91 | skin = cfg.readEntry("Skin","default"); | ||
87 | 92 | ||
88 | QString Button0aPix, Button0bPix, controlsPix; | 93 | QString skinPath = "opieplayer2/skins/" + skin; |
89 | Button0aPix=cfg.readEntry( "Button0aPix", "opieplayer/mediaButton0a"); | 94 | pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); |
90 | Button0bPix=cfg.readEntry( "Button0bPix","opieplayer/mediaButton0b"); | 95 | imgUp = new QImage( Resource::loadImage( QString("%1/skinV_up").arg(skinPath) ) ); |
91 | controlsPix=cfg.readEntry( "controlsPix","opieplayer/mediaControls0" ); | 96 | imgDn = new QImage( Resource::loadImage( QString("%1/skinV_down").arg(skinPath) ) ); |
92 | 97 | ||
93 | cfg.setGroup("AudioWidget"); | 98 | imgButtonMask = new QImage( imgUp->width(), imgUp->height(), 8, 255 ); |
94 | QString skin = cfg.readEntry("Skin","default"); | 99 | imgButtonMask->fill( 0 ); |
95 | QString skinPath = "opieplayer/skins/" + skin; | ||
96 | backgroundPix = QString("%1/background").arg(skinPath) ; | ||
97 | 100 | ||
98 | setBackgroundPixmap( Resource::loadPixmap( backgroundPix) ); | 101 | for ( int i = 0; i < 7; i++ ) { |
99 | pixmaps[0] = new QPixmap( Resource::loadPixmap( Button0aPix ) ); | 102 | QString filename = QString(getenv("OPIEDIR")) + "/pics/" + skinPath + "/skinV_mask_" + skinV_mask_file_names[i] + ".png"; |
100 | pixmaps[1] = new QPixmap( Resource::loadPixmap( Button0bPix ) ); | 103 | masks[i] = new QBitmap( filename ); |
101 | pixmaps[2] = new QPixmap( Resource::loadPixmap( controlsPix) ); | 104 | qDebug(filename); |
102 | currentFrame = new QImage( 220 + 2, 160, (QPixmap::defaultDepth() == 16) ? 16 : 32 ); | 105 | if ( !masks[i]->isNull() ) { |
106 | QImage imgMask = masks[i]->convertToImage(); | ||
107 | uchar **dest = imgButtonMask->jumpTable(); | ||
108 | for ( int y = 0; y < imgUp->height(); y++ ) { | ||
109 | uchar *line = dest[y]; | ||
110 | for ( int x = 0; x < imgUp->width(); x++ ) { | ||
111 | if ( !qRed( imgMask.pixel( x, y ) ) ) | ||
112 | line[x] = i + 1; | ||
113 | } | ||
114 | } | ||
115 | } | ||
116 | |||
117 | } | ||
118 | |||
119 | for ( int i = 0; i < 7; i++ ) { | ||
120 | buttonPixUp[i] = NULL; | ||
121 | buttonPixDown[i] = NULL; | ||
122 | } | ||
123 | |||
124 | setBackgroundPixmap( *pixBg ); | ||
103 | 125 | ||
@@ -106,5 +128,3 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) : | |||
106 | slider->setMaxValue( 1 ); | 128 | slider->setMaxValue( 1 ); |
107 | 129 | slider->setBackgroundPixmap( Resource::loadPixmap( backgroundPix ) ); | |
108 | slider->setBackgroundPixmap( *this->backgroundPixmap () ); //Resource::loadPixmap( backgroundPix ) ); | ||
109 | slider->setBackgroundOrigin( QWidget::ParentOrigin); | ||
110 | slider->setFocusPolicy( QWidget::NoFocus ); | 130 | slider->setFocusPolicy( QWidget::NoFocus ); |
@@ -112,6 +132,2 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) : | |||
112 | 132 | ||
113 | videoFrame = new XineVideoWidget ( this, "Video frame" ); | ||
114 | |||
115 | connect ( videoFrame, SIGNAL( videoResized ( const QSize & )), this, SIGNAL( videoResized ( const QSize & ))); | ||
116 | |||
117 | connect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); | 133 | connect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); |
@@ -126,9 +142,10 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) : | |||
126 | 142 | ||
127 | // Intialise state | ||
128 | setLength( mediaPlayerState->length() ); | 143 | setLength( mediaPlayerState->length() ); |
129 | setPosition( mediaPlayerState->position() ); | 144 | setPosition( mediaPlayerState->position() ); |
130 | setFullscreen( mediaPlayerState->fullscreen() ); | 145 | |
146 | ////////////////////////// FIXME | ||
147 | // setFullscreen( mediaPlayerState->fullscreen() ); | ||
131 | setPaused( mediaPlayerState->paused() ); | 148 | setPaused( mediaPlayerState->paused() ); |
132 | setPlaying( mediaPlayerState->playing() ); | 149 | setPlaying( mediaPlayerState->playing() ); |
133 | 150 | qDebug("finished videowidget"); | |
134 | } | 151 | } |
@@ -137,11 +154,64 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) : | |||
137 | VideoWidget::~VideoWidget() { | 154 | VideoWidget::~VideoWidget() { |
138 | for ( int i = 0; i < 3; i++ ) { | 155 | for ( int i = 0; i < 7; i++ ) { |
139 | delete pixmaps[i]; | 156 | delete buttonPixUp[i]; |
157 | delete buttonPixDown[i]; | ||
158 | } | ||
159 | |||
160 | delete pixBg; | ||
161 | delete imgUp; | ||
162 | delete imgDn; | ||
163 | delete imgButtonMask; | ||
164 | for ( int i = 0; i < 7; i++ ) { | ||
165 | delete masks[i]; | ||
140 | } | 166 | } |
141 | delete currentFrame; | ||
142 | } | 167 | } |
143 | 168 | ||
169 | QPixmap *combineVImageWithBackground( QImage img, QPixmap bg, QPoint offset ) { | ||
170 | QPixmap pix( img.width(), img.height() ); | ||
171 | QPainter p( &pix ); | ||
172 | p.drawTiledPixmap( pix.rect(), bg, offset ); | ||
173 | p.drawImage( 0, 0, img ); | ||
174 | return new QPixmap( pix ); | ||
175 | } | ||
144 | 176 | ||
145 | static bool videoSliderBeingMoved = FALSE; | 177 | QPixmap *maskVPixToMask( QPixmap pix, QBitmap mask ) { |
178 | QPixmap *pixmap = new QPixmap( pix ); | ||
179 | pixmap->setMask( mask ); | ||
180 | return pixmap; | ||
181 | } | ||
182 | |||
183 | void VideoWidget::resizeEvent( QResizeEvent * ) { | ||
184 | int h = height(); | ||
185 | int w = width(); | ||
186 | int Vh = 160; | ||
187 | //videoFrame->height(); | ||
188 | int Vw = 220; | ||
189 | //videoFrame->width(); | ||
190 | // songInfo.setGeometry( QRect( 2, 10, w - 4, 20 ) ); | ||
191 | |||
192 | slider->setFixedWidth( w - 110 ); | ||
193 | slider->setGeometry( QRect( 15, h - 30, w - 90, 20 ) ); | ||
194 | slider->setBackgroundOrigin( QWidget::ParentOrigin ); | ||
195 | // time.setGeometry( QRect( w - 85, h - 30, 70, 20 ) ); | ||
196 | xoff = 0;// ( imgUp->width() ) / 2; | ||
197 | yoff = 180;//(( Vh - imgUp->height() ) / 2) - 10; | ||
198 | QPoint p( xoff, yoff ); | ||
199 | |||
200 | QPixmap *pixUp = combineVImageWithBackground( *imgUp, *pixBg, p ); | ||
201 | QPixmap *pixDn = combineVImageWithBackground( *imgDn, *pixBg, p ); | ||
202 | |||
203 | for ( int i = 0; i < 7; i++ ) { | ||
204 | if ( !masks[i]->isNull() ) { | ||
205 | delete buttonPixUp[i]; | ||
206 | delete buttonPixDown[i]; | ||
207 | buttonPixUp[i] = maskVPixToMask( *pixUp, *masks[i] ); | ||
208 | buttonPixDown[i] = maskVPixToMask( *pixDn, *masks[i] ); | ||
209 | } | ||
210 | } | ||
211 | |||
212 | delete pixUp; | ||
213 | delete pixDn; | ||
214 | } | ||
146 | 215 | ||
216 | static bool videoSliderBeingMoved = FALSE; | ||
147 | 217 | ||
@@ -151,3 +221,2 @@ void VideoWidget::sliderPressed() { | |||
151 | 221 | ||
152 | |||
153 | void VideoWidget::sliderReleased() { | 222 | void VideoWidget::sliderReleased() { |
@@ -161,3 +230,2 @@ void VideoWidget::sliderReleased() { | |||
161 | 230 | ||
162 | |||
163 | void VideoWidget::setPosition( long i ) { | 231 | void VideoWidget::setPosition( long i ) { |
@@ -171,3 +239,2 @@ void VideoWidget::setLength( long max ) { | |||
171 | 239 | ||
172 | |||
173 | void VideoWidget::setView( char view ) { | 240 | void VideoWidget::setView( char view ) { |
@@ -183,3 +250,2 @@ void VideoWidget::setView( char view ) { | |||
183 | 250 | ||
184 | |||
185 | void VideoWidget::updateSlider( long i, long max ) { | 251 | void VideoWidget::updateSlider( long i, long max ) { |
@@ -201,3 +267,2 @@ void VideoWidget::updateSlider( long i, long max ) { | |||
201 | 267 | ||
202 | |||
203 | void VideoWidget::setToggleButton( int i, bool down ) { | 268 | void VideoWidget::setToggleButton( int i, bool down ) { |
@@ -208,3 +273,2 @@ void VideoWidget::setToggleButton( int i, bool down ) { | |||
208 | 273 | ||
209 | |||
210 | void VideoWidget::toggleButton( int i ) { | 274 | void VideoWidget::toggleButton( int i ) { |
@@ -215,11 +279,9 @@ void VideoWidget::toggleButton( int i ) { | |||
215 | 279 | ||
216 | |||
217 | void VideoWidget::paintButton( QPainter *p, int i ) { | 280 | void VideoWidget::paintButton( QPainter *p, int i ) { |
218 | int x = videoButtons[i].xPos; | ||
219 | int y = videoButtons[i].yPos; | ||
220 | int offset = 10 + videoButtons[i].isDown; | ||
221 | p->drawPixmap( x, y, *pixmaps[videoButtons[i].isDown] ); | ||
222 | p->drawPixmap( x + 1 + offset, y + offset, *pixmaps[2], 9 * videoButtons[i].controlType, 0, 9, 9 ); | ||
223 | } | ||
224 | 281 | ||
282 | if ( videoButtons[i].isDown ) | ||
283 | p->drawPixmap( xoff, yoff, *buttonPixDown[i] ); | ||
284 | else | ||
285 | p->drawPixmap( xoff, yoff, *buttonPixUp[i] ); | ||
286 | } | ||
225 | 287 | ||
@@ -227,12 +289,9 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
227 | for ( int i = 0; i < numButtons; i++ ) { | 289 | for ( int i = 0; i < numButtons; i++ ) { |
228 | int x = videoButtons[i].xPos; | ||
229 | int y = videoButtons[i].yPos; | ||
230 | if ( event->state() == QMouseEvent::LeftButton ) { | 290 | if ( event->state() == QMouseEvent::LeftButton ) { |
231 | // The test to see if the mouse click is inside the circular button or not | 291 | // The test to see if the mouse click is inside the button or not |
232 | // (compared with the radius squared to avoid a square-root of our distance) | 292 | int x = event->pos().x() - xoff; |
233 | int radius = 16; | 293 | int y = event->pos().y() - yoff; |
234 | QPoint center = QPoint( x + radius, y + radius ); | 294 | |
235 | QPoint dXY = center - event->pos(); | 295 | bool isOnButton = ( x > 0 && y > 0 && x < imgButtonMask->width() |
236 | int dist = dXY.x() * dXY.x() + dXY.y() * dXY.y(); | 296 | && y < imgButtonMask->height() && imgButtonMask->pixelIndex( x, y ) == i + 1 ); |
237 | bool isOnButton = dist <= (radius * radius); | ||
238 | if ( isOnButton != videoButtons[i].isHeld ) { | 297 | if ( isOnButton != videoButtons[i].isHeld ) { |
@@ -246,5 +305,3 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
246 | setToggleButton( i, FALSE ); | 305 | setToggleButton( i, FALSE ); |
247 | qDebug("button toggled3 %d",i); | ||
248 | } | 306 | } |
249 | |||
250 | } | 307 | } |
@@ -263,3 +320,2 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
263 | 320 | ||
264 | |||
265 | void VideoWidget::mousePressEvent( QMouseEvent *event ) { | 321 | void VideoWidget::mousePressEvent( QMouseEvent *event ) { |
@@ -268,3 +324,2 @@ void VideoWidget::mousePressEvent( QMouseEvent *event ) { | |||
268 | 324 | ||
269 | |||
270 | void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) { | 325 | void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) { |
@@ -296,3 +351,3 @@ void VideoWidget::makeVisible() { | |||
296 | 351 | ||
297 | void VideoWidget::paintEvent( QPaintEvent * ) { | 352 | void VideoWidget::paintEvent( QPaintEvent * pe) { |
298 | QPainter p( this ); | 353 | QPainter p( this ); |
@@ -309,7 +364,22 @@ void VideoWidget::paintEvent( QPaintEvent * ) { | |||
309 | 364 | ||
310 | for ( int i = 0; i < numButtons; i++ ) { | 365 | if ( !pe->erased() ) { |
366 | // Combine with background and double buffer | ||
367 | QPixmap pix( pe->rect().size() ); | ||
368 | QPainter p( &pix ); | ||
369 | p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() ); | ||
370 | p.drawTiledPixmap( pe->rect(), *pixBg, pe->rect().topLeft() ); | ||
371 | for ( int i = 0; i < numButtons; i++ ) | ||
372 | paintButton( &p, i ); | ||
373 | QPainter p2( this ); | ||
374 | p2.drawPixmap( pe->rect().topLeft(), pix ); | ||
375 | } else { | ||
376 | QPainter p( this ); | ||
377 | for ( int i = 0; i < numButtons; i++ ) | ||
311 | paintButton( &p, i ); | 378 | paintButton( &p, i ); |
312 | } | 379 | } |
313 | // draw the slider | 380 | // for ( int i = 0; i < numButtons; i++ ) { |
314 | slider->repaint( TRUE ); | 381 | // paintButton( &p, i ); |
382 | // } | ||
383 | // // draw the slider | ||
384 | // slider->repaint( TRUE ); | ||
315 | } | 385 | } |
@@ -323,5 +393,17 @@ void VideoWidget::closeEvent( QCloseEvent* ) { | |||
323 | 393 | ||
394 | bool VideoWidget::playVideo() { | ||
395 | bool result = FALSE; | ||
396 | |||
397 | int stream = 0; | ||
398 | |||
399 | int sw = 240; | ||
400 | int sh = 320; | ||
401 | int dd = QPixmap::defaultDepth(); | ||
402 | int w = height(); | ||
403 | int h = width(); | ||
324 | 404 | ||
325 | void VideoWidget::keyReleaseEvent( QKeyEvent *e) | 405 | return true; |
326 | { | 406 | } |
407 | |||
408 | void VideoWidget::keyReleaseEvent( QKeyEvent *e) { | ||
327 | switch ( e->key() ) { | 409 | switch ( e->key() ) { |
@@ -372,2 +454,3 @@ void VideoWidget::keyReleaseEvent( QKeyEvent *e) | |||
372 | } | 454 | } |
455 | |||
373 | XineVideoWidget* VideoWidget::vidWidget() { | 456 | XineVideoWidget* VideoWidget::vidWidget() { |
@@ -377,4 +460,3 @@ XineVideoWidget* VideoWidget::vidWidget() { | |||
377 | 460 | ||
378 | void VideoWidget::setFullscreen ( bool b ) | 461 | void VideoWidget::setFullscreen ( bool b ) { |
379 | { | ||
380 | setToggleButton( VideoFullscreen, b ); | 462 | setToggleButton( VideoFullscreen, b ); |