Make exact beat calculation of tempi a bit less cumbersome. Move tempi on an audio...

[ardour.git] / libs / surfaces / generic_midi / interface.cc

diff --git a/libs/surfaces/generic_midi/interface.cc b/libs/surfaces/generic_midi/interface.cc
index 57f56bd39978b8a951978787d26bf1bcf0b46484..04254cb97454763045267fea7603b291b6121f36 100644 (file)
--- a/libs/surfaces/generic_midi/interface.cc
+++ b/libs/surfaces/generic_midi/interface.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Paul Davis 
+    Copyright (C) 2012 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -24,17 +24,17 @@
 
 using namespace ARDOUR;
 
-ControlProtocol*
+static ControlProtocol*
 new_generic_midi_protocol (ControlProtocolDescriptor* /*descriptor*/, Session* s)
 {
        GenericMidiControlProtocol* gmcp;
-               
+
        try {
                gmcp =  new GenericMidiControlProtocol (*s);
        } catch (failed_constructor& err) {
                return 0;
        }
-       
+
        if (gmcp->set_active (true)) {
                delete gmcp;
                return 0;
@@ -43,35 +43,34 @@ new_generic_midi_protocol (ControlProtocolDescriptor* /*descriptor*/, Session* s
        return gmcp;
 }
 
-void
+static void
 delete_generic_midi_protocol (ControlProtocolDescriptor* /*descriptor*/, ControlProtocol* cp)
 {
        delete cp;
 }
 
-bool
+static bool
 probe_generic_midi_protocol (ControlProtocolDescriptor* /*descriptor*/)
 {
        return GenericMidiControlProtocol::probe ();
 }
 
+// Field names commented out by JE - 06-01-2010
 static ControlProtocolDescriptor generic_midi_descriptor = {
-       .name = "Generic MIDI",
-       .id = "uri://ardour.org/surfaces/generic_midi:0",
-       .ptr = 0,
-       .module = 0,
-       .mandatory = 0,
-       .supports_feedback = true,
-       .probe = probe_generic_midi_protocol,
-       .initialize = new_generic_midi_protocol,
-       .destroy = delete_generic_midi_protocol
+       /*name :              */   "Generic MIDI",
+       /*id :                */   "uri://ardour.org/surfaces/generic_midi:0",
+       /*ptr :               */   0,
+       /*module :            */   0,
+       /*mandatory :         */   0,
+       /*supports_feedback : */   true,
+       /*probe :             */   probe_generic_midi_protocol,
+       /*initialize :        */   new_generic_midi_protocol,
+       /*destroy :           */   delete_generic_midi_protocol,
+       /*request_buffer_factory : */ 0  /* no buffer factory because this runs
+                                         * in the midiUI event loop (which has
+                                         * its own request buffer factory.
+                                         */
 };
 
-
-extern "C" {
-ControlProtocolDescriptor* 
-protocol_descriptor () {
-       return &generic_midi_descriptor;
-}
-}
+extern "C" ARDOURSURFACE_API ControlProtocolDescriptor* protocol_descriptor () { return &generic_midi_descriptor; }