Commit: master - QtSchChime (git)

Commit MetaInfo

• Revision: 9c9331905a9899c0df8b4c1cac0ee4c4b2916ca4 (tree)
• Time: 2014-08-11 17:00:00
• Author: alucky4416 <alucky4416@user...>
• Commiter: alucky4416

Log Message

change: add mutexlockert to ThSchManager and PlayMusicThread.

Change Summary

• modified: PlayMusicThread.cpp
• modified: PlayMusicThread.h
• modified: thschmanager.cpp
• modified: thschmanager.h

Incremental Difference

--- a/PlayMusicThread.cpp
+++ b/PlayMusicThread.cpp
@@ -5,6 +5,7 @@
 
 PlayMusicThread::PlayMusicThread(WId winId)
 {
+    QMutexLocker locker(&mutex);
     stopped = false;
 
 #ifdef __WIN32__
@@ -31,28 +32,41 @@ PlayMusicThread::~PlayMusicThread()
 
 void PlayMusicThread::stop()
 {
+    QMutexLocker locker(&mutex);
     stopped = true;
 }
 
 void PlayMusicThread::PlayMusic(const QString &filepath) {
     if (state == IDLE) {
+        QMutexLocker locker(&mutex);
         FilePath = filepath;
     }
 }
 
 void PlayMusicThread::StopMusic() {
     if (state == PLAYING) {
+        QMutexLocker locker(&mutex);
         playstopped = true;
     }
 }
 int PlayMusicThread::GetPlayStatus() {
+    QMutexLocker locker(&mutex);
     return state;
 }
 
 void PlayMusicThread::run()
 {
-    while (!stopped) {
+
+    forever {
+        {
+            QMutexLocker locker(&mutex);
+            if (stopped) {
+                stopped = false;
+                break;
+            }
+        }
         if (state == IDLE) {
+            QMutexLocker locker(&mutex);
             if (FilePath.isEmpty()) {
                 ;
             } else {
@@ -69,6 +83,7 @@ void PlayMusicThread::run()
                 emit MusicStarted(PlayFileName);
             }
         } else if (state == PLAYING){
+            QMutexLocker locker(&mutex);
             if (!IsMusicPlaying() || playstopped) {
                 // Music Stop
                 MusicStop();

--- a/PlayMusicThread.h
+++ b/PlayMusicThread.h
@@ -2,8 +2,10 @@
 #define PLAYMUSICTHREAD_H
 
 #include <QWidget> // WId
-#include <QThread>
 #include <QString>
+#include <QThread>
+#include <QMutexLocker>
+
 
 #include <bass.h>
 
@@ -34,6 +36,7 @@ protected:
     int IsMusicPlaying();
 
 private:
+    QMutex mutex;
     volatile bool stopped;
     volatile bool playstopped;
 

--- a/thschmanager.cpp
+++ b/thschmanager.cpp
@@ -2,6 +2,7 @@
 
 #include <QStringList>
 #include <QDateTime>
+#include <QMutexLocker>
 
 #include <QDebug>
 
@@ -20,23 +21,39 @@ ThSchManager::~ThSchManager()
 
 void ThSchManager::stop()
 {
+    QMutexLocker locker(&mutex);
     stopped = true;
 }
 
 void ThSchManager::run()
 {
+    bool EventEmpty;
     EventData event;
     int event_id;
     int status = 0; // 0 = idle, 1 = exec
     int index;
     QString nexttime;
 
-    while (!stopped) {
-        if (EvtQue->isEmpty()) {
+    forever {
+        {
+            QMutexLocker locker(&mutex);
+            if (stopped) {
+                stopped = false;
+                break;
+            } else {
+                if (EventEmpty = EvtQue->isEmpty()) {
+                    ;
+                } else{
+                    event = EvtQue->dequeue();
+                }
+            }
+        }
+        if (EventEmpty) {
             if (status == 1) { // EXEC (supervise sch time)
+                QMutexLocker locker(&mutex);
                 // Is Saturday and Sunday
                 if ((ExcludeSS && isSaturdayOrSunday()) || (ExcludeHolidays && isHolidays())) {
-                    sleep(1); // skip
+                    ; // skip
                 } else {
                     // Time Check
                     if (isMatchSchTimeVsCurrentTime(&nexttime)) {
@@ -45,50 +62,48 @@ void ThSchManager::run()
                         ThPlayMusic->PlayMusic(ChimeFilepath);
 
                         // next
-                        if ((index + 1) < SchTimeList.count())
+                        if ((index + 1) < SchTimeList.count()) {
                             index++;
-                        else
+                        } else {
                             index = 0;
+                        }
                         nexttime = SchTimeList.at(index);
                         emit sig_notify_nexttime(nexttime);
                         // qDebug() << "### next time : " << nexttime;
-                    } else {
-                        sleep(1);
                     }
                 }
-            } else {
-                sleep(1);
             }
+            sleep(1);
         } else {
-            event = EvtQue->dequeue();
-            event_id = event.id;
-            switch(event_id) {
-            case Ev_Start:
-                if (status == 0) { // idle
-                    // Start;
-                    // qDebug() << "### Start!";
-                    index = nextSchTimeIndex(&SchTimeList);
-                    nexttime = SchTimeList.at(index);
-                    emit sig_notify_nexttime(nexttime);
-                    // qDebug() << "### next time : " << nexttime;
-                    status = 1; // goto EXEC
-                }
-                break;
-            case Ev_Stop:
-                if (status == 1) {
-                    // Stop;
-                    emit sig_notify_nexttime("idle...");
-                    // qDebug() << "### Stop!";
-                    status = 0; // goto IDLE
+                //            event = EvtQue->dequeue();
+                event_id = event.id;
+                switch(event_id) {
+                case Ev_Start:
+                    if (status == 0) { // idle
+                        QMutexLocker locker(&mutex);
+                        // Start;
+                        // qDebug() << "### Start!";
+                        index = nextSchTimeIndex(&SchTimeList);
+                        nexttime = SchTimeList.at(index);
+                        emit sig_notify_nexttime(nexttime);
+                        // qDebug() << "### next time : " << nexttime;
+                        status = 1; // goto EXEC
+                    }
+                    break;
+                case Ev_Stop:
+                    if (status == 1) {
+                        QMutexLocker locker(&mutex);
+                        // Stop;
+                        emit sig_notify_nexttime("idle...");
+                        // qDebug() << "### Stop!";
+                        status = 0; // goto IDLE
+                    }
+                    break;
+                default:
+                    break;
                 }
-                break;
-            default:
-                break;
-            }
-        }
-
-    } // while(!stopped)
-
+        } // if(EventEmpty)
+    } // forever
 }
 
 void ThSchManager::sendEvent_Start()
@@ -96,6 +111,7 @@ void ThSchManager::sendEvent_Start()
     EventData evt;
 
     evt.id = Ev_Start;
+    QMutexLocker locker(&mutex);
     EvtQue->enqueue(evt);
 }
 
@@ -104,6 +120,7 @@ void ThSchManager::sendEvent_Stop()
     EventData evt;
 
     evt.id = Ev_Stop;
+    QMutexLocker locker(&mutex);
     EvtQue->enqueue(evt);
 }
 
@@ -121,6 +138,7 @@ void ThSchManager::setSchTimeList(QStringList list)
 {
     if (list.isEmpty()) return;
 
+    QMutexLocker locker(&mutex);
     SchTimeList.clear();
     SchTimeList = list;
     // qDebug() << "ThSchManager::SchTimeList:" << SchTimeList;
@@ -130,6 +148,7 @@ void ThSchManager::setHolidaysList(QStringList list)
 {
     if (list.isEmpty()) return;
 
+    QMutexLocker locker(&mutex);
     HolidaysList.clear();
     HolidaysList = list;
     // qDebug() << "ThSchManager::HolidaysList:" << HolidaysList;
@@ -137,11 +156,13 @@ void ThSchManager::setHolidaysList(QStringList list)
 
 void ThSchManager::setExcludeSS(bool flag)
 {
+    QMutexLocker locker(&mutex);
     ExcludeSS = flag;
 }
 
 void ThSchManager::setExcludeHolidays(bool flag)
 {
+    QMutexLocker locker(&mutex);
     ExcludeHolidays = flag;
 }
 

--- a/thschmanager.h
+++ b/thschmanager.h
@@ -38,6 +38,7 @@ protected:
     void run();
 
 private:
+    QMutex mutex;
     volatile bool stopped;
 
     // Event ID