camstreamerlib 3.5.2 → 4.0.0-beta.2

package/CamOverlayPainter/Frame.js

@@ -1,40 +1,44 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Frame = void 0;
-const events_1 = require("events");
-class Frame extends events_1.EventEmitter {
+import { EventEmitter } from 'events';
+export class Frame extends EventEmitter {
+    enabled;
+    posX;
+    posY;
+    width;
+    height;
+    text = '';
+    fontColor;
+    fontName;
+    font;
+    align = 'A_LEFT';
+    textType = 'TFM_OVERFLOW';
+    bgColor;
+    bgImageName;
+    bgImage;
+    bgType;
+    borderRadius;
+    borderWidth;
+    borderColor;
+    customDraw;
+    layer;
+    children = new Array();
     constructor(opt) {
-        var _a, _b, _c, _d, _e, _f, _g;
         super();
-        this.text = '';
-        this.align = 'A_LEFT';
-        this.textType = 'TFM_OVERFLOW';
-        this.children = new Array();
-        this.enabled = (_a = opt.enabled) !== null && _a !== void 0 ? _a : true;
+        this.enabled = opt.enabled ?? true;
         this.posX = opt.x;
         this.posY = opt.y;
         this.width = opt.width;
         this.height = opt.height;
-        this.setText((_b = opt.text) !== null && _b !== void 0 ? _b : '', 'A_LEFT');
-        this.fontColor = (_c = opt.fontColor) !== null && _c !== void 0 ? _c : [1.0, 1.0, 1.0];
+        this.setText(opt.text ?? '', 'A_LEFT');
+        this.fontColor = opt.fontColor ?? [1.0, 1.0, 1.0];
         this.fontName = opt.font;
         this.bgColor = opt.bgColor;
         this.bgImageName = opt.bgImage;
         this.bgType = opt.bgType;
-        this.borderRadius = (_d = opt.borderRadius) !== null && _d !== void 0 ? _d : 0;
-        this.borderWidth = (_e = opt.borderWidth) !== null && _e !== void 0 ? _e : 0;
-        this.borderColor = (_f = opt.borderColor) !== null && _f !== void 0 ? _f : [1, 1, 1, 1];
+        this.borderRadius = opt.borderRadius ?? 0;
+        this.borderWidth = opt.borderWidth ?? 0;
+        this.borderColor = opt.borderColor ?? [1, 1, 1, 1];
         this.customDraw = opt.customDraw;
-        this.layer = (_g = opt.layer) !== null && _g !== void 0 ? _g : 0;
+        this.layer = opt.layer ?? 0;
     }
     enable() {
         this.enabled = true;
@@ -141,172 +145,153 @@ class Frame extends events_1.EventEmitter {
     layoutChanged() {
         this.emit('layoutChanged');
     }
-    displayImage(cod, resourceManager, cairo, ppX, ppY, scale, layer) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.enabled) {
-                ppX += this.posX;
-                ppY += this.posY;
-                yield this.prepareResources(resourceManager);
-                yield cod.cairo('cairo_save', cairo);
-                yield this.clipDrawing(cod, cairo, scale, ppX, ppY);
-                if (this.layer === layer) {
-                    yield this.displayOwnImage(cod, cairo, ppX, ppY, scale);
-                }
-                for (const child of this.children) {
-                    yield child.displayImage(cod, resourceManager, cairo, ppX, ppY, scale, layer);
-                }
-                yield cod.cairo('cairo_restore', cairo);
-            }
-        });
-    }
-    prepareResources(resourceManager) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.bgImageName !== undefined) {
-                this.bgImage = yield resourceManager.image(this.bgImageName);
-            }
-            if (this.fontName !== undefined) {
-                this.font = yield resourceManager.font(this.fontName);
-            }
-        });
-    }
-    displayOwnImage(cod, cairo, ppX, ppY, scale) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.enabled) {
-                return;
-            }
-            const promises = new Array();
-            if (this.font !== undefined) {
-                promises.push(cod.cairo('cairo_set_font_face', cairo, this.font.var));
-            }
-            else {
-                promises.push(cod.cairo('cairo_set_font_face', cairo, 'NULL'));
-            }
-            if (this.bgColor !== undefined) {
-                promises.push(this.drawFrame(cod, cairo, scale, ppX, ppY));
-            }
-            if (this.bgImage !== undefined) {
-                promises.push(this.drawImage(cod, cairo, scale, ppX, ppY));
-            }
-            if (this.borderWidth > 0) {
-                promises.push(this.drawBorder(cod, cairo, scale, ppX, ppY));
+    async displayImage(cod, resourceManager, cairo, ppX, ppY, scale, layer) {
+        if (this.enabled) {
+            const posX = ppX + this.posX;
+            const posY = ppY + this.posY;
+            await this.prepareResources(resourceManager);
+            await cod.cairo('cairo_save', cairo);
+            await this.clipDrawing(cod, cairo, scale, posX, posY);
+            if (this.layer === layer) {
+                await this.displayOwnImage(cod, cairo, posX, posY, scale);
             }
-            if (this.text) {
-                promises.push(this.drawText(cod, cairo, scale, ppX, ppY));
+            for (const child of this.children) {
+                await child.displayImage(cod, resourceManager, cairo, posX, posY, scale, layer);
             }
-            if (this.customDraw) {
-                promises.push(cod.cairo('cairo_identity_matrix', cairo));
-                promises.push(cod.cairo('cairo_translate', cairo, scale * ppX, scale * ppY));
-                promises.push(cod.cairo('cairo_scale', cairo, scale, scale));
-                promises.push(this.customDraw(cod, cairo, { width: this.width, height: this.height }));
-            }
-            yield Promise.all(promises);
-        });
+            await cod.cairo('cairo_restore', cairo);
+        }
     }
