Fix deprecated INCLUDES variable in Makefile.am's. Add skeleton code for jackaudio output module.

7 files changed, 7 insertions, 169 deletions

diff --git a/drumgizmo/input/dummy/Makefile.am b/drumgizmo/input/dummy/Makefile.am
index 10bd70f..6c40eb9 100644
--- a/drumgizmo/input/dummy/Makefile.am
+++ b/drumgizmo/input/dummy/Makefile.am
@@ -20,7 +20,7 @@ lib_LTLIBRARIES = $(dummyltlibs)
 
 libdir = $(INPUT_PLUGIN_DIR)
 
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 libdummy_la_LDFLAGS =
 libdummy_la_LIBADD =
 libdummy_la_SOURCES = $(dummybuildsources)
diff --git a/drumgizmo/input/jackmidi/Makefile.am b/drumgizmo/input/jackmidi/Makefile.am
index f357b56..cd77a74 100644
--- a/drumgizmo/input/jackmidi/Makefile.am
+++ b/drumgizmo/input/jackmidi/Makefile.am
@@ -1,8 +1,6 @@
 
 jackmidisources = \
-	jackmidi.cc \
-	jackclient.cc \
-	jackclient.h
+	jackmidi.cc
 
 if HAVE_INPUT_JACKMIDI
 
@@ -22,7 +20,7 @@ lib_LTLIBRARIES = $(jackmidiltlibs)
 
 libdir = $(INPUT_PLUGIN_DIR)
 
-INCLUDES = -I$(top_srcdir)/include $(JACK_CFLAGS)
-libjackmidi_la_LDFLAGS = $(JACK_LIBS)
+AM_CPPFLAGS = -I$(top_srcdir)/include
+libjackmidi_la_LDFLAGS =
 libjackmidi_la_LIBADD =
 libjackmidi_la_SOURCES = $(jackmidibuildsources)
