summaryrefslogtreecommitdiffstats
path: root/src/controllers/midi/midicontroller.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/controllers/midi/midicontroller.h')
-rw-r--r--src/controllers/midi/midicontroller.h38
1 files changed, 16 insertions, 22 deletions
diff --git a/src/controllers/midi/midicontroller.h b/src/controllers/midi/midicontroller.h
index 0cc39139a3..f3e5a1f971 100644
--- a/src/controllers/midi/midicontroller.h
+++ b/src/controllers/midi/midicontroller.h
@@ -1,17 +1,4 @@
-/**
-* @file midicontroller.h
-* @author Sean Pappalardo spappalardo@mixxx.org
-* @date Tue 7 Feb 2012
-* @brief MIDI Controller base class
-*
-* This is a base class representing a MIDI controller.
-* It must be inherited by a class that implements it on some API.
-*
-* Note that the subclass' destructor should call close() at a minimum.
-*/
-
-#ifndef MIDICONTROLLER_H
-#define MIDICONTROLLER_H
+#pragma once
#include "controllers/controller.h"
#include "controllers/midi/midicontrollerpreset.h"
@@ -20,6 +7,14 @@
#include "controllers/midi/midioutputhandler.h"
#include "controllers/softtakeover.h"
+class DlgControllerLearning;
+
+/// MIDI Controller base class
+///
+/// This is a base class representing a MIDI controller.
+/// It must be inherited by a class that implements it on some API.
+///
+/// Note that the subclass' destructor should call close() at a minimum.
class MidiController : public Controller {
Q_OBJECT
public:
@@ -49,11 +44,10 @@ class MidiController : public Controller {
return m_preset.isMappable();
}
- bool matchPreset(const PresetInfo& preset) override;
+ bool matchPreset(const PresetInfo& preset) override;
signals:
- void messageReceived(unsigned char status, unsigned char control,
- unsigned char value);
+ void messageReceived(unsigned char status, unsigned char control, unsigned char value);
protected:
virtual void sendShortMsg(unsigned char status,
@@ -69,15 +63,17 @@ class MidiController : public Controller {
}
protected slots:
- virtual void receive(unsigned char status, unsigned char control,
- unsigned char value, mixxx::Duration timestamp);
+ virtual void receive(unsigned char status,
+ unsigned char control,
+ unsigned char value,
+ mixxx::Duration timestamp);
// For receiving System Exclusive messages
void receive(const QByteArray& data, mixxx::Duration timestamp) override;
int close() override;
private slots:
/// Apply the preset to the controller.
- /// @brief Initializes both controller engine and static output mappings.
+ /// Initializes both controller engine and static output mappings.
///
/// @param initializeScripts Can be set to false to skip script
/// initialization for unit tests.
@@ -145,5 +141,3 @@ class MidiControllerJSProxy : public ControllerJSProxy {
private:
MidiController* m_pMidiController;
};
-
-#endif