-    clipDrawing(cod, cairo, scale, ppX, ppY) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.borderRadius === 0) {
-                return;
-            }
-            yield Promise.all([
-                this.drawRectPath(cod, cairo, scale, ppX, ppY, this.borderRadius),
-                cod.cairo('cairo_clip', cairo),
-            ]);
-        });
-    }
-    drawFrame(cod, cairo, scale, ppX, ppY) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.bgColor) {
-                const promises = [
-                    cod.cairo('cairo_identity_matrix', cairo),
-                    cod.cairo('cairo_translate', cairo, scale * ppX, scale * ppY),
-                    cod.cairo('cairo_scale', cairo, scale, scale),
-                    cod.cairo('cairo_set_source_rgba', cairo, this.bgColor[0], this.bgColor[1], this.bgColor[2], this.bgColor[3]),
-                    cod.cairo('cairo_rectangle', cairo, 0, 0, this.width, this.height),
-                    cod.cairo('cairo_fill', cairo),
-                    cod.cairo('cairo_stroke', cairo),
-                ];
-                yield Promise.all(promises);
-            }
-            else {
-                throw new Error('Color of the frame is undefined.');
-            }
-        });
+    async prepareResources(resourceManager) {
+        if (this.bgImageName !== undefined) {
+            this.bgImage = await resourceManager.image(this.bgImageName);
+        }
+        if (this.fontName !== undefined) {
+            this.font = await resourceManager.font(this.fontName);
+        }
     }
