Add the missing header and check the try_lock return value

Change-Id: I240ede8acf92eb2a117e1064afeadea5ea8428f5

diff --git a/packaging/esplusplayer.spec b/packaging/esplusplayer.spec
index cdf38a8..ee63f97 100644 (file)
--- a/packaging/esplusplayer.spec
+++ b/packaging/esplusplayer.spec
@@ -11,7 +11,7 @@
 Name:       esplusplayer
 Summary:    new multimedia streaming player
 Version:    1.3.7
-Release:    1
+Release:    2
 Group:      Multimedia/Libraries
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz

diff --git a/src/esplusplayer/include_internal/esplayer/state_manager.hpp b/src/esplusplayer/include_internal/esplayer/state_manager.hpp
index d90efbc..e26ebc4 100644 (file)
--- a/src/esplusplayer/include_internal/esplayer/state_manager.hpp
+++ b/src/esplusplayer/include_internal/esplayer/state_manager.hpp
@@ -49,6 +49,7 @@
 #include <boost/msm/front/state_machine_def.hpp>  // front-end
 #include <mutex>
 #include <vector>
+#include <thread>
 
 #include "core/utils/plusplayer_log.h"
 #include "esplusplayer/esplusplayer.h"
@@ -323,7 +324,9 @@ class EsStateManager : private boost::noncopyable {
 
   bool ProcessEventStop(const es_event::Stop& stop_event) {
     std::unique_lock<std::mutex> lock(control_m_, std::defer_lock);
-    lock.try_lock();
+    if (!lock.try_lock())
+      STATE_TRACE_P(this, "Failed try_lock");
+
     if (stopped_) return false;
     STATE_TRACE_P(this, "Transition Stop Requested, Current[%d]",
                   GetStateEnum());