summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore 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[] =
70 { MediaWidget::FullScreen, "full", MediaWidget::ToggleButton } 70 { MediaWidget::FullScreen, "full", MediaWidget::ToggleButton }
71}; 71};
72 72
73const uint buttonCount = sizeof( skinInfo ) / sizeof( skinInfo[ 0 ] ); 73const uint buttonCount = sizeof( skinInfo ) / sizeof( skinInfo[ 0 ] );
74 74
75} 75}
76 76
77VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name ) 77VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name )
78 : MediaWidget( playList, mediaPlayerState, parent, name ), scaledWidth( 0 ), scaledHeight( 0 ) 78 : MediaWidget( playList, mediaPlayerState, parent, name ), scaledWidth( 0 ), scaledHeight( 0 ), videoSliderBeingMoved( false )
79{ 79{
80 setCaption( tr("OpiePlayer - Video") ); 80 setCaption( tr("OpiePlayer - Video") );
81 81
82 82
83 videoFrame = new XineVideoWidget ( this, "Video frame" ); 83 videoFrame = new XineVideoWidget ( this, "Video frame" );
84 84
85 connect ( videoFrame, SIGNAL( videoResized ( const QSize & )), this, SIGNAL( videoResized ( const QSize & ))); 85 connect ( videoFrame, SIGNAL( videoResized ( const QSize & )), this, SIGNAL( videoResized ( const QSize & )));
86 connect ( videoFrame, SIGNAL( clicked () ), this, SLOT ( backToNormal() ) ); 86 connect ( videoFrame, SIGNAL( clicked () ), this, SLOT ( backToNormal() ) );
@@ -184,18 +184,16 @@ void VideoWidget::resizeEvent( QResizeEvent * ) {
184 button.pixDown = maskVPixToMask( *pixDn, button.mask ); 184 button.pixDown = maskVPixToMask( *pixDn, button.mask );
185 } 185 }
186 } 186 }
187 187
188 delete pixUp; 188 delete pixUp;
189 delete pixDn; 189 delete pixDn;
190} 190}
191 191
192static bool videoSliderBeingMoved = FALSE;
193
194void VideoWidget::sliderPressed() { 192void VideoWidget::sliderPressed() {
195 videoSliderBeingMoved = TRUE; 193 videoSliderBeingMoved = TRUE;
196} 194}
197 195
198void VideoWidget::sliderReleased() { 196void VideoWidget::sliderReleased() {
199 videoSliderBeingMoved = FALSE; 197 videoSliderBeingMoved = FALSE;
200 if ( slider->width() == 0 ) { 198 if ( slider->width() == 0 ) {
201 return; 199 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:
89 89
90 90
91 QString backgroundPix; 91 QString backgroundPix;
92 QSlider *slider; 92 QSlider *slider;
93 QImage *currentFrame; 93 QImage *currentFrame;
94 int scaledWidth; 94 int scaledWidth;
95 int scaledHeight; 95 int scaledHeight;
96 XineVideoWidget* videoFrame; 96 XineVideoWidget* videoFrame;
97
98 bool videoSliderBeingMoved;
97}; 99};
98 100
99#endif // VIDEO_WIDGET_H 101#endif // VIDEO_WIDGET_H
100 102
101 103
102 104