Move midi_device.cpp into shared, as Futatabi is getting MIDI support soon.

diff --git a/meson.build b/meson.build
index a3e943004d5b367ebfd679f0c30efe321df3001e..461c12559dc58dcfeb942203eda8b90d0d45319d 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -177,7 +177,7 @@ qt_files = qt5.preprocess(
 # Qt objects.
 nageru_srcs += ['nageru/glwidget.cpp', 'nageru/mainwindow.cpp', 'nageru/vumeter.cpp', 'nageru/lrameter.cpp', 'nageru/compression_reduction_meter.cpp',
        'nageru/correlation_meter.cpp', 'nageru/analyzer.cpp', 'nageru/input_mapping_dialog.cpp', 'nageru/midi_mapping_dialog.cpp',
-       'nageru/nonlinear_fader.cpp', 'nageru/context_menus.cpp', 'nageru/vu_common.cpp', 'nageru/piecewise_interpolator.cpp', 'nageru/midi_mapper.cpp', 'nageru/midi_device.cpp']
+       'nageru/nonlinear_fader.cpp', 'nageru/context_menus.cpp', 'nageru/vu_common.cpp', 'nageru/piecewise_interpolator.cpp', 'nageru/midi_mapper.cpp']
 
 # Auxiliary objects used for nearly everything.
 aux_srcs = ['nageru/flags.cpp']

diff --git a/nageru/midi_mapper.h b/nageru/midi_mapper.h
index 8fa0bf997b7255f56a52a9e48c31e78df1d94e04..a25994357c6e81df285fa97fa023ff5d0a0d003a 100644 (file)
--- a/nageru/midi_mapper.h
+++ b/nageru/midi_mapper.h
@@ -18,7 +18,7 @@
 #include <thread>
 
 #include "defs.h"
-#include "midi_device.h"
+#include "shared/midi_device.h"
 
 class MIDIMappingProto;
 

diff --git a/shared/meson.build b/shared/meson.build
index 22d4c19731c0bd6daf382791f4360cab24421f32..90711c02f1f17a8043e2be55fbcab61479894951 100644 (file)
--- a/shared/meson.build
+++ b/shared/meson.build
@@ -2,6 +2,7 @@ qt5 = import('qt5')
 shared_qt5deps = dependency('qt5', modules: ['Core', 'Gui', 'Widgets', 'OpenGL'])
 libmicrohttpddep = dependency('libmicrohttpd')
 protobufdep = dependency('protobuf')
+alsadep = dependency('alsa')
 
 # Preprocess Qt as needed.
 qt_files = qt5.preprocess(
@@ -9,13 +10,13 @@ qt_files = qt5.preprocess(
        ui_files: ['aboutdialog.ui'],
        dependencies: shared_qt5deps)
 
-srcs = ['memcpy_interleaved.cpp', 'metacube2.cpp', 'ffmpeg_raii.cpp', 'mux.cpp', 'metrics.cpp', 'context.cpp', 'httpd.cpp', 'disk_space_estimator.cpp', 'read_file.cpp', 'text_proto.cpp']
+srcs = ['memcpy_interleaved.cpp', 'metacube2.cpp', 'ffmpeg_raii.cpp', 'mux.cpp', 'metrics.cpp', 'context.cpp', 'httpd.cpp', 'disk_space_estimator.cpp', 'read_file.cpp', 'text_proto.cpp', 'midi_device.cpp']
 
 # Qt objects.
 srcs += qt_files
 srcs += ['aboutdialog.cpp']
 
-shared = static_library('shared', srcs, include_directories: top_include, dependencies: [shared_qt5deps, libmicrohttpddep, protobufdep])
+shared = static_library('shared', srcs, include_directories: top_include, dependencies: [shared_qt5deps, libmicrohttpddep, protobufdep, alsadep])
 shareddep = declare_dependency(
    include_directories: top_include,
    link_with: shared)

diff --git a/nageru/midi_device.cpp b/shared/midi_device.cpp
similarity index 100%
rename from nageru/midi_device.cpp
rename to shared/midi_device.cpp

diff --git a/nageru/midi_device.h b/shared/midi_device.h
similarity index 100%
rename from nageru/midi_device.h
rename to shared/midi_device.h