diff options
Diffstat (limited to 'libs/evoral/evoral/Note.hpp')
| -rw-r--r-- | libs/evoral/evoral/Note.hpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libs/evoral/evoral/Note.hpp b/libs/evoral/evoral/Note.hpp index b636df46e2..6110ad42fe 100644 --- a/libs/evoral/evoral/Note.hpp +++ b/libs/evoral/evoral/Note.hpp @@ -1,22 +1,22 @@ /* This file is part of Evoral. * Copyright (C) 2008 Dave Robillard <http://drobilla.net> * Copyright (C) 2000-2008 Paul Davis - * + * * Evoral 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 (at your option) any later * version. - * + * * Evoral is distributed in the hope that it will be useful, but WITHOUT ANY * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef EVORAL_NOTE_HPP +#ifndef EVORAL_NOTE_HPP #define EVORAL_NOTE_HPP #include <stdint.h> @@ -38,9 +38,9 @@ public: const Note<Time>& operator=(const Note<Time>& copy); inline bool operator==(const Note<Time>& other) { - return musical_time_equal (time(), other.time()) && - note() == other.note() && - musical_time_equal (length(), other.length()) && + return musical_time_equal (time(), other.time()) && + note() == other.note() && + musical_time_equal (length(), other.length()) && velocity() == other.velocity() && channel() == other.channel(); } @@ -51,8 +51,8 @@ public: inline uint8_t velocity() const { return _on_event.velocity(); } inline Time length() const { return _off_event.time() - _on_event.time(); } inline uint8_t channel() const { - assert(_on_event.channel() == _off_event.channel()); - return _on_event.channel(); + assert(_on_event.channel() == _off_event.channel()); + return _on_event.channel(); } inline void set_time(Time t) { _off_event.time() = t + length(); _on_event.time() = t; } @@ -77,8 +77,8 @@ private: template<typename Time> std::ostream& operator<<(std::ostream& o, const Evoral::Note<Time>& n) { o << "Note: pitch = " << (int) n.note() - << " @ " << n.time() << " .. " << n.end_time() - << " velocity " << (int) n.velocity() + << " @ " << n.time() << " .. " << n.end_time() + << " velocity " << (int) n.velocity() << " chn " << (int) n.channel(); return o; } |