From 7b4ba9dd54a8fb50450bdfe723f1ad3a098e8560 Mon Sep 17 00:00:00 2001 From: James Grogan Date: Mon, 23 Jan 2023 12:02:08 +0000 Subject: [PATCH] Fix up minimal build. --- infra/containers/README.md | 2 +- plugins/circuits/src/visuals/TerminalNode.cpp | 18 +++++++++--------- .../audio_interfaces/NullAudioInterface.cpp | 4 ++-- src/rendering/fonts/BasicFontEngine.h | 4 ++-- src/rendering/graphics/PainterFactory.cpp | 1 + 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/infra/containers/README.md b/infra/containers/README.md index dec8d59..a2d9179 100644 --- a/infra/containers/README.md +++ b/infra/containers/README.md @@ -21,6 +21,6 @@ podman build -t ubuntu_22_04_minimal_deps . # Run containers ```bash -podman run -it -v $LOCAL_SOURCE_DIR:source ubuntu_22_04_minimal_deps:latest /bin/bash +podman run -it -v $LOCAL_SOURCE_DIR:/source ubuntu_22_04_minimal_deps:latest /bin/bash ``` diff --git a/plugins/circuits/src/visuals/TerminalNode.cpp b/plugins/circuits/src/visuals/TerminalNode.cpp index 4feb0f8..8265e84 100644 --- a/plugins/circuits/src/visuals/TerminalNode.cpp +++ b/plugins/circuits/src/visuals/TerminalNode.cpp @@ -3,26 +3,26 @@ #include "CircleNode.h" TerminalNode::TerminalNode(const Transform& transform) - : AbstractVisualNode(transform) + : AbstractVisualNode(transform) { } void TerminalNode::setContent(Terminal* terminal) { - mContent = terminal; + mContent = terminal; } void TerminalNode::createOrUpdateGeometry(SceneInfo*) { - if (!mMarker) - { - mMarker = std::make_unique(Transform{}, 5); - mMarker->setFillColor(Color(0, 0, 0)); - mMarker->setHasStrokeColor(false); + if (!mMarker) + { + mMarker = std::make_unique(Transform{}, 5); + mMarker->setFillColor(Color(0, 0, 0)); + mMarker->setHasStrokeColor(false); - addChild(mMarker.get()); - } + addChild(mMarker.get()); + } } void TerminalNode::update(SceneInfo* sceneInfo) diff --git a/src/media/audio/audio_interfaces/NullAudioInterface.cpp b/src/media/audio/audio_interfaces/NullAudioInterface.cpp index 68f01a5..2a05684 100644 --- a/src/media/audio/audio_interfaces/NullAudioInterface.cpp +++ b/src/media/audio/audio_interfaces/NullAudioInterface.cpp @@ -20,12 +20,12 @@ std::unique_ptr NullAudioInterface::Create() return std::make_unique(); } -void NullAudioInterface::openDevice(AudioDevice* device) +void NullAudioInterface::openDevice(AudioDevice*) { } -void NullAudioInterface::play(AudioDevice* device, AudioSample* sample, unsigned duration) +void NullAudioInterface::play(AudioDevice*, AudioSample*, unsigned) { } diff --git a/src/rendering/fonts/BasicFontEngine.h b/src/rendering/fonts/BasicFontEngine.h index 4afc8c4..4ae84e6 100644 --- a/src/rendering/fonts/BasicFontEngine.h +++ b/src/rendering/fonts/BasicFontEngine.h @@ -9,7 +9,7 @@ class BasicFontEngine : public IFontEngine { virtual void initialize(){}; - virtual void loadFontFace(const std::filesystem::path& fontFile, float penSize = 16){}; + virtual void loadFontFace(const std::filesystem::path&, float){}; - virtual std::unique_ptr loadGlyph(unsigned charCode){return nullptr;}; + virtual std::unique_ptr loadGlyph(unsigned){return nullptr;}; }; diff --git a/src/rendering/graphics/PainterFactory.cpp b/src/rendering/graphics/PainterFactory.cpp index 8fe43fd..cdd27e5 100644 --- a/src/rendering/graphics/PainterFactory.cpp +++ b/src/rendering/graphics/PainterFactory.cpp @@ -42,6 +42,7 @@ std::unique_ptr PainterFactory::Create(DrawingContext* context, return std::make_unique(context); } #else + (void)drawMode; return std::make_unique(context); #endif #endif