Consume all pending events at once

This commit is contained in:
Ingvar Stepanyan
2021-07-26 13:25:51 +00:00
parent 92c785dc73
commit 36ed35192c
3 changed files with 19 additions and 11 deletions

13
api.cpp
View File

@@ -75,13 +75,20 @@ class Context {
return result;
}
bool hasPendingEvent() {
bool consumeEvents() {
return gpp_rethrow([=]() {
bool had_events = false;
for (;;) {
CameraEventType event_type = GP_EVENT_UNKNOWN;
gpp_unique_ptr<void, free> event_data(GPP_CALL(
void *, gp_camera_wait_for_event(camera.get(), 0, &event_type, _,
context.get())));
return event_type != GP_EVENT_TIMEOUT;
if (event_type == GP_EVENT_TIMEOUT) {
break;
}
had_events = true;
}
return had_events;
});
}
@@ -312,6 +319,6 @@ EMSCRIPTEN_BINDINGS(gphoto2_js_api) {
.function("setConfigValue", &Context::setConfigValue)
.function("capturePreviewAsBlob", &Context::capturePreviewAsBlob)
.function("captureImageAsFile", &Context::captureImageAsFile)
.function("hasPendingEvent", &Context::hasPendingEvent)
.function("consumeEvents", &Context::consumeEvents)
.function("supportedOps", &Context::supportedOps);
}

2
libapi.mjs.d.ts vendored
View File

@@ -30,7 +30,7 @@ declare class Context {
): Promise<undefined>;
capturePreviewAsBlob(): Promise<Blob>;
captureImageAsFile(): Promise<File>;
hasPendingEvent(): Promise<boolean>;
consumeEvents(): Promise<boolean>;
supportedOps(): SupportedOps;
delete(): void;

View File

@@ -73,6 +73,7 @@ class App extends Component {
context.configToJS()
);
if (!isDebug) {
delete config.children.actions;
delete config.children.other;
}
this.setState({
@@ -83,10 +84,10 @@ class App extends Component {
await new Promise(resolve =>
requestIdleCallback(resolve, { timeout: 500 })
);
let hasPendingEvent = await this.connection.schedule(context =>
context.hasPendingEvent()
let hadEvents = await this.connection.schedule(context =>
context.consumeEvents()
);
if (hasPendingEvent) {
if (hadEvents) {
break;
}
}