Browse Source

Reorganize jack headers.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1614 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/0.68
sletz 17 years ago
parent
commit
2fd68fdfbf
24 changed files with 257 additions and 194 deletions
  1. +4
    -0
      ChangeLog
  2. +2
    -1
      common/JackAPI.h
  3. +1
    -0
      common/JackAPIWrapper.cpp
  4. +1
    -0
      common/JackServerLaunch.h
  5. +1
    -2
      common/jack/intclient.h
  6. +0
    -5
      common/jack/jack.h
  7. +0
    -0
      common/jack/ringbuffer.h
  8. +1
    -2
      common/jack/statistics.h
  9. +0
    -0
      common/jack/thread.h
  10. +1
    -2
      common/jack/transport.h
  11. +9
    -9
      common/jack/types.h
  12. +2
    -1
      common/ringbuffer.c
  13. +2
    -1
      common/transport_types.h
  14. +1
    -3
      example-clients/connect.c
  15. +2
    -4
      example-clients/external_metro.h
  16. +2
    -2
      example-clients/freewheel.c
  17. +2
    -2
      example-clients/internal_metro.cpp
  18. +2
    -3
      example-clients/ipload.c
  19. +2
    -3
      example-clients/ipunload.c
  20. +1
    -2
      example-clients/lsp.c
  21. +1
    -2
      example-clients/metro.c
  22. +1
    -2
      example-clients/zombie.c
  23. +217
    -145
      macosx/Jackdmp.xcodeproj/project.pbxproj
  24. +2
    -3
      tests/jack_test.cpp

+ 4
- 0
ChangeLog View File

@@ -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>


+ 2
- 1
common/JackAPI.h View File

@@ -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);

+ 1
- 0
common/JackAPIWrapper.cpp View File

@@ -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>


+ 1
- 0
common/JackServerLaunch.h View File

@@ -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);


common/intclient.h → common/jack/intclient.h View File

@@ -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

common/jack.h → common/jack/jack.h View File

@@ -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.

common/ringbuffer.h → common/jack/ringbuffer.h View File


common/statistics.h → common/jack/statistics.h View File

@@ -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

common/thread.h → common/jack/thread.h View File


common/transport.h → common/jack/transport.h View File

@@ -26,8 +26,7 @@ extern "C"
{
#endif

//#include <jack/types.h>
#include "types.h"
#include <jack/types.h>

/**
* Transport states.

common/types.h → common/jack/types.h View File

@@ -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

+ 2
- 1
common/ringbuffer.c View File

@@ -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. */


+ 2
- 1
common/transport_types.h View File

@@ -27,7 +27,8 @@ extern "C"
{
#endif

#include "types.h"
//#include "types.h"
#include <jack/types.h>

/**
* Transport states.


+ 1
- 3
example-clients/connect.c View File

@@ -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;


+ 2
- 4
example-clients/external_metro.h View File

@@ -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;



+ 2
- 2
example-clients/freewheel.c View File

@@ -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;


+ 2
- 2
example-clients/internal_metro.cpp View File

@@ -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;
}
}



+ 2
- 3
example-clients/ipload.c View File

@@ -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;


+ 2
- 3
example-clients/ipunload.c View File

@@ -1,9 +1,8 @@
#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[])


+ 1
- 2
example-clients/lsp.c View File

@@ -5,8 +5,7 @@
#endif
#include <string.h>
#include <getopt.h>

#include "jack.h"
#include <jack/jack.h>

char * my_name;



+ 1
- 2
example-clients/metro.c View File

@@ -25,8 +25,7 @@
#include <math.h>
#include <getopt.h>
#include <string.h>

#include "jack.h"
#include <jack/jack.h>

typedef jack_default_audio_sample_t sample_t;



+ 1
- 2
example-clients/zombie.c View File

@@ -23,8 +23,7 @@
#include <unistd.h>
#include <string.h>
#include <stdlib.h>

#include "jack.h"
#include <jack/jack.h>

int running = 1;
int count = 0;


+ 217
- 145
macosx/Jackdmp.xcodeproj/project.pbxproj
File diff suppressed because it is too large
View File


+ 2
- 3
tests/jack_test.cpp View File

@@ -34,9 +34,8 @@
#include <math.h>
#include <assert.h>
#include <stdarg.h>

#include "jack.h"
#include "transport.h"
#include <jack/jack.h>
#include <jack/transport.h>


#ifdef WIN32


Loading…
Cancel
Save