diff options
-rw-r--r-- | .clang-format | 42 | ||||
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | Makefile.am | 5 | ||||
-rw-r--r-- | lv2/drumgizmo.ttl | 17 | ||||
-rw-r--r-- | plugingui/Makefile.am | 4 | ||||
-rw-r--r-- | src/Makefile.am | 12 |
6 files changed, 70 insertions, 12 deletions
diff --git a/.clang-format b/.clang-format new file mode 100644 index 0000000..fe6ba0c --- /dev/null +++ b/.clang-format @@ -0,0 +1,42 @@ +Language: Cpp +Standard: Cpp11 + +# Use SmartTabs +UseTab: ForIndentation +IndentWidth: 4 +TabWidth: 4 +ConstructorInitializerIndentWidth: 4 + +NamespaceIndentation: None + +# Use Allman brace style. +BreakBeforeBraces: Allman + +# CTOR initializers should be +# Class::Class() +# : Foo() +# , bar(1 ,2) +# , bas("hello") +BreakConstructorInitializersBeforeComma: true + +AccessModifierOffset: -4 +AlignAfterOpenBracket: false + +# Always expand curlies. +AllowShortFunctionsOnASingleLine: None +AllowShortLoopsOnASingleLine: false +AllowShortIfStatementsOnASingleLine: false + +# Do not indent case labels +IndentCaseLabels: false + +ConstructorInitializerAllOnOneLineOrOnePerLine: true +AllowAllParametersOfDeclarationOnNextLine: true + +DerivePointerAlignment: false +PointerAlignment: Left + +SpaceBeforeAssignmentOperators: true +SpacesInParentheses: false +SpacesInSquareBrackets: false +SpaceBeforeParens: Never @@ -17,6 +17,8 @@ libtool ltmain.sh missing stamp-h1 +compile +config.h.in~ test-driver *.o *.a diff --git a/Makefile.am b/Makefile.am index 84bcaa7..ffa7602 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,5 +9,6 @@ EXTRA_DIST = \ hugin/hugin.c \ hugin/hugin_util.h \ hugin/hugin_syslog.h \ - hugin/hugin_syslog.c - + hugin/hugin_syslog.c \ + hugin/hugin_filter.h \ + hugin/hugin_filter.c diff --git a/lv2/drumgizmo.ttl b/lv2/drumgizmo.ttl index 6ce3e91..1854d74 100644 --- a/lv2/drumgizmo.ttl +++ b/lv2/drumgizmo.ttl @@ -13,12 +13,13 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -@prefix doap: <http://usefulinc.com/ns/doap#> . -@prefix foaf: <http://xmlns.com/foaf/0.1/> . -@prefix lv2: <http://lv2plug.in/ns/lv2core#> . -@prefix atom: <http://lv2plug.in/ns/ext/atom#> . -@prefix uiext: <http://lv2plug.in/ns/extensions/ui#> . -@prefix state: <http://lv2plug.in/ns/ext/state#> . +@prefix doap: <http://usefulinc.com/ns/doap#> . +@prefix foaf: <http://xmlns.com/foaf/0.1/> . +@prefix lv2: <http://lv2plug.in/ns/lv2core#> . +@prefix atom: <http://lv2plug.in/ns/ext/atom#> . +@prefix uiext: <http://lv2plug.in/ns/extensions/ui#> . +@prefix state: <http://lv2plug.in/ns/ext/state#> . +@prefix pprops: <http://lv2plug.in/ns/ext/port-props#> . <http://drumgizmo.org/lv2-gui> a uiext:external ; @@ -47,10 +48,10 @@ lv2:maximum 1.0 ; lv2:designation <http://lv2plug.in/ns/lv2core#freeWheeling> ; lv2:portProperty lv2:toggled ; - lv2:portProperty epp:hasStrictBounds; + lv2:portProperty pprops:hasStrictBounds; ] , [ a atom:AtomPort , - lv2:InputPort; + lv2:InputPort; atom:bufferType atom:Sequence ; atom:supports <http://lv2plug.in/ns/ext/midi#MidiEvent> ; lv2:index 1 ; diff --git a/plugingui/Makefile.am b/plugingui/Makefile.am index bc90f09..cc40516 100644 --- a/plugingui/Makefile.am +++ b/plugingui/Makefile.am @@ -27,6 +27,7 @@ EXTRA_DIST = \ checkbox.h \ colour.h \ combobox.h \ + dgwindow.h \ directory.h \ eventhandler.h \ filebrowser.h \ @@ -35,6 +36,7 @@ EXTRA_DIST = \ image.h \ knob.h \ label.h \ + layout.h \ led.h \ lineedit.h \ listbox.h \ @@ -44,6 +46,7 @@ EXTRA_DIST = \ nativewindow.h \ nativewindow_win32.h \ nativewindow_x11.h \ + notifier.h \ painter.h \ pixelbuffer.h \ pluginconfig.h \ @@ -53,6 +56,7 @@ EXTRA_DIST = \ resource_data.h \ scrollbar.h \ slider.h \ + textedit.h \ verticalline.h \ widget.h \ window.h \ diff --git a/src/Makefile.am b/src/Makefile.am index cb44909..f0d174b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,8 @@ EXTRA_DIST = \ + audiocachefile.h \ + audiocache.h \ + audiocacheeventhandler.h \ + audiocacheidmanager.h \ audio.h \ audiofile.h \ audioinputengine.h \ @@ -8,8 +12,8 @@ EXTRA_DIST = \ channel.h \ channelmixer.h \ chresampler.h \ + configfile.h \ configuration.h \ - cachemanager.h \ configparser.h \ drumgizmo.h \ drumkit.h \ @@ -35,15 +39,19 @@ EXTRA_DIST = \ velocity.h \ versionstr.h \ \ + audiocachefile.cc \ + audiocache.cc \ + audiocacheeventhandler.cc \ + audiocacheidmanager.cc \ audiofile.cc \ audioinputengine.cc \ audioinputenginemidi.cc \ audiooutputengine.cc \ beatmapper.cc \ - cachemanager.cc \ channel.cc \ channelmixer.cc \ chresampler.cc \ + configfile.cc \ configuration.cc \ configparser.cc \ drumgizmo.cc \ |