Merge pull request #144 from zonkmachine/modalbarcontrol

Fix mixed up control messages

CMakeLists.txt

@@ -46,13 +46,54 @@ file(GLOB STK_SRC "./src/*.cpp") # GLOB instead of GLOB_RECURSE as the asio depe
 #========================================#
 if(REALTIME)
     if(ENABLE_JACK)
-        find_library(JACK_LIBRARY jack) # find_package(JACK) # TODO: NEED FindJACK.cmake
-        if(JACK_LIBRARY)
-            message("Jack API found: ${JACK_LIBRARY}")
-            link_libraries(${JACK_LIBRARY})
+        # Try to find PkgConfig
+        find_package(PkgConfig QUIET)
+
+        if(PkgConfig_FOUND)
+            # PkgConfig is available, use it
+            pkg_check_modules(JACK QUIET jack)
+        endif()
+
+        if(NOT JACK_FOUND)
+            # PkgConfig was not found or Jack was not found through it, try a fallback
+            message(STATUS "PkgConfig not found or failed to find Jack, attempting fallback")
+
+            # Fallback: Search in common locations
+            find_path(JACK_INCLUDE_DIR
+                NAMES jack/jack.h
+                HINTS
+                    ENV JACK_ROOT
+                    "$ENV{ProgramFiles}/Jack"
+                    /usr/local/include
+                    /usr/include
+            )
+
+            find_library(JACK_LIBRARY
+                NAMES jack
+                HINTS
+                    ENV JACK_ROOT
+                    "$ENV{ProgramFiles}/Jack"
+                    /usr/local/lib
+                    /usr/lib
+            )
+
+            # Check if the fallback was successful
+            if(JACK_INCLUDE_DIR AND JACK_LIBRARY)
+                set(JACK_FOUND TRUE)
+                set(JACK_INCLUDE_DIRS ${JACK_INCLUDE_DIR})
+                set(JACK_LIBRARIES ${JACK_LIBRARY})
+                message(STATUS "Found Jack (fallback):")
+                message(STATUS "  Includes: ${JACK_INCLUDE_DIRS}")
+                message(STATUS "  Libraries: ${JACK_LIBRARIES}")
+            else()
+                message(WARNING "Failed to find Jack library even with fallback. Please install Jack development package or ensure it is in a standard location.")
+            endif()
+        endif()
+
+        if(JACK_FOUND)
+            include_directories(${JACK_INCLUDE_DIRS})
+            link_libraries(${JACK_LIBRARIES})
             add_definitions(-D__UNIX_JACK__)
-        else()
-            message(WARNING "JACK support requires the jack library!")
         endif()
     endif()
 

configure.ac

@@ -20,12 +20,6 @@ if [[ $AR = "no" ]] ; then
 fi
 
 # Checks for header files.
-m4_warn([obsolete],
-[The preprocessor macro `STDC_HEADERS' is obsolete.
-  Except in unusual embedded environments, you can safely include all
-  ISO C90 headers unconditionally.])dnl
-# Autoupdate added the next two lines to ensure that your configure
-# script's behavior did not change.  They are probably safe to remove.
 AC_CHECK_INCLUDES_DEFAULT
 AC_PROG_EGREP
 
@@ -34,19 +28,6 @@ AC_CHECK_HEADERS(fcntl.h sys/ioctl.h sys/time.h termio.h unistd.h)
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_SIZE_T
-m4_warn([obsolete],
-[Update your code to rely only on HAVE_SYS_TIME_H,
-then remove this warning and the obsolete code below it.
-All current systems provide time.h; it need not be checked for.
-Not all systems provide sys/time.h, but those that do, all allow
-you to include it and time.h simultaneously.])dnl
-AC_CHECK_HEADERS_ONCE([sys/time.h])
-# Obsolete code to be removed.
-if test $ac_cv_header_sys_time_h = yes; then
-  AC_DEFINE([TIME_WITH_SYS_TIME],[1],[Define to 1 if you can safely include both <sys/time.h>
-	     and <time.h>.  This macro is obsolete.])
-fi
-# End of obsolete code.
 
 AC_C_BIGENDIAN
 AC_EGREP_CPP(yes,

src/ModalBar.cpp

@@ -9,9 +9,9 @@
     Control Change Numbers: 
        - Stick Hardness = 2
        - Stick Position = 4
-       - Vibrato Gain = 8
+       - Vibrato Gain = 1
        - Vibrato Frequency = 11
-       - Direct Stick Mix = 1
+       - Direct Stick Mix = 8
        - Volume = 128
        - Modal Presets = 16
          - Marimba = 0
@@ -173,9 +173,9 @@ void ModalBar :: controlChange( int number, StkFloat value )
   else if (number == __SK_ProphesyRibbon_) // 16
 		this->setPreset((int) value);
   else if (number == __SK_Balance_) // 8
-    vibratoGain_ = normalizedValue * 0.3;
-  else if (number == __SK_ModWheel_) // 1
     directGain_ = normalizedValue;
+  else if (number == __SK_ModWheel_) // 1
+    vibratoGain_ = normalizedValue * 0.3;
   else if (number == __SK_ModFrequency_) // 11
     vibrato_.setFrequency( normalizedValue * 12.0 );
   else if (number == __SK_AfterTouch_Cont_)	// 128