From d701ba2182a3847b109a0dc09874cde988a655a3 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Tue, 6 Nov 2012 10:46:03 +0000
Subject: [PATCH] More of the same

---
 .gitignore                                    |  2 +-
 Makefile                                      | 76 +++++++++---------
 c++/carla-bridge/carla_bridge_osc.cpp         |  2 +-
 c++/carla-bridge/carla_bridge_ui-lv2.cpp      |  2 +-
 c++/carla-bridge/carla_bridge_ui-vst.cpp      |  2 +-
 c++/jackmeter/Makefile                        | 15 +++-
 c++/jackmeter/jackmeter.cpp                   | 28 +++----
 c++/jackmeter/jackmeter.pro                   | 30 +++++++
 c++/jackmeter/qtcreator/jackmeter.pro         | 22 ------
 c++/patchcanvas.hpp                           |  2 +-
 c++/widgets/digitalpeakmeter.cpp              |  2 +-
 ...igitalpeakmeter.h => digitalpeakmeter.hpp} |  6 +-
 c++/widgets/pixmapdial.cpp                    |  2 +-
 c++/widgets/{pixmapdial.h => pixmapdial.hpp}  |  6 +-
 c++/widgets/pixmapkeyboard.cpp                |  2 +-
 .../{pixmapkeyboard.h => pixmapkeyboard.hpp}  |  6 +-
 c++/xycontroller/Makefile                     | 18 ++---
 c++/xycontroller/qtcreator/xycontroller.pro   | 34 --------
 c++/xycontroller/xycontroller.cpp             |  6 +-
 c++/xycontroller/xycontroller.pro             | 36 +++++++++
 resources/resources-jackmeter.qrc             |  5 ++
 resources/resources-xycontroller.qrc          | 14 ++++
 {src => resources}/ui/cadence.ui              |  0
 {src => resources}/ui/cadence_rwait.ui        |  0
 {src => resources}/ui/cadence_tb_a2j.ui       |  0
 {src => resources}/ui/cadence_tb_alsa.ui      |  0
 {src => resources}/ui/cadence_tb_jack.ui      |  0
 {src => resources}/ui/cadence_tb_pa.ui        |  0
 {src => resources}/ui/carla.ui                |  0
 {src => resources}/ui/carla_about.ui          |  0
 {src => resources}/ui/carla_control.ui        |  0
 {src => resources}/ui/carla_database.ui       |  0
 resources/ui/carla_driver.ui                  | 78 +++++++++++++++++++
 {src => resources}/ui/carla_edit.ui           |  0
 {src => resources}/ui/carla_parameter.ui      |  0
 {src => resources}/ui/carla_plugin.ui         |  0
 {src => resources}/ui/carla_refresh.ui        |  0
 {src => resources}/ui/catarina.ui             |  0
 {src => resources}/ui/catarina_addgroup.ui    |  0
 {src => resources}/ui/catarina_addport.ui     |  0
 .../ui/catarina_connectports.ui               |  0
 .../ui/catarina_disconnectports.ui            |  0
 {src => resources}/ui/catarina_removegroup.ui |  0
 {src => resources}/ui/catarina_removeport.ui  |  0
 {src => resources}/ui/catarina_renamegroup.ui |  0
 {src => resources}/ui/catarina_renameport.ui  |  0
 {src => resources}/ui/catia.ui                |  0
 {src => resources}/ui/claudia.ui              |  0
 {src => resources}/ui/claudia_createroom.ui   |  0
 {src => resources}/ui/claudia_launcher.ui     |  0
 {src => resources}/ui/claudia_launcher_app.ui |  0
 {src => resources}/ui/claudia_projectname.ui  |  0
 .../ui/claudia_projectproperties.ui           |  0
 {src => resources}/ui/claudia_runcustom.ui    |  0
 {src => resources}/ui/claudia_studiolist.ui   |  0
 {src => resources}/ui/claudia_studioname.ui   |  0
 {src => resources}/ui/inputdialog_value.ui    |  0
 {src => resources}/ui/logs.ui                 |  0
 {src => resources}/ui/render.ui               |  0
 {src => resources}/ui/settings_app.ui         |  0
 {src => resources}/ui/settings_jack.ui        |  0
 {src => resources}/ui/xycontroller.ui         | 20 ++---
 62 files changed, 264 insertions(+), 152 deletions(-)
 create mode 100644 c++/jackmeter/jackmeter.pro
 delete mode 100644 c++/jackmeter/qtcreator/jackmeter.pro
 rename c++/widgets/{digitalpeakmeter.h => digitalpeakmeter.hpp} (95%)
 rename c++/widgets/{pixmapdial.h => pixmapdial.hpp} (96%)
 rename c++/widgets/{pixmapkeyboard.h => pixmapkeyboard.hpp} (95%)
 delete mode 100644 c++/xycontroller/qtcreator/xycontroller.pro
 create mode 100644 c++/xycontroller/xycontroller.pro
 create mode 100644 resources/resources-jackmeter.qrc
 create mode 100644 resources/resources-xycontroller.qrc
 rename {src => resources}/ui/cadence.ui (100%)
 rename {src => resources}/ui/cadence_rwait.ui (100%)
 rename {src => resources}/ui/cadence_tb_a2j.ui (100%)
 rename {src => resources}/ui/cadence_tb_alsa.ui (100%)
 rename {src => resources}/ui/cadence_tb_jack.ui (100%)
 rename {src => resources}/ui/cadence_tb_pa.ui (100%)
 rename {src => resources}/ui/carla.ui (100%)
 rename {src => resources}/ui/carla_about.ui (100%)
 rename {src => resources}/ui/carla_control.ui (100%)
 rename {src => resources}/ui/carla_database.ui (100%)
 create mode 100644 resources/ui/carla_driver.ui
 rename {src => resources}/ui/carla_edit.ui (100%)
 rename {src => resources}/ui/carla_parameter.ui (100%)
 rename {src => resources}/ui/carla_plugin.ui (100%)
 rename {src => resources}/ui/carla_refresh.ui (100%)
 rename {src => resources}/ui/catarina.ui (100%)
 rename {src => resources}/ui/catarina_addgroup.ui (100%)
 rename {src => resources}/ui/catarina_addport.ui (100%)
 rename {src => resources}/ui/catarina_connectports.ui (100%)
 rename {src => resources}/ui/catarina_disconnectports.ui (100%)
 rename {src => resources}/ui/catarina_removegroup.ui (100%)
 rename {src => resources}/ui/catarina_removeport.ui (100%)
 rename {src => resources}/ui/catarina_renamegroup.ui (100%)
 rename {src => resources}/ui/catarina_renameport.ui (100%)
 rename {src => resources}/ui/catia.ui (100%)
 rename {src => resources}/ui/claudia.ui (100%)
 rename {src => resources}/ui/claudia_createroom.ui (100%)
 rename {src => resources}/ui/claudia_launcher.ui (100%)
 rename {src => resources}/ui/claudia_launcher_app.ui (100%)
 rename {src => resources}/ui/claudia_projectname.ui (100%)
 rename {src => resources}/ui/claudia_projectproperties.ui (100%)
 rename {src => resources}/ui/claudia_runcustom.ui (100%)
 rename {src => resources}/ui/claudia_studiolist.ui (100%)
 rename {src => resources}/ui/claudia_studioname.ui (100%)
 rename {src => resources}/ui/inputdialog_value.ui (100%)
 rename {src => resources}/ui/logs.ui (100%)
 rename {src => resources}/ui/render.ui (100%)
 rename {src => resources}/ui/settings_app.ui (100%)
 rename {src => resources}/ui/settings_jack.ui (100%)
 rename {src => resources}/ui/xycontroller.ui (98%)

