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
@@ -58,3 +58,3 @@ MediaButton videoButtons[] = {
{ FALSE, FALSE, FALSE }, // stop
- { TRUE, FALSE, FALSE }, // play
+ { FALSE, FALSE, FALSE }, // play
{ FALSE, FALSE, FALSE }, // previous
@@ -146,3 +146,3 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
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) ) );
@@ -153,3 +153,3 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
setFullscreen( mediaPlayerState->fullscreen() );
- setPaused( mediaPlayerState->paused() );
+// setPaused( mediaPlayerState->paused() );
setPlaying( mediaPlayerState->playing() );
@@ -321,20 +321,90 @@ 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) {
@@ -347,61 +417,47 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
// }
- }
- 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;
+// }
+// }
+// }
+// }
@@ -434,13 +490,4 @@ 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;
-// }
-// }
+// }
}
@@ -458,5 +505,5 @@ void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) {
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
@@ -30,8 +30,10 @@ class QSlider;
enum VideoButtons {
- VideoPrevious,
VideoStop,
VideoPlay,
- VideoPause,
+// VideoPause,
+ VideoPrevious,
VideoNext,
- VideoPlayList,
+ VideoVolUp,
+ VideoVolDown,
+// VideoPlayList,
VideoFullscreen
@@ -51,3 +53,3 @@ public slots:
void sliderReleased( );
- void setPaused( bool b) { setToggleButton( VideoPause, b ); }
+// void setPaused( bool b) { setToggleButton( VideoPause, b ); }
void setPlaying( bool b) { setToggleButton( VideoPlay, b ); }
@@ -60,2 +62,6 @@ public slots:
signals:
+ void moreClicked();
+ void lessClicked();
+ void moreReleased();
+ void lessReleased();
void sliderMoved( long );