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

diff --git a/libs/evoral/evoral/Control.hpp b/libs/evoral/evoral/Control.hpp
index 31ebe3cfde4808691a5284a2cbbf1b830a0bb932..2f6e72be1e82fe3364cc1848602953fe9361ff09 100644 (file)
--- 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 48050f9e93704ce94758d6a588ec59cfcc17471c..d0e1598388d5973ae21b64fb0fc645ec7a678964 100644 (file)
--- 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 9a8ea2efcd054af850475df9e9cd1cfdad7d3a58..0172d0e0254bf4a23ddd91cd64bab7af2b8ebb6e 100644 (file)
--- 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 1dd081a5b90575336e0b10e45f2abdd667405044..d6da9b8a1e3288c3a65f7c7fd1ca7303183ff1b5 100644 (file)
--- 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 05ec9217b878dffe79a8914a356390ed4dd3efc9..cc7b617e268051ec3f171b05089a68e386525c60 100644 (file)
--- 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 dfa746d870be08907d3b25010a048f02d93c0b47..3e98601a9a32dd13fc008b582efdc6d5eb392901 100644 (file)
--- 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 bbf1e580f116f431be7f64925885c4feb59962fb..59cbb12492381a80e62bcf92c8608e895bfab7b3 100644 (file)
--- 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 75a8046237d784d0ad3b949e3dad9c0aa3393109..7e98255d7cd572386b7b6210f742c1f970246f74 100644 (file)
--- 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 5ae27131e38677332c8806dc4b8890a5ef5354b7..7257368213a69a06a6f81b6503e0fdc01569b3e2 100644 (file)
--- 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 f2bf24b25488ce942c906d427c1a46dd608b2646..450051b2464ab6c654e9aaf4b68fcf7fe60674db 100644 (file)
--- 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 9e3d64a047c6a7526ead3352494257529783f06a..642735134dc6a85d21b13e4dcf2fcf36dd18c908 100644 (file)
--- 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 499a40fd2cf3b5cb7d3de9ea2138ce96e51f4c47..b1b492548b4fa77b5a3a770fbe2848caa0b6c47f 100644 (file)
--- 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 033e375a8a22372287c9e3879dce364e65ed7026..5ec8c2dac99e4791a1412442b301d94afb174c76 100644 (file)
--- 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 06046347a625139e2f5e95f69cb9e61ca7c774a0..860419a187f6424fb7dee0aaf929c64b8ba8f797 100644 (file)
--- 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 a586edc70b02706a6c9ddc84c8080005149d5868..2ae79a39175832bbc58c4027468c2cd78aafbaf4 100644 (file)
--- 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 99a94e0215e22def0b655e2f3478190e4451df3e..5ac38d6357411449e43e4b10e691be560e37dc44 100644 (file)
--- 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 7617d2ae9ae169a9e8970ee6ce12a5089365f998..0ae45c749d45a9e8509b9321af91da353a887cc9 100644 (file)
--- 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 894945c422a098dba5fc1764ddb4ec12a8eebea8..02d65b5291aae8448094227693f55ba00ebc8462 100644 (file)
--- 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 4996f16d6ab0dfa2850aad63d7d54ae3d535593d..cfcc7821122681ee7d685fc3f71930b976b1a17a 100644 (file)
--- 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 8da6f95c85636e9ab9edd05179b45081ef2b8908..fa76d3aa396c52d73908b7dc9a300d4d9f419cb8 100644 (file)
--- 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 d746f470b6f15c44ebad8247cbb6d033e1573970..ce037d985fec3e94e2c95c3e06f6b8a129ac2d08 100644 (file)
--- 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;