Define operator<< in the corresponding namespace

This fixes the build for me with clang 11.1.0 (from LLVM repositories) on
Debian buster as C++11.  As far as I know this is the general best practice
because of ADL voodoo, but Ardour's approach to namespaces is pretty anarchic,
and I'm not really sure exactly why this wasn't building for some types.

Also tested to build find with the default buster GCC 8.3.0.

gtk2_ardour/editor.cc

@@ -2922,7 +2922,7 @@ Editor::snap_to_marker (samplepos_t presnap, RoundMode direction)
 			test = after;
 		} else if ((direction == RoundDownMaybe || direction == RoundDownAlways)) {
 			test = before;
-		} else if (direction ==  0) {
+		} else {
 			if ((presnap - before) < (after - presnap)) {
 				test = before;
 			} else {

gtk2_ardour/editor_rulers.cc

@@ -977,7 +977,6 @@ Editor::compute_bbt_ruler_scale (samplepos_t lower, samplepos_t upper)
 		return;
 	}
 
-	std::vector<TempoMap::BBTPoint>::const_iterator i;
 	Timecode::BBT_Time lower_beat, upper_beat; // the beats at each end of the ruler
 	double floor_lower_beat = floor(std::max (0.0, _session->tempo_map().beat_at_sample (lower)));
 

libs/ardour/ardour/bundle.h

@@ -178,8 +178,8 @@ public:
 	int channel; ///< channel index, or -1 for "all"
 };
 
+std::ostream & operator<< (std::ostream & o, Bundle const &);
+
 }
 
-std::ostream & operator<< (std::ostream & o, ARDOUR::Bundle const &);
-
 #endif /* __ardour_bundle_h__ */

libs/ardour/ardour/chan_count.h

@@ -212,9 +212,9 @@ private:
 	uint32_t _counts[DataType::num_types];
 };
 
-} // namespace ARDOUR
+LIBARDOUR_API std::ostream& operator<<(std::ostream& o, const ChanCount& c);
 
-LIBARDOUR_API std::ostream& operator<<(std::ostream& o, const ARDOUR::ChanCount& c);
+} // namespace ARDOUR
 
 #endif // __ardour_chan_count_h__
 

libs/ardour/ardour/chan_mapping.h

@@ -136,9 +136,9 @@ private:
 	Mappings _mappings;
 };
 
-} // namespace ARDOUR
+std::ostream& operator<<(std::ostream& o, const ChanMapping& m);
 
-std::ostream& operator<<(std::ostream& o, const ARDOUR::ChanMapping& m);
+} // namespace ARDOUR
 
 #endif // __ardour_chan_mapping_h__
 

libs/ardour/ardour/midi_playlist.h

@@ -91,7 +91,6 @@ public:
 	void dump () const;
 
 	NoteMode     _note_mode;
-	samplepos_t  _read_end;
 
 	RTMidiBuffer _rendered;
 };

libs/ardour/ardour/plugin_insert.h

@@ -447,8 +447,8 @@ private:
 	GATOMIC_QUAL gint _flush;
 };
 
+std::ostream& operator<<(std::ostream& o, const PluginInsert::Match& m);
+
 } // namespace ARDOUR
 
-std::ostream& operator<<(std::ostream& o, const ARDOUR::PluginInsert::Match& m);
-
 #endif /* __ardour_plugin_insert_h__ */

libs/ardour/ardour/presentation_info.h

@@ -280,8 +280,8 @@ class LIBARDOUR_API PresentationInfo : public PBD::Stateful
 	static int selection_counter;
 };
 
+LIBARDOUR_API std::ostream& operator<<(std::ostream& o, PresentationInfo const& rid);
+
 }
 
-std::ostream& operator<<(std::ostream& o, ARDOUR::PresentationInfo const& rid);
-
 #endif /* __libardour_presentation_info_h__ */

libs/ardour/ardour/tempo.h

@@ -627,11 +627,11 @@ private:
 	MeterSection* copy_metrics_and_point (const Metrics& metrics, Metrics& copy, MeterSection* section) const;
 };
 
-}; /* namespace ARDOUR */
+LIBARDOUR_API std::ostream& operator<< (std::ostream&, const Meter&);
+LIBARDOUR_API std::ostream& operator<< (std::ostream&, const Tempo&);
+LIBARDOUR_API std::ostream& operator<< (std::ostream&, const MetricSection&);
 
-LIBARDOUR_API std::ostream& operator<< (std::ostream&, const ARDOUR::Meter&);
-LIBARDOUR_API std::ostream& operator<< (std::ostream&, const ARDOUR::Tempo&);
-LIBARDOUR_API std::ostream& operator<< (std::ostream&, const ARDOUR::MetricSection&);
+}; /* namespace ARDOUR */
 
 namespace PBD {
 	DEFINE_ENUM_CONVERT (ARDOUR::TempoSection::Type)

libs/ardour/chan_count.cc

@@ -66,8 +66,9 @@ ChanCount::state(const std::string& name) const
 // Statics
 const ChanCount ChanCount::ZERO     = ChanCount();
 
-} // namespace ARDOUR
-
-std::ostream& operator<<(std::ostream& o, const ARDOUR::ChanCount& c) {
+std::ostream& operator<<(std::ostream& o, const ChanCount& c) {
 	return o << "AUDIO=" << c.n_audio() << ":MIDI=" << c.n_midi();
 }
+
+} // namespace ARDOUR
+

