Skip to content

Commit

Permalink
backends: use string_view for name literals
Browse files Browse the repository at this point in the history
  • Loading branch information
jcelerier committed Jan 6, 2025
1 parent b18a2fc commit d6e7b95
Show file tree
Hide file tree
Showing 16 changed files with 63 additions and 32 deletions.
5 changes: 3 additions & 2 deletions include/libremidi/backends/alsa_raw.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include <libremidi/backends/alsa_raw/midi_out.hpp>
#include <libremidi/backends/alsa_raw/observer.hpp>

#include <string_view>
// Credits: greatly inspired from
// https://ccrma.stanford.edu/~craig/articles/linuxmidi/alsa-1.0/alsarawmidiout.c
// https://ccrma.stanford.edu/~craig/articles/linuxmidi/alsa-1.0/alsarawportlist.c
Expand All @@ -19,8 +20,8 @@ struct backend
using midi_out_configuration = alsa_raw_output_configuration;
using midi_observer_configuration = alsa_raw_observer_configuration;
static const constexpr auto API = libremidi::API::ALSA_RAW;
static const constexpr auto name = "alsa_raw";
static const constexpr auto display_name = "ALSA (raw)";
static const constexpr std::string_view name = "alsa_raw";
static const constexpr std::string_view display_name = "ALSA (raw)";

