Move everything into a separate futatabi/ subdir, for the upcoming merge with Futatabi.

diff --git a/bmusb b/bmusb
index e9aa80b8e6a09cf2c8b3458a1c395b6f1b6a58cc..5163d25c65c3028090db1aea6587ec2fb4cb823e 160000 (submodule)
--- a/bmusb
+++ b/bmusb
@@ -1 +1 @@
-Subproject commit e9aa80b8e6a09cf2c8b3458a1c395b6f1b6a58cc
+Subproject commit 5163d25c65c3028090db1aea6587ec2fb4cb823e

diff --git a/meson.build b/meson.build
index cc161f2dae4e4a12576960e7c89d398289564fa7..15184b878e0298c647f8e78b99cb03a2f933567e 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,252 +1,3 @@
 project('nageru', 'cpp', default_options: ['buildtype=debugoptimized'])
-qt5 = import('qt5')
-protoc = find_program('protoc')
-cxx = meson.get_compiler('cpp')
+subdir('nageru')
 
-# Use lld if we can; it links a lot faster than ld.bfd or gold.
-nageru_link_args = []
-code = '''#include <stdio.h>
-int main() { printf("Hello, world!\n"); return 0; }
-'''
-if cxx.links(code, args: '-fuse-ld=lld', name: 'check for LLD')
-       nageru_link_args += '-fuse-ld=lld'
-endif
-
-embedded_bmusb = get_option('embedded_bmusb')
-
-alsadep = dependency('alsa')
-bmusbdep = dependency('bmusb', required: not embedded_bmusb)
-dldep = cxx.find_library('dl')
-epoxydep = dependency('epoxy')
-libavcodecdep = dependency('libavcodec')
-libavformatdep = dependency('libavformat')
-libavresampledep = dependency('libavresample')
-libavutildep = dependency('libavutil')
-libjpegdep = dependency('libjpeg')
-libmicrohttpddep = dependency('libmicrohttpd')
-libswscaledep = dependency('libswscale')
-libusbdep = dependency('libusb-1.0')
-luajitdep = dependency('luajit')
-movitdep = dependency('movit')
-protobufdep = dependency('protobuf')
-qcustomplotdep = cxx.find_library('qcustomplot')
-qt5deps = dependency('qt5', modules: ['Core', 'Gui', 'Widgets', 'OpenGLExtensions', 'OpenGL', 'PrintSupport'])
-threaddep = dependency('threads')
-vadrmdep = dependency('libva-drm')
-vax11dep = dependency('libva-x11')
-x11dep = dependency('x11')
-x264dep = dependency('x264')
-zitaresamplerdep = cxx.find_library('zita-resampler')
-
-srcs = []
-nageru_deps = [qt5deps, libjpegdep, movitdep, libmicrohttpddep, protobufdep,
-       vax11dep, vadrmdep, x11dep, libavformatdep, libavresampledep, libavcodecdep, libavutildep,
-       libswscaledep, libusbdep, luajitdep, dldep, x264dep, alsadep, zitaresamplerdep,
-       qcustomplotdep, threaddep]
-nageru_include_dirs = []
-nageru_link_with = []
-nageru_build_rpath = ''
-nageru_install_rpath = ''
-
-kaeru_link_with = []
-kaeru_extra_deps = []
-
-# DeckLink has these issues, and we include it from various places.
-if cxx.has_argument('-Wno-non-virtual-dtor')
-       add_project_arguments('-Wno-non-virtual-dtor', language: 'cpp')
-endif
-
-# FFmpeg has a lot of deprecated APIs whose replacements are not available
-# in Debian stable, so we suppress these warnings.
-if cxx.has_argument('-Wno-deprecated-declarations')
-       add_project_arguments('-Wno-deprecated-declarations', language: 'cpp')
-endif
-
-# Add the right MOVIT_SHADER_DIR definition.
-r = run_command('pkg-config', '--variable=shaderdir', 'movit')
-if r.returncode() != 0
-       error('Movit pkg-config installation is broken.')
-endif
-add_project_arguments('-DMOVIT_SHADER_DIR="' + r.stdout().strip() + '"', language: 'cpp')
-
-# CEF.
-exe_dir = join_paths(get_option('prefix'), 'lib/nageru')
-cef_dir = get_option('cef_dir')
-cef_build_type = get_option('cef_build_type')
-have_cef = (cef_dir != '')
-if have_cef
-       add_project_arguments('-DHAVE_CEF=1', language: 'cpp')
-
-       system_cef = (cef_build_type == 'system')
-       if system_cef
-               cef_lib_dir = cef_dir
-               cef_resource_dir = '/usr/share/cef/Resources'
-       else
-               cef_lib_dir = join_paths(cef_dir, cef_build_type)
-               cef_resource_dir = join_paths(cef_dir, 'Resources')
-
-               nageru_include_dirs += include_directories(cef_dir)
-               nageru_include_dirs += include_directories(join_paths(cef_dir, 'include'))
-               nageru_build_rpath = cef_lib_dir
-               nageru_install_rpath = '$ORIGIN/'
-       endif
-
-       cefdep = cxx.find_library('cef')
-       nageru_deps += cefdep
-
-       # CEF wrapper library; not built as part of the CEF binary distribution,
-       # but should be if CEF is installed as a system library.
-       if system_cef
-               cefdlldep = cxx.find_library('cef_dll_wrapper')
-               nageru_deps += cefdlldep
-       else
-               cmake = find_program('cmake')
-               cef_compile_script = find_program('scripts/compile_cef_dll_wrapper.sh')
-
-               cef_dll_target = custom_target('libcef_dll_wrapper',
-                       input: join_paths(cef_dir, 'libcef_dll/CMakeLists.txt'),
-                       output: ['libcef_dll_wrapper.a', 'cef-stamp'],
-                       command: [cef_compile_script, '@BUILD_DIR@', cef_dir, cmake, '@OUTPUT@'])
-
-               # Putting the .a in sources seemingly hits a bug where the .a files get sorted
-               # in the wrong order. This is a workaround; see
-               # https://github.com/mesonbuild/meson/issues/3613#issuecomment-408276296 .
-               cefdlldep = declare_dependency(sources: cef_dll_target[1], link_args: cef_dll_target.full_path())
-               nageru_deps += cefdlldep
-       endif
-
-       cef_libs = ['libEGL.so', 'libGLESv2.so', 'natives_blob.bin', 'snapshot_blob.bin', 'v8_context_snapshot.bin']
-       cef_resources = ['cef.pak', 'cef_100_percent.pak', 'cef_200_percent.pak', 'cef_extensions.pak', 'devtools_resources.pak']
-       if not get_option('cef_no_icudtl')
-               cef_resources += ['icudtl.dat']
-       endif
-       if cef_build_type != 'system'
-               cef_libs += ['libcef.so']
-       endif
-
-       # Symlink the files into the build directory, so that running nageru without ninja install works.
-       run_command('mkdir', join_paths(meson.current_build_dir(), 'locales/'))
-       foreach file : cef_libs
-               run_command('ln', '-s', join_paths(cef_lib_dir, file), meson.current_build_dir())
-               install_data(join_paths(cef_lib_dir, file), install_dir: exe_dir)
-       endforeach
-       foreach file : cef_resources
-               run_command('ln', '-s', join_paths(cef_resource_dir, file), meson.current_build_dir())
-               install_data(join_paths(cef_resource_dir, file), install_dir: exe_dir)
-       endforeach
-       run_command('ln', '-s', join_paths(cef_resource_dir, 'locales/en-US.pak'), join_paths(meson.current_build_dir(), 'locales/'))
-       install_data(join_paths(cef_resource_dir, 'locales/en-US.pak'), install_dir: join_paths(exe_dir, 'locales'))
-endif
-
-# bmusb.
-if embedded_bmusb
-       bmusb_dir = include_directories('bmusb')
-       nageru_include_dirs += bmusb_dir
-
-       bmusb = static_library('bmusb', 'bmusb/bmusb.cpp', 'bmusb/fake_capture.cpp',
-               dependencies: [libusbdep],
-               include_directories: [bmusb_dir])
-       nageru_link_with += bmusb
-       kaeru_link_with += bmusb
-else
-       nageru_deps += bmusbdep
-       kaeru_extra_deps += bmusbdep
-endif
-
-# Protobuf compilation.
-gen = generator(protoc, \
-       output    : ['@BASENAME@.pb.cc', '@BASENAME@.pb.h'],
-       arguments : ['--proto_path=@CURRENT_SOURCE_DIR@', '--cpp_out=@BUILD_DIR@', '@INPUT@'])
-proto_generated = gen.process(['state.proto', 'midi_mapping.proto', 'json.proto'])
-protobuf_lib = static_library('protobufs', proto_generated, dependencies: nageru_deps, include_directories: nageru_include_dirs)
-protobuf_hdrs = declare_dependency(sources: proto_generated)
-nageru_link_with += protobuf_lib
-
-# Preprocess Qt as needed.
-qt_files = qt5.preprocess(
-       moc_headers: ['aboutdialog.h', 'analyzer.h', 'clickable_label.h', 'compression_reduction_meter.h', 'correlation_meter.h',
-               'ellipsis_label.h', 'glwidget.h', 'input_mapping_dialog.h', 'lrameter.h', 'mainwindow.h', 'midi_mapping_dialog.h',
-               'nonlinear_fader.h', 'vumeter.h'],
-       ui_files: ['aboutdialog.ui', 'analyzer.ui', 'audio_expanded_view.ui', 'audio_miniview.ui', 'display.ui',
-               'input_mapping.ui', 'mainwindow.ui', 'midi_mapping.ui'],
-       dependencies: qt5deps)
-
-# Qt objects.
-srcs += ['glwidget.cpp', 'mainwindow.cpp', 'vumeter.cpp', 'lrameter.cpp', 'compression_reduction_meter.cpp',
-       'correlation_meter.cpp', 'aboutdialog.cpp', 'analyzer.cpp', 'input_mapping_dialog.cpp', 'midi_mapping_dialog.cpp',
-       'nonlinear_fader.cpp', 'context_menus.cpp', 'vu_common.cpp', 'piecewise_interpolator.cpp', 'midi_mapper.cpp']
-
-# Auxiliary objects used for nearly everything.
-aux_srcs = ['metrics.cpp', 'flags.cpp']
-aux = static_library('aux', aux_srcs, dependencies: nageru_deps, include_directories: nageru_include_dirs)
-nageru_link_with += aux
-
-# Audio objects.
-audio_mixer_srcs = ['audio_mixer.cpp', 'alsa_input.cpp', 'alsa_pool.cpp', 'ebu_r128_proc.cc', 'stereocompressor.cpp',
-       'resampling_queue.cpp', 'flags.cpp', 'correlation_measurer.cpp', 'filter.cpp', 'input_mapping.cpp']
-audio = static_library('audio', audio_mixer_srcs, dependencies: [nageru_deps, protobuf_hdrs], include_directories: nageru_include_dirs)
-nageru_link_with += audio
-
-# Mixer objects.
-srcs += ['chroma_subsampler.cpp', 'v210_converter.cpp', 'mixer.cpp', 'pbo_frame_allocator.cpp',
-       'context.cpp', 'theme.cpp', 'image_input.cpp', 'alsa_output.cpp',
-       'disk_space_estimator.cpp', 'timecode_renderer.cpp', 'tweaked_inputs.cpp']
-
-# Streaming and encoding objects (largely the set that is shared between Nageru and Kaeru).
-stream_srcs = ['quicksync_encoder.cpp', 'x264_encoder.cpp', 'x264_dynamic.cpp', 'x264_speed_control.cpp', 'video_encoder.cpp',
-       'metacube2.cpp', 'mux.cpp', 'audio_encoder.cpp', 'ffmpeg_raii.cpp', 'ffmpeg_util.cpp', 'httpd.cpp', 'ffmpeg_capture.cpp',
-       'print_latency.cpp', 'basic_stats.cpp', 'ref_counted_frame.cpp']
-stream = static_library('stream', stream_srcs, dependencies: nageru_deps, include_directories: nageru_include_dirs)
-nageru_link_with += stream
-
-# DeckLink.
-srcs += ['decklink_capture.cpp', 'decklink_util.cpp', 'decklink_output.cpp', 'memcpy_interleaved.cpp',
-       'decklink/DeckLinkAPIDispatch.cpp']
-decklink_dir = include_directories('decklink')
-nageru_include_dirs += decklink_dir
-
-# CEF input.
-if have_cef
-       srcs += ['nageru_cef_app.cpp', 'cef_capture.cpp']
-endif
-
-srcs += qt_files
-srcs += proto_generated
-
-# Everything except main.cpp. (We do this because if you specify a .cpp file in
-# both Nageru and Kaeru, it gets compiled twice. In the older Makefiles, Kaeru
-# depended on a smaller set of objects.)
-core = static_library('core', srcs, dependencies: nageru_deps, include_directories: nageru_include_dirs)
-nageru_link_with += core
-
-# Nageru executable; it goes into /usr/lib/nageru since CEF files go there, too
-# (we can't put them straight into /usr/bin).
-executable('nageru', 'main.cpp',
-       dependencies: nageru_deps,
-       include_directories: nageru_include_dirs,
-       link_with: nageru_link_with,
-       link_args: nageru_link_args,
-       build_rpath: nageru_build_rpath,
-       install_rpath: nageru_install_rpath,
-       install: true,
-       install_dir: exe_dir
-)
-meson.add_install_script('scripts/setup_nageru_symlink.sh')
-
-# Kaeru executable.
-executable('kaeru', 'kaeru.cpp',
-       dependencies: [nageru_deps, kaeru_extra_deps],
-       include_directories: nageru_include_dirs,
-       link_with: [stream, aux, kaeru_link_with],
-       link_args: nageru_link_args,
-       install: true)
-
-# Audio mixer microbenchmark.
-executable('benchmark_audio_mixer', 'benchmark_audio_mixer.cpp', dependencies: nageru_deps, include_directories: nageru_include_dirs, link_args: nageru_link_args, link_with: [audio, aux])
-
-# These are needed for a default run.
-data_files = ['theme.lua', 'simple.lua', 'bg.jpeg', 'akai_midimix.midimapping']
-install_data(data_files, install_dir: join_paths(get_option('prefix'), 'share/nageru'))
-foreach file : data_files
-       run_command('ln', '-s', join_paths(meson.current_source_dir(), file), meson.current_build_dir())
-endforeach

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

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

