diff options
| author | Bent Bisballe Nyeng <deva@aasimon.org> | 2015-12-20 17:24:31 +0100 |
|---|---|---|
| committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2015-12-20 17:24:31 +0100 |
| commit | 64e5faf11c22c8aabf181288293c8ec7964c213d (patch) | |
| tree | f0669001e9eef2aa883df85f401947d843f684b4 /drumgizmo/input | |
| parent | b697682bd3c1b9cdfde97cd6a7c9d0f10103f6b4 (diff) | |
| parent | 0fa481dabf620181c852f43923a3c4b049294ab4 (diff) | |
Merge remote-tracking branch 'origin/master' into uirefactor
Diffstat (limited to 'drumgizmo/input')
| -rw-r--r-- | drumgizmo/input/jackmidi/Makefile.am | 3 | ||||
| -rw-r--r-- | drumgizmo/input/jackmidi/jackmidi.cc | 4 | ||||
| -rw-r--r-- | drumgizmo/input/midifile/Makefile.am | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/drumgizmo/input/jackmidi/Makefile.am b/drumgizmo/input/jackmidi/Makefile.am index fd63944..d392f19 100644 --- a/drumgizmo/input/jackmidi/Makefile.am +++ b/drumgizmo/input/jackmidi/Makefile.am @@ -26,7 +26,8 @@ libdir = $(INPUT_PLUGIN_DIR) AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/hugin jackmidi_la_LDFLAGS = -module -avoid-version -shared -jackmidi_la_LIBADD = +jackmidi_la_LIBADD = $(EXPAT_LIBS) +jackmidi_la_CXXFLAGS = $(EXPAT_CFLAGS) jackmidi_la_SOURCES = $(jackmidibuildsources) install-exec-hook: diff --git a/drumgizmo/input/jackmidi/jackmidi.cc b/drumgizmo/input/jackmidi/jackmidi.cc index 5496195..a6b49b7 100644 --- a/drumgizmo/input/jackmidi/jackmidi.cc +++ b/drumgizmo/input/jackmidi/jackmidi.cc @@ -60,8 +60,8 @@ public: private: void loadMap(std::string map) {} - JackClient *jackclient; - jack_port_t *midi_port; + JackClient *jackclient{nullptr}; + jack_port_t *midi_port{nullptr}; size_t pos; diff --git a/drumgizmo/input/midifile/Makefile.am b/drumgizmo/input/midifile/Makefile.am index f95a289..9ade475 100644 --- a/drumgizmo/input/midifile/Makefile.am +++ b/drumgizmo/input/midifile/Makefile.am @@ -27,8 +27,9 @@ libdir = $(INPUT_PLUGIN_DIR) AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include $(SMF_CFLAGS) \ $(EXPAT_CFLAGS) -I$(top_srcdir)/hugin -DWITH_HUG_MUTEX -midifile_la_LDFLAGS = $(SMF_LIBS) $(EXPAT_LIBS) -module -avoid-version -shared -midifile_la_LIBADD = +midifile_la_LDFLAGS = -module -avoid-version -shared +midifile_la_LIBADD = $(EXPAT_LIBS) $(SMF_LIBS) +midifile_la_CXXFLAGS =$(EXPAT_CFLAGS) midifile_la_SOURCES = $(midifilebuildsources) install-exec-hook: |