Commit 2fd68fdf authored by sletz's avatar sletz
Browse files

Reorganize jack headers.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1614 0c269be4-1314-0410-8aa9-9f06e86f4224
parent 084dc073
......@@ -12,6 +12,10 @@ Tom Szilagyi
---------------------------
Jackdmp changes log
---------------------------
2007-10-16 Stephane Letz <letz@grame.fr>
* Reorganize jack hearders.
2007-10-16 Stephane Letz <letz@grame.fr>
......
......@@ -17,7 +17,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "types.h"
//#include "types.h"
#include "jack/types.h"
#include "varargs.h"
int try_start_server(jack_varargs_t* va, jack_options_t options, jack_status_t* status);
......@@ -17,6 +17,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "types.h"
#include "jack.h"
#include "JackExports.h"
#include <dlfcn.h>
......
......@@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "varargs.h"
#include "types.h"
//#include "jack/types.h"
int server_connect(char* name);
int try_start_server(jack_varargs_t* va, jack_options_t options, jack_status_t* status);
......
......@@ -26,8 +26,7 @@ extern "C"
{
#endif
//#include <jack/types.h>
#include "types.h"
#include <jack/types.h>
/**
* Get an internal client's name. This is useful when @ref
......
......@@ -34,13 +34,8 @@ extern "C"
#include <pthread.h>
#endif
/*
#include <jack/types.h>
#include <jack/transport.h>
*/
#include "types.h"
#include "transport.h"
/**
* Note: More documentation can be found in jack/types.h.
......
......@@ -26,8 +26,7 @@ extern "C"
{
#endif
//#include <jack/types.h>
#include "types.h"
#include <jack/types.h>
/**
* @return the maximum delay reported by the backend since
......
......@@ -26,8 +26,7 @@ extern "C"
{
#endif
//#include <jack/types.h>
#include "types.h"
#include <jack/types.h>
/**
* Transport states.
......
......@@ -23,14 +23,14 @@
#ifdef WIN32
#include <windows.h>
typedef char int8_t;
typedef unsigned char uint8_t;
typedef short int16_t;
typedef unsigned short uint16_t;
typedef long int32_t;
typedef unsigned long uint32_t;
typedef LONGLONG int64_t;
typedef ULONGLONG uint64_t;
typedef char int8_t;
typedef unsigned char uint8_t;
typedef short int16_t;
typedef unsigned short uint16_t;
typedef long int32_t;
typedef unsigned long uint32_t;
typedef LONGLONG int64_t;
typedef ULONGLONG uint64_t;
#else
#include <inttypes.h>
#endif
......@@ -187,7 +187,7 @@ typedef void (*JackPortRegistrationCallback)(jack_port_id_t port, int, void *arg
* zero if the client is being unregistered
* @param arg pointer to a client supplied structure
*/
typedef void (*JackClientRegistrationCallback)(const char* name, int register, void *arg);
typedef void (*JackClientRegistrationCallback)(const char* name, int val, void *arg);
/**
* Prototype for the client supplied function that is called
......
......@@ -25,7 +25,8 @@
#ifdef USE_MLOCK
#include <sys/mman.h>
#endif /* USE_MLOCK */
#include "ringbuffer.h"
//#include "ringbuffer.h"
#include "jack/ringbuffer.h"
/* Create a new ringbuffer to hold at least `sz' bytes of data. The
actual buffer size is rounded up to the next power of two. */
......
......@@ -27,7 +27,8 @@ extern "C"
{
#endif
#include "types.h"
//#include "types.h"
#include <jack/types.h>
/**
* Transport states.
......
......@@ -26,9 +26,7 @@
#include <string.h>
#include <stdlib.h>
#include <math.h>
#include "jack.h"
#include <jack/jack.h>
jack_port_t *input_port;
jack_port_t *output_port;
......
......@@ -33,10 +33,8 @@ extern "C"
#include <math.h>
#include <getopt.h>
#include <string.h>
#include "jack.h"
#include "transport.h"
#include <jack/jack.h>
#include <jack/transport.h>
typedef jack_default_audio_sample_t sample_t;
......
......@@ -24,8 +24,8 @@
#include <signal.h>
#include <stdlib.h>
#include <string.h>
#include "jack.h"
#include "transport.h"
#include <jack/jack.h>
#include <jack/transport.h>
char *package; /* program name */
jack_client_t *client;
......
......@@ -109,8 +109,8 @@ InternalMetro::InternalMetro(int freq, double max_amp, int dur_arg, int bpm, cha
}
if (jack_activate (client)) {
fprintf (stderr, "cannot activate client");
return ;
fprintf(stderr, "cannot activate client");
return;
}
}
......
......@@ -4,9 +4,8 @@
#include <signal.h>
#include <unistd.h>
#include <getopt.h>
#include "jack.h"
#include "intclient.h"
#include <jack/jack.h>
#include <jack/intclient.h>
jack_client_t *client;
jack_intclient_t intclient;
......
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include "jack.h"
#include "intclient.h"
#include <jack/jack.h>
#include <jack/intclient.h>
int
main (int argc, char *argv[])
......
......@@ -5,8 +5,7 @@
#endif
#include <string.h>
#include <getopt.h>
#include "jack.h"
#include <jack/jack.h>
char * my_name;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment