diff options
Diffstat (limited to 'libs/midi++2/midi++')
-rw-r--r-- | libs/midi++2/midi++/channel.h | 14 | ||||
-rw-r--r-- | libs/midi++2/midi++/event.h | 4 | ||||
-rw-r--r-- | libs/midi++2/midi++/ipmidi_port.h | 8 | ||||
-rw-r--r-- | libs/midi++2/midi++/libmidi_visibility.h | 2 | ||||
-rw-r--r-- | libs/midi++2/midi++/midnam_patch.h | 18 | ||||
-rw-r--r-- | libs/midi++2/midi++/mmc.h | 10 | ||||
-rw-r--r-- | libs/midi++2/midi++/parser.h | 6 | ||||
-rw-r--r-- | libs/midi++2/midi++/port.h | 12 | ||||
-rw-r--r-- | libs/midi++2/midi++/types.h | 2 |
9 files changed, 38 insertions, 38 deletions
diff --git a/libs/midi++2/midi++/channel.h b/libs/midi++2/midi++/channel.h index f3ec434ca5..d397c99ea0 100644 --- a/libs/midi++2/midi++/channel.h +++ b/libs/midi++2/midi++/channel.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1998-99 Paul Barton-Davis + Copyright (C) 1998-99 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 @@ -46,24 +46,24 @@ class LIBMIDIPP_API Channel : public PBD::ScopedConnectionList { byte pressure () { return _chanpress; } byte poly_pressure (byte n) { return _polypress[n]; } - byte last_note_on () { + byte last_note_on () { return _last_note_on; } - byte last_on_velocity () { + byte last_on_velocity () { return _last_on_velocity; } - byte last_note_off () { + byte last_note_off () { return _last_note_off; } - byte last_off_velocity () { + byte last_off_velocity () { return _last_off_velocity; } - pitchbend_t pitchbend () { + pitchbend_t pitchbend () { return _pitch_bend; } - controller_value_t controller_value (byte n) { + controller_value_t controller_value (byte n) { return _controller_val[n%128]; } diff --git a/libs/midi++2/midi++/event.h b/libs/midi++2/midi++/event.h index 6620010071..a75f4006f2 100644 --- a/libs/midi++2/midi++/event.h +++ b/libs/midi++2/midi++/event.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2007 Paul Davis + Copyright (C) 2007 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 @@ -33,7 +33,7 @@ /** If this is not defined, all methods of MidiEvent are RT safe * but MidiEvent will never deep copy and (depending on the scenario) - * may not be usable in STL containers, signals, etc. + * may not be usable in STL containers, signals, etc. */ #define EVORAL_EVENT_ALLOC 1 diff --git a/libs/midi++2/midi++/ipmidi_port.h b/libs/midi++2/midi++/ipmidi_port.h index a056612514..9e37253e52 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 @@ -58,10 +58,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); @@ -73,7 +73,7 @@ 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 (); diff --git a/libs/midi++2/midi++/libmidi_visibility.h b/libs/midi++2/midi++/libmidi_visibility.h index 17b57045cf..5c64196e1a 100644 --- a/libs/midi++2/midi++/libmidi_visibility.h +++ b/libs/midi++2/midi++/libmidi_visibility.h @@ -38,7 +38,7 @@ #define LIBMIDIPP_API LIBMIDIPP_DLL_EXPORT #else #define LIBMIDIPP_API LIBMIDIPP_DLL_IMPORT - #endif + #endif #define LIBMIDIPP_LOCAL LIBMIDIPP_DLL_LOCAL #endif diff --git a/libs/midi++2/midi++/midnam_patch.h b/libs/midi++2/midi++/midnam_patch.h index 5902bd5c05..45a251457e 100644 --- a/libs/midi++2/midi++/midnam_patch.h +++ b/libs/midi++2/midi++/midnam_patch.h @@ -83,7 +83,7 @@ private: class PatchBank; -class LIBMIDIPP_API Patch +class LIBMIDIPP_API Patch { public: @@ -114,7 +114,7 @@ private: typedef std::list<boost::shared_ptr<Patch> > PatchNameList; -class LIBMIDIPP_API PatchBank +class LIBMIDIPP_API PatchBank { public: PatchBank (uint16_t n = 0, std::string a_name = std::string()) : _name(a_name), _number (n) {}; @@ -157,8 +157,8 @@ public: const PatchBanks& patch_banks() const { return _patch_banks; } - bool available_for_channel(uint8_t channel) const { - return _available_for_channels.find(channel) != _available_for_channels.end(); + bool available_for_channel(uint8_t channel) const { + return _available_for_channels.find(channel) != _available_for_channels.end(); } boost::shared_ptr<Patch> find_patch(const PatchPrimaryKey& key) { @@ -173,7 +173,7 @@ public: if (i != _patch_list.begin()) { --i; return _patch_map[*i]; - } + } } } @@ -240,7 +240,7 @@ private: std::string _name; }; -class LIBMIDIPP_API NoteNameList +class LIBMIDIPP_API NoteNameList { public: typedef std::vector< boost::shared_ptr<Note> > Notes; @@ -345,7 +345,7 @@ private: boost::shared_ptr<ValueNameList> _value_name_list; ///< Local, ValueNameList }; -class LIBMIDIPP_API ControlNameList +class LIBMIDIPP_API ControlNameList { public: typedef std::map<uint16_t, boost::shared_ptr<Control> > Controls; @@ -385,12 +385,12 @@ public: /// Note: channel here is 0-based while in the MIDNAM-file it's 1-based const std::string& channel_name_set_name_by_channel(uint8_t channel) { assert(channel <= 15); - return _channel_name_set_assignments[channel]; + return _channel_name_set_assignments[channel]; } private: /// array index = channel number - /// string contents = name of channel name set + /// string contents = name of channel name set std::string _name; std::string _channel_name_set_assignments[16]; }; diff --git a/libs/midi++2/midi++/mmc.h b/libs/midi++2/midi++/mmc.h index b52f4bded8..3529031caf 100644 --- a/libs/midi++2/midi++/mmc.h +++ b/libs/midi++2/midi++/mmc.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000 Paul Barton-Davis + Copyright (C) 2000 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 @@ -40,7 +40,7 @@ class Parser; class MachineControlCommand; /** Class to handle incoming and outgoing MIDI machine control messages */ -class LIBMIDIPP_API MachineControl +class LIBMIDIPP_API MachineControl { public: typedef PBD::Signal1<void,MachineControl&> MMCSignal; @@ -95,7 +95,7 @@ class LIBMIDIPP_API MachineControl }; MachineControl (); - + void set_ports (MIDI::Port* input, MIDI::Port* output); Port* input_port() { return _input_port; } @@ -166,14 +166,14 @@ class LIBMIDIPP_API MachineControl status. */ - PBD::Signal3<void,MachineControl &,size_t,bool> + PBD::Signal3<void,MachineControl &,size_t,bool> TrackRecordStatusChange; /* The second argument specifies the desired track record enabled status. */ - PBD::Signal3<void,MachineControl &,size_t,bool> + PBD::Signal3<void,MachineControl &,size_t,bool> TrackMuteChange; /* The second argument points to a byte array containing diff --git a/libs/midi++2/midi++/parser.h b/libs/midi++2/midi++/parser.h index 420e7fcb7b..05d674375c 100644 --- a/libs/midi++2/midi++/parser.h +++ b/libs/midi++2/midi++/parser.h @@ -1,6 +1,6 @@ /* Copyright (C) 1998 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 @@ -52,7 +52,7 @@ class LIBMIDIPP_API Parser { */ framecnt_t get_timestamp() const { return _timestamp; } - void set_timestamp (const framecnt_t timestamp) { _timestamp = timestamp; } + void set_timestamp (const framecnt_t timestamp) { _timestamp = timestamp; } /* signals that anyone can connect to */ @@ -146,7 +146,7 @@ class LIBMIDIPP_API Parser { size_t message_counter[256]; - enum ParseState { + enum ParseState { NEEDSTATUS, NEEDONEBYTE, NEEDTWOBYTES, diff --git a/libs/midi++2/midi++/port.h b/libs/midi++2/midi++/port.h index 5a52cfe898..1f85b53cd4 100644 --- a/libs/midi++2/midi++/port.h +++ b/libs/midi++2/midi++/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 @@ -72,7 +72,7 @@ class LIBMIDIPP_API Port { /** block until the output FIFO used by non-process threads * is empty, checking every @a check_interval_usecs usecs * for current status. Not to be called by a thread that - * executes any part of a JACK process callback (will + * executes any part of a JACK process callback (will * simply return immediately in that situation). */ virtual void drain (int /* check_interval_usecs */) {} @@ -83,7 +83,7 @@ class LIBMIDIPP_API Port { */ int midimsg (byte *msg, size_t len, timestamp_t timestamp) { return !(write (msg, len, timestamp) == (int) len); - } + } virtual void parse (framecnt_t timestamp) = 0; @@ -92,11 +92,11 @@ class LIBMIDIPP_API Port { /* select(2)/poll(2)-based I/O */ /** Get the file descriptor for port. - * @return File descriptor, or -1 if not selectable. + * @return File descriptor, or -1 if not selectable. */ virtual int selectable () const = 0; - Channel *channel (channel_t chn) { + Channel *channel (channel_t chn) { return _channel[chn&0x7F]; } @@ -141,7 +141,7 @@ class LIBMIDIPP_API Port { struct LIBMIDIPP_API PortSet { PortSet (std::string str) : owner (str) { } - + std::string owner; std::list<XMLNode> ports; }; diff --git a/libs/midi++2/midi++/types.h b/libs/midi++2/midi++/types.h index 92858eaa60..c29ce1c767 100644 --- a/libs/midi++2/midi++/types.h +++ b/libs/midi++2/midi++/types.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 Paul Davis + Copyright (C) 2000-2007 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 |