X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_feedback.cc;h=1fd8389e117a27c230c0393b4f6f56321068c5c6;hb=dca612e82af4f89dad4f15454cbbb15694fa077c;hp=2e6d0cd80ba9d441b0dedf8a2b7a6fdd20a66529;hpb=bd21c474e547d49338ea0efd452895de1e147cd5;p=ardour.git

diff --git a/libs/ardour/session_feedback.cc b/libs/ardour/session_feedback.cc
index 2e6d0cd80b..1fd8389e11 100644
--- a/libs/ardour/session_feedback.cc
+++ b/libs/ardour/session_feedback.cc
@@ -28,15 +28,17 @@
 #include <midi++/types.h>
 #include <midi++/port.h>
 #include <midi++/manager.h>
-#include <pbd/error.h>
-#include <pbd/lockmonitor.h>
+
+#include <glibmm/thread.h>
+
 #include <pbd/pthread_utils.h>
 
 #include <ardour/configuration.h>
 #include <ardour/audioengine.h>
 #include <ardour/session.h>
 #include <ardour/audio_track.h>
-#include <ardour/diskstream.h>
+#include <ardour/audio_diskstream.h>
+#include <control_protocol/control_protocol.h>
 
 #include "i18n.h"
 
@@ -44,203 +46,5 @@ using namespace std;
 using namespace ARDOUR;
 //using namespace sigc;
 
-int
-Session::init_feedback ()
-{
-	if (pipe (feedback_request_pipe) != 0) {
-		error << string_compose (_("cannot create feedback request pipe (%1)"),
-				  strerror (errno))
-		      << endmsg;
-		return -1;
-	}
-
-	if (fcntl (feedback_request_pipe[0], F_SETFL, O_NONBLOCK)) {
-		error << string_compose(_("UI: cannot set O_NONBLOCK on "    "signal read pipe (%1)"), strerror (errno)) << endmsg;
-		return -1;
-	}
-
-	if (fcntl (feedback_request_pipe[1], F_SETFL, O_NONBLOCK)) {
-		error << string_compose(_("UI: cannot set O_NONBLOCK on "    "signal write pipe (%1)"), strerror (errno)) << endmsg;
-		return -1;
-	}
-
-	active_feedback = 0;
-	midi_feedback = false;
-
-	/* add possible feedback functions here */
-	
-	feedback_functions.push_back (mem_fun (*this, &Session::feedback_generic_midi_function));
-
-	if (pthread_create_and_store ("feedback", &feedback_thread, 0, _feedback_thread_work, this)) {
-		error << _("Session: could not create feedback thread") << endmsg;
-		return -1;
-	}
-
-	return 0;
-}	
-
-int
-Session::poke_feedback (FeedbackRequest::Type why)
-{
-	char c = (char) why;
-	return !(write (feedback_request_pipe[1], &c, 1) == 1);
-}
-
-int
-Session::start_feedback ()
-{
-	return poke_feedback (FeedbackRequest::Start);
-}
-
-int
-Session::stop_feedback ()
-{
-	return poke_feedback (FeedbackRequest::Stop);
-}
-
-void
-Session::terminate_feedback ()
-{
-	void* status;
-	poke_feedback (FeedbackRequest::Quit);
-	pthread_join (feedback_thread, &status);
-}
-
-void*
-Session::_feedback_thread_work (void* arg)
-{
-	return static_cast<Session*> (arg)->feedback_thread_work ();
-}
-
-void*
-Session::feedback_thread_work ()
-{
-	PBD::ThreadCreated (pthread_self(), X_("Feedback"));
-	struct pollfd pfd[1];
-	int timeout;
-
-	pthread_setcancelstate (PTHREAD_CANCEL_ENABLE, 0);
-	pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, 0);
-
-	if (active_feedback) {
-		/* XXX use Config->feedback_interval_usecs()*/;
-		timeout = max (5, (int) Config->get_midi_feedback_interval_ms());
-	} else {
-		timeout = -1;
-	}
-
-	while (1) {
-
-		pfd[0].fd = feedback_request_pipe[0];
-		pfd[0].events = POLLIN|POLLHUP|POLLERR;
-
-		if (poll (pfd, 1, timeout) < 0) {
-			if (errno == EINTR) {
-				continue;
-			}
-			error << string_compose (_("Feedback thread poll failed (%1)"),
-					  strerror (errno))
-			      << endmsg;
-			break;
-		}
-
-		if (pfd[0].revents & ~POLLIN) {
-			error << _("Error on feedback thread request pipe") << endmsg;
-			break;
-		}
-
-		if (pfd[0].revents & POLLIN) {
-
-			char req;
-			
-			/* empty the pipe of all current requests */
-
-			while (1) {
-				size_t nread = read (feedback_request_pipe[0], &req, sizeof (req));
-
-				if (nread == 1) {
-					switch ((FeedbackRequest::Type) req) {
-					
-					case FeedbackRequest::Start:
-						timeout = max (5, (int) Config->get_midi_feedback_interval_ms());
-						active_feedback++;
-						break;
-						
-					case FeedbackRequest::Stop:
-						timeout = -1;
-						if (active_feedback) {
-							active_feedback--;
-						} 
-						break;
-						
-					case FeedbackRequest::Quit:
-						pthread_exit_pbd (0);
-						/*NOTREACHED*/
-						break;
-						
-					default:
-						break;
-					}
-
-				} else if (nread == 0) {
-					break;
-				} else if (errno == EAGAIN) {
-					break;
-				} else {
-					fatal << _("Error reading from feedback request pipe") << endmsg;
-					/*NOTREACHED*/
-				}
-			}
-		}
-		
-		if (!active_feedback || transport_stopped()) {
-			continue;
-		}
-
-		for (list<FeedbackFunctionPtr>::iterator i = feedback_functions.begin(); i != feedback_functions.end(); ) {
-			
-			list<FeedbackFunctionPtr>::iterator tmp;
-			
-			tmp = i;
-			++tmp;
-			
-			if ((*i)) {
-				feedback_functions.erase (i);
-			}
-			
-			i = tmp;
-		}
-	}
-	
-	return 0;
-}
-
-int
-Session::feedback_generic_midi_function ()
-{
-	const int32_t bufsize = 16 * 1024;
-	int32_t bsize = bufsize;
-	MIDI::byte* buf = new MIDI::byte[bufsize];
-	MIDI::byte* end = buf;
-
-	{
-		RWLockMonitor lm (route_lock, false, __LINE__, __FILE__);
-		
-		for (RouteList::iterator i = routes.begin(); i != routes.end(); ++i) {
-			end = (*i)->write_midi_feedback (end, bsize);
-		}
-	}
-
-	if (end == buf) {
-		delete [] buf;
-		return 0;
-	} 
-	
-	deliver_midi (_midi_port, buf, (int32_t) (end - buf));
-
-	//cerr << "MIDI feedback: wrote " << (int32_t) (end - buf) << " to midi port\n";
-		
 
-	return 0;
-}