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 @@
planning/*
src/*.o
luppp
loopp
*.zip
*.orig
......@@ -14,7 +14,7 @@ buildTest/*
/doc
/Makefile
/src/cmake_install.cmake
/src/liblibluppp.a
/src/liblibloopp.a
/src/Makefile
CMakeFiles/*
src/CMakeFiles/*
......
......@@ -51,7 +51,7 @@ test:
- build-test
script:
- 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:
paths:
- buildDir/coverage.txt
......@@ -74,4 +74,4 @@ package-AppImage:
untracked: false
expire_in: 30 days
paths:
- Luppp-*.AppImage*
- Loopp-*.AppImage*
......@@ -38,7 +38,7 @@ script:
- ./linuxdeployqt-continuous-x86_64.AppImage build/appdir/usr/share/applications/*.desktop -appimage
after_success:
- wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
- bash upload.sh Luppp*.AppImage*
- bash upload.sh Loopp*.AppImage*
branches:
except:
#- Do not build tags that we create when we upload to GitHub Releases
......
......@@ -15,7 +15,7 @@
## Features:
* Print version number with `luppp --version`
* Print version number with `loopp --version`
## Improvements:
......@@ -69,7 +69,7 @@
# 1.1: Saturday 24th December 2016
## 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 save clips
* Added per track outputs
......
cmake_minimum_required (VERSION 2.6)
project (LUPPP)
project (LOOPP)
set(LUPPP_VERSION_MAJOR "1")
set(LUPPP_VERSION_MINOR "2")
set(LUPPP_VERSION_PATCH "0")
set(LOOPP_VERSION_MAJOR "1")
set(LOOPP_VERSION_MINOR "2")
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(WITH_ASAN "Build address sanitized version" OFF)
......
......@@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8
# title of most generated pages and in a few other places.
# 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
# could be handy for archiving the generated documentation or if some version
......@@ -51,7 +51,7 @@ PROJECT_BRIEF =
# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
# 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
# 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,
your work is apprecatied!
......@@ -10,10 +10,10 @@ Notes for packaging:
=== Controllers directory
Install controllers directory (and contents) to
/usr/share/luppp/controllers
/usr/share/loopp/controllers
Result: dir: /usr/share/luppp/controllers/
files: /usr/share/luppp/controllers/<filename>.ctlr
Result: dir: /usr/share/loopp/controllers/
files: /usr/share/loopp/controllers/<filename>.ctlr
=== Questions
......
#!/bin/bash
./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 : [
'cpp_std=c++11',
])
......@@ -18,7 +18,7 @@ add_project_arguments('-Wno-sign-compare', language : 'cpp')
cc = meson.get_compiler('c')
cpp = meson.get_compiler('cpp')
luppp_src = []
loopp_src = []
subdir('src')
......@@ -38,7 +38,7 @@ foreach dep : dep_names
endforeach
# compile the main project
exe = executable('luppp', luppp_src + [version_hxx],
exe = executable('loopp', loopp_src + [version_hxx],
install: true,
dependencies: deps)
......@@ -46,6 +46,6 @@ if get_option('unitTests')
test('Unit Tests', exe, args : ['-r junit', '-o junit.xml'])
endif
install_data('resources/metadata/luppp.desktop', install_dir: 'share/applications')
install_data('resources/metadata/luppp.appdata.xml', install_dir: 'share/appdata')
install_data('resources/icons/luppp.png', install_dir: 'share/pixmaps')
install_data('resources/metadata/loopp.desktop', install_dir: 'share/applications')
install_data('resources/metadata/loopp.appdata.xml', install_dir: 'share/appdata')
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 {
unsigned int width;
unsigned int height;
unsigned int bytes_per_pixel; /* 2:RGB16, 3:RGB, 4:RGBA */
unsigned char pixel_data[130 * 36 * 4 + 1];
} lupppImg = {
} looppImg = {
130, 36, 4,
"(((\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 @@
version="1.1"
id="svg8"
inkscape:version="0.92.1 r15371"
sodipodi:docname="luppp.svg">
sodipodi:docname="loopp.svg">
<defs
id="defs2">
<linearGradient
......
<?xml version="1.0" encoding="UTF-8"?>
<application>
<id type="desktop">luppp.desktop</id>
<id type="desktop">loopp.desktop</id>
<licence>CC0</licence>
<name>OpenAV Luppp</name>
<name>OpenAV Loopp</name>
<description>
<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
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.
</p>
<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
temps-réel et une expérience utilisateur intuitive et
rapide. Il est en développement depuis Décembre 2011, et
......@@ -22,8 +22,8 @@
</description>
<screenshots>
<!-- 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>
<url type="homepage">http://openavproductions.com/luppp</url>
<url type="homepage">http://openavproductions.com/loopp</url>
<updatecontact>zbyszek@in.waw.pl</updatecontact>
</application>
[Desktop Entry]
Name=Luppp
Name=Loopp
GenericName=Live performance mixing tool
GenericName[fr]=Outil de mixage pour performance live
Comment=Create music by recording, playing, and mixing samples
Comment[fr]=Créer de la musique en enregistrant, jouant, et mixant des échantillons
Type=Application
Categories=Audio;AudioVideo;
Exec=luppp
Exec=loopp
Terminal=false
StartupNotify=true
Icon=luppp
Icon=loopp
X-NSM-capable=true
......@@ -68,29 +68,29 @@ endif()
FILE(GLOB sources *.cxx avtk/*.cxx cjson/*.c controller/*.cxx dsp/*.cxx observer/*.cxx state/*.cxx tests/*.cxx)
# Compile binary
add_executable (luppp version.hxx ${sources} )
add_executable (loopp version.hxx ${sources} )
# require a C++11 compiler
set_target_properties(luppp PROPERTIES
set_target_properties(loopp PROPERTIES
CXX_STANDARD 11
CXX_STANDARD_REQUIRED YES
CXX_EXTENSIONS NO
)
# Linking
target_link_libraries( luppp ${JACK_LIBRARIES} )
target_link_libraries( luppp ${LIBLO_LIBRARIES} )
target_link_libraries( luppp ${NTK_LIBRARIES} )
target_link_libraries( luppp ${CAIRO_LIBRARIES} )
target_link_libraries( luppp ${SNDFILE_LIBRARIES} )
target_link_libraries( luppp ${SAMPLERATE_LIBRARIES} )
target_link_libraries( luppp ${X11_LIBRARIES} )
target_link_libraries( loopp ${JACK_LIBRARIES} )
target_link_libraries( loopp ${LIBLO_LIBRARIES} )
target_link_libraries( loopp ${NTK_LIBRARIES} )
target_link_libraries( loopp ${CAIRO_LIBRARIES} )
target_link_libraries( loopp ${SNDFILE_LIBRARIES} )
target_link_libraries( loopp ${SAMPLERATE_LIBRARIES} )
target_link_libraries( loopp ${X11_LIBRARIES} )
# Check build type, linking with gcov for code analysis if needed
IF(BUILD_TESTS)
target_link_libraries(luppp gcov)
target_link_libraries(loopp gcov)
ENDIF(BUILD_TESTS)
# add the install targets
install (TARGETS luppp DESTINATION bin)
install (TARGETS loopp DESTINATION bin)
......@@ -108,7 +108,7 @@ long AudioBuffer::getAudioFrames()
long AudioBuffer::getSize()
{
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());
}
......
......@@ -16,8 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LUPPP_AUDIOBUFFER_H
#define LUPPP_AUDIOBUFFER_H
#ifndef LOOPP_AUDIOBUFFER_H
#define LOOPP_AUDIOBUFFER_H
#include <vector>
#include <string>
......
......@@ -16,8 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LUPPP_AUDIO_PROCESSOR_H
#define LUPPP_AUDIO_PROCESSOR_H
#ifndef LOOPP_AUDIO_PROCESSOR_H
#define LOOPP_AUDIO_PROCESSOR_H
#include <stdio.h>
......@@ -49,5 +49,5 @@ public:
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 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LUPPP_BUFFERS_H
#define LUPPP_BUFFERS_H
#ifndef LOOPP_BUFFERS_H
#define LOOPP_BUFFERS_H
#include <cstring>
#include <jack/transport.h>
......@@ -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 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LUPPP_CONFIG_H
#define LUPPP_CONFIG_H
#ifndef LOOPP_CONFIG_H
#define LOOPP_CONFIG_H
/// PROGAM WIDE DEFINES
#define NAME "Luppp"
#define NAME "Loopp"
#pragma GCC diagnostic ignored "-Wunused-parameter"
......@@ -65,9 +65,9 @@
#define LOOPER_SAMPLES_BEFORE_REQUEST 44100
#define LOOPER_SAMPLES_UPDATE_SIZE 44100
#define LUPPP_RETURN_OK 0
#define LUPPP_RETURN_WARNING 1
#define LUPPP_RETURN_ERROR 2
#define LOOPP_RETURN_OK 0
#define LOOPP_RETURN_WARNING 1
#define LOOPP_RETURN_ERROR 2
// Smoothing value
#define SMOOTHING_CONST 0.005
......@@ -76,5 +76,5 @@
#include "debug.hxx"
#endif // LUPPP_CONFIG_H
#endif // LOOPP_CONFIG_H
......@@ -17,13 +17,13 @@
*/
#ifndef LUPPP_BINDING_H
#define LUPPP_BINDING_H
#ifndef LOOPP_BINDING_H
#define LOOPP_BINDING_H
#include <map>
/// a LupppAction represents the Event type, as from Event.hxx
typedef int LupppAction;
/// a LooppAction represents the Event type, as from Event.hxx
typedef int LooppAction;
class Binding
{
......@@ -41,7 +41,7 @@ public:
/// the action this binding relates to: this is an integer based on the
/// event.hxx enumeration of event types
LupppAction action;
LooppAction action;
/// arguments to the event: track number, scene number etc
int active;
......
......@@ -17,15 +17,15 @@
*/
#ifndef LUPPP_CONTROLLER_H
#define LUPPP_CONTROLLER_H
#ifndef LOOPP_CONTROLLER_H
#define LOOPP_CONTROLLER_H
#include <string>
#include "../gridlogic.hxx"
/** 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
* that event type. To provide input, #include gridlogic.hxx and logic.hxx
**/
......@@ -100,5 +100,5 @@ private:
int ID;
};
#endif // LUPPP_CONTROLLER_H
#endif // LOOPP_CONTROLLER_H
......@@ -38,7 +38,7 @@ GenericMIDI::GenericMIDI(int waste, std::string n) :
Controller(),
MidiIO()
{
LUPPP_NOTE("Adding GenericMIDI %s", n.c_str() );
LOOPP_NOTE("Adding GenericMIDI %s", n.c_str() );
name = n;
registerMidiPorts( name );
stat = CONTROLLER_OK;
......@@ -49,7 +49,7 @@ GenericMIDI::GenericMIDI(int waste, std::string n) :
void GenericMIDI::setFootswitchToNextScene(int v)
{
LUPPP_NOTE("Set Footswitch to %i", v );
LOOPP_NOTE("Set Footswitch to %i", v );
if ( v == 0 ) {
footswitchNextScene = false;
footswitchPrevScene = false;
......@@ -77,12 +77,12 @@ GenericMIDI::GenericMIDI(std::string file) :
// load the JSON config file
int result = loadController( file );
if ( result == LUPPP_RETURN_OK ) {
LUPPP_NOTE("GenericMIDI registering ports: %s", name.c_str() );
if ( result == LOOPP_RETURN_OK ) {
LOOPP_NOTE("GenericMIDI registering ports: %s", name.c_str() );
registerMidiPorts( name );
stat = CONTROLLER_OK;
} else {
LUPPP_ERROR("Error in loading controller map!" );
LOOPP_ERROR("Error in loading controller map!" );
stat = CONTROLLER_ERROR;
}
}
......@@ -106,7 +106,7 @@ int GenericMIDI::registerComponents()
jack->registerMidiIO( m );
return LUPPP_RETURN_OK;
return LOOPP_RETURN_OK;
}
std::string GenericMIDI::getName()
......@@ -212,7 +212,7 @@ void GenericMIDI::midi(unsigned char* midi)
// create new MIDI binding?
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,
jack->bindingTrack,
jack->bindingScene,
......@@ -247,7 +247,7 @@ void GenericMIDI::midi(unsigned char* midi)
Binding* b = midiToAction.at(i);
if ( b->status == status && b->data == data ) {
//LUPPP_NOTE("Executing action %s, send %i value %f, b->active %i", Event::getPrettyName(b->action), b->send, value, int(b->active) );
//LOOPP_NOTE("Executing action %s, send %i value %f, b->active %i", Event::getPrettyName(b->action), b->send, value, int(b->active) );
switch( b->action ) {
case Event::TRACK_VOLUME:
......@@ -308,11 +308,11 @@ void GenericMIDI::midi(unsigned char* midi)
jack->getLogic()->masterInputVol( value );
break;
case Event::MASTER_INPUT_TO:
//LUPPP_NOTE("GenMidi event INPUT_TO %i", b->send );
//LOOPP_NOTE("GenMidi event INPUT_TO %i", b->send );
jack->getLogic()->masterInputTo( b->send, value );
break;
case Event::MASTER_INPUT_TO_ACTIVE:
//LUPPP_NOTE("GenMidi event INPUT_TO_ACTIVE %i", b->send );
//LOOPP_NOTE("GenMidi event INPUT_TO_ACTIVE %i", b->send );
jack->getLogic()->masterInputToActive( b->send, b->active );
break;
......@@ -360,7 +360,7 @@ void GenericMIDI::setSceneState(int t, int scene, GridLogic::State s)
data[1] = b->data;
data[2] = it->second;
//LUPPP_NOTE("GenericMIDI::sceneState() writing event %i, %i, %i", data[0],data[1],data[2] );
//LOOPP_NOTE("GenericMIDI::sceneState() writing event %i, %i, %i", data[0],data[1],data[2] );
writeMidi( data );
}
}
......@@ -396,7 +396,7 @@ void GenericMIDI::launchScene( int scene )
data[1] = b->data;
data[2] = (i == scene) * 127;
//LUPPP_NOTE("this = %i GenericMIDI::launchScene()", this );
//LOOPP_NOTE("this = %i GenericMIDI::launchScene()", this );
writeMidi( data );
}
}
......@@ -409,7 +409,7 @@ int GenericMIDI::loadController( std::string file )
/// open and read whole file
#ifdef DEBUG_CONTROLLER
LUPPP_NOTE("%s%s","Loading controller : ", file.c_str() );
LOOPP_NOTE("%s%s","Loading controller : ", file.c_str() );
#endif
std::ifstream sampleFile( file.c_str(), std::ios_base::in|std::ios_base::ate);
long file_length = sampleFile.tellg();
......@@ -427,37 +427,37 @@ int GenericMIDI::loadController( std::string file )
std::string line;
std::getline( ss, line );
LUPPP_ERROR("%s %s","Error in JSON *before*: ", line.c_str() );
LOOPP_ERROR("%s %s","Error in JSON *before*: ", line.c_str() );
for(int i = 0; i < 5; i++) {
std::getline( ss, line );
LUPPP_ERROR("%s %s","Error in JSON : ", line.c_str() );
LOOPP_ERROR("%s %s","Error in JSON : ", line.c_str() );
}
return LUPPP_RETURN_ERROR;
return LOOPP_RETURN_ERROR;
}
cJSON* nameJson = cJSON_GetObjectItem( controllerJson, "name" );
if ( nameJson ) {
name = nameJson->valuestring;
LUPPP_NOTE("Device %s", name.c_str() );
LOOPP_NOTE("Device %s", name.c_str() );
} else {
LUPPP_NOTE("Has no name field");
LOOPP_NOTE("Has no name field");
}
cJSON* authorJson = cJSON_GetObjectItem( controllerJson, "author" );
if ( authorJson ) {
author = authorJson->valuestring;
LUPPP_NOTE("Author %s", author.c_str() );
LOOPP_NOTE("Author %s", author.c_str() );
} else {
LUPPP_NOTE("Has no author field");
LOOPP_NOTE("Has no author field");
}
cJSON* linkJson = cJSON_GetObjectItem( controllerJson, "link" );
if ( linkJson ) {
email = linkJson->valuestring;
LUPPP_NOTE("Link %s", email.c_str() );
LOOPP_NOTE("Link %s", email.c_str() );
} else {
LUPPP_NOTE("Has no link field");
LOOPP_NOTE("Has no link field");
}
......@@ -474,12 +474,12 @@ int GenericMIDI::loadController( std::string file )
nInputBindings++;
}
} else {
LUPPP_WARN("No input bindings array in .ctlr map." );
LOOPP_WARN("No input bindings array in .ctlr map." );
nInputBindings++; // hack to avoid 2 prints
}
if ( nInputBindings == 0 ) {
LUPPP_NOTE("Zero input bindings present in .ctlr map.");
LOOPP_NOTE("Zero input bindings present in .ctlr map.");
}
......@@ -494,35 +494,35 @@ int GenericMIDI::loadController( std::string file )
actionToMidi.push_back( tmp );
nOutputBindings++;
//LUPPP_NOTE("Binding from %s to %i %i", actionJ->valuestring, statusJson->valueint, dataJson->valueint );
//LOOPP_NOTE("Binding from %s to %i %i", actionJ->valuestring, statusJson->valueint, dataJson->valueint );
}
} else {
LUPPP_NOTE("No output bindings array in .ctlr map." );
LOOPP_NOTE("No output bindings array in .ctlr map." );
nOutputBindings++; // hack to avoid 2 prints
}
if ( nOutputBindings == 0 ) {
LUPPP_NOTE("Zero output bindings present in .ctlr map." );
LOOPP_NOTE("Zero output bindings present in .ctlr map." );
}
cJSON_Delete( controllerJson );
delete[] sampleString;
} else {
LUPPP_WARN("%s %s","No controller file found at ", file.c_str() );
return LUPPP_RETURN_WARNING;
LOOPP_WARN("%s %s","No controller file found at ", file.c_str() );
return LOOPP_RETURN_WARNING;
}
LUPPP_NOTE("Controller loading complete." );
LOOPP_NOTE("Controller loading complete." );
return LUPPP_RETURN_OK;
return LOOPP_RETURN_OK;
}
void GenericMIDI::removeBinding( int bindingID )
{
for(unsigned int i = 0; i < midiToAction.size(); i++) {
if ( midiToAction.at(i)->ID == bindingID ) {
//LUPPP_NOTE("MIDI binding REMOVED with bindingID %i\n", bindingID );
//LOOPP_NOTE("MIDI binding REMOVED with bindingID %i\n", bindingID );
Binding* tmp = midiToAction.at(i);
midiToAction.erase( midiToAction.begin()+i );
......@@ -534,9 +534,9 @@ void GenericMIDI::removeBinding( int bindingID )
}
}
void GenericMIDI::setupBinding( LupppAction eventType, int midiStatus, int midiData, int track, int scene, int send, int active )
void GenericMIDI::setupBinding( LooppAction eventType, int midiStatus, int midiData, int track, int scene, int send, int active )
{
LUPPP_NOTE("MIDI binding, track %d, send %d from eventType %d to %d, %d", track, send, eventType, midiStatus, midiData );
LOOPP_NOTE("MIDI binding, track %d, send %d from eventType %d to %d, %d", track, send, eventType, midiStatus, midiData );
// FIXME: NON-RT Have stack of Bindings() available, or push in GUI thread?
Binding* tmp = new Binding();
......@@ -564,7 +564,7 @@ Binding* GenericMIDI::setupBinding( cJSON* binding )
cJSON* actionJson = cJSON_GetObjectItem( binding, "action" );
if ( !actionJson ) {
LUPPP_WARN("Binding doesn't have action field: fix .ctlr file");
LOOPP_WARN("Binding doesn't have action field: fix .ctlr file");
delete tmp;
return 0;
}
......@@ -572,7 +572,7 @@ Binding* GenericMIDI::setupBinding( cJSON* binding )
cJSON* statusJson = cJSON_GetObjectItem( binding, "status" );
cJSON* dataJson = cJSON_GetObjectItem( binding, "data" );
if ( !statusJson || !dataJson ) {
LUPPP_WARN("Binding w Action:%s doesn't have status / data field: fix .ctlr file", actionJson->valuestring);
LOOPP_WARN("Binding w Action:%s doesn't have status / data field: fix .ctlr file", actionJson->valuestring);
delete tmp;
return 0;
}
......@@ -645,12 +645,12 @@ Binding* GenericMIDI::setupBinding( cJSON* binding )
tmp->action = Event::MASTER_VOL;
} else if ( strcmp( actionJson->valuestring, "metronome:active" ) == 0 ) {
tmp->action = Event::METRONOME_ACTIVE;
LUPPP_NOTE("binding metro active event, tmp->active == %i", tmp->active );
LOOPP_NOTE("binding metro active event, tmp->active == %i", tmp->active );
}
// check for valid event: otherwise pass
if ( tmp->action != Event::EVENT_NULL ) {
//LUPPP_NOTE("Binding from %i %i %s", statusJson->valueint, dataJson->valueint, actionJson->valuestring);
//LOOPP_NOTE("Binding from %i %i %s", statusJson->valueint, dataJson->valueint, actionJson->valuestring);
cJSON* track = cJSON_GetObjectItem( binding, "track" );
cJSON* scene = cJSON_GetObjectItem( binding, "scene" );
......@@ -665,7 +665,7 @@ Binding* GenericMIDI::setupBinding( cJSON* binding )
return tmp;
} else {
LUPPP_WARN("Binding action not recognized: %s", actionJson->valuestring );
LOOPP_WARN("Binding action not recognized: %s", actionJson->valuestring );
}
delete tmp;
......
......@@ -17,8 +17,8 @@
*/
#ifndef LUPPP_GENERIC_MIDI_H
#define LUPPP_GENERIC_MIDI_H
#ifndef LOOPP_GENERIC_MIDI_H
#define LOOPP_GENERIC_MIDI_H
#include "controller.hxx"
......@@ -83,7 +83,7 @@ public:
const std::vector<Binding*>& getMidiToAction();
// for adding bindings from MIDI / GUI event pair
void setupBinding( LupppAction eventType, int midiStatus, int midiData, int track, int scene, int send, int active );
void setupBinding( LooppAction eventType, int midiStatus, int midiData, int track, int scene, int send, int active );
void removeBinding( int bindingID );
private:
......@@ -117,5 +117,5 @@ private:
*/
};
#endif // LUPPP_GENERIC_MIDI_H
#endif // LOOPP_GENERIC_MIDI_H
......@@ -29,126 +29,126 @@
extern Jack* jack;
LupppGUI::LupppGUI() :
LooppGUI::LooppGUI() :
Controller()
{
}
void LupppGUI::masterInputVol(float f)
void L