diff --git a/modules/video/include/videoplayer.h b/modules/video/include/videoplayer.h index a4ad4dfe39..7a10a667ad 100644 --- a/modules/video/include/videoplayer.h +++ b/modules/video/include/videoplayer.h @@ -67,7 +67,7 @@ public: const std::unique_ptr& frameTexture() const; bool isInitialized() const; - void reset(); + void reload(); void destroy(); void update(); @@ -123,7 +123,7 @@ private: properties::TriggerProperty _play; properties::TriggerProperty _pause; properties::TriggerProperty _goToStart; - properties::TriggerProperty _reset; + properties::TriggerProperty _reload; properties::BoolProperty _playAudio; properties::BoolProperty _loopVideo; diff --git a/modules/video/src/videoplayer.cpp b/modules/video/src/videoplayer.cpp index e4b85762cb..35a80dfb94 100644 --- a/modules/video/src/videoplayer.cpp +++ b/modules/video/src/videoplayer.cpp @@ -60,13 +60,14 @@ namespace { constexpr openspace::properties::Property::PropertyInfo GoToStartInfo = { "GoToStart", "Go To Start", - "Go to start in video" + "Sets the time to the beginning of the video and pauses it." }; - constexpr openspace::properties::Property::PropertyInfo ResetInfo = { - "Reset", - "Reset", - "Reset video" + constexpr openspace::properties::Property::PropertyInfo ReloadInfo = { + "Reload", + "Reload", + "Reloads the video and creates a new texture. This might be useful in case there " + "was an error loading the video." }; constexpr openspace::properties::Property::PropertyInfo AudioInfo = { @@ -249,7 +250,7 @@ VideoPlayer::VideoPlayer(const ghoul::Dictionary& dictionary) , _play(PlayInfo) , _pause(PauseInfo) , _goToStart(GoToStartInfo) - , _reset(ResetInfo) + , _reload(ReloadInfo) , _playAudio(AudioInfo, false) , _loopVideo(LoopVideoInfo, true) { @@ -260,8 +261,8 @@ VideoPlayer::VideoPlayer(const ghoul::Dictionary& dictionary) _videoFile = p.video; _loopVideo = p.loopVideo.value_or(_loopVideo); - _reset.onChange([this]() { reset(); }); - addProperty(_reset); + _reload.onChange([this]() { reload(); }); + addProperty(_reload); if (p.playbackMode.has_value()) { switch (*p.playbackMode) { @@ -781,7 +782,7 @@ const std::unique_ptr& VideoPlayer::frameTexture() const return _frameTexture; } -void VideoPlayer::reset() { +void VideoPlayer::reload() { if (_videoFile.empty()) { return; } diff --git a/modules/video/src/videotileprovider.cpp b/modules/video/src/videotileprovider.cpp index 5d4b03ee04..8446be051a 100644 --- a/modules/video/src/videotileprovider.cpp +++ b/modules/video/src/videotileprovider.cpp @@ -106,7 +106,7 @@ void VideoTileProvider::update() { } void VideoTileProvider::reset() { - _videoPlayer.reset(); + _videoPlayer.reload(); } ChunkTile VideoTileProvider::chunkTile(TileIndex tileIndex, int parents, int maxParents) {