From 27a1cf2cf73703267cac5bda2acca386afb374b3 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 24 May 2012 02:54:10 +0000 Subject: Compile cleanly with clang. To compile Ardour with LLVM/clang, do the usual thing but set the CXX and CC environment variables, e.g.: CC=/usr/bin/clang CXX=/usr/bin/clang++ ./waf configure build git-svn-id: svn://localhost/ardour2/branches/3.0@12418 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/ardour/bundle.h | 3 ++- libs/ardour/ardour/control_protocol_manager.h | 3 ++- libs/ardour/ardour/export_status.h | 4 ++-- libs/ardour/ardour/import_status.h | 3 ++- libs/ardour/ardour/interthread_info.h | 5 +++-- libs/ardour/ardour/midi_buffer.h | 3 ++- libs/ardour/ardour/named_selection.h | 3 ++- libs/ardour/ardour/playlist.h | 6 ++++-- libs/ardour/ardour/session_event.h | 3 ++- libs/ardour/ardour/types.h | 3 ++- 10 files changed, 23 insertions(+), 13 deletions(-) (limited to 'libs/ardour/ardour') diff --git a/libs/ardour/ardour/bundle.h b/libs/ardour/ardour/bundle.h index 2bf614e75f..e84349c647 100644 --- a/libs/ardour/ardour/bundle.h +++ b/libs/ardour/ardour/bundle.h @@ -149,8 +149,9 @@ class Bundle : public PBD::ScopedConnectionList Change _pending_change; }; -struct BundleChannel +class BundleChannel { +public: BundleChannel () : channel (-1) {} BundleChannel (boost::shared_ptr b, int c) diff --git a/libs/ardour/ardour/control_protocol_manager.h b/libs/ardour/ardour/control_protocol_manager.h index 19abbaf6be..20358025f1 100644 --- a/libs/ardour/ardour/control_protocol_manager.h +++ b/libs/ardour/ardour/control_protocol_manager.h @@ -35,7 +35,8 @@ class ControlProtocol; class ControlProtocolDescriptor; class Session; -struct ControlProtocolInfo { +class ControlProtocolInfo { +public: ControlProtocolDescriptor* descriptor; ControlProtocol* protocol; std::string name; diff --git a/libs/ardour/ardour/export_status.h b/libs/ardour/ardour/export_status.h index 56b15eada1..164b348c37 100644 --- a/libs/ardour/ardour/export_status.h +++ b/libs/ardour/ardour/export_status.h @@ -31,8 +31,8 @@ namespace ARDOUR { -struct ExportStatus { - +class ExportStatus { + public: ExportStatus (); void init (); diff --git a/libs/ardour/ardour/import_status.h b/libs/ardour/ardour/import_status.h index 1753abe655..c261b7a960 100644 --- a/libs/ardour/ardour/import_status.h +++ b/libs/ardour/ardour/import_status.h @@ -30,7 +30,8 @@ namespace ARDOUR { -struct ImportStatus : public InterThreadInfo { +class ImportStatus : public InterThreadInfo { +public: std::string doing_what; /* control info */ diff --git a/libs/ardour/ardour/interthread_info.h b/libs/ardour/ardour/interthread_info.h index 908276067a..01cacf437c 100644 --- a/libs/ardour/ardour/interthread_info.h +++ b/libs/ardour/ardour/interthread_info.h @@ -27,14 +27,15 @@ namespace ARDOUR { - struct InterThreadInfo { + class InterThreadInfo { + public: InterThreadInfo () : done (false), cancel (false), progress (0), thread (0) {} volatile bool done; volatile bool cancel; volatile float progress; pthread_t thread; - ProcessThread process_thread; + ProcessThread process_thread; }; } // namespace diff --git a/libs/ardour/ardour/midi_buffer.h b/libs/ardour/ardour/midi_buffer.h index db02344249..183ca7eea9 100644 --- a/libs/ardour/ardour/midi_buffer.h +++ b/libs/ardour/ardour/midi_buffer.h @@ -53,7 +53,8 @@ public: bool merge_in_place(const MidiBuffer &other); template - struct iterator_base { + class iterator_base { + public: iterator_base(BufferType& b, framecnt_t o) : buffer(b), offset(o) {} inline EventType operator*() const { uint8_t* ev_start = buffer._data + offset + sizeof(TimeType); diff --git a/libs/ardour/ardour/named_selection.h b/libs/ardour/ardour/named_selection.h index f03db20574..c120848328 100644 --- a/libs/ardour/ardour/named_selection.h +++ b/libs/ardour/ardour/named_selection.h @@ -34,8 +34,9 @@ namespace ARDOUR class Session; class Playlist; -struct NamedSelection : public PBD::Stateful +class NamedSelection : public PBD::Stateful { +public: NamedSelection (std::string, std::list >&); NamedSelection (Session&, const XMLNode&); virtual ~NamedSelection (); diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h index ff2ac35954..59b7ae406c 100644 --- a/libs/ardour/ardour/playlist.h +++ b/libs/ardour/ardour/playlist.h @@ -230,12 +230,14 @@ public: friend class Session; protected: - struct RegionReadLock : public Glib::RWLock::ReaderLock { + class RegionReadLock : public Glib::RWLock::ReaderLock { + public: RegionReadLock (Playlist *pl) : Glib::RWLock::ReaderLock (pl->region_lock) {} ~RegionReadLock() {} }; - struct RegionWriteLock : public Glib::RWLock::WriterLock { + class RegionWriteLock : public Glib::RWLock::WriterLock { + public: RegionWriteLock (Playlist *pl, bool do_block_notify = true) : Glib::RWLock::WriterLock (pl->region_lock) , playlist (pl) diff --git a/libs/ardour/ardour/session_event.h b/libs/ardour/ardour/session_event.h index 27f778b8ac..932ddc9176 100644 --- a/libs/ardour/ardour/session_event.h +++ b/libs/ardour/ardour/session_event.h @@ -16,7 +16,8 @@ namespace ARDOUR { class Slave; class Region; -struct SessionEvent { +class SessionEvent { +public: enum Type { SetTransportSpeed, SetTrackSpeed, diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h index 6ac9ebfe70..6d05bdbbd8 100644 --- a/libs/ardour/ardour/types.h +++ b/libs/ardour/ardour/types.h @@ -213,7 +213,8 @@ namespace ARDOUR { timecode_60 }; - struct AnyTime { + class AnyTime { + public: enum Type { Timecode, BBT, -- cgit v1.2.3