From 83b6825bd0e4a27a956d6d57ebcab73aa461de00 Mon Sep 17 00:00:00 2001 From: John Emmas Date: Tue, 9 Sep 2014 08:26:26 +0100 Subject: [PATCH] Revert "Add a couple of pthread helper macros" This reverts commit 8d0ec2403f3444e3a53d16b21f2f8557abd71b55. --- .../devicemanager/WCMRNativeAudio.cpp | 14 +++---- .../wavesapi/miscutils/pthread_utils.h | 38 ------------------- libs/pbd/MSVCpbd/pbd.vcproj | 4 -- libs/pbd/pbd/pthread_utils.h | 15 -------- 4 files changed, 6 insertions(+), 65 deletions(-) delete mode 100644 libs/backends/wavesaudio/wavesapi/miscutils/pthread_utils.h diff --git a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRNativeAudio.cpp b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRNativeAudio.cpp index 889defe0ad..18811f7dc6 100644 --- a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRNativeAudio.cpp +++ b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRNativeAudio.cpp @@ -12,7 +12,6 @@ #endif #include "WCMRNativeAudio.h" -#include "MiscUtils/pthread_utils.h" #include "MiscUtils/safe_delete.h" #include #include @@ -35,12 +34,11 @@ //********************************************************************************************** WCMRNativeAudioNoneDevice::WCMRNativeAudioNoneDevice (WCMRAudioDeviceManager *pManager) : WCMRNativeAudioDevice (pManager, false /*useMultiThreading*/) + , m_SilenceThread(0) #if defined (PLATFORM_WINDOWS) , _waitableTimerForUsleep (CreateWaitableTimer(NULL, TRUE, NULL)) #endif { - mark_pthread_inactive (m_SilenceThread); - m_DeviceName = NONE_DEVICE_NAME; m_SamplingRates = boost::assign::list_of (m_CurrentSamplingRate=44100)(48000)(88200)(96000); @@ -139,7 +137,7 @@ WTErr WCMRNativeAudioNoneDevice::SetStreaming (bool newState) if (Streaming()) { - if (is_pthread_active (m_SilenceThread)) + if (m_SilenceThread) std::cerr << "\t\t\t\t\t !!!!!!!!!!!!!!! Warning: the inactive NONE-DEVICE was streaming!" << std::endl; pthread_attr_t attributes; @@ -158,19 +156,19 @@ WTErr WCMRNativeAudioNoneDevice::SetStreaming (bool newState) } if (pthread_create (&m_SilenceThread, &attributes, __SilenceThread, this)) { - mark_pthread_inactive (m_SilenceThread); + m_SilenceThread = 0; std::cerr << "WCMRNativeAudioNoneDevice::SetStreaming (): pthread_create () failed!" << std::endl; return eGenericErr; } } else { - if (!is_pthread_active (m_SilenceThread)) + if (!m_SilenceThread) { std::cerr << "\t\t\t\t\t !!!!!!!!!!!!!!! Warning: the active NONE-DEVICE was NOT streaming!" << std::endl; } - while (is_pthread_active (m_SilenceThread)) + while (m_SilenceThread) { _usleep(1); //now wait for ended thread; } @@ -222,7 +220,7 @@ void WCMRNativeAudioNoneDevice::_SilenceThread() } audioCallbackData.acdCycleStartTimeNanos = cycleEndTimeNanos+1; } - mark_pthread_inactive (m_SilenceThread); + m_SilenceThread = 0; } void* WCMRNativeAudioNoneDevice::__SilenceThread(void *This) diff --git a/libs/backends/wavesaudio/wavesapi/miscutils/pthread_utils.h b/libs/backends/wavesaudio/wavesapi/miscutils/pthread_utils.h deleted file mode 100644 index 825405d02e..0000000000 --- a/libs/backends/wavesaudio/wavesapi/miscutils/pthread_utils.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - Copyright (C) 2014 John Emmas - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - -#ifndef __waves_pthread_utils__ -#define __waves_pthread_utils__ - -/* Accommodate thread setting (and testing) for both - * 'libpthread' and 'libpthread_win32' (whose implementations - * of 'pthread_t' are subtlely different) - */ -#ifndef PTHREAD_MACROS_DEFINED -#define PTHREAD_MACROS_DEFINED -#ifdef PTW32_VERSION /* pthread_win32 */ -#define mark_pthread_inactive(threadID) threadID.p=0 -#define is_pthread_active(threadID) threadID.p==0 -#else /* normal pthread */ -#define mark_pthread_inactive(threadID) threadID=0 -#define is_pthread_active(threadID) threadID==0 -#endif /* PTW32_VERSION */ - -#endif /* PTHREAD_MACROS_DEFINED */ -#endif /* __waves_pthread_utils__ */ diff --git a/libs/pbd/MSVCpbd/pbd.vcproj b/libs/pbd/MSVCpbd/pbd.vcproj index 892ee5b3d9..e80a5181c7 100644 --- a/libs/pbd/MSVCpbd/pbd.vcproj +++ b/libs/pbd/MSVCpbd/pbd.vcproj @@ -719,10 +719,6 @@ RelativePath="..\pbd\property_basics.h" > - - diff --git a/libs/pbd/pbd/pthread_utils.h b/libs/pbd/pbd/pthread_utils.h index ee78819d59..37ce723715 100644 --- a/libs/pbd/pbd/pthread_utils.h +++ b/libs/pbd/pbd/pthread_utils.h @@ -20,21 +20,6 @@ #ifndef __pbd_pthread_utils__ #define __pbd_pthread_utils__ -/* Accommodate thread setting (and testing) for both - * 'libpthread' and 'libpthread_win32' (whose implementations - * of 'pthread_t' are subtlely different) - */ -#ifndef PTHREAD_MACROS_DEFINED -#define PTHREAD_MACROS_DEFINED -#ifdef PTW32_VERSION /* pthread_win32 */ -#define mark_pthread_inactive(threadID) threadID.p=0 -#define is_pthread_active(threadID) threadID.p==0 -#else /* normal pthread */ -#define mark_pthread_inactive(threadID) threadID=0 -#define is_pthread_active(threadID) threadID==0 -#endif /* PTW32_VERSION */ -#endif /* PTHREAD_MACROS_DEFINED */ - #ifdef COMPILER_MSVC #include #else -- 2.30.2