summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/videowidget.cpp225
-rw-r--r--core/multimedia/opieplayer/videowidget.h14
2 files changed, 146 insertions, 93 deletions
diff --git a/core/multimedia/opieplayer/videowidget.cpp b/core/multimedia/opieplayer/videowidget.cpp
index 1b38206..6ed0108 100644
--- a/core/multimedia/opieplayer/videowidget.cpp
+++ b/core/multimedia/opieplayer/videowidget.cpp
@@ -47,25 +47,25 @@ static const int yo = 0; // movable y offset
struct MediaButton {
// int xPos, yPos;
bool isToggle, isHeld, isDown;
// int controlType;
};
// Layout information for the videoButtons (and if it is a toggle button or not)
MediaButton videoButtons[] = {
{ FALSE, FALSE, FALSE }, // stop
- { TRUE, FALSE, FALSE }, // play
+ { FALSE, FALSE, FALSE }, // play
{ FALSE, FALSE, FALSE }, // previous
{ FALSE, FALSE, FALSE }, // next
{ FALSE, FALSE, FALSE }, // volUp
{ FALSE, FALSE, FALSE }, // volDown
{ TRUE, FALSE, FALSE } // fullscreen
};
//static const int numButtons = (sizeof(videoButtons)/sizeof(MediaButton));
const char *skinV_mask_file_names[7] = {
"stop","play","back","fwd","up","down","full"
};
@@ -135,32 +135,32 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
slider->setMaxValue( 1 );
slider->setBackgroundPixmap( Resource::loadPixmap( backgroundPix ) );
slider->setFocusPolicy( QWidget::NoFocus );
// slider->setGeometry( QRect( 7, 250, 220, 20 ) );
connect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) );
connect( slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) );
connect( mediaPlayerState, SIGNAL( lengthChanged(long) ), this, SLOT( setLength(long) ) );
connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
connect( mediaPlayerState, SIGNAL( viewChanged(char) ), this, SLOT( setView(char) ) );
- connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( setPaused(bool) ) );
+// connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( setPaused(bool) ) );
connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) );
// Intialise state
setLength( mediaPlayerState->length() );
setPosition( mediaPlayerState->position() );
setFullscreen( mediaPlayerState->fullscreen() );
- setPaused( mediaPlayerState->paused() );
+// setPaused( mediaPlayerState->paused() );
setPlaying( mediaPlayerState->playing() );
}
VideoWidget::~VideoWidget() {
for ( int i = 0; i < 7; i++ )
{
delete buttonPixUp[i];
delete buttonPixDown[i];
}
@@ -310,109 +310,165 @@ void VideoWidget::paintButton( QPainter *p, int i ) {
{
p->drawPixmap( xoff, yoff, *buttonPixUp[i] );
}
// int x = videoButtons[i].xPos;
// int y = videoButtons[i].yPos;
// int offset = 10 + videoButtons[i].isDown;
// p->drawPixmap( x, y, *pixmaps[videoButtons[i].isDown] );
// p->drawPixmap( x + 1 + offset, y + offset, *pixmaps[2], 9 * videoButtons[i].controlType, 0, 9, 9 );
}
void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
-
- for ( int i = 0; i < numVButtons; i++ )
- {
- if ( event->state() == QMouseEvent::LeftButton )
- {
- // The test to see if the mouse click is inside the button or not
- int x = event->pos().x() - xoff;
- int y = event->pos().y() - yoff;
-
- bool isOnButton = ( x > 0 && y > 0 && x < imgButtonMask->width()
- && y < imgButtonMask->height()
- && imgButtonMask->pixelIndex( x, y ) == i + 1 );
-
- if ( isOnButton && !videoButtons[i].isHeld )
- {
- videoButtons[i].isHeld = TRUE;
- toggleButton(i);
-
+ for ( int i = 0; i < numVButtons; i++ ) {
+ if ( event->state() == QMouseEvent::LeftButton ) {
+ // The test to see if the mouse click is inside the button or not
+ int x = event->pos().x() - xoff;
+ int y = event->pos().y() - yoff;
+
+ bool isOnButton = ( x > 0 && y > 0 && x < imgButtonMask->width()
+ && y < imgButtonMask->height()
+ && imgButtonMask->pixelIndex( x, y ) == i + 1 );
+
+ if ( isOnButton && !videoButtons[i].isHeld ) {
+ videoButtons[i].isHeld = TRUE;
+ toggleButton(i);
+
+ switch (i) {
+ case VideoVolUp:
+ emit moreClicked();
+ return;
+ case VideoVolDown:
+ emit lessClicked();
+ return;
+ }
+ } else if ( !isOnButton && videoButtons[i].isHeld ) {
+ videoButtons[i].isHeld = FALSE;
+ toggleButton(i);
+ }
+ } else {
+
+ if ( videoButtons[i].isHeld ) {
+ videoButtons[i].isHeld = FALSE;
+ if ( !videoButtons[i].isToggle ) {
+ setToggleButton( i, FALSE );
+ }
+
+ switch(i) {
+
+ case VideoPlay: {
+ qDebug("play");
+ if( !mediaPlayerState->playing()) {
+ mediaPlayerState->setPlaying( true);
+ setToggleButton( i-1, false );
+ setToggleButton( i, false );
+ return;
+ }
+ if( mediaPlayerState->isPaused ) {
+ qDebug("isPaused");
+ setToggleButton( i, FALSE );
+ mediaPlayerState->setPaused( FALSE );
+ return;
+ } else if( !mediaPlayerState->isPaused ) {
+ qDebug("is not paused");
+ setToggleButton( i, TRUE );
+ mediaPlayerState->setPaused( TRUE );
+ return;
+ } else {
+ return;
+ }
+ }
+
+ case VideoStop: qDebug("stop"); mediaPlayerState->setPlaying( FALSE ); setToggleButton( i+1, true); setToggleButton( i, true ); return;
+ case VideoNext: mediaPlayerState->setNext(); return;
+ case VideoPrevious: mediaPlayerState->setPrev(); return;
+ case VideoVolUp: emit moreReleased(); return;
+ case VideoVolDown: emit lessReleased(); return;
+ case VideoFullscreen: mediaPlayerState->setFullscreen( TRUE ); makeVisible(); return;
+ }
+ }
+ }
+ }
+
+// for ( int i = 0; i < numVButtons; i++ )
+// {
+// if ( event->state() == QMouseEvent::LeftButton )
+// {
+// // The test to see if the mouse click is inside the button or not
+// int x = event->pos().x() - xoff;
+// int y = event->pos().y() - yoff;
+
+// bool isOnButton = ( x > 0 && y > 0 && x < imgButtonMask->width()
+// && y < imgButtonMask->height()
+// && imgButtonMask->pixelIndex( x, y ) == i + 1 );
+
+// if ( isOnButton && !videoButtons[i].isHeld )
+// {
+// qDebug("key %d", i);
+
+// videoButtons[i].isHeld = TRUE;
+// toggleButton(i);
// switch (i) {
// case VideoVolUp:
// emit moreClicked();
// return;
// case VideoVolDown:
// emit lessClicked();
// return;
// }
- }
- else if ( !isOnButton && videoButtons[i].isHeld )
- {
- videoButtons[i].isHeld = FALSE;
- toggleButton(i);
- }
- }
- else
- {
+// } else if ( !isOnButton && videoButtons[i].isHeld ) {
+// videoButtons[i].isHeld = FALSE;
+// toggleButton(i);
+// }
- if ( videoButtons[i].isHeld )
- {
- videoButtons[i].isHeld = FALSE;
- if ( !videoButtons[i].isToggle )
- {
- setToggleButton( i, FALSE );
- }
- qDebug("key %d", i);
- switch(i)
- {
-// case VideoPlay:
-// {
-// if( mediaPlayerState->isPaused )
-// {
-// setToggleButton( i, FALSE );
-// mediaPlayerState->setPaused( FALSE );
-// return;
-// }
-// else if( !mediaPlayerState->isPaused )
-// {
-// setToggleButton( i, TRUE );
-// mediaPlayerState->setPaused( TRUE );
-// return;
-// }
-// else
-// {
-// return;
-// }
-// }
- case VideoPlay: mediaPlayerState->setPlaying(videoButtons[i].isDown); return;
- case VideoStop: mediaPlayerState->setPlaying(FALSE); return;
-// case VideoPause: mediaPlayerState->setPaused(videoButtons[i].isDown); return;
- case VideoNext: mediaPlayerState->setNext(); return;
- case VideoPrevious: mediaPlayerState->setPrev(); return;
-// case VideoPlayList: mediaPlayerState->setList(); return;
- case VideoFullscreen: mediaPlayerState->setFullscreen( TRUE ); makeVisible(); return;
-
-// case VideoStop: mediaPlayerState->setPlaying( FALSE ); return;
-// case VideoNext: if(playList->whichList() ==0) mediaPlayerState->setNext(); return;
-// case VideoPrevious: if(playList->whichList() ==0) mediaPlayerState->setPrev(); return;
-// case VideoVolUp: emit moreReleased(); return;
-// case VideoVolDown: emit lessReleased(); return;
-// case VideoFullscreen: mediaPlayerState->setFullscreen( TRUE ); makeVisible(); return;
- }
- }
- }
- }
+// } else {
+// if ( videoButtons[i].isHeld )
+// {
+// videoButtons[i].isHeld = FALSE;
+// if ( !videoButtons[i].isToggle ) {
+// setToggleButton( i, FALSE );
+// }
+// qDebug("key %d", i);
+// switch(i) {
+// case VideoPlay:
+// {
+// if( mediaPlayerState->isPaused ) {
+// setToggleButton( i, FALSE );
+// mediaPlayerState->setPaused( FALSE );
+// return;
+// }
+// else if( !mediaPlayerState->isPaused ) {
+// setToggleButton( i, TRUE );
+// mediaPlayerState->setPaused( TRUE );
+// return;
+// } else {
+// return;
+// }
+// }
+
+// case VideoStop: mediaPlayerState->setPlaying(FALSE); return;
+// // case VideoPlay: mediaPlayerState->setPlaying(videoButtons[i].isDown); return;
+// // case VideoPause: mediaPlayerState->setPaused(videoButtons[i].isDown); return;
+// case VideoNext: mediaPlayerState->setNext(); return;
+// case VideoPrevious: mediaPlayerState->setPrev(); return;
+// case VideoVolUp: emit moreReleased(); return;
+// case VideoVolDown: emit lessReleased(); return;
+// // case VideoPlayList: mediaPlayerState->setList(); return;
+// case VideoFullscreen: mediaPlayerState->setFullscreen( TRUE ); makeVisible(); return;
+// }
+// }
+// }
+// }
// for ( int i = 0; i < numButtons; i++ ) {
// int x = videoButtons[i].xPos;
// int y = videoButtons[i].yPos;
// if ( event->state() == QMouseEvent::LeftButton ) {
// // The test to see if the mouse click is inside the circular button or not
// // (compared with the radius squared to avoid a square-root of our distance)
// int radius = 16;
@@ -423,51 +479,42 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
// if ( isOnButton != videoButtons[i].isHeld ) {
// videoButtons[i].isHeld = isOnButton;
// toggleButton(i);
// }
// } else {
// if ( videoButtons[i].isHeld ) {
// videoButtons[i].isHeld = FALSE;
// if ( !videoButtons[i].isToggle )
// setToggleButton( i, FALSE );
// }
// }
-// switch (i) {
-// case VideoPlay: mediaPlayerState->setPlaying(videoButtons[i].isDown); return;
-// case VideoStop: mediaPlayerState->setPlaying(FALSE); return;
-// case VideoPause: mediaPlayerState->setPaused(videoButtons[i].isDown); return;
-// case VideoNext: mediaPlayerState->setNext(); return;
-// case VideoPrevious: mediaPlayerState->setPrev(); return;
-// case VideoPlayList: mediaPlayerState->setList(); return;
-// case VideoFullscreen: mediaPlayerState->setFullscreen( TRUE ); makeVisible(); return;
-// }
-// }
+// }
}
void VideoWidget::mousePressEvent( QMouseEvent *event ) {
mouseMoveEvent( event );
}
void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) {
if ( mediaPlayerState->fullscreen() )
{
mediaPlayerState->setFullscreen( FALSE );
makeVisible();
-
- mouseMoveEvent( event );
}
+ mouseMoveEvent( event );
+// }
}
void VideoWidget::makeVisible() {
if ( mediaPlayerState->fullscreen() )
{
setBackgroundMode( QWidget::NoBackground );
showFullScreen();
resize( qApp->desktop()->size() );
slider->hide();
}
else
diff --git a/core/multimedia/opieplayer/videowidget.h b/core/multimedia/opieplayer/videowidget.h
index fd86cd2..e9778f1 100644
--- a/core/multimedia/opieplayer/videowidget.h
+++ b/core/multimedia/opieplayer/videowidget.h
@@ -19,54 +19,60 @@
**********************************************************************/
#ifndef VIDEO_WIDGET_H
#define VIDEO_WIDGET_H
#include <qwidget.h>
class QPixmap;
class QSlider;
enum VideoButtons {
- VideoPrevious,
VideoStop,
VideoPlay,
- VideoPause,
+// VideoPause,
+ VideoPrevious,
VideoNext,
- VideoPlayList,
+ VideoVolUp,
+ VideoVolDown,
+// VideoPlayList,
VideoFullscreen
};
class VideoWidget : public QWidget {
Q_OBJECT
public:
VideoWidget( QWidget* parent=0, const char* name=0, WFlags f=0 );
~VideoWidget();
bool playVideo();
public slots:
void updateSlider( long, long );
void sliderPressed( );
void sliderReleased( );
- void setPaused( bool b) { setToggleButton( VideoPause, b ); }
+// void setPaused( bool b) { setToggleButton( VideoPause, b ); }
void setPlaying( bool b) { setToggleButton( VideoPlay, b ); }
void setFullscreen( bool b ) { setToggleButton( VideoFullscreen, b ); }
void makeVisible();
void setPosition( long );
void setLength( long );
void setView( char );
signals:
+ void moreClicked();
+ void lessClicked();
+ void moreReleased();
+ void lessReleased();
void sliderMoved( long );
protected:
void resizeEvent( QResizeEvent * );
void paintEvent( QPaintEvent *pe );
void mouseMoveEvent( QMouseEvent *event );
void mousePressEvent( QMouseEvent *event );
void mouseReleaseEvent( QMouseEvent *event );
void closeEvent( QCloseEvent *event );
void keyReleaseEvent( QKeyEvent *e);
private: