Remove remaining boost remnants from AlsaOut, fixed Linux compile issues in Transcoder

This commit is contained in:
casey langen 2022-12-04 12:50:26 -08:00
parent 3637d61938
commit 2a42a14b1c
3 changed files with 12 additions and 11 deletions

View File

@ -46,7 +46,7 @@ static musik::core::sdk::IPreferences* prefs;
#define LOCK(x) \
/*std::cerr << "locking " << x << "\n";*/ \
boost::recursive_mutex::scoped_lock lock(this->stateMutex); \
std::unique_lock<std::recursive_mutex> lock(this->stateMutex); \
/*std::cerr << "locked " << x << "\n";*/ \
#define WAIT() this->threadEvent.wait(lock);
@ -143,7 +143,7 @@ AlsaOut::AlsaOut()
, latency(0)
, initialized(false) {
std::cerr << "AlsaOut::AlsaOut() called" << std::endl;
this->writeThread.reset(new boost::thread(boost::bind(&AlsaOut::WriteLoop, this)));
this->writeThread.reset(new std::thread(std::bind(&AlsaOut::WriteLoop, this)));
}
AlsaOut::~AlsaOut() {

View File

@ -35,15 +35,15 @@
#include "pch.h"
#include <boost/thread/condition.hpp>
#include <boost/thread/thread.hpp>
#include <musikcore/sdk/IOutput.h>
#include <musikcore/sdk/IDevice.h>
#include <boost/thread/recursive_mutex.hpp>
#include <boost/thread/condition.hpp>
#include <list>
#include <vector>
#include <mutex>
#include <condition_variable>
#include <thread>
#include <functional>
class AlsaOut : public musik::core::sdk::IOutput {
public:
@ -97,10 +97,10 @@ class AlsaOut : public musik::core::sdk::IOutput {
double latency;
volatile bool quit, paused, initialized;
std::unique_ptr<boost::thread> writeThread;
boost::recursive_mutex stateMutex;
boost::condition threadEvent;
std::unique_ptr<std::thread> writeThread;
std::recursive_mutex stateMutex;
std::condition_variable_any threadEvent;
std::mutex mutex;
std::list<std::shared_ptr<BufferContext> > buffers;
boost::mutex mutex;
};

View File

@ -43,6 +43,7 @@
#include <set>
#include <map>
#include <filesystem>
#include <functional>
#include <chrono>
namespace fs = std::filesystem;