Removed fltk_client. More trouble than it's worth.

git-svn-id: svn+ssh://jackaudio.org/trunk/jack@387 0c269be4-1314-0410-8aa9-9f06e86f4224

5 files changed, 5 insertions, 239 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index aefa8f1..6ef5520 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -39,87 +39,3 @@ AC_DEFUN(AS_AC_EXPAND,
   exec_prefix=$exec_prefix_save
 ])
 
-#
-# fltk.m4
-#
-# You have permission to use this file under GNU's General Public License,
-# version 2 or later
-#
-# Copyright (C) 2002 Robert Ham (node@users.sourceforge.net)
-#
-
-AC_DEFUN([AC_LIB_FLTK],[
-  AC_LANG_PUSH([C++])
-  AC_ARG_ENABLE(
-    [fltktest],
-    AC_HELP_STRING([--disable-fltktest],
-                   [assume fltk is installed and skip the test]),
-    [
-      case "$enableval" in
-        "yes")
-          FLTK_TEST="yes"
-          ;;
-        "no")
-          FLTK_TEST="no"
-          ;;
-        *)
-          AC_MSG_ERROR([must use --enable-fltktest(=yes/no) or --disable-fltktest])
-          ;;
-      esac
-    ],
-    [ FLTK_TEST="yes"
-    ])
-                
-  if test "$FLTK_TEST" = "no"; then
-    AC_MSG_WARN([fltk test disabled: assuming FLTK_LDFLAGS="-lfltk" and FLTK_CXXFLAGS=""])
-    FLTK_LDFLAGS="-lfltk"
-    FLTK_CXXFLAGS=""
-    FLTK_FOUND="yes"
-  else
-    AC_CACHE_VAL(
-      [fltk_cv_prog_fltkconfig],
-      [
-        AC_ARG_WITH(
-          [fltk-config],
-          AC_HELP_STRING([--with-fltk-config=DIR],
-                         [the directory containing the fltk-config program]),
-          [
-            case "$withval" in
-              "yes")
-                if test -d yes; then
-                  FLTK_CONFIG_PATH="yes"
-                else
-                  AC_MSG_ERROR([you must use --with-fltk-config=DIR with DIR as a directory name])
-                fi
-                ;;
-              "no")
-                AC_MSG_ERROR([you must use --with-fltk-config=DIR with DIR as a directory name])
-                ;;
-              *)
-                FLTK_CONFIG_PATH="$withval"
-                ;;
-            esac
-          ])
-
-        if test "$FLTK_CONFIG_PATH" = ""; then
-          AC_PATH_PROG([FLTK_CONFIG], [fltk-config], [no])
-        else
-          AC_PATH_PROG([FLTK_CONFIG], [fltk-config], [no], "${FLTK_CONFIG_PATH}:${PATH}")
-        fi
-
-        if test "$FLTK_CONFIG" = "no"; then
-          AC_MSG_WARN([could not find the fltk-config program - try using --with-fltk-config=DIR])
-          FLTK_FOUND="no";
-        fi
-
-        fltk_cv_prog_fltkconfig="$FLTK_CONFIG"
-      ])
-    FLTK_CXXFLAGS="$( "$fltk_cv_prog_fltkconfig" --cxxflags )"
-    FLTK_LDFLAGS="$( "$fltk_cv_prog_fltkconfig" --ldflags )"
-    FLTK_FOUND="yes"
-  fi
-  AC_LANG_POP([C++])
-
-  AC_SUBST(FLTK_CXXFLAGS)
-  AC_SUBST(FLTK_LDFLAGS)
-])
diff --git a/configure.in b/configure.in
index 2e6eeab..abdc209 100644
--- a/configure.in
+++ b/configure.in
@@ -14,7 +14,7 @@ dnl                 changes are made
 dnl ---
 JACK_MAJOR_VERSION=0
 JACK_MINOR_VERSION=71
-JACK_MICRO_VERSION=1
+JACK_MICRO_VERSION=2
 
 dnl ---
 dnl HOWTO: updating the jack protocal version
