Compare commits
4 Commits
aa8bacc18f
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0d3696c0c5 | ||
|
|
811a673b0d | ||
|
|
aef9593095 | ||
|
|
4dc22c012e |
2
external/solanaceae_tox
vendored
2
external/solanaceae_tox
vendored
Submodule external/solanaceae_tox updated: 83367b2d2e...51b81d1a8a
@@ -22,13 +22,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"ImGuiFonts": {
|
"ImGuiFonts": {
|
||||||
"atlas_extra_text": "🥰💀✌️🌴🐢🐐🍄⚽🍻👑📸😬👀🚨🏡🐦🔥🍋🟩🍄🟫🙂↕️🕊️🏆😻🌟🧿🍀🎨🍜",
|
|
||||||
"size": 20,
|
"size": 20,
|
||||||
"fonts": {
|
"fonts": {
|
||||||
"entries": {
|
"entries": {
|
||||||
"/nix/store/7fjwhgbz16i08xm171arr081bqpivv7k-hack-font-3.003/share/fonts/truetype/Hack-Regular.ttf": true,
|
"/nix/store/ihpjyw2nvm924kf84898v9zqizhbwvn6-hack-font-3.003/share/fonts/truetype/Hack-Regular.ttf": true,
|
||||||
"/nix/store/g4hlmhda2xmap333kqnzlsz01k8djnp6-noto-fonts-24.3.1/share/fonts/noto/NotoSans[wdth,wght].ttf": true,
|
"/home/user/Downloads/TwitterColorEmoji-SVGinOT-15.1.0/TwitterColorEmoji-SVGinOT.ttf": true
|
||||||
"/nix/store/d7mgcvb59anvaz69cjghbb42616c7xfg-noto-fonts-monochrome-emoji-3.000/share/fonts/noto/NotoEmoji.ttf": true
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -156,8 +156,6 @@ bool renderContactBig(
|
|||||||
ImGui::EndTooltip();
|
ImGui::EndTooltip();
|
||||||
}
|
}
|
||||||
|
|
||||||
ImVec2 post_curser_pos = ImGui::GetCursorPos();
|
|
||||||
|
|
||||||
ImVec2 img_curser {
|
ImVec2 img_curser {
|
||||||
orig_curser_pos.x + ImGui::GetStyle().FramePadding.x,
|
orig_curser_pos.x + ImGui::GetStyle().FramePadding.x,
|
||||||
orig_curser_pos.y + ImGui::GetStyle().FramePadding.y
|
orig_curser_pos.y + ImGui::GetStyle().FramePadding.y
|
||||||
|
|||||||
@@ -24,6 +24,24 @@ struct AudioFrame2 {
|
|||||||
Span<int16_t> // non owning variant, for direct consumption
|
Span<int16_t> // non owning variant, for direct consumption
|
||||||
> buffer;
|
> buffer;
|
||||||
|
|
||||||
|
AudioFrame2(void) = default;
|
||||||
|
AudioFrame2(const AudioFrame2&) = default;
|
||||||
|
AudioFrame2(AudioFrame2&& other) :
|
||||||
|
sample_rate(other.sample_rate),
|
||||||
|
channels(other.channels),
|
||||||
|
buffer(std::move(other.buffer))
|
||||||
|
{}
|
||||||
|
AudioFrame2(uint32_t sample_rate_, size_t channels_, const std::variant<std::vector<int16_t>, Span<int16_t>>& buffer_) :
|
||||||
|
sample_rate(sample_rate_),
|
||||||
|
channels(channels_),
|
||||||
|
buffer(buffer_)
|
||||||
|
{}
|
||||||
|
AudioFrame2(uint32_t sample_rate_, size_t channels_, std::variant<std::vector<int16_t>, Span<int16_t>>&& buffer_) :
|
||||||
|
sample_rate(sample_rate_),
|
||||||
|
channels(channels_),
|
||||||
|
buffer(std::move(buffer_))
|
||||||
|
{}
|
||||||
|
|
||||||
// helpers
|
// helpers
|
||||||
Span<int16_t> getSpan(void) const {
|
Span<int16_t> getSpan(void) const {
|
||||||
if (std::holds_alternative<std::vector<int16_t>>(buffer)) {
|
if (std::holds_alternative<std::vector<int16_t>>(buffer)) {
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ struct LockedFrameStream2 : public FrameStream2I<FrameType> {
|
|||||||
FrameType new_frame = std::move(_frames.front());
|
FrameType new_frame = std::move(_frames.front());
|
||||||
_frames.pop_front();
|
_frames.pop_front();
|
||||||
|
|
||||||
return std::move(new_frame);
|
return new_frame;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool push(const FrameType& value) {
|
bool push(const FrameType& value) {
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
#include "../audio_stream_pop_reframer.hpp"
|
#include "../audio_stream_pop_reframer.hpp"
|
||||||
|
|
||||||
// "thin" wrapper around sdl audio streams
|
// "thin" wrapper around sdl audio streams
|
||||||
// we dont needs to get fance, as they already provide everything we need
|
// we dont needs to get fancy, as they already provide everything we need
|
||||||
struct SDLAudio2StreamReader : public AudioFrame2Stream2I {
|
struct SDLAudio2StreamReader : public AudioFrame2Stream2I {
|
||||||
std::unique_ptr<SDL_AudioStream, decltype(&SDL_DestroyAudioStream)> _stream;
|
std::unique_ptr<SDL_AudioStream, decltype(&SDL_DestroyAudioStream)> _stream;
|
||||||
|
|
||||||
|
|||||||
@@ -15,11 +15,13 @@
|
|||||||
|
|
||||||
#include "./start_screen.hpp"
|
#include "./start_screen.hpp"
|
||||||
|
|
||||||
|
#ifdef __ANDROID__
|
||||||
#include <filesystem>
|
#include <filesystem>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <string_view>
|
#include <string_view>
|
||||||
#include <thread>
|
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
|
|
||||||
#ifdef TOMATO_BREAKPAD
|
#ifdef TOMATO_BREAKPAD
|
||||||
|
|||||||
Reference in New Issue
Block a user