diff --git a/.gitignore b/.gitignore
index f9fc899..968c5ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,7 +47,7 @@ c++/carla-includes/vst/
 *-build-*Release/
 
 src/resources_rc.py
-resources/qrc_resources.cpp
+qrc_resources*.cpp
 
 
 # incoming
diff --git a/Makefile b/Makefile
index 969eaff..1db820b 100644
--- a/Makefile
+++ b/Makefile
@@ -50,118 +50,118 @@ tools: \
 	src/ui_logs.py src/ui_render.py \
 	src/ui_settings_app.py src/ui_settings_jack.py
 
-src/ui_cadence.py: src/ui/cadence.ui
+src/ui_cadence.py: resources/ui/cadence.ui
 	$(PYUIC) $< -o $@
 
-src/ui_cadence_tb_jack.py: src/ui/cadence_tb_jack.ui
+src/ui_cadence_tb_jack.py: resources/ui/cadence_tb_jack.ui
 	$(PYUIC) $< -o $@
 
-src/ui_cadence_tb_alsa.py: src/ui/cadence_tb_alsa.ui
+src/ui_cadence_tb_alsa.py: resources/ui/cadence_tb_alsa.ui
 	$(PYUIC) $< -o $@
 
-src/ui_cadence_tb_a2j.py: src/ui/cadence_tb_a2j.ui
+src/ui_cadence_tb_a2j.py: resources/ui/cadence_tb_a2j.ui
 	$(PYUIC) $< -o $@
 
-src/ui_cadence_tb_pa.py: src/ui/cadence_tb_pa.ui
+src/ui_cadence_tb_pa.py: resources/ui/cadence_tb_pa.ui
 	$(PYUIC) $< -o $@
 
-src/ui_cadence_rwait.py: src/ui/cadence_rwait.ui
+src/ui_cadence_rwait.py: resources/ui/cadence_rwait.ui
 	$(PYUIC) $< -o $@
 
-src/ui_catarina.py: src/ui/catarina.ui
+src/ui_catarina.py: resources/ui/catarina.ui
 	$(PYUIC) $< -o $@
 
-src/ui_catarina_addgroup.py: src/ui/catarina_addgroup.ui
+src/ui_catarina_addgroup.py: resources/ui/catarina_addgroup.ui
 	$(PYUIC) $< -o $@
 
-src/ui_catarina_removegroup.py: src/ui/catarina_removegroup.ui
+src/ui_catarina_removegroup.py: resources/ui/catarina_removegroup.ui
 	$(PYUIC) $< -o $@
 
-src/ui_catarina_renamegroup.py: src/ui/catarina_renamegroup.ui
+src/ui_catarina_renamegroup.py: resources/ui/catarina_renamegroup.ui
 	$(PYUIC) $< -o $@
 
-src/ui_catarina_addport.py: src/ui/catarina_addport.ui
+src/ui_catarina_addport.py: resources/ui/catarina_addport.ui
 	$(PYUIC) $< -o $@
 
-src/ui_catarina_removeport.py: src/ui/catarina_removeport.ui
+src/ui_catarina_removeport.py: resources/ui/catarina_removeport.ui
 	$(PYUIC) $< -o $@
 
-src/ui_catarina_renameport.py: src/ui/catarina_renameport.ui
+src/ui_catarina_renameport.py: resources/ui/catarina_renameport.ui
 	$(PYUIC) $< -o $@
 
-src/ui_catarina_connectports.py: src/ui/catarina_connectports.ui
+src/ui_catarina_connectports.py: resources/ui/catarina_connectports.ui
 	$(PYUIC) $< -o $@
 
-src/ui_catarina_disconnectports.py: src/ui/catarina_disconnectports.ui
+src/ui_catarina_disconnectports.py: resources/ui/catarina_disconnectports.ui
 	$(PYUIC) $< -o $@
 
-src/ui_catia.py: src/ui/catia.ui
+src/ui_catia.py: resources/ui/catia.ui
 	$(PYUIC) $< -o $@
 
-src/ui_claudia.py: src/ui/claudia.ui
+src/ui_claudia.py: resources/ui/claudia.ui
 	$(PYUIC) $< -o $@
 
-src/ui_claudia_studioname.py: src/ui/claudia_studioname.ui
+src/ui_claudia_studioname.py: resources/ui/claudia_studioname.ui
 	$(PYUIC) $< -o $@
 