@@ -217,7 +217,7 @@ AC_DEFINE_UNQUOTED(DEFAULT_TMP_DIR,"$DEFAULT_TMP_DIR",[Default tmp directory])
 
 
 
-# jack depends on alsa 0.9. some example apps depend on libsndfile and fltk.
+# jack depends on alsa 0.9. some example apps depend on libsndfile.
 
 AC_CHECK_LIB(asound,snd_pcm_drop,
 	     [
@@ -241,37 +241,6 @@ if test "x$HAVE_ALSA" != "xtrue"; then
    fi
 fi
 
-#
-# FLTK
-#
-jack_enable_fltk="yes"
-AC_ARG_ENABLE(fltk, [  --disable-fltk          disable fltk-dependant code],[
-  case "$enableval" in
-    "yes")
-      ;;
-    "no")
-      jack_enable_fltk="no"
-      ;;
-    *)
-      AC_MSG_ERROR([must use --enable-fltk(=yes/no) or --disable-fltk])
-      ;;
-  esac
-])
-                                                                                                                                                       
-if test "$jack_enable_fltk" = "yes"; then
-  AC_LIB_FLTK
-  if test "$FLTK_FOUND" = "yes"; then
-    HAVE_FLTK=true
-    AC_DEFINE(HAVE_FLTK, 1, [whether or not we have fltk])
-  else
-    HAVE_FLTK=false
-    AC_MSG_WARN([*** no fltk found, the fltk example client will not be built])
-  fi
-else
-  FLTK_FOUND="no"
-  HAVE_FLTK=false
-fi
-
 HAVE_SNDFILE=false
 PKG_CHECK_MODULES(SNDFILE, sndfile >= 1.0,[HAVE_SNDFILE=true], [true])
 if test x$HAVE_SNDFILE = xfalse; then
@@ -284,7 +253,6 @@ if test $HAVE_DOXYGEN = "false"; then
              AC_MSG_WARN([*** doxygen not found, docs will not be built])
 fi
 
-AM_CONDITIONAL(HAVE_FLTK, $HAVE_FLTK)
 AM_CONDITIONAL(HAVE_SNDFILE, $HAVE_SNDFILE)
 AM_CONDITIONAL(HAVE_DOXYGEN, $HAVE_DOXYGEN)
 AM_CONDITIONAL(USE_CAPABILITIES, $USE_CAPABILITIES)
diff --git a/example-clients/Makefile.am b/example-clients/Makefile.am
index efe8cb6..2984ca8 100644
--- a/example-clients/Makefile.am
+++ b/example-clients/Makefile.am
@@ -1,17 +1,5 @@
 MAINTAINERCLEANFILES    = Makefile.in
 
-if HAVE_FLTK
-FLTK_CLIENT = jack_fltk_client
-dist-check-fltk:
-else
-FLTK_CLIENT =
-dist-check-fltk:
-	@echo
-	@echo ' ******' You need fltk installed to make dist.' ******'
-	@echo
-	@false
-endif
-
 if HAVE_SNDFILE
 JACKREC = jackrec
 dist-check-sndfile:
@@ -34,7 +22,7 @@ bin_PROGRAMS = jack_load \
 	       jack_metro \
 	       jack_showtime \
 	       jack_lsp \
-	       $(FLTK_CLIENT) $(JACKREC)
+		   jackrec
 
 if HAVE_SNDFILE
 # note! jackrec_CFLAGS syntax not supported by automake-1.4
@@ -42,7 +30,7 @@ sndfile_cflags = @SNDFILE_CFLAGS@
 endif
 
 AM_CFLAGS = -I.. $(JACK_CFLAGS) $(sndfile_cflags)
-AM_CXXFLAGS = -I.. $(FLTK_CXXFLAGS) $(JACK_CFLAGS) $(sndfile_cflags)
+AM_CXXFLAGS = -I.. $(JACK_CFLAGS) $(sndfile_cflags)
 
 jack_simple_client_SOURCES = simple_client.c
 jack_simple_client_LDFLAGS = -lrt -ldl -lpthread
@@ -73,12 +61,6 @@ jack_showtime_LDFLAGS = -lrt -ldl -lpthread
 jack_showtime_LDADD = ../libjack/libjack.la
 
 