libs/ardour/chan_mapping.cc

@@ -257,16 +257,12 @@ ChanMapping::count () const
 	return rv;
 }
 
-
-
-} // namespace ARDOUR
-
-std::ostream& operator<<(std::ostream& o, const ARDOUR::ChanMapping& cm)
+std::ostream& operator<<(std::ostream& o, const ChanMapping& cm)
 {
-	const ARDOUR::ChanMapping::Mappings& mp (cm.mappings());
-	for (ARDOUR::ChanMapping::Mappings::const_iterator tm = mp.begin(); tm != mp.end(); ++tm) {
+	const ChanMapping::Mappings& mp (cm.mappings());
+	for (ChanMapping::Mappings::const_iterator tm = mp.begin(); tm != mp.end(); ++tm) {
 		o << tm->first.to_string() << endl;
-		for (ARDOUR::ChanMapping::TypeMapping::const_iterator i = tm->second.begin();
+		for (ChanMapping::TypeMapping::const_iterator i = tm->second.begin();
 				i != tm->second.end(); ++i) {
 			o << "\t" << i->first << " => " << i->second << endl;
 		}
@@ -274,3 +270,5 @@ std::ostream& operator<<(std::ostream& o, const ARDOUR::ChanMapping& cm)
 
 	return o;
 }
+
+} // namespace ARDOUR

libs/ardour/import_pt.cc

@@ -278,7 +278,6 @@ Session::import_pt_rest (PTFFormat& ptf)
 	uint32_t srate = sample_rate ();
 
 	vector<struct ptflookup> ptfregpair;
-	vector<PTFFormat::wav_t>::const_iterator w;
 
 	SourceList just_one_src;
 

libs/ardour/io.cc

@@ -650,7 +650,6 @@ int
 IO::set_state_2X (const XMLNode& node, int version, bool in)
 {
 	XMLProperty const * prop;
-	XMLNodeConstIterator iter;
 	LocaleGuard lg;
 
 	/* force use of non-localized representation of decimal point,

libs/ardour/ltc_slave.cc

@@ -264,6 +264,7 @@ LTC_TransportMaster::equal_ltc_sample_time(LTCFrame *a, LTCFrame *b) {
 	}
 	return true;
 }
+
 static ostream& operator<< (ostream& ostr, LTCFrame& a)
 {
 	ostr

libs/ardour/midi_playlist.cc

@@ -50,7 +50,6 @@ using namespace std;
 MidiPlaylist::MidiPlaylist (Session& session, const XMLNode& node, bool hidden)
 	: Playlist (session, node, DataType::MIDI, hidden)
 	, _note_mode(Sustained)
-	, _read_end(0)
 {
 #ifndef NDEBUG
 	XMLProperty const * prop = node.property("type");
@@ -69,14 +68,12 @@ MidiPlaylist::MidiPlaylist (Session& session, const XMLNode& node, bool hidden)
 MidiPlaylist::MidiPlaylist (Session& session, string name, bool hidden)
 	: Playlist (session, name, DataType::MIDI, hidden)
 	, _note_mode(Sustained)
-	, _read_end(0)
 {
 }
 
 MidiPlaylist::MidiPlaylist (boost::shared_ptr<const MidiPlaylist> other, string name, bool hidden)
 	: Playlist (other, name, hidden)
 	, _note_mode(other->_note_mode)
-	, _read_end(0)
 {
 }
 
@@ -87,7 +84,6 @@ MidiPlaylist::MidiPlaylist (boost::shared_ptr<const MidiPlaylist> other,
                             bool                                  hidden)
 	: Playlist (other, start, dur, name, hidden)
 	, _note_mode(other->_note_mode)
-	, _read_end(0)
 {
 }
 

libs/ardour/playlist.cc

@@ -2252,7 +2252,6 @@ Playlist::set_state (const XMLNode& node, int version)
 	XMLNode*                  child;
 	XMLNodeList               nlist;
 	XMLNodeConstIterator      niter;
-	XMLPropertyConstIterator  piter;
 	boost::shared_ptr<Region> region;
 	string                    region_name;
 	bool                      seen_region_nodes = false;

libs/ardour/plugin_insert.cc

@@ -3382,7 +3382,7 @@ PluginInsert::clear_stats ()
 	g_atomic_int_set (&_stat_reset, 1);
 }
 
-std::ostream& operator<<(std::ostream& o, const ARDOUR::PluginInsert::Match& m)
+std::ostream& ARDOUR::operator<<(std::ostream& o, const ARDOUR::PluginInsert::Match& m)
 {
 	switch (m.method) {
 		case PluginInsert::Impossible: o << "Impossible"; break;

libs/ardour/presentation_info.cc

@@ -297,7 +297,7 @@ PresentationInfo::operator= (PresentationInfo const& other)
 }
 
 std::ostream&
-operator<<(std::ostream& o, ARDOUR::PresentationInfo const& pi)
+ARDOUR::operator<<(std::ostream& o, ARDOUR::PresentationInfo const& pi)
 {
 	return o << pi.order() << '/' << enum_2_string (pi.flags()) << '/' << pi.color();
 }

libs/ardour/session.cc

@@ -3230,17 +3230,11 @@ Session::add_routes_inner (RouteList& new_routes, bool input_auto_connect, bool
 				}
 			}
 
-#if !defined(__APPLE__) && !defined(__FreeBSD__)
-			/* clang complains: 'operator<<' should be declared prior to the call site or in an associated namespace of one of its
-			 * arguments std::ostream& operator<<(std::ostream& o, ARDOUR::PresentationInfo const& rid)"
-			 */
 			DEBUG_TRACE (DEBUG::OrderKeys, string_compose ("added route %1, group order %2 type %3 (summary: %4)\n",
 			                                               r->name(),
 			                                               r->presentation_info().order(),
 			                                               enum_2_string (r->presentation_info().flags()),
 			                                               r->presentation_info()));
-#endif
-
 
 			if (input_auto_connect || output_auto_connect) {
 				auto_connect_route (r, input_auto_connect, output_auto_connect, ChanCount (), ChanCount (), existing_inputs, existing_outputs);
@@ -4746,7 +4740,6 @@ bool
 Session::audio_source_name_is_unique (const string& name)
 {
 	std::vector<string> sdirs = source_search_path (DataType::AUDIO);
-	vector<space_and_path>::iterator i;
 	uint32_t existing = 0;
 
 	for (vector<string>::const_iterator i = sdirs.begin(); i != sdirs.end(); ++i) {
@@ -4890,7 +4883,6 @@ Session::new_midi_source_path (const string& base, bool need_lock)
 	while (true) {
 		possible_name = bump_name_once (possible_name, '-');
 
-		vector<space_and_path>::iterator i;
 		uint32_t existing = 0;
 
 		for (vector<string>::const_iterator i = sdirs.begin(); i != sdirs.end(); ++i) {

libs/ardour/tempo.cc

@@ -4943,17 +4943,17 @@ struct bbtcmp {
 };
 
 std::ostream&
-operator<< (std::ostream& o, const Meter& m) {
+ARDOUR::operator<< (std::ostream& o, const ARDOUR::Meter& m) {
 	return o << m.divisions_per_bar() << '/' << m.note_divisor();
 }
 
 std::ostream&
-operator<< (std::ostream& o, const Tempo& t) {
+ARDOUR::operator<< (std::ostream& o, const ARDOUR::Tempo& t) {
 	return o << t.note_types_per_minute() << " 1/" << t.note_type() << "'s per minute";
 }
 
 std::ostream&
-operator<< (std::ostream& o, const MetricSection& section) {
+ARDOUR::operator<< (std::ostream& o, const ARDOUR::MetricSection& section) {
 
 	o << "MetricSection @ " << section.sample() << ' ';
 

libs/ardour/vst_plugin.cc

@@ -323,7 +323,6 @@ VSTPlugin::set_state (const XMLNode& node, int version)
 			_plugin->dispatcher (_plugin, effSetProgram, 0, pgm, NULL, 0);
 		};
 
-		XMLPropertyList::const_iterator i;
 		XMLNodeList::const_iterator n;
 
 		for (n = child->children ().begin (); n != child->children ().end (); ++n) {

libs/backends/alsa/alsa_rawmidi.cc

@@ -200,7 +200,7 @@ retry:
 		printf ("\n");
 #endif
 
-		if ((err == -EAGAIN)) {
+		if (err == -EAGAIN) {
 			snd_rawmidi_drain (_device);
 			goto retry;
 		}

libs/backends/alsa/alsa_sequencer.cc

@@ -199,7 +199,7 @@ retry:
 
 		ssize_t err = snd_seq_event_output(_seq, &alsa_event);
 
-		if ((err == -EAGAIN)) {
+		if (err == -EAGAIN) {
 			snd_seq_drain_output (_seq);
 			goto retry;
 		}

libs/canvas/canvas/canvas.h

@@ -323,8 +323,8 @@ private:
 	void scrolled ();
 };
 
+std::ostream& operator<< (std::ostream&, const Canvas&);
+
 }
 
-std::ostream& operator<< (std::ostream&, const ArdourCanvas::Canvas&);
-
 #endif

libs/canvas/canvas/item.h

@@ -333,7 +333,7 @@ private:
 	void propagate_show_hide ();
 };
 
-extern LIBCANVAS_API std::ostream& operator<< (std::ostream&, const ArdourCanvas::Item&);
+extern LIBCANVAS_API std::ostream& operator<< (std::ostream&, const Item&);
 
 }
 

libs/evoral/ControlSet.cc

@@ -104,12 +104,11 @@ ControlSet::clear_controls ()
 	}
 }
 
-} // namespace Evoral
-
-/* No good place for this so just put it here */
-
 std::ostream&
-std::operator<< (std::ostream & str, Evoral::Parameter const & p)
+operator<< (std::ostream & str, Parameter const & p)
 {
 	return str << p.type() << '-' << p.id() << '-' << (int) p.channel();
 }
+
+} // namespace Evoral
+

libs/evoral/evoral/Parameter.h

@@ -87,11 +87,9 @@ private:
 	uint8_t       _channel;
 };
 
-} // namespace Evoral
+std::ostream& operator<< (std::ostream &str, Parameter const &);
 
-namespace std {
-std::ostream& operator<< (std::ostream &str, Evoral::Parameter const &);
-}
+} // namespace Evoral
 
 #endif // EVORAL_PARAMETER_HPP
 

libs/evoral/evoral/Sequence.h

@@ -371,11 +371,9 @@ private:
 	uint8_t _highest_note;
 };
 
+template<typename Time> /*LIBEVORAL_API*/ std::ostream& operator<<(std::ostream& o, const Evoral::Sequence<Time>& s) { s.dump (o); return o; }
 
 } // namespace Evoral
 
-template<typename Time> /*LIBEVORAL_API*/ std::ostream& operator<<(std::ostream& o, const Evoral::Sequence<Time>& s) { s.dump (o); return o; }
-
-
 #endif // EVORAL_SEQUENCE_HPP
 

libs/midi++2/midi++/port.h

@@ -149,7 +149,7 @@ struct LIBMIDIPP_API PortSet {
     std::list<XMLNode> ports;
 };
 
-std::ostream & operator << (std::ostream& os, const Port& port);
+std::ostream & operator<< (std::ostream& os, const Port& port);
 
 } // namespace MIDI
 

libs/midi++2/port.cc

@@ -99,7 +99,7 @@ Port::clock (timestamp_t timestamp)
 	return false;
 }
 
-std::ostream & MIDI::operator << ( std::ostream & os, const MIDI::Port & port )
+std::ostream & MIDI::operator<< ( std::ostream & os, const MIDI::Port & port )
 {
 	using namespace std;
 	os << "MIDI::Port { ";

libs/pbd/id.cc

@@ -105,7 +105,7 @@ ID::operator= (const ID& other)
 }
 
 ostream&
-operator<< (ostream& ostr, const ID& id)
+PBD::operator<< (ostream& ostr, const ID& id)
 {
 	ostr << id.to_s();
 	return ostr;

libs/pbd/pbd/id.h

@@ -75,8 +75,8 @@ class LIBPBD_API ID {
 	static uint64_t _counter;
 };
 
+LIBPBD_API std::ostream& operator<< (std::ostream& ostr, const ID&);
+
 }
 
-LIBPBD_API std::ostream& operator<< (std::ostream& ostr, const PBD::ID&);
-
 #endif /* __pbd_id_h__ */

libs/plugins/a-delay.lv2/a-delay.c

@@ -249,11 +249,6 @@ from_dB(float gdb) {
 	return (exp(gdb/20.f*log(10.f)));
 }
 
