git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1603 0c269be4-1314-0410-8aa9-9f06e86f4224tags/0.68
@@ -19,7 +19,7 @@ | |||||
#define PRINTDEBUG | #define PRINTDEBUG | ||||
#define VERSION "0.67" | |||||
#define VERSION "0.68" | |||||
#define FORK_SERVER 1 | #define FORK_SERVER 1 | ||||
@@ -16,11 +16,11 @@ You should have received a copy of the GNU General Public License | |||||
along with this program; if not, write to the Free Software | along with this program; if not, write to the Free Software | ||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||||
*/ | |||||
#ifdef WIN32 | |||||
#pragma warning (disable : 4786) | |||||
#endif | |||||
*/ | |||||
#ifdef WIN32 | |||||
#pragma warning (disable : 4786) | |||||
#endif | |||||
#include "JackDriverLoader.h" | #include "JackDriverLoader.h" | ||||
#include "JackError.h" | #include "JackError.h" | ||||
@@ -263,7 +263,7 @@ jack_drivers_get_descriptor (JSList * drivers, const char * sofile) | |||||
} | } | ||||
*/ | */ | ||||
#ifdef WIN32 | |||||
#ifdef WIN32 | |||||
char* driver_dir = ADDON_DIR; | char* driver_dir = ADDON_DIR; | ||||
if (strcmp(ADDON_DIR, "") == 0) { | if (strcmp(ADDON_DIR, "") == 0) { | ||||
char temp_driver_dir1[512]; | char temp_driver_dir1[512]; | ||||
@@ -271,9 +271,9 @@ jack_drivers_get_descriptor (JSList * drivers, const char * sofile) | |||||
GetCurrentDirectory(512, temp_driver_dir1); | GetCurrentDirectory(512, temp_driver_dir1); | ||||
sprintf(temp_driver_dir2, "%s/%s", temp_driver_dir1, ADDON_DIR); | sprintf(temp_driver_dir2, "%s/%s", temp_driver_dir1, ADDON_DIR); | ||||
driver_dir = temp_driver_dir2; | driver_dir = temp_driver_dir2; | ||||
} | |||||
#else | |||||
char driver_dir[512]; | |||||
} | |||||
#else | |||||
char driver_dir[512]; | |||||
snprintf(driver_dir, sizeof(driver_dir) - 1, "%s/lib/jackmp", ADDON_DIR); | snprintf(driver_dir, sizeof(driver_dir) - 1, "%s/lib/jackmp", ADDON_DIR); | ||||
#endif | #endif | ||||
@@ -125,7 +125,7 @@ JackLoadableInternalClient::JackLoadableInternalClient(JackServer* server, JackS | |||||
snprintf(fObjectData, JACK_LOAD_INIT_LIMIT, object_data); | snprintf(fObjectData, JACK_LOAD_INIT_LIMIT, object_data); | ||||
fHandle = LoadJackModule(path_to_so); | fHandle = LoadJackModule(path_to_so); | ||||
printf("path_to_so %s\n", path_to_so); | |||||
JackLog("JackLoadableInternalClient::JackLoadableInternalClient path_to_so = %s\n", path_to_so); | |||||
if (fHandle == 0) { | if (fHandle == 0) { | ||||
jack_error("error loading %s", so_name); | jack_error("error loading %s", so_name); | ||||
@@ -23,7 +23,7 @@ PROJECT_NAME = "Jackdmp" | |||||
# This could be handy for archiving the generated documentation or | # This could be handy for archiving the generated documentation or | ||||
# if some version control system is used. | # if some version control system is used. | ||||
PROJECT_NUMBER = 0.67 | |||||
PROJECT_NUMBER = 0.68 | |||||
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) | # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) | ||||
# base path where the generated documentation will be put. | # base path where the generated documentation will be put. | ||||
@@ -7,7 +7,7 @@ | |||||
<key>CFBundleExecutable</key> | <key>CFBundleExecutable</key> | ||||
<string>Jackmp</string> | <string>Jackmp</string> | ||||
<key>CFBundleGetInfoString</key> | <key>CFBundleGetInfoString</key> | ||||
<string>Jackdmp 0.67, @03-07 Paul Davis, Grame</string> | |||||
<string>Jackdmp 0.68, @03-07 Paul Davis, Grame</string> | |||||
<key>CFBundleIdentifier</key> | <key>CFBundleIdentifier</key> | ||||
<string>com.grame.Jackmp</string> | <string>com.grame.Jackmp</string> | ||||
<key>CFBundleInfoDictionaryVersion</key> | <key>CFBundleInfoDictionaryVersion</key> | ||||
@@ -28,8 +28,8 @@ LANGUAGE LANG_FRENCH, SUBLANG_FRENCH | |||||
// | // | ||||
VS_VERSION_INFO VERSIONINFO | VS_VERSION_INFO VERSIONINFO | ||||
FILEVERSION 0,6,7,0 | |||||
PRODUCTVERSION 0,6,7,0 | |||||
FILEVERSION 0,6,8,0 | |||||
PRODUCTVERSION 0,6,8,0 | |||||
FILEFLAGSMASK 0x3fL | FILEFLAGSMASK 0x3fL | ||||
#ifdef _DEBUG | #ifdef _DEBUG | ||||
FILEFLAGS 0x1L | FILEFLAGS 0x1L | ||||
@@ -47,14 +47,14 @@ BEGIN | |||||
VALUE "Comments", "\0" | VALUE "Comments", "\0" | ||||
VALUE "CompanyName", "Grame\0" | VALUE "CompanyName", "Grame\0" | ||||
VALUE "FileDescription", "Jackmp library for Windows\0" | VALUE "FileDescription", "Jackmp library for Windows\0" | ||||
VALUE "FileVersion", "0, 6, 7, 0\0" | |||||
VALUE "FileVersion", "0, 6, 8, 0\0" | |||||
VALUE "InternalName", "libjackmp\0" | VALUE "InternalName", "libjackmp\0" | ||||
VALUE "LegalCopyright", "Copyright Grame © 2006-2007\0" | VALUE "LegalCopyright", "Copyright Grame © 2006-2007\0" | ||||
VALUE "LegalTrademarks", "\0" | VALUE "LegalTrademarks", "\0" | ||||
VALUE "OriginalFilename", "libjackmp.dll\0" | VALUE "OriginalFilename", "libjackmp.dll\0" | ||||
VALUE "PrivateBuild", "\0" | VALUE "PrivateBuild", "\0" | ||||
VALUE "ProductName", "libjackmp\0" | VALUE "ProductName", "libjackmp\0" | ||||
VALUE "ProductVersion", "0, 6, 7, 0\0" | |||||
VALUE "ProductVersion", "0, 6, 8, 0\0" | |||||
VALUE "SpecialBuild", "\0" | VALUE "SpecialBuild", "\0" | ||||
END | END | ||||
END | END | ||||