From: Sebastian Ramacher Date: Tue, 12 Oct 2021 22:38:26 +0200 Subject: Use system-provided rtaudio and rtmidi --- src/Makefile.am | 4 ++-- src/audio.h | 2 +- src/midi_in.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index ab7bcc5..b7a1c54 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,8 +5,8 @@ LIBS += -ltcl8.6 -lSDL -lGL -lpthread -lasound bin_PROGRAMS = din -din_SOURCES = alarm.cc arrow_button.cc audio.cc authors_note.cc autoflip.cc autopause.cc autorotator.cc ball.cc ball_ops.cc basic_editor.cc beat2value.cc binaural_drone.cc binaural_drones.cc bit_display.cc box_selector.cc button.cc capturer.cc checkbutton.cc chrono.cc circler.cc command.cc compressor.cc console.cc console_iterator.cc countries.cc cross_button.cc curve.cc curve_display.cc curve_editor.cc curve_library.cc curve_mixer.cc curve_picker.cc curve_samples.cc custom_periodic.cc defvelaccel.cc delay.cc din.cc din_info.cc drawrrow.cc drone.cc eval.cc fader.cc fft.cc field.cc filled_button.cc font.cc font_editor.cc fractaliser.cc globals.cc glyph.cc gravity.cc help.cc hit.cc instrument.cc item_list.cc keyboard_keyboard.cc label.cc levels.cc line.cc lissajous.cc listeners.cc main.cc menu.cc mesh.cc midi_in.cc minus_button.cc mocap.cc modulator.cc mondrian.cc morpher.cc morse_code.cc mouse_slider.cc multi_curve.cc noiser.cc note.cc number.cc oscilloscope.cc phrasor.cc play.cc plugin_browser.cc plugin.cc plus_button.cc point_modulator.cc range.cc recorder.cc rect.cc rose_milker.cc scale_info.cc scalelist.cc scale_notes.cc separator.cc settings.cc sine_mixer.cc slit.cc solver.cc spiraler.cc starrer.cc superformula.cc tap_bpm.cc tcl_interp.cc textboard.cc tokenizer.cc trail.cc triggered_note.cc ui.cc ui_sin_cos_radius.cc viewwin.cc warper.cc widget.cc RtAudio.cpp RtMidi.cpp kiss_fft.c +din_SOURCES = alarm.cc arrow_button.cc audio.cc authors_note.cc autoflip.cc autopause.cc autorotator.cc ball.cc ball_ops.cc basic_editor.cc beat2value.cc binaural_drone.cc binaural_drones.cc bit_display.cc box_selector.cc button.cc capturer.cc checkbutton.cc chrono.cc circler.cc command.cc compressor.cc console.cc console_iterator.cc countries.cc cross_button.cc curve.cc curve_display.cc curve_editor.cc curve_library.cc curve_mixer.cc curve_picker.cc curve_samples.cc custom_periodic.cc defvelaccel.cc delay.cc din.cc din_info.cc drawrrow.cc drone.cc eval.cc fader.cc fft.cc field.cc filled_button.cc font.cc font_editor.cc fractaliser.cc globals.cc glyph.cc gravity.cc help.cc hit.cc instrument.cc item_list.cc keyboard_keyboard.cc label.cc levels.cc line.cc lissajous.cc listeners.cc main.cc menu.cc mesh.cc midi_in.cc minus_button.cc mocap.cc modulator.cc mondrian.cc morpher.cc morse_code.cc mouse_slider.cc multi_curve.cc noiser.cc note.cc number.cc oscilloscope.cc phrasor.cc play.cc plugin_browser.cc plugin.cc plus_button.cc point_modulator.cc range.cc recorder.cc rect.cc rose_milker.cc scale_info.cc scalelist.cc scale_notes.cc separator.cc settings.cc sine_mixer.cc slit.cc solver.cc spiraler.cc starrer.cc superformula.cc tap_bpm.cc tcl_interp.cc textboard.cc tokenizer.cc trail.cc triggered_note.cc ui.cc ui_sin_cos_radius.cc viewwin.cc warper.cc widget.cc kiss_fft.c -dist_include = alarm.h angle.h arrow_button.h audio.h authors_note.h autoflip.h autopause.h autorotator.h ball.h ball_ops.h basic_editor.h beat2value.h binaural_drone.h binaural_drones.h bit_display.h box.h box_selector.h button.h capturer.h checkbutton.h chrono.h circler.h color.h command.h compressor.h console.h console_iterator.h constant_radius.h container.h cosine.h countries.h cross_button.h crvpt.h curve_display.h curve_editor.h curve.h curve_library.h curve_listener.h curve_mixer.h curve_picker.h curve_samples.h custom_periodic.h defvelaccel.h delay.h dingl.h din.h din_info.h drawrrow.h drone.h fader.h fft.h field.h file-utils.h filled_button.h font_editor.h font.h fractaliser.h funktion.h globals.h glyph.h gravity.h help.h hit.h input.h instrument.h item_list.h keyboard_keyboard.h _kiss_fft_guts.h kiss_fft.h label_field.h label_field_slider.h label.h levels.h line.h lissajous.h listeners.h log.h loom.h main.h menu.h mesh.h midi_in.h minus_button.h mocap.h mod_params.h modulator.h mondrian.h morpher.h morse_code.h mouse_slider.h multi_curve.h noiser.h note.h number.h octave_shift_data.h options_list.h osc.h oscilloscope.h phrasor.h play.h plugin_browser.h plugin.h plus_button.h point.h point_modulator.h random.h range.h recorder.h rect.h rose_milker.h RtAudio.h RtError.h RtMidi.h scale_info.h scalelist.h scale_notes.h separator.h settings.h sine.h sine_mixer.h slider.h slit.h solver.h spinner2.h spinner.h spiraler.h starrer.h state_button.h strength_editor.h superformula.h tap_bpm.h tcl_interp.h textboard.h tick.h tokenizer.h trail.h triggered_note.h ui.h ui_list.h ui_sin_cos_radius.h utils.h vector2d.h viewwin.h warper.h wav.h widget.h +dist_include = alarm.h angle.h arrow_button.h audio.h authors_note.h autoflip.h autopause.h autorotator.h ball.h ball_ops.h basic_editor.h beat2value.h binaural_drone.h binaural_drones.h bit_display.h box.h box_selector.h button.h capturer.h checkbutton.h chrono.h circler.h color.h command.h compressor.h console.h console_iterator.h constant_radius.h container.h cosine.h countries.h cross_button.h crvpt.h curve_display.h curve_editor.h curve.h curve_library.h curve_listener.h curve_mixer.h curve_picker.h curve_samples.h custom_periodic.h defvelaccel.h delay.h dingl.h din.h din_info.h drawrrow.h drone.h fader.h fft.h field.h file-utils.h filled_button.h font_editor.h font.h fractaliser.h funktion.h globals.h glyph.h gravity.h help.h hit.h input.h instrument.h item_list.h keyboard_keyboard.h _kiss_fft_guts.h kiss_fft.h label_field.h label_field_slider.h label.h levels.h line.h lissajous.h listeners.h log.h loom.h main.h menu.h mesh.h midi_in.h minus_button.h mocap.h mod_params.h modulator.h mondrian.h morpher.h morse_code.h mouse_slider.h multi_curve.h noiser.h note.h number.h octave_shift_data.h options_list.h osc.h oscilloscope.h phrasor.h play.h plugin_browser.h plugin.h plus_button.h point.h point_modulator.h random.h range.h recorder.h rect.h rose_milker.h RtError.h scale_info.h scalelist.h scale_notes.h separator.h settings.h sine.h sine_mixer.h slider.h slit.h solver.h spinner2.h spinner.h spiraler.h starrer.h state_button.h strength_editor.h superformula.h tap_bpm.h tcl_interp.h textboard.h tick.h tokenizer.h trail.h triggered_note.h ui.h ui_list.h ui_sin_cos_radius.h utils.h vector2d.h viewwin.h warper.h wav.h widget.h EXTRA_DIST = $(dist_include) diff --git a/src/audio.h b/src/audio.h index 639d679..81255ee 100644 --- a/src/audio.h +++ b/src/audio.h @@ -9,7 +9,7 @@ #ifndef __AUDIO #define __AUDIO -#include "RtAudio.h" +#include #include #include diff --git a/src/midi_in.h b/src/midi_in.h index 3bfef5a..016c578 100644 --- a/src/midi_in.h +++ b/src/midi_in.h @@ -8,7 +8,7 @@ #ifndef __midi_in #define __midi_in -#include "RtMidi.h" +#include #include #include