diff --git a/aboutdialog.ui b/nageru/aboutdialog.ui
similarity index 100%
rename from aboutdialog.ui
rename to nageru/aboutdialog.ui

diff --git a/akai_midimix.midimapping b/nageru/akai_midimix.midimapping
similarity index 100%
rename from akai_midimix.midimapping
rename to nageru/akai_midimix.midimapping

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

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

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

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

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

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

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

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

diff --git a/analyzer.ui b/nageru/analyzer.ui
similarity index 100%
rename from analyzer.ui
rename to nageru/analyzer.ui

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

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

diff --git a/audio_expanded_view.ui b/nageru/audio_expanded_view.ui
similarity index 100%
rename from audio_expanded_view.ui
rename to nageru/audio_expanded_view.ui

diff --git a/audio_miniview.ui b/nageru/audio_miniview.ui
similarity index 100%
rename from audio_miniview.ui
rename to nageru/audio_miniview.ui

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

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

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

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

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

diff --git a/bg.jpeg b/nageru/bg.jpeg
similarity index 100%
rename from bg.jpeg
rename to nageru/bg.jpeg

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/display.ui b/nageru/display.ui
similarity index 100%
rename from display.ui
rename to nageru/display.ui

diff --git a/ebu_r128_proc.cc b/nageru/ebu_r128_proc.cc
similarity index 100%
rename from ebu_r128_proc.cc
rename to nageru/ebu_r128_proc.cc

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/input_mapping.ui b/nageru/input_mapping.ui
similarity index 100%
rename from input_mapping.ui
rename to nageru/input_mapping.ui

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

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

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

