X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fmidi%2B%2B2%2Fmidi%2B%2B%2Fipmidi_port.h;h=8cefe09a40888c4506abdd48cd202e9c38ac071b;hb=bfebad3dce3c4aeb634a2979f0785b2713b093a7;hp=4aa55828f18d8ce1f8c79c135ae8e6a06a987c23;hpb=36c233fe6ce570ce85224626ce7aba4a2607537f;p=ardour.git diff --git a/libs/midi++2/midi++/ipmidi_port.h b/libs/midi++2/midi++/ipmidi_port.h index 4aa55828f1..8cefe09a40 100644 --- a/libs/midi++2/midi++/ipmidi_port.h +++ b/libs/midi++2/midi++/ipmidi_port.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1998-2010 Paul Barton-Davis + Copyright (C) 1998-2010 Paul Barton-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 the Free Software Foundation; either version 2 of the License, or @@ -21,12 +21,14 @@ #include #include -#if defined(WIN32) +#if defined(PLATFORM_WINDOWS) #include -#elif defined(__FREE_BSD__) +#elif defined(__FreeBSD__) || defined(__OpenBSD__) #include #include +#if defined(__FreeBSD__) #include +#endif #include #include #include @@ -58,10 +60,10 @@ class LIBMIDIPP_API IPMIDIPort : public Port { IPMIDIPort (int base_port = lowest_ipmidi_port_default, const std::string& ifname = std::string()); IPMIDIPort (const XMLNode&); ~IPMIDIPort (); - + XMLNode& get_state () const; void set_state (const XMLNode&); - + int write (const byte *msg, size_t msglen, timestamp_t timestamp); int read (byte *buf, size_t bufsize); void parse (framecnt_t timestamp); @@ -69,11 +71,11 @@ class LIBMIDIPP_API IPMIDIPort : public Port { static const int lowest_ipmidi_port_default = 21928; -private: +private: int sockin; int sockout; struct sockaddr_in addrout; - Glib::Threads::Mutex write_lock; + Glib::Threads::Mutex write_lock; bool open_sockets (int base_port, const std::string& ifname); void close_sockets ();