Skip to content

Commit

Permalink
clang-format: all the code w/ meson
Browse files Browse the repository at this point in the history
  • Loading branch information
mfisher31 committed Sep 18, 2022
1 parent dd154be commit f35db85
Show file tree
Hide file tree
Showing 142 changed files with 3,031 additions and 2,765 deletions.
6 changes: 3 additions & 3 deletions .vscode/vscode.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define JUCE_AMALGAMATED_INCLUDE 1
#define KV_JACK_AUDIO 1
#define JUCE_AMALGAMATED_INCLUDE 1
#define KV_JACK_AUDIO 1

#include "JuceHeader.h"
#include "ElementApp.h"
Expand All @@ -16,4 +16,4 @@ using namespace juce;
using PortDescription = kv::PortDescription;
using PortType = kv::PortType;
using PortList = kv::PortList;
}
} // namespace Element
14 changes: 7 additions & 7 deletions include/element/element.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ extern "C" {

#ifdef _WIN32
// windows exports
#if defined (EL_SHARED_BUILD)
#if defined(EL_SHARED_BUILD)
#define EL_API __declspec(dllexport)
#pragma warning (disable: 4251)
#elif defined (EL_SHARED)
#pragma warning(disable : 4251)
#elif defined(EL_SHARED)
#define EL_API __declspec(dllimport)
#pragma warning (disable: 4251)
#pragma warning(disable : 4251)
#endif
#define EL_PLUGIN_EXPORT EL_EXTERN __declspec(dllexport)
#else
#if defined (EL_SHARED) || defined (EL_SHARED_BUILD)
#define EL_API __attribute__ ((visibility ("default")))
#else
#if defined(EL_SHARED) || defined(EL_SHARED_BUILD)
#define EL_API __attribute__ ((visibility ("default")))
#endif
#define EL_PLUGIN_EXPORT EL_EXTERN __attribute__ ((visibility ("default")))
#endif
Expand Down
5 changes: 4 additions & 1 deletion include/element/element.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,8 @@
ClassName& operator= (const ClassName&&) = delete;

namespace element {
template <typename... Args> void ignore_unused (Args&&...) noexcept {}
template <typename... Args>
void ignore_unused (Args&&...) noexcept
{
}
} // namespace element
2 changes: 2 additions & 0 deletions libs/.clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
DisableFormat: true
SortIncludes: false
3 changes: 2 additions & 1 deletion src/ElementApp.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@

#include <element/element.hpp>

namespace kv {}
namespace kv {
}
using namespace kv;

//=============================================================================
Expand Down
23 changes: 11 additions & 12 deletions src/bindings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
along with this program. If not, see <https://www.gnu.org/licenses/>.
**/


#include <map>

#include "element/element.hpp"
Expand All @@ -37,20 +36,20 @@ extern int luaopen_el_round (lua_State*);
namespace element {
namespace lua {

void fill_builtins (PackageLoaderMap& pkgs)
{
void fill_builtins (PackageLoaderMap& pkgs)
{
#if EL_USE_LIBRARY_BUILT_INS
if (pkgs.find ("el.audio") != pkgs.end())
return;
pkgs.insert (
{ { "el.audio", luaopen_el_audio },
{ "el.bytes", luaopen_el_bytes },
{ "el.midi", luaopen_el_midi },
{ "el.round", luaopen_el_round } });
if (pkgs.find ("el.audio") != pkgs.end())
return;
pkgs.insert (
{ { "el.audio", luaopen_el_audio },
{ "el.bytes", luaopen_el_bytes },
{ "el.midi", luaopen_el_midi },
{ "el.round", luaopen_el_round } });
#else
ignore_unused (pkgs);
ignore_unused (pkgs);
#endif
}
}

} // namespace lua
} // namespace element
27 changes: 18 additions & 9 deletions src/context.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include "context.hpp"
#include "log.hpp"
#include "module.hpp"
#include "settings.hpp"
#include "settings.hpp"

namespace element {

Expand Down Expand Up @@ -192,16 +192,21 @@ void Context::openModule (const std::string& ID)
return;

auto it = impl->modules->discovered.find (ID);
if (it == impl->modules->discovered.end()) {
if (it == impl->modules->discovered.end())
{
std::clog << "module not found: " << ID << std::endl;
return;
}

if (auto mod = std::make_unique<Module> (it->second, *this, *impl->lua)) {
if (mod->open()) {
if (auto mod = std::make_unique<Module> (it->second, *this, *impl->lua))
{
if (mod->open())
{
std::clog << "module opened: " << mod->name() << std::endl;
impl->modules->add (std::move (mod));
} else {
}
else
{
std::clog << "could not open module: " << mod->name() << std::endl;
}
}
Expand All @@ -211,8 +216,10 @@ void Context::loadModules()
{
std::vector<const elFeature*> features;

for (const auto& mod : *impl->modules) {
for (const auto& e : mod->public_extensions()) {
for (const auto& mod : *impl->modules)
{
for (const auto& e : mod->public_extensions())
{
auto f = (elFeature*) std::malloc (sizeof (elFeature));
features.push_back (f);
f->ID = strdup (e.first.c_str());
Expand All @@ -227,12 +234,14 @@ void Context::loadModules()
features.push_back ((elFeature*) nullptr);
elFeatures fptr = &features.front();

for (const auto& mod : *impl->modules) {
for (const auto& mod : *impl->modules)
{
if (! mod->loaded())
mod->load (fptr);
}

for (auto f : features) {
for (auto f : features)
{
if (nullptr == f)
continue;
std::free ((void*) f->ID);
Expand Down
2 changes: 1 addition & 1 deletion src/context.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class Context
virtual ~Context();

ServiceManager& getServices();

AudioEnginePtr getAudioEngine() const;
CommandManager& getCommandManager();
DeviceManager& getDeviceManager();
Expand Down
2 changes: 1 addition & 1 deletion src/dlfcn-win32.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

#ifndef EL_DYNLIB_H
#error "don't include dlfcn-win32.h directly, use dynlib.h instead"
#error "don't include dlfcn-win32.h directly, use dynlib.h instead"
#endif
#undef DLFCN_WIN32_SHARED

Expand Down
5 changes: 3 additions & 2 deletions src/documents/graphdocument.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,11 @@ class GraphDocument : public FileBasedDocument,
Result saveDocument (const File& file) override;
File getLastDocumentOpened() override;
void setLastDocumentOpened (const File& file) override;
File getSuggestedSaveAsFile (const File&) override {
File getSuggestedSaveAsFile (const File&) override
{
return getFile().getNonexistentSibling (true);
}

class ScopedChangeStopper
{
public:
Expand Down
3 changes: 2 additions & 1 deletion src/documents/sessiondocument.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ class SessionDocument : public FileBasedDocument,
Result saveDocument (const File& file) override;
File getLastDocumentOpened() override;
void setLastDocumentOpened (const File& file) override;
File getSuggestedSaveAsFile (const File&) override {
File getSuggestedSaveAsFile (const File&) override
{
return getFile().getNonexistentSibling (true);
}

Expand Down
4 changes: 2 additions & 2 deletions src/dynlib.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ extern "C" {
#endif

#ifdef _WIN32
#include "dlfcn-win32.h"
#include "dlfcn-win32.h"
#else
#include <dlfcn.h>
#include <dlfcn.h>
#endif

static void* element_openlib (const char* path)
Expand Down
4 changes: 2 additions & 2 deletions src/el/AudioBuffer32.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#define LKV_AUDIO_BUFFER_32 1
#define LKV_AUDIO_BUFFER_COMPILE 1
#define LKV_AUDIO_BUFFER_32 1
#define LKV_AUDIO_BUFFER_COMPILE 1
#include "./AudioBufferImpl.ipp"
4 changes: 2 additions & 2 deletions src/el/AudioBuffer64.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#define LKV_AUDIO_BUFFER_32 0
#define LKV_AUDIO_BUFFER_COMPILE 1
#define LKV_AUDIO_BUFFER_32 0
#define LKV_AUDIO_BUFFER_COMPILE 1
#include "./AudioBufferImpl.ipp"
Loading

0 comments on commit f35db85

Please sign in to comment.