Merge pull request #206 from jpcima/render

Some cleanup around cmake and sfizz_render

.gitmodules

@@ -19,11 +19,3 @@
 	path = vst/external/VST_SDK/VST3_SDK/vstgui4
 	url = https://github.com/sfztools/vstgui.git
 	shallow = true
-[submodule "clients/external/fmidi"]
-	path = clients/external/fmidi
-	url = https://github.com/jpcima/fmidi.git
-	shallow = true
-[submodule "clients/external/fmt"]
-	path = clients/external/fmt
-	url = https://github.com/fmtlib/fmt.git
-	shallow = true

CMakeLists.txt

@@ -26,6 +26,7 @@ endif()
 
 option (ENABLE_LTO              "Enable Link Time Optimization [default: ON]" ON)
 option (SFIZZ_JACK              "Enable JACK stand-alone build [default: ON]" ON)
+option (SFIZZ_RENDER            "Enable renderer of SMF files [default: ON]" ON)
 option (SFIZZ_LV2               "Enable LV2 plug-in build [default: ON]" ON)
 option (SFIZZ_VST               "Enable VST plug-in build [default: OFF]" OFF)
 option (SFIZZ_BENCHMARKS        "Enable benchmarks build [default: OFF]" OFF)
@@ -45,9 +46,7 @@ add_subdirectory (external/abseil-cpp EXCLUDE_FROM_ALL)
 add_subdirectory (src)
 
 # Optional targets
-if (SFIZZ_JACK)
-    add_subdirectory (clients)
-endif()
+add_subdirectory (clients)
 
 if (SFIZZ_LV2)
     add_subdirectory (lv2)

clients/CMakeLists.txt

@@ -1,21 +1,24 @@
 project (sfizz)
 
-find_package(PkgConfig REQUIRED)
-pkg_check_modules(JACK "jack" REQUIRED)
+if (SFIZZ_JACK)
+    find_package(PkgConfig REQUIRED)
+    pkg_check_modules(JACK "jack" REQUIRED)
 
-add_executable (sfizz_jack jack_client.cpp)
-target_include_directories (sfizz_jack PRIVATE ${JACK_INCLUDE_DIRS})
-target_link_libraries (sfizz_jack PRIVATE sfizz::sfizz jack absl::flags_parse ${JACK_LIBRARIES})
-sfizz_enable_lto_if_needed (sfizz_jack)
-install (TARGETS sfizz_jack DESTINATION ${CMAKE_INSTALL_BINDIR}
-COMPONENT "jack" OPTIONAL)
+    add_executable (sfizz_jack jack_client.cpp)
+    target_include_directories (sfizz_jack PRIVATE ${JACK_INCLUDE_DIRS})
+    target_link_libraries (sfizz_jack PRIVATE sfizz::sfizz jack absl::flags_parse ${JACK_LIBRARIES})
+    sfizz_enable_lto_if_needed (sfizz_jack)
+    install (TARGETS sfizz_jack DESTINATION ${CMAKE_INSTALL_BINDIR}
+        COMPONENT "jack" OPTIONAL)
+endif()
 
-add_library(fmidi-fmt INTERFACE)
-target_include_directories(fmidi-fmt INTERFACE "external/fmt/include")
-target_compile_definitions(fmidi-fmt INTERFACE "FMT_HEADER_ONLY=1")
-add_subdirectory(external/fmidi EXCLUDE_FROM_ALL)
+if (SFIZZ_RENDER)
+    add_library(sfizz-fmidi STATIC "external/fmidi/sources/fmidi/fmidi_mini.cpp")
+    target_include_directories(sfizz-fmidi PUBLIC "external/fmidi/sources")
+    target_compile_definitions(sfizz-fmidi PUBLIC "FMIDI_STATIC=1" "FMIDI_DISABLE_DESCRIBE_API=1")
 