-src/ui_claudia_studiolist.py: src/ui/claudia_studiolist.ui
+src/ui_claudia_studiolist.py: resources/ui/claudia_studiolist.ui
 	$(PYUIC) $< -o $@
 
-src/ui_claudia_createroom.py: src/ui/claudia_createroom.ui
+src/ui_claudia_createroom.py: resources/ui/claudia_createroom.ui
 	$(PYUIC) $< -o $@
 
-src/ui_claudia_projectname.py: src/ui/claudia_projectname.ui
+src/ui_claudia_projectname.py: resources/ui/claudia_projectname.ui
 	$(PYUIC) $< -o $@
 
-src/ui_claudia_projectproperties.py: src/ui/claudia_projectproperties.ui
+src/ui_claudia_projectproperties.py: resources/ui/claudia_projectproperties.ui
 	$(PYUIC) $< -o $@
 
-src/ui_claudia_runcustom.py: src/ui/claudia_runcustom.ui
+src/ui_claudia_runcustom.py: resources/ui/claudia_runcustom.ui
 	$(PYUIC) $< -o $@
 
-src/ui_claudia_launcher.py: src/ui/claudia_launcher.ui
+src/ui_claudia_launcher.py: resources/ui/claudia_launcher.ui
 	$(PYUIC) $< -o $@
 
-src/ui_claudia_launcher_app.py: src/ui/claudia_launcher_app.ui
+src/ui_claudia_launcher_app.py: resources/ui/claudia_launcher_app.ui
 	$(PYUIC) $< -o $@
 
-src/ui_carla.py: src/ui/carla.ui
+src/ui_carla.py: resources/ui/carla.ui
 	$(PYUIC) $< -o $@
 
-src/ui_carla_control.py: src/ui/carla_control.ui
+src/ui_carla_control.py: resources/ui/carla_control.ui
 	$(PYUIC) $< -o $@
 
-src/ui_carla_about.py: src/ui/carla_about.ui
+src/ui_carla_about.py: resources/ui/carla_about.ui
 	$(PYUIC) $< -o $@
 
-src/ui_carla_database.py: src/ui/carla_database.ui
+src/ui_carla_database.py: resources/ui/carla_database.ui
 	$(PYUIC) $< -o $@
 
-src/ui_carla_edit.py: src/ui/carla_edit.ui
+src/ui_carla_edit.py: resources/ui/carla_edit.ui
 	$(PYUIC) $< -o $@
 
-src/ui_carla_parameter.py: src/ui/carla_parameter.ui
+src/ui_carla_parameter.py: resources/ui/carla_parameter.ui
 	$(PYUIC) $< -o $@
 
-src/ui_carla_plugin.py: src/ui/carla_plugin.ui
+src/ui_carla_plugin.py: resources/ui/carla_plugin.ui
 	$(PYUIC) $< -o $@
 
-src/ui_carla_refresh.py: src/ui/carla_refresh.ui
+src/ui_carla_refresh.py: resources/ui/carla_refresh.ui
 	$(PYUIC) $< -o $@
 
-src/ui_logs.py: src/ui/logs.ui
+src/ui_logs.py: resources/ui/logs.ui
 	$(PYUIC) $< -o $@
 
-src/ui_render.py: src/ui/render.ui
+src/ui_render.py: resources/ui/render.ui
 	$(PYUIC) $< -o $@
 
-src/ui_settings_app.py: src/ui/settings_app.ui
+src/ui_settings_app.py: resources/ui/settings_app.ui
 	$(PYUIC) $< -o $@
 
-src/ui_settings_jack.py: src/ui/settings_jack.ui
+src/ui_settings_jack.py: resources/ui/settings_jack.ui
 	$(PYUIC) $< -o $@
 
-src/ui_inputdialog_value.py: src/ui/inputdialog_value.ui
+src/ui_inputdialog_value.py: resources/ui/inputdialog_value.ui
 	$(PYUIC) $< -o $@
 
 # ------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/c++/carla-bridge/carla_bridge_osc.cpp b/c++/carla-bridge/carla_bridge_osc.cpp
index 2f00b53..95f0991 100644
--- a/c++/carla-bridge/carla_bridge_osc.cpp
+++ b/c++/carla-bridge/carla_bridge_osc.cpp
@@ -17,7 +17,7 @@
 
 #include "carla_bridge_osc.hpp"
 #include "carla_bridge_client.hpp"
-#include "carla_midi.hpp"
+#include "carla_midi.h"
 
 #include <QtCore/QString>
 #include <QtCore/QStringList>
diff --git a/c++/carla-bridge/carla_bridge_ui-lv2.cpp b/c++/carla-bridge/carla_bridge_ui-lv2.cpp
index eb3ba82..79cee91 100644
--- a/c++/carla-bridge/carla_bridge_ui-lv2.cpp
+++ b/c++/carla-bridge/carla_bridge_ui-lv2.cpp
@@ -19,7 +19,7 @@
 
 #include "carla_bridge_client.hpp"
 #include "carla_lv2_utils.hpp"
-#include "carla_midi.hpp"
+#include "carla_midi.h"
 #include "rtmempool/rtmempool.h"
 
 #include <vector>
diff --git a/c++/carla-bridge/carla_bridge_ui-vst.cpp b/c++/carla-bridge/carla_bridge_ui-vst.cpp
index 8747c28..47d2ea8 100644
--- a/c++/carla-bridge/carla_bridge_ui-vst.cpp
+++ b/c++/carla-bridge/carla_bridge_ui-vst.cpp
@@ -19,7 +19,7 @@
 
 #include "carla_bridge_client.hpp"
 #include "carla_vst_utils.hpp"
-#include "carla_midi.hpp"
+#include "carla_midi.h"
 
 #include <QtCore/QTimerEvent>
 #include <QtGui/QDialog>
diff --git a/c++/jackmeter/Makefile b/c++/jackmeter/Makefile
index 5eeaaf1..de51235 100644
--- a/c++/jackmeter/Makefile
+++ b/c++/jackmeter/Makefile
@@ -14,20 +14,29 @@ ifeq ($(shell pkg-config --atleast-version=0.121.0 jack && echo true),true)
 BUILD_CXX_FLAGS += -DHAVE_JACKSESSION
 endif
 