-    drawImage(cod, cairo, scale, ppX, ppY) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.bgImage === undefined) {
-                return;
-            }
-            const bgImage = this.bgImage.var;
-            const bgWidth = this.bgImage.width;
-            const bgHeight = this.bgImage.height;
-            const promises = new Array();
+    async displayOwnImage(cod, cairo, ppX, ppY, scale) {
+        if (!this.enabled) {
+            return;
+        }
+        const promises = new Array();
+        if (this.font !== undefined) {
+            promises.push(cod.cairo('cairo_set_font_face', cairo, this.font.var));
+        }
+        else {
+            promises.push(cod.cairo('cairo_set_font_face', cairo, 'NULL'));
+        }
+        if (this.bgColor !== undefined) {
+            promises.push(this.drawFrame(cod, cairo, scale, ppX, ppY));
+        }
+        if (this.bgImage !== undefined) {
+            promises.push(this.drawImage(cod, cairo, scale, ppX, ppY));
+        }
+        if (this.borderWidth > 0) {
+            promises.push(this.drawBorder(cod, cairo, scale, ppX, ppY));
+        }
+        if (this.text) {
+            promises.push(this.drawText(cod, cairo, scale, ppX, ppY));
+        }
+        if (this.customDraw) {
             promises.push(cod.cairo('cairo_identity_matrix', cairo));
             promises.push(cod.cairo('cairo_translate', cairo, scale * ppX, scale * ppY));
-            if (this.bgType === 'fill') {
-                const sx = (scale * this.width) / bgWidth;
-                const sy = (scale * this.height) / bgHeight;
-                promises.push(cod.cairo('cairo_scale', cairo, sx, sy));
-            }
-            else if (this.bgType === 'fit') {
-                const sx = this.width / bgWidth;
-                const sy = this.height / bgHeight;
-                const scaleRatio = scale * Math.min(sx, sy);
-                promises.push(cod.cairo('cairo_scale', cairo, scaleRatio, scaleRatio));
-            }
-            else {
-                promises.push(cod.cairo('cairo_scale', cairo, scale, scale));
-            }
-            promises.push(cod.cairo('cairo_set_source_surface', cairo, bgImage, 0, 0));
-            promises.push(cod.cairo('cairo_paint', cairo));
-            yield Promise.all(promises);
-        });
+            promises.push(cod.cairo('cairo_scale', cairo, scale, scale));
+            promises.push(this.customDraw(cod, cairo, { width: this.width, height: this.height }));
+        }
+        await Promise.all(promises);
     }
