diff --git a/Live/src/main/cpp/safe_queue.h b/Live/src/main/cpp/safe_queue.h index 9f7b401..3575753 100644 --- a/Live/src/main/cpp/safe_queue.h +++ b/Live/src/main/cpp/safe_queue.h @@ -39,7 +39,6 @@ public: void push(T new_value) { #ifdef C11 - //锁 和智能指针原理类似,自动释放 lock_guard lk(mt); if (work) { q.push(new_value); @@ -62,9 +61,7 @@ public: int pop(T &value) { int ret = 0; #ifdef C11 - //占用空间相对lock_guard 更大一点且相对更慢一点,但是配合条件必须使用它,更灵活 unique_lock lk(mt); - //第二个参数 lambda表达式:false则不阻塞 往下走 cv.wait(lk,[this]{return !work || !q.empty();}); if (!q.empty()) { value = q.front(); @@ -105,7 +102,7 @@ public: } int size() { - return q.size(); + return static_cast(q.size()); } void clear() { @@ -119,7 +116,7 @@ public: } #else pthread_mutex_lock(&mutex); - int size = q.size(); + int size = static_cast(q.size()); for (int i = 0; i < size; ++i) { T value = q.front(); releaseCallback(value); diff --git a/app/src/main/cpp/visualizer/execute_fft.h b/app/src/main/cpp/visualizer/execute_fft.h index 1b13db5..e606b82 100644 --- a/app/src/main/cpp/visualizer/execute_fft.h +++ b/app/src/main/cpp/visualizer/execute_fft.h @@ -2,8 +2,8 @@ // Created by frank on 2021/8/16. // -#ifndef PLAYER_CORE_RUN_FFT_H -#define PLAYER_CORE_RUN_FFT_H +#ifndef EXECUTE_FFT_H +#define EXECUTE_FFT_H #include "vlc_queue.h" #include "fft.h" @@ -73,4 +73,4 @@ static void *fft_thread(void *); /*static*/ void close_visualizer(filter_sys_t *p_filter); -#endif //PLAYER_CORE_RUN_FFT_H +#endif //EXECUTE_FFT_H