From 647b6f9ed97c5d37a77015c43187026d24647193 Mon Sep 17 00:00:00 2001 From: "arnaud@rx3.net" Date: Fri, 5 Jun 2020 00:17:44 +0200 Subject: [PATCH] Impact DrMr2 renaming in the code --- CMakeLists.txt | 48 ++++++++++++++++++++++++------------------------ README.md | 7 +++++++ drmr2.c | 8 ++++---- drmr2.h | 6 +++--- drmr2.ttl | 18 +++++++++--------- drmr2_hydrogen.c | 10 +++++----- drmr2_hydrogen.h | 4 ++-- drmr2_ui.c | 10 +++++----- manifest.ttl | 4 ++-- nknob.c | 4 ++-- nknob.h | 2 +- 11 files changed, 64 insertions(+), 57 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7380842..d35ebd2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ #CMake file for DrMr cmake_minimum_required(VERSION 2.6) -project (DrMr) +project (DrMr2) set(LV2_INSTALL_DIR lib/lv2 CACHE PATH "Specifies where the LV2 libraries should be installed") set(CMAKE_C_FLAGS "-Wall") @@ -23,35 +23,35 @@ link_directories (${LV2_LIBRARY_DIRS} ${EXPAT_LIBRARY_DIRS} ${SNDFILE_LIBRARY_DI # config libraries -add_library(drmr SHARED - drmr.c - drmr_hydrogen.c - drmr.h - drmr_hydrogen.h +add_library(drmr2 SHARED + drmr2.c + drmr2_hydrogen.c + drmr2.h + drmr2_hydrogen.h ) -add_library(drmr_ui SHARED - drmr_ui.c - drmr_hydrogen.c +add_library(drmr2_ui SHARED + drmr2_ui.c + drmr2_hydrogen.c nknob.c - drmr_hydrogen.h + drmr2_hydrogen.h nknob.h ) -set_target_properties(drmr PROPERTIES PREFIX "") -set_target_properties(drmr_ui PROPERTIES PREFIX "") -set_target_properties(drmr_ui +set_target_properties(drmr2 PROPERTIES PREFIX "") +set_target_properties(drmr2_ui PROPERTIES PREFIX "") +set_target_properties(drmr2_ui PROPERTIES LINK_FLAGS "-Wl,-znodelete" ) -target_link_libraries(drmr ${LV2_LIBRARIES} ${SNDFILE_LIBRARIES} ${SAMPLERATE_LIBRARIES} ${EXPAT_LIBRARIES} m) -target_link_libraries(drmr_ui ${LV2_LIBRARIES} ${GTK2_LIBRARIES} ${SNDFILE_LIBRARIES} ${SAMPLERATE_LIBRARIES} ${EXPAT_LIBRARIES} m) +target_link_libraries(drmr2 ${LV2_LIBRARIES} ${SNDFILE_LIBRARIES} ${SAMPLERATE_LIBRARIES} ${EXPAT_LIBRARIES} m) +target_link_libraries(drmr2_ui ${LV2_LIBRARIES} ${GTK2_LIBRARIES} ${SNDFILE_LIBRARIES} ${SAMPLERATE_LIBRARIES} ${EXPAT_LIBRARIES} m) add_definitions ( -DPIC ) -set_target_properties (drmr +set_target_properties (drmr2 PROPERTIES COMPILE_FLAGS "-std=gnu99" ) @@ -63,13 +63,13 @@ if (NOT USE_NKNOB) endif (NOT USE_NKNOB) if (SAMP_ZERO_POS GREATER "-1" AND SAMP_ZERO_POS LESS "4") - set (ui_compile_flags "${ui_compile_flags} -DDRMR_UI_ZERO_SAMP=${SAMP_ZERO_POS}") + set (ui_compile_flags "${ui_compile_flags} -DDRMR2_UI_ZERO_SAMP=${SAMP_ZERO_POS}") else (SAMP_ZERO_POS GREATER "-1" AND SAMP_ZERO_POS LESS "4") message(WARNING "Invalid SAMP_ZERO_POS, defaulting to 0 \(top left\). Valid values are 0,1,2,3") - set (ui_compile_flags "${ui_compile_flags} -DDRMR_UI_ZERO_SAMP=0") + set (ui_compile_flags "${ui_compile_flags} -DDRMR2_UI_ZERO_SAMP=0") endif (SAMP_ZERO_POS GREATER "-1" AND SAMP_ZERO_POS LESS "4") -set_target_properties (drmr_ui +set_target_properties (drmr2_ui PROPERTIES COMPILE_FLAGS ${ui_compile_flags} ) @@ -77,7 +77,7 @@ set_target_properties (drmr_ui # Custom test commands add_executable ( htest EXCLUDE_FROM_ALL - drmr_hydrogen.c + drmr2_hydrogen.c ) add_executable ( knobt @@ -98,11 +98,11 @@ set_target_properties ( knobt ) # config install -install(TARGETS drmr drmr_ui +install(TARGETS drmr2 drmr2_ui LIBRARY - DESTINATION ${CMAKE_INSTALL_PREFIX}/${LV2_INSTALL_DIR}/drmr.lv2 + DESTINATION ${CMAKE_INSTALL_PREFIX}/${LV2_INSTALL_DIR}/drmr2.lv2 ) -install (FILES manifest.ttl drmr.ttl knob.png led_on.png led_off.png - DESTINATION ${CMAKE_INSTALL_PREFIX}/${LV2_INSTALL_DIR}/drmr.lv2 +install (FILES manifest.ttl drmr2.ttl knob.png led_on.png led_off.png + DESTINATION ${CMAKE_INSTALL_PREFIX}/${LV2_INSTALL_DIR}/drmr2.lv2 ) diff --git a/README.md b/README.md index adda08f..9730f51 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,10 @@ +DrMr2 +==== + +DrMr2 is a fork from DrMr, with additional patches comming from falkTX & PeterN + + + DrMr ==== diff --git a/drmr2.c b/drmr2.c index 3e8c335..b044803 100644 --- a/drmr2.c +++ b/drmr2.c @@ -1,5 +1,5 @@ -/* drmr.c - * LV2 DrMr plugin +/* drmr2.c + * LV2 DrMr2 plugin * Copyright 2012 Nick Lanham * * Public License v3. source code is available at @@ -19,8 +19,8 @@ #include #include -#include "drmr.h" -#include "drmr_hydrogen.h" +#include "drmr2.h" +#include "drmr2_hydrogen.h" #define REQ_BUF_SIZE 10 #define VELOCITY_MAX 127 diff --git a/drmr2.h b/drmr2.h index 036850a..bc13b5b 100644 --- a/drmr2.h +++ b/drmr2.h @@ -1,5 +1,5 @@ -/* drmr.h - * LV2 DrMr plugin +/* drmr2.h + * LV2 DrMr2 plugin * Copyright 2012 Nick Lanham * * Public License v3. source code is available at @@ -66,7 +66,7 @@ typedef struct { // lv2 stuff -#define DRMR_URI "http://github.com/nicklan/drmr" +#define DRMR_URI "http://github.com/AlkorZ3/drmr2" #define GAIN_MIN -60.0f #define GAIN_MAX 6.0f diff --git a/drmr2.ttl b/drmr2.ttl index f171a5b..d185bee 100644 --- a/drmr2.ttl +++ b/drmr2.ttl @@ -7,18 +7,18 @@ @prefix atom: . @prefix urid: . - + a lv2:InstrumentPlugin, lv2:Plugin; - lv2:binary ; - doap:name "DrMr Sampler"; + lv2:binary ; + doap:name "DrMr2 Sampler"; doap:maintainer [ - foaf:name "Nick Lanham" ; - foaf:homepage ; - foaf:mbox + foaf:name "AlkorZ3" ; + foaf:homepage ; + foaf:mbox ] ; doap:license ; lv2:requiredFeature urid:map ; - ui:ui ; + ui:ui ; lv2:extensionData ; lv2:port [ a lv2:InputPort , atom:AtomPort; @@ -892,6 +892,6 @@ lv2:default 0.0; ]. - + a ui:GtkUI ; - ui:binary . \ No newline at end of file + ui:binary . \ No newline at end of file diff --git a/drmr2_hydrogen.c b/drmr2_hydrogen.c index 5890072..c41670f 100644 --- a/drmr2_hydrogen.c +++ b/drmr2_hydrogen.c @@ -1,5 +1,5 @@ -/* drmr_hydrogen.c - * LV2 DrMr plugin +/* drmr2_hydrogen.c + * LV2 DrMr2 plugin * Copyright 2012 Nick Lanham * * Public License v3. source code is available at @@ -27,8 +27,8 @@ #include #include "samplerate.h" -#include "drmr.h" -#include "drmr_hydrogen.h" +#include "drmr2.h" +#include "drmr2_hydrogen.h" #include "expat.h" /* Below is a list of the locations that DrMr will @@ -46,7 +46,7 @@ static char* default_drumkit_locations[] = { "/usr/local/share/hydrogen/data/drumkits/", "/usr/share/drmr/drumkits/", "~/.hydrogen/data/drumkits/", - "~/.drmr/drumkits/", + "~/.drmr2/drumkits/", NULL }; diff --git a/drmr2_hydrogen.h b/drmr2_hydrogen.h index e69f804..26784ad 100644 --- a/drmr2_hydrogen.h +++ b/drmr2_hydrogen.h @@ -1,5 +1,5 @@ -/* drmr_hydrogen.h - * LV2 DrMr plugin +/* drmr2_hydrogen.h + * LV2 DrMr2 plugin * Copyright 2012 Nick Lanham * * Public License v3. source code is available at diff --git a/drmr2_ui.c b/drmr2_ui.c index 342a1be..1580cfc 100644 --- a/drmr2_ui.c +++ b/drmr2_ui.c @@ -1,5 +1,5 @@ -/* drmr.c - * LV2 DrMr plugin +/* drmr2.c + * LV2 DrMr2 plugin * Copyright 2012 Nick Lanham * * Public License v3. source code is available at @@ -20,8 +20,8 @@ #include #include -#include "drmr.h" -#include "drmr_hydrogen.h" +#include "drmr2.h" +#include "drmr2_hydrogen.h" #include "nknob.h" #include "lv2/lv2plug.in/ns/ext/atom/atom.h" @@ -30,7 +30,7 @@ #include "lv2/lv2plug.in/ns/ext/urid/urid.h" #include "lv2/lv2plug.in/ns/extensions/ui/ui.h" -#define DRMR_UI_URI "http://github.com/nicklan/drmr#ui" +#define DRMR_UI_URI "http://github.com/AlkorZ3/drmr2#ui" #define NO_KIT_STRING "[No Current Kit]" typedef struct { diff --git a/manifest.ttl b/manifest.ttl index f68faa1..bfbb1b0 100644 --- a/manifest.ttl +++ b/manifest.ttl @@ -1,5 +1,5 @@ @prefix lv2: . @prefix rdfs: . - + a lv2:Plugin; - rdfs:seeAlso . \ No newline at end of file + rdfs:seeAlso . \ No newline at end of file diff --git a/nknob.c b/nknob.c index 71d9661..2d3bdd8 100644 --- a/nknob.c +++ b/nknob.c @@ -1,12 +1,12 @@ /* nknob.c - * LV2 DrMr plugin + * LV2 DrMr2 plugin * Copyright 2012 Nick Lanham * * NKnob - A simplified version of phatknob that just is a new gui * over a GtkRange (i.e. it can be used exactly like a * GtkRange from the outside) * - * In addition, this knob makes the drmr_ui.so module memory resident + * In addition, this knob makes the drmr2_ui.so module memory resident * so it can avoid attempting to re-load itself when shown/hidden in * a ui. * diff --git a/nknob.h b/nknob.h index 858fd43..c98ee6f 100644 --- a/nknob.h +++ b/nknob.h @@ -1,5 +1,5 @@ /* nknob.h - * LV2 DrMr plugin + * LV2 DrMr2 plugin * Copyright 2012 Nick Lanham * * NKnob - A simplified version of phatknob that just is a new gui