-add_executable(sfizz_render sfizz_render.cpp)
-target_link_libraries(sfizz_render sfizz::sfizz fmidi)
-sfizz_enable_lto_if_needed (sfizz_render)
-install (TARGETS sfizz_render DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL)
+    add_executable(sfizz_render sfizz_render.cpp)
+    target_link_libraries(sfizz_render PRIVATE sfizz::sfizz sfizz-fmidi sfizz-sndfile)
+    sfizz_enable_lto_if_needed (sfizz_render)
+    install (TARGETS sfizz_render DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT "render" OPTIONAL)
+endif()

clients/external/fmidi

@@ -1 +0,0 @@
-Subproject commit 46a045c7f327d827baeddd627604907fc29ef17e

clients/external/fmidi/LICENSE.md

@@ -0,0 +1,23 @@
+# Boost Software License - Version 1.0 - August 17th, 2003
+
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.

clients/external/fmidi/sources/fmidi/fmidi.h

@@ -0,0 +1,251 @@
+// =============================================================================
+//
+// The Fmidi library - a free software toolkit for MIDI file processing
+//
+// =============================================================================
+//          Copyright Jean Pierre Cimalando 2018.
+// Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE.md or copy at
+//          http://www.boost.org/LICENSE_1_0.txt)
+
+#pragma once
+#include <stdio.h>
+#include <stdint.h>
+#include <stddef.h>
+#if !defined(__cplusplus)
+# include <stdbool.h>
+#endif
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+#if defined(_WIN32) && defined(FMIDI_BUILD) && !defined(FMIDI_STATIC)
+# define FMIDI_API __declspec(dllexport)
+#elif defined(_WIN32) && !defined(FMIDI_BUILD) && !defined(FMIDI_STATIC)
+# define FMIDI_API __declspec(dllimport)
+#elif defined(__GNUC__)
+# define FMIDI_API __attribute__((visibility("default")))
+#else
+# define FMIDI_API
+#endif
+
+///////////
+// INPUT //
+///////////
+
+typedef struct fmidi_smf fmidi_smf_t;
+
+FMIDI_API fmidi_smf_t *fmidi_smf_mem_read(const uint8_t *data, size_t length);
+FMIDI_API fmidi_smf_t *fmidi_smf_file_read(const char *filename);
+FMIDI_API fmidi_smf_t *fmidi_smf_stream_read(FILE *stream);
+FMIDI_API void fmidi_smf_free(fmidi_smf_t *smf);
+
+typedef struct fmidi_smf_info {
+    uint16_t format;
+    uint16_t track_count;
+    uint16_t delta_unit;
+} fmidi_smf_info_t;
+
+FMIDI_API const fmidi_smf_info_t *fmidi_smf_get_info(const fmidi_smf_t *smf);
+FMIDI_API double fmidi_smf_compute_duration(const fmidi_smf_t *smf);
+
+////////////
+// OUTPUT //
+////////////
+
+FMIDI_API bool fmidi_smf_mem_write(const fmidi_smf_t *smf, uint8_t **data, size_t *length);
+FMIDI_API bool fmidi_smf_file_write(const fmidi_smf_t *smf, const char *filename);
+FMIDI_API bool fmidi_smf_stream_write(const fmidi_smf_t *smf, FILE *stream);
+
+////////////////////
+// IDENTIFICATION //
+////////////////////
+
+typedef enum fmidi_fileformat {
+    fmidi_fileformat_smf,
+    fmidi_fileformat_xmi,
+} fmidi_fileformat_t;
+
+FMIDI_API fmidi_fileformat_t fmidi_mem_identify(const uint8_t *data, size_t length);
+FMIDI_API fmidi_fileformat_t fmidi_stream_identify(FILE *stream);
+
+FMIDI_API fmidi_smf_t *fmidi_auto_mem_read(const uint8_t *data, size_t length);
+FMIDI_API fmidi_smf_t *fmidi_auto_file_read(const char *filename);
+FMIDI_API fmidi_smf_t *fmidi_auto_stream_read(FILE *stream);
+
+////////////
+// EVENTS //
+////////////
+
+typedef enum fmidi_event_type {
+    fmidi_event_meta = 1,
+    fmidi_event_message = 2,
+    fmidi_event_escape = 3,
+    fmidi_event_xmi_timbre = 4,
+    fmidi_event_xmi_branch_point = 5
+} fmidi_event_type_t;
+
+typedef struct fmidi_event {
+    fmidi_event_type_t type;
+    uint32_t delta;
+    uint32_t datalen;
+    uint8_t data[1];
+} fmidi_event_t;
+
+#define fmidi_event_sizeof(datalen)             \
+    (offsetof(fmidi_event_t, data) + datalen)
+
+////////////
+// TRACKS //
+////////////
+
+typedef struct fmidi_track_iter {
+    uint16_t track;
+    uint32_t index;
+} fmidi_track_iter_t;
+
+FMIDI_API void fmidi_smf_track_begin(fmidi_track_iter_t *it, uint16_t track);
+FMIDI_API const fmidi_event_t *fmidi_smf_track_next(
+    const fmidi_smf_t *smf, fmidi_track_iter_t *it);
+
+/////////////
+// FORMATS //
+/////////////
+
+FMIDI_API fmidi_smf_t *fmidi_xmi_mem_read(const uint8_t *data, size_t length);
+FMIDI_API fmidi_smf_t *fmidi_xmi_file_read(const char *filename);
+FMIDI_API fmidi_smf_t *fmidi_xmi_stream_read(FILE *stream);
+
+///////////////
+// SEQUENCER //
+///////////////
+
+typedef struct fmidi_seq fmidi_seq_t;
+
+typedef struct fmidi_seq_event {
+    double time;
+    uint16_t track;
+    const fmidi_event_t *event;
+} fmidi_seq_event_t;
+
+FMIDI_API fmidi_seq_t *fmidi_seq_new(const fmidi_smf_t *smf);
+FMIDI_API void fmidi_seq_free(fmidi_seq_t *pl);
+FMIDI_API void fmidi_seq_rewind(fmidi_seq_t *pl);
+FMIDI_API bool fmidi_seq_peek_event(fmidi_seq_t *pl, fmidi_seq_event_t *plevt);
+FMIDI_API bool fmidi_seq_next_event(fmidi_seq_t *pl, fmidi_seq_event_t *plevt);
+
+/////////////
+// UTILITY //
+/////////////
+
+typedef struct fmidi_smpte {
+    uint8_t code[5];
+} fmidi_smpte_t;
+
+FMIDI_API double fmidi_smpte_time(const fmidi_smpte_t *smpte);
+FMIDI_API double fmidi_delta_time(double delta, uint16_t unit, uint32_t tempo);
+FMIDI_API double fmidi_time_delta(double time, uint16_t unit, uint32_t tempo);
+
+////////////
+// ERRORS //
+////////////
+
+typedef enum fmidi_status {
+    fmidi_ok,
+    fmidi_err_format,
+    fmidi_err_eof,
+    fmidi_err_input,
+    fmidi_err_largefile,
+    fmidi_err_output
+} fmidi_status_t;
+
+FMIDI_API fmidi_status_t fmidi_errno();
+FMIDI_API const char *fmidi_strerror(fmidi_status_t status);
+
+typedef struct fmidi_error_info {
+    fmidi_status_t code;
+#if defined(FMIDI_DEBUG)
+    const char *file; int line;
+#endif
+} fmidi_error_info_t;
+
+FMIDI_API const fmidi_error_info_t *fmidi_errinfo();
+
+////////////
+// PLAYER //
+////////////
+
+typedef struct fmidi_player fmidi_player_t;
+FMIDI_API fmidi_player_t *fmidi_player_new(fmidi_smf_t *smf);
+FMIDI_API void fmidi_player_tick(fmidi_player_t *seq, double delta);
+FMIDI_API void fmidi_player_free(fmidi_player_t *seq);
+FMIDI_API void fmidi_player_start(fmidi_player_t *seq);
+FMIDI_API void fmidi_player_stop(fmidi_player_t *seq);
+FMIDI_API void fmidi_player_rewind(fmidi_player_t *seq);
+FMIDI_API bool fmidi_player_running(const fmidi_player_t *seq);
+FMIDI_API double fmidi_player_current_time(const fmidi_player_t *seq);
+FMIDI_API void fmidi_player_goto_time(fmidi_player_t *seq, double time);
+FMIDI_API double fmidi_player_current_speed(const fmidi_player_t *seq);
+FMIDI_API void fmidi_player_set_speed(fmidi_player_t *seq, double speed);
+FMIDI_API void fmidi_player_event_callback(
+    fmidi_player_t *seq, void (*cbfn)(const fmidi_event_t *, void *), void *cbdata);
+FMIDI_API void fmidi_player_finish_callback(
+    fmidi_player_t *seq, void (*cbfn)(void *), void *cbdata);
+
+//////////////
+// PRINTERS //
+//////////////
+
+#if !defined(FMIDI_DISABLE_DESCRIBE_API)
+FMIDI_API void fmidi_smf_describe(const fmidi_smf_t *smf, FILE *stream);
+FMIDI_API void fmidi_event_describe(const fmidi_event_t *evt, FILE *stream);
+#endif
+
+////////////
+// LIMITS //
+////////////
+
+enum { fmidi_file_size_limit = 64 * 1024 * 1024 };
+
+#if defined(__cplusplus)
+}  // extern "C"
+#endif
+
+//////////////////
+// C++ PRINTERS //
+//////////////////
+
+#if defined(__cplusplus) && !defined(FMIDI_DISABLE_DESCRIBE_API)
+# include <iosfwd>
+FMIDI_API std::ostream &operator<<(std::ostream &out, const fmidi_smf_t &smf);
+FMIDI_API std::ostream &operator<<(std::ostream &out, const fmidi_event_t &evt);
+#endif
+
+//////////////
+// C++ RAII //
+//////////////
+
+#if defined(__cplusplus)
+# include <memory>
+
+struct fmidi_smf_deleter {
+    void operator()(fmidi_smf_t *x) const { fmidi_smf_free(x); } };
+struct fmidi_seq_deleter {
+    void operator()(fmidi_seq_t *x) const { fmidi_seq_free(x); } };
+struct fmidi_player_deleter {
+    void operator()(fmidi_player_t *x) const { fmidi_player_free(x); } };
+
+typedef std::unique_ptr<fmidi_smf_t, fmidi_smf_deleter> fmidi_smf_u;
+typedef std::unique_ptr<fmidi_seq_t, fmidi_seq_deleter> fmidi_seq_u;
+typedef std::unique_ptr<fmidi_player_t, fmidi_player_deleter> fmidi_player_u;
+#endif
+
+////////////////
+// C++ ERRORS //
+////////////////
+
+#if defined(__cplusplus)
+# include <system_error>
+FMIDI_API const std::error_category &fmidi_category();
+#endif