-    drawText(cod, cairo, scale, ppX, ppY) {
-        return __awaiter(this, void 0, void 0, function* () {
+    async clipDrawing(cod, cairo, scale, ppX, ppY) {
+        if (this.borderRadius === 0) {
+            return;
+        }
+        await Promise.all([
+            this.drawRectPath(cod, cairo, scale, ppX, ppY, this.borderRadius),
+            cod.cairo('cairo_clip', cairo),
+        ]);
+    }
+    async drawFrame(cod, cairo, scale, ppX, ppY) {
+        if (this.bgColor) {
             const promises = [
                 cod.cairo('cairo_identity_matrix', cairo),
-                cod.cairo('cairo_set_source_rgb', cairo, this.fontColor[0], this.fontColor[1], this.fontColor[2]),
-                cod.writeText(cairo, '' + this.text, Math.floor(scale * ppX), Math.floor(scale * ppY), Math.floor(scale * this.width), Math.floor(scale * this.height), this.align, this.textType),
-            ];
-            yield Promise.all(promises);
-        });
-    }
-    drawBorder(cod, cairo, scale, ppX, ppY) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield Promise.all([
-                this.drawRectPath(cod, cairo, scale, ppX, ppY, this.borderRadius),
-                cod.cairo('cairo_set_source_rgba', cairo, this.borderColor[0], this.borderColor[1], this.borderColor[2], this.borderColor[3]),
-                cod.cairo('cairo_set_line_width', cairo, this.borderWidth),
+                cod.cairo('cairo_translate', cairo, scale * ppX, scale * ppY),
+                cod.cairo('cairo_scale', cairo, scale, scale),
+                cod.cairo('cairo_set_source_rgba', cairo, this.bgColor[0], this.bgColor[1], this.bgColor[2], this.bgColor[3]),
+                cod.cairo('cairo_rectangle', cairo, 0, 0, this.width, this.height),
+                cod.cairo('cairo_fill', cairo),
                 cod.cairo('cairo_stroke', cairo),
+            ];
+            await Promise.all(promises);
+        }
+        else {
+            throw new Error('Color of the frame is undefined.');
+        }
+    }
+    async drawImage(cod, cairo, scale, ppX, ppY) {
+        if (this.bgImage === undefined) {
+            return;
+        }
+        const bgImage = this.bgImage.var;
+        const bgWidth = this.bgImage.width;
+        const bgHeight = this.bgImage.height;
+        const promises = new Array();
+        promises.push(cod.cairo('cairo_identity_matrix', cairo));
+        promises.push(cod.cairo('cairo_translate', cairo, scale * ppX, scale * ppY));
+        if (this.bgType === 'fill') {
+            const sx = (scale * this.width) / bgWidth;
+            const sy = (scale * this.height) / bgHeight;
+            promises.push(cod.cairo('cairo_scale', cairo, sx, sy));
+        }
+        else if (this.bgType === 'fit') {
+            const sx = this.width / bgWidth;
+            const sy = this.height / bgHeight;
+            const scaleRatio = scale * Math.min(sx, sy);
+            promises.push(cod.cairo('cairo_scale', cairo, scaleRatio, scaleRatio));
+        }
+        else {
+            promises.push(cod.cairo('cairo_scale', cairo, scale, scale));
+        }
+        promises.push(cod.cairo('cairo_set_source_surface', cairo, bgImage, 0, 0));
+        promises.push(cod.cairo('cairo_paint', cairo));
+        await Promise.all(promises);
+    }
+    async drawText(cod, cairo, scale, ppX, ppY) {
+        const promises = [
+            cod.cairo('cairo_identity_matrix', cairo),
+            cod.cairo('cairo_set_source_rgb', cairo, this.fontColor[0], this.fontColor[1], this.fontColor[2]),
+            cod.writeText(cairo, '' + this.text, Math.floor(scale * ppX), Math.floor(scale * ppY), Math.floor(scale * this.width), Math.floor(scale * this.height), this.align, this.textType),
+        ];
+        await Promise.all(promises);
+    }
+    async drawBorder(cod, cairo, scale, ppX, ppY) {
+        await Promise.all([
+            this.drawRectPath(cod, cairo, scale, ppX, ppY, this.borderRadius),
+            cod.cairo('cairo_set_source_rgba', cairo, this.borderColor[0], this.borderColor[1], this.borderColor[2], this.borderColor[3]),
+            cod.cairo('cairo_set_line_width', cairo, this.borderWidth),
+            cod.cairo('cairo_stroke', cairo),
+        ]);
+    }
+    async drawRectPath(cod, cairo, scale, ppX, ppY, radius) {
+        if (radius === 0) {
+            return await Promise.all([
+                cod.cairo('cairo_identity_matrix', cairo),
+                cod.cairo('cairo_translate', cairo, scale * ppX, scale * ppY),
+                cod.cairo('cairo_scale', cairo, scale, scale),
+                cod.cairo('cairo_rectangle', cairo, 0, 0, this.width, this.height),
             ]);
-        });
-    }
-    drawRectPath(cod, cairo, scale, ppX, ppY, radius) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (radius === 0) {
-                return yield Promise.all([
-                    cod.cairo('cairo_identity_matrix', cairo),
-                    cod.cairo('cairo_translate', cairo, scale * ppX, scale * ppY),
-                    cod.cairo('cairo_scale', cairo, scale, scale),
-                    cod.cairo('cairo_rectangle', cairo, 0, 0, this.width, this.height),
-                ]);
-            }
-            else {
-                const degrees = Math.PI / 180;
-                return yield Promise.all([
-                    cod.cairo('cairo_identity_matrix', cairo),
-                    cod.cairo('cairo_translate', cairo, scale * ppX, scale * ppY),
-                    cod.cairo('cairo_scale', cairo, scale, scale),
-                    cod.cairo('cairo_new_sub_path', cairo),
-                    cod.cairo('cairo_arc', cairo, this.width - radius, radius, radius, -90 * degrees, 0 * degrees),
-                    cod.cairo('cairo_arc', cairo, this.width - radius, this.height - radius, radius, 0 * degrees, 90 * degrees),
-                    cod.cairo('cairo_arc', cairo, radius, this.height - radius, radius, 90 * degrees, 180 * degrees),
-                    cod.cairo('cairo_arc', cairo, radius, radius, radius, 180 * degrees, 270 * degrees),
-                    cod.cairo('cairo_close_path', cairo),
-                ]);
-            }
-        });
+        }
+        else {
+            const degrees = Math.PI / 180;
+            return await Promise.all([
+                cod.cairo('cairo_identity_matrix', cairo),
+                cod.cairo('cairo_translate', cairo, scale * ppX, scale * ppY),
+                cod.cairo('cairo_scale', cairo, scale, scale),
+                cod.cairo('cairo_new_sub_path', cairo),
+                cod.cairo('cairo_arc', cairo, this.width - radius, radius, radius, -90 * degrees, 0 * degrees),
+                cod.cairo('cairo_arc', cairo, this.width - radius, this.height - radius, radius, 0 * degrees, 90 * degrees),
+                cod.cairo('cairo_arc', cairo, radius, this.height - radius, radius, 90 * degrees, 180 * degrees),
+                cod.cairo('cairo_arc', cairo, radius, radius, radius, 180 * degrees, 270 * degrees),
+                cod.cairo('cairo_close_path', cairo),
+            ]);
+        }
     }
 }
