summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-08 21:13:27 (UTC)
committer simon <simon>2002-12-08 21:13:27 (UTC)
commitb3ae76e6afdfd734789a85c5e80e8e846b15d6cf (patch) (side-by-side diff)
tree5ac754c7945fc89f3cfc70e361fe109ba1c90233
parent009f786417b304168f2e23ddd1d8626653ba1c63 (diff)
downloadopie-b3ae76e6afdfd734789a85c5e80e8e846b15d6cf.zip
opie-b3ae76e6afdfd734789a85c5e80e8e846b15d6cf.tar.gz
opie-b3ae76e6afdfd734789a85c5e80e8e846b15d6cf.tar.bz2
- made videoButtons a member variable instead of a global one
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.h5
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp25
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.h2
3 files changed, 28 insertions, 4 deletions
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index 0b9d826..9cb75ae 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -25,6 +25,8 @@
#include "mediaplayerstate.h"
#include "playlistwidget.h"
+#include <vector>
+
class MediaWidget : public QWidget
{
Q_OBJECT
@@ -34,11 +36,14 @@ public:
struct Button
{
// Button() : isToggle( false ), isHeld( false ), isDown( false ) {}
+// Button( bool toggle, bool held, bool down )
+// : isToggle( toggle ), isHeld( held ), isDown( down ) {}
bool isToggle : 1;
bool isHeld : 1;
bool isDown : 1;
};
+ typedef std::vector<Button> ButtonVector;
MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent = 0, const char *name = 0 );
virtual ~MediaWidget();
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index 7c20c6d..efd756c 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -59,6 +59,7 @@ namespace
const int xo = 2; // movable x offset
const int yo = 0; // movable y offset
+/*
MediaWidget::Button videoButtons[] = {
{ FALSE, FALSE, FALSE }, // stop
{ TRUE, FALSE, FALSE }, // play
@@ -68,12 +69,13 @@ MediaWidget::Button videoButtons[] = {
{ FALSE, FALSE, FALSE }, // volDown
{ TRUE, FALSE, FALSE } // fullscreen
};
+*/
const char * const skinV_mask_file_names[7] = {
"stop","play","back","fwd","up","down","full"
};
-const int numVButtons = (sizeof(videoButtons)/sizeof(MediaWidget::Button));
+//const int numVButtons = (sizeof(videoButtons)/sizeof(MediaWidget::Button));
}
@@ -82,6 +84,21 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
{
setCaption( tr("OpiePlayer - Video") );
+ Button defaultButton;
+ defaultButton.isToggle = defaultButton.isHeld = defaultButton.isDown = false;
+ Button toggleButton;
+ toggleButton.isToggle = true;
+ toggleButton.isHeld = toggleButton.isDown = false;
+
+ videoButtons.reserve( 7 );
+ videoButtons.push_back( defaultButton ); // stop
+ videoButtons.push_back( toggleButton ); // play
+ videoButtons.push_back( defaultButton ); // previous
+ videoButtons.push_back( defaultButton ); // next
+ videoButtons.push_back( defaultButton ); // volUp
+ videoButtons.push_back( defaultButton ); // volDown
+ videoButtons.push_back( toggleButton ); //fullscreen
+
videoFrame = new XineVideoWidget ( this, "Video frame" );
connect ( videoFrame, SIGNAL( videoResized ( const QSize & )), this, SIGNAL( videoResized ( const QSize & )));
@@ -276,7 +293,7 @@ void VideoWidget::paintButton( QPainter *p, int i ) {
}
void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
- for ( int i = 0; i < numVButtons; i++ ) {
+ for ( unsigned int i = 0; i < videoButtons.size(); 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;
@@ -423,14 +440,14 @@ void VideoWidget::paintEvent( QPaintEvent * pe) {
QPainter p( &pix );
p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() );
p.drawTiledPixmap( pe->rect(), pixBg, pe->rect().topLeft() );
- for ( int i = 0; i < numVButtons; i++ ) {
+ for ( unsigned int i = 0; i < videoButtons.size(); i++ ) {
paintButton( &p, i );
}
QPainter p2( this );
p2.drawPixmap( pe->rect().topLeft(), pix );
} else {
QPainter p( this );
- for ( int i = 0; i < numVButtons; i++ )
+ for ( unsigned int i = 0; i < videoButtons.size(); i++ )
paintButton( &p, i );
}
//slider->repaint( TRUE );
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h
index f996803..34558f8 100644
--- a/noncore/multimedia/opieplayer2/videowidget.h
+++ b/noncore/multimedia/opieplayer2/videowidget.h
@@ -120,6 +120,8 @@ private:
int scaledWidth;
int scaledHeight;
XineVideoWidget* videoFrame;
+
+ ButtonVector videoButtons;
};
#endif // VIDEO_WIDGET_H