clients/external/fmt

@@ -1 +0,0 @@
-Subproject commit 9bdd1596cef1b57b9556f8bef32dc4a32322ef3e

clients/sfizz_render.cpp

@@ -143,7 +143,7 @@ int main(int argc, char** argv)
     ERROR_IF(!synth.loadSfzFile(sfzPath), "There was an error loading the SFZ file.");
     LOG_INFO(synth.getNumRegions() << " regions in the SFZ.");
 
-    fmidi_smf_u midiFile { fmidi_smf_file_read(midiPath.c_str()) };
+    fmidi_smf_u midiFile { fmidi_smf_file_read(midiPath.u8string().c_str()) };
     ERROR_IF(!midiFile, "Can't read " << midiPath);
 
     const auto* midiInfo = fmidi_smf_get_info(midiFile.get());
@@ -155,8 +155,7 @@ int main(int argc, char** argv)
         LOG_INFO("-- Cutting the rendering at the last MIDI End of Track message");
     }
 
-
-    SndfileHandle outputFile (outputPath, SFM_WRITE, SF_FORMAT_WAV | SF_FORMAT_PCM_16, 2, sampleRate);
+    SndfileHandle outputFile (outputPath.u8string(), SFM_WRITE, SF_FORMAT_WAV | SF_FORMAT_PCM_16, 2, sampleRate);
     ERROR_IF(outputFile.error() != 0, "Error writing out the wav file: " << outputFile.strError());
 
     auto sampleRateDouble = static_cast<double>(sampleRate);