diff --git a/json.proto b/nageru/json.proto
similarity index 100%
rename from json.proto
rename to nageru/json.proto

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

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

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

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

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

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

diff --git a/mainwindow.ui b/nageru/mainwindow.ui
similarity index 100%
rename from mainwindow.ui
rename to nageru/mainwindow.ui

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

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

diff --git a/nageru/meson.build b/nageru/meson.build
new file mode 100644 (file)
index 0000000..bc93a28
--- /dev/null
+++ b/nageru/meson.build
@@ -0,0 +1,251 @@
+qt5 = import('qt5')
+protoc = find_program('protoc')
+cxx = meson.get_compiler('cpp')
+
+# Use lld if we can; it links a lot faster than ld.bfd or gold.
+nageru_link_args = []
+code = '''#include <stdio.h>
+int main() { printf("Hello, world!\n"); return 0; }
+'''
+if cxx.links(code, args: '-fuse-ld=lld', name: 'check for LLD')
+       nageru_link_args += '-fuse-ld=lld'
+endif
+
+embedded_bmusb = get_option('embedded_bmusb')
+
+alsadep = dependency('alsa')
+bmusbdep = dependency('bmusb', required: not embedded_bmusb)
+dldep = cxx.find_library('dl')
+epoxydep = dependency('epoxy')
+libavcodecdep = dependency('libavcodec')
+libavformatdep = dependency('libavformat')
+libavresampledep = dependency('libavresample')
+libavutildep = dependency('libavutil')
+libjpegdep = dependency('libjpeg')
+libmicrohttpddep = dependency('libmicrohttpd')
+libswscaledep = dependency('libswscale')
+libusbdep = dependency('libusb-1.0')
+luajitdep = dependency('luajit')
+movitdep = dependency('movit')
+protobufdep = dependency('protobuf')
+qcustomplotdep = cxx.find_library('qcustomplot')
+qt5deps = dependency('qt5', modules: ['Core', 'Gui', 'Widgets', 'OpenGLExtensions', 'OpenGL', 'PrintSupport'])
+threaddep = dependency('threads')
+vadrmdep = dependency('libva-drm')
+vax11dep = dependency('libva-x11')
+x11dep = dependency('x11')
+x264dep = dependency('x264')
+zitaresamplerdep = cxx.find_library('zita-resampler')
+
+srcs = []
+nageru_deps = [qt5deps, libjpegdep, movitdep, libmicrohttpddep, protobufdep,
+       vax11dep, vadrmdep, x11dep, libavformatdep, libavresampledep, libavcodecdep, libavutildep,
+       libswscaledep, libusbdep, luajitdep, dldep, x264dep, alsadep, zitaresamplerdep,
+       qcustomplotdep, threaddep]
+nageru_include_dirs = []
+nageru_link_with = []
+nageru_build_rpath = ''
+nageru_install_rpath = ''
+
+kaeru_link_with = []
+kaeru_extra_deps = []
+
+# DeckLink has these issues, and we include it from various places.
+if cxx.has_argument('-Wno-non-virtual-dtor')
+       add_project_arguments('-Wno-non-virtual-dtor', language: 'cpp')
+endif
+
+# FFmpeg has a lot of deprecated APIs whose replacements are not available
+# in Debian stable, so we suppress these warnings.
+if cxx.has_argument('-Wno-deprecated-declarations')
+       add_project_arguments('-Wno-deprecated-declarations', language: 'cpp')
+endif
+
+# Add the right MOVIT_SHADER_DIR definition.
+r = run_command('pkg-config', '--variable=shaderdir', 'movit')
+if r.returncode() != 0
+       error('Movit pkg-config installation is broken.')
+endif
+add_project_arguments('-DMOVIT_SHADER_DIR="' + r.stdout().strip() + '"', language: 'cpp')
+
+# CEF.
+exe_dir = join_paths(get_option('prefix'), 'lib/nageru')
+cef_dir = get_option('cef_dir')
+cef_build_type = get_option('cef_build_type')
+have_cef = (cef_dir != '')
+if have_cef
+       add_project_arguments('-DHAVE_CEF=1', language: 'cpp')
+
+       system_cef = (cef_build_type == 'system')
+       if system_cef
+               cef_lib_dir = cef_dir
+               cef_resource_dir = '/usr/share/cef/Resources'
+       else
+               cef_lib_dir = join_paths(cef_dir, cef_build_type)
+               cef_resource_dir = join_paths(cef_dir, 'Resources')
+
+               nageru_include_dirs += include_directories(cef_dir)
+               nageru_include_dirs += include_directories(join_paths(cef_dir, 'include'))
+               nageru_build_rpath = cef_lib_dir
+               nageru_install_rpath = '$ORIGIN/'
+       endif
+
+       cefdep = cxx.find_library('cef')
+       nageru_deps += cefdep
+
+       # CEF wrapper library; not built as part of the CEF binary distribution,
+       # but should be if CEF is installed as a system library.
+       if system_cef
+               cefdlldep = cxx.find_library('cef_dll_wrapper')
+               nageru_deps += cefdlldep
+       else
+               cmake = find_program('cmake')
+               cef_compile_script = find_program('scripts/compile_cef_dll_wrapper.sh')
+
+               cef_dll_target = custom_target('libcef_dll_wrapper',
+                       input: join_paths(cef_dir, 'libcef_dll/CMakeLists.txt'),
+                       output: ['libcef_dll_wrapper.a', 'cef-stamp'],
+                       command: [cef_compile_script, '@BUILD_DIR@', cef_dir, cmake, '@OUTPUT@'])
+
+               # Putting the .a in sources seemingly hits a bug where the .a files get sorted
+               # in the wrong order. This is a workaround; see
+               # https://github.com/mesonbuild/meson/issues/3613#issuecomment-408276296 .
+               cefdlldep = declare_dependency(sources: cef_dll_target[1], link_args: cef_dll_target.full_path())
+               nageru_deps += cefdlldep
+       endif
+
+       cef_libs = ['libEGL.so', 'libGLESv2.so', 'natives_blob.bin', 'snapshot_blob.bin', 'v8_context_snapshot.bin']
+       cef_resources = ['cef.pak', 'cef_100_percent.pak', 'cef_200_percent.pak', 'cef_extensions.pak', 'devtools_resources.pak']
+       if not get_option('cef_no_icudtl')
+               cef_resources += ['icudtl.dat']
+       endif
+       if cef_build_type != 'system'
+               cef_libs += ['libcef.so']
+       endif
+
+       # Symlink the files into the build directory, so that running nageru without ninja install works.
+       run_command('mkdir', join_paths(meson.current_build_dir(), 'locales/'))
+       foreach file : cef_libs
+               run_command('ln', '-s', join_paths(cef_lib_dir, file), meson.current_build_dir())
+               install_data(join_paths(cef_lib_dir, file), install_dir: exe_dir)
+       endforeach
+       foreach file : cef_resources
+               run_command('ln', '-s', join_paths(cef_resource_dir, file), meson.current_build_dir())
+               install_data(join_paths(cef_resource_dir, file), install_dir: exe_dir)
+       endforeach
+       run_command('ln', '-s', join_paths(cef_resource_dir, 'locales/en-US.pak'), join_paths(meson.current_build_dir(), 'locales/'))
+       install_data(join_paths(cef_resource_dir, 'locales/en-US.pak'), install_dir: join_paths(exe_dir, 'locales'))
+endif
+
+# bmusb.
+if embedded_bmusb
+       bmusb_dir = include_directories('bmusb')
+       nageru_include_dirs += bmusb_dir
+
+       bmusb = static_library('bmusb', 'bmusb/bmusb.cpp', 'bmusb/fake_capture.cpp',
+               dependencies: [libusbdep],
+               include_directories: [bmusb_dir])
+       nageru_link_with += bmusb
+       kaeru_link_with += bmusb
+else
+       nageru_deps += bmusbdep
+       kaeru_extra_deps += bmusbdep
+endif
+
+# Protobuf compilation.
+gen = generator(protoc, \
+       output    : ['@BASENAME@.pb.cc', '@BASENAME@.pb.h'],
+       arguments : ['--proto_path=@CURRENT_SOURCE_DIR@', '--cpp_out=@BUILD_DIR@', '@INPUT@'])
+proto_generated = gen.process(['state.proto', 'midi_mapping.proto', 'json.proto'])
+protobuf_lib = static_library('protobufs', proto_generated, dependencies: nageru_deps, include_directories: nageru_include_dirs)
+protobuf_hdrs = declare_dependency(sources: proto_generated)
+nageru_link_with += protobuf_lib
+
+# Preprocess Qt as needed.
+qt_files = qt5.preprocess(
+       moc_headers: ['aboutdialog.h', 'analyzer.h', 'clickable_label.h', 'compression_reduction_meter.h', 'correlation_meter.h',
+               'ellipsis_label.h', 'glwidget.h', 'input_mapping_dialog.h', 'lrameter.h', 'mainwindow.h', 'midi_mapping_dialog.h',
+               'nonlinear_fader.h', 'vumeter.h'],
+       ui_files: ['aboutdialog.ui', 'analyzer.ui', 'audio_expanded_view.ui', 'audio_miniview.ui', 'display.ui',
+               'input_mapping.ui', 'mainwindow.ui', 'midi_mapping.ui'],
+       dependencies: qt5deps)
+
+# Qt objects.
+srcs += ['glwidget.cpp', 'mainwindow.cpp', 'vumeter.cpp', 'lrameter.cpp', 'compression_reduction_meter.cpp',
+       'correlation_meter.cpp', 'aboutdialog.cpp', 'analyzer.cpp', 'input_mapping_dialog.cpp', 'midi_mapping_dialog.cpp',
+       'nonlinear_fader.cpp', 'context_menus.cpp', 'vu_common.cpp', 'piecewise_interpolator.cpp', 'midi_mapper.cpp']
+
+# Auxiliary objects used for nearly everything.
+aux_srcs = ['metrics.cpp', 'flags.cpp']
+aux = static_library('aux', aux_srcs, dependencies: nageru_deps, include_directories: nageru_include_dirs)
+nageru_link_with += aux
+
+# Audio objects.
+audio_mixer_srcs = ['audio_mixer.cpp', 'alsa_input.cpp', 'alsa_pool.cpp', 'ebu_r128_proc.cc', 'stereocompressor.cpp',
+       'resampling_queue.cpp', 'flags.cpp', 'correlation_measurer.cpp', 'filter.cpp', 'input_mapping.cpp']
+audio = static_library('audio', audio_mixer_srcs, dependencies: [nageru_deps, protobuf_hdrs], include_directories: nageru_include_dirs)
+nageru_link_with += audio
+
+# Mixer objects.
+srcs += ['chroma_subsampler.cpp', 'v210_converter.cpp', 'mixer.cpp', 'pbo_frame_allocator.cpp',
+       'context.cpp', 'theme.cpp', 'image_input.cpp', 'alsa_output.cpp',
+       'disk_space_estimator.cpp', 'timecode_renderer.cpp', 'tweaked_inputs.cpp']
+
+# Streaming and encoding objects (largely the set that is shared between Nageru and Kaeru).
+stream_srcs = ['quicksync_encoder.cpp', 'x264_encoder.cpp', 'x264_dynamic.cpp', 'x264_speed_control.cpp', 'video_encoder.cpp',
+       'metacube2.cpp', 'mux.cpp', 'audio_encoder.cpp', 'ffmpeg_raii.cpp', 'ffmpeg_util.cpp', 'httpd.cpp', 'ffmpeg_capture.cpp',
+       'print_latency.cpp', 'basic_stats.cpp', 'ref_counted_frame.cpp']
+stream = static_library('stream', stream_srcs, dependencies: nageru_deps, include_directories: nageru_include_dirs)
+nageru_link_with += stream
+
+# DeckLink.
+srcs += ['decklink_capture.cpp', 'decklink_util.cpp', 'decklink_output.cpp', 'memcpy_interleaved.cpp',
+       'decklink/DeckLinkAPIDispatch.cpp']
+decklink_dir = include_directories('decklink')
+nageru_include_dirs += decklink_dir
+
+# CEF input.
+if have_cef
+       srcs += ['nageru_cef_app.cpp', 'cef_capture.cpp']
+endif
+
+srcs += qt_files
+srcs += proto_generated
+
+# Everything except main.cpp. (We do this because if you specify a .cpp file in
+# both Nageru and Kaeru, it gets compiled twice. In the older Makefiles, Kaeru
+# depended on a smaller set of objects.)
+core = static_library('core', srcs, dependencies: nageru_deps, include_directories: nageru_include_dirs)
+nageru_link_with += core
+
+# Nageru executable; it goes into /usr/lib/nageru since CEF files go there, too
+# (we can't put them straight into /usr/bin).
+executable('nageru', 'main.cpp',
+       dependencies: nageru_deps,
+       include_directories: nageru_include_dirs,
+       link_with: nageru_link_with,
+       link_args: nageru_link_args,
+       build_rpath: nageru_build_rpath,
+       install_rpath: nageru_install_rpath,
+       install: true,
+       install_dir: exe_dir
+)
+meson.add_install_script('scripts/setup_nageru_symlink.sh')
+
+# Kaeru executable.
+executable('kaeru', 'kaeru.cpp',
+       dependencies: [nageru_deps, kaeru_extra_deps],
+       include_directories: nageru_include_dirs,
+       link_with: [stream, aux, kaeru_link_with],
+       link_args: nageru_link_args,
+       install: true)
+
+# Audio mixer microbenchmark.
+executable('benchmark_audio_mixer', 'benchmark_audio_mixer.cpp', dependencies: nageru_deps, include_directories: nageru_include_dirs, link_args: nageru_link_args, link_with: [audio, aux])
+
+# These are needed for a default run.
+data_files = ['theme.lua', 'simple.lua', 'bg.jpeg', 'akai_midimix.midimapping']
+install_data(data_files, install_dir: join_paths(get_option('prefix'), 'share/nageru'))
+foreach file : data_files
+       run_command('ln', '-s', join_paths(meson.current_source_dir(), file), meson.current_build_dir())
+endforeach

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

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

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

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

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

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

