Add a control surface MCU basic interface #7649
Conversation
|
It adds the option in the settings/save in the config manager
Partial implementation of #6129 I am not quite familiar with the code, so I may have done wrong/strange things, hopefully not too much ! |
Adds compatibility with: - Play button - Stop button - Loop button - Record button - Jog wheel to select instrument
altrouge
force-pushed
the
add_surface_control
branch
from
835b6d7 to
3ace4be
Compare
| }; | ||
| } // namespace lmms | ||
|
|
||
| #endif |
There was a problem hiding this comment.
| #endif | |
| #endif // LMMS_CONTROL_SURFACE_H |
| }; | ||
| } // namespace lmms | ||
|
|
||
| #endif |
There was a problem hiding this comment.
| #endif | |
| #endif // LMMS_CONTROL_SURFACE_MCU_H |
| @@ -512,6 +516,7 @@ private slots: | |||
| TimePos m_exportSongEnd; | |||
| TimePos m_exportEffectiveLength; | |||
|
|
|||
| std::shared_ptr<ControlSurfaceMCU> m_mcu_controller = nullptr; | |||
There was a problem hiding this comment.
| std::shared_ptr<ControlSurfaceMCU> m_mcu_controller = nullptr; | |
| std::shared_ptr<ControlSurfaceMCU> m_mcuController; |
Style, and removing = nullptr since the default constructor sets it to nullptr.
|
|
||
| ControlSurfaceMCU::ControlSurfaceMCU(const QString& device) | ||
| : MidiEventProcessor() | ||
| , m_midiPort(QString::fromStdString("mcu_controller"), Engine::audioEngine()->midiClient(), this) |
There was a problem hiding this comment.
| , m_midiPort(QString::fromStdString("mcu_controller"), Engine::audioEngine()->midiClient(), this) | |
| , m_midiPort("mcu_controller", Engine::audioEngine()->midiClient(), this) |
| int current = m_assignableMidiDevices->findText(ConfigManager::inst()->value("midi", "midiautoassign")); | ||
| if (current >= 0) { m_assignableMidiDevices->setCurrentIndex(current); } |
There was a problem hiding this comment.
Keeping this in its own block when it is no longer part of the else branch makes it look a bit confusing.
If you want to restrict the scope of current, I would use C++17's if statement with an initializer:
if (int current = m_assignableMidiDevices->findText(ConfigManager::inst()->value("midi", "midiautoassign")); current >= 0)
{
m_assignableMidiDevices->setCurrentIndex(current);
}| int current = m_MCUDawMidiDevices->findText(ConfigManager::inst()->value("midi", "midimcudaw")); | ||
| if (current >= 0) { m_MCUDawMidiDevices->setCurrentIndex(current); } |
|
|
||
| void ControlSurface::play() | ||
| { | ||
| Engine::getSong()->playSong(); |
There was a problem hiding this comment.
| Engine::getSong()->playSong(); | |
| if (auto song = Engine::getSong()) | |
| { | |
| song->playSong(); | |
| } |
I believe there are cases where song can be null.
And there are some other instances in this file where song is assumed to be non-null that should be corrected.
|
|
||
| void ControlSurface::stop() | ||
| { | ||
| auto piano_roll = gui::getGUI()->pianoRoll(); |
There was a problem hiding this comment.
gui::getGUI() returns nullptr when in headless mode
| void Song::setControlSurfaceMCU() | ||
| { | ||
| m_mcu_controller.reset(); | ||
| const QString& device = ConfigManager::inst()->value("midi", "midimcudaw"); |
There was a problem hiding this comment.
| const QString& device = ConfigManager::inst()->value("midi", "midimcudaw"); | |
| const QString device = ConfigManager::inst()->value("midi", "midimcudaw"); |
Avoids reference to a temporary
Adds compatibility with: