-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 13 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.h | 1 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.cpp | 10 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 15 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.h | 1 |
6 files changed, 14 insertions, 28 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 12f91a9..5cc2814 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -1,478 +1,469 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
3 | 3 | ||
4 | Copyright (c) 2002 Max Reiss <harlekin@handhelds.org> | 4 | Copyright (c) 2002 Max Reiss <harlekin@handhelds.org> |
5 | Copyright (c) 2002 L. Potter <ljp@llornkcor.com> | 5 | Copyright (c) 2002 L. Potter <ljp@llornkcor.com> |
6 | Copyright (c) 2002 Holger Freyther <zecke@handhelds.org> | 6 | Copyright (c) 2002 Holger Freyther <zecke@handhelds.org> |
7 | =. | 7 | =. |
8 | .=l. | 8 | .=l. |
9 | .>+-= | 9 | .>+-= |
10 | _;:, .> :=|. This program is free software; you can | 10 | _;:, .> :=|. This program is free software; you can |
11 | .> <`_, > . <= redistribute it and/or modify it under | 11 | .> <`_, > . <= redistribute it and/or modify it under |
12 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | 12 | :`=1 )Y*s>-.-- : the terms of the GNU General Public |
13 | .="- .-=="i, .._ License as published by the Free Software | 13 | .="- .-=="i, .._ License as published by the Free Software |
14 | - . .-<_> .<> Foundation; either version 2 of the License, | 14 | - . .-<_> .<> Foundation; either version 2 of the License, |
15 | ._= =} : or (at your option) any later version. | 15 | ._= =} : or (at your option) any later version. |
16 | .%`+i> _;_. | 16 | .%`+i> _;_. |
17 | .i_,=:_. -<s. This program is distributed in the hope that | 17 | .i_,=:_. -<s. This program is distributed in the hope that |
18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
19 | : .. .:, . . . without even the implied warranty of | 19 | : .. .:, . . . without even the implied warranty of |
20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
22 | ..}^=.= = ; Library General Public License for more | 22 | ..}^=.= = ; Library General Public License for more |
23 | ++= -. .` .: details. | 23 | ++= -. .` .: details. |
24 | : = ...= . :.=- | 24 | : = ...= . :.=- |
25 | -. .:....=;==+<; You should have received a copy of the GNU | 25 | -. .:....=;==+<; You should have received a copy of the GNU |
26 | -_. . . )=. = Library General Public License along with | 26 | -_. . . )=. = Library General Public License along with |
27 | -- :-=` this library; see the file COPYING.LIB. | 27 | -- :-=` this library; see the file COPYING.LIB. |
28 | If not, write to the Free Software Foundation, | 28 | If not, write to the Free Software Foundation, |
29 | Inc., 59 Temple Place - Suite 330, | 29 | Inc., 59 Temple Place - Suite 330, |
30 | Boston, MA 02111-1307, USA. | 30 | Boston, MA 02111-1307, USA. |
31 | 31 | ||
32 | */ | 32 | */ |
33 | 33 | ||
34 | #include <qpe/qpeapplication.h> | 34 | #include <qpe/qpeapplication.h> |
35 | #include <qpe/resource.h> | 35 | #include <qpe/resource.h> |
36 | #include <qpe/config.h> | 36 | #include <qpe/config.h> |
37 | #include <opie/oticker.h> | 37 | #include <opie/oticker.h> |
38 | 38 | ||
39 | #include <qwidget.h> | 39 | #include <qwidget.h> |
40 | #include <qpixmap.h> | 40 | #include <qpixmap.h> |
41 | #include <qbutton.h> | 41 | #include <qbutton.h> |
42 | #include <qpainter.h> | 42 | #include <qpainter.h> |
43 | #include <qframe.h> | 43 | #include <qframe.h> |
44 | #include <qlayout.h> | 44 | #include <qlayout.h> |
45 | #include <qdir.h> | 45 | #include <qdir.h> |
46 | #include <stdlib.h> | 46 | #include <stdlib.h> |
47 | #include <stdio.h> | 47 | #include <stdio.h> |
48 | 48 | ||
49 | #include "audiowidget.h" | 49 | #include "audiowidget.h" |
50 | #include "mediaplayerstate.h" | 50 | #include "mediaplayerstate.h" |
51 | #include "playlistwidget.h" | 51 | #include "playlistwidget.h" |
52 | 52 | ||
53 | namespace | 53 | namespace |
54 | { | 54 | { |
55 | 55 | ||
56 | const int xo = -2; // movable x offset | 56 | const int xo = -2; // movable x offset |
57 | const int yo = 22; // movable y offset | 57 | const int yo = 22; // movable y offset |
58 | 58 | ||
59 | const MediaWidget::SkinButtonInfo skinInfo[] = | 59 | const MediaWidget::SkinButtonInfo skinInfo[] = |
60 | { | 60 | { |
61 | { MediaWidget::Play, "play", MediaWidget::ToggleButton }, | 61 | { MediaWidget::Play, "play", MediaWidget::ToggleButton }, |
62 | { MediaWidget::Stop, "stop", MediaWidget::NormalButton }, | 62 | { MediaWidget::Stop, "stop", MediaWidget::NormalButton }, |
63 | { MediaWidget::Next, "next", MediaWidget::NormalButton }, | 63 | { MediaWidget::Next, "next", MediaWidget::NormalButton }, |
64 | { MediaWidget::Previous, "prev", MediaWidget::NormalButton }, | 64 | { MediaWidget::Previous, "prev", MediaWidget::NormalButton }, |
65 | { MediaWidget::VolumeUp, "up", MediaWidget::NormalButton }, | 65 | { MediaWidget::VolumeUp, "up", MediaWidget::NormalButton }, |
66 | { MediaWidget::VolumeDown, "down", MediaWidget::NormalButton }, | 66 | { MediaWidget::VolumeDown, "down", MediaWidget::NormalButton }, |
67 | { MediaWidget::Loop, "loop", MediaWidget::ToggleButton }, | 67 | { MediaWidget::Loop, "loop", MediaWidget::ToggleButton }, |
68 | { MediaWidget::PlayList, "playlist", MediaWidget::NormalButton }, | 68 | { MediaWidget::PlayList, "playlist", MediaWidget::NormalButton }, |
69 | { MediaWidget::Forward, "forward", MediaWidget::NormalButton }, | 69 | { MediaWidget::Forward, "forward", MediaWidget::NormalButton }, |
70 | { MediaWidget::Back, "back", MediaWidget::NormalButton } | 70 | { MediaWidget::Back, "back", MediaWidget::NormalButton } |
71 | }; | 71 | }; |
72 | 72 | ||
73 | const uint buttonCount = sizeof( skinInfo ) / sizeof( skinInfo[ 0 ] ); | 73 | const uint buttonCount = sizeof( skinInfo ) / sizeof( skinInfo[ 0 ] ); |
74 | 74 | ||
75 | void changeTextColor( QWidget * w) { | 75 | void changeTextColor( QWidget * w) { |
76 | QPalette p = w->palette(); | 76 | QPalette p = w->palette(); |
77 | p.setBrush( QColorGroup::Background, QColor( 167, 212, 167 ) ); | 77 | p.setBrush( QColorGroup::Background, QColor( 167, 212, 167 ) ); |
78 | p.setBrush( QColorGroup::Base, QColor( 167, 212, 167 ) ); | 78 | p.setBrush( QColorGroup::Base, QColor( 167, 212, 167 ) ); |
79 | w->setPalette( p ); | 79 | w->setPalette( p ); |
80 | } | 80 | } |
81 | 81 | ||
82 | } | 82 | } |
83 | 83 | ||
84 | AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name) : | 84 | AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name) : |
85 | 85 | ||
86 | MediaWidget( playList, mediaPlayerState, parent, name ), songInfo( this ), slider( Qt::Horizontal, this ), time( this ), | 86 | MediaWidget( playList, mediaPlayerState, parent, name ), songInfo( this ), slider( Qt::Horizontal, this ), time( this ), |
87 | audioSliderBeingMoved( false ) | 87 | audioSliderBeingMoved( false ) |
88 | { | 88 | { |
89 | setCaption( tr("OpiePlayer") ); | 89 | setCaption( tr("OpiePlayer") ); |
90 | 90 | ||
91 | Config cfg("OpiePlayer"); | 91 | Config cfg("OpiePlayer"); |
92 | cfg.setGroup("Options"); | 92 | cfg.setGroup("Options"); |
93 | skin = cfg.readEntry("Skin","default"); | 93 | skin = cfg.readEntry("Skin","default"); |
94 | //skin = "scaleTest"; | 94 | //skin = "scaleTest"; |
95 | // color of background, frame, degree of transparency | 95 | // color of background, frame, degree of transparency |
96 | 96 | ||
97 | QString skinPath = "opieplayer2/skins/" + skin; | 97 | QString skinPath = "opieplayer2/skins/" + skin; |
98 | pixBg = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); | 98 | pixBg = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); |
99 | imgUp = QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) ); | 99 | imgUp = QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) ); |
100 | imgDn = QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) ); | 100 | imgDn = QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) ); |
101 | 101 | ||
102 | buttonMask = QImage( imgUp.width(), imgUp.height(), 8, 255 ); | 102 | buttonMask = QImage( imgUp.width(), imgUp.height(), 8, 255 ); |
103 | buttonMask.fill( 0 ); | 103 | buttonMask.fill( 0 ); |
104 | 104 | ||
105 | for ( uint i = 0; i < buttonCount; i++ ) { | 105 | for ( uint i = 0; i < buttonCount; i++ ) { |
106 | Button button; | 106 | Button button; |
107 | button.type = skinInfo[ i ].type; | 107 | button.type = skinInfo[ i ].type; |
108 | 108 | ||
109 | QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath + "/skin_mask_" + skinInfo[i].fileName + ".png" ); | 109 | QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath + "/skin_mask_" + skinInfo[i].fileName + ".png" ); |
110 | button.mask =QBitmap( filename ); | 110 | button.mask =QBitmap( filename ); |
111 | 111 | ||
112 | if ( !button.mask.isNull() ) { | 112 | if ( !button.mask.isNull() ) { |
113 | QImage imgMask = button.mask.convertToImage(); | 113 | QImage imgMask = button.mask.convertToImage(); |
114 | uchar **dest = buttonMask.jumpTable(); | 114 | uchar **dest = buttonMask.jumpTable(); |
115 | for ( int y = 0; y < imgUp.height(); y++ ) { | 115 | for ( int y = 0; y < imgUp.height(); y++ ) { |
116 | uchar *line = dest[y]; | 116 | uchar *line = dest[y]; |
117 | for ( int x = 0; x < imgUp.width(); x++ ) | 117 | for ( int x = 0; x < imgUp.width(); x++ ) |
118 | if ( !qRed( imgMask.pixel( x, y ) ) ) | 118 | if ( !qRed( imgMask.pixel( x, y ) ) ) |
119 | line[x] = i + 1; | 119 | line[x] = i + 1; |
120 | } | 120 | } |
121 | } | 121 | } |
122 | 122 | ||
123 | buttons.insert( i, button ); | 123 | buttons.insert( i, button ); |
124 | } | 124 | } |
125 | 125 | ||
126 | setBackgroundPixmap( pixBg ); | 126 | setBackgroundPixmap( pixBg ); |
127 | 127 | ||
128 | songInfo.setFocusPolicy( QWidget::NoFocus ); | 128 | songInfo.setFocusPolicy( QWidget::NoFocus ); |
129 | // changeTextColor( &songInfo ); | 129 | // changeTextColor( &songInfo ); |
130 | // songInfo.setBackgroundColor( QColor( 167, 212, 167 )); | 130 | // songInfo.setBackgroundColor( QColor( 167, 212, 167 )); |
131 | // songInfo.setFrameStyle( QFrame::NoFrame); | 131 | // songInfo.setFrameStyle( QFrame::NoFrame); |
132 | songInfo.setFrameStyle( QFrame::WinPanel | QFrame::Sunken ); | 132 | songInfo.setFrameStyle( QFrame::WinPanel | QFrame::Sunken ); |
133 | // songInfo.setForegroundColor(Qt::white); | 133 | // songInfo.setForegroundColor(Qt::white); |
134 | 134 | ||
135 | slider.setFixedHeight( 20 ); | 135 | slider.setFixedHeight( 20 ); |
136 | slider.setMinValue( 0 ); | 136 | slider.setMinValue( 0 ); |
137 | slider.setMaxValue( 1 ); | 137 | slider.setMaxValue( 1 ); |
138 | slider.setFocusPolicy( QWidget::NoFocus ); | 138 | slider.setFocusPolicy( QWidget::NoFocus ); |
139 | slider.setBackgroundPixmap( pixBg ); | 139 | slider.setBackgroundPixmap( pixBg ); |
140 | 140 | ||
141 | // Config cofg("qpe"); | 141 | // Config cofg("qpe"); |
142 | // cofg.setGroup("Appearance"); | 142 | // cofg.setGroup("Appearance"); |
143 | // QColor backgroundcolor = QColor( cofg.readEntry( "Background", "#E5E1D5" ) ); | 143 | // QColor backgroundcolor = QColor( cofg.readEntry( "Background", "#E5E1D5" ) ); |
144 | 144 | ||
145 | time.setFocusPolicy( QWidget::NoFocus ); | 145 | time.setFocusPolicy( QWidget::NoFocus ); |
146 | time.setAlignment( Qt::AlignCenter ); | 146 | time.setAlignment( Qt::AlignCenter ); |
147 | 147 | ||
148 | // time.setFrame(FALSE); | 148 | // time.setFrame(FALSE); |
149 | // changeTextColor( &time ); | 149 | // changeTextColor( &time ); |
150 | 150 | ||
151 | resizeEvent( NULL ); | 151 | resizeEvent( NULL ); |
152 | 152 | ||
153 | connect( &mediaPlayerState, SIGNAL( loopingToggled(bool) ), this, SLOT( setLooping(bool) ) ); | 153 | connect( &mediaPlayerState, SIGNAL( loopingToggled(bool) ), this, SLOT( setLooping(bool) ) ); |
154 | connect( &mediaPlayerState, SIGNAL( isSeekableToggled( bool ) ), this, SLOT( setSeekable( bool ) ) ); | 154 | connect( &mediaPlayerState, SIGNAL( isSeekableToggled( bool ) ), this, SLOT( setSeekable( bool ) ) ); |
155 | 155 | ||
156 | connect( this, SIGNAL( forwardClicked() ), this, SLOT( skipFor() ) ); | 156 | connect( this, SIGNAL( forwardClicked() ), this, SLOT( skipFor() ) ); |
157 | connect( this, SIGNAL( backClicked() ), this, SLOT( skipBack() ) ); | 157 | connect( this, SIGNAL( backClicked() ), this, SLOT( skipBack() ) ); |
158 | connect( this, SIGNAL( forwardReleased() ), this, SLOT( stopSkip() ) ); | 158 | connect( this, SIGNAL( forwardReleased() ), this, SLOT( stopSkip() ) ); |
159 | connect( this, SIGNAL( backReleased() ), this, SLOT( stopSkip() ) ); | 159 | connect( this, SIGNAL( backReleased() ), this, SLOT( stopSkip() ) ); |
160 | 160 | ||
161 | // Intialise state | 161 | // Intialise state |
162 | setLength( mediaPlayerState.length() ); | 162 | setLength( mediaPlayerState.length() ); |
163 | setPosition( mediaPlayerState.position() ); | 163 | setPosition( mediaPlayerState.position() ); |
164 | setLooping( mediaPlayerState.isFullscreen() ); | 164 | setLooping( mediaPlayerState.isFullscreen() ); |
165 | // setPaused( mediaPlayerState->paused() ); | 165 | // setPaused( mediaPlayerState->paused() ); |
166 | setPlaying( mediaPlayerState.isPlaying() ); | 166 | setPlaying( mediaPlayerState.isPlaying() ); |
167 | 167 | ||
168 | } | 168 | } |
169 | 169 | ||
170 | AudioWidget::~AudioWidget() { | 170 | AudioWidget::~AudioWidget() { |
171 | 171 | ||
172 | // mediaPlayerState->setPlaying(false); | 172 | // mediaPlayerState->setPlaying(false); |
173 | } | 173 | } |
174 | 174 | ||
175 | namespace { | 175 | namespace { |
176 | 176 | ||
177 | QPixmap combineImageWithBackground( QImage img, QPixmap bg, QPoint offset ) { | 177 | QPixmap combineImageWithBackground( QImage img, QPixmap bg, QPoint offset ) { |
178 | QPixmap pix( img.width(), img.height() ); | 178 | QPixmap pix( img.width(), img.height() ); |
179 | QPainter p( &pix ); | 179 | QPainter p( &pix ); |
180 | p.drawTiledPixmap( pix.rect(), bg, offset ); | 180 | p.drawTiledPixmap( pix.rect(), bg, offset ); |
181 | p.drawImage( 0, 0, img ); | 181 | p.drawImage( 0, 0, img ); |
182 | return pix; | 182 | return pix; |
183 | } | 183 | } |
184 | 184 | ||
185 | 185 | ||
186 | QPixmap maskPixToMask( QPixmap pix, QBitmap mask ) { | 186 | QPixmap maskPixToMask( QPixmap pix, QBitmap mask ) { |
187 | QPixmap pixmap( pix ); | 187 | QPixmap pixmap( pix ); |
188 | pixmap.setMask( mask ); | 188 | pixmap.setMask( mask ); |
189 | return pixmap; | 189 | return pixmap; |
190 | } | 190 | } |
191 | 191 | ||
192 | }; | 192 | }; |
193 | 193 | ||
194 | void AudioWidget::resizeEvent( QResizeEvent * ) { | 194 | void AudioWidget::resizeEvent( QResizeEvent * ) { |
195 | int h = height(); | 195 | int h = height(); |
196 | int w = width(); | 196 | int w = width(); |
197 | 197 | ||
198 | songInfo.setGeometry( QRect( 2, 2, w - 4, 20 ) ); | 198 | songInfo.setGeometry( QRect( 2, 2, w - 4, 20 ) ); |
199 | slider.setFixedWidth( w - 110 ); | 199 | slider.setFixedWidth( w - 110 ); |
200 | slider.setGeometry( QRect( 15, h - 22, w - 90, 20 ) ); | 200 | slider.setGeometry( QRect( 15, h - 22, w - 90, 20 ) ); |
201 | slider.setBackgroundOrigin( QWidget::ParentOrigin ); | 201 | slider.setBackgroundOrigin( QWidget::ParentOrigin ); |
202 | time.setGeometry( QRect( w - 85, h - 30, 70, 20 ) ); | 202 | time.setGeometry( QRect( w - 85, h - 30, 70, 20 ) ); |
203 | 203 | ||
204 | upperLeftOfButtonMask.rx() = ( w - imgUp.width() ) / 2; | 204 | upperLeftOfButtonMask.rx() = ( w - imgUp.width() ) / 2; |
205 | upperLeftOfButtonMask.ry() = (( h - imgUp.height() ) / 2) - 10; | 205 | upperLeftOfButtonMask.ry() = (( h - imgUp.height() ) / 2) - 10; |
206 | QPoint p = upperLeftOfButtonMask; | 206 | QPoint p = upperLeftOfButtonMask; |
207 | 207 | ||
208 | QPixmap pixUp = combineImageWithBackground( imgUp, pixBg, p ); | 208 | QPixmap pixUp = combineImageWithBackground( imgUp, pixBg, p ); |
209 | QPixmap pixDn = combineImageWithBackground( imgDn, pixBg, p ); | 209 | QPixmap pixDn = combineImageWithBackground( imgDn, pixBg, p ); |
210 | 210 | ||
211 | for ( uint i = 0; i < buttons.count(); i++ ) { | 211 | for ( uint i = 0; i < buttons.count(); i++ ) { |
212 | if ( !buttons[i].mask.isNull() ) { | 212 | if ( !buttons[i].mask.isNull() ) { |
213 | buttons[i].pixUp = maskPixToMask( pixUp, buttons[i].mask ); | 213 | buttons[i].pixUp = maskPixToMask( pixUp, buttons[i].mask ); |
214 | buttons[i].pixDown = maskPixToMask( pixDn, buttons[i].mask ); | 214 | buttons[i].pixDown = maskPixToMask( pixDn, buttons[i].mask ); |
215 | } | 215 | } |
216 | } | 216 | } |
217 | } | 217 | } |
218 | 218 | ||
219 | void AudioWidget::sliderPressed() { | 219 | void AudioWidget::sliderPressed() { |
220 | audioSliderBeingMoved = TRUE; | 220 | audioSliderBeingMoved = TRUE; |
221 | } | 221 | } |
222 | 222 | ||
223 | 223 | ||
224 | void AudioWidget::sliderReleased() { | 224 | void AudioWidget::sliderReleased() { |
225 | audioSliderBeingMoved = FALSE; | 225 | audioSliderBeingMoved = FALSE; |
226 | if ( slider.width() == 0 ) | 226 | if ( slider.width() == 0 ) |
227 | return; | 227 | return; |
228 | long val = long((double)slider.value() * mediaPlayerState.length() / slider.width()); | 228 | long val = long((double)slider.value() * mediaPlayerState.length() / slider.width()); |
229 | mediaPlayerState.setPosition( val ); | 229 | mediaPlayerState.setPosition( val ); |
230 | } | 230 | } |
231 | 231 | ||
232 | void AudioWidget::setPosition( long i ) { | 232 | void AudioWidget::setPosition( long i ) { |
233 | // qDebug("<<<<<<<<<<<<<<<<<<<<<<<<set position %d",i); | 233 | // qDebug("<<<<<<<<<<<<<<<<<<<<<<<<set position %d",i); |
234 | updateSlider( i, mediaPlayerState.length() ); | 234 | updateSlider( i, mediaPlayerState.length() ); |
235 | } | 235 | } |
236 | 236 | ||
237 | 237 | ||
238 | void AudioWidget::setLength( long max ) { | 238 | void AudioWidget::setLength( long max ) { |
239 | updateSlider( mediaPlayerState.position(), max ); | 239 | updateSlider( mediaPlayerState.position(), max ); |
240 | } | 240 | } |
241 | 241 | ||
242 | 242 | ||
243 | void AudioWidget::setDisplayType( MediaPlayerState::DisplayType mediaType ) { | 243 | void AudioWidget::setDisplayType( MediaPlayerState::DisplayType mediaType ) { |
244 | if ( mediaType == MediaPlayerState::Audio ) { | 244 | if ( mediaType == MediaPlayerState::Audio ) { |
245 | // startTimer( 150 ); | 245 | // startTimer( 150 ); |
246 | showMaximized(); | 246 | showMaximized(); |
247 | return; | 247 | return; |
248 | } | 248 | } |
249 | 249 | ||
250 | killTimers(); | 250 | killTimers(); |
251 | hide(); | 251 | hide(); |
252 | } | 252 | } |
253 | 253 | ||
254 | 254 | ||
255 | void AudioWidget::setSeekable( bool isSeekable ) { | 255 | void AudioWidget::setSeekable( bool isSeekable ) { |
256 | 256 | ||
257 | if ( !isSeekable ) { | 257 | if ( !isSeekable ) { |
258 | qDebug("<<<<<<<<<<<<<<file is STREAMING>>>>>>>>>>>>>>>>>>>"); | 258 | qDebug("<<<<<<<<<<<<<<file is STREAMING>>>>>>>>>>>>>>>>>>>"); |
259 | if( !slider.isHidden()) { | 259 | if( !slider.isHidden()) { |
260 | slider.hide(); | 260 | slider.hide(); |
261 | } | 261 | } |
262 | disconnect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); | 262 | disconnect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); |
263 | disconnect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); | 263 | disconnect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); |
264 | disconnect( &slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); | 264 | disconnect( &slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); |
265 | disconnect( &slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) ); | 265 | disconnect( &slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) ); |
266 | } else { | 266 | } else { |
267 | // this stops the slider from being moved, thus | 267 | // this stops the slider from being moved, thus |
268 | // does not stop stream when it reaches the end | 268 | // does not stop stream when it reaches the end |
269 | slider.show(); | 269 | slider.show(); |
270 | qDebug( " CONNECT SET POSTION " ); | 270 | qDebug( " CONNECT SET POSTION " ); |
271 | connect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); | 271 | connect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); |
272 | connect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); | 272 | connect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); |
273 | connect( &slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); | 273 | connect( &slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); |
274 | connect( &slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) ); | 274 | connect( &slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) ); |
275 | } | 275 | } |
276 | } | 276 | } |
277 | 277 | ||
278 | 278 | ||
279 | static QString timeAsString( long length ) { | 279 | static QString timeAsString( long length ) { |
280 | int minutes = length / 60; | 280 | int minutes = length / 60; |
281 | int seconds = length % 60; | 281 | int seconds = length % 60; |
282 | return QString("%1:%2%3").arg( minutes ).arg( seconds / 10 ).arg( seconds % 10 ); | 282 | return QString("%1:%2%3").arg( minutes ).arg( seconds / 10 ).arg( seconds % 10 ); |
283 | } | 283 | } |
284 | 284 | ||
285 | void AudioWidget::updateSlider( long i, long max ) { | 285 | void AudioWidget::updateSlider( long i, long max ) { |
286 | 286 | ||
287 | time.setText( timeAsString( i ) + " / " + timeAsString( max ) ); | 287 | time.setText( timeAsString( i ) + " / " + timeAsString( max ) ); |
288 | // qDebug( timeAsString( i ) + " / " + timeAsString( max ) ) ; | 288 | // qDebug( timeAsString( i ) + " / " + timeAsString( max ) ) ; |
289 | 289 | ||
290 | if ( max == 0 ) { | 290 | if ( max == 0 ) { |
291 | return; | 291 | return; |
292 | } | 292 | } |
293 | // Will flicker too much if we don't do this | 293 | // Will flicker too much if we don't do this |
294 | // Scale to something reasonable | 294 | // Scale to something reasonable |
295 | int width = slider.width(); | 295 | int width = slider.width(); |
296 | int val = int((double)i * width / max); | 296 | int val = int((double)i * width / max); |
297 | if ( !audioSliderBeingMoved ) { | 297 | if ( !audioSliderBeingMoved ) { |
298 | if ( slider.value() != val ) { | 298 | if ( slider.value() != val ) { |
299 | slider.setValue( val ); | 299 | slider.setValue( val ); |
300 | } | 300 | } |
301 | 301 | ||
302 | if ( slider.maxValue() != width ) { | 302 | if ( slider.maxValue() != width ) { |
303 | slider.setMaxValue( width ); | 303 | slider.setMaxValue( width ); |
304 | } | 304 | } |
305 | } | 305 | } |
306 | } | 306 | } |
307 | 307 | ||
308 | 308 | ||
309 | void AudioWidget::setToggleButton( int i, bool down ) { | 309 | void AudioWidget::setToggleButton( int i, bool down ) { |
310 | qDebug("setToggleButton %d", i); | 310 | qDebug("setToggleButton %d", i); |
311 | if ( down != buttons[i].isDown ) { | 311 | if ( down != buttons[i].isDown ) { |
312 | toggleButton( i ); | 312 | toggleButton( i ); |
313 | } | 313 | } |
314 | } | 314 | } |
315 | 315 | ||
316 | void AudioWidget::paintButton( QPainter &p, int i ) { | ||
317 | if ( buttons[i].isDown ) { | ||
318 | p.drawPixmap( upperLeftOfButtonMask, buttons[i].pixDown ); | ||
319 | } else { | ||
320 | p.drawPixmap( upperLeftOfButtonMask, buttons[i].pixUp ); | ||
321 | } | ||
322 | } | ||
323 | |||
324 | |||
325 | void AudioWidget::skipFor() { | 316 | void AudioWidget::skipFor() { |
326 | skipDirection = +1; | 317 | skipDirection = +1; |
327 | startTimer( 50 ); | 318 | startTimer( 50 ); |
328 | mediaPlayerState.setPosition( mediaPlayerState.position() + 2 ); | 319 | mediaPlayerState.setPosition( mediaPlayerState.position() + 2 ); |
329 | } | 320 | } |
330 | 321 | ||
331 | void AudioWidget::skipBack() { | 322 | void AudioWidget::skipBack() { |
332 | skipDirection = -1; | 323 | skipDirection = -1; |
333 | startTimer( 50 ); | 324 | startTimer( 50 ); |
334 | mediaPlayerState.setPosition( mediaPlayerState.position() - 2 ); | 325 | mediaPlayerState.setPosition( mediaPlayerState.position() - 2 ); |
335 | } | 326 | } |
336 | 327 | ||
337 | 328 | ||
338 | 329 | ||
339 | void AudioWidget::stopSkip() { | 330 | void AudioWidget::stopSkip() { |
340 | killTimers(); | 331 | killTimers(); |
341 | } | 332 | } |
342 | 333 | ||
343 | 334 | ||
344 | void AudioWidget::timerEvent( QTimerEvent * ) { | 335 | void AudioWidget::timerEvent( QTimerEvent * ) { |
345 | if ( skipDirection == +1 ) { | 336 | if ( skipDirection == +1 ) { |
346 | mediaPlayerState.setPosition( mediaPlayerState.position() + 2 ); | 337 | mediaPlayerState.setPosition( mediaPlayerState.position() + 2 ); |
347 | } else if ( skipDirection == -1 ) { | 338 | } else if ( skipDirection == -1 ) { |
348 | mediaPlayerState.setPosition( mediaPlayerState.position() - 2 ); | 339 | mediaPlayerState.setPosition( mediaPlayerState.position() - 2 ); |
349 | } | 340 | } |
350 | } | 341 | } |
351 | 342 | ||
352 | 343 | ||
353 | void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { | 344 | void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { |
354 | for ( unsigned int i = 0; i < buttons.count(); i++ ) { | 345 | for ( unsigned int i = 0; i < buttons.count(); i++ ) { |
355 | if ( event->state() == QMouseEvent::LeftButton ) { | 346 | if ( event->state() == QMouseEvent::LeftButton ) { |
356 | // The test to see if the mouse click is inside the button or not | 347 | // The test to see if the mouse click is inside the button or not |
357 | bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, i ); | 348 | bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, i ); |
358 | 349 | ||
359 | if ( isOnButton && !buttons[i].isHeld ) { | 350 | if ( isOnButton && !buttons[i].isHeld ) { |
360 | buttons[i].isHeld = TRUE; | 351 | buttons[i].isHeld = TRUE; |
361 | toggleButton(i); | 352 | toggleButton(i); |
362 | switch (i) { | 353 | switch (i) { |
363 | case VolumeUp: | 354 | case VolumeUp: |
364 | emit moreClicked(); | 355 | emit moreClicked(); |
365 | return; | 356 | return; |
366 | case VolumeDown: | 357 | case VolumeDown: |
367 | emit lessClicked(); | 358 | emit lessClicked(); |
368 | return; | 359 | return; |
369 | case Forward: | 360 | case Forward: |
370 | emit forwardClicked(); | 361 | emit forwardClicked(); |
371 | return; | 362 | return; |
372 | case Back: | 363 | case Back: |
373 | emit backClicked(); | 364 | emit backClicked(); |
374 | return; | 365 | return; |
375 | } | 366 | } |
376 | } else if ( !isOnButton && buttons[i].isHeld ) { | 367 | } else if ( !isOnButton && buttons[i].isHeld ) { |
377 | buttons[i].isHeld = FALSE; | 368 | buttons[i].isHeld = FALSE; |
378 | toggleButton(i); | 369 | toggleButton(i); |
379 | } | 370 | } |
380 | } else { | 371 | } else { |
381 | if ( buttons[i].isHeld ) { | 372 | if ( buttons[i].isHeld ) { |
382 | buttons[i].isHeld = FALSE; | 373 | buttons[i].isHeld = FALSE; |
383 | if ( buttons[i].type != ToggleButton ) { | 374 | if ( buttons[i].type != ToggleButton ) { |
384 | setToggleButton( i, FALSE ); | 375 | setToggleButton( i, FALSE ); |
385 | } | 376 | } |
386 | qDebug("mouseEvent %d", i); | 377 | qDebug("mouseEvent %d", i); |
387 | handleCommand( static_cast<Command>( i ), buttons[ i ].isDown ); | 378 | handleCommand( static_cast<Command>( i ), buttons[ i ].isDown ); |
388 | } | 379 | } |
389 | } | 380 | } |
390 | } | 381 | } |
391 | } | 382 | } |
392 | 383 | ||
393 | 384 | ||
394 | void AudioWidget::mousePressEvent( QMouseEvent *event ) { | 385 | void AudioWidget::mousePressEvent( QMouseEvent *event ) { |
395 | mouseMoveEvent( event ); | 386 | mouseMoveEvent( event ); |
396 | } | 387 | } |
397 | 388 | ||
398 | 389 | ||
399 | void AudioWidget::mouseReleaseEvent( QMouseEvent *event ) { | 390 | void AudioWidget::mouseReleaseEvent( QMouseEvent *event ) { |
400 | mouseMoveEvent( event ); | 391 | mouseMoveEvent( event ); |
401 | } | 392 | } |
402 | 393 | ||
403 | 394 | ||
404 | void AudioWidget::showEvent( QShowEvent* ) { | 395 | void AudioWidget::showEvent( QShowEvent* ) { |
405 | QMouseEvent event( QEvent::MouseMove, QPoint( 0, 0 ), 0, 0 ); | 396 | QMouseEvent event( QEvent::MouseMove, QPoint( 0, 0 ), 0, 0 ); |
406 | mouseMoveEvent( &event ); | 397 | mouseMoveEvent( &event ); |
407 | } | 398 | } |
408 | 399 | ||
409 | 400 | ||
410 | void AudioWidget::paintEvent( QPaintEvent * pe ) { | 401 | void AudioWidget::paintEvent( QPaintEvent * pe ) { |
411 | if ( !pe->erased() ) { | 402 | if ( !pe->erased() ) { |
412 | // Combine with background and double buffer | 403 | // Combine with background and double buffer |
413 | QPixmap pix( pe->rect().size() ); | 404 | QPixmap pix( pe->rect().size() ); |
414 | QPainter p( &pix ); | 405 | QPainter p( &pix ); |
415 | p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() ); | 406 | p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() ); |
416 | p.drawTiledPixmap( pe->rect(), pixBg, pe->rect().topLeft() ); | 407 | p.drawTiledPixmap( pe->rect(), pixBg, pe->rect().topLeft() ); |
417 | for ( unsigned int i = 0; i < buttons.count(); i++ ) | 408 | for ( unsigned int i = 0; i < buttons.count(); i++ ) |
418 | paintButton( p, i ); | 409 | paintButton( p, buttons[ i ] ); |
419 | QPainter p2( this ); | 410 | QPainter p2( this ); |
420 | p2.drawPixmap( pe->rect().topLeft(), pix ); | 411 | p2.drawPixmap( pe->rect().topLeft(), pix ); |
421 | } else { | 412 | } else { |
422 | QPainter p( this ); | 413 | QPainter p( this ); |
423 | for ( unsigned int i = 0; i < buttons.count(); i++ ) | 414 | for ( unsigned int i = 0; i < buttons.count(); i++ ) |
424 | paintButton( p, i ); | 415 | paintButton( p, buttons[ i ] ); |
425 | } | 416 | } |
426 | } | 417 | } |
427 | 418 | ||
428 | void AudioWidget::keyReleaseEvent( QKeyEvent *e) { | 419 | void AudioWidget::keyReleaseEvent( QKeyEvent *e) { |
429 | switch ( e->key() ) { | 420 | switch ( e->key() ) { |
430 | ////////////////////////////// Zaurus keys | 421 | ////////////////////////////// Zaurus keys |
431 | case Key_Home: | 422 | case Key_Home: |
432 | break; | 423 | break; |
433 | case Key_F9: //activity | 424 | case Key_F9: //activity |
434 | hide(); | 425 | hide(); |
435 | // qDebug("Audio F9"); | 426 | // qDebug("Audio F9"); |
436 | break; | 427 | break; |
437 | case Key_F10: //contacts | 428 | case Key_F10: //contacts |
438 | break; | 429 | break; |
439 | case Key_F11: //menu | 430 | case Key_F11: //menu |
440 | mediaPlayerState.toggleBlank(); | 431 | mediaPlayerState.toggleBlank(); |
441 | break; | 432 | break; |
442 | case Key_F12: //home | 433 | case Key_F12: //home |
443 | break; | 434 | break; |
444 | case Key_F13: //mail | 435 | case Key_F13: //mail |
445 | mediaPlayerState.toggleBlank(); | 436 | mediaPlayerState.toggleBlank(); |
446 | break; | 437 | break; |
447 | case Key_Space: { | 438 | case Key_Space: { |
448 | mediaPlayerState.togglePaused(); | 439 | mediaPlayerState.togglePaused(); |
449 | } | 440 | } |
450 | break; | 441 | break; |
451 | case Key_Down: | 442 | case Key_Down: |
452 | // toggleButton(6); | 443 | // toggleButton(6); |
453 | emit lessClicked(); | 444 | emit lessClicked(); |
454 | emit lessReleased(); | 445 | emit lessReleased(); |
455 | // toggleButton(6); | 446 | // toggleButton(6); |
456 | break; | 447 | break; |
457 | case Key_Up: | 448 | case Key_Up: |
458 | // toggleButton(5); | 449 | // toggleButton(5); |
459 | emit moreClicked(); | 450 | emit moreClicked(); |
460 | emit moreReleased(); | 451 | emit moreReleased(); |
461 | // toggleButton(5); | 452 | // toggleButton(5); |
462 | break; | 453 | break; |
463 | case Key_Right: | 454 | case Key_Right: |
464 | // toggleButton(3); | 455 | // toggleButton(3); |
465 | mediaPlayerState.setNext(); | 456 | mediaPlayerState.setNext(); |
466 | // toggleButton(3); | 457 | // toggleButton(3); |
467 | break; | 458 | break; |
468 | case Key_Left: | 459 | case Key_Left: |
469 | // toggleButton(4); | 460 | // toggleButton(4); |
470 | mediaPlayerState.setPrev(); | 461 | mediaPlayerState.setPrev(); |
471 | // toggleButton(4); | 462 | // toggleButton(4); |
472 | break; | 463 | break; |
473 | case Key_Escape: { | 464 | case Key_Escape: { |
474 | } | 465 | } |
475 | break; | 466 | break; |
476 | 467 | ||
477 | }; | 468 | }; |
478 | } | 469 | } |
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h index 332fb4b..7a775cd 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.h +++ b/noncore/multimedia/opieplayer2/audiowidget.h | |||
@@ -1,111 +1,110 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
3 | 3 | ||
4 | Copyright (c) 2002 Max Reiss <harlekin@handhelds.org> | 4 | Copyright (c) 2002 Max Reiss <harlekin@handhelds.org> |
5 | Copyright (c) 2002 L. Potter <ljp@llornkcor.com> | 5 | Copyright (c) 2002 L. Potter <ljp@llornkcor.com> |
6 | Copyright (c) 2002 Holger Freyther <zecke@handhelds.org> | 6 | Copyright (c) 2002 Holger Freyther <zecke@handhelds.org> |
7 | =. | 7 | =. |
8 | .=l. | 8 | .=l. |
9 | .>+-= | 9 | .>+-= |
10 | _;:, .> :=|. This program is free software; you can | 10 | _;:, .> :=|. This program is free software; you can |
11 | .> <`_, > . <= redistribute it and/or modify it under | 11 | .> <`_, > . <= redistribute it and/or modify it under |
12 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | 12 | :`=1 )Y*s>-.-- : the terms of the GNU General Public |
13 | .="- .-=="i, .._ License as published by the Free Software | 13 | .="- .-=="i, .._ License as published by the Free Software |
14 | - . .-<_> .<> Foundation; either version 2 of the License, | 14 | - . .-<_> .<> Foundation; either version 2 of the License, |
15 | ._= =} : or (at your option) any later version. | 15 | ._= =} : or (at your option) any later version. |
16 | .%`+i> _;_. | 16 | .%`+i> _;_. |
17 | .i_,=:_. -<s. This program is distributed in the hope that | 17 | .i_,=:_. -<s. This program is distributed in the hope that |
18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
19 | : .. .:, . . . without even the implied warranty of | 19 | : .. .:, . . . without even the implied warranty of |
20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
22 | ..}^=.= = ; Library General Public License for more | 22 | ..}^=.= = ; Library General Public License for more |
23 | ++= -. .` .: details. | 23 | ++= -. .` .: details. |
24 | : = ...= . :.=- | 24 | : = ...= . :.=- |
25 | -. .:....=;==+<; You should have received a copy of the GNU | 25 | -. .:....=;==+<; You should have received a copy of the GNU |
26 | -_. . . )=. = Library General Public License along with | 26 | -_. . . )=. = Library General Public License along with |
27 | -- :-=` this library; see the file COPYING.LIB. | 27 | -- :-=` this library; see the file COPYING.LIB. |
28 | If not, write to the Free Software Foundation, | 28 | If not, write to the Free Software Foundation, |
29 | Inc., 59 Temple Place - Suite 330, | 29 | Inc., 59 Temple Place - Suite 330, |
30 | Boston, MA 02111-1307, USA. | 30 | Boston, MA 02111-1307, USA. |
31 | 31 | ||
32 | */ | 32 | */ |
33 | 33 | ||
34 | #ifndef AUDIO_WIDGET_H | 34 | #ifndef AUDIO_WIDGET_H |
35 | #define AUDIO_WIDGET_H | 35 | #define AUDIO_WIDGET_H |
36 | 36 | ||
37 | #include <qpainter.h> | 37 | #include <qpainter.h> |
38 | #include <qdrawutil.h> | 38 | #include <qdrawutil.h> |
39 | #include <qpixmap.h> | 39 | #include <qpixmap.h> |
40 | #include <qstring.h> | 40 | #include <qstring.h> |
41 | #include <qslider.h> | 41 | #include <qslider.h> |
42 | #include <qframe.h> | 42 | #include <qframe.h> |
43 | #include <qlineedit.h> | 43 | #include <qlineedit.h> |
44 | #include <qimage.h> | 44 | #include <qimage.h> |
45 | 45 | ||
46 | #include <opie/oticker.h> | 46 | #include <opie/oticker.h> |
47 | 47 | ||
48 | #include "mediawidget.h" | 48 | #include "mediawidget.h" |
49 | 49 | ||
50 | class QPixmap; | 50 | class QPixmap; |
51 | 51 | ||
52 | class AudioWidget : public MediaWidget { | 52 | class AudioWidget : public MediaWidget { |
53 | Q_OBJECT | 53 | Q_OBJECT |
54 | public: | 54 | public: |
55 | AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent=0, const char* name=0 ); | 55 | AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent=0, const char* name=0 ); |
56 | ~AudioWidget(); | 56 | ~AudioWidget(); |
57 | void setTickerText( const QString &text ) { songInfo.setText( text ); } | 57 | void setTickerText( const QString &text ) { songInfo.setText( text ); } |
58 | public slots: | 58 | public slots: |
59 | void updateSlider( long, long ); | 59 | void updateSlider( long, long ); |
60 | void sliderPressed( ); | 60 | void sliderPressed( ); |
61 | void sliderReleased( ); | 61 | void sliderReleased( ); |
62 | void setLooping( bool b) { setToggleButton( Loop, b ); } | 62 | void setLooping( bool b) { setToggleButton( Loop, b ); } |
63 | void setPosition( long ); | 63 | void setPosition( long ); |
64 | void setSeekable( bool ); | 64 | void setSeekable( bool ); |
65 | 65 | ||
66 | public: | 66 | public: |
67 | virtual void setLength( long ); | 67 | virtual void setLength( long ); |
68 | virtual void setPlaying( bool b) { setToggleButton( Play, b ); } | 68 | virtual void setPlaying( bool b) { setToggleButton( Play, b ); } |
69 | virtual void setDisplayType( MediaPlayerState::DisplayType displayType ); | 69 | virtual void setDisplayType( MediaPlayerState::DisplayType displayType ); |
70 | 70 | ||
71 | signals: | 71 | signals: |
72 | void moreClicked(); | 72 | void moreClicked(); |
73 | void lessClicked(); | 73 | void lessClicked(); |
74 | void forwardClicked(); | 74 | void forwardClicked(); |
75 | void backClicked(); | 75 | void backClicked(); |
76 | void sliderMoved(long); | 76 | void sliderMoved(long); |
77 | 77 | ||
78 | protected: | 78 | protected: |
79 | void doBlank(); | 79 | void doBlank(); |
80 | void doUnblank(); | 80 | void doUnblank(); |
81 | void paintEvent( QPaintEvent *pe ); | 81 | void paintEvent( QPaintEvent *pe ); |
82 | void showEvent( QShowEvent *se ); | 82 | void showEvent( QShowEvent *se ); |
83 | void resizeEvent( QResizeEvent *re ); | 83 | void resizeEvent( QResizeEvent *re ); |
84 | void mouseMoveEvent( QMouseEvent *event ); | 84 | void mouseMoveEvent( QMouseEvent *event ); |
85 | void mousePressEvent( QMouseEvent *event ); | 85 | void mousePressEvent( QMouseEvent *event ); |
86 | void mouseReleaseEvent( QMouseEvent *event ); | 86 | void mouseReleaseEvent( QMouseEvent *event ); |
87 | void timerEvent( QTimerEvent *event ); | 87 | void timerEvent( QTimerEvent *event ); |
88 | void keyReleaseEvent( QKeyEvent *e); | 88 | void keyReleaseEvent( QKeyEvent *e); |
89 | private slots: | 89 | private slots: |
90 | void skipFor(); | 90 | void skipFor(); |
91 | void skipBack(); | 91 | void skipBack(); |
92 | void stopSkip(); | 92 | void stopSkip(); |
93 | private: | 93 | private: |
94 | void setToggleButton( int, bool ); | 94 | void setToggleButton( int, bool ); |
95 | virtual void paintButton( QPainter &p, int i ); | ||
96 | int skipDirection; | 95 | int skipDirection; |
97 | QString skin; | 96 | QString skin; |
98 | QPixmap pixBg; | 97 | QPixmap pixBg; |
99 | QImage imgUp; | 98 | QImage imgUp; |
100 | QImage imgDn; | 99 | QImage imgDn; |
101 | 100 | ||
102 | OTicker songInfo; | 101 | OTicker songInfo; |
103 | QSlider slider; | 102 | QSlider slider; |
104 | QLineEdit time; | 103 | QLineEdit time; |
105 | bool isStreaming : 1; | 104 | bool isStreaming : 1; |
106 | bool audioSliderBeingMoved : 1; | 105 | bool audioSliderBeingMoved : 1; |
107 | }; | 106 | }; |
108 | 107 | ||
109 | 108 | ||
110 | #endif // AUDIO_WIDGET_H | 109 | #endif // AUDIO_WIDGET_H |
111 | 110 | ||
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp index 62266ad..f977b61 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.cpp +++ b/noncore/multimedia/opieplayer2/mediawidget.cpp | |||
@@ -1,84 +1,92 @@ | |||
1 | /* | 1 | /* |
2 | Copyright (C) 2002 Simon Hausmann <hausmann@kde.org> | 2 | Copyright (C) 2002 Simon Hausmann <hausmann@kde.org> |
3 | (C) 2002 Max Reiss <harlekin@handhelds.org> | 3 | (C) 2002 Max Reiss <harlekin@handhelds.org> |
4 | (C) 2002 L. Potter <ljp@llornkcor.com> | 4 | (C) 2002 L. Potter <ljp@llornkcor.com> |
5 | (C) 2002 Holger Freyther <zecke@handhelds.org> | 5 | (C) 2002 Holger Freyther <zecke@handhelds.org> |
6 | 6 | ||
7 | This library is free software; you can redistribute it and/or | 7 | This library is free software; you can redistribute it and/or |
8 | modify it under the terms of the GNU Library General Public | 8 | modify it under the terms of the GNU Library General Public |
9 | License as published by the Free Software Foundation; either | 9 | License as published by the Free Software Foundation; either |
10 | version 2 of the License, or (at your option) any later version. | 10 | version 2 of the License, or (at your option) any later version. |
11 | 11 | ||
12 | This library is distributed in the hope that it will be useful, | 12 | This library is distributed in the hope that it will be useful, |
13 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 13 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
15 | Library General Public License for more details. | 15 | Library General Public License for more details. |
16 | 16 | ||
17 | You should have received a copy of the GNU Library General Public License | 17 | You should have received a copy of the GNU Library General Public License |
18 | along with this library; see the file COPYING.LIB. If not, write to | 18 | along with this library; see the file COPYING.LIB. If not, write to |
19 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 19 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
20 | Boston, MA 02111-1307, USA. | 20 | Boston, MA 02111-1307, USA. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | 23 | ||
24 | #include "mediawidget.h" | 24 | #include "mediawidget.h" |
25 | #include "playlistwidget.h" | 25 | #include "playlistwidget.h" |
26 | 26 | ||
27 | MediaWidget::MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent, const char *name ) | 27 | MediaWidget::MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent, const char *name ) |
28 | : QWidget( parent, name ), mediaPlayerState( _mediaPlayerState ), playList( _playList ) | 28 | : QWidget( parent, name ), mediaPlayerState( _mediaPlayerState ), playList( _playList ) |
29 | { | 29 | { |
30 | connect( &mediaPlayerState, SIGNAL( displayTypeChanged( MediaPlayerState::DisplayType ) ), | 30 | connect( &mediaPlayerState, SIGNAL( displayTypeChanged( MediaPlayerState::DisplayType ) ), |
31 | this, SLOT( setDisplayType( MediaPlayerState::DisplayType ) ) ); | 31 | this, SLOT( setDisplayType( MediaPlayerState::DisplayType ) ) ); |
32 | connect( &mediaPlayerState, SIGNAL( lengthChanged( long ) ), | 32 | connect( &mediaPlayerState, SIGNAL( lengthChanged( long ) ), |
33 | this, SLOT( setLength( long ) ) ); | 33 | this, SLOT( setLength( long ) ) ); |
34 | connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ), | 34 | connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ), |
35 | this, SLOT( setPlaying( bool ) ) ); | 35 | this, SLOT( setPlaying( bool ) ) ); |
36 | } | 36 | } |
37 | 37 | ||
38 | MediaWidget::~MediaWidget() | 38 | MediaWidget::~MediaWidget() |
39 | { | 39 | { |
40 | } | 40 | } |
41 | 41 | ||
42 | void MediaWidget::closeEvent( QCloseEvent * ) | 42 | void MediaWidget::closeEvent( QCloseEvent * ) |
43 | { | 43 | { |
44 | mediaPlayerState.setList(); | 44 | mediaPlayerState.setList(); |
45 | } | 45 | } |
46 | 46 | ||
47 | void MediaWidget::handleCommand( Command command, bool buttonDown ) | 47 | void MediaWidget::handleCommand( Command command, bool buttonDown ) |
48 | { | 48 | { |
49 | switch ( command ) { | 49 | switch ( command ) { |
50 | case Play: mediaPlayerState.togglePaused(); | 50 | case Play: mediaPlayerState.togglePaused(); |
51 | case Stop: mediaPlayerState.setPlaying(FALSE); return; | 51 | case Stop: mediaPlayerState.setPlaying(FALSE); return; |
52 | case Next: if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setNext(); return; | 52 | case Next: if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setNext(); return; |
53 | case Previous: if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setPrev(); return; | 53 | case Previous: if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setPrev(); return; |
54 | case Loop: mediaPlayerState.setLooping( buttonDown ); return; | 54 | case Loop: mediaPlayerState.setLooping( buttonDown ); return; |
55 | case VolumeUp: emit moreReleased(); return; | 55 | case VolumeUp: emit moreReleased(); return; |
56 | case VolumeDown: emit lessReleased(); return; | 56 | case VolumeDown: emit lessReleased(); return; |
57 | case PlayList: mediaPlayerState.setList(); return; | 57 | case PlayList: mediaPlayerState.setList(); return; |
58 | case Forward: emit forwardReleased(); return; | 58 | case Forward: emit forwardReleased(); return; |
59 | case Back: emit backReleased(); return; | 59 | case Back: emit backReleased(); return; |
60 | } | 60 | } |
61 | } | 61 | } |
62 | 62 | ||
63 | bool MediaWidget::isOverButton( const QPoint &position, int buttonId ) const | 63 | bool MediaWidget::isOverButton( const QPoint &position, int buttonId ) const |
64 | { | 64 | { |
65 | return ( position.x() > 0 && position.y() > 0 && | 65 | return ( position.x() > 0 && position.y() > 0 && |
66 | position.x() < buttonMask.width() && | 66 | position.x() < buttonMask.width() && |
67 | position.y() < buttonMask.height() && | 67 | position.y() < buttonMask.height() && |
68 | buttonMask.pixelIndex( position.x(), position.y() ) == buttonId + 1 ); | 68 | buttonMask.pixelIndex( position.x(), position.y() ) == buttonId + 1 ); |
69 | } | 69 | } |
70 | 70 | ||
71 | void MediaWidget::paintButton( int buttonId ) | 71 | void MediaWidget::paintButton( int buttonId ) |
72 | { | 72 | { |
73 | QPainter p( this ); | 73 | QPainter p( this ); |
74 | paintButton( p, buttonId ); | 74 | paintButton( p, buttons[ buttonId ] ); |
75 | } | ||
76 | |||
77 | void MediaWidget::paintButton( QPainter &p, const Button &button ) | ||
78 | { | ||
79 | if ( button.isDown ) | ||
80 | p.drawPixmap( upperLeftOfButtonMask, button.pixDown ); | ||
81 | else | ||
82 | p.drawPixmap( upperLeftOfButtonMask, button.pixUp ); | ||
75 | } | 83 | } |
76 | 84 | ||
77 | void MediaWidget::toggleButton( int buttonId ) | 85 | void MediaWidget::toggleButton( int buttonId ) |
78 | { | 86 | { |
79 | buttons[ buttonId ].isDown = !buttons[ buttonId ].isDown; | 87 | buttons[ buttonId ].isDown = !buttons[ buttonId ].isDown; |
80 | paintButton( buttonId ); | 88 | paintButton( buttonId ); |
81 | } | 89 | } |
82 | 90 | ||
83 | /* vim: et sw=4 ts=4 | 91 | /* vim: et sw=4 ts=4 |
84 | */ | 92 | */ |
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h index 49bf024..163f449 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.h +++ b/noncore/multimedia/opieplayer2/mediawidget.h | |||
@@ -1,105 +1,105 @@ | |||
1 | /* | 1 | /* |
2 | Copyright (C) 2002 Simon Hausmann <hausmann@kde.org> | 2 | Copyright (C) 2002 Simon Hausmann <hausmann@kde.org> |
3 | (C) 2002 Max Reiss <harlekin@handhelds.org> | 3 | (C) 2002 Max Reiss <harlekin@handhelds.org> |
4 | (C) 2002 L. Potter <ljp@llornkcor.com> | 4 | (C) 2002 L. Potter <ljp@llornkcor.com> |
5 | (C) 2002 Holger Freyther <zecke@handhelds.org> | 5 | (C) 2002 Holger Freyther <zecke@handhelds.org> |
6 | 6 | ||
7 | This library is free software; you can redistribute it and/or | 7 | This library is free software; you can redistribute it and/or |
8 | modify it under the terms of the GNU Library General Public | 8 | modify it under the terms of the GNU Library General Public |
9 | License as published by the Free Software Foundation; either | 9 | License as published by the Free Software Foundation; either |
10 | version 2 of the License, or (at your option) any later version. | 10 | version 2 of the License, or (at your option) any later version. |
11 | 11 | ||
12 | This library is distributed in the hope that it will be useful, | 12 | This library is distributed in the hope that it will be useful, |
13 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 13 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
15 | Library General Public License for more details. | 15 | Library General Public License for more details. |
16 | 16 | ||
17 | You should have received a copy of the GNU Library General Public License | 17 | You should have received a copy of the GNU Library General Public License |
18 | along with this library; see the file COPYING.LIB. If not, write to | 18 | along with this library; see the file COPYING.LIB. If not, write to |
19 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 19 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
20 | Boston, MA 02111-1307, USA. | 20 | Boston, MA 02111-1307, USA. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef MEDIAWIDGET_H | 23 | #ifndef MEDIAWIDGET_H |
24 | #define MEDIAWIDGET_H | 24 | #define MEDIAWIDGET_H |
25 | 25 | ||
26 | #include <qwidget.h> | 26 | #include <qwidget.h> |
27 | #include <qmap.h> | 27 | #include <qmap.h> |
28 | 28 | ||
29 | #include "mediaplayerstate.h" | 29 | #include "mediaplayerstate.h" |
30 | #include "playlistwidget.h" | 30 | #include "playlistwidget.h" |
31 | 31 | ||
32 | #include <vector> | 32 | #include <vector> |
33 | 33 | ||
34 | class MediaWidget : public QWidget | 34 | class MediaWidget : public QWidget |
35 | { | 35 | { |
36 | Q_OBJECT | 36 | Q_OBJECT |
37 | public: | 37 | public: |
38 | enum Command { Play = 0, Stop, Next, Previous, VolumeUp, VolumeDown, Loop, PlayList, Forward, Back }; | 38 | enum Command { Play = 0, Stop, Next, Previous, VolumeUp, VolumeDown, Loop, PlayList, Forward, Back }; |
39 | enum ButtonType { NormalButton, ToggleButton }; | 39 | enum ButtonType { NormalButton, ToggleButton }; |
40 | 40 | ||
41 | struct Button | 41 | struct Button |
42 | { | 42 | { |
43 | Button() : type( NormalButton ), isHeld( false ), isDown( false ) {} | 43 | Button() : type( NormalButton ), isHeld( false ), isDown( false ) {} |
44 | 44 | ||
45 | ButtonType type : 1; | 45 | ButtonType type : 1; |
46 | bool isHeld : 1; | 46 | bool isHeld : 1; |
47 | bool isDown : 1; | 47 | bool isDown : 1; |
48 | 48 | ||
49 | QBitmap mask; | 49 | QBitmap mask; |
50 | QPixmap pixUp; | 50 | QPixmap pixUp; |
51 | QPixmap pixDown; | 51 | QPixmap pixDown; |
52 | }; | 52 | }; |
53 | typedef std::vector<Button> ButtonVector; | 53 | typedef std::vector<Button> ButtonVector; |
54 | // when the transition is done this should be Command -> Button | 54 | // when the transition is done this should be Command -> Button |
55 | typedef QMap<int, Button> ButtonMap; | 55 | typedef QMap<int, Button> ButtonMap; |
56 | 56 | ||
57 | struct SkinButtonInfo | 57 | struct SkinButtonInfo |
58 | { | 58 | { |
59 | Command command; | 59 | Command command; |
60 | const char *fileName; | 60 | const char *fileName; |
61 | ButtonType type; | 61 | ButtonType type; |
62 | }; | 62 | }; |
63 | 63 | ||
64 | typedef std::vector<QBitmap> MaskVector; | 64 | typedef std::vector<QBitmap> MaskVector; |
65 | typedef std::vector<QPixmap> PixmapVector; | 65 | typedef std::vector<QPixmap> PixmapVector; |
66 | 66 | ||
67 | MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent = 0, const char *name = 0 ); | 67 | MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent = 0, const char *name = 0 ); |
68 | virtual ~MediaWidget(); | 68 | virtual ~MediaWidget(); |
69 | 69 | ||
70 | public slots: | 70 | public slots: |
71 | virtual void setDisplayType( MediaPlayerState::DisplayType displayType ) = 0; | 71 | virtual void setDisplayType( MediaPlayerState::DisplayType displayType ) = 0; |
72 | virtual void setLength( long length ) = 0; | 72 | virtual void setLength( long length ) = 0; |
73 | virtual void setPlaying( bool playing ) = 0; | 73 | virtual void setPlaying( bool playing ) = 0; |
74 | 74 | ||
75 | signals: | 75 | signals: |
76 | void moreReleased(); | 76 | void moreReleased(); |
77 | void lessReleased(); | 77 | void lessReleased(); |
78 | void forwardReleased(); | 78 | void forwardReleased(); |
79 | void backReleased(); | 79 | void backReleased(); |
80 | 80 | ||
81 | protected: | 81 | protected: |
82 | virtual void closeEvent( QCloseEvent * ); | 82 | virtual void closeEvent( QCloseEvent * ); |
83 | 83 | ||
84 | void handleCommand( Command command, bool buttonDown ); | 84 | void handleCommand( Command command, bool buttonDown ); |
85 | 85 | ||
86 | bool isOverButton( const QPoint &position, int buttonId ) const; | 86 | bool isOverButton( const QPoint &position, int buttonId ) const; |
87 | 87 | ||
88 | void paintButton( int buttonId ); | 88 | void paintButton( int buttonId ); |
89 | virtual void paintButton( QPainter &p, int i ) = 0; | 89 | void paintButton( QPainter &p, const Button &button ); |
90 | 90 | ||
91 | void toggleButton( int buttonId ); | 91 | void toggleButton( int buttonId ); |
92 | 92 | ||
93 | MediaPlayerState &mediaPlayerState; | 93 | MediaPlayerState &mediaPlayerState; |
94 | PlayListWidget &playList; | 94 | PlayListWidget &playList; |
95 | 95 | ||
96 | ButtonMap buttons; | 96 | ButtonMap buttons; |
97 | 97 | ||
98 | QImage buttonMask; | 98 | QImage buttonMask; |
99 | 99 | ||
100 | QPoint upperLeftOfButtonMask; | 100 | QPoint upperLeftOfButtonMask; |
101 | }; | 101 | }; |
102 | 102 | ||
103 | #endif // MEDIAWIDGET_H | 103 | #endif // MEDIAWIDGET_H |
104 | /* vim: et sw=4 ts=4 | 104 | /* vim: et sw=4 ts=4 |
105 | */ | 105 | */ |
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index 3baa087..a483434 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -1,481 +1,470 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
3 | 3 | ||
4 | Copyright (c) 2002 Max Reiss <harlekin@handhelds.org> | 4 | Copyright (c) 2002 Max Reiss <harlekin@handhelds.org> |
5 | Copyright (c) 2002 L. Potter <ljp@llornkcor.com> | 5 | Copyright (c) 2002 L. Potter <ljp@llornkcor.com> |
6 | Copyright (c) 2002 Holger Freyther <zecke@handhelds.org> | 6 | Copyright (c) 2002 Holger Freyther <zecke@handhelds.org> |
7 | =. | 7 | =. |
8 | .=l. | 8 | .=l. |
9 | .>+-= | 9 | .>+-= |
10 | _;:, .> :=|. This program is free software; you can | 10 | _;:, .> :=|. This program is free software; you can |
11 | .> <`_, > . <= redistribute it and/or modify it under | 11 | .> <`_, > . <= redistribute it and/or modify it under |
12 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | 12 | :`=1 )Y*s>-.-- : the terms of the GNU General Public |
13 | .="- .-=="i, .._ License as published by the Free Software | 13 | .="- .-=="i, .._ License as published by the Free Software |
14 | - . .-<_> .<> Foundation; either version 2 of the License, | 14 | - . .-<_> .<> Foundation; either version 2 of the License, |
15 | ._= =} : or (at your option) any later version. | 15 | ._= =} : or (at your option) any later version. |
16 | .%`+i> _;_. | 16 | .%`+i> _;_. |
17 | .i_,=:_. -<s. This program is distributed in the hope that | 17 | .i_,=:_. -<s. This program is distributed in the hope that |
18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
19 | : .. .:, . . . without even the implied warranty of | 19 | : .. .:, . . . without even the implied warranty of |
20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
22 | ..}^=.= = ; Library General Public License for more | 22 | ..}^=.= = ; Library General Public License for more |
23 | ++= -. .` .: details. | 23 | ++= -. .` .: details. |
24 | : = ...= . :.=- | 24 | : = ...= . :.=- |
25 | -. .:....=;==+<; You should have received a copy of the GNU | 25 | -. .:....=;==+<; You should have received a copy of the GNU |
26 | -_. . . )=. = Library General Public License along with | 26 | -_. . . )=. = Library General Public License along with |
27 | -- :-=` this library; see the file COPYING.LIB. | 27 | -- :-=` this library; see the file COPYING.LIB. |
28 | If not, write to the Free Software Foundation, | 28 | If not, write to the Free Software Foundation, |
29 | Inc., 59 Temple Place - Suite 330, | 29 | Inc., 59 Temple Place - Suite 330, |
30 | Boston, MA 02111-1307, USA. | 30 | Boston, MA 02111-1307, USA. |
31 | 31 | ||
32 | */ | 32 | */ |
33 | 33 | ||
34 | #include <qpe/qpeapplication.h> | 34 | #include <qpe/qpeapplication.h> |
35 | #include <qpe/resource.h> | 35 | #include <qpe/resource.h> |
36 | #include <qpe/config.h> | 36 | #include <qpe/config.h> |
37 | 37 | ||
38 | 38 | ||
39 | #include <qwidget.h> | 39 | #include <qwidget.h> |
40 | #include <qpainter.h> | 40 | #include <qpainter.h> |
41 | #include <qpixmap.h> | 41 | #include <qpixmap.h> |
42 | #include <qslider.h> | 42 | #include <qslider.h> |
43 | #include <qdrawutil.h> | 43 | #include <qdrawutil.h> |
44 | #include "videowidget.h" | 44 | #include "videowidget.h" |
45 | #include "mediaplayerstate.h" | 45 | #include "mediaplayerstate.h" |
46 | #include "playlistwidget.h" | 46 | #include "playlistwidget.h" |
47 | 47 | ||
48 | 48 | ||
49 | #ifdef Q_WS_QWS | 49 | #ifdef Q_WS_QWS |
50 | # define USE_DIRECT_PAINTER | 50 | # define USE_DIRECT_PAINTER |
51 | # include <qdirectpainter_qws.h> | 51 | # include <qdirectpainter_qws.h> |
52 | # include <qgfxraster_qws.h> | 52 | # include <qgfxraster_qws.h> |
53 | #endif | 53 | #endif |
54 | 54 | ||
55 | 55 | ||
56 | namespace | 56 | namespace |
57 | { | 57 | { |
58 | 58 | ||
59 | const int xo = 2; // movable x offset | 59 | const int xo = 2; // movable x offset |
60 | const int yo = 0; // movable y offset | 60 | const int yo = 0; // movable y offset |
61 | 61 | ||
62 | const char * const skinV_mask_file_names[7] = { | 62 | const char * const skinV_mask_file_names[7] = { |
63 | "play","stop","fwd","back","up","down","full" | 63 | "play","stop","fwd","back","up","down","full" |
64 | }; | 64 | }; |
65 | 65 | ||
66 | } | 66 | } |
67 | 67 | ||
68 | VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name ) | 68 | VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name ) |
69 | : MediaWidget( playList, mediaPlayerState, parent, name ), scaledWidth( 0 ), scaledHeight( 0 ) | 69 | : MediaWidget( playList, mediaPlayerState, parent, name ), scaledWidth( 0 ), scaledHeight( 0 ) |
70 | { | 70 | { |
71 | setCaption( tr("OpiePlayer - Video") ); | 71 | setCaption( tr("OpiePlayer - Video") ); |
72 | 72 | ||
73 | Button defaultButton; | 73 | Button defaultButton; |
74 | Button toggleButton = defaultButton; | 74 | Button toggleButton = defaultButton; |
75 | toggleButton.type = ToggleButton; | 75 | toggleButton.type = ToggleButton; |
76 | 76 | ||
77 | buttons.insert( 0, toggleButton ); // play | 77 | buttons.insert( 0, toggleButton ); // play |
78 | buttons.insert( 1, toggleButton ); // stop | 78 | buttons.insert( 1, toggleButton ); // stop |
79 | buttons.insert( 2, toggleButton ); // next | 79 | buttons.insert( 2, toggleButton ); // next |
80 | buttons.insert( 3, toggleButton ); // previous | 80 | buttons.insert( 3, toggleButton ); // previous |
81 | buttons.insert( 4, toggleButton ); // volUp | 81 | buttons.insert( 4, toggleButton ); // volUp |
82 | buttons.insert( 5, toggleButton ); // volDown | 82 | buttons.insert( 5, toggleButton ); // volDown |
83 | buttons.insert( 6, toggleButton ); // fullscreen | 83 | buttons.insert( 6, toggleButton ); // fullscreen |
84 | 84 | ||
85 | videoFrame = new XineVideoWidget ( this, "Video frame" ); | 85 | videoFrame = new XineVideoWidget ( this, "Video frame" ); |
86 | 86 | ||
87 | connect ( videoFrame, SIGNAL( videoResized ( const QSize & )), this, SIGNAL( videoResized ( const QSize & ))); | 87 | connect ( videoFrame, SIGNAL( videoResized ( const QSize & )), this, SIGNAL( videoResized ( const QSize & ))); |
88 | connect ( videoFrame, SIGNAL( clicked () ), this, SLOT ( backToNormal() ) ); | 88 | connect ( videoFrame, SIGNAL( clicked () ), this, SLOT ( backToNormal() ) ); |
89 | 89 | ||
90 | Config cfg("OpiePlayer"); | 90 | Config cfg("OpiePlayer"); |
91 | cfg.setGroup("Options"); | 91 | cfg.setGroup("Options"); |
92 | skin = cfg.readEntry("Skin","default"); | 92 | skin = cfg.readEntry("Skin","default"); |
93 | 93 | ||
94 | QString skinPath = "opieplayer2/skins/" + skin; | 94 | QString skinPath = "opieplayer2/skins/" + skin; |
95 | pixBg = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); | 95 | pixBg = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); |
96 | imgUp = QImage( Resource::loadImage( QString("%1/skinV_up").arg(skinPath) ) ); | 96 | imgUp = QImage( Resource::loadImage( QString("%1/skinV_up").arg(skinPath) ) ); |
97 | imgDn = QImage( Resource::loadImage( QString("%1/skinV_down").arg(skinPath) ) ); | 97 | imgDn = QImage( Resource::loadImage( QString("%1/skinV_down").arg(skinPath) ) ); |
98 | 98 | ||
99 | buttonMask = QImage( imgUp.width(), imgUp.height(), 8, 255 ); | 99 | buttonMask = QImage( imgUp.width(), imgUp.height(), 8, 255 ); |
100 | buttonMask.fill( 0 ); | 100 | buttonMask.fill( 0 ); |
101 | 101 | ||
102 | for ( int i = 0; i < 7; i++ ) { | 102 | for ( int i = 0; i < 7; i++ ) { |
103 | Button &button = buttons[ i ]; | 103 | Button &button = buttons[ i ]; |
104 | 104 | ||
105 | QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath + "/skinV_mask_" + skinV_mask_file_names[i] + ".png" ); | 105 | QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath + "/skinV_mask_" + skinV_mask_file_names[i] + ".png" ); |
106 | button.mask = QBitmap( filename ); | 106 | button.mask = QBitmap( filename ); |
107 | 107 | ||
108 | if ( !button.mask.isNull() ) { | 108 | if ( !button.mask.isNull() ) { |
109 | QImage imgMask = button.mask.convertToImage(); | 109 | QImage imgMask = button.mask.convertToImage(); |
110 | uchar **dest = buttonMask.jumpTable(); | 110 | uchar **dest = buttonMask.jumpTable(); |
111 | for ( int y = 0; y < imgUp.height(); y++ ) { | 111 | for ( int y = 0; y < imgUp.height(); y++ ) { |
112 | uchar *line = dest[y]; | 112 | uchar *line = dest[y]; |
113 | for ( int x = 0; x < imgUp.width(); x++ ) { | 113 | for ( int x = 0; x < imgUp.width(); x++ ) { |
114 | if ( !qRed( imgMask.pixel( x, y ) ) ) | 114 | if ( !qRed( imgMask.pixel( x, y ) ) ) |
115 | line[x] = i + 1; | 115 | line[x] = i + 1; |
116 | } | 116 | } |
117 | } | 117 | } |
118 | } | 118 | } |
119 | } | 119 | } |
120 | 120 | ||
121 | setBackgroundPixmap( pixBg ); | 121 | setBackgroundPixmap( pixBg ); |
122 | 122 | ||
123 | slider = new QSlider( Qt::Horizontal, this ); | 123 | slider = new QSlider( Qt::Horizontal, this ); |
124 | slider->setMinValue( 0 ); | 124 | slider->setMinValue( 0 ); |
125 | slider->setMaxValue( 1 ); | 125 | slider->setMaxValue( 1 ); |
126 | slider->setBackgroundPixmap( Resource::loadPixmap( backgroundPix ) ); | 126 | slider->setBackgroundPixmap( Resource::loadPixmap( backgroundPix ) ); |
127 | //slider->setFocusPolicy( QWidget::NoFocus ); | 127 | //slider->setFocusPolicy( QWidget::NoFocus ); |
128 | 128 | ||
129 | resizeEvent( NULL ); | 129 | resizeEvent( NULL ); |
130 | 130 | ||
131 | setLength( mediaPlayerState.length() ); | 131 | setLength( mediaPlayerState.length() ); |
132 | setPosition( mediaPlayerState.position() ); | 132 | setPosition( mediaPlayerState.position() ); |
133 | setFullscreen( mediaPlayerState.isFullscreen() ); | 133 | setFullscreen( mediaPlayerState.isFullscreen() ); |
134 | setPlaying( mediaPlayerState.isPlaying() ); | 134 | setPlaying( mediaPlayerState.isPlaying() ); |
135 | } | 135 | } |
136 | 136 | ||
137 | 137 | ||
138 | VideoWidget::~VideoWidget() | 138 | VideoWidget::~VideoWidget() |
139 | { | 139 | { |
140 | } | 140 | } |
141 | 141 | ||
142 | QPixmap *combineVImageWithBackground( QImage img, QPixmap bg, QPoint offset ) { | 142 | QPixmap *combineVImageWithBackground( QImage img, QPixmap bg, QPoint offset ) { |
143 | QPixmap pix( img.width(), img.height() ); | 143 | QPixmap pix( img.width(), img.height() ); |
144 | QPainter p( &pix ); | 144 | QPainter p( &pix ); |
145 | p.drawTiledPixmap( pix.rect(), bg, offset ); | 145 | p.drawTiledPixmap( pix.rect(), bg, offset ); |
146 | p.drawImage( 0, 0, img ); | 146 | p.drawImage( 0, 0, img ); |
147 | return new QPixmap( pix ); | 147 | return new QPixmap( pix ); |
148 | } | 148 | } |
149 | 149 | ||
150 | QPixmap maskVPixToMask( QPixmap pix, QBitmap mask ) { | 150 | QPixmap maskVPixToMask( QPixmap pix, QBitmap mask ) { |
151 | QPixmap pixmap( pix ); | 151 | QPixmap pixmap( pix ); |
152 | pixmap.setMask( mask ); | 152 | pixmap.setMask( mask ); |
153 | return pixmap; | 153 | return pixmap; |
154 | } | 154 | } |
155 | 155 | ||
156 | void VideoWidget::resizeEvent( QResizeEvent * ) { | 156 | void VideoWidget::resizeEvent( QResizeEvent * ) { |
157 | int h = height(); | 157 | int h = height(); |
158 | int w = width(); | 158 | int w = width(); |
159 | //int Vh = 160; | 159 | //int Vh = 160; |
160 | //int Vw = 220; | 160 | //int Vw = 220; |
161 | 161 | ||
162 | slider->setFixedWidth( w - 20 ); | 162 | slider->setFixedWidth( w - 20 ); |
163 | slider->setGeometry( QRect( 15, h - 22, w - 90, 20 ) ); | 163 | slider->setGeometry( QRect( 15, h - 22, w - 90, 20 ) ); |
164 | slider->setBackgroundOrigin( QWidget::ParentOrigin ); | 164 | slider->setBackgroundOrigin( QWidget::ParentOrigin ); |
165 | slider->setFocusPolicy( QWidget::NoFocus ); | 165 | slider->setFocusPolicy( QWidget::NoFocus ); |
166 | slider->setBackgroundPixmap( pixBg ); | 166 | slider->setBackgroundPixmap( pixBg ); |
167 | 167 | ||
168 | upperLeftOfButtonMask.rx() = 0;// ( imgUp->width() ) / 2; | 168 | upperLeftOfButtonMask.rx() = 0;// ( imgUp->width() ) / 2; |
169 | if(w>h) | 169 | if(w>h) |
170 | upperLeftOfButtonMask.ry() = 0; | 170 | upperLeftOfButtonMask.ry() = 0; |
171 | else | 171 | else |
172 | upperLeftOfButtonMask.ry() = 185;//(( Vh - imgUp->height() ) / 2) - 10; | 172 | upperLeftOfButtonMask.ry() = 185;//(( Vh - imgUp->height() ) / 2) - 10; |
173 | QPoint p = upperLeftOfButtonMask; | 173 | QPoint p = upperLeftOfButtonMask; |
174 | 174 | ||
175 | QPixmap *pixUp = combineVImageWithBackground( imgUp, pixBg, p ); | 175 | QPixmap *pixUp = combineVImageWithBackground( imgUp, pixBg, p ); |
176 | QPixmap *pixDn = combineVImageWithBackground( imgDn, pixBg, p ); | 176 | QPixmap *pixDn = combineVImageWithBackground( imgDn, pixBg, p ); |
177 | 177 | ||
178 | for ( int i = 0; i < 7; i++ ) { | 178 | for ( int i = 0; i < 7; i++ ) { |
179 | Button &button = buttons[ i ]; | 179 | Button &button = buttons[ i ]; |
180 | 180 | ||
181 | if ( !button.mask.isNull() ) { | 181 | if ( !button.mask.isNull() ) { |
182 | button.pixUp = maskVPixToMask( *pixUp, button.mask ); | 182 | button.pixUp = maskVPixToMask( *pixUp, button.mask ); |
183 | button.pixDown = maskVPixToMask( *pixDn, button.mask ); | 183 | button.pixDown = maskVPixToMask( *pixDn, button.mask ); |
184 | } | 184 | } |
185 | } | 185 | } |
186 | 186 | ||
187 | delete pixUp; | 187 | delete pixUp; |
188 | delete pixDn; | 188 | delete pixDn; |
189 | } | 189 | } |
190 | 190 | ||
191 | static bool videoSliderBeingMoved = FALSE; | 191 | static bool videoSliderBeingMoved = FALSE; |
192 | 192 | ||
193 | void VideoWidget::sliderPressed() { | 193 | void VideoWidget::sliderPressed() { |
194 | videoSliderBeingMoved = TRUE; | 194 | videoSliderBeingMoved = TRUE; |
195 | } | 195 | } |
196 | 196 | ||
197 | void VideoWidget::sliderReleased() { | 197 | void VideoWidget::sliderReleased() { |
198 | videoSliderBeingMoved = FALSE; | 198 | videoSliderBeingMoved = FALSE; |
199 | if ( slider->width() == 0 ) { | 199 | if ( slider->width() == 0 ) { |
200 | return; | 200 | return; |
201 | } | 201 | } |
202 | long val = long((double)slider->value() * mediaPlayerState.length() / slider->width()); | 202 | long val = long((double)slider->value() * mediaPlayerState.length() / slider->width()); |
203 | mediaPlayerState.setPosition( val ); | 203 | mediaPlayerState.setPosition( val ); |
204 | } | 204 | } |
205 | 205 | ||
206 | void VideoWidget::setPosition( long i ) { | 206 | void VideoWidget::setPosition( long i ) { |
207 | updateSlider( i, mediaPlayerState.length() ); | 207 | updateSlider( i, mediaPlayerState.length() ); |
208 | } | 208 | } |
209 | 209 | ||
210 | 210 | ||
211 | void VideoWidget::setLength( long max ) { | 211 | void VideoWidget::setLength( long max ) { |
212 | updateSlider( mediaPlayerState.position(), max ); | 212 | updateSlider( mediaPlayerState.position(), max ); |
213 | } | 213 | } |
214 | 214 | ||
215 | void VideoWidget::setDisplayType( MediaPlayerState::DisplayType displayType ) | 215 | void VideoWidget::setDisplayType( MediaPlayerState::DisplayType displayType ) |
216 | { | 216 | { |
217 | if ( displayType == MediaPlayerState::Video ) { | 217 | if ( displayType == MediaPlayerState::Video ) { |
218 | makeVisible(); | 218 | makeVisible(); |
219 | return; | 219 | return; |
220 | } | 220 | } |
221 | 221 | ||
222 | // Effectively blank the view next time we show it so it looks nicer | 222 | // Effectively blank the view next time we show it so it looks nicer |
223 | scaledWidth = 0; | 223 | scaledWidth = 0; |
224 | scaledHeight = 0; | 224 | scaledHeight = 0; |
225 | hide(); | 225 | hide(); |
226 | } | 226 | } |
227 | 227 | ||
228 | void VideoWidget::updateSlider( long i, long max ) { | 228 | void VideoWidget::updateSlider( long i, long max ) { |
229 | // Will flicker too much if we don't do this | 229 | // Will flicker too much if we don't do this |
230 | if ( max == 0 ) { | 230 | if ( max == 0 ) { |
231 | return; | 231 | return; |
232 | } | 232 | } |
233 | int width = slider->width(); | 233 | int width = slider->width(); |
234 | int val = int((double)i * width / max); | 234 | int val = int((double)i * width / max); |
235 | if ( !mediaPlayerState.isFullscreen() && !videoSliderBeingMoved ) { | 235 | if ( !mediaPlayerState.isFullscreen() && !videoSliderBeingMoved ) { |
236 | if ( slider->value() != val ) { | 236 | if ( slider->value() != val ) { |
237 | slider->setValue( val ); | 237 | slider->setValue( val ); |
238 | } | 238 | } |
239 | if ( slider->maxValue() != width ) { | 239 | if ( slider->maxValue() != width ) { |
240 | slider->setMaxValue( width ); | 240 | slider->setMaxValue( width ); |
241 | } | 241 | } |
242 | } | 242 | } |
243 | } | 243 | } |
244 | 244 | ||
245 | void VideoWidget::setToggleButton( int i, bool down ) { | 245 | void VideoWidget::setToggleButton( int i, bool down ) { |
246 | if ( down != buttons[i].isDown ) { | 246 | if ( down != buttons[i].isDown ) { |
247 | toggleButton( i ); | 247 | toggleButton( i ); |
248 | } | 248 | } |
249 | } | 249 | } |
250 | 250 | ||
251 | void VideoWidget::paintButton( QPainter &p, int i ) { | ||
252 | |||
253 | Button &button = buttons[ i ]; | ||
254 | |||
255 | if ( button.isDown ) { | ||
256 | p.drawPixmap( upperLeftOfButtonMask, button.pixDown ); | ||
257 | } else { | ||
258 | p.drawPixmap( upperLeftOfButtonMask, button.pixUp ); | ||
259 | } | ||
260 | } | ||
261 | |||
262 | void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | 251 | void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { |
263 | for ( unsigned int i = 0; i < buttons.count(); i++ ) { | 252 | for ( unsigned int i = 0; i < buttons.count(); i++ ) { |
264 | if ( event->state() == QMouseEvent::LeftButton ) { | 253 | if ( event->state() == QMouseEvent::LeftButton ) { |
265 | // The test to see if the mouse click is inside the button or not | 254 | // The test to see if the mouse click is inside the button or not |
266 | bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, i ); | 255 | bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, i ); |
267 | 256 | ||
268 | if ( isOnButton && !buttons[i].isHeld ) { | 257 | if ( isOnButton && !buttons[i].isHeld ) { |
269 | buttons[i].isHeld = TRUE; | 258 | buttons[i].isHeld = TRUE; |
270 | toggleButton(i); | 259 | toggleButton(i); |
271 | 260 | ||
272 | switch (i) { | 261 | switch (i) { |
273 | case VideoVolUp: | 262 | case VideoVolUp: |
274 | emit moreClicked(); | 263 | emit moreClicked(); |
275 | return; | 264 | return; |
276 | case VideoVolDown: | 265 | case VideoVolDown: |
277 | emit lessClicked(); | 266 | emit lessClicked(); |
278 | return; | 267 | return; |
279 | } | 268 | } |
280 | } else if ( !isOnButton && buttons[i].isHeld ) { | 269 | } else if ( !isOnButton && buttons[i].isHeld ) { |
281 | buttons[i].isHeld = FALSE; | 270 | buttons[i].isHeld = FALSE; |
282 | toggleButton(i); | 271 | toggleButton(i); |
283 | } | 272 | } |
284 | } else { | 273 | } else { |
285 | 274 | ||
286 | if ( buttons[i].isHeld ) { | 275 | if ( buttons[i].isHeld ) { |
287 | buttons[i].isHeld = FALSE; | 276 | buttons[i].isHeld = FALSE; |
288 | if ( buttons[i].type != ToggleButton ) { | 277 | if ( buttons[i].type != ToggleButton ) { |
289 | setToggleButton( i, FALSE ); | 278 | setToggleButton( i, FALSE ); |
290 | } | 279 | } |
291 | 280 | ||
292 | switch(i) { | 281 | switch(i) { |
293 | 282 | ||
294 | case VideoPlay: { | 283 | case VideoPlay: { |
295 | if( mediaPlayerState.isPaused() ) { | 284 | if( mediaPlayerState.isPaused() ) { |
296 | setToggleButton( i, FALSE ); | 285 | setToggleButton( i, FALSE ); |
297 | mediaPlayerState.setPaused( FALSE ); | 286 | mediaPlayerState.setPaused( FALSE ); |
298 | return; | 287 | return; |
299 | } else if( !mediaPlayerState.isPaused() ) { | 288 | } else if( !mediaPlayerState.isPaused() ) { |
300 | setToggleButton( i, TRUE ); | 289 | setToggleButton( i, TRUE ); |
301 | mediaPlayerState.setPaused( TRUE ); | 290 | mediaPlayerState.setPaused( TRUE ); |
302 | return; | 291 | return; |
303 | } else { | 292 | } else { |
304 | return; | 293 | return; |
305 | } | 294 | } |
306 | } | 295 | } |
307 | 296 | ||
308 | case VideoStop: mediaPlayerState.setPlaying( FALSE ); return; | 297 | case VideoStop: mediaPlayerState.setPlaying( FALSE ); return; |
309 | case VideoNext: if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setNext(); return; | 298 | case VideoNext: if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setNext(); return; |
310 | case VideoPrevious: if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setPrev(); return; | 299 | case VideoPrevious: if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setPrev(); return; |
311 | case VideoVolUp: emit moreReleased(); return; | 300 | case VideoVolUp: emit moreReleased(); return; |
312 | case VideoVolDown: emit lessReleased(); return; | 301 | case VideoVolDown: emit lessReleased(); return; |
313 | case VideoFullscreen: mediaPlayerState.setFullscreen( TRUE ); makeVisible(); return; | 302 | case VideoFullscreen: mediaPlayerState.setFullscreen( TRUE ); makeVisible(); return; |
314 | } | 303 | } |
315 | } | 304 | } |
316 | } | 305 | } |
317 | } | 306 | } |
318 | } | 307 | } |
319 | 308 | ||
320 | void VideoWidget::mousePressEvent( QMouseEvent *event ) { | 309 | void VideoWidget::mousePressEvent( QMouseEvent *event ) { |
321 | mouseMoveEvent( event ); | 310 | mouseMoveEvent( event ); |
322 | } | 311 | } |
323 | 312 | ||
324 | void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) { | 313 | void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) { |
325 | if ( mediaPlayerState.isFullscreen() ) { | 314 | if ( mediaPlayerState.isFullscreen() ) { |
326 | mediaPlayerState.setFullscreen( FALSE ); | 315 | mediaPlayerState.setFullscreen( FALSE ); |
327 | makeVisible(); | 316 | makeVisible(); |
328 | } | 317 | } |
329 | mouseMoveEvent( event ); | 318 | mouseMoveEvent( event ); |
330 | } | 319 | } |
331 | 320 | ||
332 | void VideoWidget::showEvent( QShowEvent* ) { | 321 | void VideoWidget::showEvent( QShowEvent* ) { |
333 | QMouseEvent event( QEvent::MouseMove, QPoint( 0, 0 ), 0, 0 ); | 322 | QMouseEvent event( QEvent::MouseMove, QPoint( 0, 0 ), 0, 0 ); |
334 | mouseMoveEvent( &event ); | 323 | mouseMoveEvent( &event ); |
335 | } | 324 | } |
336 | 325 | ||
337 | 326 | ||
338 | void VideoWidget::backToNormal() { | 327 | void VideoWidget::backToNormal() { |
339 | mediaPlayerState.setFullscreen( FALSE ); | 328 | mediaPlayerState.setFullscreen( FALSE ); |
340 | makeVisible(); | 329 | makeVisible(); |
341 | } | 330 | } |
342 | 331 | ||
343 | void VideoWidget::makeVisible() { | 332 | void VideoWidget::makeVisible() { |
344 | if ( mediaPlayerState.isFullscreen() ) { | 333 | if ( mediaPlayerState.isFullscreen() ) { |
345 | setBackgroundMode( QWidget::NoBackground ); | 334 | setBackgroundMode( QWidget::NoBackground ); |
346 | showFullScreen(); | 335 | showFullScreen(); |
347 | resize( qApp->desktop()->size() ); | 336 | resize( qApp->desktop()->size() ); |
348 | videoFrame-> setGeometry ( 0, 0, width ( ), height ( )); | 337 | videoFrame-> setGeometry ( 0, 0, width ( ), height ( )); |
349 | 338 | ||
350 | slider->hide(); | 339 | slider->hide(); |
351 | disconnect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); | 340 | disconnect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); |
352 | disconnect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); | 341 | disconnect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); |
353 | disconnect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); | 342 | disconnect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); |
354 | disconnect( slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) ); | 343 | disconnect( slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) ); |
355 | 344 | ||
356 | } else { | 345 | } else { |
357 | showNormal(); | 346 | showNormal(); |
358 | showMaximized(); | 347 | showMaximized(); |
359 | setBackgroundPixmap( pixBg ); | 348 | setBackgroundPixmap( pixBg ); |
360 | QWidget *d = QApplication::desktop(); | 349 | QWidget *d = QApplication::desktop(); |
361 | int w = d->width(); | 350 | int w = d->width(); |
362 | int h = d->height(); | 351 | int h = d->height(); |
363 | 352 | ||
364 | if(w>h) { | 353 | if(w>h) { |
365 | int newW=(w/2)-(246/2); //this will only work with 320x240 | 354 | int newW=(w/2)-(246/2); //this will only work with 320x240 |
366 | videoFrame->setGeometry( QRect( newW, 4, 240, 170 ) ); | 355 | videoFrame->setGeometry( QRect( newW, 4, 240, 170 ) ); |
367 | } else { | 356 | } else { |
368 | videoFrame->setGeometry( QRect( 0, 30, 240, 170 ) ); | 357 | videoFrame->setGeometry( QRect( 0, 30, 240, 170 ) ); |
369 | } | 358 | } |
370 | 359 | ||
371 | if ( !mediaPlayerState.isSeekable() ) { | 360 | if ( !mediaPlayerState.isSeekable() ) { |
372 | if( !slider->isHidden()) { | 361 | if( !slider->isHidden()) { |
373 | slider->hide(); | 362 | slider->hide(); |
374 | } | 363 | } |
375 | disconnect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); | 364 | disconnect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); |
376 | disconnect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); | 365 | disconnect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); |
377 | disconnect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); | 366 | disconnect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); |
378 | disconnect( slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) ); | 367 | disconnect( slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) ); |
379 | } else { | 368 | } else { |
380 | slider->show(); | 369 | slider->show(); |
381 | connect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); | 370 | connect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); |
382 | connect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); | 371 | connect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); |
383 | connect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); | 372 | connect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); |
384 | connect( slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) ); | 373 | connect( slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) ); |
385 | } | 374 | } |
386 | } | 375 | } |
387 | } | 376 | } |
388 | 377 | ||
389 | 378 | ||
390 | 379 | ||
391 | 380 | ||
392 | void VideoWidget::paintEvent( QPaintEvent * pe) { | 381 | void VideoWidget::paintEvent( QPaintEvent * pe) { |
393 | QPainter p( this ); | 382 | QPainter p( this ); |
394 | 383 | ||
395 | if ( mediaPlayerState.isFullscreen() ) { | 384 | if ( mediaPlayerState.isFullscreen() ) { |
396 | // Clear the background | 385 | // Clear the background |
397 | p.setBrush( QBrush( Qt::black ) ); | 386 | p.setBrush( QBrush( Qt::black ) ); |
398 | } else { | 387 | } else { |
399 | if ( !pe->erased() ) { | 388 | if ( !pe->erased() ) { |
400 | // Combine with background and double buffer | 389 | // Combine with background and double buffer |
401 | QPixmap pix( pe->rect().size() ); | 390 | QPixmap pix( pe->rect().size() ); |
402 | QPainter p( &pix ); | 391 | QPainter p( &pix ); |
403 | p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() ); | 392 | p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() ); |
404 | p.drawTiledPixmap( pe->rect(), pixBg, pe->rect().topLeft() ); | 393 | p.drawTiledPixmap( pe->rect(), pixBg, pe->rect().topLeft() ); |
405 | for ( unsigned int i = 0; i < buttons.count(); i++ ) { | 394 | for ( unsigned int i = 0; i < buttons.count(); i++ ) { |
406 | paintButton( p, i ); | 395 | paintButton( p, buttons[ i ] ); |
407 | } | 396 | } |
408 | QPainter p2( this ); | 397 | QPainter p2( this ); |
409 | p2.drawPixmap( pe->rect().topLeft(), pix ); | 398 | p2.drawPixmap( pe->rect().topLeft(), pix ); |
410 | } else { | 399 | } else { |
411 | QPainter p( this ); | 400 | QPainter p( this ); |
412 | for ( unsigned int i = 0; i < buttons.count(); i++ ) | 401 | for ( unsigned int i = 0; i < buttons.count(); i++ ) |
413 | paintButton( p, i ); | 402 | paintButton( p, buttons[ i ] ); |
414 | } | 403 | } |
415 | //slider->repaint( TRUE ); | 404 | //slider->repaint( TRUE ); |
416 | } | 405 | } |
417 | } | 406 | } |
418 | 407 | ||
419 | 408 | ||
420 | void VideoWidget::keyReleaseEvent( QKeyEvent *e) { | 409 | void VideoWidget::keyReleaseEvent( QKeyEvent *e) { |
421 | switch ( e->key() ) { | 410 | switch ( e->key() ) { |
422 | ////////////////////////////// Zaurus keys | 411 | ////////////////////////////// Zaurus keys |
423 | case Key_Home: | 412 | case Key_Home: |
424 | break; | 413 | break; |
425 | case Key_F9: //activity | 414 | case Key_F9: //activity |
426 | break; | 415 | break; |
427 | case Key_F10: //contacts | 416 | case Key_F10: //contacts |
428 | // hide(); | 417 | // hide(); |
429 | break; | 418 | break; |
430 | case Key_F11: //menu | 419 | case Key_F11: //menu |
431 | break; | 420 | break; |
432 | case Key_F12: //home | 421 | case Key_F12: //home |
433 | break; | 422 | break; |
434 | case Key_F13: //mail | 423 | case Key_F13: //mail |
435 | break; | 424 | break; |
436 | case Key_Space: { | 425 | case Key_Space: { |
437 | if(mediaPlayerState.isPlaying()) { | 426 | if(mediaPlayerState.isPlaying()) { |
438 | mediaPlayerState.setPlaying(FALSE); | 427 | mediaPlayerState.setPlaying(FALSE); |
439 | } else { | 428 | } else { |
440 | mediaPlayerState.setPlaying(TRUE); | 429 | mediaPlayerState.setPlaying(TRUE); |
441 | } | 430 | } |
442 | } | 431 | } |
443 | break; | 432 | break; |
444 | case Key_Down: | 433 | case Key_Down: |
445 | // toggleButton(6); | 434 | // toggleButton(6); |
446 | emit lessClicked(); | 435 | emit lessClicked(); |
447 | emit lessReleased(); | 436 | emit lessReleased(); |
448 | // toggleButton(6); | 437 | // toggleButton(6); |
449 | break; | 438 | break; |
450 | case Key_Up: | 439 | case Key_Up: |
451 | // toggleButton(5); | 440 | // toggleButton(5); |
452 | emit moreClicked(); | 441 | emit moreClicked(); |
453 | emit moreReleased(); | 442 | emit moreReleased(); |
454 | // toggleButton(5); | 443 | // toggleButton(5); |
455 | break; | 444 | break; |
456 | case Key_Right: | 445 | case Key_Right: |
457 | mediaPlayerState.setNext(); | 446 | mediaPlayerState.setNext(); |
458 | break; | 447 | break; |
459 | case Key_Left: | 448 | case Key_Left: |
460 | mediaPlayerState.setPrev(); | 449 | mediaPlayerState.setPrev(); |
461 | break; | 450 | break; |
462 | case Key_Escape: | 451 | case Key_Escape: |
463 | break; | 452 | break; |
464 | 453 | ||
465 | }; | 454 | }; |
466 | } | 455 | } |
467 | 456 | ||
468 | XineVideoWidget* VideoWidget::vidWidget() { | 457 | XineVideoWidget* VideoWidget::vidWidget() { |
469 | return videoFrame; | 458 | return videoFrame; |
470 | } | 459 | } |
471 | 460 | ||
472 | 461 | ||
473 | void VideoWidget::setFullscreen ( bool b ) { | 462 | void VideoWidget::setFullscreen ( bool b ) { |
474 | setToggleButton( VideoFullscreen, b ); | 463 | setToggleButton( VideoFullscreen, b ); |
475 | } | 464 | } |
476 | 465 | ||
477 | 466 | ||
478 | void VideoWidget::setPlaying( bool b) { | 467 | void VideoWidget::setPlaying( bool b) { |
479 | setToggleButton( VideoPlay, b ); | 468 | setToggleButton( VideoPlay, b ); |
480 | } | 469 | } |
481 | 470 | ||
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h index 937feac..a271120 100644 --- a/noncore/multimedia/opieplayer2/videowidget.h +++ b/noncore/multimedia/opieplayer2/videowidget.h | |||
@@ -1,120 +1,119 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
3 | 3 | ||
4 | Copyright (c) 2002 Max Reiss <harlekin@handhelds.org> | 4 | Copyright (c) 2002 Max Reiss <harlekin@handhelds.org> |
5 | Copyright (c) 2002 L. Potter <ljp@llornkcor.com> | 5 | Copyright (c) 2002 L. Potter <ljp@llornkcor.com> |
6 | Copyright (c) 2002 Holger Freyther <zecke@handhelds.org> | 6 | Copyright (c) 2002 Holger Freyther <zecke@handhelds.org> |
7 | =. | 7 | =. |
8 | .=l. | 8 | .=l. |
9 | .>+-= | 9 | .>+-= |
10 | _;:, .> :=|. This program is free software; you can | 10 | _;:, .> :=|. This program is free software; you can |
11 | .> <`_, > . <= redistribute it and/or modify it under | 11 | .> <`_, > . <= redistribute it and/or modify it under |
12 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | 12 | :`=1 )Y*s>-.-- : the terms of the GNU General Public |
13 | .="- .-=="i, .._ License as published by the Free Software | 13 | .="- .-=="i, .._ License as published by the Free Software |
14 | - . .-<_> .<> Foundation; either version 2 of the License, | 14 | - . .-<_> .<> Foundation; either version 2 of the License, |
15 | ._= =} : or (at your option) any later version. | 15 | ._= =} : or (at your option) any later version. |
16 | .%`+i> _;_. | 16 | .%`+i> _;_. |
17 | .i_,=:_. -<s. This program is distributed in the hope that | 17 | .i_,=:_. -<s. This program is distributed in the hope that |
18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
19 | : .. .:, . . . without even the implied warranty of | 19 | : .. .:, . . . without even the implied warranty of |
20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
22 | ..}^=.= = ; Library General Public License for more | 22 | ..}^=.= = ; Library General Public License for more |
23 | ++= -. .` .: details. | 23 | ++= -. .` .: details. |
24 | : = ...= . :.=- | 24 | : = ...= . :.=- |
25 | -. .:....=;==+<; You should have received a copy of the GNU | 25 | -. .:....=;==+<; You should have received a copy of the GNU |
26 | -_. . . )=. = Library General Public License along with | 26 | -_. . . )=. = Library General Public License along with |
27 | -- :-=` this library; see the file COPYING.LIB. | 27 | -- :-=` this library; see the file COPYING.LIB. |
28 | If not, write to the Free Software Foundation, | 28 | If not, write to the Free Software Foundation, |
29 | Inc., 59 Temple Place - Suite 330, | 29 | Inc., 59 Temple Place - Suite 330, |
30 | Boston, MA 02111-1307, USA. | 30 | Boston, MA 02111-1307, USA. |
31 | 31 | ||
32 | */ | 32 | */ |
33 | 33 | ||
34 | #ifndef VIDEO_WIDGET_H | 34 | #ifndef VIDEO_WIDGET_H |
35 | #define VIDEO_WIDGET_H | 35 | #define VIDEO_WIDGET_H |
36 | 36 | ||
37 | #include <qwidget.h> | 37 | #include <qwidget.h> |
38 | #include <qimage.h> | 38 | #include <qimage.h> |
39 | #include <qpixmap.h> | 39 | #include <qpixmap.h> |
40 | #include "xinevideowidget.h" | 40 | #include "xinevideowidget.h" |
41 | 41 | ||
42 | #include "mediawidget.h" | 42 | #include "mediawidget.h" |
43 | 43 | ||
44 | class QPixmap; | 44 | class QPixmap; |
45 | class QSlider; | 45 | class QSlider; |
46 | 46 | ||
47 | enum VideoButtons { | 47 | enum VideoButtons { |
48 | VideoPlay = 0, | 48 | VideoPlay = 0, |
49 | VideoStop, | 49 | VideoStop, |
50 | // VideoPause, | 50 | // VideoPause, |
51 | VideoNext, | 51 | VideoNext, |
52 | VideoPrevious, | 52 | VideoPrevious, |
53 | VideoVolUp, | 53 | VideoVolUp, |
54 | VideoVolDown, | 54 | VideoVolDown, |
55 | VideoFullscreen | 55 | VideoFullscreen |
56 | }; | 56 | }; |
57 | 57 | ||
58 | class VideoWidget : public MediaWidget { | 58 | class VideoWidget : public MediaWidget { |
59 | Q_OBJECT | 59 | Q_OBJECT |
60 | public: | 60 | public: |
61 | VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent=0, const char* name=0 ); | 61 | VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent=0, const char* name=0 ); |
62 | ~VideoWidget(); | 62 | ~VideoWidget(); |
63 | 63 | ||
64 | 64 | ||
65 | XineVideoWidget* vidWidget(); | 65 | XineVideoWidget* vidWidget(); |
66 | public slots: | 66 | public slots: |
67 | void updateSlider( long, long ); | 67 | void updateSlider( long, long ); |
68 | void sliderPressed( ); | 68 | void sliderPressed( ); |
69 | void sliderReleased( ); | 69 | void sliderReleased( ); |
70 | void setFullscreen( bool b ); | 70 | void setFullscreen( bool b ); |
71 | void makeVisible(); | 71 | void makeVisible(); |
72 | void backToNormal(); | 72 | void backToNormal(); |
73 | void setPosition( long ); | 73 | void setPosition( long ); |
74 | 74 | ||
75 | public: | 75 | public: |
76 | virtual void setPlaying( bool b); | 76 | virtual void setPlaying( bool b); |
77 | virtual void setLength( long ); | 77 | virtual void setLength( long ); |
78 | virtual void setDisplayType( MediaPlayerState::DisplayType displayType ); | 78 | virtual void setDisplayType( MediaPlayerState::DisplayType displayType ); |
79 | 79 | ||
80 | signals: | 80 | signals: |
81 | void moreClicked(); | 81 | void moreClicked(); |
82 | void lessClicked(); | 82 | void lessClicked(); |
83 | void moreReleased(); | 83 | void moreReleased(); |
84 | void lessReleased(); | 84 | void lessReleased(); |
85 | void sliderMoved( long ); | 85 | void sliderMoved( long ); |
86 | void videoResized ( const QSize &s ); | 86 | void videoResized ( const QSize &s ); |
87 | 87 | ||
88 | protected: | 88 | protected: |
89 | 89 | ||
90 | void resizeEvent( QResizeEvent * ); | 90 | void resizeEvent( QResizeEvent * ); |
91 | void paintEvent( QPaintEvent *pe ); | 91 | void paintEvent( QPaintEvent *pe ); |
92 | void showEvent( QShowEvent *se ); | 92 | void showEvent( QShowEvent *se ); |
93 | void mouseMoveEvent( QMouseEvent *event ); | 93 | void mouseMoveEvent( QMouseEvent *event ); |
94 | void mousePressEvent( QMouseEvent *event ); | 94 | void mousePressEvent( QMouseEvent *event ); |
95 | void mouseReleaseEvent( QMouseEvent *event ); | 95 | void mouseReleaseEvent( QMouseEvent *event ); |
96 | void keyReleaseEvent( QKeyEvent *e); | 96 | void keyReleaseEvent( QKeyEvent *e); |
97 | 97 | ||
98 | private: | 98 | private: |
99 | // Ticker songInfo; | 99 | // Ticker songInfo; |
100 | QPixmap pixBg; | 100 | QPixmap pixBg; |
101 | QImage imgUp; | 101 | QImage imgUp; |
102 | QImage imgDn; | 102 | QImage imgDn; |
103 | QString skin; | 103 | QString skin; |
104 | 104 | ||
105 | 105 | ||
106 | virtual void paintButton( QPainter &p, int i ); | ||
107 | void setToggleButton( int, bool ); | 106 | void setToggleButton( int, bool ); |
108 | 107 | ||
109 | QString backgroundPix; | 108 | QString backgroundPix; |
110 | QSlider *slider; | 109 | QSlider *slider; |
111 | QImage *currentFrame; | 110 | QImage *currentFrame; |
112 | int scaledWidth; | 111 | int scaledWidth; |
113 | int scaledHeight; | 112 | int scaledHeight; |
114 | XineVideoWidget* videoFrame; | 113 | XineVideoWidget* videoFrame; |
115 | }; | 114 | }; |
116 | 115 | ||
117 | #endif // VIDEO_WIDGET_H | 116 | #endif // VIDEO_WIDGET_H |
118 | 117 | ||
119 | 118 | ||
120 | 119 | ||