More of the same
This commit is contained in:
parent
faf74bf922
commit
d701ba2182
|
@ -47,7 +47,7 @@ c++/carla-includes/vst/
|
|||
*-build-*Release/
|
||||
|
||||
src/resources_rc.py
|
||||
resources/qrc_resources.cpp
|
||||
qrc_resources*.cpp
|
||||
|
||||
|
||||
# incoming
|
||||
|
|
76
Makefile
76
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 $@
|
||||
|
||||
# ------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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*
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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
|
|
@ -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
|
|
@ -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"
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
|
@ -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
|
|
@ -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>
|
||||
|
||||
|
|
|
@ -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
|
|
@ -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>
|
||||
|
|
|
@ -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
|
|
@ -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:
|
||||
|
|
|
@ -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
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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
|
|
@ -0,0 +1,5 @@
|
|||
<RCC version="1.0">
|
||||
<qresource prefix="/">
|
||||
<file>scalable/cadence.svg</file>
|
||||
</qresource>
|
||||
</RCC>
|
|
@ -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>
|
|
@ -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>
|
|
@ -235,12 +235,6 @@
|
|||
<height>19</height>
|
||||
</rect>
|
||||
</property>
|
||||
<widget class="QMenu" name="menu_File">
|
||||
<property name="title">
|
||||
<string>&File</string>
|
||||
</property>
|
||||
<addaction name="act_quit"/>
|
||||
</widget>
|
||||
<widget class="QMenu" name="menu_Help">
|
||||
<property name="title">
|
||||
<string>&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>&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>
|
Loading…
Reference in New Issue