Changeset 55 for psi/trunk/src/common.cpp

Timestamp:

Sep 21, 2006, 12:43:03 AM (19 years ago)

Author:

dmik

Message:

Psi: General: Changed the !beep format to specify sequences of beeps: !beep[:freq[,dur]]...

File:

• psi/trunk/src/common.cpp (modified) (4 diffs)

psi/trunk/src/common.cpp

@@ -1599 +1599 @@
                 lock.unlock();
         }
-        void add(ulong freq, ulong dur) {
+        void beginSequence() {
                 lock.lock();
+                queue.clear(); // stop the previous sequence
+        }
+        void addNote(ulong freq, ulong dur) {
                 queue.push_back(Beep(freq, dur));
+        }
+        void endSequence() {
                 lock.unlock();
                 if (!sem.available())
@@ -1622 +1627 @@
         };
         QMutex lock;
-        QSemaphore sem;
+        QSemaphore sem; // not QWaitCond cause we need level-triggered semantics
         QValueList<Beep> queue;
         bool terminate;
@@ -1640 +1645 @@
 void soundPlay(const QString &str)
 {
-        if(str.startsWith("!beep")) {
-                QStringList list = QStringList::split(':',str);
-                if (list[0].length() == 5 /* strlen("!beep") */) {
-                        ulong freq = 0, dur = 0;
-                        if (list.count() == 3) {
-                                freq = list[1].toULong();
-                                dur = list[2].toULong();
-                                if (freq < 0x25 || freq > 0x7FFF ||
-                                        dur == 0 || dur > 3000 /* 3s is the reasonable maximum */)
-                                        freq = dur = 0;
-                        }
+        if (str.startsWith("!beep")) {
+                QStringList seq = QStringList::split(':',str);
+                if (seq[0].length() == 5 /* strlen("!beep") */) {
                         if (beepThread == 0) {
                                 beepThread = new BeepThread();
@@ -1658 +1655 @@
                                 }
                         }
-                        if (beepThread)
-                                beepThread->add(freq, dur);
+                        Q_ASSERT(beepThread);
+                        if (beepThread) {
+                                beepThread->beginSequence();
+#if defined(Q_WS_WIN) || defined(Q_WS_PM)
+                                ulong lastDur = 100;
+                                size_t i = 1;
+                                for (; i < seq.count(); ++i) {
+                                        QStringList note = QStringList::split(',',seq[i]);
+                                        if (note.count() < 1) break;
+                                        ulong freq = note[0].toULong();
+                                        if (freq < 0x25 || freq > 0x7FFF) break;
+                                        ulong dur = lastDur;
+                                        if (note.count() > 2) break;
+                                        if (note.count() == 2) {
+                                                dur = note[1].toULong();
+                                                // 3s is the reasonable maximum for the duration
+                                                if (dur == 0 || dur > 3000) break;
+                                                lastDur = dur;
+                                        }
+                                        beepThread->addNote(freq, dur);
+                                }
+                                if (i == 1) // didn't find a single note
+#endif                          
+                                        beepThread->addNote(0, 0);
+                                beepThread->endSequence();
+                        }
                         return;
                 }