Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed MIDI Autodetect always On (#1813) #7564

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixed MIDI Autodetect always On (#1813) #7564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0b5ff8
Fix MIDI Autodetect (#1813)
Rhodexa Oct 25, 2024
8a62cad
Improved code style to align with community guidelines.
Rhodexa Oct 28, 2024
93961a8
Fixed 'm_readablePorts' initialization order
Rhodexa Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 34 additions & 22 deletions include/ControllerConnectionDialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,51 +58,63 @@ class ControllerConnectionDialog : public QDialog
{
Q_OBJECT
public:
ControllerConnectionDialog( QWidget * _parent,
const AutomatableModel * _target_model );
ControllerConnectionDialog(QWidget* _parent,
const AutomatableModel* _target_model);
~ControllerConnectionDialog() override;

Controller * chosenController()
Controller* chosenController()
{
return m_controller;
}

public slots:
// void setSelection( const effectKey & _selection );
void selectController();
// void setSelection(const effectKey & _selection);

// TODO: Add and improve doxy for these events:
// And, better yet, improve function naming all together

//! "MIDI CONTROLLER" LedCheckBox clicked/toggled event
void midiToggled();

//! "Autodetect" LedCheckBox clicked/toggled event
void autoDetectToggled();

//! "USER CONTROLLER" LedCheckBox clicked/toggled event
void userToggled();

//! "OK" button clicked event
void selectController();

void userSelected();
void autoDetectToggled();
void enableAutoDetect( QAction * _a );
void enableAutoDetect(QAction* _a);


protected slots:
void midiValueChanged();


private:
// Midi
GroupBox * m_midiGroupBox;
LcdSpinBox * m_midiChannelSpinBox;
LcdSpinBox * m_midiControllerSpinBox;
LedCheckBox * m_midiAutoDetectCheckBox;
MidiPortMenu * m_readablePorts;
// Midi controller groupbox
GroupBox* m_midiGroupBox;
LcdSpinBox* m_midiChannelSpinBox;
LcdSpinBox* m_midiControllerSpinBox;
LedCheckBox* m_midiAutoDetectCheckBox;
MidiPortMenu* m_readablePorts;
BoolModel m_midiAutoDetect;

// User
GroupBox * m_userGroupBox;
ComboBox * m_userController;
// User controller groupbox
GroupBox* m_userGroupBox;
ComboBox* m_userController;

// Mapping
TabWidget * m_mappingBox;
QLineEdit * m_mappingFunction;
// Mapping function
TabWidget* m_mappingBox;
QLineEdit* m_mappingFunction;

Controller * m_controller;
const AutomatableModel * m_targetModel;
Controller* m_controller;
const AutomatableModel* m_targetModel;

// Temporary midiController
AutoDetectMidiController * m_midiController;
AutoDetectMidiController* m_midiController;
} ;


Expand Down
Loading