-if HAVE_FLTK
-jack_fltk_client_SOURCES = fltk_client.cc
-jack_fltk_client_LDFLAGS = -lrt $(FLTK_LDFLAGS)
-jack_fltk_client_LDADD = ../libjack/libjack.la
-endif
-
 if HAVE_SNDFILE
 jackrec_SOURCES = capture_client.c
 jackrec_LDFLAGS = @SNDFILE_LIBS@ -lrt -ldl -lpthread
@@ -112,4 +94,4 @@ ip_client_LTLIBRARIES = inprocess.la
 inprocess_la_LDFLAGS = -module -avoid-version
 inprocess_la_SOURCES = inprocess.c
 
-dist-hook: dist-check-fltk dist-check-sndfile
+dist-hook: dist-check-sndfile
diff --git a/example-clients/fltk_client.cc b/example-clients/fltk_client.cc
deleted file mode 100644
index 462d319..0000000
--- a/example-clients/fltk_client.cc
+++ /dev/null
@@ -1,99 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-
-extern "C"
-{
-#include <jack/jack.h>
-}
-
-#include <FL/Fl.H>
-#include <FL/Fl_Window.H>
-#include <FL/Fl_Slider.H>
-
-jack_port_t *input_port;
-jack_port_t *output_port;
-
-float gain = 0.0; /* slider starts out with zero gain */
-
-int
-process (jack_nframes_t nframes, void *arg)
-
-{
-	jack_default_audio_sample_t *out = (jack_default_audio_sample_t *) jack_port_get_buffer (output_port, nframes);
-	jack_default_audio_sample_t *in = (jack_default_audio_sample_t *) jack_port_get_buffer (input_port, nframes);
-
-	while (nframes--)
-		out[nframes] = in[nframes] * gain;
-
-	return 0;      
-}
-
-int
-bufsize (jack_nframes_t nframes, void *arg)
-
-{
-	printf ("the maximum buffer size is now %lu\n", nframes);
-	return 0;
-}
-
-int
-srate (jack_nframes_t nframes, void *arg)
-
-{
-	printf ("the sample rate is now %lu/sec\n", nframes);
-	return 0;
-}
-
-void callback(Fl_Slider* s)
-{
-	gain = s->value();
-}
-
-int
-main (int argc, char *argv[])
-
-{
-	Fl_Window w(0,0,100,120);
-	Fl_Slider s(10,10,20,100);
-	w.show();
-	s.callback((Fl_Callback*) callback);
-	
-	jack_client_t *client;
-
-	if ((client = jack_client_new ("fltktest")) == 0) {
-		fprintf (stderr, "jack server not running?\n");
-		return 1;
-	}
-
-	jack_set_process_callback (client, process, 0);
-	jack_set_buffer_size_callback (client, bufsize, 0);
-	jack_set_sample_rate_callback (client, srate, 0);
-
-	printf ("engine sample rate: %lu\n", jack_get_sample_rate (client));
-
-	input_port = jack_port_register (client, "input", JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput, 0);
-	output_port = jack_port_register (client, "output", JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0);
-
-	if (jack_activate (client)) {
-		fprintf (stderr, "cannot activate client");
-	}
-
-	printf ("client activated\n");
-
-	if (jack_connect (client, "alsa_pcm:capture_1", jack_port_name (input_port))) {
-		fprintf (stderr, "cannot connect input ports\n");
-	} 
-
-	if (jack_connect (client, jack_port_name (output_port), "alsa_pcm:playback_1")) {
-		fprintf (stderr, "cannot connect output ports\n");
-	} 
-
-	Fl::run();
-
-	printf ("done sleeping, now closing...\n");
-	jack_client_close (client);
-	exit (0);
-}
-
diff --git a/jack.spec.in b/jack.spec.in
index b6c6c6a..8c38ee5 100644
--- a/jack.spec.in
+++ b/jack.spec.in
@@ -86,7 +86,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 %files example-clients
 %defattr(-,root,root)
-%{_bindir}/jack_fltk_client
 %{_bindir}/jackrec
 %{_bindir}/jack_cache_killer
 %{_bindir}/jack_connect