Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Müller <nexyon@gmail.com>2016-10-22 15:20:47 +0300
committerJörg Müller <nexyon@gmail.com>2016-10-22 15:20:47 +0300
commit132478d4b8bb5dc1554f7ca01ac337fe1978e5fc (patch)
treed82edc65620c2e45e0b1edcc4324ea6e25ca2137 /intern/audaspace
parentd5ee031f76137339e3af0fdadb706fbb8db4c961 (diff)
Fix T49657: Audio backend "Jack" should be named "JACK".
Diffstat (limited to 'intern/audaspace')
-rw-r--r--intern/audaspace/intern/AUD_C-API.cpp6
-rw-r--r--intern/audaspace/intern/AUD_C-API.h2
-rw-r--r--intern/audaspace/jack/AUD_JackDevice.h8
-rw-r--r--intern/audaspace/jack/AUD_JackLibrary.h2
4 files changed, 9 insertions, 9 deletions
diff --git a/intern/audaspace/intern/AUD_C-API.cpp b/intern/audaspace/intern/AUD_C-API.cpp
index b326c9f4281..52cf256147f 100644
--- a/intern/audaspace/intern/AUD_C-API.cpp
+++ b/intern/audaspace/intern/AUD_C-API.cpp
@@ -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 {
diff --git a/intern/audaspace/intern/AUD_C-API.h b/intern/audaspace/intern/AUD_C-API.h
index bdbe751b140..cc9059a8e09 100644
--- a/intern/audaspace/intern/AUD_C-API.h
+++ b/intern/audaspace/intern/AUD_C-API.h
@@ -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);
diff --git a/intern/audaspace/jack/AUD_JackDevice.h b/intern/audaspace/jack/AUD_JackDevice.h
index a82a6bc5c38..ccf3bfd6341 100644
--- a/intern/audaspace/jack/AUD_JackDevice.h
+++ b/intern/audaspace/jack/AUD_JackDevice.h
@@ -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();
diff --git a/intern/audaspace/jack/AUD_JackLibrary.h b/intern/audaspace/jack/AUD_JackLibrary.h
index 2a737a1a4e2..d74d9ba8021 100644
--- a/intern/audaspace/jack/AUD_JackLibrary.h
+++ b/intern/audaspace/jack/AUD_JackLibrary.h
@@ -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,