Skip to content

fix build and update to SDK 26 #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Atemu wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix build and update to SDK 26 #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
099b824
fix or work around compilation errors
Atemu Apr 21, 2024
75b9194
update to SDK 26
Atemu Apr 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deps/teamspeak-plugin-qt-common
Open in desktop
Submodule teamspeak-plugin-qt-common updated 9 files
+2 −0 core/core/client_storage.h
+1 −0 core/core/ts_error.h
+1 −1 core/core/ts_functions.h
+1 −0 core/talkers.cpp
+2 −0 core/ts_error.cpp
+1 −1 core/ts_functions.cpp
+1 −1 core/ts_serversinfo.cpp
+1 −1 ts3client-pluginsdk
+1 −1 volume/volume/volumes.h
2 changes: 1 addition & 1 deletion src/mod_position_spread.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ enum TALKERS_REGION
TALKERS_REGION_RIGHT,
TALKERS_REGION_END
};
Q_DECLARE_METATYPE(TALKERS_REGION)
Q_DECLARE_METATYPE(thorwe::TALKERS_REGION)

class PositionSpread : public Module_Qt, public TalkInterface
{
Expand Down
2 changes: 1 addition & 1 deletion src/plugin_qt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "core/ts_logging_qt.h"
#include "core/ts_serversinfo.h"

#include "teamspeak/clientlib_publicdefinitions.h"
#include "teamspeak/public_definitions.h"

using namespace com::teamspeak;
using namespace com::teamspeak::pluginsdk;
Expand Down
2 changes: 1 addition & 1 deletion src/plugin_qt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class Plugin : public Plugin_Base

static const char *kPluginName;
static const char *kPluginVersion;
static const int kPluginApiVersion = 23;
static const int kPluginApiVersion = 26;
static const char *kPluginAuthor;
static const char *kPluginDescription;

Expand Down
18 changes: 10 additions & 8 deletions src/positional_audio/mod_positionalaudio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,8 @@ uint64 connection_id, anyID client_id, bool isMe, QString cmd, QTextStream &args

if (args.atEnd()) // Player left vr (unlocked)
{
Log(QString("%1 left %2 VR.").arg(obj->getIdentity()).arg(QString::fromStdWString(obj->get_vr())));
// FIXME error: no matching function for call to 'QString::arg(std::__cxx11::basic_string<wchar_t>&)'
// Log(QString("%1 left %2 VR.").arg(obj->getIdentity()).arg(QString::fromStdWString(obj->get_vr())));
remove_other(connection_id, client_id);
m_PlayersInMyContext.remove(connection_id, client_id);
return true;
Expand Down Expand Up @@ -725,11 +726,12 @@ uint64 connection_id, anyID client_id, bool isMe, QString cmd, QTextStream &args
isDirtyId = (identity != obj->getIdentityRaw());
obj->setIdentityRaw(identity);

Log(QString("Received: VR: %2 CO: %3 ID: %4")
.arg(name)
.arg((context == meObj.get_context()) ? "match" : "no match")
.arg(identity),
connection_id, LogLevel_DEBUG);
// FIXME error: no matching function for call to 'QString::arg(std::__cxx11::basic_string<wchar_t>&)'
// Log(QString("Received: VR: %2 CO: %3 ID: %4")
// .arg(name)
// .arg((context == meObj.get_context()) ? "match" : "no match")
// .arg(identity),
// connection_id, LogLevel_DEBUG);

if (isDirtyName || isDirtyContext)
{
Expand Down Expand Up @@ -782,7 +784,7 @@ auto PositionalAudio::GetSendString(bool isAll) -> QString
if (isAll)
{
// out << " " << m_GameName;
out << " " << meObj.get_vr();
out << " " << QString::fromStdWString(meObj.get_vr());

{
const auto &my_context = meObj.get_context_as_string();
Expand All @@ -793,7 +795,7 @@ auto PositionalAudio::GetSendString(bool isAll) -> QString
<< (my_context.empty() ? "[Ct_None]" : QString::fromStdString(my_context));

if (!my_ident.empty())
out << " " << my_ident;
out << " " << QString::fromStdWString(my_ident);
}
}
}
Expand Down
1 change: 1 addition & 0 deletions src/positional_audio/shared_mem_reader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <gsl/span>

#include <array>
#include <vector>
#include <mutex>
#include <optional>
#include <shared_mutex>
Expand Down
2 changes: 1 addition & 1 deletion src/positional_audio/tsvr_universe.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "core/client_storage.h"
#include "core/definitions.h"

#include "teamspeak/clientlib_publicdefinitions.h"
#include "teamspeak/public_definitions.h"

#include <QtCore/QObject>

Expand Down