+FILES = \
+	qrc_resources-jackmeter.cpp
+
 OBJS = \
 	jackmeter.o \
+	qrc_resources-jackmeter.o \
 	../widgets/digitalpeakmeter.o
 
 # --------------------------------------------------------------
 
 all: cadence-jackmeter
 
-cadence-jackmeter: $(OBJS)
+cadence-jackmeter: $(FILES) $(OBJS)
 	$(CXX) $(OBJS) $(LINK_FLAGS) -o $@ && $(STRIP) $@
 
-cadence-jackmeter.exe: $(OBJS) icon.o
+cadence-jackmeter.exe: $(FILES) $(OBJS) icon.o
 	$(CXX) $(OBJS) icon.o $(LINK_FLAGS) -static -mwindows -o $@ && $(STRIP) $@
 
+# --------------------------------------------------------------
+
+qrc_resources-jackmeter.cpp: ../../resources/resources-jackmeter.qrc
+	$(RCC) -name resources-jackmeter $< -o $@
+
 icon.o: ../../resources/ico/cadence.rc
 	$(WINDRES) -i $< -o $@ -O coff
 
@@ -37,4 +46,4 @@ icon.o: ../../resources/ico/cadence.rc
 	$(CXX) -c $< $(BUILD_CXX_FLAGS) -o $@
 
 clean:
-	rm -f $(OBJS) cadence-jackmeter*
+	rm -f $(FILES) $(OBJS) cadence-jackmeter*
diff --git a/c++/jackmeter/jackmeter.cpp b/c++/jackmeter/jackmeter.cpp
index 4053490..93d7bed 100644
--- a/c++/jackmeter/jackmeter.cpp
+++ b/c++/jackmeter/jackmeter.cpp
@@ -21,10 +21,13 @@
 # define nullptr (0)
 #endif
 
+#define VERSION "0.5.0"
+
 #include "../jack_utils.hpp"
-#include "../widgets/digitalpeakmeter.h"
+#include "../widgets/digitalpeakmeter.hpp"
 
 #include <QtGui/QApplication>
+#include <QtGui/QIcon>
 #include <QtGui/QMessageBox>
 
 // -------------------------------
@@ -38,13 +41,6 @@ jack_client_t* jClient = nullptr;
 jack_port_t* jPort1 = nullptr;
 jack_port_t* jPort2 = nullptr;
 
-// -------------------------------
-
-float abs_f(const float value)
-{
-    return (value < 1.0f) ? -value : value;
-}
-
 // -------------------------------
 // JACK callbacks
 
@@ -55,11 +51,11 @@ int process_callback(const jack_nframes_t nframes, void*)
 
     for (jack_nframes_t i = 0; i < nframes; i++)
     {
-        if (abs_f(jOut1[i]) > x_portValue1)
-            x_portValue1 = abs_f(jOut1[i]);
+        if (std::abs(jOut1[i]) > x_portValue1)
+            x_portValue1 = std::abs(jOut1[i]);
 
-        if (abs_f(jOut2[i]) > x_portValue2)
-            x_portValue2 = abs_f(jOut2[i]);
+        if (std::abs(jOut2[i]) > x_portValue2)
+            x_portValue2 = std::abs(jOut2[i]);
     }
 
     return 0;
@@ -185,16 +181,16 @@ int main(int argc, char* argv[])
 {
     QApplication app(argc, argv);
     app.setApplicationName("JackMeter");
-    //app.setApplicationVersion(VERSION);
+    app.setApplicationVersion(VERSION);
     app.setOrganizationName("Cadence");
-    //app.setWindowIcon(QIcon(":/scalable/meter.svg"));
+    app.setWindowIcon(QIcon(":/scalable/cadence.svg"));
 
     // JACK initialization
     jack_status_t jStatus;
 #ifdef HAVE_JACKSESSION
-    jack_options_t jOptions = static_cast<JackOptions>(JackNoStartServer|JackUseExactName|JackSessionID);
+    jack_options_t jOptions = static_cast<jack_options_t>(JackNoStartServer|JackUseExactName|JackSessionID);
 #else
-    jack_options_t jOptions = static_cast<JackOptions>(JackNoStartServer|JackUseExactName);
+    jack_options_t jOptions = static_cast<jack_options_t>(JackNoStartServer|JackUseExactName);
 #endif
     jClient = jack_client_open("M", jOptions, &jStatus);
 
diff --git a/c++/jackmeter/jackmeter.pro b/c++/jackmeter/jackmeter.pro
new file mode 100644
index 0000000..d1d4272
--- /dev/null
+++ b/c++/jackmeter/jackmeter.pro
@@ -0,0 +1,30 @@
+# QtCreator project file
+
+QT = core gui
+
+CONFIG    = debug
+CONFIG   += link_pkgconfig qt resources warn_on
+
+DEFINES   = DEBUG
+DEFINES  += HAVE_JACKSESSION
+PKGCONFIG = jack
+
+TARGET   = cadence-jackmeter
+TEMPLATE = app
+VERSION  = 0.5.0
+
+SOURCES  = \
+    jackmeter.cpp \
+    ../widgets/digitalpeakmeter.cpp
+
+HEADERS  = \
+    ../jack_utils.hpp \
+    ../widgets/digitalpeakmeter.hpp
+
+INCLUDEPATH = \
+    ../widgets
+
+RESOURCES = \
+    ../../resources/resources-jackmeter.qrc
+
+QMAKE_CXXFLAGS *= -std=c++0x
diff --git a/c++/jackmeter/qtcreator/jackmeter.pro b/c++/jackmeter/qtcreator/jackmeter.pro
deleted file mode 100644
index df35655..0000000
--- a/c++/jackmeter/qtcreator/jackmeter.pro
+++ /dev/null
@@ -1,22 +0,0 @@
-# QtCreator project file
-
-QT = core gui
-
-CONFIG    = debug link_pkgconfig qt warn_on
-PKGCONFIG = jack
-
-TARGET   = jackmeter
-TEMPLATE = app
-VERSION  = 0.5.0
-
-DEFINES  = HAVE_JACKSESSION
-
-SOURCES  = \
-    ../jackmeter.cpp \
-    ../../widgets/digitalpeakmeter.cpp
-
-HEADERS  = \
-    ../../jack_utils.h \
-    ../../widgets/digitalpeakmeter.h
-
-QMAKE_CXXFLAGS *= -std=c++0x
diff --git a/c++/patchcanvas.hpp b/c++/patchcanvas.hpp
index 8cb639f..af4266a 100644
--- a/c++/patchcanvas.hpp
+++ b/c++/patchcanvas.hpp
@@ -22,7 +22,7 @@
 #define END_NAMESPACE_PATCHCANVAS }
 
 #ifndef PATCHCANVAS_ORGANISATION_NAME
-#define PATCHCANVAS_ORGANISATION_NAME "PatchCanvas"
+# define PATCHCANVAS_ORGANISATION_NAME "PatchCanvas"
 #endif
 
 #include "patchcanvas/patchcanvas-theme.h"
diff --git a/c++/widgets/digitalpeakmeter.cpp b/c++/widgets/digitalpeakmeter.cpp
index 118d188..7830527 100644
--- a/c++/widgets/digitalpeakmeter.cpp
+++ b/c++/widgets/digitalpeakmeter.cpp
@@ -15,7 +15,7 @@
  * For a full copy of the GNU General Public License see the COPYING file
  */
 
-#include "digitalpeakmeter.h"
+#include "digitalpeakmeter.hpp"
 
 #include <QtGui/QPainter>
 
diff --git a/c++/widgets/digitalpeakmeter.h b/c++/widgets/digitalpeakmeter.hpp
similarity index 95%
rename from c++/widgets/digitalpeakmeter.h
rename to c++/widgets/digitalpeakmeter.hpp
index e953010..959526b 100644
--- a/c++/widgets/digitalpeakmeter.h
+++ b/c++/widgets/digitalpeakmeter.hpp
@@ -15,8 +15,8 @@
  * For a full copy of the GNU General Public License see the COPYING file
  */
 
-#ifndef DIGITALPEAKMETER_H
-#define DIGITALPEAKMETER_H
+#ifndef DIGITALPEAKMETER_HPP
+#define DIGITALPEAKMETER_HPP
 
 #include <QtCore/QTimer>
 #include <QtGui/QWidget>
@@ -70,4 +70,4 @@ private:
     QTimer m_paintTimer;
 };
 
