Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #113297 from shiena/feature/lifecycle-callbacks

Browse source 
Add platform lifecycle callbacks to CameraServer base class
This commit is contained in:
Thaddeus Crews 2025-12-02 11:51:52 -06:00
commit cd8a292324
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
8 changed files with 44 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/camera/camera_android.cpp
View file

@ -622,7 +622,7 @@ void CameraAndroid::set_monitoring_feeds(bool p_monitoring_feeds) {
}
}
void CameraAndroid::handle_pause() {
void CameraAndroid::handle_application_pause() {
for (int i = 0; i < feeds.size(); i++) {
Ref<CameraFeedAndroid> feed = feeds[i];
if (feed.is_valid()) {
@ -631,7 +631,7 @@ void CameraAndroid::handle_pause() {
}
}
void CameraAndroid::handle_resume() {
void CameraAndroid::handle_application_resume() {
for (int i = 0; i < feeds.size(); i++) {
Ref<CameraFeedAndroid> feed = feeds[i];
if (feed.is_valid()) {
@ -640,7 +640,7 @@ void CameraAndroid::handle_resume() {
}
}
void CameraAndroid::handle_rotation_change() {
void CameraAndroid::handle_display_rotation_change(int) {
for (int i = 0; i < feeds.size(); i++) {
Ref<CameraFeedAndroid> feed = feeds[i];
if (feed.is_valid()) {

6
modules/camera/camera_android.h
View file

@ -113,9 +113,9 @@ private:
public:
void set_monitoring_feeds(bool p_monitoring_feeds) override;
void handle_pause();
void handle_resume();
void handle_rotation_change();
void handle_application_pause() override;
void handle_application_resume() override;
void handle_display_rotation_change(int p_orientation) override;
~CameraAndroid();
};