From 0332df74768e0513f77eea1945f10815767534a6 Mon Sep 17 00:00:00 2001 From: Alex Montgomery Date: Tue, 10 May 2011 23:14:32 +0100 Subject: [PATCH] fixed CFLAG passing, renamed enable flags to standards. --- GNUmakefile.in | 17 +++++++++++------ TODO | 14 ++++++-------- common.c | 18 +++++++++--------- configure | 20 ++++++++++---------- configure.ac | 8 ++++---- 5 files changed, 40 insertions(+), 37 deletions(-) diff --git a/GNUmakefile.in b/GNUmakefile.in index 85b001a..9f37d40 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -22,7 +22,7 @@ bindir ?= @bindir@ QMAKE = @ac_qmake@ INSTALL = @INSTALL@ -CFLAGS += @ac_cflags@ +PKG_CFLAGS += @ac_cflags@ LIBS += @ac_libs@ OBJECTS=main.o common.o @@ -31,20 +31,25 @@ default: @ac_default_deps@ install: @ac_default_install@ uninstall: @ac_default_uninstall@ +.SUFFIXES : .o .c + +.c.o : + $(CC) $(CFLAGS) $(PKG_CFLAGS) -c $< + jackctlmmc: $(OBJECTS) - $(CC) $(CFLAGS) $(LIBS) -o $@ $(OBJECTS) + $(CC) $(CFLAGS) $(PKG_CFLAGS) $(LIBS) -o $@ $(OBJECTS) qjackmmc: cd qt && $(QMAKE) -o Makefile qjackmmc.pro && $(MAKE) cli_install: jackctlmmc - $(INSTALL) -v ./jackctlmmc $(DESTDIR)$(bindir) + $(INSTALL) -v -D ./jackctlmmc $(DESTDIR)$(bindir)/jackctlmmc gui_install: qjackmmc - $(INSTALL) -v ./qjackmmc $(DESTDIR)$(bindir) - $(INSTALL) -v qt/images/qjackmmc.png $(DESTDIR)$(datarootdir)/pixmaps - $(INSTALL) -v qt/qjackmmc.desktop $(DESTDIR)$(datarootdir)/applications + $(INSTALL) -v -D ./qjackmmc $(DESTDIR)$(bindir)/qjackmmc + $(INSTALL) -v -D qt/images/qjackmmc.png $(DESTDIR)$(datarootdir)/pixmaps/qjackmmc.png + $(INSTALL) -v -D qt/qjackmmc.desktop $(DESTDIR)$(datarootdir)/applications/qjackmmc.desktop cli_uninstall: rm -vf $(DESTDIR)$(bindir)/jackctlmmc diff --git a/TODO b/TODO index 941481f..040cc62 100644 --- a/TODO +++ b/TODO @@ -1,14 +1,12 @@ -- fix XRun on quit -- hunt down clock drift on subsequent play/stop gotos -- change verbose checkbox to dropdown with output levels: normal, verbose, silent -- use XML for settings - change icon +- make ebuild for pro-audio overlay - update NEWS, VERSION - add README with advice on configure's parameters and how to call help - update screenshots -- update documentation +- update documentation: mention prefix's bad default value, remove references to "listening" - upload tarball - announce -- pass CFLAGS to qt -- make portage file for pro-audio overlay -- base prefix on jackd's path? +- hunt down clock drift on subsequent play/stop gotos +- change verbose checkbox to dropdown with output levels: normal, verbose, silent +- use XML for settings +- handle messages from JACK Re: close, disconnect, etc. diff --git a/common.c b/common.c index 65e48b3..2502c6e 100644 --- a/common.c +++ b/common.c @@ -339,6 +339,15 @@ void cleanup_globals() { int ret = 0; + if (g_jack_client) + { +#if JACK_MIDI_SUPPORT + jack_port_unregister(g_jack_client, g_jackMidiIn); +#endif + jack_deactivate(g_jack_client); + jack_client_close(g_jack_client); + } + if (g_seq_ptr) { ret = snd_seq_close(g_seq_ptr); @@ -350,13 +359,4 @@ void cleanup_globals() if (g_pollDescriptor) free(g_pollDescriptor); - - if (g_jack_client) - { -#if JACK_MIDI_SUPPORT - jack_port_unregister(g_jack_client, g_jackMidiIn); -#endif - jack_deactivate(g_jack_client); - jack_client_close(g_jack_client); - } } diff --git a/configure b/configure index 86d6228..e0ede53 100755 --- a/configure +++ b/configure @@ -692,8 +692,8 @@ with_qt with_jack with_alsa with_lash -enable_lash_support -enable_jack_midi +enable_lash +enable_jackmidi ' ac_precious_vars='build_alias host_alias @@ -1335,8 +1335,8 @@ Optional Features: --enable-gui build the gui program qjackmmc (default=yes) --enable-cli build the command line program jackctlmmc (default=no) - --enable-lash_support enable LASH support (default=yes) - --enable-jack_midi enable JACK MIDI support (default=yes) + --enable-lash enable LASH support (default=yes) + --enable-jackmidi enable JACK MIDI support (default=yes) Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -4591,18 +4591,18 @@ $as_echo "#define CONFIG_ALSA_SEQ 1" >>confdefs.h fi # check if the user wants LASH support -# Check whether --enable-lash_support was given. -if test "${enable_lash_support+set}" = set; then : - enableval=$enable_lash_support; ac_lashsupport="$enableval" +# Check whether --enable-lash was given. +if test "${enable_lash+set}" = set; then : + enableval=$enable_lash; ac_lashsupport="$enableval" else ac_lashsupport="yes" fi # check if the user wants JACK midi support -# Check whether --enable-jack_midi was given. -if test "${enable_jack_midi+set}" = set; then : - enableval=$enable_jack_midi; ac_jack_midi="$enableval" +# Check whether --enable-jackmidi was given. +if test "${enable_jackmidi+set}" = set; then : + enableval=$enable_jackmidi; ac_jack_midi="$enableval" else ac_jack_midi="yes" fi diff --git a/configure.ac b/configure.ac index decafae..c6e0186 100644 --- a/configure.ac +++ b/configure.ac @@ -197,14 +197,14 @@ if test "x$ac_alsa_seq" = "xyes"; then fi # check if the user wants LASH support -AC_ARG_ENABLE(lash_support, - AC_HELP_STRING([--enable-lash_support], [enable LASH support (default=yes)]), +AC_ARG_ENABLE(lash, + AC_HELP_STRING([--enable-lash], [enable LASH support (default=yes)]), [ac_lashsupport="$enableval"], [ac_lashsupport="yes"]) # check if the user wants JACK midi support -AC_ARG_ENABLE(jack_midi, - AC_HELP_STRING([--enable-jack_midi], [enable JACK MIDI support (default=yes)]), +AC_ARG_ENABLE(jackmidi, + AC_HELP_STRING([--enable-jackmidi], [enable JACK MIDI support (default=yes)]), [ac_jack_midi="$enableval"], [ac_jack_midi="yes"]) -- 2.11.4.GIT