mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2024-11-19 20:13:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compile errors on Linux.

Browse Source
This commit is contained in:
casey langen 2022-12-04 11:32:02 -08:00
parent 99af903b26
commit 8d703e9737
3 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/musikcubed/main.cpp
View File

@ -21,9 +21,6 @@
#include <musikcore/support/PreferenceKeys.h>
#include <musikcore/support/Common.h>
#include <boost/locale.hpp>
#include <boost/filesystem/detail/utf8_codecvt_facet.hpp>
#include "../musikcore/version.h"
using namespace musik;
@ -264,12 +261,6 @@ static void initForeground() {
});
}
static void initUtf8() {
std::locale locale = std::locale();
std::locale utf8Locale(locale, new boost::filesystem::detail::utf8_codecvt_facet);
boost::filesystem::path::imbue(utf8Locale);
}
static void rescanHandler(int signal) {
debug::info("daemon", "received SIGUSR1, rescanning the library...");
auto library = LibraryFactory::Instance().DefaultLocalLibrary();
@ -277,7 +268,6 @@ static void rescanHandler(int signal) {
}
int main(int argc, char** argv) {
initUtf8();
std::cout << "\n using lockfile at: " << getLockfileFn();
handleCommandLine(argc, argv);
exitIfRunning();

10
src/plugins/pipewireout/PipeWireOut.cpp
View File

@ -85,7 +85,7 @@ static std::string getDeviceId() {
}
void PipeWireOut::OnStreamStateChanged(void* data, enum pw_stream_state old, enum pw_stream_state state, const char* error) {
::debug->Info(TAG, str::format("state changed from %d to %d. (%s)", old, state, error ? error : "no additional context").c_str());
::debug->Info(TAG, str::Format("state changed from %d to %d. (%s)", old, state, error ? error : "no additional context").c_str());
}
void PipeWireOut::OnCoreDone(void* userdata, uint32_t id, int seq) {
@ -119,7 +119,7 @@ void PipeWireOut::OnRegistryGlobal(void *userdata, uint32_t id, uint32_t permiss
}
pw_properties_free(dict);
}
::debug->Info(TAG, str::format("detected PipeWire:Interface:Device with id=%d", id).c_str());
::debug->Info(TAG, str::Format("detected PipeWire:Interface:Device with id=%d", id).c_str());
context->instance->deviceList.Add(std::to_string(id), formattedName);
}
}
@ -337,7 +337,7 @@ bool PipeWireOut::StartPipeWire(IBuffer* buffer) {
int result;
if ((result = pw_thread_loop_start(this->pwThreadLoop)) != 0) {
::debug->Error(TAG, str::format("error starting thread loop: %s", spa_strerror(result)).c_str());
::debug->Error(TAG, str::Format("error starting thread loop: %s", spa_strerror(result)).c_str());
goto cleanup;
};
@ -371,7 +371,7 @@ bool PipeWireOut::StartPipeWire(IBuffer* buffer) {
params[0] = spa_format_audio_raw_build(&builder, SPA_PARAM_EnumFormat, &audioInfo);
if (!params[0]) {
::debug->Error(TAG, str::format(
::debug->Error(TAG, str::Format(
"failed to create audio format. channels=%d, rate=%d",
this->channelCount,
this->sampleRate).c_str());
@ -408,7 +408,7 @@ bool PipeWireOut::StartPipeWire(IBuffer* buffer) {
return true;
}
else {
::debug->Error(TAG, str::format(
::debug->Error(TAG, str::Format(
"error starting stream: %s",
spa_strerror(result)).c_str());
}

1
src/plugins/pulseout/PulseOut.cpp
View File

@ -39,6 +39,7 @@
#include <pulse/pulseaudio.h>
#include <pulse/thread-mainloop.h>
#include <math.h>
#include <vector>
using namespace musik::core::sdk;