author | llornkcor <llornkcor> | 2003-04-20 04:09:51 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2003-04-20 04:09:51 (UTC) |
commit | 0bc47585aef17477ca5564dde4da4a41cf57a1c0 (patch) (side-by-side diff) | |
tree | b425c7820c64c1673680b86a87932401a6e8f4a1 /core | |
parent | f4b192f79649abb3318c2c404da31f067f4ca467 (diff) | |
download | opie-0bc47585aef17477ca5564dde4da4a41cf57a1c0.zip opie-0bc47585aef17477ca5564dde4da4a41cf57a1c0.tar.gz opie-0bc47585aef17477ca5564dde4da4a41cf57a1c0.tar.bz2 |
buttons working
-rw-r--r-- | core/multimedia/opieplayer/videowidget.cpp | 225 | ||||
-rw-r--r-- | core/multimedia/opieplayer/videowidget.h | 14 |
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 @@ -57,5 +57,5 @@ struct MediaButton { MediaButton videoButtons[] = { { FALSE, FALSE, FALSE }, // stop - { TRUE, FALSE, FALSE }, // play + { FALSE, FALSE, FALSE }, // play { FALSE, FALSE, FALSE }, // previous { FALSE, FALSE, FALSE }, // next @@ -145,5 +145,5 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) : 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) ) ); @@ -152,5 +152,5 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) : setPosition( mediaPlayerState->position() ); setFullscreen( mediaPlayerState->fullscreen() ); - setPaused( mediaPlayerState->paused() ); +// setPaused( mediaPlayerState->paused() ); setPlaying( mediaPlayerState->playing() ); } @@ -320,22 +320,92 @@ void VideoWidget::paintButton( QPainter *p, int i ) { 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: @@ -346,63 +416,49 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { // 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; +// } +// } +// } +// } @@ -433,15 +489,6 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { // } -// 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; -// } -// } +// } } @@ -457,7 +504,7 @@ void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) { mediaPlayerState->setFullscreen( FALSE ); makeVisible(); - - mouseMoveEvent( event ); } + mouseMoveEvent( event ); +// } } 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 @@ -29,10 +29,12 @@ class QSlider; enum VideoButtons { - VideoPrevious, VideoStop, VideoPlay, - VideoPause, +// VideoPause, + VideoPrevious, VideoNext, - VideoPlayList, + VideoVolUp, + VideoVolDown, +// VideoPlayList, VideoFullscreen }; @@ -50,5 +52,5 @@ public slots: 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 ); } @@ -59,4 +61,8 @@ public slots: signals: + void moreClicked(); + void lessClicked(); + void moreReleased(); + void lessReleased(); void sliderMoved( long ); |