Commit e592d5de authored by Georg Krause's avatar Georg Krause

Rename Luppp to Loopp

parent a748de09
Pipeline #315 passed with stages
in 1 minute and 55 seconds
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
planning/* planning/*
src/*.o src/*.o
luppp loopp
*.zip *.zip
*.orig *.orig
...@@ -14,7 +14,7 @@ buildTest/* ...@@ -14,7 +14,7 @@ buildTest/*
/doc /doc
/Makefile /Makefile
/src/cmake_install.cmake /src/cmake_install.cmake
/src/liblibluppp.a /src/liblibloopp.a
/src/Makefile /src/Makefile
CMakeFiles/* CMakeFiles/*
src/CMakeFiles/* src/CMakeFiles/*
......
...@@ -51,7 +51,7 @@ test: ...@@ -51,7 +51,7 @@ test:
- build-test - build-test
script: script:
- ninja -C buildDir test - ninja -C buildDir test
- gcovr -b -e buildDir/luppp@exe/catch.hpp -e buildDir/luppp@exe/test_ <&1 | tee buildDir/coverage.txt - gcovr -b -e buildDir/loopp@exe/catch.hpp -e buildDir/loopp@exe/test_ <&1 | tee buildDir/coverage.txt
artifacts: artifacts:
paths: paths:
- buildDir/coverage.txt - buildDir/coverage.txt
...@@ -74,4 +74,4 @@ package-AppImage: ...@@ -74,4 +74,4 @@ package-AppImage:
untracked: false untracked: false
expire_in: 30 days expire_in: 30 days
paths: paths:
- Luppp-*.AppImage* - Loopp-*.AppImage*
...@@ -38,7 +38,7 @@ script: ...@@ -38,7 +38,7 @@ script:
- ./linuxdeployqt-continuous-x86_64.AppImage build/appdir/usr/share/applications/*.desktop -appimage - ./linuxdeployqt-continuous-x86_64.AppImage build/appdir/usr/share/applications/*.desktop -appimage
after_success: after_success:
- wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh - wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
- bash upload.sh Luppp*.AppImage* - bash upload.sh Loopp*.AppImage*
branches: branches:
except: except:
#- Do not build tags that we create when we upload to GitHub Releases #- Do not build tags that we create when we upload to GitHub Releases
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
## Features: ## Features:
* Print version number with `luppp --version` * Print version number with `loopp --version`
## Improvements: ## Improvements:
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
# 1.1: Saturday 24th December 2016 # 1.1: Saturday 24th December 2016
## Features: ## Features:
* Added saveDirectory option to set the save dir for Luppp sessions * Added saveDirectory option to set the save dir for Loopp sessions
* Added possibility to enable metronom on startup and set volume * Added possibility to enable metronom on startup and set volume
* Added possibility to save clips * Added possibility to save clips
* Added per track outputs * Added per track outputs
......
cmake_minimum_required (VERSION 2.6) cmake_minimum_required (VERSION 2.6)
project (LUPPP) project (LOOPP)
set(LUPPP_VERSION_MAJOR "1") set(LOOPP_VERSION_MAJOR "1")
set(LUPPP_VERSION_MINOR "2") set(LOOPP_VERSION_MINOR "2")
set(LUPPP_VERSION_PATCH "0") set(LOOPP_VERSION_PATCH "0")
set(LUPPP_VERSION "${LUPPP_VERSION_MAJOR}.${LUPPP_VERSION_MINOR}.${LUPPP_VERSION_PATCH}") set(LOOPP_VERSION "${LOOPP_VERSION_MAJOR}.${LOOPP_VERSION_MINOR}.${LOOPP_VERSION_PATCH}")
option(BUILD_TESTS "Build test version" OFF) option(BUILD_TESTS "Build test version" OFF)
option(WITH_ASAN "Build address sanitized version" OFF) option(WITH_ASAN "Build address sanitized version" OFF)
......
...@@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8 ...@@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8
# title of most generated pages and in a few other places. # title of most generated pages and in a few other places.
# The default value is: My Project. # The default value is: My Project.
PROJECT_NAME = "openAV - Luppp" PROJECT_NAME = "openAV - Loopp"
# The PROJECT_NUMBER tag can be used to enter a project or revision number. This # The PROJECT_NUMBER tag can be used to enter a project or revision number. This
# could be handy for archiving the generated documentation or if some version # could be handy for archiving the generated documentation or if some version
...@@ -51,7 +51,7 @@ PROJECT_BRIEF = ...@@ -51,7 +51,7 @@ PROJECT_BRIEF =
# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
# the logo to the output directory. # the logo to the output directory.
PROJECT_LOGO = resources/icons/luppp.svg PROJECT_LOGO = resources/icons/loopp.svg
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
# into which the generated documentation will be written. If a relative path is # into which the generated documentation will be written. If a relative path is
......
Thanks for looking into packaging Luppp: Thanks for looking into packaging Loopp:
OpenAV couldn't possibly package for every distro, OpenAV couldn't possibly package for every distro,
your work is apprecatied! your work is apprecatied!
...@@ -10,10 +10,10 @@ Notes for packaging: ...@@ -10,10 +10,10 @@ Notes for packaging:
=== Controllers directory === Controllers directory
Install controllers directory (and contents) to Install controllers directory (and contents) to
/usr/share/luppp/controllers /usr/share/loopp/controllers
Result: dir: /usr/share/luppp/controllers/ Result: dir: /usr/share/loopp/controllers/
files: /usr/share/luppp/controllers/<filename>.ctlr files: /usr/share/loopp/controllers/<filename>.ctlr
=== Questions === Questions
......
#!/bin/bash #!/bin/bash
./version.sh ./version.sh
git archive HEAD --prefix=luppp-beta/ --format=zip > lupppGit_`date +"%d-%m-%Y"`_`git log --pretty=format:"%h" | head -n1`.zip git archive HEAD --prefix=loopp-beta/ --format=zip > looppGit_`date +"%d-%m-%Y"`_`git log --pretty=format:"%h" | head -n1`.zip
project( 'openav_luppp', ['c','cpp'], project( 'openav_loopp', ['c','cpp'],
default_options : [ default_options : [
'cpp_std=c++11', 'cpp_std=c++11',
]) ])
...@@ -18,7 +18,7 @@ add_project_arguments('-Wno-sign-compare', language : 'cpp') ...@@ -18,7 +18,7 @@ add_project_arguments('-Wno-sign-compare', language : 'cpp')
cc = meson.get_compiler('c') cc = meson.get_compiler('c')
cpp = meson.get_compiler('cpp') cpp = meson.get_compiler('cpp')
luppp_src = [] loopp_src = []
subdir('src') subdir('src')
...@@ -38,7 +38,7 @@ foreach dep : dep_names ...@@ -38,7 +38,7 @@ foreach dep : dep_names
endforeach endforeach
# compile the main project # compile the main project
exe = executable('luppp', luppp_src + [version_hxx], exe = executable('loopp', loopp_src + [version_hxx],
install: true, install: true,
dependencies: deps) dependencies: deps)
...@@ -46,6 +46,6 @@ if get_option('unitTests') ...@@ -46,6 +46,6 @@ if get_option('unitTests')
test('Unit Tests', exe, args : ['-r junit', '-o junit.xml']) test('Unit Tests', exe, args : ['-r junit', '-o junit.xml'])
endif endif
install_data('resources/metadata/luppp.desktop', install_dir: 'share/applications') install_data('resources/metadata/loopp.desktop', install_dir: 'share/applications')
install_data('resources/metadata/luppp.appdata.xml', install_dir: 'share/appdata') install_data('resources/metadata/loopp.appdata.xml', install_dir: 'share/appdata')
install_data('resources/icons/luppp.png', install_dir: 'share/pixmaps') install_data('resources/icons/loopp.png', install_dir: 'share/pixmaps')
/* GIMP RGBA C-Source image dump (luppp.c) */ /* GIMP RGBA C-Source image dump (LOOPP.c) */
static const struct { static const struct {
unsigned int width; unsigned int width;
unsigned int height; unsigned int height;
unsigned int bytes_per_pixel; /* 2:RGB16, 3:RGB, 4:RGBA */ unsigned int bytes_per_pixel; /* 2:RGB16, 3:RGB, 4:RGBA */
unsigned char pixel_data[130 * 36 * 4 + 1]; unsigned char pixel_data[130 * 36 * 4 + 1];
} lupppImg = { } looppImg = {
130, 36, 4, 130, 36, 4,
"(((\377(((\377(((\377(((\377(((\377(((\377(((\377(((\377(((\377(((\377((" "(((\377(((\377(((\377(((\377(((\377(((\377(((\377(((\377(((\377(((\377(("
"(\377(((\377(()\377(((\377)((\377)((\377(((\377(((\377(((\377(((\377(((\377" "(\377(((\377(()\377(((\377)((\377)((\377(((\377(((\377(((\377(((\377(((\377"
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
version="1.1" version="1.1"
id="svg8" id="svg8"
inkscape:version="0.92.1 r15371" inkscape:version="0.92.1 r15371"
sodipodi:docname="luppp.svg"> sodipodi:docname="loopp.svg">
<defs <defs
id="defs2"> id="defs2">
<linearGradient <linearGradient
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<application> <application>
<id type="desktop">luppp.desktop</id> <id type="desktop">loopp.desktop</id>
<licence>CC0</licence> <licence>CC0</licence>
<name>OpenAV Luppp</name> <name>OpenAV Loopp</name>
<description> <description>
<p> <p>
Luppp is a music creation tool, intended for live use. It Loopp is a music creation tool, intended for live use. It
focuses on real time processing and a fast intuitive focuses on real time processing and a fast intuitive
workflow. It has been developed since December 2011, and many workflow. It has been developed since December 2011, and many
iterations of development have been completed. Luppp iterations of development have been completed. Loopp
uses jack for audio output. uses jack for audio output.
</p> </p>
<p xml:lang="fr"> <p xml:lang="fr">
Luppp est un outil de création musicale pensé pour une Loopp est un outil de création musicale pensé pour une
utilisation live. Il se concentre sur l'utilisation en utilisation live. Il se concentre sur l'utilisation en
temps-réel et une expérience utilisateur intuitive et temps-réel et une expérience utilisateur intuitive et
rapide. Il est en développement depuis Décembre 2011, et rapide. Il est en développement depuis Décembre 2011, et
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
</description> </description>
<screenshots> <screenshots>
<!-- the width and height are optional, but suggested --> <!-- the width and height are optional, but suggested -->
<screenshot type="default" width="1110" height="650">https://raw.github.com/harryhaaren/openAV-Luppp/master/resources/screenshots/1.0.png</screenshot> <screenshot type="default" width="1110" height="650">https://raw.github.com/harryhaaren/openAV-Loopp/master/resources/screenshots/1.0.png</screenshot>
</screenshots> </screenshots>
<url type="homepage">http://openavproductions.com/luppp</url> <url type="homepage">http://openavproductions.com/loopp</url>
<updatecontact>zbyszek@in.waw.pl</updatecontact> <updatecontact>zbyszek@in.waw.pl</updatecontact>
</application> </application>
[Desktop Entry] [Desktop Entry]
Name=Luppp Name=Loopp
GenericName=Live performance mixing tool GenericName=Live performance mixing tool
GenericName[fr]=Outil de mixage pour performance live GenericName[fr]=Outil de mixage pour performance live
Comment=Create music by recording, playing, and mixing samples Comment=Create music by recording, playing, and mixing samples
Comment[fr]=Créer de la musique en enregistrant, jouant, et mixant des échantillons Comment[fr]=Créer de la musique en enregistrant, jouant, et mixant des échantillons
Type=Application Type=Application
Categories=Audio;AudioVideo; Categories=Audio;AudioVideo;
Exec=luppp Exec=loopp
Terminal=false Terminal=false
StartupNotify=true StartupNotify=true
Icon=luppp Icon=loopp
X-NSM-capable=true X-NSM-capable=true
...@@ -68,29 +68,29 @@ endif() ...@@ -68,29 +68,29 @@ endif()
FILE(GLOB sources *.cxx avtk/*.cxx cjson/*.c controller/*.cxx dsp/*.cxx observer/*.cxx state/*.cxx tests/*.cxx) FILE(GLOB sources *.cxx avtk/*.cxx cjson/*.c controller/*.cxx dsp/*.cxx observer/*.cxx state/*.cxx tests/*.cxx)
# Compile binary # Compile binary
add_executable (luppp version.hxx ${sources} ) add_executable (loopp version.hxx ${sources} )
# require a C++11 compiler # require a C++11 compiler
set_target_properties(luppp PROPERTIES set_target_properties(loopp PROPERTIES
CXX_STANDARD 11 CXX_STANDARD 11
CXX_STANDARD_REQUIRED YES CXX_STANDARD_REQUIRED YES
CXX_EXTENSIONS NO CXX_EXTENSIONS NO
) )
# Linking # Linking
target_link_libraries( luppp ${JACK_LIBRARIES} ) target_link_libraries( loopp ${JACK_LIBRARIES} )
target_link_libraries( luppp ${LIBLO_LIBRARIES} ) target_link_libraries( loopp ${LIBLO_LIBRARIES} )
target_link_libraries( luppp ${NTK_LIBRARIES} ) target_link_libraries( loopp ${NTK_LIBRARIES} )
target_link_libraries( luppp ${CAIRO_LIBRARIES} ) target_link_libraries( loopp ${CAIRO_LIBRARIES} )
target_link_libraries( luppp ${SNDFILE_LIBRARIES} ) target_link_libraries( loopp ${SNDFILE_LIBRARIES} )
target_link_libraries( luppp ${SAMPLERATE_LIBRARIES} ) target_link_libraries( loopp ${SAMPLERATE_LIBRARIES} )
target_link_libraries( luppp ${X11_LIBRARIES} ) target_link_libraries( loopp ${X11_LIBRARIES} )
# Check build type, linking with gcov for code analysis if needed # Check build type, linking with gcov for code analysis if needed
IF(BUILD_TESTS) IF(BUILD_TESTS)
target_link_libraries(luppp gcov) target_link_libraries(loopp gcov)
ENDIF(BUILD_TESTS) ENDIF(BUILD_TESTS)
# add the install targets # add the install targets
install (TARGETS luppp DESTINATION bin) install (TARGETS loopp DESTINATION bin)
...@@ -108,7 +108,7 @@ long AudioBuffer::getAudioFrames() ...@@ -108,7 +108,7 @@ long AudioBuffer::getAudioFrames()
long AudioBuffer::getSize() long AudioBuffer::getSize()
{ {
if(bufferL.size() != bufferR.size()) { if(bufferL.size() != bufferR.size()) {
LUPPP_WARN("left and right channels of audio buffer have different size: %i vs %i", bufferL.size(), bufferR.size() ); LOOPP_WARN("left and right channels of audio buffer have different size: %i vs %i", bufferL.size(), bufferR.size() );
} }
return std::min(bufferL.size(), bufferR.size()); return std::min(bufferL.size(), bufferR.size());
} }
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef LUPPP_AUDIOBUFFER_H #ifndef LOOPP_AUDIOBUFFER_H
#define LUPPP_AUDIOBUFFER_H #define LOOPP_AUDIOBUFFER_H
#include <vector> #include <vector>
#include <string> #include <string>
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef LUPPP_AUDIO_PROCESSOR_H #ifndef LOOPP_AUDIO_PROCESSOR_H
#define LUPPP_AUDIO_PROCESSOR_H #define LOOPP_AUDIO_PROCESSOR_H
#include <stdio.h> #include <stdio.h>
...@@ -49,5 +49,5 @@ public: ...@@ -49,5 +49,5 @@ public:
virtual ~AudioProcessor() {}; virtual ~AudioProcessor() {};
}; };
#endif // LUPPP_AUDIO_PROCESSOR_H #endif // LOOPP_AUDIO_PROCESSOR_H
luppp_src += files( 'bindings.cxx', 'volume.cxx', 'clipselector.cxx') loopp_src += files( 'bindings.cxx', 'volume.cxx', 'clipselector.cxx')
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef LUPPP_BUFFERS_H #ifndef LOOPP_BUFFERS_H
#define LUPPP_BUFFERS_H #define LOOPP_BUFFERS_H
#include <cstring> #include <cstring>
#include <jack/transport.h> #include <jack/transport.h>
...@@ -151,5 +151,5 @@ public: ...@@ -151,5 +151,5 @@ public:
}; };
#endif // LUPPP_BUFFERS_H #endif // LOOPP_BUFFERS_H
luppp_src += files('cJSON.c') loopp_src += files('cJSON.c')
...@@ -16,12 +16,12 @@ ...@@ -16,12 +16,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef LUPPP_CONFIG_H #ifndef LOOPP_CONFIG_H
#define LUPPP_CONFIG_H #define LOOPP_CONFIG_H
/// PROGAM WIDE DEFINES /// PROGAM WIDE DEFINES
#define NAME "Luppp" #define NAME "Loopp"
#pragma GCC diagnostic ignored "-Wunused-parameter" #pragma GCC diagnostic ignored "-Wunused-parameter"
...@@ -65,9 +65,9 @@ ...@@ -65,9 +65,9 @@
#define LOOPER_SAMPLES_BEFORE_REQUEST 44100 #define LOOPER_SAMPLES_BEFORE_REQUEST 44100
#define LOOPER_SAMPLES_UPDATE_SIZE 44100 #define LOOPER_SAMPLES_UPDATE_SIZE 44100
#define LUPPP_RETURN_OK 0 #define LOOPP_RETURN_OK 0
#define LUPPP_RETURN_WARNING 1 #define LOOPP_RETURN_WARNING 1
#define LUPPP_RETURN_ERROR 2 #define LOOPP_RETURN_ERROR 2
// Smoothing value // Smoothing value
#define SMOOTHING_CONST 0.005 #define SMOOTHING_CONST 0.005
...@@ -76,5 +76,5 @@ ...@@ -76,5 +76,5 @@
#include "debug.hxx" #include "debug.hxx"
#endif // LUPPP_CONFIG_H #endif // LOOPP_CONFIG_H
...@@ -17,13 +17,13 @@ ...@@ -17,13 +17,13 @@
*/ */
#ifndef LUPPP_BINDING_H #ifndef LOOPP_BINDING_H
#define LUPPP_BINDING_H #define LOOPP_BINDING_H
#include <map> #include <map>
/// a LupppAction represents the Event type, as from Event.hxx /// a LooppAction represents the Event type, as from Event.hxx
typedef int LupppAction; typedef int LooppAction;
class Binding class Binding
{ {
...@@ -41,7 +41,7 @@ public: ...@@ -41,7 +41,7 @@ public:
/// the action this binding relates to: this is an integer based on the /// the action this binding relates to: this is an integer based on the
/// event.hxx enumeration of event types /// event.hxx enumeration of event types
LupppAction action; LooppAction action;
/// arguments to the event: track number, scene number etc /// arguments to the event: track number, scene number etc
int active; int active;
......
...@@ -17,15 +17,15 @@ ...@@ -17,15 +17,15 @@
*/ */
#ifndef LUPPP_CONTROLLER_H #ifndef LOOPP_CONTROLLER_H
#define LUPPP_CONTROLLER_H #define LOOPP_CONTROLLER_H
#include <string> #include <string>
#include "../gridlogic.hxx" #include "../gridlogic.hxx"
/** Controller /** Controller
* This is the base class for any device that interacts with Luppp. * This is the base class for any device that interacts with Loopp.
* Overriding the virtual functions allows the subclass to be notified about * Overriding the virtual functions allows the subclass to be notified about
* that event type. To provide input, #include gridlogic.hxx and logic.hxx * that event type. To provide input, #include gridlogic.hxx and logic.hxx
**/ **/
...@@ -100,5 +100,5 @@ private: ...@@ -100,5 +100,5 @@ private:
int ID; int ID;
}; };
#endif // LUPPP_CONTROLLER_H #endif // LOOPP_CONTROLLER_H
...@@ -38,7 +38,7 @@ GenericMIDI::GenericMIDI(int waste, std::string n) : ...@@ -38,7 +38,7 @@ GenericMIDI::GenericMIDI(int waste, std::string n) :
Controller(), Controller(),
MidiIO() MidiIO()
{ {
LUPPP_NOTE("Adding GenericMIDI %s", n.c_str() ); LOOPP_NOTE("Adding GenericMIDI %s", n.c_str() );
name = n; name = n;
registerMidiPorts( name ); registerMidiPorts( name );
stat = CONTROLLER_OK; stat = CONTROLLER_OK;
...@@ -49,7 +49,7 @@ GenericMIDI::GenericMIDI(int waste, std::string n) : ...@@ -49,7 +49,7 @@ GenericMIDI::GenericMIDI(int waste, std::string n) :
void GenericMIDI::setFootswitchToNextScene(int v) void GenericMIDI::setFootswitchToNextScene(int v)
{ {
LUPPP_NOTE("Set Footswitch to %i", v ); LOOPP_NOTE("Set Footswitch to %i", v );
if ( v == 0 ) { if ( v == 0 ) {
footswitchNextScene = false; footswitchNextScene = false;
footswitchPrevScene = false; footswitchPrevScene = false;
...@@ -77,12 +77,12 @@ GenericMIDI::GenericMIDI(std::string file) : ...@@ -77,12 +77,12 @@ GenericMIDI::GenericMIDI(std::string file) :
// load the JSON config file // load the JSON config file
int result = loadController( file ); int result = loadController( file );
if ( result == LUPPP_RETURN_OK ) { if ( result == LOOPP_RETURN_OK ) {
LUPPP_NOTE("GenericMIDI registering ports: %s", name.c_str() ); LOOPP_NOTE("GenericMIDI registering ports: %s", name.c_str() );
registerMidiPorts( name ); registerMidiPorts( name );
stat = CONTROLLER_OK; stat = CONTROLLER_OK;
} else { } else {
LUPPP_ERROR("Error in loading controller map!" ); LOOPP_ERROR("Error in loading controller map!" );
stat = CONTROLLER_ERROR; stat = CONTROLLER_ERROR;
} }
} }
...@@ -106,7 +106,7 @@ int GenericMIDI::registerComponents() ...@@ -106,7 +106,7 @@ int GenericMIDI::registerComponents()
jack->registerMidiIO( m ); jack->registerMidiIO( m );
return LUPPP_RETURN_OK; return LOOPP_RETURN_OK;
} }
std::string GenericMIDI::getName() std::string GenericMIDI::getName()
...@@ -212,7 +212,7 @@ void GenericMIDI::midi(unsigned char* midi) ...@@ -212,7 +212,7 @@ void GenericMIDI::midi(unsigned char* midi)
// create new MIDI binding? // create new MIDI binding?
if ( jack->bindingEventRecordEnable ) { if ( jack->bindingEventRecordEnable ) {
//LUPPP_NOTE("making binding from: %i %i %f", status, data, value ); //LOOPP_NOTE("making binding from: %i %i %f", status, data, value );
setupBinding( jack->bindingEventType, status, data, setupBinding( jack->bindingEventType, status, data,
jack->bindingTrack, jack->bindingTrack,
jack->bindingScene, jack->bindingScene,
...@@ -247,7 +247,7 @@ void GenericMIDI::midi(unsigned char* midi) ...@@ -247,7 +247,7 @@ void GenericMIDI::midi(unsigned char* midi)
Binding* b = midiToAction.at(i); Binding* b = midiToAction.at(i);
if ( b->status == status && b->data == data ) {