3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-05-16 18:46:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Use lambdas instead of static funcs for Jack callbacks

Browse source
This commit is contained in:
Marcus Weseloh 2024-06-02 12:50:02 +02:00 • committed by Johannes Pohl
parent 2921fd69d8
commit 3527c0a2eb
2 changed files with 9 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

39
server/streamreader/jack_stream.cpp
View file

@ -156,8 +156,8 @@ JackStream::JackStream(PcmStream::Listener* pcmListener, boost::asio::io_context
throw SnapException("JackStreams only support 16, 24 and 32 bit sample formats");
}
jack_set_error_function(jackErrorMessage);
jack_set_info_function(jackInfoMessage);
jack_set_error_function([](const char* msg) { LOG(ERROR, LOG_TAG) << "Jack Error: " << msg << "\n"; });
jack_set_info_function([](const char* msg) { LOG(DEBUG, LOG_TAG) << msg << "\n"; });
}
@ -243,9 +243,13 @@ bool JackStream::openJackConnection()
LOG(DEBUG, LOG_TAG) << name_ << ": Jack server time adjustment is " << jackTimeAdjust_ << "\n";
jack_set_process_callback(client_, processCallback, this);
jack_on_shutdown(client_, jackShutdown, this);
jack_set_port_registration_callback(client_, jackPortRegistration, this);
jack_set_process_callback(
client_, [](jack_nframes_t nframes, void* arg) { return static_cast<JackStream*>(arg)->readJackBuffers(nframes); }, this);
jack_on_shutdown(
client_, [](void* arg) { static_cast<JackStream*>(arg)->onJackShutdown(); }, this);
jack_set_port_registration_callback(
client_, [](jack_port_id_t port_id, int registered, void* arg) { return static_cast<JackStream*>(arg)->onJackPortRegistration(port_id, registered); },
this);
int err = jack_activate(client_);
if (err)
@ -447,29 +451,4 @@ void JackStream::onJackShutdown()
wait(read_timer_, 1000ms, [this] { tryConnect(); });
}
int JackStream::processCallback(jack_nframes_t nframes, void* arg)
{
return static_cast<JackStream*>(arg)->readJackBuffers(nframes);
}
void JackStream::jackShutdown(void* arg)
{
static_cast<JackStream*>(arg)->onJackShutdown();
}
void JackStream::jackErrorMessage(const char* msg)
{
// LOG(TRACE, LOG_TAG) << "Jack Error: " << msg << "\n";
}
void JackStream::jackInfoMessage(const char* msg)
{
// LOG(TRACE, LOG_TAG) << msg << "\n";
}
void JackStream::jackPortRegistration(jack_port_id_t port_id, int registered, void* arg)
{
return static_cast<JackStream*>(arg)->onJackPortRegistration(port_id, registered);
}
} // namespace streamreader