Fix angle bracket project-local include paths.

git-svn-id: svn://localhost/ardour2/branches/3.0@5975 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2009-10-30 00:21:40 +00:00
parent 67b57c8df9
commit e5258d4ed1
38 changed files with 135 additions and 134 deletions

View file

@ -293,7 +293,7 @@ def create_stored_revision (target = None, source = None, env = None):
sys.exit (-1) sys.exit (-1)
try: try:
text = "#include <ardour/svn_revision.h>\n" text = "#include \"ardour/svn_revision.h\"\n"
text += "namespace ARDOUR {\n"; text += "namespace ARDOUR {\n";
text += "extern const char* svn_revision = \"" + rev + "\";\n"; text += "extern const char* svn_revision = \"" + rev + "\";\n";
text += "}\n"; text += "}\n";

View file

@ -1,9 +1,9 @@
#undef Marker #undef Marker
#define Marker FuckYouAppleAndYourLackOfNameSpaces #define Marker FuckYouAppleAndYourLackOfNameSpaces
#include <pbd/error.h> #include "pbd/error.h"
#include <ardour/audio_unit.h> #include "ardour/audio_unit.h"
#include <ardour/insert.h> #include "ardour/insert.h"
#undef check // stupid gtk, stupid apple #undef check // stupid gtk, stupid apple

View file

@ -25,7 +25,7 @@
#include <string.h> #include <string.h>
#include <limits.h> #include <limits.h>
#include <ardour/dB.h> #include "ardour/dB.h"
#include "logmeter.h" #include "logmeter.h"
#include "canvas-waveview.h" #include "canvas-waveview.h"

View file

@ -32,7 +32,7 @@
#include <sigc++/signal.h> #include <sigc++/signal.h>
#include <gtkmm/widget.h> #include <gtkmm/widget.h>
#include <ardour_dialog.h> #include "ardour_dialog.h"
#include "ardour/types.h" #include "ardour/types.h"
#include "plugin_ui.h" #include "plugin_ui.h"

View file

@ -16,7 +16,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#include <ardour/mtdm.h> #include "ardour/mtdm.h"
MTDM::MTDM (void) MTDM::MTDM (void)
: _cnt (0) : _cnt (0)

View file

@ -18,12 +18,12 @@
*/ */
#include <pbd/pthread_utils.h> #include "pbd/pthread_utils.h"
#include <ardour/session.h> #include "ardour/session.h"
#include <ardour/location.h> #include "ardour/location.h"
#include <control_protocol/basic_ui.h> #include "control_protocol/basic_ui.h"
#include "i18n.h" #include "i18n.h"

View file

