git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2402 0c269be4-1314-0410-8aa9-9f06e86f4224tags/1.90
@@ -20,6 +20,10 @@ Fernando Lopez-Lezcano | |||||
Jackdmp changes log | Jackdmp changes log | ||||
--------------------------- | --------------------------- | ||||
2008-05-31 Stephane Letz <letz@grame.fr> | |||||
* Add missing include for proper compilation when jack headers are not installed. | |||||
2008-05-30 Stephane Letz <letz@grame.fr> | 2008-05-30 Stephane Letz <letz@grame.fr> | ||||
* Avoid using Terminate when "quitting" in RT thread. Cleanup JackEngineInterface. | * Avoid using Terminate when "quitting" in RT thread. Cleanup JackEngineInterface. | ||||
@@ -25,6 +25,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | |||||
#include <sys/types.h> | #include <sys/types.h> | ||||
#include <getopt.h> | #include <getopt.h> | ||||
#include <string.h> | #include <string.h> | ||||
#include "types.h" | |||||
#include "jack.h" | #include "jack.h" | ||||
#include "JackConstants.h" | #include "JackConstants.h" | ||||
#include "JackDriverLoader.h" | #include "JackDriverLoader.h" | ||||
@@ -18,10 +18,6 @@ | |||||
$Id: hammerfall.c,v 1.3 2005/09/29 14:51:59 letz Exp $ | $Id: hammerfall.c,v 1.3 2005/09/29 14:51:59 letz Exp $ | ||||
*/ | */ | ||||
//#include <jack/hardware.h> | |||||
//#include <jack/internal.h> | |||||
//#include "internal.h" | |||||
#include "hardware.h" | #include "hardware.h" | ||||
#include "alsa_driver.h" | #include "alsa_driver.h" | ||||
#include "hammerfall.h" | #include "hammerfall.h" | ||||
@@ -30,7 +26,6 @@ | |||||
#define FALSE 0 | #define FALSE 0 | ||||
#define TRUE 1 | #define TRUE 1 | ||||
/* Set this to 1 if you want this compile error: | /* Set this to 1 if you want this compile error: | ||||
* warning: `hammerfall_monitor_controls' defined but not used */ | * warning: `hammerfall_monitor_controls' defined but not used */ | ||||
#define HAMMERFALL_MONITOR_CONTROLS 0 | #define HAMMERFALL_MONITOR_CONTROLS 0 | ||||
@@ -26,10 +26,8 @@ | |||||
#include "hardware.h" | #include "hardware.h" | ||||
#include "alsa_driver.h" | #include "alsa_driver.h" | ||||
#include "ice1712.h" | #include "ice1712.h" | ||||
//#include <jack/internal.h> | |||||
#include "JackError.h" | #include "JackError.h" | ||||
static int | static int | ||||
ice1712_hw_monitor_toggle(jack_hardware_t *hw, int idx, int onoff) | ice1712_hw_monitor_toggle(jack_hardware_t *hw, int idx, int onoff) | ||||
{ | { | ||||
@@ -18,14 +18,9 @@ | |||||
*/ | */ | ||||
//#include <jack/hardware.h> | |||||
#include "hardware.h" | #include "hardware.h" | ||||
#include "alsa_driver.h" | #include "alsa_driver.h" | ||||
#include "usx2y.h" | #include "usx2y.h" | ||||
//#include <jack/internal.h> | |||||
//#include <jack/engine.h> | |||||
//#include <jack/messagebuffer.h> | |||||
#include <sys/mman.h> | #include <sys/mman.h> | ||||
#ifndef ARRAY_SIZE | #ifndef ARRAY_SIZE | ||||
@@ -645,7 +640,6 @@ usx2y_driver_setup (alsa_driver_t *driver) | |||||
(JackDriverNullCycleFunction) usx2y_driver_null_cycle; | (JackDriverNullCycleFunction) usx2y_driver_null_cycle; | ||||
} | } | ||||
jack_hardware_t * | jack_hardware_t * | ||||
jack_alsa_usx2y_hw_new (alsa_driver_t *driver) | jack_alsa_usx2y_hw_new (alsa_driver_t *driver) | ||||
{ | { | ||||