diff --git a/midi_mapping.proto b/nageru/midi_mapping.proto
similarity index 100%
rename from midi_mapping.proto
rename to nageru/midi_mapping.proto

diff --git a/midi_mapping.ui b/nageru/midi_mapping.ui
similarity index 100%
rename from midi_mapping.ui
rename to nageru/midi_mapping.ui

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/scripts/compile_cef_dll_wrapper.sh b/nageru/scripts/compile_cef_dll_wrapper.sh
similarity index 100%
rename from scripts/compile_cef_dll_wrapper.sh
rename to nageru/scripts/compile_cef_dll_wrapper.sh

diff --git a/scripts/setup_nageru_symlink.sh b/nageru/scripts/setup_nageru_symlink.sh
similarity index 100%
rename from scripts/setup_nageru_symlink.sh
rename to nageru/scripts/setup_nageru_symlink.sh

diff --git a/simple.lua b/nageru/simple.lua
similarity index 100%
rename from simple.lua
rename to nageru/simple.lua

diff --git a/state.proto b/nageru/state.proto
similarity index 100%
rename from state.proto
rename to nageru/state.proto

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

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

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

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

diff --git a/theme.lua b/nageru/theme.lua
similarity index 100%
rename from theme.lua
rename to nageru/theme.lua

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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