Skip to content

Commit

Permalink
wip: Detect OS
Browse files Browse the repository at this point in the history
  • Loading branch information
brucelane committed Jan 27, 2017
1 parent 4dd482e commit c77f2f2
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 2 deletions.
11 changes: 10 additions & 1 deletion include/MidiIn.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,15 @@ Midi parsing taken from openFrameworks addon ofxMidi by Theo Watson & Dan Wilcox


#pragma once

#if defined( CINDER_MSW )
#define __WINDOWS_MM__
#endif
#if defined( CINDER_MAC )
#define __MACOSX_CORE__
#endif
#if defined( CINDER_LINUX )
#define __LINUX_ALSA__
#endif
#include <vector>
#include <string>
#include <iostream>
Expand All @@ -46,6 +54,7 @@ Midi parsing taken from openFrameworks addon ofxMidi by Theo Watson & Dan Wilcox
*/



namespace cinder { namespace midi {

void MidiInCallback( double deltatime, std::vector< unsigned char > *message, void *userData );
Expand Down
10 changes: 9 additions & 1 deletion include/MidiOut.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,15 @@ Midi parsing taken from openFrameworks addon ofxMidi by Theo Watson & Dan Wilcox
*/

#pragma once

#if defined( CINDER_MSW )
#define __WINDOWS_MM__
#endif
#if defined( CINDER_MAC )
#define __MACOSX_CORE__
#endif
#if defined( CINDER_LINUX )
#define __LINUX_ALSA__
#endif
//#include "MidiHeaders.h"
#include "cinder/app/App.h"
#include "RtMidi.h"
Expand Down

0 comments on commit c77f2f2

Please sign in to comment.