-#endif // DIGITALPEAKMETER_H
+#endif // DIGITALPEAKMETER_HPP
diff --git a/c++/widgets/pixmapdial.cpp b/c++/widgets/pixmapdial.cpp
index 4b24418..dad9cf8 100644
--- a/c++/widgets/pixmapdial.cpp
+++ b/c++/widgets/pixmapdial.cpp
@@ -15,7 +15,7 @@
  * For a full copy of the GNU General Public License see the COPYING file
  */
 
-#include "pixmapdial.h"
+#include "pixmapdial.hpp"
 
 #include <cmath>
 
diff --git a/c++/widgets/pixmapdial.h b/c++/widgets/pixmapdial.hpp
similarity index 96%
rename from c++/widgets/pixmapdial.h
rename to c++/widgets/pixmapdial.hpp
index 162e2ba..2aee5f6 100644
--- a/c++/widgets/pixmapdial.h
+++ b/c++/widgets/pixmapdial.hpp
@@ -15,8 +15,8 @@
  * For a full copy of the GNU General Public License see the COPYING file
  */
 
-#ifndef PIXMAPDIAL_H
-#define PIXMAPDIAL_H
+#ifndef PIXMAPDIAL_HPP
+#define PIXMAPDIAL_HPP
 
 #include <QtGui/QDial>
 #include <QtGui/QPixmap>
@@ -86,4 +86,4 @@ private:
     int p_width, p_height, p_size, p_count;
 };
 
-#endif // PIXMAPDIAL_H
+#endif // PIXMAPDIAL_HPP
diff --git a/c++/widgets/pixmapkeyboard.cpp b/c++/widgets/pixmapkeyboard.cpp
index 08c13fa..6ff1df1 100644
--- a/c++/widgets/pixmapkeyboard.cpp
+++ b/c++/widgets/pixmapkeyboard.cpp
@@ -15,7 +15,7 @@
  * For a full copy of the GNU General Public License see the COPYING file
  */
 
-#include "pixmapkeyboard.h"
+#include "pixmapkeyboard.hpp"
 
 #include <QtCore/QMap>
 #include <QtCore/QTimer>
diff --git a/c++/widgets/pixmapkeyboard.h b/c++/widgets/pixmapkeyboard.hpp
similarity index 95%
rename from c++/widgets/pixmapkeyboard.h
rename to c++/widgets/pixmapkeyboard.hpp
index 1e84b3c..0ea72a0 100644
--- a/c++/widgets/pixmapkeyboard.h
+++ b/c++/widgets/pixmapkeyboard.hpp
@@ -15,8 +15,8 @@
  * For a full copy of the GNU General Public License see the COPYING file
  */
 
-#ifndef PIXMAPKEYBOARD_H
-#define PIXMAPKEYBOARD_H
+#ifndef PIXMAPKEYBOARD_HPP
+#define PIXMAPKEYBOARD_HPP
 
 #include <QtGui/QPixmap>
 #include <QtGui/QWidget>
@@ -82,4 +82,4 @@ private:
     QRectF _getRectFromMidiNote(int note);
 };
 
-#endif // PIXMAPKEYBOARD_H
+#endif // PIXMAPKEYBOARD_HPP
diff --git a/c++/xycontroller/Makefile b/c++/xycontroller/Makefile
index d4ef175..3af5b12 100644
--- a/c++/xycontroller/Makefile
+++ b/c++/xycontroller/Makefile
@@ -17,14 +17,14 @@ endif
 FILES = \
 	xycontroller.moc \
 	ui_xycontroller.h \
