-rw-r--r-- | library/sound.cpp | 63 |
1 files changed, 34 insertions, 29 deletions
diff --git a/library/sound.cpp b/library/sound.cpp index 602fcf0..1ff3b3f 100644 --- a/library/sound.cpp +++ b/library/sound.cpp | |||
@@ -102,43 +102,47 @@ static int WAVsoundDuration(const QString& filename) | |||
102 | 102 | ||
103 | class SoundData : public QSound { | 103 | class SoundData : public QSound { |
104 | public: | 104 | public: |
105 | SoundData(const QString& name) : | 105 | SoundData ( const QString& name ) : |
106 | QSound(Resource::findSound(name)), | 106 | QSound ( Resource::findSound ( name )), |
107 | filename(Resource::findSound(name)) | 107 | filename ( Resource::findSound ( name )) |
108 | { | 108 | { |
109 | loopsleft=0; | 109 | loopsleft=0; |
110 | } | 110 | ms = WAVsoundDuration(filename); |
111 | } | ||
111 | 112 | ||
112 | void playLoop(int loopcnt = -1) | 113 | void playLoop ( int loopcnt = -1 ) |
113 | { | 114 | { |
114 | // needs server support | 115 | // needs server support |
115 | loopsleft = loopcnt; | 116 | loopsleft = loopcnt; |
116 | 117 | ||
117 | int ms = WAVsoundDuration(filename); | 118 | if ( ms ) |
118 | if ( ms ) | 119 | startTimer ( ms > 50 ? ms-50 : 0 ); // 50 for latency |
119 | startTimer(ms > 50 ? ms-50 : 0); // 50 for latency | 120 | play ( ); |
120 | play(); | 121 | } |
121 | } | ||
122 | 122 | ||
123 | void timerEvent ( QTimerEvent *e ) | 123 | void timerEvent ( QTimerEvent *e ) |
124 | { | 124 | { |
125 | if (loopsleft >= 0) { | 125 | if ( loopsleft >= 0 ) { |
126 | if (--loopsleft <= 0) | 126 | if ( --loopsleft <= 0 ) { |
127 | killTimer (e->timerId()); | 127 | killTimer ( e-> timerId ( )); |
128 | return; | 128 | loopsleft = 0; |
129 | } | 129 | return; |
130 | play(); | 130 | } |
131 | } | 131 | } |
132 | play(); | ||
133 | } | ||
132 | 134 | ||
133 | bool isFinished ( ) const | 135 | bool isFinished ( ) const |
134 | { | 136 | { |
135 | return ( loopsleft == 0 ); | 137 | return ( loopsleft == 0 ); |
136 | } | 138 | } |
137 | 139 | ||
138 | private: | 140 | private: |
139 | QString filename; | 141 | QString filename; |
140 | int loopsleft; | 142 | int loopsleft; |
143 | int ms; | ||
141 | }; | 144 | }; |
145 | |||
142 | #endif | 146 | #endif |
143 | 147 | ||
144 | Sound::Sound(const QString& name) | 148 | Sound::Sound(const QString& name) |
@@ -158,7 +162,6 @@ Sound::~Sound() | |||
158 | void Sound::play() | 162 | void Sound::play() |
159 | { | 163 | { |
160 | #ifndef QT_NO_SOUND | 164 | #ifndef QT_NO_SOUND |
161 | d->killTimers(); | ||
162 | d->playLoop(1); | 165 | d->playLoop(1); |
163 | #endif | 166 | #endif |
164 | } | 167 | } |
@@ -182,6 +185,8 @@ bool Sound::isFinished() const | |||
182 | { | 185 | { |
183 | #ifndef QT_NO_SOUND | 186 | #ifndef QT_NO_SOUND |
184 | return d->isFinished(); | 187 | return d->isFinished(); |
188 | #else | ||
189 | return true; | ||
185 | #endif | 190 | #endif |
186 | } | 191 | } |
187 | 192 | ||