Rx3/drmr2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Impact DrMr2 renaming in the code

Browse Source
This commit is contained in:
Arnaud G. GIBERT 2020-06-05 00:17:44 +02:00
parent 26e9ac51f3
commit 647b6f9ed9
11 changed files with 64 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
CMakeLists.txt
View File

@ -1,7 +1,7 @@
#CMake file for DrMr #CMake file for DrMr
cmake_minimum_required(VERSION 2.6) 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(LV2_INSTALL_DIR lib/lv2 CACHE PATH "Specifies where the LV2 libraries should be installed")
set(CMAKE_C_FLAGS "-Wall") set(CMAKE_C_FLAGS "-Wall")
@ -23,35 +23,35 @@ link_directories (${LV2_LIBRARY_DIRS} ${EXPAT_LIBRARY_DIRS} ${SNDFILE_LIBRARY_DI
# config libraries # config libraries
add_library(drmr SHARED add_library(drmr2 SHARED
drmr.c drmr2.c
drmr_hydrogen.c drmr2_hydrogen.c
drmr.h drmr2.h
drmr_hydrogen.h drmr2_hydrogen.h
) )
add_library(drmr_ui SHARED add_library(drmr2_ui SHARED
drmr_ui.c drmr2_ui.c
drmr_hydrogen.c drmr2_hydrogen.c
nknob.c nknob.c
drmr_hydrogen.h drmr2_hydrogen.h
nknob.h nknob.h
) )
set_target_properties(drmr PROPERTIES PREFIX "") set_target_properties(drmr2 PROPERTIES PREFIX "")
set_target_properties(drmr_ui PROPERTIES PREFIX "") set_target_properties(drmr2_ui PROPERTIES PREFIX "")
set_target_properties(drmr_ui set_target_properties(drmr2_ui
PROPERTIES PROPERTIES
LINK_FLAGS "-Wl,-znodelete" LINK_FLAGS "-Wl,-znodelete"
) )
target_link_libraries(drmr ${LV2_LIBRARIES} ${SNDFILE_LIBRARIES} ${SAMPLERATE_LIBRARIES} ${EXPAT_LIBRARIES} m) target_link_libraries(drmr2 ${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_ui ${LV2_LIBRARIES} ${GTK2_LIBRARIES} ${SNDFILE_LIBRARIES} ${SAMPLERATE_LIBRARIES} ${EXPAT_LIBRARIES} m)
add_definitions ( -DPIC ) add_definitions ( -DPIC )
set_target_properties (drmr set_target_properties (drmr2
PROPERTIES PROPERTIES
COMPILE_FLAGS "-std=gnu99" COMPILE_FLAGS "-std=gnu99"
) )
@ -63,13 +63,13 @@ if (NOT USE_NKNOB)
endif (NOT USE_NKNOB) endif (NOT USE_NKNOB)
if (SAMP_ZERO_POS GREATER "-1" AND SAMP_ZERO_POS LESS "4") 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") 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") 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") endif (SAMP_ZERO_POS GREATER "-1" AND SAMP_ZERO_POS LESS "4")
set_target_properties (drmr_ui set_target_properties (drmr2_ui
PROPERTIES PROPERTIES
COMPILE_FLAGS ${ui_compile_flags} COMPILE_FLAGS ${ui_compile_flags}
) )
@ -77,7 +77,7 @@ set_target_properties (drmr_ui
# Custom test commands # Custom test commands
add_executable ( htest add_executable ( htest
EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL
drmr_hydrogen.c drmr2_hydrogen.c
) )
add_executable ( knobt add_executable ( knobt
@ -98,11 +98,11 @@ set_target_properties ( knobt
) )
# config install # config install
install(TARGETS drmr drmr_ui install(TARGETS drmr2 drmr2_ui
LIBRARY 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 install (FILES manifest.ttl drmr2.ttl knob.png led_on.png led_off.png
DESTINATION ${CMAKE_INSTALL_PREFIX}/${LV2_INSTALL_DIR}/drmr.lv2 DESTINATION ${CMAKE_INSTALL_PREFIX}/${LV2_INSTALL_DIR}/drmr2.lv2
) )

7
README.md
View File

@ -1,3 +1,10 @@
DrMr2
====
DrMr2 is a fork from DrMr, with additional patches comming from falkTX & PeterN
DrMr DrMr
==== ====

8
drmr2.c
View File

@ -1,5 +1,5 @@
/* drmr.c /* drmr2.c
* LV2 DrMr plugin * LV2 DrMr2 plugin
* Copyright 2012 Nick Lanham <nick@afternight.org> * Copyright 2012 Nick Lanham <nick@afternight.org>
* *
* Public License v3. source code is available at * Public License v3. source code is available at
@ -19,8 +19,8 @@
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
#include "drmr.h" #include "drmr2.h"
#include "drmr_hydrogen.h" #include "drmr2_hydrogen.h"
#define REQ_BUF_SIZE 10 #define REQ_BUF_SIZE 10
#define VELOCITY_MAX 127 #define VELOCITY_MAX 127

6
drmr2.h
View File

@ -1,5 +1,5 @@
/* drmr.h /* drmr2.h
* LV2 DrMr plugin * LV2 DrMr2 plugin
* Copyright 2012 Nick Lanham <nick@afternight.org> * Copyright 2012 Nick Lanham <nick@afternight.org>
* *
* Public License v3. source code is available at * Public License v3. source code is available at
@ -66,7 +66,7 @@ typedef struct {
// lv2 stuff // 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_MIN -60.0f
#define GAIN_MAX 6.0f #define GAIN_MAX 6.0f

18
drmr2.ttl
View File

@ -7,18 +7,18 @@
@prefix atom: <http://lv2plug.in/ns/ext/atom#> . @prefix atom: <http://lv2plug.in/ns/ext/atom#> .
@prefix urid: <http://lv2plug.in/ns/ext/urid#> . @prefix urid: <http://lv2plug.in/ns/ext/urid#> .
<http://github.com/nicklan/drmr> <http://github.com/AlkorZ3/drmr2>
a lv2:InstrumentPlugin, lv2:Plugin; a lv2:InstrumentPlugin, lv2:Plugin;
lv2:binary <drmr.so>; lv2:binary <drmr2.so>;
doap:name "DrMr Sampler"; doap:name "DrMr2 Sampler";
doap:maintainer [ doap:maintainer [
foaf:name "Nick Lanham" ; foaf:name "AlkorZ3" ;
foaf:homepage <http://github.com/nick/drmr/wiki> ; foaf:homepage <http://github.com/AlkorZ3/drmr2/wiki> ;
foaf:mbox <nick@afternight.org> foaf:mbox <alkorz3@rx3.net>
] ; ] ;
doap:license <http://usefulinc.com/doap/licenses/gpl> ; doap:license <http://usefulinc.com/doap/licenses/gpl> ;
lv2:requiredFeature urid:map ; lv2:requiredFeature urid:map ;
ui:ui <http://github.com/nicklan/drmr#ui> ; ui:ui <http://github.com/AlkorZ3/drmr2#ui> ;
lv2:extensionData <http://lv2plug.in/ns/ext/state#interface> ; lv2:extensionData <http://lv2plug.in/ns/ext/state#interface> ;
lv2:port [ lv2:port [
a lv2:InputPort , atom:AtomPort; a lv2:InputPort , atom:AtomPort;
@ -892,6 +892,6 @@
lv2:default 0.0; lv2:default 0.0;
]. ].
<http://github.com/nicklan/drmr#ui> <http://github.com/AlkorZ3/drmr2#ui>
a ui:GtkUI ; a ui:GtkUI ;
ui:binary <drmr_ui.so> . ui:binary <drmr2_ui.so> .

10
drmr2_hydrogen.c
View File

@ -1,5 +1,5 @@
/* drmr_hydrogen.c /* drmr2_hydrogen.c
* LV2 DrMr plugin * LV2 DrMr2 plugin
* Copyright 2012 Nick Lanham <nick@afternight.org> * Copyright 2012 Nick Lanham <nick@afternight.org>
* *
* Public License v3. source code is available at * Public License v3. source code is available at
@ -27,8 +27,8 @@
#include <math.h> #include <math.h>
#include "samplerate.h" #include "samplerate.h"
#include "drmr.h" #include "drmr2.h"
#include "drmr_hydrogen.h" #include "drmr2_hydrogen.h"
#include "expat.h" #include "expat.h"
/* Below is a list of the locations that DrMr will /* 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/local/share/hydrogen/data/drumkits/",
"/usr/share/drmr/drumkits/", "/usr/share/drmr/drumkits/",
"~/.hydrogen/data/drumkits/", "~/.hydrogen/data/drumkits/",
"~/.drmr/drumkits/", "~/.drmr2/drumkits/",
NULL NULL
}; };

4
drmr2_hydrogen.h
View File

@ -1,5 +1,5 @@
/* drmr_hydrogen.h /* drmr2_hydrogen.h
* LV2 DrMr plugin * LV2 DrMr2 plugin
* Copyright 2012 Nick Lanham <nick@afternight.org> * Copyright 2012 Nick Lanham <nick@afternight.org>
* *
* Public License v3. source code is available at * Public License v3. source code is available at

10
drmr2_ui.c
View File

@ -1,5 +1,5 @@
/* drmr.c /* drmr2.c
* LV2 DrMr plugin * LV2 DrMr2 plugin
* Copyright 2012 Nick Lanham <nick@afternight.org> * Copyright 2012 Nick Lanham <nick@afternight.org>
* *
* Public License v3. source code is available at * Public License v3. source code is available at
@ -20,8 +20,8 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gdk/gdk.h> #include <gdk/gdk.h>
#include "drmr.h" #include "drmr2.h"
#include "drmr_hydrogen.h" #include "drmr2_hydrogen.h"
#include "nknob.h" #include "nknob.h"
#include "lv2/lv2plug.in/ns/ext/atom/atom.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/ext/urid/urid.h"
#include "lv2/lv2plug.in/ns/extensions/ui/ui.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]" #define NO_KIT_STRING "[No Current Kit]"
typedef struct { typedef struct {

4
manifest.ttl
View File

@ -1,5 +1,5 @@
@prefix lv2: <http://lv2plug.in/ns/lv2core#>. @prefix lv2: <http://lv2plug.in/ns/lv2core#>.
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>. @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
<http://github.com/nicklan/drmr> <http://github.com/AlkorZ3/drmr2>
a lv2:Plugin; a lv2:Plugin;
rdfs:seeAlso <drmr.ttl>. rdfs:seeAlso <drmr2.ttl>.

4
nknob.c
View File

@ -1,12 +1,12 @@
/* nknob.c /* nknob.c
* LV2 DrMr plugin * LV2 DrMr2 plugin
* Copyright 2012 Nick Lanham <nick@afternight.org> * Copyright 2012 Nick Lanham <nick@afternight.org>
* *
* NKnob - A simplified version of phatknob that just is a new gui * NKnob - A simplified version of phatknob that just is a new gui
* over a GtkRange (i.e. it can be used exactly like a * over a GtkRange (i.e. it can be used exactly like a
* GtkRange from the outside) * 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 * so it can avoid attempting to re-load itself when shown/hidden in
* a ui. * a ui.
* *

2
nknob.h
View File

@ -1,5 +1,5 @@
/* nknob.h /* nknob.h
* LV2 DrMr plugin * LV2 DrMr2 plugin
* Copyright 2012 Nick Lanham <nick@afternight.org> * Copyright 2012 Nick Lanham <nick@afternight.org>
* *
* NKnob - A simplified version of phatknob that just is a new gui * NKnob - A simplified version of phatknob that just is a new gui