-static inline float
-to_dB(float g) {
-	return (20.f*log10(g));
-}
-
 static inline bool
 is_eq(float a, float b, float small) {
 	return (fabsf(a - b) < small);

libs/surfaces/cc121/cc121.cc

@@ -758,7 +758,6 @@ int
 CC121::set_state (const XMLNode& node, int version)
 {
 	XMLNodeList nlist;
-	XMLNodeConstIterator niter;
 	XMLNode const* child;
 
 	if (ControlProtocol::set_state (node, version)) {

libs/surfaces/cc121/operations.cc

@@ -35,11 +35,6 @@ using namespace ARDOUR;
 using namespace ArdourSurface;
 using namespace PBD;
 
-/* this value is chosen to given smooth motion from 0..1.0 in about 270 degrees
- * of encoder rotation.
- */
-static const double encoder_divider = 24.0;
-
 void
 CC121::input_monitor ()
 {

libs/surfaces/faderport/faderport.cc

@@ -790,7 +790,6 @@ int
 FaderPort::set_state (const XMLNode& node, int version)
 {
 	XMLNodeList nlist;
-	XMLNodeConstIterator niter;
 	XMLNode const* child;
 
 	if (ControlProtocol::set_state (node, version)) {

libs/surfaces/faderport8/faderport8.cc

@@ -808,7 +808,6 @@ FaderPort8::set_state (const XMLNode& node, int version)
 {
 	DEBUG_TRACE (DEBUG::FaderPort8, "FaderPort8::set_state\n");
 	XMLNodeList nlist;
-	XMLNodeConstIterator niter;
 	XMLNode const* child;
 
 	if (ControlProtocol::set_state (node, version)) {

libs/surfaces/generic_midi/generic_midi_control_protocol.cc

@@ -803,7 +803,6 @@ GenericMidiControlProtocol::load_bindings (const string& xmlpath)
 
 	const XMLNodeList& children (root->children());
 	XMLNodeConstIterator citer;
-	XMLNodeConstIterator gciter;
 
 	MIDIControllable* mc;
 

libs/surfaces/launch_control_xl/midi_byte_array.cc

@@ -59,20 +59,20 @@ void MidiByteArray::copy (size_t count, MIDI::byte * arr)
 	}
 }
 
-MidiByteArray & operator <<  (MidiByteArray & mba, const MIDI::byte & b)
+MidiByteArray & operator<< (MidiByteArray & mba, const MIDI::byte & b)
 {
 	mba.push_back (b);
 	return mba;
 }
 
-MidiByteArray & operator <<  (MidiByteArray & mba, const MidiByteArray & barr)
+MidiByteArray & operator<< (MidiByteArray & mba, const MidiByteArray & barr)
 {
 	back_insert_iterator<MidiByteArray> bit (mba);
 	copy (barr.begin(), barr.end(), bit);
 	return mba;
 }
 
-ostream & operator <<  (ostream & os, const MidiByteArray & mba)
+ostream & operator<< (ostream & os, const MidiByteArray & mba)
 {
 	os << "[";
 	char fill = os.fill('0');
@@ -86,7 +86,7 @@ ostream & operator <<  (ostream & os, const MidiByteArray & mba)
 	return os;
 }
 
-MidiByteArray & operator <<  (MidiByteArray & mba, const std::string & st)
+MidiByteArray & operator<< (MidiByteArray & mba, const std::string & st)
 {
 	/* note that this assumes that "st" is ASCII encoded
 	 */
@@ -112,4 +112,3 @@ MidiByteArray::compare_n (const MidiByteArray& other, MidiByteArray::size_type n
 
 	return true;
 }
-	

libs/surfaces/launch_control_xl/midi_byte_array.h

@@ -64,15 +64,15 @@ public:
 };
 
 /// append the given byte to the end of the array
-MidiByteArray & operator << ( MidiByteArray & mba, const MIDI::byte & b );
+MidiByteArray & operator<< ( MidiByteArray & mba, const MIDI::byte & b );
 
 /// append the given string to the end of the array
-MidiByteArray & operator << ( MidiByteArray & mba, const std::string & );
+MidiByteArray & operator<< ( MidiByteArray & mba, const std::string & );
 
 /// append the given array to the end of this array
-MidiByteArray & operator << ( MidiByteArray & mba, const MidiByteArray & barr );
+MidiByteArray & operator<< ( MidiByteArray & mba, const MidiByteArray & barr );
 
 /// output the bytes as hex to the given stream
-std::ostream & operator << ( std::ostream & os, const MidiByteArray & mba );
+std::ostream & operator<< ( std::ostream & os, const MidiByteArray & mba );
 
 #endif

libs/surfaces/mackie/controls.cc

@@ -112,7 +112,7 @@ Control::stop_touch (double when)
 	}
 }
 
-ostream & operator <<  (ostream & os, const ArdourSurface::Mackie::Control & control)
+ostream & operator<< (ostream & os, const ArdourSurface::Mackie::Control & control)
 {
 	os << typeid (control).name();
 	os << " { ";

libs/surfaces/mackie/controls.h

@@ -88,9 +88,9 @@ public:
 	bool _in_use;
 };
 
-}
-}
+std::ostream & operator<< (std::ostream & os, const ArdourSurface::Mackie::Control & control);
 
-std::ostream & operator <<  (std::ostream & os, const ArdourSurface::Mackie::Control & control);
+}
+}
 
 #endif /* __mackie_controls_h__ */

