diff options
Diffstat (limited to 'src/JackDbusDriver.cpp')
| -rw-r--r-- | src/JackDbusDriver.cpp | 69 |
1 files changed, 29 insertions, 40 deletions
diff --git a/src/JackDbusDriver.cpp b/src/JackDbusDriver.cpp index 23c12f2..81aca11 100644 --- a/src/JackDbusDriver.cpp +++ b/src/JackDbusDriver.cpp @@ -1,20 +1,8 @@ -/* This file is part of Patchage. - * Copyright 2008-2020 David Robillard <d@drobilla.net> - * Copyright 2008 Nedko Arnaudov <nedko@arnaudov.name> - * - * Patchage is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free - * Software Foundation, either version 3 of the License, or (at your option) - * any later version. - * - * Patchage is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License - * along with Patchage. If not, see <http://www.gnu.org/licenses/>. - */ +// Copyright 2008-2020 David Robillard <d@drobilla.net> +// Copyright 2008 Nedko Arnaudov <nedko@arnaudov.name> +// SPDX-License-Identifier: GPL-3.0-or-later +#include "AudioDriver.hpp" #include "ClientType.hpp" #include "Driver.hpp" #include "Event.hpp" @@ -27,7 +15,6 @@ PATCHAGE_DISABLE_FMT_WARNINGS #include <fmt/core.h> -#include <fmt/ostream.h> PATCHAGE_RESTORE_WARNINGS #include <dbus/dbus-glib-lowlevel.h> @@ -63,10 +50,10 @@ class JackDriver : public AudioDriver public: explicit JackDriver(ILog& log, EventSink emit_event); - JackDriver(const JackDriver&) = delete; + JackDriver(const JackDriver&) = delete; JackDriver& operator=(const JackDriver&) = delete; - JackDriver(JackDriver&&) = delete; + JackDriver(JackDriver&&) = delete; JackDriver& operator=(JackDriver&&) = delete; ~JackDriver() override; @@ -160,18 +147,18 @@ JackDriver::update_attached() if (!_server_responding) { if (was_attached) { - _emit_event(DriverDetachmentEvent{ClientType::jack}); + _emit_event(event::DriverDetached{ClientType::jack}); } return; } if (_server_started && !was_attached) { - _emit_event(DriverAttachmentEvent{ClientType::jack}); + _emit_event(event::DriverAttached{ClientType::jack}); return; } if (!_server_started && was_attached) { - _emit_event(DriverDetachmentEvent{ClientType::jack}); + _emit_event(event::DriverDetached{ClientType::jack}); return; } } @@ -194,7 +181,7 @@ JackDriver::on_jack_disappeared() _server_responding = false; if (_server_started) { - _emit_event(DriverDetachmentEvent{ClientType::jack}); + _emit_event(event::DriverDetached{ClientType::jack}); } _server_started = false; @@ -279,12 +266,12 @@ JackDriver::dbus_message_hook(DBusConnection* /*connection*/, if (!me->_server_started) { me->_server_started = true; - me->_emit_event(DriverAttachmentEvent{ClientType::jack}); + me->_emit_event(event::DriverAttached{ClientType::jack}); } me->_emit_event( - PortCreationEvent{PortID::jack(client_name, port_name), - me->port_info(port_name, port_type, port_flags)}); + event::PortCreated{PortID::jack(client_name, port_name), + me->port_info(port_name, port_type, port_flags)}); return DBUS_HANDLER_RESULT_HANDLED; } @@ -313,10 +300,10 @@ JackDriver::dbus_message_hook(DBusConnection* /*connection*/, if (!me->_server_started) { me->_server_started = true; - me->_emit_event(DriverAttachmentEvent{ClientType::jack}); + me->_emit_event(event::DriverAttached{ClientType::jack}); } - me->_emit_event(PortDestructionEvent{PortID::jack(client_name, port_name)}); + me->_emit_event(event::PortDestroyed{PortID::jack(client_name, port_name)}); return DBUS_HANDLER_RESULT_HANDLED; } @@ -355,11 +342,12 @@ JackDriver::dbus_message_hook(DBusConnection* /*connection*/, if (!me->_server_started) { me->_server_started = true; - me->_emit_event(DriverAttachmentEvent{ClientType::jack}); + me->_emit_event(event::DriverAttached{ClientType::jack}); } - me->_emit_event(ConnectionEvent{PortID::jack(client_name, port_name), - PortID::jack(client2_name, port2_name)}); + me->_emit_event( + event::PortsConnected{PortID::jack(client_name, port_name), + PortID::jack(client2_name, port2_name)}); return DBUS_HANDLER_RESULT_HANDLED; } @@ -398,11 +386,12 @@ JackDriver::dbus_message_hook(DBusConnection* /*connection*/, if (!me->_server_started) { me->_server_started = true; - me->_emit_event(DriverAttachmentEvent{ClientType::jack}); + me->_emit_event(event::DriverAttached{ClientType::jack}); } - me->_emit_event(DisconnectionEvent{PortID::jack(client_name, port_name), - PortID::jack(client2_name, port2_name)}); + me->_emit_event( + event::PortsDisconnected{PortID::jack(client_name, port_name), + PortID::jack(client2_name, port2_name)}); return DBUS_HANDLER_RESULT_HANDLED; } @@ -518,7 +507,7 @@ JackDriver::stop_server() } dbus_message_unref(reply_ptr); - _emit_event(DriverDetachmentEvent{ClientType::jack}); + _emit_event(event::DriverDetached{ClientType::jack}); } void @@ -648,7 +637,7 @@ JackDriver::refresh(const EventSink& sink) dbus_message_iter_next(&client_struct_iter); // TODO: Pretty name? - sink({ClientCreationEvent{ClientID::jack(client_name), {client_name}}}); + sink({event::ClientCreated{ClientID::jack(client_name), {client_name}}}); for (dbus_message_iter_recurse(&client_struct_iter, &ports_array_iter); dbus_message_iter_get_arg_type(&ports_array_iter) != DBUS_TYPE_INVALID; @@ -667,8 +656,8 @@ JackDriver::refresh(const EventSink& sink) dbus_message_iter_get_basic(&port_struct_iter, &port_type); dbus_message_iter_next(&port_struct_iter); - sink({PortCreationEvent{PortID::jack(client_name, port_name), - port_info(port_name, port_type, port_flags)}}); + sink({event::PortCreated{PortID::jack(client_name, port_name), + port_info(port_name, port_type, port_flags)}}); } dbus_message_iter_next(&client_struct_iter); @@ -710,8 +699,8 @@ JackDriver::refresh(const EventSink& sink) dbus_message_iter_get_basic(&connection_struct_iter, &connection_id); dbus_message_iter_next(&connection_struct_iter); - sink({ConnectionEvent{PortID::jack(client_name, port_name), - PortID::jack(client2_name, port2_name)}}); + sink({event::PortsConnected{PortID::jack(client_name, port_name), + PortID::jack(client2_name, port2_name)}}); } } |