Browse Source

Cleanup.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4640 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.9.8
sletz 13 years ago
parent
commit
0b948126cc
8 changed files with 12 additions and 14 deletions
  1. +1
    -2
      common/JackAPI.cpp
  2. +0
    -1
      common/JackAudioAdapterInterface.h
  3. +1
    -1
      common/JackDriverLoader.h
  4. +0
    -1
      common/JackException.h
  5. +6
    -4
      common/JackLibAPI.cpp
  6. +0
    -2
      common/JackLibSampleRateResampler.h
  7. +0
    -2
      common/JackMidiAPI.cpp
  8. +4
    -1
      common/JackServerAPI.cpp

+ 1
- 2
common/JackAPI.cpp View File

@@ -25,9 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "JackClientControl.h"
#include "JackGlobals.h"
#include "JackTime.h"
#include "JackCompilerDeps.h"
#include "JackPortType.h"
#include "JackPlatformPlug.h"
#include <math.h>

#ifdef __CLIENTDEBUG__
@@ -59,6 +57,7 @@ extern "C"
jack_client_t * jack_client_new_aux(const char* client_name,
jack_options_t options,
jack_status_t *status);

LIB_EXPORT jack_client_t * jack_client_open(const char* client_name,
jack_options_t options,
jack_status_t *status, ...);


+ 0
- 1
common/JackAudioAdapterInterface.h View File

@@ -22,7 +22,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

#include "JackResampler.h"
#include "JackFilters.h"
#include "JackConstants.h"
#include <stdio.h>

namespace Jack


+ 1
- 1
common/JackDriverLoader.h View File

@@ -64,7 +64,7 @@ extern "C"
{
#endif

SERVER_EXPORT int jackctl_parse_driver_params (jackctl_driver * driver_ptr, int argc, char* argv[]);
SERVER_EXPORT int jackctl_parse_driver_params(jackctl_driver * driver_ptr, int argc, char* argv[]);
SERVER_EXPORT void jack_free_driver_params(JSList * param_ptr);
SERVER_EXPORT void jack_print_driver_options(jack_driver_desc_t* desc, FILE* file);



+ 0
- 1
common/JackException.h View File

@@ -23,7 +23,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include <stdexcept>
#include <iostream>
#include <string>
#include "JackCompilerDeps.h"
#include "JackError.h"

namespace Jack


+ 6
- 4
common/JackLibAPI.cpp View File

@@ -39,9 +39,6 @@ extern "C"
jack_client_t * jack_client_new_aux (const char *client_name,
jack_options_t options,
jack_status_t *status);
jack_client_t * jack_client_open_aux (const char *client_name,
jack_options_t options,
jack_status_t *status, va_list ap);

LIB_EXPORT jack_client_t * jack_client_open (const char *client_name,
jack_options_t options,
@@ -49,10 +46,15 @@ extern "C"
LIB_EXPORT int jack_client_close (jack_client_t *client);
LIB_EXPORT int jack_get_client_pid (const char *name);


#ifdef __cplusplus
}
#endif

static jack_client_t * jack_client_open_aux (const char *client_name,
jack_options_t options,
jack_status_t *status, va_list ap);

JackLibGlobals* JackLibGlobals::fGlobals = NULL;
int JackLibGlobals::fClientCount = 0;

@@ -109,7 +111,7 @@ jack_client_t* jack_client_new_aux(const char* client_name, jack_options_t optio
}
}

jack_client_t* jack_client_open_aux(const char* client_name, jack_options_t options, jack_status_t* status, va_list ap)
static jack_client_t* jack_client_open_aux(const char* client_name, jack_options_t options, jack_status_t* status, va_list ap)
{
jack_varargs_t va; /* variable arguments */
jack_status_t my_status;


+ 0
- 2
common/JackLibSampleRateResampler.h View File

@@ -21,8 +21,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#define __JackLibSampleRateResampler__

#include "JackResampler.h"
#include "types.h"

#include <samplerate.h>

namespace Jack


+ 0
- 2
common/JackMidiAPI.cpp View File

@@ -20,10 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

#include "JackError.h"
#include "JackMidiPort.h"
#include "JackCompilerDeps.h"
#include <errno.h>
#include <string.h>
#include "JackSystemDeps.h"

#ifdef __cplusplus
extern "C"


+ 4
- 1
common/JackServerAPI.cpp View File

@@ -34,7 +34,6 @@ extern "C"
#endif

jack_client_t* jack_client_new_aux(const char* client_name, jack_options_t options, jack_status_t* status);
jack_client_t* jack_client_open_aux(const char* client_name, jack_options_t options, jack_status_t* status, va_list ap);

SERVER_EXPORT jack_client_t * jack_client_open (const char *client_name,
jack_options_t options,
@@ -48,6 +47,10 @@ extern "C"

using namespace Jack;

static jack_client_t * jack_client_open_aux (const char *client_name,
jack_options_t options,
jack_status_t *status, va_list ap);

jack_client_t* jack_client_new_aux(const char* client_name, jack_options_t options, jack_status_t* status)
{
jack_varargs_t va; /* variable arguments */


Loading…
Cancel
Save