summaryrefslogtreecommitdiff
path: root/servers/camera_server.cpp
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2022-08-23 08:52:13 +0200
committerGitHub <noreply@github.com>2022-08-23 08:52:13 +0200
commit62c3e72b6f3e6fb628ffcb2d062dcbb5de304867 (patch)
treedccdf3ce6517b6a7ac72ba845ac747b92f06a302 /servers/camera_server.cpp
parent4fbfd10dccc297295e80407fb411de2506cb9838 (diff)
parent8be27dc59e3e330e10079ba8cbc999c80cab0ddc (diff)
Merge pull request #63959 from KoBeWi/typo_arrray
Replace Array return types with TypedArray (part 1)
Diffstat (limited to 'servers/camera_server.cpp')
-rw-r--r--servers/camera_server.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/servers/camera_server.cpp b/servers/camera_server.cpp
index 91df3afadd..b83b41a571 100644
--- a/servers/camera_server.cpp
+++ b/servers/camera_server.cpp
@@ -29,6 +29,7 @@
/*************************************************************************/
#include "camera_server.h"
+#include "core/variant/typed_array.h"
#include "rendering_server.h"
#include "servers/camera/camera_feed.h"
@@ -143,8 +144,8 @@ int CameraServer::get_feed_count() {
return feeds.size();
};
-Array CameraServer::get_feeds() {
- Array return_feeds;
+TypedArray<CameraFeed> CameraServer::get_feeds() {
+ TypedArray<CameraFeed> return_feeds;
int cc = get_feed_count();
return_feeds.resize(cc);