Skip to content

Commit

Permalink
clang-format run
Browse files Browse the repository at this point in the history
  • Loading branch information
simotek committed Oct 3, 2024
1 parent e1b2e77 commit 4cedd8a
Show file tree
Hide file tree
Showing 6 changed files with 505 additions and 544 deletions.
46 changes: 20 additions & 26 deletions sources/Application/Application.cpp
Original file line number Diff line number Diff line change
@@ -1,48 +1,42 @@
#include "Application.h"
#include "Application.h"

#include <math.h>
#include "Application/AppWindow.h"
#include "Application/AppWindow.h"
#include "Application/Commands/CommandDispatcher.h"
#include "Application/Controllers/ControlRoom.h"
#include "Application/Model/Config.h"
#include "Application/Persistency/PersistencyService.h"
#include "Application/Persistency/PersistencyService.h"
#include "Services/Audio/Audio.h"
#include "Services/Midi/MidiService.h"
#include "UIFramework/Interfaces/I_GUIWindowFactory.h"
#include <math.h>

Application *Application::instance_ = NULL;

Application *Application::instance_=NULL ;

Application::Application() {
}
Application::Application() {}

void Application::initMidiInput()
{
const char * preferedDevice=Config::GetInstance()->GetValue("MIDICTRLDEVICE");
void Application::initMidiInput() {
const char *preferedDevice =
Config::GetInstance()->GetValue("MIDICTRLDEVICE");
if (preferedDevice) {
MidiService::GetInstance()->SelectDevice(preferedDevice);
}
}

bool Application::Init(GUICreateWindowParams &params) {
const char* root=Config::GetInstance()->GetValue("ROOTFOLDER") ;
const char *root = Config::GetInstance()->GetValue("ROOTFOLDER");
if (root) {
Path::SetAlias("root",root) ;
Path::SetAlias("root", root);
}
window_=AppWindow::Create(params) ;
PersistencyService::GetInstance() ;
Audio *audio=Audio::GetInstance() ;
audio->Init() ;
CommandDispatcher::GetInstance()->Init() ;
window_ = AppWindow::Create(params);
PersistencyService::GetInstance();
Audio *audio = Audio::GetInstance();
audio->Init();
CommandDispatcher::GetInstance()->Init();
initMidiInput();
ControlRoom::GetInstance()->LoadMapping("bin:mapping.xml") ;
return true ;
ControlRoom::GetInstance()->LoadMapping("bin:mapping.xml");
return true;
}

GUIWindow *Application::GetWindow() {
return window_ ;
}
GUIWindow *Application::GetWindow() { return window_; }

Application::~Application() {
delete window_ ;
}
Application::~Application() { delete window_; }
27 changes: 14 additions & 13 deletions sources/Application/Application.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,23 @@
#include "Foundation/T_Singleton.h"
#include "UIFramework/SimpleBaseClasses/GUIWindow.h"

class Application:public T_Singleton<Application> {
class Application : public T_Singleton<Application> {

public:
Application() ;
~Application() ;
bool Init(GUICreateWindowParams &params) ;
public:
Application();
~Application();
bool Init(GUICreateWindowParams &params);

GUIWindow *GetWindow() ;
protected:
GUIWindow *GetWindow();

protected:
void initMidiInput();

private:
GUIWindow *window_ ;
private:
static Application* instance_ ;
} ;
private:
GUIWindow *window_;

#endif // _APPLICATION_H_
private:
static Application *instance_;
};

#endif // _APPLICATION_H_
Loading

0 comments on commit 4cedd8a

Please sign in to comment.