libs/surfaces/mackie/device_info.h

@@ -127,10 +127,9 @@ class DeviceInfo
 	void shared_buttons ();
 };
 
+std::ostream& operator<< (std::ostream& os, const ArdourSurface::Mackie::DeviceInfo& di);
 
 } // Mackie namespace
 } // ArdourSurface namespace
 
-std::ostream& operator<< (std::ostream& os, const ArdourSurface::Mackie::DeviceInfo& di);
-
 #endif /* __ardour_mackie_control_protocol_device_info_h__ */

libs/surfaces/mackie/midi_byte_array.cc

@@ -60,20 +60,20 @@ void MidiByteArray::copy (size_t count, MIDI::byte * arr)
 	}
 }
 
-MidiByteArray & operator <<  (MidiByteArray & mba, const MIDI::byte & b)
+MidiByteArray & operator<< (MidiByteArray & mba, const MIDI::byte & b)
 {
 	mba.push_back (b);
 	return mba;
 }
 
-MidiByteArray & operator <<  (MidiByteArray & mba, const MidiByteArray & barr)
+MidiByteArray & operator<< (MidiByteArray & mba, const MidiByteArray & barr)
 {
 	back_insert_iterator<MidiByteArray> bit (mba);
 	copy (barr.begin(), barr.end(), bit);
 	return mba;
 }
 
