smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-15 19:16:40 +01:00
Code Issues Projects Releases Wiki Activity

put all of the Mackie control surface code into the ArdourSurface namespace

Browse source
This commit is contained in:
Paul Davis 2015-04-15 20:37:20 -04:00
parent 12cb11b286
commit 4512d013eb
37 changed files with 131 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libs/surfaces/mackie/mackie_control_protocol.h
View file

@ -50,6 +50,8 @@ namespace MIDI {
class Port;
}
namespace ArdourSurface {
namespace Mackie {
class Surface;
class Control;
@ -57,6 +59,8 @@ namespace Mackie {
class Button;
}
gboolean ipmidi_input_handler (GIOChannel*, GIOCondition condition, void *data);
/**
This handles the plugin duties, and the midi encoding and decoding,
and the signal callbacks, mostly from ARDOUR::Route.
@ -297,7 +301,7 @@ class MackieControlProtocol
MIDI::Port* port;
};
friend struct ipMIDIHandler; /* is this necessary */
friend gboolean ipmidi_input_handler (GIOChannel*, GIOCondition condition, void *data);
friend gboolean ArdourSurface::ipmidi_input_handler (GIOChannel*, GIOCondition condition, void *data);
int create_surfaces ();
bool periodic();
@ -509,4 +513,6 @@ class MackieControlProtocol
Mackie::LedState view_release (Mackie::Button&);
};
} // namespace
#endif // ardour_mackie_control_protocol_h