Skip to content
Snippets Groups Projects
Unverified Commit 29493cbc authored by Albrecht Weiche's avatar Albrecht Weiche Committed by Andre Fischer
Browse files

Merge branch 'prepare-v0.11.1' into 'release/v0.11.x'

prepare version 0.11.1

See merge request opentalk/backend/services/obelisk!168
parents f1c10282 64310bbb
No related merge requests found
......@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [0.11.1]
### 🐛 Bug fixes
- Only subscribe screenshare when call uses video ([!166](https://git.opentalk.dev/opentalk/backend/services/obelisk/-/merge_requests/166))
## [0.11.0]
### 🚀 New features
......@@ -229,6 +235,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
initial release candidate
[0.11.1]: https://git.opentalk.dev/opentalk/backend/services/obelisk/-/compare/v0.11.0...0.11.1
[0.11.0]: https://git.opentalk.dev/opentalk/backend/services/obelisk/-/compare/v0.10.0...0.11.0
[0.10.1]: https://git.opentalk.dev/opentalk/backend/services/obelisk/-/compare/v0.10.0...v0.10.1
......
......@@ -1966,7 +1966,7 @@ dependencies = [
[[package]]
name = "opentalk-obelisk"
version = "0.11.0"
version = "0.11.1"
dependencies = [
"anstream",
"anyhow",
......
......@@ -4,7 +4,7 @@
[package]
name = "opentalk-obelisk"
version = "0.11.0"
version = "0.11.1"
edition = "2021"
authors = ["OpenTalk Team <mail@opentalk.eu>"]
publish = false
......
......@@ -153,7 +153,6 @@ impl Signaling {
event = websocket_receive(&mut self.websocket) => {
if let Err(e) = self.handle_websocket_event(event, closed_finished_channel_tx.clone()).await {
log::error!("failed to handle websocket event, {:?}", e);
self.state = State::Quitting;
}
}
_ = self.timeout_receiver.recv() => {
......@@ -217,7 +216,7 @@ impl Signaling {
.await?;
}
if participant.media.screen.is_some() {
if participant.media.screen.is_some() && self.media.with_video {
websocket
.subscribe(
MediaDescriptor {
......@@ -425,7 +424,8 @@ impl Signaling {
status.audio,
status.video,
)
.await?;
.await
.context("Failed to create subscribe")?;
websocket.subscribe_answer(desc, answer).await?;
}
......@@ -454,7 +454,7 @@ impl Signaling {
.await?;
}
if participant.media.screen.is_some() {
if participant.media.screen.is_some() && self.media.with_video {
websocket
.subscribe(
MediaDescriptor {
......@@ -479,18 +479,22 @@ impl Signaling {
current.media.video,
updated.media.video,
)
.await?;
Self::update_subscriptions_for_media_session_type(
&mut self.media,
websocket,
&*current,
&updated,
MediaSessionType::Screen,
current.media.screen,
updated.media.screen,
)
.await?;
.await
.context("Failed to update video subscription")?;
if self.media.with_video {
Self::update_subscriptions_for_media_session_type(
&mut self.media,
websocket,
&*current,
&updated,
MediaSessionType::Screen,
current.media.screen,
updated.media.screen,
)
.await
.context("Failed to update screen subscription")?;
}
// update participant state
*current = updated;
......@@ -511,7 +515,7 @@ impl Signaling {
.await?;
}
if participant.media.screen.is_some() {
if participant.media.screen.is_some() && self.media.with_video {
self.media
.remove_subscribe(MediaDescriptor {
participant_id: assoc.id,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Use of Cookies

We use Matomo Analytics to analyze and evaluate the use of our platform. The insights help us to improve our offerings and make them more relevant for you.

You can choose whether to allow us to process your data for these purposes and set the corresponding cookies. For more information about data protection — especially regarding "Cookies" and "Matomo"— please refer to our Privacy Policy. You can withdraw your consent at any time.