@ -24,7 +24,7 @@
#include <string> #include <string>
#include <jack/types.h> #include <jack/types.h>
#include <control_protocol/timecode.h> #include "control_protocol/timecode.h"
namespace ARDOUR { namespace ARDOUR {
class Session; class Session;

View file

@ -27,7 +27,7 @@
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <sigc++/sigc++.h> #include <sigc++/sigc++.h>
#include <pbd/stateful.h> #include <pbd/stateful.h>
#include <control_protocol/basic_ui.h> #include "control_protocol/basic_ui.h"
namespace ARDOUR { namespace ARDOUR {

View file

@ -1,4 +1,4 @@
#include <control_protocol/control_protocol.h> #include "control_protocol/control_protocol.h"
#include "tranzport_control_protocol.h" #include "tranzport_control_protocol.h"
using namespace ARDOUR; using namespace ARDOUR;

View file

@ -52,14 +52,14 @@
#include <sys/time.h> #include <sys/time.h>
#include <errno.h> #include <errno.h>
#include <pbd/pthread_utils.h> #include "pbd/pthread_utils.h"
#include <ardour/route.h> #include "ardour/route.h"
#include <ardour/audio_track.h> #include "ardour/audio_track.h"
#include <ardour/session.h> #include "ardour/session.h"
#include <ardour/tempo.h> #include "ardour/tempo.h"
#include <ardour/location.h> #include "ardour/location.h"
#include <ardour/dB.h> #include "ardour/dB.h"
#include "tranzport_control_protocol.h" #include "tranzport_control_protocol.h"
@ -70,7 +70,7 @@ using namespace PBD;
#include "i18n.h" #include "i18n.h"
#include <pbd/abstract_ui.cc> #include "pbd/abstract_ui.cc"
BaseUI::RequestType LEDChange = BaseUI::new_request_type (); BaseUI::RequestType LEDChange = BaseUI::new_request_type ();
BaseUI::RequestType Print = BaseUI::new_request_type (); BaseUI::RequestType Print = BaseUI::new_request_type ();

View file

@ -10,9 +10,9 @@
#include <glibmm/thread.h> #include <glibmm/thread.h>
#include <ardour/types.h> #include "ardour/types.h"
#include <control_protocol/control_protocol.h> #include "control_protocol/control_protocol.h"
class TranzportControlProtocol : public ARDOUR::ControlProtocol class TranzportControlProtocol : public ARDOUR::ControlProtocol
{ {

View file

@ -22,14 +22,14 @@
#include <algorithm> #include <algorithm>
#include <pbd/error.h> #include "pbd/error.h"
#include <pbd/failed_constructor.h> #include "pbd/failed_constructor.h"
#include <midi++/port.h> #include "midi++/port.h"
#include <midi++/manager.h> #include "midi++/manager.h"
#include <ardour/route.h> #include "ardour/route.h"
#include <ardour/session.h> #include "ardour/session.h"
#include "generic_midi_control_protocol.h" #include "generic_midi_control_protocol.h"
#include "midicontrollable.h" #include "midicontrollable.h"

View file

@ -3,9 +3,9 @@
#include <set> #include <set>
#include <glibmm/thread.h> #include <glibmm/thread.h>
#include <ardour/types.h> #include "ardour/types.h"
#include <control_protocol/control_protocol.h> #include "control_protocol/control_protocol.h"
namespace MIDI { namespace MIDI {
class Port; class Port;

View file

@ -1,6 +1,6 @@
#include <pbd/failed_constructor.h> #include <pbd/failed_constructor.h>
#include <control_protocol/control_protocol.h> #include "control_protocol/control_protocol.h"
#include "generic_midi_control_protocol.h" #include "generic_midi_control_protocol.h"
using namespace ARDOUR; using namespace ARDOUR;

View file

@ -19,11 +19,11 @@
#include <cstdio> /* for sprintf, sigh */ #include <cstdio> /* for sprintf, sigh */
#include <climits> #include <climits>
#include <pbd/error.h> #include "pbd/error.h"
#include <pbd/xml++.h> #include "pbd/xml++.h"
#include <midi++/port.h> #include "midi++/port.h"
#include <midi++/channel.h> #include "midi++/channel.h"
#include <ardour/automation_control.h> #include "ardour/automation_control.h"
#include "midicontrollable.h" #include "midicontrollable.h"

View file

@ -24,10 +24,10 @@
#include <sigc++/sigc++.h> #include <sigc++/sigc++.h>
#include <midi++/types.h> #include "midi++/types.h"
#include <pbd/controllable.h> #include "pbd/controllable.h"
#include <pbd/stateful.h> #include "pbd/stateful.h"
#include <ardour/types.h> #include "ardour/types.h"
namespace MIDI { namespace MIDI {

View file

@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#include <control_protocol/control_protocol.h> #include "control_protocol/control_protocol.h"
#include "mackie_control_protocol.h" #include "mackie_control_protocol.h"
#include <pbd/error.h> #include <pbd/error.h>

View file

@ -32,21 +32,21 @@
#include <boost/shared_array.hpp> #include <boost/shared_array.hpp>
#include <midi++/types.h> #include "midi++/types.h"
#include <midi++/port.h> #include "midi++/port.h"
#include <midi++/manager.h> #include "midi++/manager.h"
#include <pbd/pthread_utils.h> #include "pbd/pthread_utils.h"
#include <pbd/error.h> #include "pbd/error.h"
#include <pbd/memento_command.h> #include "pbd/memento_command.h"
#include <pbd/convert.h> #include "pbd/convert.h"
#include <ardour/route.h> #include "ardour/route.h"
#include <ardour/session.h> #include "ardour/session.h"
#include <ardour/location.h> #include "ardour/location.h"
#include <ardour/dB.h> #include "ardour/dB.h"
#include <ardour/panner.h> #include "ardour/panner.h"
#include <ardour/tempo.h> #include "ardour/tempo.h"
#include <ardour/types.h> #include "ardour/types.h"
#include "mackie_control_protocol.h" #include "mackie_control_protocol.h"

View file

@ -25,11 +25,11 @@
#include <glibmm/thread.h> #include <glibmm/thread.h>
#include <ardour/types.h> #include "ardour/types.h"
#include <ardour/session.h> #include "ardour/session.h"
#include <midi++/types.h> #include "midi++/types.h"
#include <control_protocol/control_protocol.h> #include "control_protocol/control_protocol.h"
#include "midi_byte_array.h" #include "midi_byte_array.h"
#include "controls.h" #include "controls.h"
#include "dummy_port.h" #include "dummy_port.h"

View file

@ -25,11 +25,12 @@
#include <glibmm/main.h> #include <glibmm/main.h>
#include <midi++/types.h>
#include <midi++/port.h>
#include <sigc++/sigc++.h>
#include <boost/shared_array.hpp> #include <boost/shared_array.hpp>
#include <ardour/configuration.h>
#include "midi++/types.h"
#include "midi++/port.h"
#include "sigc++/sigc++.h"
#include "ardour/configuration.h"
#include "i18n.h" #include "i18n.h"

View file

@ -17,9 +17,9 @@
*/ */
#include "route_signal.h" #include "route_signal.h"
#include <ardour/route.h> #include "ardour/route.h"
#include <ardour/track.h> #include "ardour/track.h"
#include <ardour/panner.h> #include "ardour/panner.h"
#include "mackie_control_protocol.h" #include "mackie_control_protocol.h"

View file

@ -111,8 +111,8 @@ erb.run
impl_def = <<EOF impl_def = <<EOF
#include "route_signal.h" #include "route_signal.h"
#include <ardour/route.h> #include "ardour/route.h"
#include <ardour/panner.h> #include "ardour/panner.h"
#include "mackie_control_protocol.h" #include "mackie_control_protocol.h"

View file

@ -17,7 +17,7 @@
* *
* */ * */
#include <control_protocol/control_protocol.h> #include "control_protocol/control_protocol.h"
#include "osc.h" #include "osc.h"
using namespace ARDOUR; using namespace ARDOUR;

View file

@ -35,12 +35,12 @@
#include <pbd/filesystem.h> #include <pbd/filesystem.h>
#include <pbd/failed_constructor.h> #include <pbd/failed_constructor.h>
#include <ardour/session.h> #include "ardour/session.h"
#include <ardour/route.h> #include "ardour/route.h"
#include <ardour/audio_track.h> #include "ardour/audio_track.h"
#include <ardour/midi_track.h> #include "ardour/midi_track.h"
#include <ardour/dB.h> #include "ardour/dB.h"
#include <ardour/filesystem_paths.h> #include "ardour/filesystem_paths.h"
#include "osc.h" #include "osc.h"
#include "osc_controllable.h" #include "osc_controllable.h"

View file

@ -31,9 +31,9 @@
#include <sigc++/sigc++.h> #include <sigc++/sigc++.h>
#include <ardour/types.h> #include "ardour/types.h"
#include <ardour/session.h> #include "ardour/session.h"
#include <control_protocol/control_protocol.h> #include "control_protocol/control_protocol.h"
class OSCControllable; class OSCControllable;

View file

@ -19,10 +19,10 @@
#include <cstdio> /* for sprintf, sigh */ #include <cstdio> /* for sprintf, sigh */
#include <climits> #include <climits>
#include <pbd/error.h> #include "pbd/error.h"
#include <pbd/xml++.h> #include "pbd/xml++.h"
#include <ardour/route.h> #include "ardour/route.h"
#include "osc_controllable.h" #include "osc_controllable.h"

View file

@ -25,9 +25,9 @@
#include <sigc++/sigc++.h> #include <sigc++/sigc++.h>
#include <lo/lo.h> #include <lo/lo.h>
#include <pbd/controllable.h> #include "pbd/controllable.h"
#include <pbd/stateful.h> #include "pbd/stateful.h"
#include <ardour/types.h> #include "ardour/types.h"
namespace ARDOUR { namespace ARDOUR {

View file

@ -18,7 +18,7 @@
* *
* */ * */
#include <control_protocol/control_protocol.h> #include "control_protocol/control_protocol.h"
#include "tranzport_control_protocol.h" #include "tranzport_control_protocol.h"
using namespace ARDOUR; using namespace ARDOUR;

View file

@ -28,16 +28,16 @@
#include <sys/time.h> #include <sys/time.h>
#include <errno.h> #include <errno.h>
#include <pbd/pthread_utils.h> #include "pbd/pthread_utils.h"
#include <ardour/route.h> #include "ardour/route.h"
#include <ardour/audio_track.h> #include "ardour/audio_track.h"
#include <ardour/session.h> #include "ardour/session.h"
#include <ardour/tempo.h> #include "ardour/tempo.h"
#include <ardour/location.h> #include "ardour/location.h"
#include <ardour/dB.h> #include "ardour/dB.h"
#include <tranzport_control_protocol.h> #include "tranzport_control_protocol.h"
using namespace ARDOUR; using namespace ARDOUR;
using namespace std; using namespace std;
@ -46,7 +46,7 @@ using namespace PBD;
#include "i18n.h" #include "i18n.h"
#include <pbd/abstract_ui.cc> #include "pbd/abstract_ui.cc"
float float
log_meter (float db) log_meter (float db)

View file

@ -27,11 +27,11 @@
#include <float.h> #include <float.h>
#include <sys/time.h> #include <sys/time.h>
#include <errno.h> #include <errno.h>
#include <ardour/route.h> #include "ardour/route.h"
#include <ardour/audio_track.h> #include "ardour/audio_track.h"
#include <ardour/session.h> #include "ardour/session.h"
#include <ardour/location.h> #include "ardour/location.h"
#include <ardour/dB.h> #include "ardour/dB.h"
using namespace ARDOUR; using namespace ARDOUR;
using namespace std; using namespace std;
@ -40,7 +40,7 @@ using namespace PBD;
#include "i18n.h" #include "i18n.h"
#include <pbd/abstract_ui.cc> #include "pbd/abstract_ui.cc"
#include "tranzport_control_protocol.h" #include "tranzport_control_protocol.h"

View file

@ -32,13 +32,13 @@
#include <sys/time.h> #include <sys/time.h>
#include <errno.h> #include <errno.h>
#include <pbd/pthread_utils.h> #include "pbd/pthread_utils.h"
#include <ardour/route.h> #include "ardour/route.h"
#include <ardour/audio_track.h> #include "ardour/audio_track.h"
#include <ardour/session.h> #include "ardour/session.h"
#include <ardour/tempo.h> #include "ardour/tempo.h"
#include <ardour/location.h> #include "ardour/location.h"
#include <ardour/dB.h> #include "ardour/dB.h"
#endif /* ardour_tranzport_common */ #endif /* ardour_tranzport_common */

View file

@ -34,9 +34,9 @@
#endif #endif
#include <glibmm/thread.h> #include <glibmm/thread.h>
#include <ardour/types.h> #include "ardour/types.h"
#include <control_protocol/control_protocol.h> #include "control_protocol/control_protocol.h"
class TranzportControlProtocol : public ARDOUR::ControlProtocol class TranzportControlProtocol : public ARDOUR::ControlProtocol
{ {

View file

@ -27,11 +27,11 @@
#include <float.h> #include <float.h>
#include <sys/time.h> #include <sys/time.h>
#include <errno.h> #include <errno.h>
#include <ardour/route.h> #include "ardour/route.h"
#include <ardour/audio_track.h> #include "ardour/audio_track.h"
#include <ardour/session.h> #include "ardour/session.h"
#include <ardour/location.h> #include "ardour/location.h"
#include <ardour/dB.h> #include "ardour/dB.h"
using namespace ARDOUR; using namespace ARDOUR;
using namespace std; using namespace std;
@ -40,14 +40,14 @@ using namespace PBD;
#include "i18n.h" #include "i18n.h"
#include <pbd/abstract_ui.cc> #include "pbd/abstract_ui.cc"
BaseUI::RequestType LEDChange = BaseUI::new_request_type (); BaseUI::RequestType LEDChange = BaseUI::new_request_type ();
BaseUI::RequestType Print = BaseUI::new_request_type (); BaseUI::RequestType Print = BaseUI::new_request_type ();
BaseUI::RequestType SetCurrentTrack = BaseUI::new_request_type (); BaseUI::RequestType SetCurrentTrack = BaseUI::new_request_type ();
#include <tranzport_control_protocol.h> #include "tranzport_control_protocol.h"
void void
TranzportControlProtocol::datawheel () TranzportControlProtocol::datawheel ()

View file

@ -33,16 +33,16 @@
#include <poll.h> #include <poll.h>
#endif #endif
#include <pbd/pthread_utils.h> #include "pbd/pthread_utils.h"
#include <ardour/route.h> #include "ardour/route.h"
#include <ardour/audio_track.h> #include "ardour/audio_track.h"
#include <ardour/session.h> #include "ardour/session.h"
#include <ardour/tempo.h> #include "ardour/tempo.h"
#include <ardour/location.h> #include "ardour/location.h"
#include <ardour/dB.h> #include "ardour/dB.h"
#include <tranzport_control_protocol.h> #include "tranzport_control_protocol.h"
using namespace ARDOUR; using namespace ARDOUR;
using namespace std; using namespace std;

View file

@ -1,9 +1,9 @@
#include <pbd/failed_constructor.h> #include <pbd/failed_constructor.h>
#include <control_protocol/control_protocol.h> #include "control_protocol/control_protocol.h"
#include "wiimote.h" #include "wiimote.h"
#include <ardour/session.h> #include "ardour/session.h"
using namespace ARDOUR; using namespace ARDOUR;

View file

@ -3,8 +3,8 @@
#include <iostream> #include <iostream>
#include <sigc++/bind.h> #include <sigc++/bind.h>
#include <pbd/xml++.h> #include "pbd/xml++.h"
#include <ardour/session.h> #include "ardour/session.h"
#include "i18n.h" #include "i18n.h"

View file

@ -1,12 +1,12 @@
#ifndef ardour_wiimote_control_protocol_h #ifndef ardour_wiimote_control_protocol_h
#define ardour_wiimote_control_protocol_h #define ardour_wiimote_control_protocol_h
#include <ardour/types.h> #include "ardour/types.h"
#include <control_protocol/control_protocol.h> #include "control_protocol/control_protocol.h"
#include <glibmm/thread.h> #include <glibmm/thread.h>
#include <pbd/abstract_ui.h> #include "pbd/abstract_ui.h"
#include <cwiid.h> #include <cwiid.h>

View file

@ -81,7 +81,7 @@ def create_stored_revision():
sys.exit(-1) sys.exit(-1)
try: try:
text = '#include <ardour/svn_revision.h>\n' text = '#include "ardour/svn_revision.h"\n'
text += 'namespace ARDOUR { extern const char* svn_revision = \"' + rev + '\"; }\n' text += 'namespace ARDOUR { extern const char* svn_revision = \"' + rev + '\"; }\n'
print 'Writing svn revision info to libs/ardour/svn_revision.cc' print 'Writing svn revision info to libs/ardour/svn_revision.cc'
o = file('libs/ardour/svn_revision.cc', 'w') o = file('libs/ardour/svn_revision.cc', 'w')