From 731a1af1a600698f4e6bcc5ee841d68bbecb852f Mon Sep 17 00:00:00 2001 From: Bruno Herbelin Date: Sun, 12 Dec 2021 23:10:07 +0100 Subject: [PATCH] Defines for ImGuiToolkit icons for source. --- DeviceSource.cpp | 4 ++-- MediaSource.cpp | 4 ++-- MultiFileSource.cpp | 2 +- NetworkSource.cpp | 2 +- PatternSource.cpp | 2 +- SessionSource.cpp | 6 +++--- Source.h | 15 ++++++++++++++- 7 files changed, 24 insertions(+), 11 deletions(-) diff --git a/DeviceSource.cpp b/DeviceSource.cpp index 31f5715..7fedc87 100644 --- a/DeviceSource.cpp +++ b/DeviceSource.cpp @@ -583,9 +583,9 @@ DeviceConfigSet Device::getDeviceConfigs(const std::string &src_description) glm::ivec2 DeviceSource::icon() const { if ( device_.find("Screen") != std::string::npos ) - return glm::ivec2(19, 1); + return glm::ivec2(ICON_SOURCE_DEVICE_SCREEN); else - return glm::ivec2(2, 14); + return glm::ivec2(ICON_SOURCE_DEVICE); } std::string DeviceSource::info() const diff --git a/MediaSource.cpp b/MediaSource.cpp index 217f71a..f7a0c1e 100644 --- a/MediaSource.cpp +++ b/MediaSource.cpp @@ -68,9 +68,9 @@ MediaPlayer *MediaSource::mediaplayer() const glm::ivec2 MediaSource::icon() const { if (mediaplayer_->isImage()) - return glm::ivec2(4, 9); + return glm::ivec2(ICON_SOURCE_IMAGE); else - return glm::ivec2(18, 13); + return glm::ivec2(ICON_SOURCE_VIDEO); } std::string MediaSource::info() const diff --git a/MultiFileSource.cpp b/MultiFileSource.cpp index a37f200..9608141 100644 --- a/MultiFileSource.cpp +++ b/MultiFileSource.cpp @@ -261,7 +261,7 @@ MultiFile *MultiFileSource::multifile () const glm::ivec2 MultiFileSource::icon () const { - return glm::ivec2(3, 9); + return glm::ivec2(ICON_SOURCE_SEQUENCE); } std::string MultiFileSource::info() const diff --git a/NetworkSource.cpp b/NetworkSource.cpp index 49a1fe7..42cb4de 100644 --- a/NetworkSource.cpp +++ b/NetworkSource.cpp @@ -334,7 +334,7 @@ void NetworkSource::accept(Visitor& v) glm::ivec2 NetworkSource::icon() const { - return glm::ivec2(18, 11); + return glm::ivec2(ICON_SOURCE_NETWORK); } std::string NetworkSource::info() const diff --git a/PatternSource.cpp b/PatternSource.cpp index 8bb40f6..2d40357 100644 --- a/PatternSource.cpp +++ b/PatternSource.cpp @@ -176,7 +176,7 @@ Pattern *PatternSource::pattern() const glm::ivec2 PatternSource::icon() const { - return glm::ivec2(11, 5); + return glm::ivec2(ICON_SOURCE_PATTERN); } std::string PatternSource::info() const diff --git a/SessionSource.cpp b/SessionSource.cpp index 51dee64..0cc9a4c 100644 --- a/SessionSource.cpp +++ b/SessionSource.cpp @@ -281,7 +281,7 @@ void SessionFileSource::accept(Visitor& v) glm::ivec2 SessionFileSource::icon() const { - return glm::ivec2(19, 6); + return glm::ivec2(ICON_SOURCE_SESSION); } std::string SessionFileSource::info() const @@ -372,7 +372,7 @@ void SessionGroupSource::accept(Visitor& v) glm::ivec2 SessionGroupSource::icon() const { - return glm::ivec2(10, 6); + return glm::ivec2(ICON_SOURCE_GROUP); } std::string SessionGroupSource::info() const @@ -449,7 +449,7 @@ void RenderSource::accept(Visitor& v) glm::ivec2 RenderSource::icon() const { - return glm::ivec2(0, 2); + return glm::ivec2(ICON_SOURCE_RENDER); } std::string RenderSource::info() const diff --git a/Source.h b/Source.h index f257e20..2fa5dd1 100644 --- a/Source.h +++ b/Source.h @@ -10,6 +10,19 @@ #define DEFAULT_MIXING_TRANSLATION -1.f, 1.f +#define ICON_SOURCE_VIDEO 18, 13 +#define ICON_SOURCE_IMAGE 4, 9 +#define ICON_SOURCE_DEVICE_SCREEN 19, 1 +#define ICON_SOURCE_DEVICE 2, 14 +#define ICON_SOURCE_SEQUENCE 3, 9 +#define ICON_SOURCE_NETWORK 18, 11 +#define ICON_SOURCE_PATTERN 11, 5 +#define ICON_SOURCE_SESSION 19, 6 +#define ICON_SOURCE_GROUP 10, 6 +#define ICON_SOURCE_RENDER 0, 2 +#define ICON_SOURCE_CLONE 9, 2 +#define ICON_SOURCE 12, 11 + class ImageShader; class MaskShader; class ImageProcessingShader; @@ -229,7 +242,7 @@ public: } // class-dependent icon - virtual glm::ivec2 icon () const { return glm::ivec2(12, 11); } + virtual glm::ivec2 icon () const { return glm::ivec2(ICON_SOURCE); } // class-dependent notification virtual std::string info () const { return "Undefined"; }