3 Commits

Author	SHA1	Message	Date
Pedro Beschorner Marin	d50f65fce1	Moved akka-transcode messages to 2.0 format	2017-07-25 13:23:20 +00:00
Pedro Beschorner Marin	2097b611ed	Merge remote-tracking branch 'prlanzarin/1.1-transcode-screenshare-merge' into bigbluebutton/bbb-2.x-mconf ... Conflicts: akka-bbb-apps/src/main/scala/org/bigbluebutton/core/LiveMeeting.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersModel.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/AppsRedisSubscriberActor.scala bbb-common-message/src/main/java/org/bigbluebutton/common/messages/RegisterUserMessage.java bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/WebRTCDeskshareManager.as bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml record-and-playback/core/scripts/rap-process-worker.rb	2017-07-11 20:41:38 +00:00
Mario Gasparoni	16698f7489	Introducing bbb-transcode-akka ... Conflicts: akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/MeetingMessageReceiver.java akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersModel.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/VoiceApp.scala akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ESLEventListener.java akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/VideoTranscoderObserver.java akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/ffmpeg/FFmpegCommand.java akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/ffmpeg/FFmpegConstants.java akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/ffprobe/FFProbeCommand.java akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/processmonitor/ProcessMonitor.java akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/processmonitor/ProcessMonitorObserver.java akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/processmonitor/ProcessStream.java bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessageFromJsonConverter.java bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessagingConstants.java bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/Constants.java bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/IMessagingService.java bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageReceiver.java bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/ReceivedMessageHandler.java bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/RedisMessagingService.java bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/Service.java bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/CallAgent.java bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/CallAgentObserver.java bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/GlobalCall.java bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/SipPeer.java bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/SipPeerManager.java bbb-voice/src/main/webapp/WEB-INF/bbb-redis-messaging.xml bbb-voice/src/main/webapp/WEB-INF/red5-web.xml	2017-05-17 15:54:44 +00:00