mirror of
https://github.com/clangen/musikcube.git
synced 2025-03-14 13:21:13 +00:00
Remove remaining boost remnants from AlsaOut, fixed Linux compile issues in Transcoder
This commit is contained in:
parent
3637d61938
commit
2a42a14b1c
@ -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() {
|
||||
|
@ -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;
|
||||
};
|
||||
|
@ -43,6 +43,7 @@
|
||||
#include <set>
|
||||
#include <map>
|
||||
#include <filesystem>
|
||||
#include <functional>
|
||||
#include <chrono>
|
||||
|
||||
namespace fs = std::filesystem;
|
||||
|
Loading…
x
Reference in New Issue
Block a user