split up session code that uses parts of the JACK API (timebase + session event handling) and connect it directly to the jack audiobackend

i've made the audiobackend call the session directly so that only one object (ARDOUR::Session) has a need for the JACK types
and only one .cc file (session_jack.cc) needs jack.h. having ARDOUR::AudioEngine act as an intermediary would be cleaner
conceptually but would end up causing two different ARDOUR objects to have jack types in their own API.

1 files changed, 185 insertions, 0 deletions

diff --git a/libs/ardour/session_jack.cc b/libs/ardour/session_jack.cc
new file mode 100644
index 0000000000..af8a93fec3
--- /dev/null
+++ b/libs/ardour/session_jack.cc
@@ -0,0 +1,185 @@
+/*
+  Copyright (C) 1999-2013 Paul Davis
+
+  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.
+
+*/
+
+
+#ifdef WAF_BUILD
+#include "libardour-config.h"
+#endif
+
+#include <time.h>
+
+#include <glibmm/miscutils.h>
+
+#include "jack/jack.h"
+#include "jack/session.h"
+
+#include "ardour/audioengine.h"
+#include "ardour/filename_extensions.h"
+#include "ardour/session.h"
+#include "ardour/session_directory.h"
+#include "ardour/tempo.h"
+
+using namespace ARDOUR;
+using std::string;
+
+#ifdef HAVE_JACK_SESSION
+void
+Session::jack_session_event (jack_session_event_t* event)
+{
+        char timebuf[128], *tmp;
+        time_t n;
+        struct tm local_time;
+
+        time (&n);
+        localtime_r (&n, &local_time);
+        strftime (timebuf, sizeof(timebuf), "JS_%FT%T", &local_time);
+
+        while ((tmp = strchr(timebuf, ':'))) { *tmp = '.'; }
+
+        if (event->type == JackSessionSaveTemplate)
+        {
+                if (save_template( timebuf )) {
+                        event->flags = JackSessionSaveError;
+                } else {
+                        string cmd ("ardour3 -P -U ");
+                        cmd += event->client_uuid;
+                        cmd += " -T ";
+                        cmd += timebuf;
+
+                        event->command_line = strdup (cmd.c_str());
+                }
+        }
+        else
+        {
+                if (save_state (timebuf)) {
+                        event->flags = JackSessionSaveError;
+                } else {
+			std::string xml_path (_session_dir->root_path());
+			std::string legalized_filename = legalize_for_path (timebuf) + statefile_suffix;
+			xml_path = Glib::build_filename (xml_path, legalized_filename);
+
+                        string cmd ("ardour3 -P -U ");
+                        cmd += event->client_uuid;
+                        cmd += " \"";
+                        cmd += xml_path;
+                        cmd += '\"';
+
+                        event->command_line = strdup (cmd.c_str());
+                }
+        }
+
+	/* this won't be called if the port engine in use is not JACK, so we do 
+	   not have to worry about the type of PortEngine::private_handle()
+	*/
+
+	jack_client_t* jack_client = (jack_client_t*) AudioEngine::instance()->port_engine().private_handle();
+	
+	if (jack_client) {
+		jack_session_reply (jack_client, event);
+	}
+
+	if (event->type == JackSessionSaveAndQuit) {
+		Quit (); /* EMIT SIGNAL */
+	}
+
+	jack_session_event_free( event );
+}
+#endif
+
+void
+Session::jack_timebase_callback (jack_transport_state_t /*state*/,
+				 pframes_t /*nframes*/,
+				 jack_position_t* pos,
+				 int /*new_position*/)
+{
+	Timecode::BBT_Time bbt;
+
+	/* BBT info */
+
+	if (_tempo_map) {
+
+		TempoMetric metric (_tempo_map->metric_at (_transport_frame));
+
+		try {
+			_tempo_map->bbt_time_rt (_transport_frame, bbt);
+
+			pos->bar = bbt.bars;
+			pos->beat = bbt.beats;
+			pos->tick = bbt.ticks;
+			
+			// XXX still need to set bar_start_tick
+			
+			pos->beats_per_bar = metric.meter().divisions_per_bar();
+			pos->beat_type = metric.meter().note_divisor();
+			pos->ticks_per_beat = Timecode::BBT_Time::ticks_per_beat;
+			pos->beats_per_minute = metric.tempo().beats_per_minute();
+			
+			pos->valid = jack_position_bits_t (pos->valid | JackPositionBBT);
+
+		} catch (...) {
+			/* no message */
+		}
+	}
+
+#ifdef HAVE_JACK_VIDEO_SUPPORT
+	//poke audio video ratio so Ardour can track Video Sync
+	pos->audio_frames_per_video_frame = frame_rate() / timecode_frames_per_second();
+	pos->valid = jack_position_bits_t (pos->valid | JackAudioVideoRatio);
+#endif
+
+#if 0
+	/* Timecode info */
+
+	pos->timecode_offset = config.get_timecode_offset();
+	t.timecode_frame_rate = timecode_frames_per_second();
+	pos->valid = jack_position_bits_t (pos->valid | JackPositionTimecode;
+
+	if (_transport_speed) {
+
+		if (play_loop) {
+
+			Location* location = _locations.auto_loop_location();
+
+			if (location) {
+
+				t.transport_state = JackTransportLooping;
+				t.loop_start = location->start();
+				t.loop_end = location->end();
+				t.valid = jack_transport_bits_t (t.valid | JackTransportLoop);
+
+			} else {
+
+				t.loop_start = 0;
+				t.loop_end = 0;
+				t.transport_state = JackTransportRolling;
+
+			}
+
+		} else {
+
+			t.loop_start = 0;
+			t.loop_end = 0;
+			t.transport_state = JackTransportRolling;
+
+		}
+
+	}
+#endif
+}
+