author | harlekin <harlekin> | 2002-07-03 15:42:34 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-07-03 15:42:34 (UTC) |
commit | 3035c46ce448317f786d974094f78ce43e594a57 (patch) (unidiff) | |
tree | f0c84f34ee2ecbae4d00ed6cfde3cb955802a470 /noncore | |
parent | e1e4956ec7ffa9a07f98b03e831f0f9627556a6c (diff) | |
download | opie-3035c46ce448317f786d974094f78ce43e594a57.zip opie-3035c46ce448317f786d974094f78ce43e594a57.tar.gz opie-3035c46ce448317f786d974094f78ce43e594a57.tar.bz2 |
even more code cleanups .-)
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 10 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/inputDialog.cpp | 14 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayerstate.cpp | 195 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayerstate.h | 75 |
4 files changed, 227 insertions, 67 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 1b0de5d..125fd72 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -46,54 +46,49 @@ void Ticker::timerEvent( QTimerEvent * ) { | |||
46 | 46 | ||
47 | void Ticker::drawContents( QPainter *p ) { | 47 | void Ticker::drawContents( QPainter *p ) { |
48 | QPixmap pm( width(), height() ); | 48 | QPixmap pm( width(), height() ); |
49 | pm.fill( colorGroup().base() ); | 49 | pm.fill( colorGroup().base() ); |
50 | QPainter pmp( &pm ); | 50 | QPainter pmp( &pm ); |
51 | for ( int i = 0; i - pos < width() && (i < 1 || pixelLen > width()); i += pixelLen ) { | 51 | for ( int i = 0; i - pos < width() && (i < 1 || pixelLen > width()); i += pixelLen ) { |
52 | pmp.drawText( i - pos, 0, INT_MAX, height(), AlignVCenter, scrollText ); | 52 | pmp.drawText( i - pos, 0, INT_MAX, height(), AlignVCenter, scrollText ); |
53 | } | 53 | } |
54 | p->drawPixmap( 0, 0, pm ); | 54 | p->drawPixmap( 0, 0, pm ); |
55 | } | 55 | } |
56 | 56 | ||
57 | 57 | ||
58 | |||
59 | |||
60 | struct MediaButton { | 58 | struct MediaButton { |
61 | int xPos, yPos; | 59 | int xPos, yPos; |
62 | int color; | 60 | int color; |
63 | bool isToggle, isBig, isHeld, isDown; | 61 | bool isToggle, isBig, isHeld, isDown; |
64 | }; | 62 | }; |
65 | 63 | ||
66 | 64 | ||
67 | |||
68 | |||
69 | // Layout information for the audioButtons (and if it is a toggle button or not) | 65 | // Layout information for the audioButtons (and if it is a toggle button or not) |
70 | MediaButton audioButtons[] = { | 66 | MediaButton audioButtons[] = { |
71 | { 3*30-15+xo, 3*30-13+yo, 0, TRUE, TRUE, FALSE, FALSE }, // play | 67 | { 3*30-15+xo, 3*30-13+yo, 0, TRUE, TRUE, FALSE, FALSE }, // play |
72 | { 1*30+xo, 5*30+yo, 2, FALSE, FALSE, FALSE, FALSE }, // stop | 68 | { 1*30+xo, 5*30+yo, 2, FALSE, FALSE, FALSE, FALSE }, // stop |
73 | { 5*30+xo, 5*30+yo, 2, TRUE, FALSE, FALSE, FALSE }, // pause | 69 | { 5*30+xo, 5*30+yo, 2, TRUE, FALSE, FALSE, FALSE }, // pause |
74 | { 6*30-5+xo, 3*30+yo, 1, FALSE, FALSE, FALSE, FALSE }, // next | 70 | { 6*30-5+xo, 3*30+yo, 1, FALSE, FALSE, FALSE, FALSE }, // next |
75 | { 0*30+5+xo, 3*30+yo, 1, FALSE, FALSE, FALSE, FALSE }, // previous | 71 | { 0*30+5+xo, 3*30+yo, 1, FALSE, FALSE, FALSE, FALSE }, // previous |
76 | { 3*30+xo, 0*30+5+yo, 3, FALSE, FALSE, FALSE, FALSE }, // volume up | 72 | { 3*30+xo, 0*30+5+yo, 3, FALSE, FALSE, FALSE, FALSE }, // volume up |
77 | { 3*30+xo, 6*30-5+yo, 3, FALSE, FALSE, FALSE, FALSE }, // volume down | 73 | { 3*30+xo, 6*30-5+yo, 3, FALSE, FALSE, FALSE, FALSE }, // volume down |
78 | { 5*30+xo, 1*30+yo, 0, TRUE, FALSE, FALSE, FALSE }, // repeat/loop | 74 | { 5*30+xo, 1*30+yo, 0, TRUE, FALSE, FALSE, FALSE }, // repeat/loop |
79 | { 1*30+xo, 1*30+yo, 0, FALSE, FALSE, FALSE, FALSE } // playlist | 75 | { 1*30+xo, 1*30+yo, 0, FALSE, FALSE, FALSE, FALSE } // playlist |
80 | }; | 76 | }; |
81 | 77 | ||
82 | static const int numButtons = (sizeof(audioButtons)/sizeof(MediaButton)); | 78 | static const int numButtons = (sizeof(audioButtons)/sizeof(MediaButton)); |
83 | 79 | ||
84 | 80 | ||
85 | AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : | 81 | AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : |
86 | QWidget( parent, name, f ) | 82 | QWidget( parent, name, f ) { |
87 | { | ||
88 | setCaption( tr("OpiePlayer - Audio") ); | 83 | setCaption( tr("OpiePlayer - Audio") ); |
89 | Config cfg("OpiePlayer"); | 84 | Config cfg("OpiePlayer"); |
90 | cfg.setGroup("AudioWidget"); | 85 | cfg.setGroup("AudioWidget"); |
91 | 86 | ||
92 | QString backgroundPix, buttonsAllPix, buttonsBigPix, controlsPix, animatedPix; | 87 | QString backgroundPix, buttonsAllPix, buttonsBigPix, controlsPix, animatedPix; |
93 | backgroundPix=cfg.readEntry( " backgroundPix", "opieplayer/metalFinish"); | 88 | backgroundPix=cfg.readEntry( " backgroundPix", "opieplayer/metalFinish"); |
94 | buttonsAllPix=cfg.readEntry( "buttonsAllPix","opieplayer/mediaButtonsAll"); | 89 | buttonsAllPix=cfg.readEntry( "buttonsAllPix","opieplayer/mediaButtonsAll"); |
95 | buttonsBigPix=cfg.readEntry( "buttonsBigPix","opieplayer/mediaButtonsBig"); | 90 | buttonsBigPix=cfg.readEntry( "buttonsBigPix","opieplayer/mediaButtonsBig"); |
96 | controlsPix=cfg.readEntry( "controlsPix","opieplayer/mediaControls"); | 91 | controlsPix=cfg.readEntry( "controlsPix","opieplayer/mediaControls"); |
97 | 92 | ||
98 | setBackgroundPixmap( Resource::loadPixmap( backgroundPix) ); | 93 | setBackgroundPixmap( Resource::loadPixmap( backgroundPix) ); |
99 | pixmaps[0] = new QPixmap( Resource::loadPixmap( buttonsAllPix ) ); | 94 | pixmaps[0] = new QPixmap( Resource::loadPixmap( buttonsAllPix ) ); |
@@ -118,28 +113,26 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : | |||
118 | connect( mediaPlayerState, SIGNAL( lengthChanged(long) ), this, SLOT( setLength(long) ) ); | 113 | connect( mediaPlayerState, SIGNAL( lengthChanged(long) ), this, SLOT( setLength(long) ) ); |
119 | connect( mediaPlayerState, SIGNAL( viewChanged(char) ), this, SLOT( setView(char) ) ); | 114 | connect( mediaPlayerState, SIGNAL( viewChanged(char) ), this, SLOT( setView(char) ) ); |
120 | connect( mediaPlayerState, SIGNAL( loopingToggled(bool) ), this, SLOT( setLooping(bool) ) ); | 115 | connect( mediaPlayerState, SIGNAL( loopingToggled(bool) ), this, SLOT( setLooping(bool) ) ); |
121 | connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( setPaused(bool) ) ); | 116 | connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( setPaused(bool) ) ); |
122 | connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) ); | 117 | connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) ); |
123 | 118 | ||
124 | // Intialise state | 119 | // Intialise state |
125 | setLength( mediaPlayerState->length() ); | 120 | setLength( mediaPlayerState->length() ); |
126 | setPosition( mediaPlayerState->position() ); | 121 | setPosition( mediaPlayerState->position() ); |
127 | setLooping( mediaPlayerState->fullscreen() ); | 122 | setLooping( mediaPlayerState->fullscreen() ); |
128 | setPaused( mediaPlayerState->paused() ); | 123 | setPaused( mediaPlayerState->paused() ); |
129 | setPlaying( mediaPlayerState->playing() ); | 124 | setPlaying( mediaPlayerState->playing() ); |
130 | |||
131 | } | 125 | } |
132 | 126 | ||
133 | |||
134 | AudioWidget::~AudioWidget() { | 127 | AudioWidget::~AudioWidget() { |
135 | mediaPlayerState->isStreaming = FALSE; | 128 | mediaPlayerState->isStreaming = FALSE; |
136 | for ( int i = 0; i < 3; i++ ) { | 129 | for ( int i = 0; i < 3; i++ ) { |
137 | delete pixmaps[i]; | 130 | delete pixmaps[i]; |
138 | } | 131 | } |
139 | } | 132 | } |
140 | 133 | ||
141 | 134 | ||
142 | static bool audioSliderBeingMoved = FALSE; | 135 | static bool audioSliderBeingMoved = FALSE; |
143 | 136 | ||
144 | 137 | ||
145 | void AudioWidget::sliderPressed() { | 138 | void AudioWidget::sliderPressed() { |
@@ -147,25 +140,24 @@ void AudioWidget::sliderPressed() { | |||
147 | } | 140 | } |
148 | 141 | ||
149 | 142 | ||
150 | void AudioWidget::sliderReleased() { | 143 | void AudioWidget::sliderReleased() { |
151 | audioSliderBeingMoved = FALSE; | 144 | audioSliderBeingMoved = FALSE; |
152 | if ( slider->width() == 0 ) { | 145 | if ( slider->width() == 0 ) { |
153 | return; | 146 | return; |
154 | } | 147 | } |
155 | long val = long((double)slider->value() * mediaPlayerState->length() / slider->width()); | 148 | long val = long((double)slider->value() * mediaPlayerState->length() / slider->width()); |
156 | mediaPlayerState->setPosition( val ); | 149 | mediaPlayerState->setPosition( val ); |
157 | } | 150 | } |
158 | 151 | ||
159 | |||
160 | void AudioWidget::setPosition( long i ) { | 152 | void AudioWidget::setPosition( long i ) { |
161 | // qDebug("set position %d",i); | 153 | // qDebug("set position %d",i); |
162 | updateSlider( i, mediaPlayerState->length() ); | 154 | updateSlider( i, mediaPlayerState->length() ); |
163 | } | 155 | } |
164 | 156 | ||
165 | 157 | ||
166 | void AudioWidget::setLength( long max ) { | 158 | void AudioWidget::setLength( long max ) { |
167 | updateSlider( mediaPlayerState->position(), max ); | 159 | updateSlider( mediaPlayerState->position(), max ); |
168 | } | 160 | } |
169 | 161 | ||
170 | 162 | ||
171 | void AudioWidget::setView( char view ) { | 163 | void AudioWidget::setView( char view ) { |
diff --git a/noncore/multimedia/opieplayer2/inputDialog.cpp b/noncore/multimedia/opieplayer2/inputDialog.cpp index 687aff6..c13ea63 100644 --- a/noncore/multimedia/opieplayer2/inputDialog.cpp +++ b/noncore/multimedia/opieplayer2/inputDialog.cpp | |||
@@ -2,47 +2,45 @@ | |||
2 | 2 | ||
3 | #include <qpe/resource.h> | 3 | #include <qpe/resource.h> |
4 | 4 | ||
5 | #include <opie/ofiledialog.h> | 5 | #include <opie/ofiledialog.h> |
6 | 6 | ||
7 | #include <qlineedit.h> | 7 | #include <qlineedit.h> |
8 | #include <qlayout.h> | 8 | #include <qlayout.h> |
9 | #include <qvariant.h> | 9 | #include <qvariant.h> |
10 | #include <qpushbutton.h> | 10 | #include <qpushbutton.h> |
11 | #include <qwhatsthis.h> | 11 | #include <qwhatsthis.h> |
12 | 12 | ||
13 | InputDialog::InputDialog( QWidget* parent, const char* name, bool modal, WFlags fl ) | 13 | InputDialog::InputDialog( QWidget* parent, const char* name, bool modal, WFlags fl ) |
14 | : QDialog( parent, name, modal, fl ) | 14 | : QDialog( parent, name, modal, fl ) { |
15 | { | 15 | if ( !name ) { |
16 | if ( !name ) | 16 | setName( "InputDialog" ); |
17 | setName( "InputDialog" ); | 17 | } |
18 | resize( 234, 115); | 18 | resize( 234, 115); |
19 | setMaximumSize( QSize( 240, 40)); | 19 | setMaximumSize( QSize( 240, 40)); |
20 | setCaption( tr(name ) ); | 20 | setCaption( tr( name ) ); |
21 | 21 | ||
22 | QPushButton *browserButton; | 22 | QPushButton *browserButton; |
23 | browserButton = new QPushButton( Resource::loadIconSet("fileopen"),"",this,"BrowseButton"); | 23 | browserButton = new QPushButton( Resource::loadIconSet("fileopen"),"",this,"BrowseButton"); |
24 | browserButton->setGeometry( QRect( 205, 10, 22, 22)); | 24 | browserButton->setGeometry( QRect( 205, 10, 22, 22)); |
25 | connect( browserButton, SIGNAL(released()),this,SLOT(browse())); | 25 | connect( browserButton, SIGNAL(released()),this,SLOT(browse())); |
26 | LineEdit1 = new QLineEdit( this, "LineEdit1" ); | 26 | LineEdit1 = new QLineEdit( this, "LineEdit1" ); |
27 | LineEdit1->setGeometry( QRect( 4, 10, 190, 22 ) ); | 27 | LineEdit1->setGeometry( QRect( 4, 10, 190, 22 ) ); |
28 | } | 28 | } |
29 | 29 | ||
30 | /* | 30 | /* |
31 | * Destroys the object and frees any allocated resources | 31 | * Destroys the object and frees any allocated resources |
32 | */ | 32 | */ |
33 | InputDialog::~InputDialog() | 33 | InputDialog::~InputDialog() { |
34 | { | ||
35 | inputText= LineEdit1->text(); | 34 | inputText= LineEdit1->text(); |
36 | |||
37 | } | 35 | } |
38 | 36 | ||
39 | void InputDialog::browse() { | 37 | void InputDialog::browse() { |
40 | 38 | ||
41 | MimeTypes types; | 39 | MimeTypes types; |
42 | QStringList audio, video, all; | 40 | QStringList audio, video, all; |
43 | audio << "audio/*"; | 41 | audio << "audio/*"; |
44 | audio << "playlist/plain"; | 42 | audio << "playlist/plain"; |
45 | audio << "audio/x-mpegurl"; | 43 | audio << "audio/x-mpegurl"; |
46 | 44 | ||
47 | video << "video/*"; | 45 | video << "video/*"; |
48 | video << "playlist/plain"; | 46 | video << "playlist/plain"; |
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp index d1d30e4..2f24b00 100644 --- a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp | |||
@@ -8,25 +8,25 @@ | |||
8 | #include <qobject.h> | 8 | #include <qobject.h> |
9 | #include <qdir.h> | 9 | #include <qdir.h> |
10 | #include <qpe/mediaplayerplugininterface.h> | 10 | #include <qpe/mediaplayerplugininterface.h> |
11 | #include "mediaplayerstate.h" | 11 | #include "mediaplayerstate.h" |
12 | 12 | ||
13 | 13 | ||
14 | 14 | ||
15 | //#define MediaPlayerDebug(x) qDebug x | 15 | //#define MediaPlayerDebug(x) qDebug x |
16 | #define MediaPlayerDebug(x) | 16 | #define MediaPlayerDebug(x) |
17 | 17 | ||
18 | 18 | ||
19 | MediaPlayerState::MediaPlayerState( QObject *parent, const char *name ) | 19 | MediaPlayerState::MediaPlayerState( QObject *parent, const char *name ) |
20 | : QObject( parent, name ), decoder( NULL ) { | 20 | : QObject( parent, name ) { |
21 | Config cfg( "OpiePlayer" ); | 21 | Config cfg( "OpiePlayer" ); |
22 | readConfig( cfg ); | 22 | readConfig( cfg ); |
23 | } | 23 | } |
24 | 24 | ||
25 | 25 | ||
26 | MediaPlayerState::~MediaPlayerState() { | 26 | MediaPlayerState::~MediaPlayerState() { |
27 | Config cfg( "OpiePlayer" ); | 27 | Config cfg( "OpiePlayer" ); |
28 | writeConfig( cfg ); | 28 | writeConfig( cfg ); |
29 | } | 29 | } |
30 | 30 | ||
31 | 31 | ||
32 | void MediaPlayerState::readConfig( Config& cfg ) { | 32 | void MediaPlayerState::readConfig( Config& cfg ) { |
@@ -46,25 +46,200 @@ void MediaPlayerState::readConfig( Config& cfg ) { | |||
46 | 46 | ||
47 | 47 | ||
48 | void MediaPlayerState::writeConfig( Config& cfg ) const { | 48 | void MediaPlayerState::writeConfig( Config& cfg ) const { |
49 | cfg.setGroup("Options"); | 49 | cfg.setGroup("Options"); |
50 | cfg.writeEntry("FullScreen", isFullscreen ); | 50 | cfg.writeEntry("FullScreen", isFullscreen ); |
51 | cfg.writeEntry("Scaling", isScaled ); | 51 | cfg.writeEntry("Scaling", isScaled ); |
52 | cfg.writeEntry("Looping", isLooping ); | 52 | cfg.writeEntry("Looping", isLooping ); |
53 | cfg.writeEntry("Shuffle", isShuffled ); | 53 | cfg.writeEntry("Shuffle", isShuffled ); |
54 | cfg.writeEntry("UsePlayList", usePlaylist ); | 54 | cfg.writeEntry("UsePlayList", usePlaylist ); |
55 | } | 55 | } |
56 | 56 | ||
57 | 57 | ||
58 | struct MediaPlayerPlugin { | ||
59 | #ifndef QT_NO_COMPONENT | ||
60 | QLibrary *library; | ||
61 | #endif | ||
62 | MediaPlayerPluginInterface *iface; | ||
63 | MediaPlayerDecoder *decoder; | ||
64 | MediaPlayerEncoder *encoder; | ||
65 | }; | ||
66 | 58 | ||
67 | 59 | ||
68 | static QValueList<MediaPlayerPlugin> pluginList; | 60 | // public stuff |
61 | bool MediaPlayerState::fullscreen() { | ||
62 | return isFullscreen; | ||
63 | } | ||
64 | |||
65 | bool MediaPlayerState::scaled() { | ||
66 | return isScaled; | ||
67 | } | ||
68 | |||
69 | bool MediaPlayerState::looping() { | ||
70 | return isLooping; | ||
71 | } | ||
72 | |||
73 | bool MediaPlayerState::shuffled() { | ||
74 | return isShuffled; | ||
75 | } | ||
76 | |||
77 | |||
78 | bool MediaPlayerState:: playlist() { | ||
79 | return usePlaylist; | ||
80 | } | ||
81 | |||
82 | bool MediaPlayerState::paused() { | ||
83 | return isPaused; | ||
84 | } | ||
85 | |||
86 | bool MediaPlayerState::playing() { | ||
87 | return isPlaying; | ||
88 | } | ||
89 | |||
90 | long MediaPlayerState::position() { | ||
91 | return curPosition; | ||
92 | } | ||
93 | |||
94 | long MediaPlayerState::length() { | ||
95 | return curLength; | ||
96 | } | ||
97 | |||
98 | char MediaPlayerState::view() { | ||
99 | return curView; | ||
100 | } | ||
101 | |||
102 | // slots | ||
103 | void MediaPlayerState::setFullscreen( bool b ) { | ||
104 | if ( isFullscreen == b ) { | ||
105 | return; | ||
106 | } | ||
107 | isFullscreen = b; | ||
108 | emit fullscreenToggled(b); | ||
109 | } | ||
110 | |||
111 | |||
112 | void MediaPlayerState::setScaled( bool b ) { | ||
113 | if ( isScaled == b ) { | ||
114 | return; | ||
115 | } | ||
116 | isScaled = b; | ||
117 | emit scaledToggled(b); | ||
118 | } | ||
119 | |||
120 | void MediaPlayerState::setLooping( bool b ) { | ||
121 | if ( isLooping == b ) { | ||
122 | return; | ||
123 | } | ||
124 | isLooping = b; | ||
125 | emit loopingToggled(b); | ||
126 | } | ||
127 | |||
128 | void MediaPlayerState::setShuffled( bool b ) { | ||
129 | if ( isShuffled == b ) { | ||
130 | return; | ||
131 | } | ||
132 | isShuffled = b; | ||
133 | emit shuffledToggled(b); | ||
134 | } | ||
135 | |||
136 | void MediaPlayerState::setPlaylist( bool b ) { | ||
137 | if ( usePlaylist == b ) { | ||
138 | return; | ||
139 | } | ||
140 | usePlaylist = b; | ||
141 | emit playlistToggled(b); | ||
142 | } | ||
143 | |||
144 | void MediaPlayerState::setPaused( bool b ) { | ||
145 | if ( isPaused == b ) { | ||
146 | return; | ||
147 | } | ||
148 | isPaused = b; | ||
149 | emit pausedToggled(b); | ||
150 | } | ||
151 | |||
152 | void MediaPlayerState::setPlaying( bool b ) { | ||
153 | if ( isPlaying == b ) { | ||
154 | return; | ||
155 | } | ||
156 | isPlaying = b; | ||
157 | emit playingToggled(b); | ||
158 | } | ||
159 | |||
160 | void MediaPlayerState::setPosition( long p ) { | ||
161 | if ( curPosition == p ) { | ||
162 | return; | ||
163 | } | ||
164 | curPosition = p; | ||
165 | emit positionChanged(p); | ||
166 | } | ||
167 | |||
168 | void MediaPlayerState::updatePosition( long p ){ | ||
169 | if ( curPosition == p ) { | ||
170 | return; | ||
171 | } | ||
172 | curPosition = p; | ||
173 | emit positionUpdated(p); | ||
174 | } | ||
175 | |||
176 | void MediaPlayerState::setLength( long l ) { | ||
177 | if ( curLength == l ) { | ||
178 | return; | ||
179 | } | ||
180 | curLength = l; | ||
181 | emit lengthChanged(l); | ||
182 | } | ||
183 | |||
184 | void MediaPlayerState::setView( char v ) { | ||
185 | if ( curView == v ) { | ||
186 | return; | ||
187 | } | ||
188 | curView = v; | ||
189 | emit viewChanged(v); | ||
190 | } | ||
191 | |||
192 | void MediaPlayerState::setPrev(){ | ||
193 | emit prev(); | ||
194 | } | ||
195 | |||
196 | void MediaPlayerState::setNext() { | ||
197 | emit next(); | ||
198 | } | ||
199 | |||
200 | void MediaPlayerState::setList() { | ||
201 | setPlaying( FALSE ); | ||
202 | setView('l'); | ||
203 | } | ||
204 | |||
205 | void MediaPlayerState::setVideo() { | ||
206 | setView('v'); | ||
207 | } | ||
208 | |||
209 | void MediaPlayerState::setAudio() { | ||
210 | setView('a'); | ||
211 | } | ||
212 | |||
213 | |||
214 | |||
215 | void MediaPlayerState::toggleFullscreen() { | ||
216 | setFullscreen( !isFullscreen ); | ||
217 | } | ||
218 | |||
219 | void MediaPlayerState::toggleScaled() { | ||
220 | setScaled( !isScaled); | ||
221 | } | ||
222 | |||
223 | void MediaPlayerState::toggleLooping() { | ||
224 | setLooping( !isLooping); | ||
225 | } | ||
226 | |||
227 | void MediaPlayerState::toggleShuffled() { | ||
228 | setShuffled( !isShuffled); | ||
229 | } | ||
230 | |||
231 | void MediaPlayerState::togglePlaylist() { | ||
232 | setPlaylist( !usePlaylist); | ||
233 | } | ||
234 | |||
235 | void MediaPlayerState::togglePaused() { | ||
236 | setPaused( !isPaused); | ||
237 | } | ||
238 | |||
239 | void MediaPlayerState::togglePlaying() { | ||
240 | setPlaying( !isPlaying); | ||
241 | } | ||
242 | |||
243 | |||
69 | 244 | ||
70 | 245 | ||
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.h b/noncore/multimedia/opieplayer2/mediaplayerstate.h index 8a64939..7aa0ff2 100644 --- a/noncore/multimedia/opieplayer2/mediaplayerstate.h +++ b/noncore/multimedia/opieplayer2/mediaplayerstate.h | |||
@@ -8,64 +8,61 @@ | |||
8 | 8 | ||
9 | class MediaPlayerDecoder; | 9 | class MediaPlayerDecoder; |
10 | class Config; | 10 | class Config; |
11 | 11 | ||
12 | 12 | ||
13 | class MediaPlayerState : public QObject { | 13 | class MediaPlayerState : public QObject { |
14 | Q_OBJECT | 14 | Q_OBJECT |
15 | public: | 15 | public: |
16 | MediaPlayerState( QObject *parent, const char *name ); | 16 | MediaPlayerState( QObject *parent, const char *name ); |
17 | ~MediaPlayerState(); | 17 | ~MediaPlayerState(); |
18 | 18 | ||
19 | bool isStreaming; | 19 | bool isStreaming; |
20 | bool fullscreen() { return isFullscreen; } | 20 | bool fullscreen(); |
21 | bool scaled() { return isScaled; } | 21 | bool scaled(); |
22 | bool looping() { return isLooping; } | 22 | bool looping(); |
23 | bool shuffled() { return isShuffled; } | 23 | bool shuffled(); |
24 | bool playlist() { return usePlaylist; } | 24 | bool playlist(); |
25 | bool paused() { return isPaused; } | 25 | bool paused(); |
26 | bool playing() { return isPlaying; } | 26 | bool playing(); |
27 | long position() { return curPosition; } | 27 | long position(); |
28 | long length() { return curLength; } | 28 | long length(); |
29 | char view() { return curView; } | 29 | char view(); |
30 | |||
31 | MediaPlayerDecoder *newDecoder( const QString& file ); | ||
32 | MediaPlayerDecoder *curDecoder(); | ||
33 | 30 | ||
34 | public slots: | 31 | public slots: |
35 | void setFullscreen( bool b ) { if ( isFullscreen == b ) return; isFullscreen = b; emit fullscreenToggled(b); } | 32 | void setFullscreen( bool b ); |
36 | void setScaled( bool b ) { if ( isScaled == b ) return; isScaled = b; emit scaledToggled(b); } | 33 | void setScaled( bool b ); |
37 | void setLooping( bool b ) { if ( isLooping == b ) return; isLooping = b; emit loopingToggled(b); } | 34 | void setLooping( bool b ); |
38 | void setShuffled( bool b ) { if ( isShuffled == b ) return; isShuffled = b; emit shuffledToggled(b); } | 35 | void setShuffled( bool b ); |
39 | void setPlaylist( bool b ) { if ( usePlaylist == b ) return; usePlaylist = b; emit playlistToggled(b); } | 36 | void setPlaylist( bool b ); |
40 | void setPaused( bool b ) { if ( isPaused == b ) return; isPaused = b; emit pausedToggled(b); } | 37 | void setPaused( bool b ); |
41 | void setPlaying( bool b ) { if ( isPlaying == b ) return; isPlaying = b; emit playingToggled(b); } | 38 | void setPlaying( bool b ); |
42 | void setPosition( long p ) { if ( curPosition == p ) return; curPosition = p; emit positionChanged(p); } | 39 | void setPosition( long p ); |
43 | void updatePosition( long p ){ if ( curPosition == p ) return; curPosition = p; emit positionUpdated(p); } | 40 | void updatePosition( long p ); |
44 | void setLength( long l ) { if ( curLength == l ) return; curLength = l; emit lengthChanged(l); } | 41 | void setLength( long l ); |
45 | void setView( char v ) { if ( curView == v ) return; curView = v; emit viewChanged(v); } | 42 | void setView( char v ); |
46 | 43 | ||
47 | void setPrev() { emit prev(); } | 44 | void setPrev() ; |
48 | void setNext() { emit next(); } | 45 | void setNext(); |
49 | void setList() { setPlaying( FALSE ); setView('l'); } | 46 | void setList(); |
50 | void setVideo() { setView('v'); } | 47 | void setVideo(); |
51 | void setAudio() { setView('a'); } | 48 | void setAudio(); |
52 | 49 | ||
53 | void toggleFullscreen() { setFullscreen( !isFullscreen ); } | 50 | void toggleFullscreen(); |
54 | void toggleScaled() { setScaled( !isScaled); } | 51 | void toggleScaled(); |
55 | void toggleLooping() { setLooping( !isLooping); } | 52 | void toggleLooping(); |
56 | void toggleShuffled() { setShuffled( !isShuffled); } | 53 | void toggleShuffled(); |
57 | void togglePlaylist() { setPlaylist( !usePlaylist); } | 54 | void togglePlaylist(); |
58 | void togglePaused() { setPaused( !isPaused); } | 55 | void togglePaused(); |
59 | void togglePlaying() { setPlaying( !isPlaying); } | 56 | void togglePlaying(); |
60 | 57 | ||
61 | signals: | 58 | signals: |
62 | void fullscreenToggled( bool ); | 59 | void fullscreenToggled( bool ); |
63 | void scaledToggled( bool ); | 60 | void scaledToggled( bool ); |
64 | void loopingToggled( bool ); | 61 | void loopingToggled( bool ); |
65 | void shuffledToggled( bool ); | 62 | void shuffledToggled( bool ); |
66 | void playlistToggled( bool ); | 63 | void playlistToggled( bool ); |
67 | void pausedToggled( bool ); | 64 | void pausedToggled( bool ); |
68 | void playingToggled( bool ); | 65 | void playingToggled( bool ); |
69 | void positionChanged( long ); // When the slider is moved | 66 | void positionChanged( long ); // When the slider is moved |
70 | void positionUpdated( long ); // When the media file progresses | 67 | void positionUpdated( long ); // When the media file progresses |
71 | void lengthChanged( long ); | 68 | void lengthChanged( long ); |
@@ -77,21 +74,19 @@ signals: | |||
77 | private: | 74 | private: |
78 | bool isFullscreen; | 75 | bool isFullscreen; |
79 | bool isScaled; | 76 | bool isScaled; |
80 | bool isLooping; | 77 | bool isLooping; |
81 | bool isShuffled; | 78 | bool isShuffled; |
82 | bool usePlaylist; | 79 | bool usePlaylist; |
83 | bool isPaused; | 80 | bool isPaused; |
84 | bool isPlaying; | 81 | bool isPlaying; |
85 | long curPosition; | 82 | long curPosition; |
86 | long curLength; | 83 | long curLength; |
87 | char curView; | 84 | char curView; |
88 | 85 | ||
89 | MediaPlayerDecoder *decoder; | ||
90 | |||
91 | void readConfig( Config& cfg ); | 86 | void readConfig( Config& cfg ); |
92 | void writeConfig( Config& cfg ) const; | 87 | void writeConfig( Config& cfg ) const; |
93 | }; | 88 | }; |
94 | 89 | ||
95 | 90 | ||
96 | #endif // MEDIA_PLAYER_STATE_H | 91 | #endif // MEDIA_PLAYER_STATE_H |
97 | 92 | ||