diff --git a/drumgizmo/input/jackmidi/jackclient.cc b/drumgizmo/input/jackmidi/jackclient.cc
deleted file mode 100644
index 4fbafb5..0000000
--- a/drumgizmo/input/jackmidi/jackclient.cc
+++ /dev/null
@@ -1,96 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/***************************************************************************
- *            jackclient.cc
- *
- *  Sun Jul 20 21:48:44 CEST 2008
- *  Copyright 2008 Bent Bisballe Nyeng
- *  deva@aasimon.org
- ****************************************************************************/
-
-/*
- *  This file is part of DrumGizmo.
- *
- *  DrumGizmo 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.
- *
- *  DrumGizmo 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 DrumGizmo; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
- */
-#include "jackclient.h"
-
-extern "C"
-{
-  int _wrap_jack_process(jack_nframes_t nframes, void *arg){
-    return ((JackClient*)arg)->process(nframes);}
-}  // extern "C"
-
-JackClient::JackClient()
-  : refcnt(0)
-{
-	jack_status_t status;
-
-	jack_client = jack_client_open("DrumGizmo", JackNullOption, &status);
-
-  jack_set_process_callback(jack_client, _wrap_jack_process, this);
-}
-
-JackClient::~JackClient()
-{
-	jack_client_close(jack_client);
-}
-
-void JackClient::addJackProcess(JackProcess *process)
-{
-  jack_processes.insert(process);
-}
-
-void JackClient::removeJackProcess(JackProcess *process)
-{
-  jack_processes.erase(process);
-}
-
-void JackClient::activate()
-{
-	if(!active) jack_activate(jack_client);
-  active = true;
-}
-
-int JackClient::process(jack_nframes_t nframes)
-{
-  std::set<JackProcess *>::iterator i = jack_processes.begin();
-  while(i != jack_processes.end()) {
-    JackProcess *jp = *i;
-    jp->jack_process(nframes);
-    i++;
-  }
-
-	return 0;
-}
-
-JackClient *jackclient = NULL;
-
-JackClient *init_jack_client()
-{
-  if(jackclient == NULL) jackclient = new JackClient();
-  jackclient->refcnt++;
-  return jackclient;
-
-}
-void close_jack_client()
-{
-  if(jackclient) {
-    jackclient->refcnt--;
-    if(jackclient->refcnt == 0) {
-      delete jackclient;
-      jackclient = NULL;
-    }
-  }
-}
diff --git a/drumgizmo/input/jackmidi/jackclient.h b/drumgizmo/input/jackmidi/jackclient.h
deleted file mode 100644
index 88e4bbf..0000000
--- a/drumgizmo/input/jackmidi/jackclient.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/***************************************************************************
- *            jackclient.h
- *
- *  Sun Jul 20 21:48:44 CEST 2008
- *  Copyright 2008 Bent Bisballe Nyeng
- *  deva@aasimon.org
- ****************************************************************************/
-
-/*
- *  This file is part of DrumGizmo.
- *
- *  DrumGizmo 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.
- *
- *  DrumGizmo 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 DrumGizmo; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
- */
-#ifndef __DRUMGIZMO_JACKCLIENT_H__
-#define __DRUMGIZMO_JACKCLIENT_H__
-
-#include <jack/jack.h>
-#include <set>
-
-class JackProcess {
-public:
-  virtual void jack_process(jack_nframes_t nframes) = 0;
-};
-
-class JackClient {
-public:
-  JackClient();
-  ~JackClient();
-
-  void addJackProcess(JackProcess *process);
-  void removeJackProcess(JackProcess *process);
-
-  void activate();
-  int process(jack_nframes_t nframes);
-
-	jack_client_t *jack_client;
-
-  // Sort of private...
-  int refcnt;
-
-private:
-  std::set<JackProcess *> jack_processes;
-  bool active;
-};
-
-extern JackClient *jackclient;
-
-JackClient *init_jack_client();
-void close_jack_client();
-
-#endif/*__DRUMGIZMO_JACKCLIENT_H__*/
diff --git a/drumgizmo/input/jackmidi/jackmidi.cc b/drumgizmo/input/jackmidi/jackmidi.cc
index 1e42468..7af257e 100644
--- a/drumgizmo/input/jackmidi/jackmidi.cc
+++ b/drumgizmo/input/jackmidi/jackmidi.cc
@@ -33,7 +33,7 @@
 
 #define NOTE_ON 0x90
 
-#include "jackclient.h"
+#include "../../jackclient.h"
 
 #include <jack/midiport.h>
 
diff --git a/drumgizmo/input/midifile/Makefile.am b/drumgizmo/input/midifile/Makefile.am
index 3e267e6..da87f93 100644
--- a/drumgizmo/input/midifile/Makefile.am
+++ b/drumgizmo/input/midifile/Makefile.am
@@ -25,7 +25,7 @@ lib_LTLIBRARIES = $(midifileltlibs)
 
 libdir = $(INPUT_PLUGIN_DIR)
 
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/include $(SMF_CFLAGS) \
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include $(SMF_CFLAGS) \
 	$(EXPAT_CFLAGS) -I$(top_srcdir)/hugin -DWITH_HUG_MUTEX
 libmidifile_la_LDFLAGS = $(SMF_LIBS) $(EXPAT_LIBS)
 libmidifile_la_LIBADD =
diff --git a/drumgizmo/input/test/Makefile.am b/drumgizmo/input/test/Makefile.am
index ca45de0..0b65a67 100644
--- a/drumgizmo/input/test/Makefile.am
+++ b/drumgizmo/input/test/Makefile.am
@@ -20,7 +20,7 @@ lib_LTLIBRARIES = $(testltlibs)
 
 libdir = $(INPUT_PLUGIN_DIR)
 
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 libtest_la_LDFLAGS =
 libtest_la_LIBADD =
 libtest_la_SOURCES = $(testbuildsources)