-ostream & operator <<  (ostream & os, const MidiByteArray & mba)
+ostream & operator<< (ostream & os, const MidiByteArray & mba)
 {
 	os << "[";
 	char fill = os.fill('0');
@@ -87,7 +87,7 @@ ostream & operator <<  (ostream & os, const MidiByteArray & mba)
 	return os;
 }
 
-MidiByteArray & operator <<  (MidiByteArray & mba, const std::string & st)
+MidiByteArray & operator<< (MidiByteArray & mba, const std::string & st)
 {
 	/* note that this assumes that "st" is ASCII encoded
 	 */

libs/surfaces/mackie/midi_byte_array.h

@@ -63,15 +63,15 @@ public:
 };
 
 /// append the given byte to the end of the array
-MidiByteArray & operator << ( MidiByteArray & mba, const MIDI::byte & b );
+MidiByteArray & operator<< ( MidiByteArray & mba, const MIDI::byte & b );
 
 /// append the given string to the end of the array
-MidiByteArray & operator << ( MidiByteArray & mba, const std::string & );
+MidiByteArray & operator<< ( MidiByteArray & mba, const std::string & );
 
 /// append the given array to the end of this array
-MidiByteArray & operator << ( MidiByteArray & mba, const MidiByteArray & barr );
+MidiByteArray & operator<< ( MidiByteArray & mba, const MidiByteArray & barr );
 
 /// output the bytes as hex to the given stream
-std::ostream & operator << ( std::ostream & os, const MidiByteArray & mba );
+std::ostream & operator<< ( std::ostream & os, const MidiByteArray & mba );
 
 #endif

libs/surfaces/mackie/surface_port.cc

@@ -229,7 +229,7 @@ SurfacePort::write (const MidiByteArray & mba)
 }
 
 ostream &
-Mackie::operator <<  (ostream & os, const SurfacePort & port)
+Mackie::operator<< (ostream & os, const SurfacePort & port)
 {
 	os << "{ ";
 	os << "name: " << port.input_port().name() << " " << port.output_port().name();

libs/surfaces/mackie/surface_port.h

@@ -85,7 +85,7 @@ class SurfacePort
 	boost::shared_ptr<ARDOUR::Port> _async_out;
 };
 
-std::ostream& operator <<  (std::ostream& , const SurfacePort& port);
+std::ostream& operator<< (std::ostream& , const SurfacePort& port);
 
 }
 }

libs/surfaces/mackie/types.cc

@@ -31,7 +31,7 @@ LedState none( LedState::none );
 }
 }
 
-std::ostream & operator << ( std::ostream & os, const ArdourSurface::Mackie::ControlState & cs )
+std::ostream & operator<< ( std::ostream & os, const ArdourSurface::Mackie::ControlState & cs )
 {
 	os << "ControlState { ";
 	os << "pos: " << cs.pos;

libs/surfaces/mackie/types.h

@@ -98,7 +98,7 @@ struct ControlState
 	ButtonState button_state;
 };
 
-std::ostream & operator <<  (std::ostream &, const ControlState &);
+std::ostream & operator<< (std::ostream &, const ControlState &);
 
 class Control;
 class Fader;

libs/surfaces/osc/osc_cue_observer.h

@@ -56,7 +56,6 @@ class OSCCueObserver
 	ArdourSurface::OSC::OSCSurface* sur;
 	float _last_meter;
 	float _last_signal;
-	bool _hidden;
 	std::vector<uint32_t> gain_timeout;
 	bool tick_enable;
 	std::vector<float> _last_gain;

libs/surfaces/push2/midi_byte_array.cc

@@ -59,20 +59,20 @@ void MidiByteArray::copy (size_t count, MIDI::byte * arr)
 	}
 }
 
-MidiByteArray & operator <<  (MidiByteArray & mba, const MIDI::byte & b)
+MidiByteArray & operator<< (MidiByteArray & mba, const MIDI::byte & b)
 {
 	mba.push_back (b);
 	return mba;
 }
 
-MidiByteArray & operator <<  (MidiByteArray & mba, const MidiByteArray & barr)
+MidiByteArray & operator<< (MidiByteArray & mba, const MidiByteArray & barr)
 {
 	back_insert_iterator<MidiByteArray> bit (mba);
 	copy (barr.begin(), barr.end(), bit);
 	return mba;
 }
 
-ostream & operator <<  (ostream & os, const MidiByteArray & mba)
+ostream & operator<< (ostream & os, const MidiByteArray & mba)
 {
 	os << "[";
 	char fill = os.fill('0');
@@ -86,7 +86,7 @@ ostream & operator <<  (ostream & os, const MidiByteArray & mba)
 	return os;
 }
 
