Improve Midi Input Part 1

sources/Application/Application.cpp

@@ -1,14 +1,15 @@
-#include "Application/Application.h" 
+#include "Application.h" 
+
+#include <math.h>
 #include "Application/AppWindow.h" 
-#include "UIFramework/Interfaces/I_GUIWindowFactory.h"
-#include "Application/Persistency/PersistencyService.h" 
-#include "Services/Audio/Audio.h"
 #include "Application/Commands/CommandDispatcher.h"
 #include "Application/Controllers/ControlRoom.h"
 #include "Application/Model/Config.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 ;
 
@@ -17,48 +18,31 @@ Application::Application() {
 
 void Application::initMidiInput()
 {
-  const char *preferedDevice=Config::GetInstance()->GetValue("MIDICTRLDEVICE");
-
-  IteratorPtr<MidiInDevice>it(MidiService::GetInstance()->GetInIterator()) ;
-  for(it->Begin();!it->IsDone();it->Next())
-  {
-    MidiInDevice &in=it->CurrentItem() ;
-    if ((preferedDevice) && (!strncmp(in.GetName(), preferedDevice, strlen(preferedDevice))))
-    {
-      if (in.Init())
-      {
-        if (in.Start())
-        {
-          Trace::Log("MIDI","Controlling activated for MIDI interface %s",in.GetName()) ;
-        }
-        else
-        {
-          in.Close() ;
-        }
-      }
+    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") ;
-	if (root) {
-		Path::SetAlias("root",root) ;
-	} ;
-	window_=AppWindow::Create(params) ;
-	PersistencyService::GetInstance() ;
-  Audio *audio=Audio::GetInstance() ;
-  audio->Init() ;
-	CommandDispatcher::GetInstance()->Init() ;
-  initMidiInput();
-	ControlRoom::GetInstance()->LoadMapping("bin:mapping.xml") ;
-	return true ;
-} ;
+    const char* root=Config::GetInstance()->GetValue("ROOTFOLDER") ;
+    if (root) {
+        Path::SetAlias("root",root) ;
+    }
+    window_=AppWindow::Create(params) ;
+    PersistencyService::GetInstance() ;
+    Audio *audio=Audio::GetInstance() ;
+    audio->Init() ;
+    CommandDispatcher::GetInstance()->Init() ;
+    initMidiInput();
+    ControlRoom::GetInstance()->LoadMapping("bin:mapping.xml") ;
+    return true ;
+}
 
 GUIWindow *Application::GetWindow() {
-	return window_ ;
-} ;
+    return window_ ;
+}
 
 Application::~Application() {
-	delete window_ ;
+    delete window_ ;
 }

sources/Application/Application.h

@@ -1,25 +1,25 @@
 #ifndef _APPLICATION_H_
 #define _APPLICATION_H_
 
-#include "UIFramework/SimpleBaseClasses/GUIWindow.h"
 #include "Foundation/T_Singleton.h"
+#include "UIFramework/SimpleBaseClasses/GUIWindow.h"
 
 class Application:public T_Singleton<Application> {
 
 public:
-	Application() ;
-	~Application() ;
-	bool Init(GUICreateWindowParams &params) ;
+    Application() ;
+    ~Application() ;
+    bool Init(GUICreateWindowParams &params) ;
 
-	GUIWindow *GetWindow() ;
+    GUIWindow *GetWindow() ;
 protected:
-  void initMidiInput();
+    void initMidiInput();
 
 private:
-	GUIWindow *window_ ;
+    GUIWindow *window_ ;
 private:
-	static Application* instance_ ;
+    static Application* instance_ ;
 } ;
 
-#endif
+#endif // _APPLICATION_H_