remove a couple of boost::signals2 trouble spots; fix some --strict compile time warnings

git-svn-id: svn://localhost/ardour2/branches/3.0@6378 d708f5d6-7413-0410-9779-e7cbd77b26cf

14 files changed, 36 insertions, 28 deletions

diff --git a/libs/ardour/ardour/debug.h b/libs/ardour/ardour/debug.h
index 2998771dba..3951fe11ef 100644
--- a/libs/ardour/ardour/debug.h
+++ b/libs/ardour/ardour/debug.h
@@ -50,7 +50,8 @@ namespace ARDOUR {
 			Transport = 0x400,
 			Slave = 0x800,
 			SessionEvents = 0x800,
-			MidiIO = 0x1000
+			MidiIO = 0x1000,
+			MackieControl = 0x2000
 		};
 	}
 
@@ -58,12 +59,13 @@ namespace ARDOUR {
 
 #ifndef NDEBUG
 #define DEBUG_TRACE(bits,str) if ((bits) & ARDOUR::debug_bits) { ARDOUR::debug_print (# bits, str); }
-#define DEBUG_STR_SET(id,s) std::stringstream __debug_str ## id; __debug_str ## id << s;
+#define DEBUG_STR_DECL(id) std::stringstream __debug_str ## id;
 #define DEBUG_STR(id) __debug_str ## id
+#define DEBUG_STR_APPEND(id,s) __debug_str ## id << s;
 #else
 #define DEBUG_TRACE(bits,fmt,...) /*empty*/
-#define DEBUG_STR_SET(a,b) /* empty */
 #define DEBUG_STR(a) /* empty */
+#define DEBUG_STR_APPEND(a,b) /* empty */
 #endif
 
 #endif /* __ardour_debug_h__ */
diff --git a/libs/ardour/ardour/midi_ui.h b/libs/ardour/ardour/midi_ui.h
index 869d7ab708..c21182f4e2 100644
--- a/libs/ardour/ardour/midi_ui.h
+++ b/libs/ardour/ardour/midi_ui.h
@@ -4,9 +4,10 @@
 #include <list>
 #include <boost/signals2.hpp>
 #include "pbd/abstract_ui.h"
+#include "pbd/signals.h"
 
 namespace MIDI { 
-	class port;
+	class Port;
 }
 
 namespace ARDOUR {
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 7c6c83a121..59a282fe1d 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -548,7 +548,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 	    0 for "yes, delete this playlist",
 	    1 for "no, don't delete this playlist".
 	*/
-	PBD::Signal1<void,boost::shared_ptr<Playlist> >  AskAboutPlaylistDeletion;
+	static PBD::Signal1<int,boost::shared_ptr<Playlist> >  AskAboutPlaylistDeletion;
 
 	/** handlers should return 0 for "ignore the rate mismatch",
 	    !0 for "do not use this session"
@@ -1464,6 +1464,8 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 	void update_have_rec_enabled_diskstream ();
 	gint _have_rec_enabled_diskstream;
 
+	static int ask_about_playlist_deletion (boost::shared_ptr<Playlist>);
+
 	/* realtime "apply to set of routes" operations */
 	SessionEvent* get_rt_event (boost::shared_ptr<RouteList> rl, bool yn, SessionEvent::RTeventCallback after, bool group_override, 
 		void (Session::*method) (boost::shared_ptr<RouteList>, bool, bool));
diff --git a/libs/ardour/internal_send.cc b/libs/ardour/internal_send.cc
index 7fc2efe9b9..8e9010b148 100644
--- a/libs/ardour/internal_send.cc
+++ b/libs/ardour/internal_send.cc
@@ -173,7 +173,7 @@ InternalSend::get_state()
 }
 
 int
-InternalSend::set_our_state (const XMLNode& node, int version)
+InternalSend::set_our_state (const XMLNode& node, int /*version*/)
 {
 	const XMLProperty* prop;
 
diff --git a/libs/ardour/ladspa_plugin.cc b/libs/ardour/ladspa_plugin.cc
index b0d64ad41b..bbd29e960e 100644
--- a/libs/ardour/ladspa_plugin.cc
+++ b/libs/ardour/ladspa_plugin.cc
@@ -427,7 +427,7 @@ LadspaPlugin::set_state (const XMLNode& node, int version)
 }
 
 int
-LadspaPlugin::set_state_2X (const XMLNode& node, int version)
+LadspaPlugin::set_state_2X (const XMLNode& node, int /* version */)
 {
 	XMLNodeList nodes;
 	XMLProperty *prop;
diff --git a/libs/ardour/midi_ring_buffer.cc b/libs/ardour/midi_ring_buffer.cc
index df49b570c7..a050422ae5 100644
--- a/libs/ardour/midi_ring_buffer.cc
+++ b/libs/ardour/midi_ring_buffer.cc
@@ -107,8 +107,10 @@ MidiRingBuffer<T>::read(MidiBuffer& dst, nframes_t start, nframes_t end, nframes
 #ifndef NDEBUG
 		DEBUG_TRACE (DEBUG::MidiDiskstreamIO, "wrote MidiEvent to Buffer: ");
 		for (size_t i=0; i < ev_size; ++i) {
-			DEBUG_STR_SET(a, hex);
-			DEBUG_STR(a) << "0x" << (int)write_loc[i] << ' ';
+			DEBUG_STR_DECL(a);
+			DEBUG_STR_APPEND(a,hex);
+			DEBUG_STR_APPEND(a,"0x");
+			DEBUG_STR_APPEND(a,(int)write_loc[i]);
 			DEBUG_TRACE (DEBUG::MidiDiskstreamIO, DEBUG_STR(a).str());
 		}
 		DEBUG_TRACE (DEBUG::MidiDiskstreamIO, "\n");
diff --git a/libs/ardour/midi_ui.cc b/libs/ardour/midi_ui.cc
index be7a2bafc0..38f856b5a2 100644
--- a/libs/ardour/midi_ui.cc
+++ b/libs/ardour/midi_ui.cc
@@ -124,6 +124,7 @@ MidiControlUI::reset_ports ()
 
 	for (MIDI::Manager::PortList::iterator i = plist.begin(); i != plist.end(); ++i) {
 		int fd;
+
 		if ((fd = (*i)->selectable ()) >= 0) {
 			Glib::RefPtr<IOSource> psrc = IOSource::create (fd, IO_IN|IO_HUP|IO_ERR);
 
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index b2a1aa8da8..8d707545fe 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -114,6 +114,7 @@ PBD::Signal0<void> Session::EndTimeChanged;
 PBD::Signal0<void> Session::AutoBindingOn;
 PBD::Signal0<void> Session::AutoBindingOff;
 PBD::Signal2<void,std::string, std::string> Session::Exported;
+PBD::Signal1<int,boost::shared_ptr<Playlist> > Session::AskAboutPlaylistDeletion;
 
 static void clean_up_session_event (SessionEvent* ev) { delete ev; }
 const SessionEvent::RTeventCallback Session::rt_cleanup (clean_up_session_event);
@@ -387,8 +388,6 @@ Session::destroy ()
 	
 	AudioDiskstream::free_working_buffers();
 
-	// BOOST::SIGNALS: Route::SyncOrderKeys.clear();
-
 	DEBUG_TRACE (DEBUG::Destruction, "delete named selections\n");
 	for (NamedSelectionList::iterator i = named_selections.begin(); i != named_selections.end(); ) {
 		NamedSelectionList::iterator tmp;
diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc
index 4f0c70aa20..bd06fe78ee 100644
--- a/libs/ardour/session_midi.cc
+++ b/libs/ardour/session_midi.cc
@@ -872,8 +872,9 @@ Session::send_midi_time_code_for_cycle(nframes_t nframes)
 		}
 
 #ifndef NDEBUG
-		DEBUG_STR_SET(foo,"sending ");
-		DEBUG_STR(foo) << transmitting_timecode_time;
+		DEBUG_STR_DECL(foo)
+		DEBUG_STR_APPEND(foo,"sending ");
+		DEBUG_STR_APPEND(foo, transmitting_timecode_time);
 		DEBUG_TRACE (DEBUG::MTC, string_compose ("%1 qfm = %2, stamp = %3\n", DEBUG_STR(foo).str(), next_quarter_frame_to_send,
 							 out_stamp));
 #endif
diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc
index 9766a1b159..9baa0aea9e 100644
--- a/libs/ardour/session_process.cc
+++ b/libs/ardour/session_process.cc
@@ -578,7 +578,7 @@ Session::follow_slave (nframes_t nframes)
 			}
 			
 #if 1
-			if (abs(average_slave_delta) > _slave->resolution()) {
+			if ((nframes_t) abs(average_slave_delta) > _slave->resolution()) {
 				cerr << "average slave delta greater than slave resolution (" << _slave->resolution() << "), going to silent motion\n";
 				goto silent_motion;
 			}
diff --git a/libs/ardour/session_rtevents.cc b/libs/ardour/session_rtevents.cc
index 945e422076..7bb27db808 100644
--- a/libs/ardour/session_rtevents.cc
+++ b/libs/ardour/session_rtevents.cc
@@ -33,7 +33,7 @@ using namespace ARDOUR;
 using namespace Glib;
 
 SessionEvent*
-Session::get_rt_event (boost::shared_ptr<RouteList> rl, bool yn, SessionEvent::RTeventCallback after, bool group_override, 
+Session::get_rt_event (boost::shared_ptr<RouteList> rl, bool yn, SessionEvent::RTeventCallback after, bool group_override,  
 		       void (Session::*method) (boost::shared_ptr<RouteList>, bool, bool))
 {
 	SessionEvent* ev = new SessionEvent (SessionEvent::RealTimeOperation, SessionEvent::Add, SessionEvent::Immediate, 0, 0.0);
@@ -51,7 +51,7 @@ Session::set_solo (boost::shared_ptr<RouteList> rl, bool yn, SessionEvent::RTeve
 }
 
 void
-Session::rt_set_solo (boost::shared_ptr<RouteList> rl, bool yn, bool group_override)
+Session::rt_set_solo (boost::shared_ptr<RouteList> rl, bool yn, bool /* group_override */)
 {
 	for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
 		if (!(*i)->is_hidden()) {
@@ -100,7 +100,7 @@ Session::set_listen (boost::shared_ptr<RouteList> rl, bool yn, SessionEvent::RTe
 }
 
 void
-Session::rt_set_listen (boost::shared_ptr<RouteList> rl, bool yn, bool group_override)
+Session::rt_set_listen (boost::shared_ptr<RouteList> rl, bool yn, bool /*group_override*/ )
 {
 	for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
 		if (!(*i)->is_hidden()) {
@@ -118,7 +118,7 @@ Session::set_mute (boost::shared_ptr<RouteList> rl, bool yn, SessionEvent::RTeve
 }
 
 void
-Session::rt_set_mute (boost::shared_ptr<RouteList> rl, bool yn, bool group_override)
+Session::rt_set_mute (boost::shared_ptr<RouteList> rl, bool yn, bool /*group_override*/)
 {
 	for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
 		if (!(*i)->is_hidden()) {
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index 16cbfd1d36..bcd074a516 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -276,10 +276,7 @@ Session::first_stage_init (string fullpath, string snapshot_name)
 	Processor::ProcessorCreated.connect (*this, boost::bind (&Session::add_processor, this, _1));
 	NamedSelection::NamedSelectionCreated.connect (*this, boost::bind (&Session::add_named_selection, this, _1));
 	AutomationList::AutomationListCreated.connect (*this, boost::bind (&Session::add_automation_list, this, _1));
-
-	// BOOST SIGNALS
-	// Controllable::Destroyed.connect (*this, boost::bind (&Session::remove_controllable, this, _1));
-
+	Controllable::Destroyed.connect (*this, boost::bind (&Session::remove_controllable, this, _1));
 	IO::PortCountChanged.connect (*this, boost::bind (&Session::ensure_buffers, this, _1));
 
 	/* stop IO objects from doing stuff until we're ready for them */
@@ -2291,6 +2288,12 @@ struct RegionCounter {
 };
 
 int
+Session::ask_about_playlist_deletion (boost::shared_ptr<Playlist> p)
+{
+	return *AskAboutPlaylistDeletion (p);
+}
+
+int
 Session::cleanup_sources (CleanupReport& rep)
 {
 	// FIXME: needs adaptation to midi
@@ -2311,12 +2314,11 @@ Session::cleanup_sources (CleanupReport& rep)
 
 	/* step 1: consider deleting all unused playlists */
 	
-/* BOOST SIGNALS
-	if (playlists->maybe_delete_unused (boost::bind (AskAboutPlaylistDeletion, _1));
+	if (playlists->maybe_delete_unused (boost::bind (Session::ask_about_playlist_deletion, _1))) {
 		ret = 0;
 		goto out;
 	}
-*/
+
 	/* step 2: find all un-used sources */
 
 	rep.paths.clear ();
diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc
index 9536576713..9dcce637e6 100644
--- a/libs/ardour/tempo.cc
+++ b/libs/ardour/tempo.cc
@@ -1687,7 +1687,7 @@ TempoMap::bbt_add (const BBT_Time& start, const BBT_Time& other) const
  * add the BBT interval @param increment to  @param start and return the result
  */
 BBT_Time
-TempoMap::bbt_add (const BBT_Time& start, const BBT_Time& increment, const TempoMetric& metric) const
+TempoMap::bbt_add (const BBT_Time& start, const BBT_Time& increment, const TempoMetric& /*metric*/) const
 {
 	BBT_Time result = start;
 	BBT_Time op = increment; /* argument is const, but we need to modify it */
diff --git a/libs/ardour/ticker.cc b/libs/ardour/ticker.cc
index 30d6c5f2d0..f35f84e889 100644
--- a/libs/ardour/ticker.cc
+++ b/libs/ardour/ticker.cc
@@ -135,7 +135,6 @@ void MidiClockTicker::transport_looped()
 
 void MidiClockTicker::tick(const nframes_t& transport_frames, const BBT_Time& /*transport_bbt*/, const Timecode::Time& /*transport_smpt*/)
 {
-#ifdef WITH_JACK_MIDI
 	if (!Config->get_send_midi_clock() || _session == 0 || _session->transport_speed() != 1.0f)
 		return;
 
@@ -162,7 +161,6 @@ void MidiClockTicker::tick(const nframes_t& transport_frames, const BBT_Time& /*
 
 		_last_tick = next_tick;
 	}
-#endif // WITH_JACK_MIDI
 }
 
 double MidiClockTicker::one_ppqn_in_frames(nframes_t transport_position)