summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp10
-rw-r--r--noncore/multimedia/opieplayer2/inputDialog.cpp14
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayerstate.cpp195
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayerstate.h75
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
@@ -50,27 +50,23 @@ void Ticker::drawContents( QPainter *p ) {
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
60struct MediaButton { 58struct 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)
70MediaButton audioButtons[] = { 66MediaButton 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
@@ -78,18 +74,17 @@ MediaButton audioButtons[] = {
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
82static const int numButtons = (sizeof(audioButtons)/sizeof(MediaButton)); 78static const int numButtons = (sizeof(audioButtons)/sizeof(MediaButton));
83 79
84 80
85AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : 81AudioWidget::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");
@@ -122,20 +117,18 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
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
134AudioWidget::~AudioWidget() { 127AudioWidget::~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
@@ -151,17 +144,16 @@ 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
160void AudioWidget::setPosition( long i ) { 152void 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
166void AudioWidget::setLength( long max ) { 158void AudioWidget::setLength( long max ) {
167 updateSlider( mediaPlayerState->position(), max ); 159 updateSlider( mediaPlayerState->position(), max );
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
@@ -6,39 +6,37 @@
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
13InputDialog::InputDialog( QWidget* parent, const char* name, bool modal, WFlags fl ) 13InputDialog::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 */
33InputDialog::~InputDialog() 33InputDialog::~InputDialog() {
34{
35 inputText= LineEdit1->text(); 34 inputText= LineEdit1->text();
36
37} 35}
38 36
39void InputDialog::browse() { 37void 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";
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
@@ -12,17 +12,17 @@
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
19MediaPlayerState::MediaPlayerState( QObject *parent, const char *name ) 19MediaPlayerState::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
26MediaPlayerState::~MediaPlayerState() { 26MediaPlayerState::~MediaPlayerState() {
27 Config cfg( "OpiePlayer" ); 27 Config cfg( "OpiePlayer" );
28 writeConfig( cfg ); 28 writeConfig( cfg );
@@ -50,21 +50,196 @@ void MediaPlayerState::writeConfig( Config& cfg ) const {
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
58struct 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
68static QValueList<MediaPlayerPlugin> pluginList; 60// public stuff
61bool MediaPlayerState::fullscreen() {
62 return isFullscreen;
63}
64
65bool MediaPlayerState::scaled() {
66 return isScaled;
67}
68
69bool MediaPlayerState::looping() {
70 return isLooping;
71}
72
73bool MediaPlayerState::shuffled() {
74 return isShuffled;
75}
76
77
78bool MediaPlayerState:: playlist() {
79 return usePlaylist;
80}
81
82bool MediaPlayerState::paused() {
83 return isPaused;
84}
85
86bool MediaPlayerState::playing() {
87 return isPlaying;
88}
89
90long MediaPlayerState::position() {
91 return curPosition;
92}
93
94long MediaPlayerState::length() {
95 return curLength;
96}
97
98char MediaPlayerState::view() {
99 return curView;
100}
101
102// slots
103void MediaPlayerState::setFullscreen( bool b ) {
104 if ( isFullscreen == b ) {
105 return;
106 }
107 isFullscreen = b;
108 emit fullscreenToggled(b);
109}
110
111
112void MediaPlayerState::setScaled( bool b ) {
113 if ( isScaled == b ) {
114 return;
115 }
116 isScaled = b;
117 emit scaledToggled(b);
118}
119
120void MediaPlayerState::setLooping( bool b ) {
121 if ( isLooping == b ) {
122 return;
123 }
124 isLooping = b;
125 emit loopingToggled(b);
126}
127
128void MediaPlayerState::setShuffled( bool b ) {
129 if ( isShuffled == b ) {
130 return;
131 }
132 isShuffled = b;
133 emit shuffledToggled(b);
134}
135
136void MediaPlayerState::setPlaylist( bool b ) {
137 if ( usePlaylist == b ) {
138 return;
139 }
140 usePlaylist = b;
141 emit playlistToggled(b);
142}
143
144void MediaPlayerState::setPaused( bool b ) {
145 if ( isPaused == b ) {
146 return;
147 }
148 isPaused = b;
149 emit pausedToggled(b);
150}
151
152void MediaPlayerState::setPlaying( bool b ) {
153 if ( isPlaying == b ) {
154 return;
155 }
156 isPlaying = b;
157 emit playingToggled(b);
158}
159
160void MediaPlayerState::setPosition( long p ) {
161 if ( curPosition == p ) {
162 return;
163 }
164 curPosition = p;
165 emit positionChanged(p);
166}
167
168void MediaPlayerState::updatePosition( long p ){
169 if ( curPosition == p ) {
170 return;
171 }
172 curPosition = p;
173 emit positionUpdated(p);
174}
175
176void MediaPlayerState::setLength( long l ) {
177 if ( curLength == l ) {
178 return;
179 }
180 curLength = l;
181 emit lengthChanged(l);
182}
183
184void MediaPlayerState::setView( char v ) {
185 if ( curView == v ) {
186 return;
187 }
188 curView = v;
189 emit viewChanged(v);
190}
191
192void MediaPlayerState::setPrev(){
193 emit prev();
194}
195
196void MediaPlayerState::setNext() {
197 emit next();
198}
199
200void MediaPlayerState::setList() {
201 setPlaying( FALSE );
202 setView('l');
203}
204
205void MediaPlayerState::setVideo() {
206 setView('v');
207}
208
209void MediaPlayerState::setAudio() {
210 setView('a');
211}
212
213
214
215void MediaPlayerState::toggleFullscreen() {
216 setFullscreen( !isFullscreen );
217}
218
219void MediaPlayerState::toggleScaled() {
220 setScaled( !isScaled);
221}
222
223void MediaPlayerState::toggleLooping() {
224 setLooping( !isLooping);
225}
226
227void MediaPlayerState::toggleShuffled() {
228 setShuffled( !isShuffled);
229}
230
231void MediaPlayerState::togglePlaylist() {
232 setPlaylist( !usePlaylist);
233}
234
235void MediaPlayerState::togglePaused() {
236 setPaused( !isPaused);
237}
238
239void 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
@@ -12,56 +12,53 @@ class Config;
12 12
13class MediaPlayerState : public QObject { 13class MediaPlayerState : public QObject {
14Q_OBJECT 14Q_OBJECT
15public: 15public:
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
34public slots: 31public 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
61signals: 58signals:
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 );
@@ -81,17 +78,15 @@ private:
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