-MidiByteArray & operator <<  (MidiByteArray & mba, const std::string & st)
+MidiByteArray & operator<< (MidiByteArray & mba, const std::string & st)
 {
 	/* note that this assumes that "st" is ASCII encoded
 	 */

libs/surfaces/push2/midi_byte_array.h

@@ -64,15 +64,15 @@ public:
 };
 
 /// append the given byte to the end of the array
-MidiByteArray & operator << ( MidiByteArray & mba, const MIDI::byte & b );
+MidiByteArray & operator<< ( MidiByteArray & mba, const MIDI::byte & b );
 
 /// append the given string to the end of the array
-MidiByteArray & operator << ( MidiByteArray & mba, const std::string & );
+MidiByteArray & operator<< ( MidiByteArray & mba, const std::string & );
 
 /// append the given array to the end of this array
-MidiByteArray & operator << ( MidiByteArray & mba, const MidiByteArray & barr );
+MidiByteArray & operator<< ( MidiByteArray & mba, const MidiByteArray & barr );
 
 /// output the bytes as hex to the given stream
-std::ostream & operator << ( std::ostream & os, const MidiByteArray & mba );
+std::ostream & operator<< ( std::ostream & os, const MidiByteArray & mba );
 
 #endif

libs/surfaces/us2400/controls.cc

@@ -112,7 +112,7 @@ Control::stop_touch (double when)
 	}
 }
 
-ostream & operator <<  (ostream & os, const ArdourSurface::US2400::Control & control)
+ostream & operator<< (ostream & os, const ArdourSurface::US2400::Control & control)
 {
 	os << typeid (control).name();
 	os << " { ";

libs/surfaces/us2400/controls.h

@@ -88,9 +88,9 @@ public:
 	bool _in_use;
 };
 
-}
-}
+std::ostream & operator<< (std::ostream & os, const ArdourSurface::US2400::Control & control);
 
-std::ostream & operator <<  (std::ostream & os, const ArdourSurface::US2400::Control & control);
+}
+}
 
 #endif /* __us2400_controls_h__ */

libs/surfaces/us2400/device_info.h

@@ -122,10 +122,9 @@ class DeviceInfo
 	void shared_buttons ();
 };
 
+std::ostream& operator<< (std::ostream& os, const ArdourSurface::US2400::DeviceInfo& di);
 
 } // US2400 namespace
 } // ArdourSurface namespace
 
-std::ostream& operator<< (std::ostream& os, const ArdourSurface::US2400::DeviceInfo& di);
-
 #endif /* __ardour_us2400_control_protocol_device_info_h__ */

libs/surfaces/us2400/midi_byte_array.cc

@@ -59,20 +59,20 @@ void MidiByteArray::copy (size_t count, MIDI::byte * arr)
 	}
 }
 
-MidiByteArray & operator <<  (MidiByteArray & mba, const MIDI::byte & b)
+MidiByteArray & operator<< (MidiByteArray & mba, const MIDI::byte & b)
 {
 	mba.push_back (b);
 	return mba;
 }
 
-MidiByteArray & operator <<  (MidiByteArray & mba, const MidiByteArray & barr)
+MidiByteArray & operator<< (MidiByteArray & mba, const MidiByteArray & barr)
 {
 	back_insert_iterator<MidiByteArray> bit (mba);
 	copy (barr.begin(), barr.end(), bit);
 	return mba;
 }
 
-ostream & operator <<  (ostream & os, const MidiByteArray & mba)
+ostream & operator<< (ostream & os, const MidiByteArray & mba)
 {
 	os << "[";
 	char fill = os.fill('0');
@@ -86,7 +86,7 @@ ostream & operator <<  (ostream & os, const MidiByteArray & mba)
 	return os;
 }
 
-MidiByteArray & operator <<  (MidiByteArray & mba, const std::string & st)
+MidiByteArray & operator<< (MidiByteArray & mba, const std::string & st)
 {
 	/* note that this assumes that "st" is ASCII encoded
 	 */

libs/surfaces/us2400/midi_byte_array.h

@@ -62,15 +62,15 @@ public:
 };
 
 /// append the given byte to the end of the array
-MidiByteArray & operator << ( MidiByteArray & mba, const MIDI::byte & b );
+MidiByteArray & operator<< ( MidiByteArray & mba, const MIDI::byte & b );
 
 /// append the given string to the end of the array
-MidiByteArray & operator << ( MidiByteArray & mba, const std::string & );
+MidiByteArray & operator<< ( MidiByteArray & mba, const std::string & );
 
 /// append the given array to the end of this array
-MidiByteArray & operator << ( MidiByteArray & mba, const MidiByteArray & barr );
+MidiByteArray & operator<< ( MidiByteArray & mba, const MidiByteArray & barr );
 
 /// output the bytes as hex to the given stream
-std::ostream & operator << ( std::ostream & os, const MidiByteArray & mba );
+std::ostream & operator<< ( std::ostream & os, const MidiByteArray & mba );
 
 #endif

