Commit 756027b0 authored by Stephane Letz's avatar Stephane Letz
Browse files

Constant naming cleanup.

parent f80e2502
...@@ -87,7 +87,7 @@ class SERVER_EXPORT JackClient : public JackClientInterface, public JackRunnable ...@@ -87,7 +87,7 @@ class SERVER_EXPORT JackClient : public JackClientInterface, public JackRunnable
void* fThreadFunArg; void* fThreadFunArg;
void* fSessionArg; void* fSessionArg;
void* fLatencyArg; void* fLatencyArg;
char fServerName[JACK_SERVER_CONTROL_NAME_SIZE]; char fServerName[JACK_SERVER_NAME_SIZE];
JackThread fThread; /*! Thread to execute the Process function */ JackThread fThread; /*! Thread to execute the Process function */
detail::JackClientChannelInterface* fChannel; detail::JackClientChannelInterface* fChannel;
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#define JACK_PORT_NAME_SIZE 256 #define JACK_PORT_NAME_SIZE 256
#define JACK_PORT_TYPE_SIZE 32 #define JACK_PORT_TYPE_SIZE 32
#define JACK_SERVER_CONTROL_NAME_SIZE 64 #define JACK_SERVER_NAME_SIZE 256
#define JACK_CLIENT_NAME_SIZE 64 #define JACK_CLIENT_NAME_SIZE 64
#define JACK_MESSAGE_SIZE 256 #define JACK_MESSAGE_SIZE 256
#define JACK_UUID_SIZE 32 #define JACK_UUID_SIZE 32
...@@ -77,7 +77,6 @@ ...@@ -77,7 +77,6 @@
#define JACK_SERVER_FAILURE "JACK server has been closed" #define JACK_SERVER_FAILURE "JACK server has been closed"
#define NO_PORT 0xFFFE #define NO_PORT 0xFFFE
#define EMPTY 0xFFFD #define EMPTY 0xFFFD
......
...@@ -63,7 +63,7 @@ struct SERVER_EXPORT JackEngineControl : public JackShmMem ...@@ -63,7 +63,7 @@ struct SERVER_EXPORT JackEngineControl : public JackShmMem
int fServerPriority; int fServerPriority;
int fClientPriority; int fClientPriority;
int fMaxClientPriority; int fMaxClientPriority;
char fServerName[JACK_SERVER_CONTROL_NAME_SIZE]; char fServerName[JACK_SERVER_NAME_SIZE];
JackTransportEngine fTransport; JackTransportEngine fTransport;
jack_timer_type_t fClockSource; jack_timer_type_t fClockSource;
int fDriverNum; int fDriverNum;
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include <sys/types.h> #include <sys/types.h>
#include "types.h" #include "types.h"
#include "JackCompilerDeps.h" #include "JackCompilerDeps.h"
#include "JackConstants.h"
#define TRUE 1 #define TRUE 1
#define FALSE 0 #define FALSE 0
...@@ -47,9 +48,8 @@ extern "C" ...@@ -47,9 +48,8 @@ extern "C"
{ {
#endif #endif
#define MAX_SERVERS 8 /* maximum concurrent servers */ #define MAX_SERVERS 8 /* maximum concurrent servers */
#define MAX_SHM_ID 256 /* generally about 16 per server */ #define MAX_SHM_ID 256 /* generally about 16 per server */
#define JACK_SERVER_NAME_SIZE 256 /* maximum length of server name */
#define JACK_SHM_MAGIC 0x4a41434b /* shm magic number: "JACK" */ #define JACK_SHM_MAGIC 0x4a41434b /* shm magic number: "JACK" */
#define JACK_SHM_NULL_INDEX -1 /* NULL SHM index */ #define JACK_SHM_NULL_INDEX -1 /* NULL SHM index */
#define JACK_SHM_REGISTRY_INDEX -2 /* pseudo SHM index for registry */ #define JACK_SHM_REGISTRY_INDEX -2 /* pseudo SHM index for registry */
...@@ -62,7 +62,7 @@ extern "C" ...@@ -62,7 +62,7 @@ extern "C"
#ifdef USE_POSIX_SHM #ifdef USE_POSIX_SHM
#ifndef NAME_MAX #ifndef NAME_MAX
#define NAME_MAX 255 #define NAME_MAX 255
#endif #endif
#ifndef SHM_NAME_MAX #ifndef SHM_NAME_MAX
...@@ -72,7 +72,7 @@ extern "C" ...@@ -72,7 +72,7 @@ extern "C"
typedef shm_name_t jack_shm_id_t; typedef shm_name_t jack_shm_id_t;
#elif WIN32 #elif WIN32
#define NAME_MAX 255 #define NAME_MAX 255
#ifndef SHM_NAME_MAX #ifndef SHM_NAME_MAX
#define SHM_NAME_MAX NAME_MAX #define SHM_NAME_MAX NAME_MAX
#endif #endif
......
...@@ -80,7 +80,7 @@ class JackWinNamedPipeServerChannel : public JackRunnableInterface ...@@ -80,7 +80,7 @@ class JackWinNamedPipeServerChannel : public JackRunnableInterface
JackWinNamedPipeServer fRequestListenPipe; // Pipe to create request socket for the client JackWinNamedPipeServer fRequestListenPipe; // Pipe to create request socket for the client
JackServer* fServer; JackServer* fServer;
JackThread fThread; // Thread to execute the event loop JackThread fThread; // Thread to execute the event loop
char fServerName[JACK_SERVER_CONTROL_NAME_SIZE]; char fServerName[JACK_SERVER_NAME_SIZE];
std::list<JackClientPipeThread*> fClientList; std::list<JackClientPipeThread*> fClientList;
......
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