static inline bool available() noexcept
{
Expand Down
6 changes: 4 additions & 2 deletions include/libremidi/backends/alsa_raw_ump.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#include <libremidi/backends/alsa_raw_ump/observer.hpp>
#include <libremidi/backends/dummy.hpp>

#include <string_view>

namespace libremidi::alsa_raw_ump
{
struct backend
Expand All @@ -18,8 +20,8 @@ struct backend
{
};
static const constexpr auto API = libremidi::API::ALSA_RAW_UMP;
static const constexpr auto name = "alsa_raw_ump";
static const constexpr auto display_name = "ALSA (raw UMP)";
static const constexpr std::string_view name = "alsa_raw_ump";
static const constexpr std::string_view display_name = "ALSA (raw UMP)";

static inline bool available() noexcept
{
Expand Down
6 changes: 4 additions & 2 deletions include/libremidi/backends/alsa_seq.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
#include <libremidi/backends/alsa_seq/midi_out.hpp>
#include <libremidi/backends/alsa_seq/observer.hpp>

#include <string_view>

namespace libremidi::alsa_seq
{

Expand All @@ -29,8 +31,8 @@ struct backend
using midi_out_configuration = alsa_seq::output_configuration;
using midi_observer_configuration = alsa_seq::observer_configuration;
static const constexpr auto API = libremidi::API::ALSA_SEQ;
static const constexpr auto name = "alsa_seq";
static const constexpr auto display_name = "ALSA (sequencer)";
static const constexpr std::string_view name = "alsa_seq";
static const constexpr std::string_view display_name = "ALSA (sequencer)";

static inline bool available() noexcept
{
Expand Down
6 changes: 4 additions & 2 deletions include/libremidi/backends/alsa_seq_ump.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#include <libremidi/backends/alsa_seq_ump/config.hpp>
#include <libremidi/backends/alsa_seq_ump/midi_out.hpp>

#include <string_view>

namespace libremidi
{
template <>
Expand Down Expand Up @@ -50,8 +52,8 @@ struct backend
using midi_out_configuration = alsa_seq_ump::output_configuration;
using midi_observer_configuration = alsa_seq_ump::observer_configuration;
static const constexpr auto API = libremidi::API::ALSA_SEQ_UMP;
static const constexpr auto name = "alsa_seq_ump";
static const constexpr auto display_name = "ALSA (sequencer, UMP)";
static const constexpr std::string_view name = "alsa_seq_ump";
static const constexpr std::string_view display_name = "ALSA (sequencer, UMP)";

static inline bool available() noexcept
{
Expand Down
6 changes: 4 additions & 2 deletions include/libremidi/backends/coremidi.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
#include <libremidi/backends/coremidi/midi_out.hpp>
#include <libremidi/backends/coremidi/observer.hpp>

#include <string_view>

namespace libremidi
{
struct core_backend
Expand All @@ -14,8 +16,8 @@ struct core_backend
using midi_out_configuration = coremidi_output_configuration;
using midi_observer_configuration = coremidi_observer_configuration;
static const constexpr auto API = libremidi::API::COREMIDI;
static const constexpr auto name = "core";
static const constexpr auto display_name = "CoreMIDI";
static const constexpr std::string_view name = "core";
static const constexpr std::string_view display_name = "CoreMIDI";

static constexpr inline bool available() noexcept { return true; }
};
Expand Down
6 changes: 4 additions & 2 deletions include/libremidi/backends/coremidi_ump.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
#include <libremidi/backends/coremidi_ump/midi_out.hpp>
#include <libremidi/backends/coremidi_ump/observer.hpp>

#include <string_view>

namespace libremidi::coremidi_ump
{
struct backend
Expand All @@ -14,8 +16,8 @@ struct backend
using midi_out_configuration = coremidi_ump::output_configuration;
using midi_observer_configuration = coremidi_ump::observer_configuration;
static const constexpr auto API = libremidi::API::COREMIDI_UMP;
static const constexpr auto name = "core_ump";
static const constexpr auto display_name = "CoreMIDI UMP";
static const constexpr std::string_view name = "core_ump";
static const constexpr std::string_view display_name = "CoreMIDI UMP";

static constexpr inline bool available() noexcept { return true; /* todo? */ }
};
Expand Down
6 changes: 4 additions & 2 deletions include/libremidi/backends/dummy.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#include <libremidi/detail/midi_out.hpp>
#include <libremidi/detail/observer.hpp>

#include <string_view>

namespace libremidi
{
class observer_dummy : public observer_api
Expand Down Expand Up @@ -97,8 +99,8 @@ struct dummy_backend
using midi_out_configuration = dummy_configuration;
using midi_observer_configuration = dummy_configuration;
static const constexpr auto API = libremidi::API::DUMMY;
static const constexpr auto name = "dummy";
static const constexpr auto display_name = "Dummy";
static const constexpr std::string_view name = "dummy";
static const constexpr std::string_view display_name = "Dummy";

static constexpr inline bool available() noexcept { return true; }
};
Expand Down
6 changes: 4 additions & 2 deletions include/libremidi/backends/emscripten.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
#include <libremidi/backends/emscripten/midi_out.hpp>
#include <libremidi/backends/emscripten/observer.hpp>

#include <string_view>

namespace libremidi
{

Expand All @@ -19,8 +21,8 @@ struct emscripten_backend
using midi_out_configuration = emscripten_output_configuration;
using midi_observer_configuration = emscripten_observer_configuration;
static const constexpr auto API = libremidi::API::WEBMIDI;
static const constexpr auto name = "webmidi";
static const constexpr auto display_name = "WebMIDI";
static const constexpr std::string_view name = "webmidi";
static const constexpr std::string_view display_name = "WebMIDI";

static constexpr inline bool available() noexcept { return true; }
};
Expand Down
6 changes: 4 additions & 2 deletions include/libremidi/backends/jack.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
#include <libremidi/backends/jack/midi_out.hpp>
#include <libremidi/backends/jack/observer.hpp>

#include <string_view>

//*********************************************************************//
// API: UNIX JACK
//
Expand All @@ -22,8 +24,8 @@ struct jack_backend
using midi_out_configuration = jack_output_configuration;
using midi_observer_configuration = jack_observer_configuration;
static const constexpr auto API = libremidi::API::JACK_MIDI;
static const constexpr auto name = "jack";
static const constexpr auto display_name = "JACK";
static const constexpr std::string_view name = "jack";
static const constexpr std::string_view display_name = "JACK";

static inline bool available() noexcept
{
Expand Down
6 changes: 4 additions & 2 deletions include/libremidi/backends/keyboard.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
#include <libremidi/backends/dummy.hpp>
#include <libremidi/backends/keyboard/midi_in.hpp>

#include <string_view>

namespace libremidi
{
struct kbd_backend
Expand All @@ -13,8 +15,8 @@ struct kbd_backend
using midi_out_configuration = dummy_configuration;
using midi_observer_configuration = dummy_configuration;
static const constexpr auto API = libremidi::API::KEYBOARD;
static const constexpr auto name = "keyboard";
static const constexpr auto display_name = "Computer keyboard";
static const constexpr std::string_view name = "keyboard";
static const constexpr std::string_view display_name = "Computer keyboard";

static inline bool available() noexcept { return true; }
};
Expand Down
6 changes: 4 additions & 2 deletions include/libremidi/backends/network.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#include <libremidi/backends/net/midi_out.hpp>
#include <libremidi/backends/net/observer.hpp>

#include <string_view>

namespace libremidi::net
{
struct backend
Expand All @@ -16,8 +18,8 @@ struct backend
using midi_out_configuration = libremidi::net::dgram_output_configuration;
using midi_observer_configuration = libremidi::net::net_observer_configuration;
static const constexpr auto API = libremidi::API::NETWORK;
static const constexpr auto name = "network";
static const constexpr auto display_name = "Network";
static const constexpr std::string_view name = "network";
static const constexpr std::string_view display_name = "Network";

static inline bool available() noexcept { return true; }
};
Expand Down
6 changes: 4 additions & 2 deletions include/libremidi/backends/network_ump.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
#include <libremidi/backends/net/midi_out.hpp>
#include <libremidi/backends/net/observer.hpp>

#include <string_view>

namespace libremidi::net_ump
{
struct backend
Expand All @@ -15,8 +17,8 @@ struct backend
using midi_out_configuration = libremidi::net_ump::dgram_output_configuration;
using midi_observer_configuration = libremidi::net_ump::net_observer_configuration;
static const constexpr auto API = libremidi::API::NETWORK_UMP;
static const constexpr auto name = "network (UMP)";
static const constexpr auto display_name = "Network (UMP)";
static const constexpr std::string_view name = "network (UMP)";
static const constexpr std::string_view display_name = "Network (UMP)";

static inline bool available() noexcept { return true; }
};
Expand Down
6 changes: 4 additions & 2 deletions include/libremidi/backends/pipewire.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
#include <libremidi/backends/pipewire/midi_out.hpp>
#include <libremidi/backends/pipewire/observer.hpp>

#include <string_view>

namespace libremidi::pipewire
{
struct backend
Expand All @@ -18,8 +20,8 @@ struct backend
using midi_out_configuration = pipewire_output_configuration;
using midi_observer_configuration = pipewire_observer_configuration;
static const constexpr auto API = libremidi::API::PIPEWIRE;
static const constexpr auto name = "pipewire";
static const constexpr auto display_name = "PipeWire";
static const constexpr std::string_view name = "pipewire";
static const constexpr std::string_view display_name = "PipeWire";

static inline bool available() noexcept
{
Expand Down
6 changes: 4 additions & 2 deletions include/libremidi/backends/winmidi.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
#include <libremidi/backends/winmidi/midi_out.hpp>
#include <libremidi/backends/winmidi/observer.hpp>

#include <string_view>

namespace libremidi::winmidi
{
struct backend
Expand All @@ -14,8 +16,8 @@ struct backend
using midi_out_configuration = winmidi::output_configuration;
using midi_observer_configuration = winmidi::observer_configuration;
static const constexpr auto API = libremidi::API::WINDOWS_MIDI_SERVICES;
static const constexpr auto name = "winmidi";
static const constexpr auto display_name = "Windows MIDI Services";
static const constexpr std::string_view name = "winmidi";
static const constexpr std::string_view display_name = "Windows MIDI Services";

static constexpr inline bool available() noexcept { return true; }
};
Expand Down
6 changes: 4 additions & 2 deletions include/libremidi/backends/winmm.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
#include <libremidi/backends/winmm/midi_out.hpp>
#include <libremidi/backends/winmm/observer.hpp>

#include <string_view>

// Default for Windows is to add an identifier to the port names; this
// flag can be defined (e.g. in your project file) to disable this behaviour.
// #define LIBREMIDI_DO_NOT_ENSURE_UNIQUE_PORTNAMES
Expand All @@ -28,8 +30,8 @@ struct winmm_backend
using midi_out_configuration = winmm_output_configuration;
using midi_observer_configuration = winmm_observer_configuration;
static const constexpr auto API = libremidi::API::WINDOWS_MM;
static const constexpr auto name = "winmm";
static const constexpr auto display_name = "Windows Multimedia";
static const constexpr std::string_view name = "winmm";
static const constexpr std::string_view display_name = "Windows Multimedia";

static constexpr inline bool available() noexcept { return true; }
};
Expand Down
6 changes: 4 additions & 2 deletions include/libremidi/backends/winuwp.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
#include <libremidi/backends/winuwp/midi_out.hpp>
#include <libremidi/backends/winuwp/observer.hpp>

#include <string_view>

namespace libremidi
{
struct winuwp_backend
Expand All @@ -14,8 +16,8 @@ struct winuwp_backend
using midi_out_configuration = winuwp_output_configuration;
using midi_observer_configuration = winuwp_observer_configuration;
static const constexpr auto API = libremidi::API::WINDOWS_UWP;
static const constexpr auto name = "winuwp";
static const constexpr auto display_name = "Windows UWP";
static const constexpr std::string_view name = "winuwp";
static const constexpr std::string_view display_name = "Windows UWP";

static constexpr inline bool available() noexcept { return true; }
};
Expand Down

0 comments on commit d6e7b95

Please sign in to comment.