Skip to content

Commit

Permalink
Merge branch 'dev/android_support'
Browse files Browse the repository at this point in the history
  • Loading branch information
kunitoki committed Dec 5, 2024
2 parents 9536229 + 9aabd1a commit ee02a67
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
8 changes: 4 additions & 4 deletions modules/juce_audio_devices/juce_audio_devices.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
*/

#ifdef JUCE_AUDIO_DEVICES_H_INCLUDED
/* When you add this cpp file to your project, you mustn't include it in a file where you've
/* When you add this cpp file to your project, you mustn't include it in a file where you've
already included any other headers - just put it inside a file on its own, possibly with your config
flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix
header files that the compiler may be using.
Expand Down Expand Up @@ -115,7 +115,7 @@
#endif

#if JUCE_USE_WINRT_MIDI && (JUCE_MSVC || JUCE_CLANG)
/* If you cannot find any of the header files below then you are probably
/* If you cannot find any of the header files below then you are probably
attempting to use the Windows 10 Bluetooth Low Energy API. For this to work you
need to install version 10.0.14393.0 of the Windows Standalone SDK and you may
need to add the path to the WinRT headers to your build system. This path should
Expand All @@ -141,7 +141,7 @@ JUCE_END_IGNORE_WARNINGS_MSVC
#include "native/juce_Midi_windows.cpp"

#if JUCE_ASIO
/* This is very frustrating - we only need to use a handful of definitions from
/* This is very frustrating - we only need to use a handful of definitions from
a couple of the header files in Steinberg's ASIO SDK, and it'd be easy to copy
about 30 lines of code into this cpp file to create a fully stand-alone ASIO
implementation...
Expand Down Expand Up @@ -182,7 +182,7 @@ JUCE_END_IGNORE_WARNINGS_GCC_LIKE
#endif

#if JUCE_JACK
/* Got an include error here? If so, you've either not got jack-audio-connection-kit
/* Got an include error here? If so, you've either not got jack-audio-connection-kit
installed, or you've not got your paths set up correctly to find its header files.
The package you need to install to get JACK support is "libjack-dev".
Expand Down
22 changes: 11 additions & 11 deletions modules/yup_gui/native/yup_Windowing_glfw.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -274,23 +274,23 @@ GraphicsContext::Api getGraphicsContextApi (const std::optional<GraphicsContext:

#if JUCE_MAC
#if YUP_RIVE_USE_METAL
desiredApi = forceContextApi.value_or(GraphicsContext::Metal);
desiredApi = forceContextApi.value_or (GraphicsContext::Metal);
#elif YUP_RIVE_USE_OPENGL
desiredApi = forceContextApi.value_or(GraphicsContext::OpenGL);
desiredApi = forceContextApi.value_or (GraphicsContext::OpenGL);
#endif

#elif JUCE_WINDOWS
#if YUP_RIVE_USE_D3D
desiredApi = forceContextApi.value_or(GraphicsContext::Direct3D);
desiredApi = forceContextApi.value_or (GraphicsContext::Direct3D);
#elif YUP_RIVE_USE_OPENGL
desiredApi = forceContextApi.value_or(GraphicsContext::OpenGL);
desiredApi = forceContextApi.value_or (GraphicsContext::OpenGL);
#endif

#elif JUCE_LINUX
desiredApi = forceContextApi.value_or(GraphicsContext::OpenGL);
desiredApi = forceContextApi.value_or (GraphicsContext::OpenGL);

#else
desiredApi = forceContextApi.value_or(GraphicsContext::OpenGL);
desiredApi = forceContextApi.value_or (GraphicsContext::OpenGL);

#endif

Expand Down Expand Up @@ -694,7 +694,7 @@ Rectangle<int> GLFWComponentNative::getBounds() const
void GLFWComponentNative::setBounds (const Rectangle<int>& newBounds)
{
#if JUCE_ANDROID
screenBounds = Rectangle<int>(0, 0, getSize());
screenBounds = Rectangle<int> (0, 0, getSize());

#else
jassert (window != nullptr);
Expand Down Expand Up @@ -1081,7 +1081,7 @@ void GLFWComponentNative::triggerRenderingUpdate()

void GLFWComponentNative::startRendering()
{
#if (JUCE_EMSCRIPTEN && RIVE_WEBGL) && !defined(__EMSCRIPTEN_PTHREADS__)
#if (JUCE_EMSCRIPTEN && RIVE_WEBGL) && ! defined(__EMSCRIPTEN_PTHREADS__)
startTimerHz (desiredFrameRate);
#else
startThread (Priority::high);
Expand All @@ -1090,7 +1090,7 @@ void GLFWComponentNative::startRendering()

void GLFWComponentNative::stopRendering()
{
#if (JUCE_EMSCRIPTEN && RIVE_WEBGL) && !defined(__EMSCRIPTEN_PTHREADS__)
#if (JUCE_EMSCRIPTEN && RIVE_WEBGL) && ! defined(__EMSCRIPTEN_PTHREADS__)
stopTimer();
#else
signalThreadShouldExit();
Expand Down Expand Up @@ -1257,7 +1257,7 @@ void GLFWComponentNative::handleContentScaleChanged (float xscale, float yscale)

forceSizeChange = true;

handleResized(width, height);
handleResized (width, height);
}

void GLFWComponentNative::handleUserTriedToCloseWindow()
Expand Down Expand Up @@ -1447,7 +1447,7 @@ void initialiseYup_Windowing()
{
// Setup error callback
{
auto errorCallback = +[](int code, const char* message)
auto errorCallback = +[] (int code, const char* message)
{
DBG ("GLFW Error: " << code << " - " << message);
};
Expand Down

0 comments on commit ee02a67

Please sign in to comment.