diff options
| author | Bent Bisballe Nyeng <deva@aasimon.org> | 2018-10-08 20:50:52 +0200 |
|---|---|---|
| committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2018-10-08 20:50:52 +0200 |
| commit | a21ab2d9260bd4cb1af1de0b8cd4cad9e9687861 (patch) | |
| tree | 4b449b45a05e2a5bd33859eaa2c7b1e7cf1bcca6 /drumgizmo | |
| parent | 30c2b53047b11b1517fa44b49adc52bc5119649c (diff) | |
Move event.h and audiotypes.h into src and get rid of the obsolete include folder.
Diffstat (limited to 'drumgizmo')
| -rw-r--r-- | drumgizmo/Makefile.am | 2 | ||||
| -rw-r--r-- | drumgizmo/input/jackmidi.cc | 2 | ||||
| -rw-r--r-- | drumgizmo/input/midifile.cc | 4 | ||||
| -rw-r--r-- | drumgizmo/input/test.cc | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/drumgizmo/Makefile.am b/drumgizmo/Makefile.am index f221b5f..5455726 100644 --- a/drumgizmo/Makefile.am +++ b/drumgizmo/Makefile.am @@ -9,7 +9,7 @@ drumgizmo_LDADD = $(JACK_LIBS) $(top_srcdir)/src/libdg.la drumgizmo_LDFLAGS = drumgizmo_CXXFLAGS = \ - -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/getoptpp \ + -I$(top_srcdir)/src -I$(top_srcdir)/getoptpp \ -I$(top_srcdir)/hugin -DWITH_HUG_MUTEX -DWITH_HUG_FILTER \ $(JACK_CFLAGS) $(SSEFLAGS) diff --git a/drumgizmo/input/jackmidi.cc b/drumgizmo/input/jackmidi.cc index 8f8d5cb..8459e67 100644 --- a/drumgizmo/input/jackmidi.cc +++ b/drumgizmo/input/jackmidi.cc @@ -133,7 +133,7 @@ void JackMidiInputEngine::process(jack_nframes_t num_frames) int k = mmap.lookup(key); if(k != -1 && velocity) { - events.push_back({TYPE_ONSET, (size_t)k, event.time, velocity / 127.f}); + events.push_back({EventType::OnSet, (size_t)k, event.time, velocity / 127.f}); } } jack_midi_clear_buffer(buffer); diff --git a/drumgizmo/input/midifile.cc b/drumgizmo/input/midifile.cc index c3bd8ae..562ed37 100644 --- a/drumgizmo/input/midifile.cc +++ b/drumgizmo/input/midifile.cc @@ -157,7 +157,7 @@ void MidifileInputEngine::run(size_t pos, size_t len, std::vector<event_t>& even events.emplace_back(); auto& event = events.back(); - event.type = TYPE_ONSET; + event.type = EventType::OnSet; size_t evpos = current_event->time_seconds * (samplerate / speed); event.offset = evpos - pos; @@ -183,7 +183,7 @@ void MidifileInputEngine::run(size_t pos, size_t len, std::vector<event_t>& even else { assert(len >= 1); - events.push_back({TYPE_STOP, 0, len-1, 0.f}); + events.push_back({EventType::Stop, 0, len-1, 0.f}); } } } diff --git a/drumgizmo/input/test.cc b/drumgizmo/input/test.cc index 3a5ea47..955d218 100644 --- a/drumgizmo/input/test.cc +++ b/drumgizmo/input/test.cc @@ -86,15 +86,15 @@ void TestInputEngine::run(size_t pos, size_t len, std::vector<event_t>& events) events.emplace_back(); auto& event = events.back(); - event.type = TYPE_ONSET; + event.type = EventType::OnSet; if((length != -1) && (pos > (size_t)(length * sample_rate))) { - event.type = TYPE_STOP; + event.type = EventType::Stop; } else { - event.type = TYPE_ONSET; + event.type = EventType::OnSet; } if(instrument != -1) |