Fix T49657: Audio backend "Jack" should be named "JACK".
authorJörg Müller <nexyon@gmail.com>
Sat, 22 Oct 2016 12:20:47 +0000 (14:20 +0200)
committerJörg Müller <nexyon@gmail.com>
Sat, 22 Oct 2016 12:20:47 +0000 (14:20 +0200)
CMakeLists.txt
build_files/cmake/Modules/FindJack.cmake
intern/audaspace/intern/AUD_C-API.cpp
intern/audaspace/intern/AUD_C-API.h
intern/audaspace/jack/AUD_JackDevice.h
intern/audaspace/jack/AUD_JackLibrary.h

index c7addc81b0c46e416b79e75480919dce9ef50829..f3c22d9b717012f33aa82d4c2c5ff2e154f68bed 100644 (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)
index 9a847fabf7065814a4bf0d29b2a52f562f2a9f5c..59aa7fcf60b9a4ae64efd05cdf715fe8b87db643 100644 (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)
index b326c9f42816166e8260ba414a7e5ac1d0483122..52cf256147fda5b7f5ca9876f99881a066f76670 100644 (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 {
index bdbe751b140c176743c93b9ed0eea31d5d7ee45d..cc9059a8e092e9a4d4e9b4843fdf805674b4351d 100644 (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);
 
index a82a6bc5c3877a5eb42785fdc3f72d4e9abd6d23..ccf3bfd63417a5990137781583ae9281d7bd286f 100644 (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();
 
index 2a737a1a4e2b4c52fdbb00f653284daf2cf72a7b..d74d9ba80218f659469db81e044940972c04330e 100644 (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,