Skip to content

Commit

Permalink
Merge pull request #2 from TeamSpeak-Systems/api_24
Browse files Browse the repository at this point in the history
Update to API version 24
  • Loading branch information
SGalbierz committed Apr 8, 2020
2 parents c302de0 + 9bea5eb commit a39d503
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 6 deletions.
5 changes: 3 additions & 2 deletions include/teamspeak/clientlib_publicdefinitions.h
Expand Up @@ -17,8 +17,9 @@ enum ConnectStatus {

enum LocalTestMode {
TEST_MODE_OFF = 0,
TEST_MODE_VOICE_LOCAL_ONLY = 1,
TEST_MODE_VOICE_LOCAL_AND_REMOTE = 2,
TEST_MODE_VOICE_LOCAL_ONLY,
TEST_MODE_VOICE_LOCAL_AND_REMOTE,
TEST_MODE_TALK_STATUS_CHANGES_ONLY
};

#endif //CLIENTLIB_PUBLICDEFINITIONS_H
1 change: 1 addition & 0 deletions include/teamspeak/public_definitions.h
Expand Up @@ -125,6 +125,7 @@ enum ChannelProperties {
CHANNEL_CODEC_IS_UNENCRYPTED, //Available for all channels that are "in view", always up-to-date
CHANNEL_SECURITY_SALT, //Not available client side, not used in teamspeak, only SDK. Sets the options+salt for security hash.
CHANNEL_DELETE_DELAY, //How many seconds to wait before deleting this channel
CHANNEL_UNIQUE_IDENTIFIER, //Available for all channels that are "in view"
CHANNEL_ENDMARKER,
};

Expand Down
1 change: 1 addition & 0 deletions include/teamspeak/public_errors_rare.h
Expand Up @@ -43,6 +43,7 @@ enum Ts3RareErrorType {
ERROR_server_modal_quit = 0x040c,
ERROR_server_time_difference_too_large = 0x040f,
ERROR_server_blacklisted = 0x0410,
ERROR_server_shutdown = 0x0411,

//messages
ERROR_message_invalid_id = 0x0c00,
Expand Down
6 changes: 4 additions & 2 deletions include/teamspeak/public_rare_definitions.h
Expand Up @@ -110,6 +110,7 @@ enum CommandLinePropertiesRare {
COMMANDLINE_CRASHDUMPSPATH,
COMMANDLINE_DAEMON,
COMMANDLINE_PID_FILE,
COMMANDLINE_HINTS_ENABLED,
#endif
#else
COMMANDLINE_NOTHING=0,
Expand Down Expand Up @@ -217,8 +218,7 @@ enum VirtualServerPropertiesRare {
};

enum ChannelPropertiesRare {
CHANNEL_DUMMY_2= CHANNEL_ENDMARKER,
CHANNEL_DUMMY_3,
CHANNEL_DUMMY_3=CHANNEL_ENDMARKER,
CHANNEL_DUMMY_4,
CHANNEL_DUMMY_5,
CHANNEL_DUMMY_6,
Expand All @@ -234,6 +234,7 @@ enum ChannelPropertiesRare {
CHANNEL_ICON_ID, //Available for all channels that are "in view", always up-to-date
CHANNEL_BANNER_GFX_URL, //Available for all channels that are "in view", always up-to-date
CHANNEL_BANNER_MODE, //Available for all channels that are "in view", always up-to-date
CHANNEL_PERMISSION_HINTS,
CHANNEL_ENDMARKER_RARE,
CHANNEL_DELETE_DELAY_DEADLINE = 127 //(for clientlibv2) expected delete time in monotonic clock seconds or 0 if nothing is expected
};
Expand Down Expand Up @@ -283,6 +284,7 @@ enum ClientPropertiesRare {
CLIENT_ACTIVE_INTEGRATIONS_INFO, //stores info from the myts server and contains the subscription info
CLIENT_MYTS_AVATAR,
CLIENT_SIGNED_BADGES,
CLIENT_PERMISSION_HINTS,
CLIENT_ENDMARKER_RARE,
CLIENT_HW_ID = 127 //(for clientlibv2) unique hardware id
};
Expand Down
26 changes: 24 additions & 2 deletions include/ts3_functions.h
Expand Up @@ -66,7 +66,7 @@ struct TS3Functions {
unsigned int (*setPlaybackConfigValue)(uint64 serverConnectionHandlerID, const char* ident, const char* value);
unsigned int (*setClientVolumeModifier)(uint64 serverConnectionHandlerID, anyID clientID, float value);

/* Recording */
/* Recording status */
unsigned int (*startVoiceRecording)(uint64 serverConnectionHandlerID);
unsigned int (*stopVoiceRecording)(uint64 serverConnectionHandlerID);

Expand Down Expand Up @@ -273,7 +273,29 @@ struct TS3Functions {
unsigned int (*createBookmark)(const char* bookmarkuuid, const char* serverLabel, const char* serverAddress, const char* serverPassword, const char* nickname, const char* channel, const char* channelPassword, const char* captureProfile, const char* playbackProfile, const char* hotkeyProfile, const char* soundProfile, const char* uniqueUserId, const char* oneTimeKey, const char* phoneticName);
unsigned int (*getPermissionIDByName)(uint64 serverConnectionHandlerID, const char* permissionName, unsigned int* result);
unsigned int (*getClientNeededPermission)(uint64 serverConnectionHandlerID, const char* permissionName, int* result);
void(*notifyKeyEvent)(const char *pluginID, const char *keyIdentifier, int up_down);
void (*notifyKeyEvent)(const char *pluginID, const char *keyIdentifier, int up_down);

/* Single-Track/Multi-Track recording */
unsigned int (*startRecording)(uint64 serverConnectionHandlerID, int multitrack, int noFileSelector, const char* path);
unsigned int (*stopRecording)(uint64 serverConnectionHandlerID);

/* Convenience functions */
unsigned int (*requestClientsMove)(uint64 serverConnectionHandlerID, const anyID* clientIDArray, uint64 newChannelID, const char* password, const char* returnCode);
unsigned int (*requestClientsKickFromChannel)(uint64 serverConnectionHandlerID, const anyID* clientIDArray, const char* kickReason, const char* returnCode);
unsigned int (*requestClientsKickFromServer)(uint64 serverConnectionHandlerID, const anyID* clientIDArray, const char* kickReason, const char* returnCode);
unsigned int (*requestMuteClientsTemporary)(uint64 serverConnectionHandlerID, const anyID* clientIDArray, const char* returnCode);
unsigned int (*requestUnmuteClientsTemporary)(uint64 serverConnectionHandlerID, const anyID* clientIDArray, const char* returnCode);
unsigned int (*getPermissionNameByID)(uint64 scHandlerID, unsigned int permissionID, char* result, size_t max_len);
unsigned int (*clientPropertyFlagToString)(size_t clientPropertyFlag, char** resultString);
unsigned int (*channelPropertyFlagToString)(size_t channelPropertyFlag, char** resultString);
unsigned int (*serverPropertyFlagToString)(size_t serverPropertyFlag, char** resultString);

/* Server editing */
unsigned int (*setServerVariableAsInt)(uint64 serverConnectionHandlerID, size_t flag, int value);
unsigned int (*setServerVariableAsUInt64)(uint64 serverConnectionHandlerID, size_t flag, uint64 value);
unsigned int (*setServerVariableAsDouble)(uint64 serverConnectionHandlerID, size_t flag, double value);
unsigned int (*setServerVariableAsString)(uint64 serverConnectionHandlerID, size_t flag, const char* value);
unsigned int (*flushServerUpdates)(uint64 serverConnectionHandlerID, const char* returnCode);
};

#ifdef __cplusplus
Expand Down

0 comments on commit a39d503

Please sign in to comment.