-	../widgets/moc_pixmapkeyboard.cpp \
-	../../resources/qrc_resources.cpp
+	qrc_resources-xycontroller.cpp \
+	../widgets/moc_pixmapkeyboard.cpp
 
 OBJS  = xycontroller.o \
+	qrc_resources-xycontroller.o \
 	../widgets/pixmapdial.o \
 	../widgets/pixmapkeyboard.o \
-	../widgets/moc_pixmapkeyboard.o \
-	../../resources/qrc_resources.o
+	../widgets/moc_pixmapkeyboard.o
 
 # --------------------------------------------------------------
 
@@ -41,18 +41,18 @@ cadence-xycontroller.exe: $(FILES) $(OBJS) icon.o
 xycontroller.moc: xycontroller.cpp
 	$(MOC) $< -o $@
 
-ui_xycontroller.h: ../../src/ui/xycontroller.ui
+ui_xycontroller.h: ../../resources/ui/xycontroller.ui
 	$(UIC) $< -o $@
 
+qrc_resources-xycontroller.cpp: ../../resources/resources-xycontroller.qrc
+	$(RCC) -name resources-xycontroller $< -o $@
+
 icon.o: ../../resources/ico/cadence.rc
 	$(WINDRES) -i $< -o $@ -O coff
 
-../widgets/moc_pixmapkeyboard.cpp: ../widgets/pixmapkeyboard.h
+../widgets/moc_pixmapkeyboard.cpp: ../widgets/pixmapkeyboard.hpp
 	$(MOC) $< -o $@
 
-../../resources/qrc_resources.cpp: ../../resources/resources.qrc
-	$(RCC) -name resources $< -o $@
-
 # --------------------------------------------------------------
 
 .cpp.o:
diff --git a/c++/xycontroller/qtcreator/xycontroller.pro b/c++/xycontroller/qtcreator/xycontroller.pro
deleted file mode 100644
index 78b5790..0000000
--- a/c++/xycontroller/qtcreator/xycontroller.pro
+++ /dev/null
@@ -1,34 +0,0 @@
-# QtCreator project file
-
-QT = core gui
-
-CONFIG    = debug link_pkgconfig qt resources uic warn_on
-PKGCONFIG = jack
-
-TARGET   = xycontroller
-TEMPLATE = app
-VERSION  = 0.5.0
-
-DEFINES  = HAVE_JACKSESSION
-
-SOURCES  = \
-    ../xycontroller.cpp \
-    ../../widgets/pixmapdial.cpp \
-    ../../widgets/pixmapkeyboard.cpp
-
-HEADERS  = \
-    ../../jack_utils.h \
-    ../../midi_queue.h \
-    ../../widgets/pixmapdial.h \
-    ../../widgets/pixmapkeyboard.h
-
-FORMS = \
-    ../../../src/ui/xycontroller.ui
-
-RESOURCES = \
-    ../../../resources/resources.qrc
-
-INCLUDEPATH = \
-    ../../widgets
-
-QMAKE_CXXFLAGS *= -std=c++0x
diff --git a/c++/xycontroller/xycontroller.cpp b/c++/xycontroller/xycontroller.cpp
index 1f51803..e30f46f 100644
--- a/c++/xycontroller/xycontroller.cpp
+++ b/c++/xycontroller/xycontroller.cpp
@@ -953,14 +953,14 @@ int main(int argc, char* argv[])
     app.setApplicationName("XY-Controller");
     app.setApplicationVersion(VERSION);
     app.setOrganizationName("Cadence");
-    //app.setWindowIcon(QIcon(":/48x48/xy-controller.png"));
+    app.setWindowIcon(QIcon(":/scalable/cadence.svg"));
 
     // JACK initialization
     jack_status_t jStatus;
 #ifdef HAVE_JACKSESSION
-    jack_options_t jOptions = static_cast<JackOptions>(JackNoStartServer|JackSessionID);
+    jack_options_t jOptions = static_cast<jack_options_t>(JackNoStartServer|JackSessionID);
 #else
-    jack_options_t jOptions = static_cast<JackOptions>(JackNoStartServer);
+    jack_options_t jOptions = static_cast<jack_options_t>(JackNoStartServer);
 #endif
     jClient = jack_client_open("XY-Controller", jOptions, &jStatus);
 
