* the very humble beginnings of sending MIDI clock

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

6 files changed, 133 insertions, 3 deletions

diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript
index 68d10a0868..172cb5163d 100644
--- a/libs/ardour/SConscript
+++ b/libs/ardour/SConscript
@@ -165,6 +165,7 @@ svn_revision.cc
 tape_file_matcher.cc
 template_utils.cc
 tempo.cc
+ticker.cc
 tempo_map_importer.cc
 track.cc
 transient_detector.cc
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 24478f9eb8..14e8c6d841 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -576,6 +576,9 @@ class Session : public PBD::StatefulDestructible
 
 	TempoMap& tempo_map() { return *_tempo_map; }
 
+	/// signals the current transport position in frames, bbt and smpte time (in that order)
+	sigc::signal<void, const nframes_t&, const BBT_Time&, const SMPTE::Time&> tick;
+	
 	/* region info  */
 
 	void add_regions (std::vector<boost::shared_ptr<Region> >&);
diff --git a/libs/ardour/ardour/ticker.h b/libs/ardour/ardour/ticker.h
new file mode 100644
index 0000000000..73e5046ac3
--- /dev/null
+++ b/libs/ardour/ardour/ticker.h
@@ -0,0 +1,74 @@
+/*
+    Copyright (C) 2008 Hans Baier 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+    $Id$
+*/
+#include <sigc++/sigc++.h>
+
+#include "ardour/types.h"
+#include "midi++/jack.h"
+
+#ifndef TICKER_H_
+#define TICKER_H_
+
+namespace ARDOUR
+{
+
+class Session;
+
+class Ticker : public sigc::trackable
+{
+public:
+	Ticker() : _session(0) {};
+	virtual ~Ticker() {};
+	
+	virtual void tick(
+		const nframes_t& transport_frames, 
+		const BBT_Time& transport_bbt, 
+		const SMPTE::Time& transport_smpte) = 0;
+	
+	virtual void set_session(Session& s);
+	virtual void going_away() { _session = 0; }
+
+private:
+	Session* _session;
+};
+
+class MidiClockTicker : public Ticker
+{
+	MidiClockTicker() : _jack_port(0) {};
+	virtual ~MidiClockTicker() {};
+	
+	
+	void tick(
+		const nframes_t& transport_frames, 
+		const BBT_Time& transport_bbt, 
+		const SMPTE::Time& transport_smpte);
+	
+	
+	void going_away() { Ticker::going_away(); _jack_port = 0;}
+	
+	void set_midi_port(MIDI::JACK_MidiPort &port);
+
+private:	
+	MIDI::JACK_MidiPort* _jack_port;
+	
+};
+
+}
+
+#endif /* TICKER_H_ */
diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h
index ce76a247cb..48671c6841 100644
--- a/libs/ardour/ardour/types.h
+++ b/libs/ardour/ardour/types.h
@@ -199,7 +199,7 @@ namespace ARDOUR {
 	    BBT_Time       bbt;
 
 	    union {
-		nframes_t frames;
+		nframes_t      frames;
 		double         seconds;
 	    };
 
diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc
index d61500018b..3b81092a96 100644
--- a/libs/ardour/session_process.cc
+++ b/libs/ardour/session_process.cc
@@ -66,9 +66,17 @@ Session::process (nframes_t nframes)
 	
 	(this->*process_function) (nframes);
 	
-	MIDI::Manager::instance()->cycle_end();
-
+	// the ticker is for sending time information like MidiClock
+	nframes_t transport_frames = transport_frame();
+	BBT_Time  transport_bbt;
+	bbt_time(transport_frames, transport_bbt);
+	SMPTE::Time transport_smpte;
+	smpte_time(transport_frames, transport_smpte);
+	tick (transport_frames, transport_bbt, transport_smpte); /* EMIT SIGNAL */
+	
 	SendFeedback (); /* EMIT SIGNAL */
+	
+	MIDI::Manager::instance()->cycle_end();
 }
 
 void
diff --git a/libs/ardour/ticker.cc b/libs/ardour/ticker.cc
new file mode 100644
index 0000000000..bf84bba92b
--- /dev/null
+++ b/libs/ardour/ticker.cc
@@ -0,0 +1,44 @@
+/*
+    Copyright (C) 2008 Hans Baier 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+    $Id$
+*/
+#include "ardour/ticker.h"
+#include "ardour/session.h"
+
+namespace ARDOUR
+{
+
+
+void Ticker::set_session(Session& s) 
+{
+	 _session = &s;
+	 
+	 if(_session) {
+		 _session->tick.connect(mem_fun (*this, &Ticker::tick));
+		 _session->GoingAway.connect(mem_fun (*this, &Ticker::going_away));
+	 }
+}
+
+
+void MidiClockTicker::tick(const nframes_t& transport_frames, const BBT_Time& transport_bbt, const SMPTE::Time& transport_smpt)
+{
+	
+}
+
+}
+