Merge PR #2: UPDATE: Headers to latest version

mumble-voip · Jun 3, 2021 · 8b6f41f · 8b6f41f
2 parents 0520787 + 20533a7
commit 8b6f41f
Show file tree

Hide file tree

Showing 5 changed files with 212 additions and 204 deletions.
diff --git a/include/mumble/plugin/internal/MumbleAPI_v_1_0_x.h b/include/mumble/plugin/internal/MumbleAPI_v_1_0_x.h
@@ -5,8 +5,8 @@
 
 /// This header file contains the definition of Mumble's API
 
-#ifndef MUMBLE_PLUGIN_API_H_
-#define MUMBLE_PLUGIN_API_H_
+#ifndef EXTERNAL_MUMBLE_PLUGIN_API_H_
+#define EXTERNAL_MUMBLE_PLUGIN_API_H_
 
 #include "PluginComponents_v_1_0_x.h"
 #include <stdint.h>
@@ -17,9 +17,9 @@
 #define MUMBLE_PLUGIN_API_MINOR_MACRO 0
 #define MUMBLE_PLUGIN_API_PATCH_MACRO 0
 
-constexpr int32_t MUMBLE_PLUGIN_API_MAJOR        = MUMBLE_PLUGIN_API_MAJOR_MACRO;
-constexpr int32_t MUMBLE_PLUGIN_API_MINOR        = MUMBLE_PLUGIN_API_MINOR_MACRO;
-constexpr int32_t MUMBLE_PLUGIN_API_PATCH        = MUMBLE_PLUGIN_API_PATCH_MACRO;
+const int32_t MUMBLE_PLUGIN_API_MAJOR            = MUMBLE_PLUGIN_API_MAJOR_MACRO;
+const int32_t MUMBLE_PLUGIN_API_MINOR            = MUMBLE_PLUGIN_API_MINOR_MACRO;
+const int32_t MUMBLE_PLUGIN_API_PATCH            = MUMBLE_PLUGIN_API_PATCH_MACRO;
 const mumble_version_t MUMBLE_PLUGIN_API_VERSION = { MUMBLE_PLUGIN_API_MAJOR, MUMBLE_PLUGIN_API_MINOR,
 													 MUMBLE_PLUGIN_API_PATCH };
 
@@ -527,4 +527,4 @@ struct MumbleAPI_v_1_0_x {
 	mumble_error_t(PLUGIN_CALLING_CONVENTION *playSample)(mumble_plugin_id_t callerID, const char *samplePath);
 };
 
-#endif
+#endif // EXTERNAL_MUMBLE_PLUGIN_API_H_
diff --git a/include/mumble/plugin/internal/MumblePlugin_v_1_0_x.h b/include/mumble/plugin/internal/MumblePlugin_v_1_0_x.h
@@ -39,7 +39,7 @@ extern "C" {
 /// @param id The ID for this plugin. This is the ID Mumble will reference this plugin with
 /// and by which this plugin can identify itself when communicating with Mumble.
 /// @returns The status of the initialization. If everything went fine, return STATUS_OK
-PLUGIN_EXPORT mumble_error_t PLUGIN_CALLING_CONVENTION mumble_init(uint32_t id);
+PLUGIN_EXPORT mumble_error_t PLUGIN_CALLING_CONVENTION mumble_init(mumble_plugin_id_t id);
 
 /// Gets called when unloading the plugin in order to allow it to clean up after itself.
 /// Note that it is still safe to call API functions from within this callback.