diff --git a/c++/xycontroller/xycontroller.pro b/c++/xycontroller/xycontroller.pro
new file mode 100644
index 0000000..bdf7478
--- /dev/null
+++ b/c++/xycontroller/xycontroller.pro
@@ -0,0 +1,36 @@
+# QtCreator project file
+
+QT = core gui
+
+CONFIG    = debug
+CONFIG   += link_pkgconfig qt resources uic warn_on
+
+DEFINES   = DEBUG
+DEFINES  += HAVE_JACKSESSION
+PKGCONFIG = jack
+
+TARGET   = cadence-xycontroller
+TEMPLATE = app
+VERSION  = 0.5.0
+
+SOURCES  = \
+    xycontroller.cpp \
+    ../widgets/pixmapdial.cpp \
+    ../widgets/pixmapkeyboard.cpp
+
+HEADERS  = \
+    ../jack_utils.hpp \
+    ../midi_queue.hpp \
+    ../widgets/pixmapdial.hpp \
+    ../widgets/pixmapkeyboard.hpp
+
+INCLUDEPATH = \
+    ../widgets
+
+FORMS = \
+    ../../resources/ui/xycontroller.ui
+
+RESOURCES = \
+    ../../resources/resources-xycontroller.qrc
+
+QMAKE_CXXFLAGS *= -std=c++0x
diff --git a/resources/resources-jackmeter.qrc b/resources/resources-jackmeter.qrc
new file mode 100644
index 0000000..930be5b
--- /dev/null
+++ b/resources/resources-jackmeter.qrc
@@ -0,0 +1,5 @@
+<RCC version="1.0">
+    <qresource prefix="/">
+        <file>scalable/cadence.svg</file>
+    </qresource>
+</RCC>
diff --git a/resources/resources-xycontroller.qrc b/resources/resources-xycontroller.qrc
new file mode 100644
index 0000000..0be3f9c
--- /dev/null
+++ b/resources/resources-xycontroller.qrc
@@ -0,0 +1,14 @@
+<RCC version="1.0">
+    <qresource prefix="/">
+        <file>16x16/application-exit.png</file>
+        <file>scalable/cadence.svg</file>
+        <file>bitmaps/dial_01.png</file>
+        <file>bitmaps/dial_01d.png</file>
+        <file>bitmaps/dial_02.png</file>
+        <file>bitmaps/dial_02d.png</file>
+        <file>bitmaps/kbd_h_classic.png</file>
+        <file>bitmaps/kbd_h_orange.png</file>
+        <file>bitmaps/kbd_v_classic.png</file>
+        <file>bitmaps/kbd_v_orange.png</file>
+    </qresource>
+</RCC>
diff --git a/src/ui/cadence.ui b/resources/ui/cadence.ui
similarity index 100%
rename from src/ui/cadence.ui
rename to resources/ui/cadence.ui
diff --git a/src/ui/cadence_rwait.ui b/resources/ui/cadence_rwait.ui
similarity index 100%
rename from src/ui/cadence_rwait.ui
rename to resources/ui/cadence_rwait.ui
diff --git a/src/ui/cadence_tb_a2j.ui b/resources/ui/cadence_tb_a2j.ui
similarity index 100%
rename from src/ui/cadence_tb_a2j.ui
rename to resources/ui/cadence_tb_a2j.ui
diff --git a/src/ui/cadence_tb_alsa.ui b/resources/ui/cadence_tb_alsa.ui
similarity index 100%
rename from src/ui/cadence_tb_alsa.ui
rename to resources/ui/cadence_tb_alsa.ui
diff --git a/src/ui/cadence_tb_jack.ui b/resources/ui/cadence_tb_jack.ui
similarity index 100%
rename from src/ui/cadence_tb_jack.ui
rename to resources/ui/cadence_tb_jack.ui
diff --git a/src/ui/cadence_tb_pa.ui b/resources/ui/cadence_tb_pa.ui
similarity index 100%
rename from src/ui/cadence_tb_pa.ui
rename to resources/ui/cadence_tb_pa.ui
diff --git a/src/ui/carla.ui b/resources/ui/carla.ui
similarity index 100%
rename from src/ui/carla.ui
rename to resources/ui/carla.ui
diff --git a/src/ui/carla_about.ui b/resources/ui/carla_about.ui
similarity index 100%
rename from src/ui/carla_about.ui
rename to resources/ui/carla_about.ui
diff --git a/src/ui/carla_control.ui b/resources/ui/carla_control.ui
similarity index 100%
rename from src/ui/carla_control.ui
rename to resources/ui/carla_control.ui
diff --git a/src/ui/carla_database.ui b/resources/ui/carla_database.ui
similarity index 100%
rename from src/ui/carla_database.ui
rename to resources/ui/carla_database.ui
diff --git a/resources/ui/carla_driver.ui b/resources/ui/carla_driver.ui
new file mode 100644
index 0000000..7a553a9
--- /dev/null
+++ b/resources/ui/carla_driver.ui
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Dialog</class>
+ <widget class="QDialog" name="Dialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <widget class="QComboBox" name="comboBox">
+   <property name="geometry">
+    <rect>
+     <x>210</x>
+     <y>30</y>
+     <width>64</width>
+     <height>24</height>
+    </rect>
+   </property>
+  </widget>
+  <widget class="QComboBox" name="comboBox_2">
+   <property name="geometry">
+    <rect>
+     <x>210</x>
+     <y>70</y>
+     <width>64</width>
+     <height>24</height>
+    </rect>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label">
+   <property name="geometry">
+    <rect>
+     <x>90</x>
+     <y>30</y>
+     <width>111</width>
+     <height>20</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Preferred buffer size:</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_2">
+   <property name="geometry">
+    <rect>
+     <x>90</x>
+     <y>80</y>
+     <width>111</width>
+     <height>16</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Preferred sample rate:</string>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="pushButton">
+   <property name="geometry">
+    <rect>
+     <x>150</x>
+     <y>110</y>
+     <width>131</width>
+     <height>51</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Show Control Panel</string>
+   </property>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/ui/carla_edit.ui b/resources/ui/carla_edit.ui
similarity index 100%
rename from src/ui/carla_edit.ui
rename to resources/ui/carla_edit.ui
diff --git a/src/ui/carla_parameter.ui b/resources/ui/carla_parameter.ui
similarity index 100%
rename from src/ui/carla_parameter.ui
rename to resources/ui/carla_parameter.ui
diff --git a/src/ui/carla_plugin.ui b/resources/ui/carla_plugin.ui
similarity index 100%
rename from src/ui/carla_plugin.ui
rename to resources/ui/carla_plugin.ui
diff --git a/src/ui/carla_refresh.ui b/resources/ui/carla_refresh.ui
similarity index 100%
rename from src/ui/carla_refresh.ui
rename to resources/ui/carla_refresh.ui
diff --git a/src/ui/catarina.ui b/resources/ui/catarina.ui
similarity index 100%
rename from src/ui/catarina.ui
rename to resources/ui/catarina.ui
diff --git a/src/ui/catarina_addgroup.ui b/resources/ui/catarina_addgroup.ui
similarity index 100%
rename from src/ui/catarina_addgroup.ui
rename to resources/ui/catarina_addgroup.ui
diff --git a/src/ui/catarina_addport.ui b/resources/ui/catarina_addport.ui
similarity index 100%
rename from src/ui/catarina_addport.ui
rename to resources/ui/catarina_addport.ui
diff --git a/src/ui/catarina_connectports.ui b/resources/ui/catarina_connectports.ui
similarity index 100%
rename from src/ui/catarina_connectports.ui
rename to resources/ui/catarina_connectports.ui
diff --git a/src/ui/catarina_disconnectports.ui b/resources/ui/catarina_disconnectports.ui
similarity index 100%
rename from src/ui/catarina_disconnectports.ui
rename to resources/ui/catarina_disconnectports.ui
diff --git a/src/ui/catarina_removegroup.ui b/resources/ui/catarina_removegroup.ui
similarity index 100%
rename from src/ui/catarina_removegroup.ui
rename to resources/ui/catarina_removegroup.ui
diff --git a/src/ui/catarina_removeport.ui b/resources/ui/catarina_removeport.ui
similarity index 100%
rename from src/ui/catarina_removeport.ui
rename to resources/ui/catarina_removeport.ui
diff --git a/src/ui/catarina_renamegroup.ui b/resources/ui/catarina_renamegroup.ui
similarity index 100%
rename from src/ui/catarina_renamegroup.ui
rename to resources/ui/catarina_renamegroup.ui
diff --git a/src/ui/catarina_renameport.ui b/resources/ui/catarina_renameport.ui
similarity index 100%
rename from src/ui/catarina_renameport.ui
rename to resources/ui/catarina_renameport.ui
diff --git a/src/ui/catia.ui b/resources/ui/catia.ui
similarity index 100%
rename from src/ui/catia.ui
rename to resources/ui/catia.ui
diff --git a/src/ui/claudia.ui b/resources/ui/claudia.ui
similarity index 100%
rename from src/ui/claudia.ui
rename to resources/ui/claudia.ui
diff --git a/src/ui/claudia_createroom.ui b/resources/ui/claudia_createroom.ui
similarity index 100%
rename from src/ui/claudia_createroom.ui
rename to resources/ui/claudia_createroom.ui
diff --git a/src/ui/claudia_launcher.ui b/resources/ui/claudia_launcher.ui
similarity index 100%
rename from src/ui/claudia_launcher.ui
rename to resources/ui/claudia_launcher.ui
diff --git a/src/ui/claudia_launcher_app.ui b/resources/ui/claudia_launcher_app.ui
similarity index 100%
rename from src/ui/claudia_launcher_app.ui
rename to resources/ui/claudia_launcher_app.ui
diff --git a/src/ui/claudia_projectname.ui b/resources/ui/claudia_projectname.ui
similarity index 100%
rename from src/ui/claudia_projectname.ui
rename to resources/ui/claudia_projectname.ui
diff --git a/src/ui/claudia_projectproperties.ui b/resources/ui/claudia_projectproperties.ui
similarity index 100%
rename from src/ui/claudia_projectproperties.ui
rename to resources/ui/claudia_projectproperties.ui
diff --git a/src/ui/claudia_runcustom.ui b/resources/ui/claudia_runcustom.ui
similarity index 100%
rename from src/ui/claudia_runcustom.ui
rename to resources/ui/claudia_runcustom.ui
diff --git a/src/ui/claudia_studiolist.ui b/resources/ui/claudia_studiolist.ui
similarity index 100%
rename from src/ui/claudia_studiolist.ui
rename to resources/ui/claudia_studiolist.ui
diff --git a/src/ui/claudia_studioname.ui b/resources/ui/claudia_studioname.ui
similarity index 100%
rename from src/ui/claudia_studioname.ui
rename to resources/ui/claudia_studioname.ui
diff --git a/src/ui/inputdialog_value.ui b/resources/ui/inputdialog_value.ui
similarity index 100%
rename from src/ui/inputdialog_value.ui
rename to resources/ui/inputdialog_value.ui
diff --git a/src/ui/logs.ui b/resources/ui/logs.ui
similarity index 100%
rename from src/ui/logs.ui
rename to resources/ui/logs.ui
diff --git a/src/ui/render.ui b/resources/ui/render.ui
similarity index 100%
rename from src/ui/render.ui
rename to resources/ui/render.ui
diff --git a/src/ui/settings_app.ui b/resources/ui/settings_app.ui
similarity index 100%
rename from src/ui/settings_app.ui
rename to resources/ui/settings_app.ui
diff --git a/src/ui/settings_jack.ui b/resources/ui/settings_jack.ui
similarity index 100%
rename from src/ui/settings_jack.ui
rename to resources/ui/settings_jack.ui
diff --git a/src/ui/xycontroller.ui b/resources/ui/xycontroller.ui
similarity index 98%
rename from src/ui/xycontroller.ui
rename to resources/ui/xycontroller.ui
index 60c1269..fd6e4c9 100644
--- a/src/ui/xycontroller.ui
+++ b/resources/ui/xycontroller.ui
@@ -235,12 +235,6 @@
      <height>19</height>
     </rect>
    </property>
