summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDaniel Schürmann <daschuer@mixxx.org>2015-12-25 23:32:21 +0100
committerDaniel Schürmann <daschuer@mixxx.org>2015-12-25 23:32:21 +0100
commit76287f984a64ad1a66f451a42c4ce2f3d80ac091 (patch)
tree9f72086877e4d03e7218ec173ecb969664f2f977 /src
parent3dfd4ba17ed2be81193f7ff5e29b8c96385a9cfe (diff)
Fix windows build
Diffstat (limited to 'src')
-rw-r--r--src/controllers/midi/midicontroller.cpp2
-rw-r--r--src/controllers/midi/midicontroller.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/controllers/midi/midicontroller.cpp b/src/controllers/midi/midicontroller.cpp
index c889437f26..9a499e2bab 100644
--- a/src/controllers/midi/midicontroller.cpp
+++ b/src/controllers/midi/midicontroller.cpp
@@ -241,7 +241,7 @@ void MidiController::commitTemporaryInputMappings() {
}
void MidiController::receive(unsigned char status, unsigned char control,
- unsigned char value, int32_t timestamp) {
+ unsigned char value, int timestamp) {
unsigned char channel = MidiUtils::channelFromStatus(status);
unsigned char opCode = MidiUtils::opCodeFromStatus(status);
diff --git a/src/controllers/midi/midicontroller.h b/src/controllers/midi/midicontroller.h
index 1df27f47f8..7423770d80 100644
--- a/src/controllers/midi/midicontroller.h
+++ b/src/controllers/midi/midicontroller.h
@@ -63,7 +63,7 @@ class MidiController : public Controller {
}
void receive(unsigned char status, unsigned char control,
- unsigned char value, int32_t timestamp);
+ unsigned char value, int timestamp);
// For receiving System Exclusive messages
void receive(const QByteArray data);