RMB gear to toggle video speedup

Telegram/SourceFiles/media/media_common.h

@@ -39,6 +39,7 @@ struct VideoQuality {
 
 inline constexpr auto kSpeedMin = 0.5;
 inline constexpr auto kSpeedMax = 2.5;
+inline constexpr auto kSpeedDefault = 1.0;
 inline constexpr auto kSpedUpDefault = 1.7;
 
 [[nodiscard]] inline bool EqualSpeeds(float64 a, float64 b) {

Telegram/SourceFiles/media/player/media_player_dropdown.cpp

@@ -779,6 +779,10 @@ void SpeedController::toggleDefault() {
 	_speedChanged.fire(speed());
 }
 
+void SpeedController::updateSpeedFromOutside(float64 newSpeed) {
+	setSpeed(newSpeed);
+}
+
 void SpeedController::setSpeed(float64 newSpeed) {
 	if (!(_isDefault = EqualSpeeds(newSpeed, 1.))) {
 		_speed = newSpeed;

Telegram/SourceFiles/media/player/media_player_dropdown.h

@@ -139,14 +139,15 @@ class SpeedController final : public WithDropdownController {
 
 	[[nodiscard]] rpl::producer<> saved() const;
 	[[nodiscard]] rpl::producer<float64> realtimeValue() const;
+	void updateSpeedFromOutside(float64 newSpeed);
+	void toggleDefault();
 
 private:
 	void fillMenu(not_null<Ui::DropdownMenu*> menu) override;
 
 	[[nodiscard]] float64 speed() const;
 	[[nodiscard]] bool isDefault() const;
 	[[nodiscard]] float64 lastNonDefaultSpeed() const;
-	void toggleDefault();
 	void setSpeed(float64 newSpeed);
 	void setQuality(VideoQuality quality);
 	void save();

Telegram/SourceFiles/media/view/media_view_playback_controls.cpp

@@ -75,11 +75,33 @@ PlaybackControls::PlaybackControls(
 		: 1.);
 	updateSpeedToggleQuality();
 
+	if (_speedToggle) {
+		_speedToggle->setAcceptBoth(true);
+		_speedToggle->setContextMenuPolicy(Qt::PreventContextMenu);
+		_speedToggle->clicks(
+		) | rpl::filter([](Qt::MouseButton button) {
+			return button == Qt::RightButton;
+		}) | rpl::on_next([=] {
+			if (_speedController) {
+				_speedController->toggleDefault();
+			} else {
+				updatePlaybackSpeed(Media::kSpeedDefault);
+			}
+		}, _speedToggle->lifetime());
+	}
+
 	if (const auto controller = _speedController.get()) {
 		controller->menuToggledValue(
 		) | rpl::on_next([=](bool toggled) {
 			_speedToggle->setActive(toggled);
 		}, _speedToggle->lifetime());
+
+		controller->realtimeValue(
+		) | rpl::on_next([=](float64 speed) {
+			_speedToggle->setSpeed(speed);
+			_delegate->playbackControlsSpeedChanged(speed);
+			resizeEvent(nullptr);
+		}, _speedToggle->lifetime());
 	}
 
 	_pictureInPicture->addClickHandler([=] {
@@ -229,6 +251,12 @@ void PlaybackControls::updateSpeedToggleQuality() {
 
 void PlaybackControls::updatePlaybackSpeed(float64 speed) {
 	DEBUG_LOG(("Media playback speed: update to %1.").arg(speed));
+	if (_speedToggle) {
+		_speedToggle->setSpeed(speed);
+	}
+	if (_speedController) {
+		_speedController->updateSpeedFromOutside(speed);
+	}
 	_delegate->playbackControlsSpeedChanged(speed);
 	resizeEvent(nullptr);
 }

Telegram/SourceFiles/media/view/media_view_playback_controls.h

@@ -64,6 +64,7 @@ class PlaybackControls : public Ui::RpWidget {
 	void updatePlayback(const Player::TrackState &state);
 	void setLoadingProgress(int64 ready, int64 total);
 	void setInFullScreen(bool inFullScreen);
+	void updatePlaybackSpeed(float64 speed);
 	[[nodiscard]] bool hasMenu() const;
 	[[nodiscard]] bool dragging() const;
 
@@ -84,7 +85,6 @@ class PlaybackControls : public Ui::RpWidget {
 	[[nodiscard]] float64 countDownloadedTillPercent(
 		const Player::TrackState &state) const;
 
-	void updatePlaybackSpeed(float64 speed);
 	void updateVolumeToggleIcon();
 	void updateDownloadProgressPosition();