-   <widget class="QMenu" name="menu_File">
-    <property name="title">
-     <string>&amp;File</string>
-    </property>
-    <addaction name="act_quit"/>
-   </widget>
    <widget class="QMenu" name="menu_Help">
     <property name="title">
      <string>&amp;Help</string>
@@ -278,6 +272,12 @@
     <addaction name="menu_Channels"/>
     <addaction name="act_show_keyboard"/>
    </widget>
+   <widget class="QMenu" name="menu_File">
+    <property name="title">
+     <string>&amp;File</string>
+    </property>
+    <addaction name="act_quit"/>
+   </widget>
    <addaction name="menu_File"/>
    <addaction name="menu_Settings"/>
    <addaction name="menu_Help"/>
@@ -450,7 +450,7 @@
   </action>
   <action name="act_quit">
    <property name="icon">
-    <iconset resource="../../resources/resources.qrc">
+    <iconset resource="../resources-xycontroller.qrc">
      <normaloff>:/16x16/application-exit.png</normaloff>:/16x16/application-exit.png</iconset>
    </property>
    <property name="text">
@@ -467,17 +467,17 @@
   <customwidget>
    <class>PixmapKeyboard</class>
    <extends>QWidget</extends>
-   <header>pixmapkeyboard.h</header>
+   <header>pixmapkeyboard.hpp</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>PixmapDial</class>
    <extends>QDial</extends>
-   <header>pixmapdial.h</header>
+   <header>pixmapdial.hpp</header>
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../../resources/resources.qrc"/>
+  <include location="../resources-xycontroller.qrc"/>
  </resources>
  <connections>
   <connection>