-exports.Frame = Frame;

package/CamOverlayPainter/Painter.js

@@ -1,21 +1,7 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ResourceManager = exports.Frame = exports.Painter = exports.COORD = void 0;
-const CamOverlayDrawingAPI_1 = require("../CamOverlayDrawingAPI");
-const ResourceManager_1 = require("./ResourceManager");
-exports.ResourceManager = ResourceManager_1.default;
-const Frame_1 = require("./Frame");
-Object.defineProperty(exports, "Frame", { enumerable: true, get: function () { return Frame_1.Frame; } });
-exports.COORD = {
+import { CamOverlayDrawingAPI } from '../CamOverlayDrawingAPI';
+import ResourceManager from './ResourceManager';
+import { Frame } from './Frame';
+export const COORD = {
     top_left: [-1, -1],
     center_left: [-1, 0],
     bottom_left: [-1, 1],
@@ -26,16 +12,21 @@ exports.COORD = {
     center_right: [1, 0],
     bottom_right: [1, 1],
 };
-class Painter extends Frame_1.Frame {
+export class Painter extends Frame {
+    screenWidth;
+    screenHeight;
+    coAlignment;
+    cod;
+    rm;
+    refreshLayers = true;
+    layers = [];
     constructor(opt, coopt) {
         super(opt);
-        this.refreshLayers = true;
-        this.layers = [];
-        this.coAlignment = exports.COORD[opt.coAlignment];
+        this.coAlignment = COORD[opt.coAlignment];
         this.screenWidth = opt.screenWidth;
         this.screenHeight = opt.screenHeight;
-        this.cod = new CamOverlayDrawingAPI_1.CamOverlayDrawingAPI(coopt);
-        this.rm = new ResourceManager_1.default(this.cod);
+        this.cod = new CamOverlayDrawingAPI(coopt);
+        this.rm = new ResourceManager(this.cod);
     }
     get camOverlayDrawingAPI() {
         return this.cod;
@@ -75,98 +66,86 @@ class Painter extends Frame_1.Frame {
         this.screenHeight = sh;
     }
     setCoAlignment(coAlignment) {
-        this.coAlignment = exports.COORD[coAlignment];
+        this.coAlignment = COORD[coAlignment];
     }
     layoutChanged() {
         this.refreshLayers = true;
     }
-    display(scale = 1.0) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.enabled) {
-                if (this.refreshLayers) {
-                    this.refreshLayers = false;
-                    yield this.prepareLayers();
+    async display(scale = 1.0) {
+        if (this.enabled) {
+            if (this.refreshLayers) {
+                this.refreshLayers = false;
+                await this.prepareLayers();
+            }
+            let cairo;
+            let surface;
+            let lastCachedLayer;
+            for (let i = 0; i < this.layers.length; i++) {
+                const layer = this.layers[i];
+                if (layer.cairoCache !== undefined &&
+                    layer.surfaceCache !== undefined &&
+                    surface === undefined &&
+                    cairo === undefined) {
+                    lastCachedLayer = layer;
+                    continue;
                 }
-                let cairo;
-                let surface;
-                let lastCachedLayer;
-                for (let i = 0; i < this.layers.length; i++) {
-                    const layer = this.layers[i];
-                    if (layer.cairoCache !== undefined &&
-                        layer.surfaceCache !== undefined &&
-                        surface === undefined &&
-                        cairo === undefined) {
-                        lastCachedLayer = layer;
-                        continue;
-                    }
-                    if (surface === undefined || cairo === undefined) {
-                        [surface, cairo] = yield this.prepareSurface(scale, lastCachedLayer === null || lastCachedLayer === void 0 ? void 0 : lastCachedLayer.surfaceCache, lastCachedLayer === null || lastCachedLayer === void 0 ? void 0 : lastCachedLayer.cairoCache);
-                    }
-                    yield this.displayImage(this.cod, this.rm, cairo, -this.posX, -this.posY, scale, layer.layer);
-                    if (i < this.layers.length - 1) {
-                        const [surfaceToCache, cairoToCache] = yield this.prepareSurface(scale, surface, cairo);
-                        layer.surfaceCache = surfaceToCache;
-                        layer.cairoCache = cairoToCache;
-                    }
+                if (surface === undefined || cairo === undefined) {
+                    [surface, cairo] = await this.prepareSurface(scale, lastCachedLayer?.surfaceCache, lastCachedLayer?.cairoCache);
                 }
-                if (surface !== undefined && cairo !== undefined) {
-                    yield this.cod.showCairoImage(surface, this.positionConvertor(this.coAlignment[0], this.screenWidth, this.posX, scale * this.width), this.positionConvertor(this.coAlignment[1], this.screenHeight, this.posY, scale * this.height));
-                    yield this.cleanupSurface(surface, cairo);
+                await this.displayImage(this.cod, this.rm, cairo, -this.posX, -this.posY, scale, layer.layer);
+                if (i < this.layers.length - 1) {
+                    const [surfaceToCache, cairoToCache] = await this.prepareSurface(scale, surface, cairo);
+                    layer.surfaceCache = surfaceToCache;
+                    layer.cairoCache = cairoToCache;
                 }
             }
-        });
+            if (surface !== undefined && cairo !== undefined) {
+                await this.cod.showCairoImage(surface, this.positionConvertor(this.coAlignment[0], this.screenWidth, this.posX, scale * this.width), this.positionConvertor(this.coAlignment[1], this.screenHeight, this.posY, scale * this.height));
+                await this.cleanupSurface(surface, cairo);
+            }
+        }
     }
-    hide() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.cod.removeImage();
-        });
+    async hide() {
+        await this.cod.removeImage();
     }
-    invalidateLayer(layer) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const layerIdx = this.layers.findIndex((l) => l.layer === layer);
-            if (layerIdx === -1) {
-                return;
-            }
-            for (let i = layerIdx; i < this.layers.length; i++) {
-                const layer = this.layers[i];
-                if (layer.surfaceCache !== undefined && layer.cairoCache !== undefined) {
-                    yield this.cleanupSurface(layer.surfaceCache, layer.cairoCache);
-                    layer.surfaceCache = undefined;
-                    layer.cairoCache = undefined;
-                }
+    async invalidateLayer(layer) {
+        const layerIdx = this.layers.findIndex((l) => l.layer === layer);
+        if (layerIdx === -1) {
+            return;
+        }
+        for (let i = layerIdx; i < this.layers.length; i++) {
+            const currentLayer = this.layers[i];
+            if (currentLayer.surfaceCache !== undefined && currentLayer.cairoCache !== undefined) {
+                await this.cleanupSurface(currentLayer.surfaceCache, currentLayer.cairoCache);
+                currentLayer.surfaceCache = undefined;
+                currentLayer.cairoCache = undefined;
             }
-        });
+        }
     }
-    prepareLayers() {
-        return __awaiter(this, void 0, void 0, function* () {
-            for (const layer of this.layers) {
-                if (layer.surfaceCache !== undefined && layer.cairoCache !== undefined) {
-                    yield this.cleanupSurface(layer.surfaceCache, layer.cairoCache);
-                }
+    async prepareLayers() {
+        for (const layer of this.layers) {
+            if (layer.surfaceCache !== undefined && layer.cairoCache !== undefined) {
+                await this.cleanupSurface(layer.surfaceCache, layer.cairoCache);
             }
-            const uniqueLayers = this.getLayers();
-            const sortedLayers = Array.from(uniqueLayers).sort((a, b) => a - b);
-            this.layers = sortedLayers.map((layer) => {
-                return { layer };
-            });
+        }
+        const uniqueLayers = this.getLayers();
+        const sortedLayers = Array.from(uniqueLayers).sort((a, b) => a - b);
+        this.layers = sortedLayers.map((layer) => {
+            return { layer };
         });
     }
-    prepareSurface(scale, cachedSurface, cachedCairo) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const surface = (yield this.cod.cairo('cairo_image_surface_create', 'CAIRO_FORMAT_ARGB32', Math.floor(this.width * scale), Math.floor(this.height * scale)));
-            const cairo = (yield this.cod.cairo('cairo_create', surface.var));
-            if (cachedSurface !== undefined && cachedCairo !== undefined) {
-                yield this.cod.cairo('cairo_set_source_surface', cairo.var, cachedSurface, 0, 0);
-                yield this.cod.cairo('cairo_paint', cairo.var);
-            }
-            return [surface.var, cairo.var];
-        });
+    async prepareSurface(scale, cachedSurface, cachedCairo) {
+        const surface = (await this.cod.cairo('cairo_image_surface_create', 'CAIRO_FORMAT_ARGB32', Math.floor(this.width * scale), Math.floor(this.height * scale)));
+        const cairo = (await this.cod.cairo('cairo_create', surface.var));
+        if (cachedSurface !== undefined && cachedCairo !== undefined) {
+            await this.cod.cairo('cairo_set_source_surface', cairo.var, cachedSurface, 0, 0);
+            await this.cod.cairo('cairo_paint', cairo.var);
+        }
+        return [surface.var, cairo.var];
     }
-    cleanupSurface(surface, cairo) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.cod.cairo('cairo_surface_destroy', surface);
-            yield this.cod.cairo('cairo_destroy', cairo);
-        });
+    async cleanupSurface(surface, cairo) {
+        await this.cod.cairo('cairo_surface_destroy', surface);
+        await this.cod.cairo('cairo_destroy', cairo);
     }
     positionConvertor(alignment, screenSize, position, graphicsSize) {
         switch (alignment) {
@@ -181,4 +160,4 @@ class Painter extends Frame_1.Frame {
         }
     }
 }
-exports.Painter = Painter;
+export { Frame, ResourceManager };