diff options
author | David Robillard <d@drobilla.net> | 2008-12-21 20:36:15 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2008-12-21 20:36:15 +0000 |
commit | c5aa71782890fc652531f89f8676cdcc99fa8f53 (patch) | |
tree | b86cb0b299357ef3c5cb0bd99f68360bc252eea2 /libs | |
parent | 331de3dc38e4f8b94fc1ddf224349a4afb91cc75 (diff) |
Sync with http://svn.drobilla.net/lad/trunk/evoral r1891.
(Only change: use #include "" instead of #include <> for local include paths).
git-svn-id: svn://localhost/ardour2/branches/3.0@4335 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
-rw-r--r-- | libs/evoral/evoral/Control.hpp | 4 | ||||
-rw-r--r-- | libs/evoral/evoral/ControlList.hpp | 6 | ||||
-rw-r--r-- | libs/evoral/evoral/ControlSet.hpp | 4 | ||||
-rw-r--r-- | libs/evoral/evoral/Event.hpp | 2 | ||||
-rw-r--r-- | libs/evoral/evoral/EventRingBuffer.hpp | 6 | ||||
-rw-r--r-- | libs/evoral/evoral/EventSink.hpp | 2 | ||||
-rw-r--r-- | libs/evoral/evoral/MIDIEvent.hpp | 4 | ||||
-rw-r--r-- | libs/evoral/evoral/Note.hpp | 2 | ||||
-rw-r--r-- | libs/evoral/evoral/SMF.hpp | 2 | ||||
-rw-r--r-- | libs/evoral/evoral/Sequence.hpp | 10 | ||||
-rw-r--r-- | libs/evoral/evoral/TypeMap.hpp | 2 | ||||
-rw-r--r-- | libs/evoral/src/Control.cpp | 4 | ||||
-rw-r--r-- | libs/evoral/src/ControlList.cpp | 2 | ||||
-rw-r--r-- | libs/evoral/src/ControlSet.cpp | 8 | ||||
-rw-r--r-- | libs/evoral/src/Curve.cpp | 4 | ||||
-rw-r--r-- | libs/evoral/src/Event.cpp | 2 | ||||
-rw-r--r-- | libs/evoral/src/MIDIEvent.cpp | 2 | ||||
-rw-r--r-- | libs/evoral/src/Note.cpp | 2 | ||||
-rw-r--r-- | libs/evoral/src/SMF.cpp | 8 | ||||
-rw-r--r-- | libs/evoral/src/SMFReader.cpp | 4 | ||||
-rw-r--r-- | libs/evoral/src/Sequence.cpp | 14 |
21 files changed, 47 insertions, 47 deletions
diff --git a/libs/evoral/evoral/Control.hpp b/libs/evoral/evoral/Control.hpp index 31ebe3cfde..2f6e72be1e 100644 --- a/libs/evoral/evoral/Control.hpp +++ b/libs/evoral/evoral/Control.hpp @@ -22,8 +22,8 @@ #include <set> #include <map> #include <boost/shared_ptr.hpp> -#include <evoral/types.hpp> -#include <evoral/Parameter.hpp> +#include "evoral/types.hpp" +#include "evoral/Parameter.hpp" namespace Evoral { diff --git a/libs/evoral/evoral/ControlList.hpp b/libs/evoral/evoral/ControlList.hpp index 48050f9e93..d0e1598388 100644 --- a/libs/evoral/evoral/ControlList.hpp +++ b/libs/evoral/evoral/ControlList.hpp @@ -23,9 +23,9 @@ #include <boost/pool/pool.hpp> #include <boost/pool/pool_alloc.hpp> #include <glibmm/thread.h> -#include <evoral/types.hpp> -#include <evoral/Parameter.hpp> -#include <evoral/Curve.hpp> +#include "evoral/types.hpp" +#include "evoral/Parameter.hpp" +#include "evoral/Curve.hpp" namespace Evoral { diff --git a/libs/evoral/evoral/ControlSet.hpp b/libs/evoral/evoral/ControlSet.hpp index 9a8ea2efcd..0172d0e025 100644 --- a/libs/evoral/evoral/ControlSet.hpp +++ b/libs/evoral/evoral/ControlSet.hpp @@ -24,8 +24,8 @@ #include <boost/shared_ptr.hpp> #include <boost/utility.hpp> #include <glibmm/thread.h> -#include <evoral/types.hpp> -#include <evoral/Parameter.hpp> +#include "evoral/types.hpp" +#include "evoral/Parameter.hpp" namespace Evoral { diff --git a/libs/evoral/evoral/Event.hpp b/libs/evoral/evoral/Event.hpp index 1dd081a5b9..d6da9b8a1e 100644 --- a/libs/evoral/evoral/Event.hpp +++ b/libs/evoral/evoral/Event.hpp @@ -24,7 +24,7 @@ #include <cstring> #include <sstream> #include <assert.h> -#include <evoral/types.hpp> +#include "evoral/types.hpp" /** If this is not defined, all methods of MidiEvent are RT safe diff --git a/libs/evoral/evoral/EventRingBuffer.hpp b/libs/evoral/evoral/EventRingBuffer.hpp index 05ec9217b8..cc7b617e26 100644 --- a/libs/evoral/evoral/EventRingBuffer.hpp +++ b/libs/evoral/evoral/EventRingBuffer.hpp @@ -19,9 +19,9 @@ #define EVORAL_EVENT_RING_BUFFER_HPP #include <glib.h> -#include <evoral/RingBuffer.hpp> -#include <evoral/EventSink.hpp> -#include <evoral/types.hpp> +#include "evoral/RingBuffer.hpp" +#include "evoral/EventSink.hpp" +#include "evoral/types.hpp" #include <iostream> using namespace std; diff --git a/libs/evoral/evoral/EventSink.hpp b/libs/evoral/evoral/EventSink.hpp index dfa746d870..3e98601a9a 100644 --- a/libs/evoral/evoral/EventSink.hpp +++ b/libs/evoral/evoral/EventSink.hpp @@ -19,7 +19,7 @@ #ifndef EVORAL_EVENT_SINK_HPP #define EVORAL_EVENT_SINK_HPP -#include <evoral/types.hpp> +#include "evoral/types.hpp" namespace Evoral { diff --git a/libs/evoral/evoral/MIDIEvent.hpp b/libs/evoral/evoral/MIDIEvent.hpp index bbf1e580f1..59cbb12492 100644 --- a/libs/evoral/evoral/MIDIEvent.hpp +++ b/libs/evoral/evoral/MIDIEvent.hpp @@ -19,8 +19,8 @@ #ifndef EVORAL_MIDI_EVENT_HPP #define EVORAL_MIDI_EVENT_HPP -#include <evoral/Event.hpp> -#include <evoral/midi_events.h> +#include "evoral/Event.hpp" +#include "evoral/midi_events.h" #ifdef EVORAL_MIDI_XML #include <pbd/xml++.h> #endif diff --git a/libs/evoral/evoral/Note.hpp b/libs/evoral/evoral/Note.hpp index 75a8046237..7e98255d7c 100644 --- a/libs/evoral/evoral/Note.hpp +++ b/libs/evoral/evoral/Note.hpp @@ -20,7 +20,7 @@ #define EVORAL_NOTE_HPP #include <stdint.h> -#include <evoral/MIDIEvent.hpp> +#include "evoral/MIDIEvent.hpp" namespace Evoral { diff --git a/libs/evoral/evoral/SMF.hpp b/libs/evoral/evoral/SMF.hpp index 5ae27131e3..7257368213 100644 --- a/libs/evoral/evoral/SMF.hpp +++ b/libs/evoral/evoral/SMF.hpp @@ -20,7 +20,7 @@ #define EVORAL_SMF_HPP #include <string> -#include <evoral/types.hpp> +#include "evoral/types.hpp" namespace Evoral { diff --git a/libs/evoral/evoral/Sequence.hpp b/libs/evoral/evoral/Sequence.hpp index f2bf24b254..450051b246 100644 --- a/libs/evoral/evoral/Sequence.hpp +++ b/libs/evoral/evoral/Sequence.hpp @@ -26,11 +26,11 @@ #include <utility> #include <boost/shared_ptr.hpp> #include <glibmm/thread.h> -#include <evoral/types.hpp> -#include <evoral/Note.hpp> -#include <evoral/Parameter.hpp> -#include <evoral/ControlSet.hpp> -#include <evoral/ControlList.hpp> +#include "evoral/types.hpp" +#include "evoral/Note.hpp" +#include "evoral/Parameter.hpp" +#include "evoral/ControlSet.hpp" +#include "evoral/ControlList.hpp" namespace Evoral { diff --git a/libs/evoral/evoral/TypeMap.hpp b/libs/evoral/evoral/TypeMap.hpp index 9e3d64a047..642735134d 100644 --- a/libs/evoral/evoral/TypeMap.hpp +++ b/libs/evoral/evoral/TypeMap.hpp @@ -19,7 +19,7 @@ #ifndef EVORAL_TYPE_MAP_HPP #define EVORAL_TYPE_MAP_HPP -#include <evoral/types.hpp> +#include "evoral/types.hpp" namespace Evoral { diff --git a/libs/evoral/src/Control.cpp b/libs/evoral/src/Control.cpp index 499a40fd2c..b1b492548b 100644 --- a/libs/evoral/src/Control.cpp +++ b/libs/evoral/src/Control.cpp @@ -17,8 +17,8 @@ */ #include <iostream> -#include <evoral/Control.hpp> -#include <evoral/ControlList.hpp> +#include "evoral/Control.hpp" +#include "evoral/ControlList.hpp" namespace Evoral { diff --git a/libs/evoral/src/ControlList.cpp b/libs/evoral/src/ControlList.cpp index 033e375a8a..5ec8c2dac9 100644 --- a/libs/evoral/src/ControlList.cpp +++ b/libs/evoral/src/ControlList.cpp @@ -20,7 +20,7 @@ #include <cassert> #include <utility> #include <iostream> -#include <evoral/ControlList.hpp> +#include "evoral/ControlList.hpp" using namespace std; diff --git a/libs/evoral/src/ControlSet.cpp b/libs/evoral/src/ControlSet.cpp index 06046347a6..860419a187 100644 --- a/libs/evoral/src/ControlSet.cpp +++ b/libs/evoral/src/ControlSet.cpp @@ -17,10 +17,10 @@ */ #include <limits> -#include <evoral/ControlSet.hpp> -#include <evoral/ControlList.hpp> -#include <evoral/Control.hpp> -#include <evoral/Event.hpp> +#include "evoral/ControlSet.hpp" +#include "evoral/ControlList.hpp" +#include "evoral/Control.hpp" +#include "evoral/Event.hpp" using namespace std; diff --git a/libs/evoral/src/Curve.cpp b/libs/evoral/src/Curve.cpp index a586edc70b..2ae79a3917 100644 --- a/libs/evoral/src/Curve.cpp +++ b/libs/evoral/src/Curve.cpp @@ -25,8 +25,8 @@ #include <glibmm/thread.h> -#include <evoral/Curve.hpp> -#include <evoral/ControlList.hpp> +#include "evoral/Curve.hpp" +#include "evoral/ControlList.hpp" using namespace std; using namespace sigc; diff --git a/libs/evoral/src/Event.cpp b/libs/evoral/src/Event.cpp index 99a94e0215..5ac38d6357 100644 --- a/libs/evoral/src/Event.cpp +++ b/libs/evoral/src/Event.cpp @@ -16,7 +16,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <evoral/Event.hpp> +#include "evoral/Event.hpp" namespace Evoral { diff --git a/libs/evoral/src/MIDIEvent.cpp b/libs/evoral/src/MIDIEvent.cpp index 7617d2ae9a..0ae45c749d 100644 --- a/libs/evoral/src/MIDIEvent.cpp +++ b/libs/evoral/src/MIDIEvent.cpp @@ -16,7 +16,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <evoral/MIDIEvent.hpp> +#include "evoral/MIDIEvent.hpp" namespace Evoral { diff --git a/libs/evoral/src/Note.cpp b/libs/evoral/src/Note.cpp index 894945c422..02d65b5291 100644 --- a/libs/evoral/src/Note.cpp +++ b/libs/evoral/src/Note.cpp @@ -17,7 +17,7 @@ */ #include <iostream> -#include <evoral/Note.hpp> +#include "evoral/Note.hpp" namespace Evoral { diff --git a/libs/evoral/src/SMF.cpp b/libs/evoral/src/SMF.cpp index 4996f16d6a..cfcc782112 100644 --- a/libs/evoral/src/SMF.cpp +++ b/libs/evoral/src/SMF.cpp @@ -23,10 +23,10 @@ #include <cassert> #include <iostream> #include <glibmm/miscutils.h> -#include <evoral/midi_util.h> -#include <evoral/SMF.hpp> -#include <evoral/SMFReader.hpp> -#include <evoral/Event.hpp> +#include "evoral/midi_util.h" +#include "evoral/SMF.hpp" +#include "evoral/SMFReader.hpp" +#include "evoral/Event.hpp" using namespace std; diff --git a/libs/evoral/src/SMFReader.cpp b/libs/evoral/src/SMFReader.cpp index 8da6f95c85..fa76d3aa39 100644 --- a/libs/evoral/src/SMFReader.cpp +++ b/libs/evoral/src/SMFReader.cpp @@ -22,8 +22,8 @@ #include <iostream> #include <glibmm/miscutils.h> -#include <evoral/midi_util.h> -#include <evoral/SMFReader.hpp> +#include "evoral/midi_util.h" +#include "evoral/SMFReader.hpp" using namespace std; diff --git a/libs/evoral/src/Sequence.cpp b/libs/evoral/src/Sequence.cpp index d746f470b6..ce037d985f 100644 --- a/libs/evoral/src/Sequence.cpp +++ b/libs/evoral/src/Sequence.cpp @@ -23,13 +23,13 @@ #include <algorithm> #include <stdexcept> #include <stdint.h> -#include <evoral/Sequence.hpp> -#include <evoral/ControlList.hpp> -#include <evoral/Control.hpp> -#include <evoral/ControlSet.hpp> -#include <evoral/EventSink.hpp> -#include <evoral/MIDIParameters.hpp> -#include <evoral/TypeMap.hpp> +#include "evoral/Sequence.hpp" +#include "evoral/ControlList.hpp" +#include "evoral/Control.hpp" +#include "evoral/ControlSet.hpp" +#include "evoral/EventSink.hpp" +#include "evoral/MIDIParameters.hpp" +#include "evoral/TypeMap.hpp" using namespace std; |