griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T49657: Audio backend "Jack" should be named "JACK".

Browse Source
This commit is contained in:
Jörg Müller
2016-10-22 14:20:47 +02:00
parent d5ee031f76
commit 132478d4b8
6 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
intern/audaspace/intern/AUD_C-API.cpp
View File

@@ -155,18 +155,18 @@ AUD_Device* AUD_init(const char* device, AUD_DeviceSpecs specs, int buffersize,
}
#endif
#ifdef WITH_JACK
else if(dname == "Jack")
else if(dname == "JACK")
{
#ifdef __APPLE__
struct stat st;
if (stat("/Library/Frameworks/Jackmp.framework", &st) != 0) {
printf("Warning: Jack Framework not installed\n");
printf("Warning: JACK Framework not installed\n");
return NULL;
}
else
#endif
if (!AUD_jack_supported()) {
printf("Warning: Jack cllient not installed\n");
printf("Warning: JACK cllient not installed\n");
return NULL;
}
else {

2
intern/audaspace/intern/AUD_C-API.h
View File

@@ -61,7 +61,7 @@ typedef struct
#endif
/**
* Initializes audio rutines (FFMPEG/Jack if it is enabled).
* Initializes audio routines (FFMPEG/JACK if it is enabled).
*/
extern void AUD_initOnce(void);

8
intern/audaspace/jack/AUD_JackDevice.h
View File

@@ -41,7 +41,7 @@
typedef void (*AUD_syncFunction)(void*, int, float);
/**
* This device plays back through Jack.
* This device plays back through JACK.
*/
class AUD_JackDevice : public AUD_SoftwareDevice
{
@@ -90,7 +90,7 @@ private:
static int jack_sync(jack_transport_state_t state, jack_position_t* pos, void* data);
/**
* Next Jack Transport state (-1 if not expected to change).
* Next JACK Transport state (-1 if not expected to change).
*/
jack_transport_state_t m_nextState;
@@ -150,7 +150,7 @@ protected:
public:
/**
* Creates a Jack client for audio output.
* Creates a JACK client for audio output.
* \param name The client name.
* \param specs The wanted audio specification, where only the channel count
* is important.
@@ -160,7 +160,7 @@ public:
AUD_JackDevice(std::string name, AUD_DeviceSpecs specs, int buffersize = AUD_DEFAULT_BUFFER_SIZE);
/**
* Closes the Jack client.
* Closes the JACK client.
*/
virtual ~AUD_JackDevice();

2
intern/audaspace/jack/AUD_JackLibrary.h
View File

@@ -42,7 +42,7 @@
# define JACK_SYM extern
#endif
/* All loadable Jack sumbols, prototypes from original jack.h */
/* All loadable JACK sumbols, prototypes from original jack.h */
JACK_SYM jack_transport_state_t (*AUD_jack_transport_query) (
const jack_client_t *client,