This commit is contained in:
ymq1 2025-06-02 09:23:13 +00:00
parent e4616a89b6
commit c2e24f82b6
2 changed files with 0 additions and 12 deletions

View File

@ -85,13 +85,6 @@ bricks.Camera = class extends bricks.Popup {
this.task = schedule_once(this.show_picture.bind(this), this.task_period);
this.show_cnt += 1;
}
<<<<<<< HEAD
take_picture(){
if (this.task){
this.task.cancel();
this.task = null;
}
=======
videorecorder_start(){
if (!this.stream) {
throw new Error('Media stream is not initialized. Call init() first.');
@ -125,7 +118,6 @@ bricks.Camera = class extends bricks.Popup {
}
this.task_period = 0;
this.task = null;
>>>>>>> 51416a085b5aa99df9f8edf9989fdc1b6306724c
var d = this.imgw.base64();
this.dispatch('shot', d);
}

View File

@ -78,12 +78,8 @@ bricks.Video = class extends bricks.Layout {
}
auto_play(){
<<<<<<< HEAD
return;
schedule_once(this._auto_play.bind(this), 0.5);
=======
schedule_once(this._auto_play.bind(this), 0.8);
>>>>>>> 51416a085b5aa99df9f8edf9989fdc1b6306724c
}
_auto_play(){
this.set_url(this.opts.url);