blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

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

This commit is contained in:
Joerg Mueller 2016-10-22 14:20:47 +02:00
parent d5ee031f76
commit 132478d4b8
Notes: blender-bot 2023-02-14 07:30:24 +01:00 
Referenced by issue #49657, Audio backend "Jack" should be named "JACK"
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -343,9 +343,9 @@ option(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.or
# Sound output
option(WITH_SDL "Enable SDL for sound and joystick support" ${_init_SDL})
option(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON)
option(WITH_JACK "Enable Jack Support (http://www.jackaudio.org)" ${_init_JACK})
option(WITH_JACK "Enable JACK Support (http://www.jackaudio.org)" ${_init_JACK})
if(UNIX AND NOT APPLE)
option(WITH_JACK_DYNLOAD "Enable runtime dynamic Jack libraries loading" OFF)
option(WITH_JACK_DYNLOAD "Enable runtime dynamic JACK libraries loading" OFF)
endif()
if(UNIX AND NOT APPLE)
option(WITH_SDL_DYNLOAD "Enable runtime dynamic SDL libraries loading" OFF)

14
build_files/cmake/Modules/FindJack.cmake
View File

@ -1,15 +1,15 @@
# - Find Jack library
# Find the native Jack includes and library
# - Find JACK library
# Find the native JACK includes and library
# This module defines
# JACK_INCLUDE_DIRS, where to find jack.h, Set when
# JACK_INCLUDE_DIR is found.
# JACK_LIBRARIES, libraries to link against to use Jack.
# JACK_ROOT_DIR, The base directory to search for Jack.
# JACK_LIBRARIES, libraries to link against to use JACK.
# JACK_ROOT_DIR, The base directory to search for JACK.
# This can also be an environment variable.
# JACK_FOUND, If false, do not try to use Jack.
# JACK_FOUND, If false, do not try to use JACK.
#
# also defined, but not for general use are
# JACK_LIBRARY, where to find the Jack library.
# JACK_LIBRARY, where to find the JACK library.
#=============================================================================
# Copyright 2011 Blender Foundation.
@ -56,7 +56,7 @@ FIND_LIBRARY(JACK_LIBRARY
# handle the QUIETLY and REQUIRED arguments and set JACK_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Jack DEFAULT_MSG
FIND_PACKAGE_HANDLE_STANDARD_ARGS(JACK DEFAULT_MSG
JACK_LIBRARY JACK_INCLUDE_DIR)
IF(JACK_FOUND)

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,