summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-09 16:46:49 (UTC)
committer simon <simon>2002-12-09 16:46:49 (UTC)
commit73278bac12a0af959fde6d12280ed08859a5abaf (patch) (side-by-side diff)
tree5b6bb36801b1da079f6a3dbf31fe4173dd2ec7ba
parentdbe0046eb82c8ee61ce7fc704d3b376730abc17f (diff)
downloadopie-73278bac12a0af959fde6d12280ed08859a5abaf.zip
opie-73278bac12a0af959fde6d12280ed08859a5abaf.tar.gz
opie-73278bac12a0af959fde6d12280ed08859a5abaf.tar.bz2
- another global variable removed
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp4
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index 41844e1..26777e6 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -70,17 +70,17 @@ const MediaWidget::SkinButtonInfo skinInfo[] =
{ MediaWidget::FullScreen, "full", MediaWidget::ToggleButton }
};
const uint buttonCount = sizeof( skinInfo ) / sizeof( skinInfo[ 0 ] );
}
VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name )
- : MediaWidget( playList, mediaPlayerState, parent, name ), scaledWidth( 0 ), scaledHeight( 0 )
+ : MediaWidget( playList, mediaPlayerState, parent, name ), scaledWidth( 0 ), scaledHeight( 0 ), videoSliderBeingMoved( false )
{
setCaption( tr("OpiePlayer - Video") );
videoFrame = new XineVideoWidget ( this, "Video frame" );
connect ( videoFrame, SIGNAL( videoResized ( const QSize & )), this, SIGNAL( videoResized ( const QSize & )));
connect ( videoFrame, SIGNAL( clicked () ), this, SLOT ( backToNormal() ) );
@@ -184,18 +184,16 @@ void VideoWidget::resizeEvent( QResizeEvent * ) {
button.pixDown = maskVPixToMask( *pixDn, button.mask );
}
}
delete pixUp;
delete pixDn;
}
-static bool videoSliderBeingMoved = FALSE;
-
void VideoWidget::sliderPressed() {
videoSliderBeingMoved = TRUE;
}
void VideoWidget::sliderReleased() {
videoSliderBeingMoved = FALSE;
if ( slider->width() == 0 ) {
return;
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h
index 7d50ea0..bed2116 100644
--- a/noncore/multimedia/opieplayer2/videowidget.h
+++ b/noncore/multimedia/opieplayer2/videowidget.h
@@ -89,14 +89,16 @@ private:
QString backgroundPix;
QSlider *slider;
QImage *currentFrame;
int scaledWidth;
int scaledHeight;
XineVideoWidget* videoFrame;
+
+ bool videoSliderBeingMoved;
};
#endif // VIDEO_WIDGET_H