diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/record/events/UpdateExternalVideoRecordEvent.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/record/events/UpdateExternalVideoRecordEvent.scala index dd3fa563b13729eca67a5ef9ce43b6f82b7113f2..983ab26be60b22ad3f6623b356baadba38e8f518 100644 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/record/events/UpdateExternalVideoRecordEvent.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/record/events/UpdateExternalVideoRecordEvent.scala @@ -36,7 +36,7 @@ class UpdateExternalVideoRecordEvent extends AbstractExternalVideoRecordEvent { eventMap.put(TIME, time.toString) } - def setState(state: Int) { + def setState(state: Boolean) { eventMap.put(STATE, state.toString) } } diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/ExternalVideoMsgs.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/ExternalVideoMsgs.scala index 3ea752b81c016f0ea80bee22fd57f795a520249a..7a66abd7e74828afd2e11092893e7c11129630d0 100644 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/ExternalVideoMsgs.scala +++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/ExternalVideoMsgs.scala @@ -7,7 +7,7 @@ case class StartExternalVideoPubMsgBody(externalVideoUrl: String) object UpdateExternalVideoPubMsg { val NAME = "UpdateExternalVideoPubMsg" } case class UpdateExternalVideoPubMsg(header: BbbClientMsgHeader, body: UpdateExternalVideoPubMsgBody) extends StandardMsg -case class UpdateExternalVideoPubMsgBody(status: String, rate: Double, time: Double, state: Int) +case class UpdateExternalVideoPubMsgBody(status: String, rate: Double, time: Double, state: Boolean) object StopExternalVideoPubMsg { val NAME = "StopExternalVideoPubMsg" } case class StopExternalVideoPubMsg(header: BbbClientMsgHeader, body: StopExternalVideoPubMsgBody) extends StandardMsg @@ -20,7 +20,7 @@ case class StartExternalVideoEvtMsgBody(externalVideoUrl: String) object UpdateExternalVideoEvtMsg { val NAME = "UpdateExternalVideoEvtMsg" } case class UpdateExternalVideoEvtMsg(header: BbbClientMsgHeader, body: UpdateExternalVideoEvtMsgBody) extends BbbCoreMsg -case class UpdateExternalVideoEvtMsgBody(status: String, rate: Double, time: Double, state: Int) +case class UpdateExternalVideoEvtMsgBody(status: String, rate: Double, time: Double, state: Boolean) object StopExternalVideoEvtMsg { val NAME = "StopExternalVideoEvtMsg" } case class StopExternalVideoEvtMsg(header: BbbClientMsgHeader, body: StopExternalVideoEvtMsgBody) extends BbbCoreMsg diff --git a/bigbluebutton-html5/imports/api/external-videos/server/methods/emitExternalVideoEvent.js b/bigbluebutton-html5/imports/api/external-videos/server/methods/emitExternalVideoEvent.js index a27667a3a219ca8114d79cee2579a5feabd8d50d..29123dbd8628a0d914f54dd9290e8c5a1b055c3e 100644 --- a/bigbluebutton-html5/imports/api/external-videos/server/methods/emitExternalVideoEvent.js +++ b/bigbluebutton-html5/imports/api/external-videos/server/methods/emitExternalVideoEvent.js @@ -21,7 +21,7 @@ export default function emitExternalVideoEvent(options) { check(playerStatus, { rate: Match.Maybe(Number), time: Match.Maybe(Number), - state: Match.Maybe(Number), + state: Match.Maybe(Boolean), }); let rate = playerStatus.rate || 0; diff --git a/bigbluebutton-html5/imports/api/external-videos/server/methods/updateExternalVideoStatus.js b/bigbluebutton-html5/imports/api/external-videos/server/methods/updateExternalVideoStatus.js deleted file mode 100644 index 628eeeaa14ff85951f4a458249f64a81ca731fc7..0000000000000000000000000000000000000000 --- a/bigbluebutton-html5/imports/api/external-videos/server/methods/updateExternalVideoStatus.js +++ /dev/null @@ -1,22 +0,0 @@ -import { Meteor } from 'meteor/meteor'; -import { check } from 'meteor/check'; -import Logger from '/imports/startup/server/logger'; -import RedisPubSub from '/imports/startup/server/redis'; - -export default function updateExternalVideoStatus(credentials, options) { - const REDIS_CONFIG = Meteor.settings.private.redis; - const CHANNEL = REDIS_CONFIG.channels.toAkkaApps; - const EVENT_NAME = 'UpdateExternalVideoStatusMsg'; - - const { meetingId, requesterUserId } = credentials; - const { eventName, playerStatus } = options; - - check(meetingId, String); - check(requesterUserId, String); - - const payload = { eventName, playerStatus }; - - Logger.info(`User id=${requesterUserId} sending video status: ${eventName} for meeting ${meetingId}`); - - return RedisPubSub.publishUserMessage(CHANNEL, EVENT_NAME, meetingId, requesterUserId, payload); -}