author | sandman <sandman> | 2002-06-18 12:46:11 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-06-18 12:46:11 (UTC) |
commit | 61e2f9e5eb634b17ef480d79bdbcbc3a715990cb (patch) (side-by-side diff) | |
tree | 013600ee0ababcc25f37ff98cede8f67cbdc9d2a /library/sound.cpp | |
parent | e21322ab34a8df36344eece685e604abe4f83fc6 (diff) | |
download | opie-61e2f9e5eb634b17ef480d79bdbcbc3a715990cb.zip opie-61e2f9e5eb634b17ef480d79bdbcbc3a715990cb.tar.gz opie-61e2f9e5eb634b17ef480d79bdbcbc3a715990cb.tar.bz2 |
Moved platform specific things from custom-*.h #defines to virtual methods
in libopie/odevice.{h,cpp}
Minor fix in Sound + reformating
-rw-r--r-- | library/sound.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/library/sound.cpp b/library/sound.cpp index 602fcf0..1ff3b3f 100644 --- a/library/sound.cpp +++ b/library/sound.cpp @@ -108,4 +108,5 @@ public: { loopsleft=0; + ms = WAVsoundDuration(filename); } @@ -115,5 +116,4 @@ public: loopsleft = loopcnt; - int ms = WAVsoundDuration(filename); if ( ms ) startTimer(ms > 50 ? ms-50 : 0); // 50 for latency @@ -124,8 +124,10 @@ public: { if (loopsleft >= 0) { - if (--loopsleft <= 0) + if ( --loopsleft <= 0 ) { killTimer (e->timerId()); + loopsleft = 0; return; } + } play(); } @@ -139,5 +141,7 @@ private: QString filename; int loopsleft; + int ms; }; + #endif @@ -159,5 +163,4 @@ void Sound::play() { #ifndef QT_NO_SOUND - d->killTimers(); d->playLoop(1); #endif @@ -183,4 +186,6 @@ bool Sound::isFinished() const #ifndef QT_NO_SOUND return d->isFinished(); +#else + return true; #endif } |