Skip to content

Commit 65e8ebe

Browse files
committed
Fixed recording state notification #935
1 parent 9d080c3 commit 65e8ebe

File tree

2 files changed

+44
-35
lines changed

2 files changed

+44
-35
lines changed

src/component/player-view/player-view.controller.ts

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { ReactiveController } from "lit";
2+
import { RecordedModal } from "../recorded-modal/recorded.modal";
23
import { PlayerView } from "./player-view";
34
import { featureStore } from "../../store/feature.store";
45
import { courseStore } from "../../store/course.store";
@@ -28,6 +29,10 @@ export class PlayerViewController implements ReactiveController {
2829

2930
this.host.requestUpdate();
3031
});
32+
33+
if (courseStore.recorded) {
34+
this.host.playerController.modalController.registerModal("RecordedModal", new RecordedModal());
35+
}
3136
}
3237

3338
update() {
@@ -44,4 +49,4 @@ export class PlayerViewController implements ReactiveController {
4449
setDisconnected() {
4550
window.clearInterval(this.clockIntervalId);
4651
}
47-
}
52+
}

src/component/player/player.controller.ts

+38-34
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,50 @@
1+
import { t } from 'i18next';
12
import { ReactiveController } from 'lit';
2-
import { EventService } from '../../service/event.service';
3+
import {
4+
LpChatResponseEvent,
5+
LpChatStateEvent,
6+
LpEventServiceStateEvent,
7+
LpMediaStateEvent,
8+
LpParticipantModerationEvent,
9+
LpParticipantPresenceEvent,
10+
LpQuizStateEvent,
11+
LpRecordingStateEvent,
12+
LpStreamStateEvent,
13+
} from '../../event';
14+
import { MouseListener } from '../../event/mouse-listener';
315
import { ChatService } from '../../service/chat.service';
16+
import { EventService } from '../../service/event.service';
417
import { ModerationService } from "../../service/moderation.service";
5-
import { DeviceInfo, Devices } from '../../utils/devices';
6-
import { MediaProfile, Settings } from '../../utils/settings';
7-
import { State } from '../../utils/state';
8-
import { Utils } from '../../utils/utils';
9-
import { EntryModal } from '../entry-modal/entry.modal';
10-
import { PlayerViewController } from '../player-view/player-view.controller';
11-
import { ReconnectModal } from '../reconnect-modal/reconnect.modal';
12-
import { RecordedModal } from '../recorded-modal/recorded.modal';
13-
import { LecturePlayer } from './player';
14-
import { featureStore } from '../../store/feature.store';
1518
import { chatStore } from '../../store/chat.store';
16-
import { privilegeStore } from '../../store/privilege.store';
17-
import { participantStore } from '../../store/participants.store';
1819
import { courseStore } from '../../store/course.store';
19-
import { userStore } from '../../store/user.store';
20+
import { deviceStore } from '../../store/device.store';
2021
import { documentStore } from '../../store/document.store';
22+
import { featureStore } from '../../store/feature.store';
23+
import { participantStore } from '../../store/participants.store';
24+
import { privilegeStore } from '../../store/privilege.store';
25+
import { streamStatsStore } from '../../store/stream-stats.store';
2126
import { uiStateStore } from '../../store/ui-state.store';
27+
import { userStore } from '../../store/user.store';
2228
import { ToolController } from '../../tool/tool-controller';
23-
import { MouseListener } from '../../event/mouse-listener';
24-
import { SlideView } from '../slide-view/slide-view';
25-
import { deviceStore } from '../../store/device.store';
29+
import { CourseChatApi } from '../../transport/course-chat-api';
30+
import { CourseParticipantApi } from '../../transport/course-participant-api';
2631
import { CourseStateApi } from '../../transport/course-state-api';
2732
import { CourseUserApi } from '../../transport/course-user-api';
28-
import { CourseParticipantApi } from '../../transport/course-participant-api';
29-
import { CourseChatApi } from '../../transport/course-chat-api';
30-
import { ApplicationContext } from '../controller/context';
33+
import { DeviceInfo, Devices } from '../../utils/devices';
3134
import { EventEmitter } from '../../utils/event-emitter';
32-
import { RootController } from '../controller/root.controller';
33-
import { Controller } from '../controller/controller';
34-
import { streamStatsStore } from '../../store/stream-stats.store';
35-
import { LpChatResponseEvent, LpChatStateEvent, LpEventServiceStateEvent, LpMediaStateEvent, LpParticipantPresenceEvent, LpParticipantModerationEvent, LpQuizStateEvent, LpRecordingStateEvent, LpStreamStateEvent } from '../../event';
35+
import { MediaProfile, Settings } from '../../utils/settings';
36+
import { State } from '../../utils/state';
3637
import { Toaster } from '../../utils/toaster';
37-
import { t } from 'i18next';
38+
import { Utils } from '../../utils/utils';
39+
import { ApplicationContext } from '../controller/context';
40+
import { Controller } from '../controller/controller';
41+
import { RootController } from '../controller/root.controller';
42+
import { EntryModal } from '../entry-modal/entry.modal';
43+
import { PlayerViewController } from '../player-view/player-view.controller';
44+
import { ReconnectModal } from '../reconnect-modal/reconnect.modal';
45+
import { RecordedModal } from '../recorded-modal/recorded.modal';
46+
import { SlideView } from '../slide-view/slide-view';
47+
import { LecturePlayer } from './player';
3848

3949
export class PlayerController extends Controller implements ReactiveController {
4050

@@ -398,8 +408,10 @@ export class PlayerController extends Controller implements ReactiveController {
398408
private onRecordingState(event: LpRecordingStateEvent) {
399409
const recordingState = event.detail;
400410

411+
console.log("******** recording state", recordingState.started)
412+
401413
if (recordingState.started && !courseStore.recorded && uiStateStore.state === State.CONNECTED) {
402-
this.showRecordedModal();
414+
this.modalController.registerModal("RecordedModal", new RecordedModal());
403415
}
404416
else {
405417
this.modalController.closeModal("RecordedModal");
@@ -562,10 +574,6 @@ export class PlayerController extends Controller implements ReactiveController {
562574
if (streamState === State.CONNECTED && documentState === State.CONNECTED) {
563575
this.setConnectionState(State.CONNECTED);
564576

565-
if (courseStore.recorded && !this.connecting) {
566-
this.showRecordedModal();
567-
}
568-
569577
this.connecting = false;
570578
}
571579
else if (streamState === State.DISCONNECTED) {
@@ -617,8 +625,4 @@ export class PlayerController extends Controller implements ReactiveController {
617625
break;
618626
}
619627
}
620-
621-
private showRecordedModal() {
622-
this.modalController.registerModal("RecordedModal", new RecordedModal());
623-
}
624628
}

0 commit comments

Comments
 (0)