libs/surfaces/us2400/strip.h

@@ -129,10 +129,9 @@ private:
 	PBD::ScopedConnectionList stripable_connections;
 	PBD::ScopedConnectionList subview_connections;
 	PBD::ScopedConnectionList send_connections;
-	int       eq_band;
-	
+
 	int      _trickle_counter;
-	
+
 	ARDOUR::AutomationType  _pan_mode;
 
 	void notify_solo_changed ();

libs/surfaces/us2400/surface_port.cc

@@ -194,7 +194,7 @@ SurfacePort::write (const MidiByteArray & mba)
 }
 
 ostream &
-US2400::operator <<  (ostream & os, const SurfacePort & port)
+US2400::operator<< (ostream & os, const SurfacePort & port)
 {
 	os << "{ ";
 	os << "name: " << port.input_port().name() << " " << port.output_port().name();

libs/surfaces/us2400/surface_port.h

@@ -83,7 +83,7 @@ class SurfacePort
 	boost::shared_ptr<ARDOUR::Port> _async_out;
 };
 
-std::ostream& operator <<  (std::ostream& , const SurfacePort& port);
+std::ostream& operator<< (std::ostream& , const SurfacePort& port);
 
 }
 }

libs/surfaces/us2400/types.cc

@@ -30,7 +30,7 @@ LedState none( LedState::none );
 }
 }
 
-std::ostream & operator << ( std::ostream & os, const ArdourSurface::US2400::ControlState & cs )
+std::ostream & operator<< ( std::ostream & os, const ArdourSurface::US2400::ControlState & cs )
 {
 	os << "ControlState { ";
 	os << "pos: " << cs.pos;

libs/surfaces/us2400/types.h

@@ -99,7 +99,7 @@ struct ControlState
 	ButtonState button_state;
 };
 
-std::ostream & operator <<  (std::ostream &, const ControlState &);
+std::ostream & operator<< (std::ostream &, const ControlState &);
 
 class Control;
 class Fader;

libs/temporal/temporal/bbt_time.h

@@ -112,24 +112,22 @@ struct LIBTEMPORAL_API BBT_Offset
 	BBT_Offset (double beats);
 };
 
-}
-
 inline std::ostream&
-operator<< (std::ostream& o, const Timecode::BBT_Time& bbt)
+operator<< (std::ostream& o, const BBT_Time& bbt)
 {
 	o << bbt.bars << '|' << bbt.beats << '|' << bbt.ticks;
 	return o;
 }
 
 inline std::ostream&
-operator<< (std::ostream& o, const Timecode::BBT_Offset& bbt)
+operator<< (std::ostream& o, const BBT_Offset& bbt)
 {
 	o << bbt.bars << '|' << bbt.beats << '|' << bbt.ticks;
 	return o;
 }
 
 inline std::ostream&
-print_padded (std::ostream& o, const Timecode::BBT_Time& bbt)
+print_padded (std::ostream& o, const BBT_Time& bbt)
 {
 	o << std::setfill ('0') << std::right
 	  << std::setw (3) << bbt.bars << "|"
@@ -139,4 +137,6 @@ print_padded (std::ostream& o, const Timecode::BBT_Time& bbt)
 	return o;
 }
 
+}
+
 #endif /* __timecode_bbt_time_h__ */

libs/temporal/temporal/time.h

@@ -162,8 +162,8 @@ sample_to_timecode (
     uint32_t subframes_per_frame,
     bool offset_is_negative, int64_t offset_samples);
 
+extern LIBTEMPORAL_API std::ostream& operator<< (std::ostream& ostr, const Time& t);
+
 } // namespace Timecode
 
-extern LIBTEMPORAL_API std::ostream& operator<< (std::ostream& ostr, const Timecode::Time& t);
-
 #endif // __timecode_time_h__

libs/temporal/time.cc

@@ -844,10 +844,11 @@ sample_to_timecode (
 	timecode.drop = timecode_drop_frames;
 }
 
-} // namespace Timecode
-
 std::ostream&
-operator<<(std::ostream& ostr, const Timecode::Time& t)
+operator<<(std::ostream& ostr, const Time& t)
 {
 	return t.print (ostr);
 }
+
+} // namespace Timecode
+

nutemp/t.h

@@ -420,10 +420,10 @@ class LIBARDOUR_API TempoMap
 	void dump_locked (std::ostream&);
 };
 
+std::ostream& operator<<(std::ostream&, TempoMapPoint const &);
+std::ostream& operator<<(std::ostream&, Tempo const &);
+std::ostream& operator<<(std::ostream&, Meter const &);
+
 }
 
-std::ostream& operator<<(std::ostream&, ARDOUR::TempoMapPoint const &);
-std::ostream& operator<<(std::ostream&, ARDOUR::Tempo const &);
-std::ostream& operator<<(std::ostream&, ARDOUR::Meter const &);
-
 #endif /* __ardour_tempo_h__ */