C++11: use atomic bool instead of mutex

2 files changed, 4 insertions, 18 deletions

diff --git a/src/odr-padenc.cpp b/src/odr-padenc.cpp
index 319a037..d7f6a86 100644
--- a/src/odr-padenc.cpp
+++ b/src/odr-padenc.cpp
@@ -279,12 +279,6 @@ int main(int argc, char *argv[]) {
 
 
 // --- PadEncoder -----------------------------------------------------------------
-void PadEncoder::DoExit() {
-    std::lock_guard<std::mutex> lock(status_mutex);
-
-    do_exit = true;
-}
-
 int PadEncoder::Main() {
     output_fd = open(options.output, O_WRONLY);
     if (output_fd == -1) {
@@ -314,14 +308,7 @@ int PadEncoder::Main() {
 
     // invoke actual encoder
     int result = 0;
-    for (;;) {
-        {
-            std::lock_guard<std::mutex> lock(status_mutex);
-
-            if(do_exit)
-                break;
-        }
-
+    while (!do_exit) {
         result = Encode();
 
         // abort on error
diff --git a/src/odr-padenc.h b/src/odr-padenc.h
index fe5d375..022ae9c 100644
--- a/src/odr-padenc.h
+++ b/src/odr-padenc.h
@@ -29,7 +29,7 @@
 
 #include "common.h"
 
-#include <mutex>
+#include <atomic>
 #include <stdlib.h>
 #include <signal.h>
 #include <string>
@@ -92,8 +92,7 @@ protected:
     int output_fd;
     steady_clock::time_point run_timeline;
 
-    std::mutex status_mutex;
-    bool do_exit;
+    std::atomic<bool> do_exit;
 
     PadEncoder(PadEncoderOptions options) :
         options(options),
@@ -113,7 +112,7 @@ public:
     virtual ~PadEncoder() {}
 
     int Main();
-    void DoExit();
+    void DoExit() {do_exit = true;}
 };