diff -Nru csound-6.01~dfsg/CMakeLists.txt csound-6.02~dfsg/CMakeLists.txt --- csound-6.01~dfsg/CMakeLists.txt 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/CMakeLists.txt 2014-01-07 16:54:20.000000000 +0000 @@ -44,7 +44,6 @@ include(CheckCCompilerFlag) include(CheckCXXCompilerFlag) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") # Utility function to make executables. All plugin targets should use this as it @@ -56,14 +55,14 @@ # libs - list of library files to link to # output_name (OPTIONAL) - overide the name of the generated executable # -function(make_executable name srcs libs) +function(make_executable name srcs libs) add_executable(${name} ${srcs}) target_link_libraries (${name} ${libs}) set_target_properties(${name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BUILD_BIN_DIR}) - if(${ARGC} EQUAL 4) - set_target_properties(${name} PROPERTIES + if(${ARGC} EQUAL 4) + set_target_properties(${name} PROPERTIES OUTPUT_NAME ${ARGV3}) endif() install(TARGETS ${name} @@ -78,7 +77,7 @@ function(make_utility name srcs) make_executable(${name} "${srcs}" "${CSOUNDLIB}") - add_dependencies(${name} ${CSOUNDLIB}) + add_dependencies(${name} ${CSOUNDLIB}) endfunction() @@ -196,43 +195,42 @@ if(WIN32) set(CMAKE_SHARED_LIBRARY_PREFIX "") set(CMAKE_SHARED_MODULE_PREFIX "") - - set(CSOUND_WINDOWS_LIBRARIES - advapi32 - comctl32 - comdlg32 - glu32 - kernel32 + + set(CSOUND_WINDOWS_LIBRARIES + advapi32 + comctl32 + comdlg32 + glu32 + kernel32 msvcrt - odbc32 - odbccp32 - ole32 - oleaut32 - shell32 - user32 - uuid - winmm - winspool - ws2_32 - wsock32 - advapi32 - comctl32 - comdlg32 - glu32 - kernel32 - odbc32 - odbccp32 - ole32 - oleaut32 - shell32 - user32 - uuid - winmm - winspool - ws2_32 + odbc32 + odbccp32 + ole32 + oleaut32 + shell32 + user32 + uuid + winmm + winspool + ws2_32 wsock32 - pthread) - + advapi32 + comctl32 + comdlg32 + glu32 + kernel32 + odbc32 + odbccp32 + ole32 + oleaut32 + shell32 + user32 + uuid + winmm + winspool + ws2_32 + wsock32) + endif(WIN32) if(CMAKE_SYSTEM_NAME MATCHES "Linux") @@ -260,6 +258,7 @@ option(USE_OPEN_MP "Use OpenMP for Parallel Performance" ON) option(USE_LRINT "Use lrint/lrintf for converting floating point values to integers." ON) +option(USE_CURL "Use CURL library" ON) option(BUILD_RELEASE "Build for release" ON) option(BUILD_INSTALLER "Build for release" OFF) option(BUILD_TESTS "Build for release" ON) @@ -269,7 +268,7 @@ set(BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}) # This needs to be here since _everybody_ needs this flag -if(USE_DOUBLE) +if(USE_DOUBLE) add_definitions("-DUSE_DOUBLE") endif(USE_DOUBLE) check_c_compiler_flag(-fvisibility=hidden HAS_VISIBILITY_HIDDEN) @@ -285,17 +284,17 @@ if(BUILD_INSTALLER) set(CS_FRAMEWORK_DEST "${CMAKE_INSTALL_PREFIX}") endif() - + set(DEFAULT_OSX_SYSROOT /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/) - if(NOT CMAKE_OSX_SYSROOT AND EXISTS ${DEFAULT_OSX_SYSROOT}) - set(CMAKE_OSX_SYSROOT ${DEFAULT_OSX_SYSROOT}) + if(NOT CMAKE_OSX_SYSROOT AND EXISTS ${DEFAULT_OSX_SYSROOT}) + set(CMAKE_OSX_SYSROOT ${DEFAULT_OSX_SYSROOT}) endif() - if(EXISTS ${CMAKE_OSX_SYSROOT}) + if(EXISTS ${CMAKE_OSX_SYSROOT}) set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6) endif() - + endif() if(USE_DOUBLE) @@ -314,7 +313,7 @@ endif() endif() -if(APPLE) +if(APPLE) if(BUILD_INSTALLER) set(CS_FRAMEWORK_FULL_PATH "/Library/Frameworks/${CSOUNDLIB}.framework/Versions/${APIVERSION}/Resources/Opcodes64") else() @@ -337,7 +336,7 @@ add_definitions("-DBETA") endif() -if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) +if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) add_definitions("-Wno-format") # add_compiler_flags("-g") endif() @@ -353,7 +352,7 @@ set(BUILD_BIN_DIR ${BUILD_DIR}) set(BUILD_LIB_DIR ${BUILD_DIR}) -#if(APPLE AND NOT ${CMAKE_GENERATOR} STREQUAL "Xcode") +#if(APPLE AND NOT ${CMAKE_GENERATOR} STREQUAL "Xcode") # set(BUILD_PLUGINS_DIR ${BUILD_DIR}/${CSOUNDLIB}.framework/Versions/${APIVERSION}/Resources/Opcodes) #endif() @@ -387,12 +386,12 @@ if(SNDFILE_H_PATH) include_directories(${SNDFILE_H_PATH}) else() - message(FATAL_ERROR "Could not find sndfile.h") + message(FATAL_ERROR "Could not find sndfile.h") endif() find_library(PTHREAD_LIBRARY pthread) -if(NOT PTHREAD_LIBRARY AND WIN32) +if(NOT PTHREAD_LIBRARY AND WIN32) find_library(PTHREAD_LIBRARY pthreadGC2) endif() @@ -408,7 +407,7 @@ option(USE_ATOMIC_BUILTIN "Use Atomic Builtins if supported" ON) if(USE_ATOMIC_BUILTIN) include(cmake/CheckAtomic.cmake) - if(HAVE_ATOMIC_BUILTIN) + if(HAVE_ATOMIC_BUILTIN) message(STATUS "Using Atomic Builtins") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHAVE_ATOMIC_BUILTIN") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_ATOMIC_BUILTIN") @@ -445,6 +444,19 @@ add_definitions("-DUSE_LRINT") endif() +## Check existence of CURL +if(USE_CURL) + find_package(CURL) + + if(CURL_FOUND) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHAVE_CURL") + else() + message(STATUS "Not using CURL for urls - not found") + endif() +else() + message(STATUS "Not using CURL for urls - disabled") +endif() + # Flex/Bison for the new parser find_package(FLEX) find_package(BISON) @@ -457,6 +469,34 @@ message(FATAL_ERROR "Csound requires the bison executable") endif() +find_program(FLTK_CONFIG_SCRIPT fltk-config) +if(FLTK_CONFIG_SCRIPT) + execute_process(COMMAND ${FLTK_CONFIG_SCRIPT} --api-version + OUTPUT_VARIABLE FLTK_VERSION) + if(FLTK_VERSION) + string(STRIP ${FLTK_VERSION} FLTK_VERSION) + if(FLTK_VERSION GREATER 1.1) + set(HAVE_FLTK "Fltk") + set(FLTK_FOUND 1) + message("FLTK FOUND: ${FLTK_FOUND}") + message(STATUS "Using fltk-config script for FLTK " ${FLTK_VERSION}) + execute_process(COMMAND ${FLTK_CONFIG_SCRIPT} --includedir + OUTPUT_VARIABLE FLTK_INCLUDE_DIR) + string(STRIP ${FLTK_INCLUDE_DIR} FLTK_INCLUDE_DIR) + execute_process(COMMAND ${FLTK_CONFIG_SCRIPT} --ldflags --use-images + OUTPUT_VARIABLE FLTK_LIBRARIES) + string(STRIP ${FLTK_LIBRARIES} FLTK_LIBRARIES) + string(REGEX MATCH "fltk[_ ]jpeg" FLTK_JPEG ${FLTK_LIBRARIES}) + string(REGEX MATCH "fltk[_ ]z" FLTK_Z ${FLTK_LIBRARIES}) + string(REGEX MATCH "fltk[_ ]png" FLTK_PNG ${FLTK_LIBRARIES}) + endif(FLTK_VERSION GREATER 1.1) + endif(FLTK_VERSION) +endif(FLTK_CONFIG_SCRIPT) +if(NOT HAVE_FLTK) + set(FLTK_SKIP_OPENGL true) + find_package(FLTK) +endif() + ## MAIN TARGETS ## set(libcsound_CFLAGS -D__BUILDING_LIBCSOUND) @@ -464,7 +504,7 @@ include_directories(./H) include_directories(./include) include_directories(./Engine) - + #adding this for files that #include SDIF/sdif* include_directories(./) @@ -481,7 +521,7 @@ endif() -check_deps(USE_OPEN_MP OPENMP_FOUND PTHREAD_BARRIER_INIT_EXISTS) +check_deps(USE_OPEN_MP OPENMP_FOUND PTHREAD_BARRIER_INIT_EXISTS) if(USE_OPEN_MP) list(APPEND libcsound_CFLAGS -DUSE_OPENMP) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") @@ -572,44 +612,44 @@ Opcodes/compress.c Opcodes/eqfil.c Opcodes/Vosim.c - Opcodes/pitch.c - Opcodes/pitch0.c - Opcodes/spectra.c + Opcodes/pitch.c + Opcodes/pitch0.c + Opcodes/spectra.c Opcodes/ambicode1.c - Opcodes/sfont.c - Opcodes/grain4.c - Opcodes/hrtferX.c + Opcodes/sfont.c + Opcodes/grain4.c + Opcodes/hrtferX.c Opcodes/loscilx.c - Opcodes/minmax.c - Opcodes/pan2.c + Opcodes/minmax.c + Opcodes/pan2.c Opcodes/arrays.c Opcodes/phisem.c - Opcodes/hrtfopcodes.c - Opcodes/stackops.c - Opcodes/vbap.c - Opcodes/vbap1.c - Opcodes/vbap_n.c - Opcodes/vbap_zak.c - Opcodes/vaops.c - Opcodes/ugakbari.c - Opcodes/harmon.c - Opcodes/pitchtrack.c - Opcodes/partikkel.c - Opcodes/shape.c + Opcodes/hrtfopcodes.c + Opcodes/stackops.c + Opcodes/vbap.c + Opcodes/vbap1.c + Opcodes/vbap_n.c + Opcodes/vbap_zak.c + Opcodes/vaops.c + Opcodes/ugakbari.c + Opcodes/harmon.c + Opcodes/pitchtrack.c + Opcodes/partikkel.c + Opcodes/shape.c Opcodes/tabsum.c - Opcodes/crossfm.c - Opcodes/pvlock.c - Opcodes/fareyseq.c - Opcodes/modmatrix.c - Opcodes/scoreline.c + Opcodes/crossfm.c + Opcodes/pvlock.c + Opcodes/fareyseq.c + Opcodes/modmatrix.c + Opcodes/scoreline.c Opcodes/modal4.c - Opcodes/physutil.c - Opcodes/physmod.c - Opcodes/mandolin.c + Opcodes/physutil.c + Opcodes/physmod.c + Opcodes/mandolin.c Opcodes/singwave.c - Opcodes/fm4op.c - Opcodes/moog1.c - Opcodes/shaker.c + Opcodes/fm4op.c + Opcodes/moog1.c + Opcodes/shaker.c Opcodes/bowedbar.c Opcodes/gab/tabmorph.c Opcodes/gab/hvs.c @@ -621,6 +661,7 @@ Opcodes/cpumeter.c Opcodes/gendy.c Opcodes/tl/sc_noise.c + Opcodes/afilters.c Top/argdecode.c Top/cscore_internal.c Top/cscorfns.c @@ -633,76 +674,77 @@ Top/opcode.c Top/threads.c Top/utility.c - Top/threadsafe.c) + Top/threadsafe.c + Top/server.c) -set(stdopcod_SRCS - Opcodes/ambicode.c - Opcodes/bbcut.c +set(stdopcod_SRCS + Opcodes/ambicode.c + Opcodes/bbcut.c Opcodes/biquad.c - Opcodes/butter.c - Opcodes/clfilt.c + Opcodes/butter.c + Opcodes/clfilt.c Opcodes/cross2.c - Opcodes/dam.c - Opcodes/dcblockr.c + Opcodes/dam.c + Opcodes/dcblockr.c Opcodes/filter.c - Opcodes/flanger.c - Opcodes/follow.c + Opcodes/flanger.c + Opcodes/follow.c Opcodes/fout.c - Opcodes/freeverb.c - Opcodes/ftconv.c + Opcodes/freeverb.c + Opcodes/ftconv.c Opcodes/ftgen.c - Opcodes/gab/gab.c - Opcodes/gab/vectorial.c + Opcodes/gab/gab.c + Opcodes/gab/vectorial.c Opcodes/grain.c - Opcodes/locsig.c - Opcodes/lowpassr.c + Opcodes/locsig.c + Opcodes/lowpassr.c Opcodes/metro.c - Opcodes/midiops2.c - Opcodes/midiops3.c + Opcodes/midiops2.c + Opcodes/midiops3.c Opcodes/newfils.c - Opcodes/nlfilt.c - Opcodes/oscbnk.c + Opcodes/nlfilt.c + Opcodes/oscbnk.c Opcodes/pluck.c - Opcodes/repluck.c - Opcodes/reverbsc.c + Opcodes/repluck.c + Opcodes/reverbsc.c Opcodes/seqtime.c - Opcodes/sndloop.c - Opcodes/sndwarp.c + Opcodes/sndloop.c + Opcodes/sndwarp.c Opcodes/space.c - Opcodes/spat3d.c - Opcodes/syncgrain.c + Opcodes/spat3d.c + Opcodes/syncgrain.c Opcodes/ugens7.c - Opcodes/ugens9.c - Opcodes/ugensa.c + Opcodes/ugens9.c + Opcodes/ugensa.c Opcodes/uggab.c - Opcodes/ugmoss.c - Opcodes/ugnorman.c + Opcodes/ugmoss.c + Opcodes/ugnorman.c Opcodes/ugsc.c - Opcodes/wave-terrain.c + Opcodes/wave-terrain.c Opcodes/stdopcod.c Opcodes/socksend.c Opcodes/sockrecv.c) set(cs_pvs_ops_SRCS - Opcodes/ifd.c - Opcodes/partials.c - Opcodes/psynth.c + Opcodes/ifd.c + Opcodes/partials.c + Opcodes/psynth.c Opcodes/pvsbasic.c - Opcodes/pvscent.c - Opcodes/pvsdemix.c - Opcodes/pvs_ops.c + Opcodes/pvscent.c + Opcodes/pvsdemix.c + Opcodes/pvs_ops.c Opcodes/pvsband.c Opcodes/pvsbuffer.c Opcodes/pvsgendy.c) set(oldpvoc_SRCS - Opcodes/dsputil.c - Opcodes/pvadd.c - Opcodes/pvinterp.c + Opcodes/dsputil.c + Opcodes/pvadd.c + Opcodes/pvinterp.c Opcodes/pvocext.c - Opcodes/pvread.c - Opcodes/ugens8.c - Opcodes/vpvoc.c + Opcodes/pvread.c + Opcodes/ugens8.c + Opcodes/vpvoc.c Opcodes/pvoc.c) set(mp3in_SRCS @@ -733,25 +775,25 @@ add_custom_command( SOURCE ${LEX_SRC} - COMMAND ${FLEX_EXECUTABLE} ARGS -B -t ${LEX_SRC} > ${LEX_OUT} + COMMAND ${FLEX_EXECUTABLE} ARGS -B -t ${LEX_SRC} > ${LEX_OUT} TARGET NewParser OUTPUTS ${LEX_OUT}) add_custom_command( SOURCE ${PRELEX_SRC} - COMMAND ${FLEX_EXECUTABLE} ARGS -B ${PRELEX_SRC} > ${PRELEX_OUT} + COMMAND ${FLEX_EXECUTABLE} ARGS -B ${PRELEX_SRC} > ${PRELEX_OUT} TARGET NewParser OUTPUTS ${PRELEX_OUT}) add_custom_command( SOURCE ${YACC_SRC} COMMAND ${BISON_EXECUTABLE} - ARGS -pcsound_orc -d --report=itemset -o ${YACC_OUT} ${YACC_SRC} + ARGS -pcsound_orc -d --report=itemset -o ${YACC_OUT} ${YACC_SRC} TARGET NewParser DEPENDS ${LEX_OUT} OUTPUTS ${YACC_OUT}) -list(APPEND libcsound_SRCS +list(APPEND libcsound_SRCS ${LEX_OUT} ${YACC_OUT} ${PRELEX_OUT} Engine/csound_orc_semantics.c Engine/csound_orc_expressions.c @@ -780,25 +822,25 @@ add_custom_command( SOURCE ${LEX_SCOSRC} - COMMAND ${FLEX_EXECUTABLE} ARGS -B -t ${LEX_SCOSRC} > ${LEX_SCOOUT} + COMMAND ${FLEX_EXECUTABLE} ARGS -B -t ${LEX_SCOSRC} > ${LEX_SCOOUT} TARGET NewScoParser OUTPUTS ${LEX_SCOOUT}) add_custom_command( SOURCE ${PRELEX_SCOSRC} - COMMAND ${FLEX_EXECUTABLE} ARGS -B ${PRELEX_SCOSRC} > ${PRELEX_SCOOUT} + COMMAND ${FLEX_EXECUTABLE} ARGS -B ${PRELEX_SCOSRC} > ${PRELEX_SCOOUT} TARGET NewScoParser OUTPUTS ${PRELEXSCO_OUT}) add_custom_command( SOURCE ${YACC_SCOSRC} COMMAND ${BISON_EXECUTABLE} - ARGS -pcsound_sco -d --report=itemset -o ${YACC_SCOOUT} ${YACC_SCOSRC} + ARGS -pcsound_sco -d --report=itemset -o ${YACC_SCOOUT} ${YACC_SCOSRC} TARGET NewScoParser DEPENDS ${LEX_SCOOUT} OUTPUTS ${YACC_SCOOUT}) - list(APPEND libcsound_SRCS + list(APPEND libcsound_SRCS ${LEX_SCOOUT} ${YACC_SCOOUT} ${PRELEXSCO_OUT}) set_source_files_properties(${YACC_SCOOUT} GENERATED) @@ -809,7 +851,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) - + if(NEW_PARSER_DEBUG) message(STATUS "Building with new parser debugging") list(APPEND libcsound_CFLAGS -DPARSER_DEBUG=1) @@ -819,15 +861,15 @@ if(BUILD_MULTI_CORE) message(STATUS "Building with multicore") - + list(APPEND libcsound_SRCS Engine/cs_new_dispatch.c Engine/cs_par_base.c Engine/cs_par_orc_semantic_analysis.c Engine/cs_par_dispatch.c) - + list(APPEND libcsound_CFLAGS -DPARCS) - + else() message(STATUS "Not building with multicore") endif() @@ -870,10 +912,10 @@ #if(NOT EXISTS ${CSOUNDLIB_DIR}/Resources/libs/${depname}) # add_custom_command( -# TARGET ${CSOUNDLIB} +# TARGET ${CSOUNDLIB} # POST_BUILD # COMMAND mkdir -# ARGS -p ${CSOUNDLIB_DIR}/Resources/libs +# ARGS -p ${CSOUNDLIB_DIR}/Resources/libs # COMMAND cp # ARGS ${source} ${CSOUNDLIB_DIR}/Resources/libs/${depname} # COMMAND ${CMAKE_INSTALL_NAME_TOOL} @@ -882,7 +924,7 @@ #endif() #add_custom_command( -# TARGET ${CSOUNDLIB} +# TARGET ${CSOUNDLIB} # POST_BUILD # COMMAND ${CMAKE_INSTALL_NAME_TOOL} # ARGS -change ${source} @loader_path/Resources/libs/${depname} ${CSOUNDLIB_DIR}/${CSOUNDLIB} @@ -896,7 +938,7 @@ # libname - name of library to produce # srcs - list of src files (must be quoted if a list) # extralibs (OPTIONAL) - extra libraries to link the plugin to -# +# # NB - this was moved here as it needs some VARS defined above # for setting up the framework function(make_plugin libname srcs) @@ -913,7 +955,7 @@ endif() math(EXPR i "${i}+1") endwhile() - + set_target_properties(${libname} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BUILD_PLUGINS_DIR} LIBRARY_OUTPUT_DIRECTORY ${BUILD_PLUGINS_DIR} @@ -938,8 +980,8 @@ #if(NOT EXISTS ${RESOURCE_DIR}/libs/${depname}) #add_custom_command( - #TARGET ${pluginlib} - #COMMAND mkdir + #TARGET ${pluginlib} + #COMMAND mkdir #ARGS -p ${RESOURCE_DIR}/libs #COMMAND cp #ARGS -f ${source} ${RESOURCE_DIR}/libs/${depname} @@ -948,7 +990,7 @@ #) #endif() #add_custom_command( - #TARGET ${pluginlib} + #TARGET ${pluginlib} #POST_BUILD #COMMAND ${CMAKE_INSTALL_NAME_TOOL} #ARGS -change ${source} @loader_path/../libs/${depname} ${BUILD_PLUGINS_DIR}/lib${pluginlib}.dylib @@ -962,14 +1004,18 @@ ARCHIVE DESTINATION "${LIBRARY_INSTALL_DIR}" FRAMEWORK DESTINATION "${CS_FRAMEWORK_DEST}") -set(libcsound_LIBS - ${LIBSNDFILE_LIBRARY} +set(libcsound_LIBS + ${LIBSNDFILE_LIBRARY} ${PTHREAD_LIBRARY}) -if(WIN32) +if(WIN32) list(APPEND libcsound_LIBS "${CSOUND_WINDOWS_LIBRARIES}") endif() +if(CURL_FOUND) + list(APPEND libcsound_LIBS ${CURL_LIBRARIES}) +endif() + # Linux does not have a separate libintl, it is part of libc set(LIBINTL_AVAIL (LIBINTL_LIBRARY OR LINUX)) check_deps(USE_GETTEXT LIBINTL_HEADER LIBINTL_AVAIL GETTEXT_MSGFMT_EXECUTABLE) @@ -986,19 +1032,19 @@ if(LINUX) message(STATUS "Building on Linux") add_definitions(-DLINUX -DPIPES -D_GNU_SOURCE) - list(APPEND libcsound_LIBS m dl) + list(APPEND libcsound_LIBS m dl) endif() if(APPLE) message(STATUS "Building on OSX") add_definitions(-DMACOSX -DPIPES -DNO_FLTK_THREADS -DHAVE_SOCKETS) - list(APPEND libcsound_LIBS m dl) + list(APPEND libcsound_LIBS m dl) endif() if(WIN32) add_definitions(-DWIN32) endif() - + # Locale-aware reading and printing check_function_exists(strtok_r HAVE_STRTOK_R) check_function_exists(strtod_l HAVE_STRTOD_L) @@ -1067,6 +1113,8 @@ endif() + + add_compiler_flags(${libcsound_CFLAGS} TARGETS ${CSOUNDLIB}) target_link_libraries(${CSOUNDLIB} ${libcsound_LIBS}) @@ -1114,6 +1162,7 @@ add_subdirectory(tests/c) add_subdirectory(tests/commandline) add_subdirectory(tests/regression) +add_subdirectory(tests/soak) # uninstall target configure_file( @@ -1140,3 +1189,4 @@ set (CPACK_PACKAGE_VERSION_MINOR "0") set (CPACK_PACKAGE_VERSION_PATCH "0") include (CPack) + diff -Nru csound-6.01~dfsg/CsoundLib.framework/readme.txt csound-6.02~dfsg/CsoundLib.framework/readme.txt --- csound-6.01~dfsg/CsoundLib.framework/readme.txt 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/CsoundLib.framework/readme.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -This is the top-level of Csound Library Framework. The framework is -normally installed in /Library/Frameworks. In order to use -the Csound Library, the following options should be given: - -a) compiling options: - --I/Library/Frameworks/CsoundLib.Framework/Headers - -b) linker options: - --framework CsoundLib - -VL, 2005 diff -Nru csound-6.01~dfsg/Doxyfile csound-6.02~dfsg/Doxyfile --- csound-6.01~dfsg/Doxyfile 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Doxyfile 2014-01-07 16:54:20.000000000 +0000 @@ -1339,7 +1339,7 @@ # the first chapter. If it is left blank doxygen will generate a # standard header. Notice: only use this tag if you know what you are doing! -LATEX_HEADER = +LATEX_HEADER = # The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for # the generated latex document. The footer should contain everything after @@ -1586,7 +1586,7 @@ # undefined via #undef or recursively expanded use the := operator # instead of the = operator. -PREDEFINED = +PREDEFINED = __BUILDING_LIBCSOUND # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. diff -Nru csound-6.01~dfsg/Engine/corfiles.c csound-6.02~dfsg/Engine/corfiles.c --- csound-6.01~dfsg/Engine/corfiles.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Engine/corfiles.c 2014-01-07 16:54:20.000000000 +0000 @@ -29,6 +29,7 @@ extern int csoundFileClose(CSOUND*, void*); +CORFIL *copy_url_corefile(CSOUND *, const char *, int); CORFIL *corfile_create_w(void) { @@ -213,7 +214,11 @@ void *fd; int n; char buffer[1024]; - +#ifdef HAVE_CURL + if (strstr(fname,"://")) { + return copy_url_corefile(csound, fname, fromScore); + } +#endif fd = fopen_path(csound, &ff, (char *)fname, NULL, (char *)env, fromScore); if (ff==NULL) return NULL; mm = corfile_create_w(); @@ -228,3 +233,135 @@ csoundFileClose(csound, fd); return mm; } + +void corfile_preputs(const char *s, CORFIL *f) +{ + char *body = f->body; + f->body = (char*)malloc(f->len=(strlen(body)+strlen(s)+1)); + f->p = f->len-1; + strcpy(f->body, s); strcat(f->body, body); + free(body); +} + +#ifdef HAVE_CURL + +#include + +struct MemoryStruct { + char *memory; + size_t size; +}; + + +static size_t +WriteMemoryCallback(void *contents, size_t size, size_t nmemb, void *userp) +{ + size_t realsize = size * nmemb; + struct MemoryStruct *mem = (struct MemoryStruct *)userp; + + mem->memory = realloc(mem->memory, mem->size + realsize + 1); + if (mem->memory == NULL) { + /* out of memory! */ + printf("not enough memory (realloc returned NULL)\n"); + return 0; + } + + memcpy(&(mem->memory[mem->size]), contents, realsize); + mem->size += realsize; + mem->memory[mem->size] = 0; + + return realsize; +} + +CORFIL *copy_url_corefile(CSOUND *csound, const char *url, int fromScore) +{ + int n; + CURL *curl = curl_easy_init(); + CORFIL *mm = corfile_create_w(); + struct MemoryStruct chunk; + + chunk.memory = malloc(1); /* will be grown as needed by the realloc above */ + chunk.size = 0; /* no data at this point */ + curl_easy_setopt(curl, CURLOPT_URL, url); + curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteMemoryCallback); + curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)&chunk); + curl_easy_setopt(curl, CURLOPT_USERAGENT, "libcurl-agent/1.0"); + n = curl_easy_perform(curl); + if (n != CURLE_OK) { + csound->Die(csound, "curl_easy_perform() failed: %s\n", + curl_easy_strerror(n)); + } + curl_easy_cleanup(curl); + corfile_puts(chunk.memory, mm); + corfile_putc('\0', mm); /* For use in bison/flex */ + corfile_putc('\0', mm); /* For use in bison/flex */ + if (fromScore) corfile_flush(mm); + if (chunk.memory) + free (chunk.memory); + + curl_global_cleanup(); + return mm; +} + +#endif + +#if 0 +int main(void) +{ + CURL *curl_handle; + CURLcode res; + + struct MemoryStruct chunk; + + chunk.memory = malloc(1); /* will be grown as needed by the realloc above */ + chunk.size = 0; /* no data at this point */ + + curl_global_init(CURL_GLOBAL_ALL); + + /* init the curl session */ + curl_handle = curl_easy_init(); + + /* specify URL to get */ + curl_easy_setopt(curl_handle, CURLOPT_URL, "http://www.example.com/"); + + /* send all data to this function */ + curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, WriteMemoryCallback); + + /* we pass our 'chunk' struct to the callback function */ + curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *)&chunk); + + /* some servers don't like requests that are made without a user-agent + field, so we provide one */ + curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "libcurl-agent/1.0"); + + /* get it! */ + res = curl_easy_perform(curl_handle); + + /* check for errors */ + if(res != CURLE_OK) { + fprintf(stderr, "curl_easy_perform() failed: %s\n", + curl_easy_strerror(res)); + } + else { + /* + * Now, our chunk.memory points to a memory block that is chunk.size + * bytes big and contains the remote file. + * + * Do something nice with it! + */ + + printf("%lu bytes retrieved\n", (long)chunk.size); + } + + /* cleanup curl stuff */ + curl_easy_cleanup(curl_handle); + + if(chunk.memory) + free(chunk.memory); + + /* we're done with libcurl, so clean it up */ + curl_global_cleanup(); + + return 0; +} +#endif diff -Nru csound-6.01~dfsg/Engine/cs_par_base.c csound-6.02~dfsg/Engine/cs_par_base.c --- csound-6.01~dfsg/Engine/cs_par_base.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Engine/cs_par_base.c 2014-01-07 16:54:20.000000000 +0000 @@ -53,7 +53,7 @@ /* **** An implementation of Barriers for MAC that lacks them **** */ -#if defined(__MACH__) || defined(ANDROID) +#if defined(__MACH__) || defined(ANDROID) || defined(NACL) /*#define BARRIER_SERIAL_THREAD (-1) typedef struct { diff -Nru csound-6.01~dfsg/Engine/csound_orc.y csound-6.02~dfsg/Engine/csound_orc.y --- csound-6.01~dfsg/Engine/csound_orc.y 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Engine/csound_orc.y 2014-01-07 16:54:20.000000000 +0000 @@ -141,24 +141,21 @@ #include "cs_par_orc_semantics.h" #include "parse_param.h" - //int udoflag = -1; /* THIS NEEDS TO BE MADE NON-GLOBAL */ #define udoflag csound->parserUdoflag - //int namedInstrFlag = 0; /* THIS NEEDS TO BE MADE NON-GLOBAL */ #define namedInstrFlag csound->parserNamedInstrFlag -extern TREE* appendToTree(CSOUND * csound, TREE *first, TREE *newlast); -extern int csound_orclex(TREE**, CSOUND *, void *); -extern void print_tree(CSOUND *, char *msg, TREE *); -extern void csound_orcerror(PARSE_PARM *, void *, CSOUND *, TREE*, const char*); -extern void add_udo_definition(CSOUND*, char *, char *, char *); -extern ORCTOKEN *lookup_token(CSOUND*,char*,void*); + extern TREE* appendToTree(CSOUND * csound, TREE *first, TREE *newlast); + extern int csound_orclex(TREE**, CSOUND *, void *); + extern void print_tree(CSOUND *, char *msg, TREE *); + extern void csound_orcerror(PARSE_PARM *, void *, CSOUND *, TREE*, const char*); + extern void add_udo_definition(CSOUND*, char *, char *, char *); + extern ORCTOKEN *lookup_token(CSOUND*,char*,void*); #define LINE csound_orcget_lineno(scanner) #define LOCN csound_orcget_locn(scanner) -extern int csound_orcget_locn(void *); -extern int csound_orcget_lineno(void *); -extern ORCTOKEN *make_string(CSOUND *, char *); - + extern int csound_orcget_locn(void *); + extern int csound_orcget_lineno(void *); + extern ORCTOKEN *make_string(CSOUND *, char *); %} %% diff -Nru csound-6.01~dfsg/Engine/csound_orc_compile.c csound-6.02~dfsg/Engine/csound_orc_compile.c --- csound-6.01~dfsg/Engine/csound_orc_compile.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Engine/csound_orc_compile.c 2014-01-07 16:54:20.000000000 +0000 @@ -76,7 +76,6 @@ if (retVal == NULL) { retVal = cs_hash_table_put_key(csound, engineState->stringPool, key); } - return retVal; } @@ -200,7 +199,6 @@ } } } - return retVal; } @@ -639,20 +637,20 @@ synterr(p, Str("%s invalid ksmps value"), err_msg); else if (UNLIKELY(FLOAT_COMPARE(sr,(double)kr *ksmps))) synterr(p, Str("%s inconsistent sr, kr, ksmps"), err_msg); - else if(ksmps > sr) + else if (ksmps > sr) synterr(p, Str("%s inconsistent sr, kr, ksmps \n"), err_msg); } csound->ksmps = ksmps; + csound->nchnls = nchnls; - if(inchnls==0) csound->inchnls = nchnls; + if (inchnls==0) csound->inchnls = nchnls; else csound->inchnls = inchnls; csound->esr = sr; csound->ekr = kr; - if(_0dbfs < 0) csound->e0dbfs = DFLT_DBFS; + if (_0dbfs < 0) csound->e0dbfs = DFLT_DBFS; else csound->e0dbfs = _0dbfs; - OPARMS *O = csound->oparms; if (UNLIKELY(csound->e0dbfs <= FL(0.0))){ csound->Warning(csound, @@ -663,14 +661,15 @@ if (O->nchnls_override > 0) csound->nchnls = csound->inchnls = O->nchnls_override; - if(O->nchnls_i_override > 0) csound->inchnls = O->nchnls_i_override; - if(O->e0dbfs_override > 0) csound->e0dbfs = O->e0dbfs_override; + if (O->nchnls_i_override > 0) csound->inchnls = O->nchnls_i_override; + if (O->e0dbfs_override > 0) csound->e0dbfs = O->e0dbfs_override; if (UNLIKELY(O->odebug)) csound->Message(csound, "esr = %7.1f, ekr = %7.1f, ksmps = %d, nchnls = %d " "0dbfs = %.1f\n", csound->esr, csound->ekr, csound->ksmps, csound->nchnls, csound->e0dbfs); + if (O->sr_override) { /* if command-line overrides, apply now */ MYFLT ensmps; csound->esr = (MYFLT) O->sr_override; @@ -707,10 +706,11 @@ csound->onedkr = FL(1.0) / csound->ekr; csound->global_kcounter = csound->kcounter; - if(csound->ksmps != DFLT_KSMPS){ + if (csound->ksmps != DFLT_KSMPS) { reallocateVarPoolMemory(csound, engineState->varPool); } close_instrument(csound, engineState, ip); + return ip; } @@ -814,6 +814,16 @@ ip->t.inlist = (ARGLST *) mmalloc(csound, sizeof(ARGLST)); ip->t.inlist->count = 1; + /* create local ksmps variable */ + CS_TYPE* rType = (CS_TYPE*)&CS_VAR_TYPE_R; + CS_VARIABLE *var = csoundCreateVariable(csound, csound->typePool, + rType, "ksmps", NULL); + csoundAddVariable(ip->varPool, var); + /* same for kr */ + var = csoundCreateVariable(csound, csound->typePool, + rType, "kr", NULL); + csoundAddVariable(ip->varPool, var); + /* Maybe should do this assignment at end when instr is setup? * Note: look into how "instr 4,5,6,8" is handled, i.e. if copies * are made or if they are all set to point to the same INSTRTXT @@ -914,10 +924,13 @@ t = s; } // myflt_pool_free(csound, ip->varPool); - deleteVarPoolMemory(csound, ip->varPool); + /* VL: 19-12-13 + an instrument varpool memory is allocated in the instrument block + so deallocating the pool is not really right */ + // deleteVarPoolMemory(csound, ip->varPool); //mfree(csound, ip->varPool); /* need to delete the varPool memory */ mfree(csound, ip); - if(csound->oparms->odebug) + if (csound->oparms->odebug) csound->Message(csound, Str("-- deleted instr from deadpool \n")); } @@ -934,10 +947,10 @@ /* check current items in deadpool to see if they need deleting */ int i; for(i=0; i < csound->dead_instr_no; i++){ - if(csound->dead_instr_pool[i] != NULL) { + if (csound->dead_instr_pool[i] != NULL) { INSDS *active = csound->dead_instr_pool[i]->instance; while (active != NULL) { - if(active->actflg) { + if (active->actflg) { // add_to_deadpool(csound,csound->dead_instr_pool[i]); break; } @@ -945,7 +958,7 @@ } /* no active instances */ if (active == NULL) { - if(csound->oparms->odebug) + if (csound->oparms->odebug) csound->Message(csound, Str(" -- free instr def %p \n"), csound->dead_instr_pool[i]); free_instrtxt(csound, csound->dead_instr_pool[i]); @@ -969,10 +982,9 @@ mrealloc(csound, csound->dead_instr_pool, ++csound->dead_instr_no * sizeof(INSTRTXT*)); csound->dead_instr_pool[csound->dead_instr_no-1] = instrtxt; - if(csound->oparms->odebug) + if (csound->oparms->odebug) csound->Message(csound, Str(" -- added to deadpool slot %d \n"), csound->dead_instr_no-1); - } /** @@ -994,9 +1006,10 @@ int i; inm->ip->isNew = 1; /* redefinition does not raise an error now, just a warning */ - if(csound->oparms->odebug) csound->Warning(csound, - Str("instr %ld redefined, replacing previous definition"), - inm->instno); + if (csound->oparms->odebug) + csound->Warning(csound, + Str("instr %ld redefined, replacing previous definition"), + inm->instno); /* here we should move the old instrument definition into a deadpool which will be checked for active instances and freed when there are no further ones @@ -1009,7 +1022,7 @@ } INSDS *active = engineState->instrtxtp[inm->instno]->instance; while (active != NULL) { - if(active->actflg) { + if (active->actflg) { add_to_deadpool(csound, engineState->instrtxtp[inm->instno]); break; } @@ -1140,21 +1153,23 @@ if (UNLIKELY(engineState->instrtxtp[instrNum] != NULL)) { instrtxt->isNew = 1; /* redefinition does not raise an error now, just a warning */ - if(instrNum && csound->oparms->odebug) csound->Warning(csound, - Str("instr %ld redefined, replacing previous definition"), - instrNum); + if (instrNum && csound->oparms->odebug) + csound->Warning(csound, + Str("instr %ld redefined, replacing previous definition"), + instrNum); /* here we should move the old instrument definition into a deadpool which will be checked for active instances and freed when there are no further ones */ - for(i=0; i < engineState->maxinsno; i++) { + for (i=0; i < engineState->maxinsno; i++) { /* check for duplicate numbers and do nothing */ - if(i != instrNum && - engineState->instrtxtp[i] == engineState->instrtxtp[instrNum]) goto end; + if (i != instrNum && + engineState->instrtxtp[i] == engineState->instrtxtp[instrNum]) + goto end; } INSDS *active = engineState->instrtxtp[instrNum]->instance; while (active != NULL && instrNum != 0) { - if(active->actflg) { + if (active->actflg) { add_to_deadpool(csound, engineState->instrtxtp[instrNum]); break; } @@ -1245,27 +1260,30 @@ current_state->stringPool, engineState->stringPool); for (count = 0; count < engineState->constantsPool->count; count++) { - if(csound->oparms->odebug) - csound->Message(csound, Str(" merging constants %d) %f\n"), - count, engineState->constantsPool->values[count]); + if (csound->oparms->odebug) + csound->Message(csound, Str(" merging constants %d) %f\n"), + count, engineState->constantsPool->values[count]); myflt_pool_find_or_add(csound, current_state->constantsPool, engineState->constantsPool->values[count]); } CS_VARIABLE* gVar = engineState->varPool->head; - while(gVar != NULL) { + while (gVar != NULL) { CS_VARIABLE* var; - if(csound->oparms->odebug) - csound->Message(csound, Str(" merging %d) %s:%s\n"), count, - gVar->varName, gVar->varType->varTypeName); + if (csound->oparms->odebug) + csound->Message(csound, Str(" merging %d) %s:%s\n"), count, + gVar->varName, gVar->varType->varTypeName); var = csoundFindVariableWithName(current_state->varPool, gVar->varName); - if(var == NULL){ - var = csoundCreateVariable(csound, csound->typePool, - gVar->varType, gVar->varName, NULL); - csoundAddVariable(current_state->varPool, var); - /* memory has already been allocated, so we just point to it */ - /* when disposing of the engineState global vars, we do not - delete the memBlock */ - var->memBlock = gVar->memBlock; + if (var == NULL) { + ARRAY_VAR_INIT varInit; + varInit.dimensions = gVar->dimensions; + varInit.type = gVar->varType; + var = csoundCreateVariable(csound, csound->typePool, + gVar->varType, gVar->varName, &varInit); + csoundAddVariable(current_state->varPool, var); + /* memory has already been allocated, so we just point to it */ + /* when disposing of the engineState global vars, we do not + delete the memBlock */ + var->memBlock = gVar->memBlock; } gVar = gVar->next; } @@ -1273,11 +1291,11 @@ /* merge opcodinfo */ insert_opcodes(csound, csound->opcodeInfo, current_state); insert_instrtxt(csound,engineState->instrtxtp[0],0,current_state); - for(i=1; i < end; i++){ + for (i=1; i < end; i++){ current = engineState->instrtxtp[i]; - if(current != NULL){ - if(current->insname == NULL) { - if(csound->oparms->odebug) + if (current != NULL){ + if (current->insname == NULL) { + if (csound->oparms->odebug) csound->Message(csound, Str("merging instr %d \n"), i); /* a first attempt at this merge is to make it use insert_instrtxt again */ @@ -1285,7 +1303,7 @@ insert_instrtxt(csound,current,i,current_state); } else { - if(csound->oparms->odebug) + if (csound->oparms->odebug) csound->Message(csound, Str("merging instr %s \n"), current->insname); /* allocate a named_instr string in the current engine */ named_instr_alloc(csound,current->insname,current,-1L,current_state); @@ -1298,26 +1316,27 @@ in case of multiple instr numbers, so insprep() is called only once */ current = (&(engineState->instxtanchor));//->nxtinstxt; while ((current = current->nxtinstxt) != NULL) { - if(csound->oparms->odebug) csound->Message(csound, "insprep %p \n", current); + if (csound->oparms->odebug) + csound->Message(csound, "insprep %p \n", current); insprep(csound, current, current_state);/* run insprep() to connect ARGS */ recalculateVarPoolMemory(csound, current->varPool); /* recalculate var pool */ - } + } /* now we need to patch up instr order */ end = current_state->maxinsno; end = end < current_state->maxopcno ? current_state->maxopcno : end; - for(i=0; i < end; i++){ + for (i=0; i < end; i++) { int j; current = current_state->instrtxtp[i]; - if(current != NULL){ + if (current != NULL) { if(csound->oparms->odebug) csound->Message(csound, "instr %d \n", i, current); current->nxtinstxt = NULL; j = i; - while(++j < end-1) { - if(current_state->instrtxtp[j] != NULL){ - current->nxtinstxt = current_state->instrtxtp[j]; - break; + while (++j < end-1) { + if (current_state->instrtxtp[j] != NULL) { + current->nxtinstxt = current_state->instrtxtp[j]; + break; } } } @@ -1568,8 +1587,8 @@ /* lock to ensure thread-safety */ csoundLockMutex(csound->API_lock); - if(csound->init_pass_threadlock) csoundLockMutex(csound->init_pass_threadlock); - if(engineState != &csound->engineState) { + if (csound->init_pass_threadlock) csoundLockMutex(csound->init_pass_threadlock); + if (engineState != &csound->engineState) { OPDS *ids = csound->ids; /* any compilation other than the first one */ /* merge ENGINE_STATE */ @@ -1579,6 +1598,7 @@ /* run global i-time code */ init0(csound); csound->ids = ids; + } else { /* first compilation */ @@ -1625,7 +1645,7 @@ } - if(csound->init_pass_threadlock) + if (csound->init_pass_threadlock) csoundUnlockMutex(csound->init_pass_threadlock); /* notify API lock */ csoundUnlockMutex(csound->API_lock); @@ -1639,14 +1659,14 @@ On SUCCESS it returns a value passed to the 'return' opcode in global space */ -PUBLIC MYFLT csoundEvalCode(CSOUND *csound, const char *str){ - - if(str && csoundCompileOrc(csound,str) == CSOUND_SUCCESS) - return csound->instr0->instance[0].retval; +PUBLIC MYFLT csoundEvalCode(CSOUND *csound, const char *str) +{ + if (str && csoundCompileOrc(csound,str) == CSOUND_SUCCESS) + return csound->instr0->instance[0].retval; #ifdef NAN - else return NAN; + else return NAN; #else - else return 0; + else return 0; #endif } @@ -1662,7 +1682,7 @@ int retVal; TREE *root = csoundParseOrc(csound, str); if (LIKELY(root != NULL)) { - retVal = csoundCompileTree(csound, root); + retVal = csoundCompileTree(csound, root); } else return CSOUND_ERROR; @@ -1694,8 +1714,8 @@ TEXT *ttp = &optxt->t; ep = ttp->oentry; - if (strcmp(ep->opname, "endin") == 0 /* (until ENDIN) */ - || strcmp(ep->opname, "endop") == 0) break; + if (strcmp(ep->opname, "endin") == 0 /* (until ENDIN) */ + || strcmp(ep->opname, "endop") == 0) break; if (strcmp(ep->opname, "$label") == 0) { continue; } @@ -1709,11 +1729,11 @@ argp = outlist->arg; /* get outarg indices */ while (n--) { ARG* arg = createArg(csound, tp, *argp++, engineState); - if(ttp->outArgs == NULL) { + if (ttp->outArgs == NULL) { ttp->outArgs = arg; } else { ARG* current = ttp->outArgs; - while(current->next != NULL) { + while (current->next != NULL) { current = current->next; } current->next = arg; @@ -1742,7 +1762,7 @@ arg = createArg(csound, tp, s, engineState); } - if(ttp->inArgs == NULL) { + if (ttp->inArgs == NULL) { ttp->inArgs = arg; } else { ARG* current = ttp->inArgs; @@ -1779,6 +1799,7 @@ n++, inArgs = inArgs->next) { switch (inArgs->type) { case ARG_CONSTANT: + *fp1++ = engineState->constantsPool->values[inArgs->index]; break; @@ -1860,6 +1881,7 @@ if ((c >= '1' && c <= '9') || c == '.' || c == '-' || c == '+' || (c == '0' && strcmp(s, "0dbfs") != 0)) { arg->type = ARG_CONSTANT; + arg->index = myflt_pool_find_or_addc(csound, engineState->constantsPool, s); } else if (c == '"') { STRINGDAT *str = mcalloc(csound, sizeof(STRINGDAT)); @@ -1877,11 +1899,18 @@ arg->type = ARG_PFIELD; arg->index = n; } + /* trap local ksmps and kr */ + else + if ((strcmp(s, "ksmps") == 0 && csoundFindVariableWithName(ip->varPool, s)) + || (strcmp(s, "kr") == 0 && csoundFindVariableWithName(ip->varPool, s))) { + arg->type = ARG_LOCAL; + arg->argPtr = csoundFindVariableWithName(ip->varPool, s); + CS_VARIABLE *var = (CS_VARIABLE *)arg->argPtr; + } else if (c == 'g' || (c == '#' && *(s+1) == 'g') || csoundFindVariableWithName(csound->engineState.varPool, s) != NULL) { // FIXME - figure out why string pool searched with gexist //|| string_pool_indexof(csound->engineState.stringPool, s) > 0) { - arg->type = ARG_GLOBAL; arg->argPtr = csoundFindVariableWithName(engineState->varPool, s); @@ -1889,8 +1918,7 @@ else { arg->type = ARG_LOCAL; arg->argPtr = csoundFindVariableWithName(ip->varPool, s); - - if(arg->argPtr == NULL) { + if (arg->argPtr == NULL) { csound->Message(csound, Str("Missing local arg: %s\n"), s); } } @@ -1906,6 +1934,7 @@ /* two situations: defined at header level: 0dbfs = 1.0 * and returned as a value: idb = 0dbfs */ + if ((c >= '1' && c <= '9') || c == '.' || c == '-' || c == '+' || (c == '0' && strcmp(s, "0dbfs") != 0)) return('c'); /* const */ @@ -1995,10 +2024,10 @@ count, current, current->nxtinstxt); csound->Message(csound, "Variables\n"); - if(current->varPool != NULL) { + if (current->varPool != NULL) { CS_VARIABLE* var = current->varPool->head; int index = 0; - while(var != NULL) { + while (var != NULL) { if (var->varType == &CS_VAR_TYPE_ARRAY) { csound->Message(csound, " %d) %s:[%s]\n", index++, var->varName, var->subType->varTypeName); diff -Nru csound-6.01~dfsg/Engine/csound_orc_semantics.c csound-6.02~dfsg/Engine/csound_orc_semantics.c --- csound-6.01~dfsg/Engine/csound_orc_semantics.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Engine/csound_orc_semantics.c 2014-01-07 16:53:47.000000000 +0000 @@ -1276,6 +1276,7 @@ char* rightArgString; char* opcodeName; + if(root->value == NULL) return 0; if (!check_args_exist(csound, root->right, typeTable)) { return 0; diff -Nru csound-6.01~dfsg/Engine/csound_pre.lex csound-6.02~dfsg/Engine/csound_pre.lex --- csound-6.01~dfsg/Engine/csound_pre.lex 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Engine/csound_pre.lex 2014-01-07 16:54:20.000000000 +0000 @@ -39,7 +39,8 @@ void do_umacro(CSOUND *, char *, yyscan_t); void do_ifdef(CSOUND *, char *, yyscan_t); void do_ifdef_skip_code(CSOUND *, yyscan_t); -// static void print_csound_predata(CSOUND *,char *,yyscan_t); +void do_function(char *, CORFIL*); + // static void print_csound_predata(CSOUND *,char *,yyscan_t); void csound_pre_line(CORFIL*, yyscan_t); #include "parse_param.h" @@ -77,14 +78,87 @@ ELSE #else[ \t]*(;.*)?$ END #end(if)?[ \t]*(;.*)?(\n|\r\n?) CONT \\[ \t]*(;.*)?(\n|\r\n?) +RESET "###\n" -%x incl +INT "int"[ \t]*\( +FRAC "frac"[ \t]*\( +ROUND "round"[ \t]*\( +FLOOR "floor"[ \t]*\( +CEIL "ceil"[ \t]*\( +RND "rnd"[ \t]*\( +BIRND "birnd"[ \t]*\( +ABS "abs"[ \t]*\( +EXP "exp"[ \t]*\( +LOG "log"[ \t]*\( +SQRT "sqrt"[ \t]*\( +SIN "sin"[ \t]*\( +COS "cos"[ \t]*\( +TAN "tan"[ \t]*\( +SININV "sininv"[ \t]*\( +COSINV "cosinv"[ \t]*\( +TANINV "taninv"[ \t]*\( +LOG10 "log10"[ \t]*\( +LOG2 "log2"[ \t]*\( +SINH "sinh"[ \t]*\( +COSH "cosh"[ \t]*\( +TANH "tanh"[ \t]*\( +AMPDB "ampdb"[ \t]*\( +AMPDBFS "ampdbfs"[ \t]*\( +DBAMP "dbamp"[ \t]*\( +DBFSAMP "dbfsamp"[ \t]*\( +FTCPS "ftcps"[ \t]*\( +FTLEN "ftlen"[ \t]*\( +FTSR "ftsr"[ \t]*\( +FTLPTIM "ftlptim"[ \t]*\( +FTCHNLS "ftchnls"[ \t]*\( +I "i"[ \t]*\( +K "k"[ \t]*\( +CPSOCT "cpsoct"[ \t]*\( +OCTPCH "octpch"[ \t]*\( +CPSPCH "cpspch"[ \t]*\( +PCHOCT "pchoct"[ \t]*\( +OCTCPS "octcps"[ \t]*\( +NSAMP "nsamp"[ \t]*\( +POWOFTWO "powoftwo"[ \t]*\( +LOGBTWO "logbtwo"[ \t]*\( +A "a"[ \t]*\( +TB0 "tb0"[ \t]*\( +TB1 "tb1"[ \t]*\( +TB2 "tb2"[ \t]*\( +TB3 "tb3"[ \t]*\( +TB4 "tb4"[ \t]*\( +TB5 "tb5"[ \t]*\( +TB6 "tb6"[ \t]*\( +TB7 "tb7"[ \t]*\( +TB8 "tb8"[ \t]*\( +TB9 "tb9"[ \t]*\( +TB10 "tb10"[ \t]*\( +TB11 "tb11"[ \t]*\( +TB12 "tb12"[ \t]*\( +TB13 "tb13"[ \t]*\( +TB14 "tb14"[ \t]*\( +TB15 "tb15"[ \t]*\( +URD "urd"[ \t]*\( +NOT "not"[ \t]*\( +CENT "cent"[ \t]*\( +OCTAVE "octave"[ \t]*\( +SEMITONE "semitone"[ \t]*\( +CPSMIDIN "cpsmidinn"[ \t]*\( +OCTMIDIN "octmidinn"[ \t]*\( +PCHMIDIN "pchmidinn"[ \t]*\( +DB "db"[ \t]*\( +P "p"[ \t]*\( +QINF "qinf"[ \t]*\( +QNAN "qnan"[ \t]*\( + +%X incl %x macro %x umacro %x ifdef %% +{RESET} { csound_preset_lineno(csound->orcLineOffset, yyscanner); } {CONT} { csound_preset_lineno(1+csound_preget_lineno(yyscanner), yyscanner); } @@ -372,7 +446,8 @@ if (UNLIKELY(PARM->depth > 1024)) csound->Die(csound, Str("unexpected EOF")); PARM->llocn = PARM->locn; PARM->locn = make_location(PARM); - csound->DebugMsg(csound,"%s(%d): loc=%d; lastloc=%d\n", __FILE__, __LINE__, + csound->DebugMsg(csound,"%s(%d): loc=%d; lastloc=%d\n", + __FILE__, __LINE__, PARM->llocn, PARM->locn); if ( !YY_CURRENT_BUFFER ) yyterminate(); /* csound->DebugMsg(csound,"End of input; popping to %p\n", */ @@ -381,7 +456,8 @@ n = PARM->alt_stack[--PARM->macro_stack_ptr].n; csound_preset_lineno(PARM->alt_stack[PARM->macro_stack_ptr].line, yyscanner); - csound->DebugMsg(csound,"%s(%d): line now %d at %d\n", __FILE__, __LINE__, + csound->DebugMsg(csound,"%s(%d): line now %d at %d\n", + __FILE__, __LINE__, csound_preget_lineno(yyscanner), PARM->macro_stack_ptr); /* csound->DebugMsg(csound,"n=%d\n", n); */ if (n!=0) { @@ -502,6 +578,77 @@ corfile_puts(yytext, csound->expanded_orc); } } +{INT} { do_function(yytext,csound->expanded_orc); } +{FRAC} { do_function(yytext,csound->expanded_orc); } +{ROUND} { do_function(yytext,csound->expanded_orc); } +{FLOOR} { do_function(yytext,csound->expanded_orc); } +{CEIL} { do_function(yytext,csound->expanded_orc); } +{RND} { do_function(yytext,csound->expanded_orc); } +{BIRND} { do_function(yytext,csound->expanded_orc); } +{ABS} { do_function(yytext,csound->expanded_orc); } +{EXP} { do_function(yytext,csound->expanded_orc); } +{LOG} { do_function(yytext,csound->expanded_orc); } +{SQRT} { do_function(yytext,csound->expanded_orc); } +{SIN} { do_function(yytext,csound->expanded_orc); } +{COS} { do_function(yytext,csound->expanded_orc); } +{TAN} { do_function(yytext,csound->expanded_orc); } +{SININV} { do_function(yytext,csound->expanded_orc); } +{COSINV} { do_function(yytext,csound->expanded_orc); } +{TANINV} { do_function(yytext,csound->expanded_orc); } +{LOG10} { do_function(yytext,csound->expanded_orc); } +{LOG2} { do_function(yytext,csound->expanded_orc); } +{SINH} { do_function(yytext,csound->expanded_orc); } +{COSH} { do_function(yytext,csound->expanded_orc); } +{TANH} { do_function(yytext,csound->expanded_orc); } +{AMPDB} { do_function(yytext,csound->expanded_orc); } +{AMPDBFS} { do_function(yytext,csound->expanded_orc); } +{DBAMP} { do_function(yytext,csound->expanded_orc); } +{DBFSAMP} { do_function(yytext,csound->expanded_orc); } +{FTCPS} { do_function(yytext,csound->expanded_orc); } +{FTLEN} { do_function(yytext,csound->expanded_orc); } +{FTSR} { do_function(yytext,csound->expanded_orc); } +{FTLPTIM} { do_function(yytext,csound->expanded_orc); } +{FTCHNLS} { do_function(yytext,csound->expanded_orc); } +{I} { do_function(yytext,csound->expanded_orc); } +{K} { do_function(yytext,csound->expanded_orc); } +{CPSOCT} { do_function(yytext,csound->expanded_orc); } +{OCTPCH} { do_function(yytext,csound->expanded_orc); } +{CPSPCH} { do_function(yytext,csound->expanded_orc); } +{PCHOCT} { do_function(yytext,csound->expanded_orc); } +{OCTCPS} { do_function(yytext,csound->expanded_orc); } +{NSAMP} { do_function(yytext,csound->expanded_orc); } +{POWOFTWO} { do_function(yytext,csound->expanded_orc); } +{LOGBTWO} { do_function(yytext,csound->expanded_orc); } +{A} { do_function(yytext,csound->expanded_orc); } +{TB0} { do_function(yytext,csound->expanded_orc); } +{TB1} { do_function(yytext,csound->expanded_orc); } +{TB2} { do_function(yytext,csound->expanded_orc); } +{TB3} { do_function(yytext,csound->expanded_orc); } +{TB4} { do_function(yytext,csound->expanded_orc); } +{TB5} { do_function(yytext,csound->expanded_orc); } +{TB6} { do_function(yytext,csound->expanded_orc); } +{TB7} { do_function(yytext,csound->expanded_orc); } +{TB8} { do_function(yytext,csound->expanded_orc); } +{TB9} { do_function(yytext,csound->expanded_orc); } +{TB10} { do_function(yytext,csound->expanded_orc); } +{TB11} { do_function(yytext,csound->expanded_orc); } +{TB12} { do_function(yytext,csound->expanded_orc); } +{TB13} { do_function(yytext,csound->expanded_orc); } +{TB14} { do_function(yytext,csound->expanded_orc); } +{TB15} { do_function(yytext,csound->expanded_orc); } +{URD} { do_function(yytext,csound->expanded_orc); } +{NOT} { do_function(yytext,csound->expanded_orc); } +{CENT} { do_function(yytext,csound->expanded_orc); } +{OCTAVE} { do_function(yytext,csound->expanded_orc); } +{SEMITONE} { do_function(yytext,csound->expanded_orc); } +{CPSMIDIN} { do_function(yytext,csound->expanded_orc); } +{OCTMIDIN} { do_function(yytext,csound->expanded_orc); } +{PCHMIDIN} { do_function(yytext,csound->expanded_orc); } +{DB} { do_function(yytext,csound->expanded_orc); } +{P} { do_function(yytext,csound->expanded_orc); } +{QINF} { do_function(yytext,csound->expanded_orc); } +{QNAN} { do_function(yytext,csound->expanded_orc); } + . { corfile_putc(yytext[0], csound->expanded_orc); } %% @@ -920,6 +1067,16 @@ PARM->line = n; } +void do_function(char *text, CORFIL *cf) +{ + char *p = text; + while (*p != '\0') { + if (!isspace(*p)) corfile_putc(*p, cf); + p++; + } + return; +} + #if 0 static void print_csound_predata(CSOUND *csound, char *mesg, void *yyscanner) { diff -Nru csound-6.01~dfsg/Engine/csound_prs.lex csound-6.02~dfsg/Engine/csound_prs.lex --- csound-6.01~dfsg/Engine/csound_prs.lex 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Engine/csound_prs.lex 2014-01-07 16:54:20.000000000 +0000 @@ -1,40 +1,4 @@ -%{ - - /* - csound_prs.l: - - Copyright (C) 2013 - John ffitch - - This file is part of Csound. - - The Csound Library is free software; you can redistribute it - and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - Csound is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with Csound; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA -*/ - -#include -#include -#include -#include -#include "csoundCore.h" -#include "corfile.h" -#include "score_param.h" - -#define YY_DECL int yylex (CSOUND *csound, yyscan_t yyscanner) -static void comment(yyscan_t); -static void do_comment(yyscan_t); +_comment(yyscan_t); static void do_include(CSOUND *, int, yyscan_t); static void do_macro_arg(CSOUND *, char *, yyscan_t); static void do_macro(CSOUND *, char *, yyscan_t); @@ -590,7 +554,8 @@ PARM->llocn = PARM->locn; corfile_puts(bb, csound->expanded_sco); } - cf = copy_to_corefile(csound, buffer, "INCDIR", 0); + if (strstr(buffer, "://")) return cf = copyurl_corefile(csound, buffer, 1); + else cf = copy_to_corefile(csound, buffer, "INCDIR", 1); if (cf == NULL) csound->Die(csound, Str("Cannot open #include'd file %s\n"), buffer); diff -Nru csound-6.01~dfsg/Engine/csound_standard_types.c csound-6.02~dfsg/Engine/csound_standard_types.c --- csound-6.01~dfsg/Engine/csound_standard_types.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Engine/csound_standard_types.c 2014-01-07 16:54:20.000000000 +0000 @@ -114,12 +114,16 @@ CSOUND* cs = (CSOUND*)csound; ARRAY_VAR_INIT* state = (ARRAY_VAR_INIT*)p; - CS_TYPE* type = state->type; + CS_VARIABLE* var = mcalloc(cs, sizeof (CS_VARIABLE)); var->memBlockSize = sizeof(ARRAYDAT); - var->subType = type; var->initializeVariableMemory = &arrayInitMemory; + + if(state) { // NB: this function is being called with p=NULL + CS_TYPE* type = state->type; + var->subType = type; var->dimensions = state->dimensions; + } return var; } diff -Nru csound-6.01~dfsg/Engine/csound_type_system.c csound-6.02~dfsg/Engine/csound_type_system.c --- csound-6.01~dfsg/Engine/csound_type_system.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Engine/csound_type_system.c 2014-01-07 16:54:20.000000000 +0000 @@ -144,7 +144,6 @@ CS_VARIABLE* var = current->cstype->createVariable(csound, typeArg); var->varType = type; var->varName = cs_strdup(csound, name); - return var; } current = current->next; diff -Nru csound-6.01~dfsg/Engine/entry1.c csound-6.02~dfsg/Engine/entry1.c --- csound-6.01~dfsg/Engine/entry1.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Engine/entry1.c 2014-01-07 16:54:20.000000000 +0000 @@ -371,7 +371,7 @@ { "linsegb", S(LINSEG),0, 3, "k", "iin", lsgset_bkpt, klnseg, NULL }, { "linsegb.a", S(LINSEG),0, 5, "a", "iin", lsgset_bkpt, NULL, linseg }, { "linsegr",S(LINSEG),0, 3, "k", "iin", lsgrset,klnsegr,NULL }, - { "linsegr.a",S(LINSEG),0, 5, "s", "iin", lsgrset,NULL,linsegr }, + { "linsegr.a",S(LINSEG),0, 5, "a", "iin", lsgrset,NULL,linsegr }, { "expseg", S(EXXPSEG),0, 3, "k", "iin", xsgset, kxpseg, NULL }, { "expseg.a", S(EXXPSEG),0, 5, "a", "iin", xsgset, NULL, expseg }, { "expsegb", S(EXXPSEG),0, 3, "k", "iin", xsgset_bkpt, kxpseg, NULL }, @@ -431,11 +431,15 @@ { "oscil1", S(OSCIL1), TR, 3, "k", "ikij", ko1set, kosc1 }, { "oscil1i",S(OSCIL1), TR, 3, "k", "ikij", ko1set, kosc1i }, { "osciln", S(OSCILN), TR, 5, "a", "kiii", oscnset,NULL, osciln }, - { "oscil.a",S(OSC),0, 5, "a", "kkjo", oscset, NULL, osckk }, + { "oscil.a",S(OSC),0, 5, "a", "kkjo", oscset, NULL, osckk }, { "oscil.kk",S(OSC),0, 7, "s", "kkjo", oscset, koscil, osckk }, { "oscil.ka",S(OSC),0, 5, "a", "kajo", oscset, NULL, oscka }, { "oscil.ak",S(OSC),0, 5, "a", "akjo", oscset, NULL, oscak }, { "oscil.aa",S(OSC),0, 5, "a", "aajo", oscset, NULL, oscaa }, + { "oscil.kkA",S(OSC),0, 7, "a", "kki[]o", oscsetA, koscil, osckk }, + { "oscil.kaA",S(OSC),0, 5, "a", "kai[]o", oscsetA, NULL, oscka }, + { "oscil.akA",S(OSC),0, 5, "a", "aki[]o", oscsetA, NULL, oscak }, + { "oscil.aaA",S(OSC),0, 5, "a", "aai[]o", oscsetA, NULL,oscaa }, /* Change these to { "oscil.kk", S(POSC),0, 7, "s", "kkjo", posc_set, kposc, posckk }, { "oscil.ka", S(POSC),0, 5, "a", "kajo", posc_set, NULL, poscka }, @@ -444,15 +448,25 @@ { "oscil3.kk", S(POSC),0, 7, "s", "kkjo", posc_set, kposc3, posc3 }, */ { "oscili.a",S(OSC),0, 5, "a", "kkjo", oscset, NULL, osckki }, - { "oscili.kk",S(OSC),0, 3, "k", "kkjo", oscset, koscli, NULL }, - { "oscili.ka",S(OSC),0, 5, "a", "kajo", oscset, NULL, osckai }, - { "oscili.ak",S(OSC),0, 5, "a", "akjo", oscset, NULL, oscaki }, - { "oscili.aa",S(OSC),0, 5, "a", "aajo", oscset, NULL, oscaai }, - { "oscil3.a",S(OSC),0, 5, "a", "kkjo", oscset, NULL, osckk3 }, - { "oscil3.kk",S(OSC),0, 3, "k", "kkjo", oscset, koscl3, NULL }, - { "oscil3.ka",S(OSC),0, 5, "a", "kajo", oscset, NULL, oscka3 }, - { "oscil3.ak",S(OSC),0, 5, "a", "akjo", oscset, NULL, oscak3 }, - { "oscil3.aa",S(OSC),0, 5, "a", "aajo", oscset, NULL, oscaa3 }, + { "oscili.kk",S(OSC),0, 3, "k", "kkjo", oscset, koscli, NULL }, + { "oscili.ka",S(OSC),0, 5, "a", "kajo", oscset, NULL, osckai }, + { "oscili.ak",S(OSC),0, 5, "a", "akjo", oscset, NULL, oscaki }, + { "oscili.aa",S(OSC),0, 5, "a", "aajo", oscset, NULL, oscaai }, + { "oscili.aA",S(OSC),0, 5, "a", "kki[]o", oscsetA, NULL, osckki }, + { "oscili.kkA",S(OSC),0, 3, "k", "kki[]o", oscsetA, koscli, NULL }, + { "oscili.kaA",S(OSC),0, 5, "a", "kai[]o", oscsetA, NULL, osckai }, + { "oscili.akA",S(OSC),0, 5, "a", "aki[]o", oscsetA, NULL, oscaki }, + { "oscili.aaA",S(OSC),0, 5, "a", "aai[]o", oscsetA, NULL, oscaai }, + { "oscil3.a",S(OSC),0, 5, "a", "kkjo", oscset, NULL, osckk3 }, + { "oscil3.kk",S(OSC),0, 3, "k", "kkjo", oscset, koscl3, NULL }, + { "oscil3.ka",S(OSC),0, 5, "a", "kajo", oscset, NULL, oscka3 }, + { "oscil3.ak",S(OSC),0, 5, "a", "akjo", oscset, NULL, oscak3 }, + { "oscil3.aa",S(OSC),0, 5, "a", "aajo", oscset, NULL, oscaa3 }, + { "oscil3.aA",S(OSC),0, 5, "a", "kki[]o", oscsetA, NULL, osckk3 }, + { "oscil3.kkA",S(OSC),0, 3, "k", "kki[]o", oscsetA, koscl3, NULL }, + { "oscil3.kaA",S(OSC),0, 5, "a", "kai[]o", oscsetA, NULL, oscka3 }, + { "oscil3.akA",S(OSC),0, 5, "a", "aki[]o", oscsetA, NULL, oscak3 }, + { "oscil3.aaA",S(OSC),0, 5, "a", "aai[]o", oscsetA, NULL, oscaa3 }, /* end change */ { "foscil", S(FOSC),TR, 5, "a", "xkxxkjo",foscset,NULL, foscil }, { "foscili",S(FOSC),TR, 5, "a", "xkxxkjo",foscset,NULL, foscili }, @@ -470,13 +484,13 @@ { "randi", S(RANDI),0, 5, "a", "xxvoo", riset, NULL, randi }, { "randi.k", S(RANDI),0, 3, "k", "xxvoo", riset, krandi, NULL }, { "port", S(PORT),0, 3, "k", "kio", porset, port }, - { "tone", S(TONE),0, 5, "a", "ako", tonset, NULL, tone }, - { "tonex", S(TONEX),0, 5, "a", "akoo", tonsetx, NULL, tonex }, - { "atone", S(TONE),0, 5, "a", "ako", tonset, NULL, atone }, - { "atonex", S(TONEX),0, 5, "a", "akoo", tonsetx, NULL, atonex }, - { "reson", S(RESON),0, 5, "a", "akkoo",rsnset, NULL, reson }, - { "resonx", S(RESONX),0, 5, "a", "akkooo", rsnsetx, NULL, resonx }, - { "areson", S(RESON),0, 5, "a", "akkoo",rsnset, NULL, areson }, + { "tone.k", S(TONE),0, 5, "a", "ako", tonset, NULL, tone }, + { "tonex.k",S(TONEX),0, 5, "a", "akoo", tonsetx, NULL, tonex }, + { "atone.k", S(TONE),0, 5, "a", "ako", tonset, NULL, atone }, + { "atonex.k", S(TONEX),0, 5, "a", "akoo", tonsetx, NULL, atonex }, + { "reson", S(RESON), 0, 5, "a", "axxoo", rsnset, NULL, reson }, + { "resonx", S(RESONX),0, 5, "a", "axxooo", rsnsetx, NULL, resonx }, + { "areson.kk", S(RESON),0,5, "a", "akkoo",rsnset, NULL, areson }, { "lpread", S(LPREAD),0, 3, "kkkk", "kSoo", lprdset_S,lpread }, { "lpread.i", S(LPREAD),0, 3, "kkkk", "kioo", lprdset,lpread }, { "lpform", S(LPFORM),0, 3, "kk", "k", lpformantset,lpformant }, @@ -801,13 +815,19 @@ { "schedkwhen.S", S(TRIGINSTR),0, 3,"", "kkkSkz", triginset_S, ktriginstr_S, NULL }, { "schedkwhennamed", S(TRIGINSTR),0, 3,"", "kkkkkz",triginset, ktriginstr, NULL }, - { "schedkwhennamed.S", S(TRIGINSTR),0, 3,"", "kkkSkz", - triginset_S, ktriginstr_S, NULL }, + { "schedkwhennamed.S", S(TRIGINSTR),0, 3,"", + "kkkSkz",triginset_S, ktriginstr_S, NULL }, { "trigseq", S(TRIGSEQ),0, 3, "", "kkkkkz", trigseq_set, trigseq, NULL }, { "event", S(LINEVENT),0, 2, "", "Skz", NULL, eventOpcode, NULL }, { "event_i", S(LINEVENT),0,1, "", "Sim", eventOpcodeI, NULL, NULL }, - { "event.S", S(LINEVENT),0, 2, "", "SSz", NULL, eventOpcode_S, NULL }, - { "event_i.S", S(LINEVENT),0,1, "", "SSm", eventOpcodeI_S, NULL, NULL }, + { "event.S", S(LINEVENT),0, 2, "", "SSz", NULL, eventOpcode_S, NULL }, + { "event_i.S", S(LINEVENT),0,1, "", "SSm", eventOpcodeI_S, NULL, NULL }, + { "instance", S(LINEVENT2),0,2, "k", "kkz", NULL, instanceOpcode, NULL }, + { "instance.i", S(LINEVENT2),0,1, "i", "iiim", instanceOpcode, NULL, NULL }, + { "instance.kS", S(LINEVENT2),0, 2, "k", "SSz", NULL, instanceOpcode_S, NULL }, + { "instance.S", S(LINEVENT2),0, 1, "i", "Siim", instanceOpcode_S, NULL, NULL}, + { "kill", S(KILLOP),0,1, "", "i", kill_instance, NULL, NULL }, + { "kill.k", S(KILLOP),0,2, "", "k", NULL, kill_instance, NULL}, { "lfo", S(LFO),0, 3, "k", "kko", lfoset, lfok, NULL }, { "lfo.a", S(LFO),0, 5, "a", "kko", lfoset, NULL, lfoa }, { "oscils", S(OSCILS),0, 5, "a", "iiio", @@ -950,7 +970,7 @@ (SUBR)multitap_set,NULL,(SUBR)multitap_play}, { "comb", S(COMB),0, 5, "a", "akioo", (SUBR)cmbset,NULL, (SUBR)comb }, { "combinv",S(COMB),0, 5, "a", "akioo", (SUBR)cmbset,NULL, (SUBR)invcomb }, - { "alpass", S(COMB),0, 5, "a", "akioo", (SUBR)cmbset,NULL, (SUBR)alpass }, + { "alpass", S(COMB),0, 5, "a", "axioo", (SUBR)cmbset,NULL, (SUBR)alpass }, { "strset", S(STRSET_OP),0, 1, "", "iS", (SUBR) strset_init, (SUBR) NULL, (SUBR) NULL }, { "strget", S(STRGET_OP),0, 1, "S", "i", @@ -1023,6 +1043,9 @@ (SUBR) strrindex_opcode, (SUBR) NULL, (SUBR) NULL }, { "strrindexk", S(STRINDEX_OP),0, 3, "k", "SS", (SUBR) strrindex_opcode, (SUBR) strrindex_opcode, (SUBR) NULL }, +#ifdef HAVE_CURL + { "strfromurl", S(STRCPY_OP), 0, 1, "S", "S", (SUBR) str_from_url }, +#endif { "changed.S", S(STRINDEX_OP),0, 3, "k", "S", (SUBR) str_changed, (SUBR) str_changed_k, (SUBR) NULL }, { "loop_lt", 0xfffb }, diff -Nru csound-6.01~dfsg/Engine/envvar.c csound-6.02~dfsg/Engine/envvar.c --- csound-6.01~dfsg/Engine/envvar.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Engine/envvar.c 2014-01-07 16:54:20.000000000 +0000 @@ -681,6 +681,8 @@ char *cwd; int len; + if(path == NULL) return NULL; + char *tempPath = csoundConvertPathname(csound, path); char *lastIndex = strrchr(tempPath, DIRSEP); diff -Nru csound-6.01~dfsg/Engine/extract.c csound-6.02~dfsg/Engine/extract.c --- csound-6.01~dfsg/Engine/extract.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Engine/extract.c 2014-01-07 16:54:20.000000000 +0000 @@ -70,7 +70,8 @@ flag = 'i'; /* default -i flag supplied */ STA(onsect) = 1; STA(onbeat) = FL(0.0); /* other default vals */ STA(offsect) = 999; STA(offbeat) = FL(0.0); - while (fscanf(xfp, s) != EOF) { + // while (fscanf(xfp, s) != EOF) { + while (fgets(s, 82, xfp) != NULL) { char *c = s; int i; switch (*c) { diff -Nru csound-6.01~dfsg/Engine/fgens.c csound-6.02~dfsg/Engine/fgens.c --- csound-6.01~dfsg/Engine/fgens.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Engine/fgens.c 2014-01-07 16:54:20.000000000 +0000 @@ -59,7 +59,9 @@ static int gen51(FGDATA *, FUNC *), gen52(FGDATA *, FUNC *); static int gen53(FGDATA *, FUNC *); static int GENUL(FGDATA *, FUNC *); +#ifndef NACL static int gen49(FGDATA *, FUNC *); +#endif static const GEN or_sub[GENMAX + 1] = { GENUL, @@ -67,7 +69,13 @@ gen11, gen12, gen13, gen14, gen15, gen16, gen17, gen18, gen19, gen20, gen21, GENUL, gen23, gen24, gen25, GENUL, gen27, gen28, GENUL, gen30, gen31, gen32, gen33, gen34, GENUL, GENUL, GENUL, GENUL, GENUL, gen40, - gen41, gen42, gen43, GENUL, GENUL, GENUL, GENUL, GENUL, gen49, GENUL, + gen41, gen42, gen43, GENUL, GENUL, GENUL, GENUL, GENUL, +#ifndef NACL + gen49, +#else + GENUL, +#endif + GENUL, gen51, gen52, gen53, GENUL, GENUL, GENUL, GENUL, GENUL, GENUL, GENUL }; @@ -283,10 +291,13 @@ csound->maxfnum = size; } /* allocate space for table */ - size = (int) sizeof(FUNC) + (len * (int) sizeof(MYFLT)); + size = (int) (len * (int) sizeof(MYFLT)); ftp = csound->flist[tableNum]; - if (ftp == NULL) - csound->flist[tableNum] = (FUNC*) csound->Malloc(csound, (size_t) size); + if (ftp == NULL) { + csound->flist[tableNum] = (FUNC*) csound->Malloc(csound, sizeof(FUNC)); + csound->flist[tableNum]->ftable = + (MYFLT*)csound->Malloc(csound, sizeof(MYFLT)*(len+1)); + } else if (len != (int) ftp->flen) { if (csound->actanchor.nxtact != NULL) { /* & chk for danger */ /* return */ /* VL: changed this into a Warning */ @@ -300,7 +311,7 @@ } /* initialise table header */ ftp = csound->flist[tableNum]; - memset((void*) ftp, 0, (size_t) ((char*) &(ftp->ftable[0]) - (char*) ftp)); + //memset((void*) ftp, 0, (size_t) ((char*) &(ftp->ftable) - (char*) ftp)); ftp->flen = (int32) len; if (!(len & (len - 1))) { /* for power of two length: */ @@ -414,7 +425,7 @@ } if (!ff->e.p[6]) { srcpts = srcftp->flen; - valp = &srcftp->ftable[0]; + valp = srcftp->ftable; rvalp = NULL; } else { @@ -986,7 +997,7 @@ lp13 = (void*) ftp; ff->fno++; /* alloc eq. space for fno+1 */ ftp = ftalloc(ff); /* & copy header */ - memcpy((void*) ftp, lp13, (size_t) ((char*) ftp->ftable - (char*) ftp)); + memcpy((void*) ftp, lp13, (size_t) sizeof(FUNC)-sizeof(MYFLT*)); ftp->fno = (int32) ff->fno; fp = &ff->e.p[5]; nsw = 1; @@ -1128,11 +1139,14 @@ } range = (MYFLT) (finish - start), j = start; - while (j++ <= finish) { /* write the table */ - f = (MYFLT)modf((fnlen*(j-start)/range), &i); - *(fp18 + j) += amp * ((f * (*(fp + (int)(i+1)) - - *(fp + (int)i))) + - *(fp + (int)i)); + while (j <= finish) { /* write the table */ + f = (MYFLT)modf((fnlen*(j++ - start)/range), &i); + if (i==fnp->flen) + fp18[j] += amp * fp[(int)i]; + else + fp18[j] += amp * ((f * (*(fp + (int)(i+1)) - + *(fp + (int)i))) + + *(fp + (int)i)); } } return OK; @@ -1330,7 +1344,11 @@ if (ftp == NULL) { /* Start counting elements */ ff->flen = 0; - while (!feof(infile)) nextval(infile), ff->flen++; + nextval(infile); + do { + ff->flen++; + nextval(infile); + } while (!feof(infile)); csoundMessage(csound, Str("%ld elements in %s\n"), ff->flen, ff->e.strarg); rewind(infile); @@ -1618,7 +1636,7 @@ if (UNLIKELY(l2 < 0)) { return fterror(ff, Str("GEN30: source ftable not found")); } - f1 = &(ftp->ftable[0]); + f1 = ftp->ftable; l1 = (int) ftp->flen; minfrac = ff->e.p[6]; /* lowest harmonic partial number */ maxfrac = ff->e.p[7] * xsr; /* highest harmonic partial number */ @@ -1701,7 +1719,7 @@ if (UNLIKELY(l2 < 0)) { return fterror(ff, Str("GEN31: source ftable not found")); } - f1 = &(ftp->ftable[0]); + f1 = ftp->ftable; l1 = (int) ftp->flen; x = (MYFLT*) calloc(l2 + 2, sizeof(MYFLT)); @@ -1792,7 +1810,7 @@ } } while (k); - f1 = &(ftp->ftable[0]); + f1 = ftp->ftable; l1 = (int) ftp->flen; memset(f1, 0, l1*sizeof(MYFLT)); /* for (i = 0; i <= l1; i++) */ @@ -2220,10 +2238,10 @@ static void generate_sine_tab(CSOUND *csound) { /* Assume power of 2 length */ int flen = csound->sinelength; - size_t nBytes = sizeof(FUNC) + (size_t) flen * sizeof(MYFLT); - FUNC *ftp = (FUNC*) mcalloc(csound, nBytes); + FUNC *ftp = (FUNC*) mcalloc(csound, sizeof(FUNC)); + ftp->ftable = (MYFLT*) mcalloc(csound, sizeof(MYFLT)*(flen+1)); double tpdlen = TWOPI / (double) flen; - MYFLT *ftable = &ftp->ftable[0]; + MYFLT *ftable = ftp->ftable; unsigned int i; int ltest, lobits; for (ltest = flen, lobits = 0; @@ -2256,6 +2274,7 @@ if (UNLIKELY(ftp != NULL)) { csound->Warning(csound, Str("replacing previous ftable %d"), ff->fno); if (ff->flen != (int32)ftp->flen) { /* if redraw & diff len, */ + mfree(csound, ftp->ftable); mfree(csound, (void*) ftp); /* release old space */ csound->flist[ff->fno] = ftp = NULL; if (csound->actanchor.nxtact != NULL) { /* & chk for danger */ @@ -2265,13 +2284,13 @@ } } else { /* else clear it to zero */ - size_t nBytes = sizeof(FUNC) + (size_t) ff->flen * sizeof(MYFLT); - memset((void*) ftp, 0, nBytes); + memset((void*) ftp->ftable, 0, ff->flen+1); + memset((void*) ftp, 0, sizeof(FUNC)-sizeof(MYFLT*)); /* leaving table! */ } } if (ftp == NULL) { /* alloc space as reqd */ - size_t nBytes = sizeof(FUNC) + (size_t) ff->flen * sizeof(MYFLT); - csound->flist[ff->fno] = ftp = (FUNC*) mcalloc(csound, nBytes); + csound->flist[ff->fno] = ftp = (FUNC*) mcalloc(csound, sizeof(FUNC)); + ftp->ftable = (MYFLT*) mcalloc(csound, (1+ff->flen) * sizeof(MYFLT)); } ftp->fno = (int32) ff->fno; ftp->flen = ff->flen; @@ -2379,7 +2398,7 @@ if (UNLIKELY(ftp == NULL)) goto err_return; } - *tablePtr = &(ftp->ftable[0]); + *tablePtr = ftp->ftable; return (int) ftp->flen; err_return: @@ -2452,7 +2471,7 @@ return NULL; } if (ftp->flen == 0) { - if(csound->oparms->gen01defer) + if (LIKELY(csound->oparms->gen01defer)) ftp = gen01_defer_load(csound, fno); else { csoundInitError(csound, Str("Invalid ftable no. %f"), *argp); @@ -2667,7 +2686,7 @@ ftp->soundend = inlocs / ftp->nchanls; /* record end of sound samps */ csound->FileClose(csound, p->fd); if (def) { - MYFLT *tab = (MYFLT *) ftp->ftable; + MYFLT *tab = ftp->ftable; ftresdisp(ff, ftp); /* VL: 11.01.05 for deferred alloc tables */ tab[ff->flen] = tab[0]; /* guard point */ ftp->flen -= 1; /* exclude guard point */ @@ -2756,7 +2775,7 @@ } return OK; } - +#ifndef NACL #include "mp3dec.h" static int gen49raw(FGDATA *ff, FUNC *ftp) @@ -2936,6 +2955,7 @@ } return gen49raw(ff, ftp); } +#endif #if 0 static CS_NOINLINE FUNC *gen49_defer_load(CSOUND *csound, int fno) @@ -3028,7 +3048,7 @@ "inconsistent with number of args")); } len = ((int) ftp->flen / nchn) * nchn; - dst = &(ftp->ftable[0]); + dst = ftp->ftable; memset(dst, 0, ftp->flen*sizeof(MYFLT)); /* for (i = len; i <= (int) ftp->flen; i++) */ /* dst[i] = FL(0.0); */ @@ -3040,7 +3060,7 @@ if (UNLIKELY(f == NULL)) return NOTOK; len2 = (int) f->flen; - src = &(f->ftable[0]); + src = f->ftable; i = n; if (LIKELY((n * 3) + 7e.p[(n * 3) + 7]); else j = MYFLT2LRND(ff->e.c.extra[(n * 3) + 7-PMAX]); diff -Nru csound-6.01~dfsg/Engine/insert.c csound-6.02~dfsg/Engine/insert.c --- csound-6.01~dfsg/Engine/insert.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Engine/insert.c 2014-01-07 16:54:20.000000000 +0000 @@ -89,7 +89,7 @@ if (ip->relesing) return; ip->offtim = (csound->icurTime + - csound->ksmps * (double) ip->xtratim)/csound->esr; + ip->ksmps * (double) ip->xtratim)/csound->esr; ip->offbet = csound->curBeat + (csound->curBeat_inc * (double) ip->xtratim); ip->relesing = 1; csound->engineState.instrtxtp[ip->insno]->pending_release++; @@ -347,7 +347,9 @@ csound->Message(csound, Str("instr %d now active:\n"), insno); showallocs(csound); } - + if(newevtp->pinstance != NULL) { + newevtp->pinstance = ip; + } return 0; } @@ -386,9 +388,9 @@ if (UNLIKELY(O->odebug)) { char *name = csound->engineState.instrtxtp[insno]->insname; if (UNLIKELY(name)) - csound->Message(csound, Str("activating instr %s\n"), name); + csound->Message(csound, Str("MIDI activating instr %s\n"), name); else - csound->Message(csound, Str("activating instr %d\n"), insno); + csound->Message(csound, Str("MIDI activating instr %d\n"), insno); } csound->inerrcnt = 0; ipp = &chn->kinsptr[mep->dat1]; /* key insptr ptr */ @@ -397,9 +399,9 @@ if (UNLIKELY(O->msglevel & RNGEMSG)) { char *name = csound->engineState.instrtxtp[insno]->insname; if (UNLIKELY(name)) - csound->Message(csound, Str("new alloc for instr %s:\n"), name); + csound->Message(csound, Str("new MIDI alloc for instr %s:\n"), name); else - csound->Message(csound, Str("new alloc for instr %d:\n"), insno); + csound->Message(csound, Str("new MIDI alloc for instr %d:\n"), insno); } instance(csound, insno); tp->isNew = 0; @@ -700,6 +702,12 @@ //printf("**** dag changed by deact\n"); } +int kill_instance(CSOUND *csound, KILLOP *p) { + if(*p->inst) xturnoff(csound, (INSDS *) ((long)*p->inst)); + else csound->Warning(csound, "instance not valid \n"); + return OK; +} + /* Turn off a particular insalloc, also remove from list of active */ /* MIDI notes. Allows for releasing if ip->xtratim > 0. */ @@ -1099,7 +1107,6 @@ int useropcdset(CSOUND *csound, UOPCODE *p) { OPDS *saved_ids = csound->ids; - INSDS *saved_curip = csound->curip; INSDS *parent_ip = csound->curip, *lcurip; INSTRTXT *tp; unsigned int instno; @@ -1185,6 +1192,17 @@ lcurip->kicvt = CS_KICVT; } + /* VL 13-12-13 */ + /* this sets ksmps and kr local variables */ + /* create local ksmps variable and init with ksmps */ + CS_VARIABLE *var = + csoundFindVariableWithName(lcurip->instr->varPool, "ksmps"); + *((MYFLT *)(var->memBlockIndex + lcurip->lclbas)) = lcurip->ksmps; + /* same for kr */ + var = + csoundFindVariableWithName(lcurip->instr->varPool, "kr"); + *((MYFLT *)(var->memBlockIndex + lcurip->lclbas)) = lcurip->ekr; + lcurip->m_chnbp = parent_ip->m_chnbp; /* MIDI parameters */ lcurip->m_pitch = parent_ip->m_pitch; lcurip->m_veloc = parent_ip->m_veloc; @@ -1229,24 +1247,29 @@ p->ip->init_done = 1; /* copy length related parameters back to caller instr */ - saved_curip->relesing = lcurip->relesing; - saved_curip->offbet = lcurip->offbet; - saved_curip->offtim = lcurip->offtim; - saved_curip->p3 = lcurip->p3; + parent_ip->relesing = lcurip->relesing; + parent_ip->offbet = lcurip->offbet; + parent_ip->offtim = lcurip->offtim; + parent_ip->p3 = parent_ip->p3; local_ksmps = lcurip->ksmps; /* restore globals */ csound->ids = saved_ids; - csound->curip = saved_curip; + csound->curip = parent_ip; + + /* select perf routine and scale xtratim accordingly */ if (local_ksmps != CS_KSMPS) { - saved_curip->xtratim = lcurip->xtratim / ksmps_scale; - /* IV - Sep 17 2002: also select perf routine */ + ksmps_scale = CS_KSMPS / local_ksmps; + parent_ip->xtratim = lcurip->xtratim / ksmps_scale; p->h.opadr = (SUBR) useropcd1; } else { - saved_curip->xtratim = lcurip->xtratim; + parent_ip->xtratim = lcurip->xtratim; p->h.opadr = (SUBR) useropcd2; } + if(csound->oparms->odebug) + csound->Message(csound, "EXTRATIM=> cur(%p): %d, parent(%p): %d\n", + lcurip, lcurip->xtratim, parent_ip, parent_ip->xtratim); return OK; } @@ -1279,9 +1302,7 @@ ndx_list = inm->in_ndx_list - 1; while (*++ndx_list >= 0) { - //printf("%.1f %p \n", *(*(p->args + *ndx_list)), *(p->args + *ndx_list)); *(*(p->args + *ndx_list)) = *(*(bufs + *ndx_list)); - } /* IV - Jul 29 2006: and string variables */ @@ -1376,11 +1397,9 @@ /* skip input pointers, including the three delimiter NULLs */ tmp = buf->iobufp_ptrs; - /* VL: needs to check if there are not 4 nulls in a sequence, which - would indicate no a, k, f or t sigs */ if (*tmp || *(tmp + 1) || *(tmp + 2) || *(tmp + 3)) tmp += (inm->perf_incnt << 1); - tmp += 4; /* VL: this was 2, now 4 with fsigs and tsigs added */ + tmp += 4; if (*tmp || *(tmp + 1)) return OK; @@ -1428,7 +1447,8 @@ it can be used on any instrument with the implementation of a mechanism to perform at local ksmps (in kperf etc) */ - +#include "typetabl.h" +#include "csound_standard_types.h" int setksmpsset(CSOUND *csound, SETKSMPS *p) { @@ -1452,6 +1472,21 @@ CS_KICVT = (MYFLT) FMAXLEN / CS_EKR; CS_KCNT *= n; + /* VL 13-12-13 */ + /* this sets ksmps and kr local variables */ + /* lookup local ksmps variable and init with ksmps */ + INSTRTXT *ip = p->h.insdshead->instr; + CS_VARIABLE *var = + csoundFindVariableWithName(ip->varPool, "ksmps"); + MYFLT *varmem = p->h.insdshead->lclbas + var->memBlockIndex; + *varmem = CS_KSMPS; + + /* same for kr */ + var = + csoundFindVariableWithName(ip->varPool, "kr"); + varmem = p->h.insdshead->lclbas + var->memBlockIndex; + *varmem = CS_EKR; + return OK; } @@ -1690,7 +1725,8 @@ CS_PDS->insdshead->pds = NULL; do { (*CS_PDS->opadr)(csound, CS_PDS); - if (CS_PDS->insdshead->pds != NULL) { + if (CS_PDS->insdshead->pds != NULL + && CS_PDS->insdshead->pds->insdshead) { CS_PDS = CS_PDS->insdshead->pds; CS_PDS->insdshead->pds = NULL; } @@ -1725,6 +1761,7 @@ do { /* copy inputs */ tmp = p->buf->iobufp_ptrs; + while (*tmp) { /* a-rate */ ptr1 = *(tmp++) + ofs; ptr2 = *(tmp++); n = csound->ksmps; @@ -1750,7 +1787,8 @@ CS_PDS->insdshead->pds = NULL; do { (*CS_PDS->opadr)(csound, CS_PDS); - if (CS_PDS->insdshead->pds != NULL) { + if (CS_PDS->insdshead->pds != NULL + && CS_PDS->insdshead->pds->insdshead) { CS_PDS = CS_PDS->insdshead->pds; CS_PDS->insdshead->pds = NULL; } @@ -1760,7 +1798,7 @@ out = *tmp; while (*(++tmp)) { /* a-rate */ ptr1 = *tmp; ptr2 = *(++tmp) + ofs; - n = csound->ksmps; + n = lksmps; do { *(ptr2++) = *(ptr1++); } while (--n); @@ -1816,6 +1854,7 @@ int n; OPDS *saved_pds = CS_PDS; MYFLT **tmp, *ptr1, *ptr2; + INSDS *this_instr = p->ip; p->ip->spin = csound->spin; p->ip->spout = csound->spout; @@ -1851,12 +1890,14 @@ CS_PDS->insdshead->pds = NULL; do { (*CS_PDS->opadr)(csound, CS_PDS); - if (CS_PDS->insdshead->pds != NULL) { - CS_PDS = CS_PDS->insdshead->pds; - CS_PDS->insdshead->pds = NULL; + if (CS_PDS->insdshead->pds != NULL + && CS_PDS->insdshead->pds->insdshead) { + CS_PDS = CS_PDS->insdshead->pds; + CS_PDS->insdshead->pds = NULL; } } while ((CS_PDS = CS_PDS->nxtp)); + this_instr->kcounter++; /* copy outputs */ while (*(++tmp)) { /* a-rate */ ptr1 = *tmp; ptr2 = *(++tmp); @@ -1889,11 +1930,14 @@ CS_PDS->insdshead->pds = NULL; do { (*CS_PDS->opadr)(csound, CS_PDS); - if (CS_PDS->insdshead->pds != NULL) { + if (CS_PDS->insdshead->pds != NULL + && CS_PDS->insdshead->pds->insdshead) { CS_PDS = CS_PDS->insdshead->pds; CS_PDS->insdshead->pds = NULL; } } while ((CS_PDS = CS_PDS->nxtp)); + + this_instr->kcounter++; /* copy outputs */ while (*(++tmp)) { /* a-rate */ ptr1 = *tmp; *(*(++tmp)) = *ptr1; @@ -1997,7 +2041,8 @@ /* gbloffbas = csound->globalVarPool; */ lcloffbas = &ip->p0; lclbas = (MYFLT*) ((char*) ip + pextent); /* split local space */ - initializeVarPool(lclbas, tp->varPool); + initializeVarPool(lclbas, tp->varPool); + opMemStart = nxtopds = (char*) lclbas + tp->varPool->poolSize; opdslim = nxtopds + tp->opdstot; if (UNLIKELY(odebug)) @@ -2072,7 +2117,6 @@ fltp = (MYFLT *) var->memBlock; /* gbloffbas + var->memBlockIndex; */ } else if(arg->type == ARG_LOCAL) { - fltp = lclbas + var->memBlockIndex; } else if (arg->type == ARG_PFIELD) { @@ -2087,8 +2131,6 @@ } argpp[n] = fltp; arg = arg->next; - *argpp[n] = n; - //printf("%f %p\n", *argpp[n], argpp[n]); } for (argStringCount = argsRequired(ep->outypes); @@ -2097,6 +2139,7 @@ argpp[n] = NULL; arg = ttp->inArgs; + ip->lclbas = lclbas; for (; arg != NULL; n++, arg = arg->next) { CS_VARIABLE* var = (CS_VARIABLE*)(arg->argPtr); if(arg->type == ARG_CONSTANT) { @@ -2109,7 +2152,6 @@ argpp[n] = lcloffbas + arg->index; } else if(arg->type == ARG_GLOBAL) { - argpp[n] = (MYFLT *) var->memBlock; /*gbloffbas + var->memBlockIndex; */ } else if(arg->type == ARG_LOCAL){ @@ -2127,6 +2169,19 @@ } + /* VL 13-12-13: point the memory to the local ksmps & kr variables, + and initialise them */ + CS_VARIABLE* var = csoundFindVariableWithName(ip->instr->varPool, "ksmps"); + if(var) { + var->memBlock = lclbas + var->memBlockIndex; + *((MYFLT *)(var->memBlock)) = csound->ksmps; + } + var = csoundFindVariableWithName(ip->instr->varPool, "kr"); + if(var) { + var->memBlock = lclbas + var->memBlockIndex; + *((MYFLT *)(var->memBlock)) = csound->ekr; + } + if (UNLIKELY(nxtopds > opdslim)) csoundDie(csound, Str("inconsistent opds total")); @@ -2300,6 +2355,7 @@ int done; float wakeup = (1000*csound->ksmps/csound->esr); while(csound->init_pass_loop) { + #if defined(MACOSX) || defined(LINUX) || defined(HAIKU) usleep(1000*wakeup); #else @@ -2317,6 +2373,7 @@ if (done == 0) { csoundLockMutex(csound->init_pass_threadlock); csound->ids = (OPDS *) (ip->nxti); + csound->curip = ip; while (csound->ids != NULL) { if (csound->oparms->odebug) csound->Message(csound, "init %s:\n", @@ -2336,7 +2393,9 @@ csoundUnlockMutex(csound->init_pass_threadlock); } ip = nxt; + } + } return NULL; } diff -Nru csound-6.01~dfsg/Engine/linevent.c csound-6.02~dfsg/Engine/linevent.c --- csound-6.01~dfsg/Engine/linevent.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Engine/linevent.c 2014-01-07 16:54:20.000000000 +0000 @@ -115,11 +115,11 @@ { if (strcmp(csound->oparms->Linename, "stdin") != 0) close(csound->Linefd); - #if !defined(DOSGCC) && !defined(WIN32) +#if !defined(DOSGCC) && !defined(WIN32) else fcntl(csound->Linefd, F_SETFL, STA(stdmode)); - #endif -} +#endif + } //csound->Free(csound, csound->lineventGlobals); //csound->lineventGlobals = NULL; } @@ -140,12 +140,12 @@ volatile jmp_buf tmpExitJmp; int err; - if(reallocsize > 0) { + if (reallocsize > 0) { STA(Linebuf) = (char *) csound->ReAlloc(csound, (void *) STA(Linebuf), reallocsize); STA(linebufsiz) = reallocsize; STA(Linebufend) = STA(Linebuf) + STA(linebufsiz); - } else if(STA(Linebuf)==NULL) { + } else if (STA(Linebuf)==NULL) { STA(linebufsiz) = LBUFSIZ; STA(Linebuf) = (char *) csound->Calloc(csound, STA(linebufsiz)); } @@ -159,8 +159,6 @@ //csound->lineventGlobals = NULL; return -1; } - /* csound->lineventGlobals = */ - /* (LINEVENT_GLOBALS*) mcalloc(csound, sizeof(LINEVENT_GLOBALS)); */ memcpy((void*) &csound->exitjmp, (void*) &tmpExitJmp, sizeof(jmp_buf)); STA(prve).opcod = ' '; STA(Linebufend) = STA(Linebuf) + STA(linebufsiz); @@ -182,10 +180,10 @@ if (!size) return; if (UNLIKELY((STA(Linep) + size) >= STA(Linebufend))) { int extralloc = STA(Linep) + size - STA(Linebufend); - if ((n=linevent_alloc(csound, STA(linebufsiz) + extralloc ), 0) != 0){ - csoundErrorMsg(csound, Str("LineBuffer Overflow - " - "Input Data has been Lost")); - return; + if ((n=linevent_alloc(csound, STA(linebufsiz) + extralloc ), 0) != 0) { + csoundErrorMsg(csound, Str("LineBuffer Overflow - " + "Input Data has been Lost")); + return; } } memcpy(STA(Linep), message, size); @@ -219,6 +217,7 @@ char *sstrp = NULL; int scnt = 0; int strsiz = 0; + memset(&e, 0, sizeof(EVTBLK)); e.strarg = NULL; e.scnt = 0; c = *cp; while (c == ' ' || c == '\t') /* skip initial white space */ @@ -321,7 +320,7 @@ Linestart = (++cp); insert_score_event_at_sample(csound, &e, csound->icurTime); continue; - Lerr: + Lerr: n = cp - Linestart; /* error position */ while (*cp != LF) cp++; /* go on to LF */ @@ -357,8 +356,9 @@ EVTBLK evt; int i; char opcod; + memset(&evt, 0, sizeof(EVTBLK)); - if(p1==0) + if (p1==0) opcod = *((STRINGDAT*) p->args[0])->data; else opcod = p1; @@ -367,9 +367,10 @@ return csound->PerfError(csound, p->h.insdshead,Str(errmsg_1)); evt.strarg = NULL; evt.scnt = 0; evt.opcod = opcod; - if(p->flag==1) evt.pcnt = p->argno-2; + if (p->flag==1) evt.pcnt = p->argno-2; else evt.pcnt = p->INOCOUNT - 1; + /* IV - Oct 31 2002: allow string argument */ if (evt.pcnt > 0) { if (insname) { @@ -398,12 +399,12 @@ int eventOpcode(CSOUND *csound, LINEVENT *p) { - return eventOpcode_(csound, p, 0, 0); + return eventOpcode_(csound, p, 0, 0); } int eventOpcode_S(CSOUND *csound, LINEVENT *p) { - return eventOpcode_(csound, p, 1, 0); + return eventOpcode_(csound, p, 1, 0); } @@ -415,10 +416,11 @@ EVTBLK evt; int i, err = 0; char opcod; + memset(&evt, 0, sizeof(EVTBLK)); if(p1==0) opcod = *((STRINGDAT*) p->args[0])->data; - else opcod = p1; + else opcod = p1; if (UNLIKELY((opcod != 'a' && opcod != 'i' && opcod != 'q' && opcod != 'f' && opcod != 'e') /*|| ((STRINGDAT*) p->args[0])->data[1] != '\0'*/)) return csound->InitError(csound, Str(errmsg_1)); @@ -461,10 +463,56 @@ int eventOpcodeI(CSOUND *csound, LINEVENT *p) { - return eventOpcodeI_(csound, p, 0, 0); + return eventOpcodeI_(csound, p, 0, 0); } int eventOpcodeI_S(CSOUND *csound, LINEVENT *p) { - return eventOpcodeI_(csound, p, 1, 0); + return eventOpcodeI_(csound, p, 1, 0); +} + +int instanceOpcode_(CSOUND *csound, LINEVENT2 *p, int insname) +{ + EVTBLK evt; + int i; + + evt.strarg = NULL; evt.scnt = 0; + evt.opcod = 'i'; + evt.pcnt = p->INOCOUNT; + + /* pass in the memory to hold the instance after insertion */ + evt.pinstance = (void *) p->inst; + + /* IV - Oct 31 2002: allow string argument */ + if (evt.pcnt > 0) { + if (insname) { + evt.p[1] = csound->strarg2insno(csound, + ((STRINGDAT*) p->args[0])->data, 1); + evt.strarg = NULL; evt.scnt = 0; + } + else { + if (ISSTRCOD(*p->args[0])) { + evt.p[1] = csound->strarg2insno(csound, + get_arg_string(csound, *p->args[0]), 1); + } else evt.p[1] = *p->args[0]; + evt.strarg = NULL; evt.scnt = 0; + } + for (i = 2; i <= evt.pcnt; i++) + evt.p[i] = *p->args[i-1]; + } + if (insert_score_event_at_sample(csound, &evt, csound->icurTime) != 0) + return csound->PerfError(csound, p->h.insdshead, + Str("instance: error creating event")); + + return OK; +} + +int instanceOpcode(CSOUND *csound, LINEVENT2 *p) +{ + return instanceOpcode_(csound, p, 0); +} + +int instanceOpcode_S(CSOUND *csound, LINEVENT2 *p) +{ + return instanceOpcode_(csound, p, 1); } diff -Nru csound-6.01~dfsg/Engine/musmon.c csound-6.02~dfsg/Engine/musmon.c --- csound-6.01~dfsg/Engine/musmon.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Engine/musmon.c 2014-01-07 16:54:20.000000000 +0000 @@ -397,6 +397,7 @@ csound->Message(csound, Str("%c\tbeep!\n"), '\a'); } +extern int UDPServerClose(CSOUND *csound); PUBLIC int csoundCleanup(CSOUND *csound) { void *p; @@ -404,6 +405,9 @@ int32 *rngp; uint32_t n; + if(csound->QueryGlobalVariable(csound,"::UDPCOM") + != NULL) UDPServerClose(csound); + while (csound->evtFuncChain != NULL) { p = (void*) csound->evtFuncChain; csound->evtFuncChain = ((EVT_CB_FUNC*) p)->nxt; @@ -509,6 +513,7 @@ { EVTBLK evt; int insno; + memset(&evt, 0, sizeof(EVTBLK)); evt.strarg = NULL; evt.scnt = 0; evt.opcod = 'i'; evt.pcnt = 3; @@ -533,7 +538,7 @@ { EVTBLK evt; int insno; - + memset(&evt, 0, sizeof(EVTBLK)); evt.strarg = NULL; evt.scnt = 0; evt.opcod = 'i'; evt.pcnt = 3; @@ -1184,6 +1189,7 @@ memcpy(e->evt.strarg, evt->strarg, p-evt->strarg+1 ); e->evt.scnt = evt->scnt; } + e->evt.pinstance = evt->pinstance; e->evt.opcod = evt->opcod; e->evt.pcnt = evt->pcnt; p = &(e->evt.p[0]); diff -Nru csound-6.01~dfsg/Engine/new_orc_parser.c csound-6.02~dfsg/Engine/new_orc_parser.c --- csound-6.01~dfsg/Engine/new_orc_parser.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Engine/new_orc_parser.c 2014-01-07 16:54:20.000000000 +0000 @@ -27,6 +27,21 @@ #include "csound_orc.h" #include "corfile.h" +#if defined(HAVE_DIRENT_H) +# include +# if 0 && defined(__MACH__) +typedef void* DIR; +DIR opendir(const char *); +struct dirent *readdir(DIR*); +int closedir(DIR*); +# endif +#endif + +#if defined(WIN32) +# include +# include +#endif + extern void csound_orcrestart(FILE*, void *); extern int csound_orcdebug; @@ -72,6 +87,42 @@ return loc; } +// Code to add #includes of UDOs +void add_include_udo_dir(CORFIL *xx) +{ + char *dir = getenv("CS_UDO_DIR"); + char buff[1024]; + if (dir) { + DIR *udo = opendir(dir); + printf("** found CS_UDO_DIR=%s\n", dir); + if (udo) { + struct dirent *f; + //printf("**and it opens\n"); + strcpy(buff, "#line 0\n"); + while ((f = readdir(udo)) != NULL) { + char *fname = &(f->d_name[0]); + int n = (int)strlen(fname); + printf("** name=%s n=%d\n", fname, n); + if (n>4 && (strcmp(&fname[n-4], ".udo")==0)) { + strcpy(buff, "#include \""); + strncat(buff, dir, 1024); + strncat(buff, "/", 1024); + strncat(buff, fname, 1024); + strncat(buff, "\"\n", 1024); + if (strlen(buff)>768) { + corfile_preputs(buff, xx); + buff[0] ='\0'; + } + } + } + closedir(udo); + strncat(buff, "###\n", 1024); + corfile_preputs(buff, xx); + } + } + //printf("Giving\n%s", corfile_body(xx)); +} + TREE *csoundParseOrc(CSOUND *csound, const char *str) { int err; @@ -87,9 +138,13 @@ file_to_int(csound, "**unknown**"); if (str == NULL) { char bb[80]; - if (csound->orchstr==NULL) + + if (csound->orchstr==NULL && !csound->oparms->daemon) csound->Die(csound, Str("Failed to open input file %s\n"), csound->orchname); + else if(csound->orchstr==NULL && csound->oparms->daemon) return NULL; + + add_include_udo_dir(csound->orchstr); if (csound->orchname==NULL || csound->orchname[0]=='\0') csound->orchname = csound->csdname; /* We know this is the start so stack is empty so far */ @@ -144,6 +199,7 @@ csound_orcset_extra(&pp, pp.yyscanner); csound_orc_scan_buffer(corfile_body(csound->expanded_orc), corfile_tell(csound->expanded_orc), pp.yyscanner); + //csound_orcset_lineno(csound->orcLineOffset, pp.yyscanner); err = csound_orcparse(&pp, pp.yyscanner, csound, astTree); corfile_rm(&csound->expanded_orc); diff -Nru csound-6.01~dfsg/Engine/rdscor.c csound-6.02~dfsg/Engine/rdscor.c --- csound-6.01~dfsg/Engine/rdscor.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Engine/rdscor.c 2014-01-07 16:54:20.000000000 +0000 @@ -118,6 +118,7 @@ { /* presumes good format if warped */ MYFLT *pp, *plim; int c; + e->pinstance = NULL; if (csound->scstr == NULL || csound->scstr->body[0] == '\0') { /* if no concurrent scorefile */ diff -Nru csound-6.01~dfsg/Engine/sread.c csound-6.02~dfsg/Engine/sread.c --- csound-6.01~dfsg/Engine/sread.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Engine/sread.c 2014-01-07 16:54:20.000000000 +0000 @@ -1666,7 +1666,12 @@ } STA(str)++; STA(str)->is_marked_repeat = 0; - STA(str)->cf = copy_to_corefile(csound, mname, "INCDIR", 1); +#ifdef HAVE_CURL + if (strstr(mname, "://")) + STA(str)->cf = copy_url_corefile(csound, mname, 1); + else +#endif + STA(str)->cf = copy_to_corefile(csound, mname, "INCDIR", 1); if (STA(str)->cf == NULL) { STA(str)--; STA(str)->line--; /* include was one line earlier */ diff -Nru csound-6.01~dfsg/H/corfile.h csound-6.02~dfsg/H/corfile.h --- csound-6.01~dfsg/H/corfile.h 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/H/corfile.h 2014-01-07 16:54:20.000000000 +0000 @@ -46,10 +46,12 @@ char *corfile_current(CORFIL *f); #define corfile_current(f) (f->body+f->p) CORFIL *copy_to_corefile(CSOUND *, const char *, const char *, int); +CORFIL *copy_url_corefile(CSOUND *, const char *, int); int corfile_length(CORFIL *f); #define corfile_length(f) (strlen(f->body)) void corfile_set(CORFIL *f, int n); #define corfile_set(f,n) (f->p = n) void corfile_seek(CORFIL *f, int n, int dir); +void corfile_preputs(const char *s, CORFIL *f); #endif diff -Nru csound-6.01~dfsg/H/diskin2.h csound-6.02~dfsg/H/diskin2.h --- csound-6.01~dfsg/H/diskin2.h 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/H/diskin2.h 2014-01-07 16:54:20.000000000 +0000 @@ -119,8 +119,8 @@ int diskin2_init(CSOUND *csound, DISKIN2 *p); int diskin2_init_S(CSOUND *csound, DISKIN2 *p); int diskin2_perf(CSOUND *csound, DISKIN2 *p); -int diskin2_init_array_I(CSOUND *csound, DISKIN2_ARRAY *p); -int diskin2_init_array_S(CSOUND *csound, DISKIN2_ARRAY *p); +int diskin2_init_array_I(CSOUND *csound, DISKIN2_ARRAY *p); +int diskin2_init_array_S(CSOUND *csound, DISKIN2_ARRAY *p); int diskin_init_array_I(CSOUND *csound, DISKIN2_ARRAY *p); int diskin_init_array_S(CSOUND *csound, DISKIN2_ARRAY *p); int diskin2_perf_array(CSOUND *csound, DISKIN2_ARRAY *p); @@ -163,4 +163,3 @@ } SNDOUTS; #endif /* CSOUND_DISKIN2_H */ - diff -Nru csound-6.01~dfsg/H/entry1.h csound-6.02~dfsg/H/entry1.h --- csound-6.01~dfsg/H/entry1.h 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/H/entry1.h 2014-01-07 16:54:20.000000000 +0000 @@ -188,6 +188,7 @@ int kosc1(CSOUND *, void *), kosc1i(CSOUND *, void *); int oscnset(CSOUND *, void *), osciln(CSOUND *, void *); int oscset(CSOUND *, void *), koscil(CSOUND *, void *); +int oscsetA(CSOUND *, void *); int osckk(CSOUND *, void *), oscka(CSOUND *, void *); int oscak(CSOUND *, void *), oscaa(CSOUND *, void *); int koscli(CSOUND *, void *), osckki(CSOUND *, void *); @@ -350,6 +351,8 @@ int trigseq_set(CSOUND *, void *), trigseq(CSOUND *, void *); int eventOpcode(CSOUND *, void *), eventOpcodeI(CSOUND *, void *); int eventOpcode_S(CSOUND *, void *), eventOpcodeI_S(CSOUND *, void *); +int instanceOpcode(CSOUND *, void *), instanceOpcode_S(CSOUND *, void *); +int kill_instance(CSOUND *csound, void *p); int lfoset(CSOUND *, void *); int lfok(CSOUND *, void *), lfoa(CSOUND *, void *); int mute_inst(CSOUND *, void *); diff -Nru csound-6.01~dfsg/H/insert.h csound-6.02~dfsg/H/insert.h --- csound-6.01~dfsg/H/insert.h 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/H/insert.h 2014-01-07 16:54:20.000000000 +0000 @@ -49,6 +49,11 @@ OPDS h; } LINK; +typedef struct { + OPDS h; + MYFLT *inst; +} KILLOP; + /* the number of optional outputs defined in entry.c */ #define SUBINSTNUMOUTS 8 diff -Nru csound-6.01~dfsg/H/linevent.h csound-6.02~dfsg/H/linevent.h --- csound-6.01~dfsg/H/linevent.h 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/H/linevent.h 2014-01-07 16:54:20.000000000 +0000 @@ -35,4 +35,12 @@ int flag; } LINEVENT; + +typedef struct { + OPDS h; + MYFLT *inst; + MYFLT *args[VARGMAX]; + int argno; +} LINEVENT2; + #endif /* CSOUND_LINEVENT_H */ diff -Nru csound-6.01~dfsg/H/lpc.h csound-6.02~dfsg/H/lpc.h --- csound-6.01~dfsg/H/lpc.h 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/H/lpc.h 2014-01-07 16:54:20.000000000 +0000 @@ -26,8 +26,8 @@ #define LP_MAGIC 999 #define LP_MAGIC2 2399 /* pole file type */ #define LPBUFSIZ 4096 /* in lpanal */ -#define MAXWINDIN 1000 /* for 10ms hops at 50 KC */ -#define MAXPOLES 1000 +#define MAXWINDIN 5000 /* for 10ms hops at 50 KC */ +#define MAXPOLES 5000 #define NDATA 4 /* number of data values stored with frame */ typedef struct { diff -Nru csound-6.01~dfsg/H/prototyp.h csound-6.02~dfsg/H/prototyp.h --- csound-6.01~dfsg/H/prototyp.h 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/H/prototyp.h 2014-01-07 16:54:20.000000000 +0000 @@ -82,7 +82,7 @@ int (*callback)(CSOUND*, MEMFIL*)); void rlsmemfiles(CSOUND *); int delete_memfile(CSOUND *, const char *); -char *csoundTmpFileName(CSOUND *, char *, const char *); +char *csoundTmpFileName(CSOUND *, const char *); void *SAsndgetset(CSOUND *, char *, void *, MYFLT *, MYFLT *, MYFLT *, int); int getsndin(CSOUND *, void *, MYFLT *, int, void *); void *sndgetset(CSOUND *, void *); diff -Nru csound-6.01~dfsg/H/str_ops.h csound-6.02~dfsg/H/str_ops.h --- csound-6.01~dfsg/H/str_ops.h 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/H/str_ops.h 2014-01-07 16:54:20.000000000 +0000 @@ -235,6 +235,7 @@ int strrindex_opcode(CSOUND *, void *); int str_changed(CSOUND *csound, STRCHGD *p); int str_changed_k(CSOUND *csound, STRCHGD *p); + int str_from_url(CSOUND *csound, STRCPY_OP *p); #endif /* CSOUND_STR_OPS_C */ diff -Nru csound-6.01~dfsg/H/ugens2.h csound-6.02~dfsg/H/ugens2.h --- csound-6.01~dfsg/H/ugens2.h 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/H/ugens2.h 2014-01-07 16:54:20.000000000 +0000 @@ -69,4 +69,5 @@ MYFLT *sr, *xamp, *xcps, *ifn, *iphs; int32 lphs; FUNC *ftp; + FUNC FF; } OSC; diff -Nru csound-6.01~dfsg/H/ugens4.h csound-6.02~dfsg/H/ugens4.h --- csound-6.01~dfsg/H/ugens4.h 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/H/ugens4.h 2014-01-07 16:54:20.000000000 +0000 @@ -65,7 +65,7 @@ MYFLT *ar, *xamp, *xcps, *iseed, *sel, *base; int16 ampcod, cpscod, new; int rand; - int32 phs; + long phs; MYFLT num1; } RANDH; @@ -74,6 +74,6 @@ MYFLT *ar, *xamp, *xcps, *iseed, *sel, *base; int16 ampcod, cpscod, new; int rand; - int32 phs; + long phs; MYFLT num1, num2, dfdmax; } RANDI; Binary files /tmp/YoCR1bco_Y/csound-6.01~dfsg/How_to_Build_Csound_on_Windows.doc and /tmp/drTeJpx12F/csound-6.02~dfsg/How_to_Build_Csound_on_Windows.doc differ diff -Nru csound-6.01~dfsg/InOut/CMakeLists.txt csound-6.02~dfsg/InOut/CMakeLists.txt --- csound-6.01~dfsg/InOut/CMakeLists.txt 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/InOut/CMakeLists.txt 2014-01-07 16:54:20.000000000 +0000 @@ -33,7 +33,10 @@ find_library(PORTMIDI_LIBRARY portmidi) # include_directories(${PORTMIDI_INCLUDE_PATH}) # include_directories(${PORTTIME_INCLUDE_PATH}) - find_library(PORTTIME_LIBRARY porttime) + if(WIN32) + else() + find_library(PORTTIME_LIBRARY porttime) + endif() endif() if(USE_JACK) find_library(JACK_LIBRARY jack) @@ -61,36 +64,6 @@ find_path(COREAUDIO_INCLUDE_PATH CoreAudio.h) find_library(COREAUDIO_LIBRARY CoreAudio) endif() -if(USE_FLTK OR BUILD_VIRTUAL_KEYBOARD) - - # first, try to use fltk-config for fltk >= 1.3 (FindFLTK is buggy - # on Unix, where e.g. xft and xinerama options are not dealt with) - find_program(FLTK_CONFIG_SCRIPT fltk-config) - if(FLTK_CONFIG_SCRIPT) - execute_process(COMMAND ${FLTK_CONFIG_SCRIPT} --api-version - OUTPUT_VARIABLE FLTK_VERSION) - string(STRIP FLTK_VERSION FLTK_VERSION) - if(FLTK_VERSION GREATER 1.1) - set(HAVE_FLTK "Fltk") - set(FLTK_FOUND 1) - message(STATUS "Using fltk-config script for Fltk " ${FLTK_VERSION}) - execute_process(COMMAND ${FLTK_CONFIG_SCRIPT} --includedir - OUTPUT_VARIABLE FLTK_INCLUDE_DIR) - string(STRIP ${FLTK_INCLUDE_DIR} FLTK_INCLUDE_DIR) - execute_process(COMMAND ${FLTK_CONFIG_SCRIPT} --ldflags - OUTPUT_VARIABLE FLTK_LIBRARIES) - string(STRIP ${FLTK_LIBRARIES} FLTK_LIBRARIES) - string(REGEX MATCH "fltk[_ ]jpeg" FLTK_JPEG ${FLTK_LIBRARIES}) - string(REGEX MATCH "fltk[_ ]z" FLTK_Z ${FLTK_LIBRARIES}) - string(REGEX MATCH "fltk[_ ]png" FLTK_PNG ${FLTK_LIBRARIES}) - endif(FLTK_VERSION GREATER 1.1) - endif(FLTK_CONFIG_SCRIPT) - if(NOT HAVE_FLTK) - - set(FLTK_SKIP_OPENGL true) - find_package(FLTK) - endif() -endif() # BUILD TARGETS @@ -116,8 +89,8 @@ endif() check_deps(USE_ALSA ALSA_HEADER ALSA_LIBRARY PTHREAD_LIBRARY) -if(USE_ALSA) - set(rtalsa_LIBS +if(USE_ALSA) + set(rtalsa_LIBS ${ALSA_LIBRARY} ${PTHREAD_LIBRARY} m) make_plugin(rtalsa rtalsa.c ${rtalsa_LIBS}) endif() @@ -139,7 +112,7 @@ if(USE_PORTAUDIO) set(rtpa_LIBS ${PORTAUDIO_LIBRARY}) include_directories(${PORTAUDIO_INCLUDE_PATH}) - + if(WIN32) list(APPEND rtpa_LIBS winmm dsound ${CSOUND_WINDOWS_LIBRARIES}) endif() @@ -148,14 +121,22 @@ add_dependency_to_framework(portaudio ${PORTAUDIO_LIBRARY}) endif() -check_deps(USE_PORTMIDI PORTMIDI_INCLUDE_PATH PORTMIDI_LIBRARY PORTTIME_LIBRARY) +if(APPLE) + check_deps(USE_PORTMIDI PORTMIDI_INCLUDE_PATH PORTMIDI_LIBRARY) +elseif(WIN32) + check_deps(USE_PORTMIDI PORTMIDI_INCLUDE_PATH PORTTIME_INCLUDE_PATH PORTMIDI_LIBRARY) +else() + check_deps(USE_PORTMIDI PORTMIDI_INCLUDE_PATH PORTMIDI_LIBRARY PORTTIME_LIBRARY) +endif() + if(USE_PORTMIDI) - set(pmidi_LIBS ${PORTMIDI_LIBRARY} ${PORTTIME_LIBRARY}) + set(pmidi_LIBS ${PORTMIDI_LIBRARY}) include_directories(${PORTMIDI_INCLUDE_PATH}) - #if(NOT APPLE) - # list(APPEND pmidi_LIBS ${PORTTIME_LIBRARY}) - #endif() + if(LINUX) + list(APPEND pmidi_LIBS ${PORTTIME_LIBRARY}) + endif() if(WIN32) + include_directories(${PORTTIME_INCLUDE_PATH}) list(APPEND pmidi_LIBS ${CSOUND_WINDOWS_LIBRARIES}) endif() if(LINUX AND ALSA_LIBRARY) @@ -177,7 +158,7 @@ if(USE_JACK) set(rtjack_LIBS "") if(LINUX) - list(APPEND rtjack_LIBS + list(APPEND rtjack_LIBS ${JACK_LIBRARY} ${PTHREAD_LIBRARY}) elseif(WIN32) list(APPEND rtjack_LIBS @@ -193,9 +174,9 @@ if(USE_FLTK) set(widgets_SRCS FL_graph.cpp winFLTK.c widgets.cpp) make_plugin(widgets "${widgets_SRCS}" "${FLTK_LIBRARIES}") - add_dependency_to_framework(widgets ${FLTK_BASE_LIBRARY}) - add_dependency_to_framework(widgets ${FLTK_FORMS_LIBRARY}) - add_dependency_to_framework(widgets ${FLTK_IMAGES_LIBRARY}) + #add_dependency_to_framework(widgets ${FLTK_BASE_LIBRARY}) + #add_dependency_to_framework(widgets ${FLTK_FORMS_LIBRARY}) + #add_dependency_to_framework(widgets ${FLTK_IMAGES_LIBRARY}) endif() check_deps(BUILD_VIRTUAL_KEYBOARD FLTK_FOUND) @@ -210,9 +191,9 @@ virtual_keyboard/SliderBank.cpp virtual_keyboard/SliderData.cpp) make_plugin(virtual "${virtual_SRCS}" "${FLTK_LIBRARIES}") - add_dependency_to_framework(virtual ${FLTK_BASE_LIBRARY}) - add_dependency_to_framework(virtual ${FLTK_FORMS_LIBRARY}) - add_dependency_to_framework(virtual ${FLTK_IMAGES_LIBRARY}) + #add_dependency_to_framework(virtual ${FLTK_BASE_LIBRARY}) + #add_dependency_to_framework(virtual ${FLTK_FORMS_LIBRARY}) + #add_dependency_to_framework(virtual ${FLTK_IMAGES_LIBRARY}) include_directories(".") include_directories(${FLTK_INCLUDE_DIR}) endif() diff -Nru csound-6.01~dfsg/InOut/midirecv.c csound-6.02~dfsg/InOut/midirecv.c --- csound-6.01~dfsg/InOut/midirecv.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/InOut/midirecv.c 2014-01-07 16:54:20.000000000 +0000 @@ -373,7 +373,8 @@ int16 chan; defaultinsno = 0; - while (++defaultinsno <= (int) csound->engineState.maxinsno && + while (csound->engineState.instrtxtp && + ++defaultinsno <= (int) csound->engineState.maxinsno && csound->engineState.instrtxtp[defaultinsno] == NULL); if (defaultinsno > (int) csound->engineState.maxinsno) defaultinsno = 0; /* no instruments */ @@ -383,7 +384,8 @@ csound->m_chnbp[chan] = chn = (MCHNBLK*) mcalloc(csound, sizeof(MCHNBLK)); n = (int) chan + 1; /* if corresponding instrument exists, assign as insno, */ - if (n <= (int) csound->engineState.maxinsno && + if (csound->engineState.instrtxtp && + n <= (int) csound->engineState.maxinsno && csound->engineState.instrtxtp[n] != NULL) chn->insno = (int16) n; else if (defaultinsno > 0) diff -Nru csound-6.01~dfsg/InOut/rtauhal.c csound-6.02~dfsg/InOut/rtauhal.c --- csound-6.01~dfsg/InOut/rtauhal.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/InOut/rtauhal.c 2014-01-07 16:54:20.000000000 +0000 @@ -506,7 +506,7 @@ for(i=0;(unsigned int) i < devnos; i++){ if(devinfo[i].outchannels) { strncpy(list[n].device_name, devinfo[i].name, 63); - sprintf(tmp, "dac%d", devinfo[i].outdevnum); + sprintf(tmp, "adc%d", devinfo[i].outdevnum); strncpy(list[n].device_id, tmp, 63); strncpy(list[n].rt_module, s, 63); list[n].max_nchnls = devinfo[i].outchannels; diff -Nru csound-6.01~dfsg/InOut/widglobals.h csound-6.02~dfsg/InOut/widglobals.h --- csound-6.01~dfsg/InOut/widglobals.h 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/InOut/widglobals.h 2014-01-07 16:54:20.000000000 +0000 @@ -237,10 +237,6 @@ //GAB (MAKING snapshots_iterator GLOBAL IS A TEMPORARY UGLY HACK) vector::iterator snapshots_iterator; FLTKMETER *p_vumeter; -#ifdef CS_VSTHOST - vector VSTplugEditors; //GAB for the vst plugin custom editors - vector vstPlugins; //GAB to remove globals in VST plugins -#endif #ifdef CS_IMAGE vector Bm_image; // map of pointers to CAnyBmp objects diff -Nru csound-6.01~dfsg/InOut/windin.c csound-6.02~dfsg/InOut/windin.c --- csound-6.01~dfsg/InOut/windin.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/InOut/windin.c 2014-01-07 16:54:20.000000000 +0000 @@ -49,7 +49,7 @@ /* MYFLT iyinit = *p->iyinit; */ /* MYFLT ixinit = *p->ixinit; */ -/* if (UNLIKELY((p->timcount = (int)(csound->ekr* *p->iprd + FL(0.5)))<=0)) { */ +/* if (UNLIKELY((p->timcount = (int)(CS_EKR * *p->iprd + FL(0.5)))<=0)) { */ /* return csound->InitError(csound, Str("illegal iprd")); */ /* } */ /* if (UNLIKELY(iymin > iymax)) { /\* swap if wrong order *\/ */ diff -Nru csound-6.01~dfsg/OOps/aops.c csound-6.02~dfsg/OOps/aops.c --- csound-6.01~dfsg/OOps/aops.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/OOps/aops.c 2014-01-07 16:54:20.000000000 +0000 @@ -994,11 +994,7 @@ int cpsmidinn(CSOUND *csound, EVAL *p) { IGN(csound); - /* Convert Midi Note number to 8ve.decimal format */ - MYFLT oct = (*p->a / FL(12.0)) + FL(MIDINOTE0); - /* Lookup in cpsoct table */ - int32 loct = (int32)(oct * OCTRES); - *p->r = (MYFLT)CPSOCTL(loct); + *p->r = pow(FL(2.0), (*p->a - FL(69.0)) / FL(12.0)) * FL(440.0); return OK; } @@ -2058,7 +2054,7 @@ { IGN(csound); p->narg = p->INOCOUNT-1; - + return OK; } @@ -2073,7 +2069,7 @@ int startChan = (int) *p->kstartChan -1; MYFLT *sp = CS_SPOUT + startChan; int narg = p->narg; - + if (startChan < 0) return csound->PerfError(csound, p->h.insdshead, diff -Nru csound-6.01~dfsg/OOps/bus.c csound-6.02~dfsg/OOps/bus.c --- csound-6.01~dfsg/OOps/bus.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/OOps/bus.c 2014-01-07 16:54:20.000000000 +0000 @@ -28,6 +28,9 @@ #include #include #include +#ifdef NACL +#include +#endif #include "bus.h" #include "namedins.h" @@ -358,7 +361,7 @@ dsize = ((int)sizeof(MYFLT) * csound->ksmps); break; case CSOUND_STRING_CHANNEL: - dsize = INIT_STRING_CHANNEL_DATASIZE; + dsize = ((int)sizeof(STRINGDAT)); break; case CSOUND_PVS_CHANNEL: dsize = ((int)sizeof(PVSDATEXT)); @@ -542,7 +545,7 @@ pp->hints.behav = CSOUND_CONTROL_CHANNEL_NO_HINTS; return 0; } - if (hints.behav & CSOUND_CONTROL_CHANNEL_INT) { + if (hints.behav == CSOUND_CONTROL_CHANNEL_INT) { hints.dflt = (MYFLT) ((int32) MYFLT2LRND(hints.dflt)); hints.min = (MYFLT) ((int32) MYFLT2LRND(hints.min)); hints.max = (MYFLT) ((int32) MYFLT2LRND(hints.max)); @@ -1036,9 +1039,9 @@ hints.behav = CSOUND_CONTROL_CHANNEL_NO_HINTS; if ((int)MYFLT2LRND(*(p->itype)) == 1) hints.behav = CSOUND_CONTROL_CHANNEL_INT; - if ((int)MYFLT2LRND(*(p->itype)) == 2) + else if ((int)MYFLT2LRND(*(p->itype)) == 2) hints.behav |= CSOUND_CONTROL_CHANNEL_LIN; - if ((int)MYFLT2LRND(*(p->itype)) == 3) + else if ((int)MYFLT2LRND(*(p->itype)) == 3) hints.behav |= CSOUND_CONTROL_CHANNEL_EXP; if ((int)MYFLT2LRND(*(p->itype)) != 0) { hints.attributes = 0; @@ -1165,10 +1168,7 @@ /* free the allocated memory (we will not use it) */ mfree(csound, chn->data); /* point to the arg var */ - if(type == CSOUND_STRING_CHANNEL) - chn->data = (MYFLT *) ((STRINGDAT *)p->arg)->data; - else - chn->data = p->arg; + chn->data = p->arg; /* if control channel, set additional parameters */ if ((type & CSOUND_CHANNEL_TYPE_MASK) != CSOUND_CONTROL_CHANNEL) diff -Nru csound-6.01~dfsg/OOps/diskin2.c csound-6.02~dfsg/OOps/diskin2.c --- csound-6.01~dfsg/OOps/diskin2.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/OOps/diskin2.c 2014-01-07 16:54:20.000000000 +0000 @@ -224,7 +224,7 @@ int diskin2_init(CSOUND *csound, DISKIN2 *p) { p->SkipInit = *p->iSkipInit; - p->WinSize = *p->iWinSize; + p->WinSize = *p->iWinSize; p->BufSize = *p->iBufSize; p->fforceSync = *p->forceSync; return diskin2_init_(csound,p,0); @@ -232,7 +232,7 @@ int diskin2_init_S(CSOUND *csound, DISKIN2 *p) { p->SkipInit = *p->iSkipInit; - p->WinSize = *p->iWinSize; + p->WinSize = *p->iWinSize; p->BufSize = *p->iBufSize; p->fforceSync = *p->forceSync; return diskin2_init_(csound,p,1); @@ -242,7 +242,7 @@ int diskin_init(CSOUND *csound, DISKIN2 *p){ p->SkipInit = *p->iWinSize; - p->WinSize = 2; + p->WinSize = 2; p->BufSize = 0; p->fforceSync = 0; return diskin2_init_(csound,p,0); @@ -250,7 +250,7 @@ int diskin_init_S(CSOUND *csound, DISKIN2 *p){ p->SkipInit = *p->iWinSize; - p->WinSize = 2; + p->WinSize = 2; p->BufSize = 0; p->fforceSync = 0; return diskin2_init_(csound,p,1); @@ -1412,11 +1412,12 @@ } static inline void diskin2_get_sample_array(CSOUND *csound, - DISKIN2_ARRAY *p, int32 fPos, int n, MYFLT scl) + DISKIN2_ARRAY *p, int32 fPos, + int n, MYFLT scl) { int bufPos, i; int ksmps = CS_KSMPS; - MYFLT *aOut = (MYFLT *) p->aOut->data; + MYFLT *aOut = (MYFLT *) p->aOut->data; if (p->wrapMode) { if (UNLIKELY(fPos >= p->fileLength)){ @@ -1433,7 +1434,7 @@ /* recalculate buffer position */ bufPos = (int)(fPos - p->bufStartPos); } - + /* copy all channels from buffer */ if(p->aOut_buf == NULL){ if (p->nChannels == 1) { @@ -1479,7 +1480,8 @@ DISKIN_INST **top, *current, *prv; if ((top = (DISKIN_INST **) - csound->QueryGlobalVariable(csound, "DISKIN_INST_ARRAY")) == NULL) return NOTOK; + csound->QueryGlobalVariable(csound, "DISKIN_INST_ARRAY")) == NULL) + return NOTOK; current = *top; prv = NULL; while(current->diskin != (DISKIN2 *)p) { @@ -1492,7 +1494,8 @@ if(*top == NULL) { int *start; pthread_t *pt; - start = (int *) csound->QueryGlobalVariable(csound,"DISKIN_THREAD_START_ARRAY"); + start = (int *) csound->QueryGlobalVariable(csound, + "DISKIN_THREAD_START_ARRAY"); *start = 0; pt = (pthread_t *) csound->QueryGlobalVariable(csound,"DISKIN_PTHREAD_ARRAY"); //csound->Message(csound, "dealloc %p %d\n", start, *start); @@ -1702,7 +1705,8 @@ DISKIN_INST *current = (DISKIN_INST *) p; int wakeup = 1000*current->csound->ksmps/current->csound->esr; int *start = - current->csound->QueryGlobalVariable(current->csound,"DISKIN_THREAD_START_ARRAY"); + current->csound->QueryGlobalVariable(current->csound, + "DISKIN_THREAD_START_ARRAY"); while(*start){ current = (DISKIN_INST *) p; csoundSleep(wakeup > 0 ? wakeup : 1); @@ -1723,7 +1727,7 @@ SF_INFO sfinfo; int n; ARRAYDAT *t = p->aOut; - + /* if already open, close old file first */ if (p->fdch.fd != NULL) { /* skip initialisation if requested */ @@ -1781,7 +1785,7 @@ return csound->InitError(csound, Str("diskin2: output array too small")); } - + /* skip initialisation if requested */ if (p->initDone && *(p->iSkipInit) != FL(0.0)) return OK; @@ -1857,13 +1861,18 @@ memset(p->aOut_buf, 0, n); p->aOut_bufsize = CS_KSMPS; - if ((top=(DISKIN_INST **)csound->QueryGlobalVariable(csound, - "DISKIN_INST_ARRAY")) == NULL){ - csound->CreateGlobalVariable(csound, "DISKIN_INST_ARRAY", sizeof(DISKIN_INST *)); - top = (DISKIN_INST **) csound->QueryGlobalVariable(csound, "DISKIN_INST_ARRAY"); + if ((top=(DISKIN_INST **) + csound->QueryGlobalVariable(csound, + "DISKIN_INST_ARRAY")) == NULL){ + csound->CreateGlobalVariable(csound, + "DISKIN_INST_ARRAY", sizeof(DISKIN_INST *)); + top = (DISKIN_INST **) csound->QueryGlobalVariable(csound, + "DISKIN_INST_ARRAY"); *top = (DISKIN_INST *) mcalloc(csound, sizeof(DISKIN_INST)); - csound->CreateGlobalVariable(csound, "DISKIN_PTHREAD_ARRAY", sizeof(pthread_t)); - csound->CreateGlobalVariable(csound, "DISKIN_THREAD_START_ARRAY", sizeof(int)); + csound->CreateGlobalVariable(csound, + "DISKIN_PTHREAD_ARRAY", sizeof(pthread_t)); + csound->CreateGlobalVariable(csound, + "DISKIN_THREAD_START_ARRAY", sizeof(int)); current = *top; } else { @@ -1878,15 +1887,17 @@ current->diskin = (DISKIN2 *) p; current->nxt = NULL; - if( *(start = csound->QueryGlobalVariable(csound, - "DISKIN_THREAD_START_ARRAY")) == 0) { + if (*(start = + csound->QueryGlobalVariable(csound, + "DISKIN_THREAD_START_ARRAY")) == 0) { void *diskin_io_thread(void *p); *start = 1; pthread_create((pthread_t *)csound->QueryGlobalVariable(csound, - "DISKIN_PTHREAD_ARRAY"), + "DISKIN_PTHREAD_ARRAY"), NULL, diskin_io_thread_array, *top); } - csound->RegisterDeinitCallback(csound, (DISKIN2 *) p, diskin2_async_deinit_array); + csound->RegisterDeinitCallback(csound, (DISKIN2 *) p, + diskin2_async_deinit_array); p->async = 1; /* print file information */ @@ -2148,7 +2159,7 @@ int diskin2_init_array_I(CSOUND *csound, DISKIN2_ARRAY *p) { p->SkipInit = *p->iSkipInit; - p->WinSize = *p->iWinSize; + p->WinSize = *p->iWinSize; p->BufSize = *p->iBufSize; p->fforceSync = *p->forceSync; return diskin2_init_array(csound,p,0); @@ -2156,7 +2167,7 @@ int diskin2_init_array_S(CSOUND *csound, DISKIN2_ARRAY *p) { p->SkipInit = *p->iSkipInit; - p->WinSize = *p->iWinSize; + p->WinSize = *p->iWinSize; p->BufSize = *p->iBufSize; p->fforceSync = *p->forceSync; return diskin2_init_array(csound,p,1); @@ -2166,7 +2177,7 @@ int diskin_init_array_I(CSOUND *csound, DISKIN2_ARRAY *p){ p->SkipInit = *p->iWinSize; - p->WinSize = 2; + p->WinSize = 2; p->BufSize = 0; p->fforceSync = 0; return diskin2_init_array(csound,p,0); @@ -2174,7 +2185,7 @@ int diskin_init_array_S(CSOUND *csound, DISKIN2_ARRAY *p){ p->SkipInit = *p->iWinSize; - p->WinSize = 2; + p->WinSize = 2; p->BufSize = 0; p->fforceSync = 0; return diskin2_init_array(csound,p,1); diff -Nru csound-6.01~dfsg/OOps/disprep.c csound-6.02~dfsg/OOps/disprep.c --- csound-6.01~dfsg/OOps/disprep.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/OOps/disprep.c 2014-01-07 16:54:20.000000000 +0000 @@ -87,7 +87,7 @@ char strmsg[256]; if (p->h.optext->t.intype == 'k') - npts = (int32)(*p->iprd * csound->ekr); + npts = (int32)(*p->iprd * CS_EKR); else npts = (int32)(*p->iprd * csound->esr); if (UNLIKELY(npts <= 0)) { return csound->InitError(csound, Str("illegal iprd in display")); @@ -247,7 +247,7 @@ return csound->InitError(csound, Str("window size must be power of two")); } if (p->h.optext->t.intype == 'k') - step_size = (int32)(*p->iprd * csound->ekr); + step_size = (int32)(*p->iprd * CS_EKR); else step_size = (int32)(*p->iprd * csound->esr); if (UNLIKELY(step_size <= 0)) { return csound->InitError(csound, Str("illegal iprd in ffy display")); @@ -437,9 +437,9 @@ MYFLT b, iperiod = *p->iprd; char strmsg[256]; - if (UNLIKELY((p->timcount = (int)(csound->ekr * iperiod)) <= 0)) + if (UNLIKELY((p->timcount = (int)(CS_EKR * iperiod)) <= 0)) return csound->InitError(csound, Str("illegal iperiod")); - if (UNLIKELY((p->dtimcnt = (int)(csound->ekr * *p->idisprd)) < 0)) + if (UNLIKELY((p->dtimcnt = (int)(CS_EKR * *p->idisprd)) < 0)) return csound->InitError(csound, Str("illegal idisprd")); if (UNLIKELY((p->tweek = *p->itweek) <= 0)) return csound->InitError(csound, Str("illegal itweek")); @@ -537,7 +537,7 @@ #endif p->thresh = *p->ithresh; /* record incoming loudness threshold */ p->xfdbak = *p->ixfdbak; /* & expectation feedback fraction */ - p->tempscal = FL(60.0) * csound->ekr / p->timcount; + p->tempscal = FL(60.0) * CS_EKR / p->timcount; p->avglam = p->tempscal / *p->istartempo; /* init the tempo factors */ p->tempo = FL(0.0); p->hcur = p->hbeg; /* init the circular ptrs */ diff -Nru csound-6.01~dfsg/OOps/dumpf.c csound-6.02~dfsg/OOps/dumpf.c --- csound-6.01~dfsg/OOps/dumpf.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/OOps/dumpf.c 2014-01-07 16:54:20.000000000 +0000 @@ -55,7 +55,7 @@ if (UNLIKELY(p->fdch.fd == NULL)) return csound->InitError(csound, Str("Cannot open %s"), soundoname); fdrecord(csound, &p->fdch); - if ((p->timcount = (int32)(*p->iprd * csound->ekr)) <= 0) + if ((p->timcount = (int32)(*p->iprd * CS_EKR)) <= 0) p->timcount = 1; p->countdown = p->timcount; return OK; @@ -84,7 +84,7 @@ if (UNLIKELY(p->fdch.fd == NULL)) return csound->InitError(csound, Str("Cannot open %s"), soundoname); fdrecord(csound, &p->fdch); - if ((p->timcount = (int32)(*p->iprd * csound->ekr)) <= 0) + if ((p->timcount = (int32)(*p->iprd * CS_EKR)) <= 0) p->timcount = 1; p->countdown = p->timcount; return OK; @@ -109,7 +109,7 @@ if (UNLIKELY(p->fdch.fd == NULL)) return csound->InitError(csound, Str("Cannot open %s"), soundoname); fdrecord(csound, &p->fdch); - if ((p->timcount = (int32)(*p->iprd * csound->ekr)) <= 0) + if ((p->timcount = (int32)(*p->iprd * CS_EKR)) <= 0) p->timcount = 1; p->countdown = p->timcount; return OK; @@ -137,7 +137,7 @@ if (UNLIKELY(p->fdch.fd == NULL)) return csound->InitError(csound, Str("Cannot open %s"), soundoname); fdrecord(csound, &p->fdch); - if ((p->timcount = (int32)(*p->iprd * csound->ekr)) <= 0) + if ((p->timcount = (int32)(*p->iprd * CS_EKR)) <= 0) p->timcount = 1; p->countdown = p->timcount; return OK; @@ -163,7 +163,7 @@ if (UNLIKELY(p->fdch.fd == NULL)) return csound->InitError(csound, Str("Cannot open %s"), soundoname); fdrecord(csound, &p->fdch); - if ((p->timcount = (int32)(*p->iprd * csound->ekr)) <= 0) + if ((p->timcount = (int32)(*p->iprd * CS_EKR)) <= 0) p->timcount = 1; p->countdown = p->timcount; return OK; @@ -192,7 +192,7 @@ if (UNLIKELY(p->fdch.fd == NULL)) return csound->InitError(csound, Str("Cannot open %s"), soundoname); fdrecord(csound, &p->fdch); - if ((p->timcount = (int32)(*p->iprd * csound->ekr)) <= 0) + if ((p->timcount = (int32)(*p->iprd * CS_EKR)) <= 0) p->timcount = 1; p->countdown = p->timcount; return OK; @@ -217,7 +217,7 @@ if (p->fdch.fd == NULL) return csound->InitError(csound, Str("Cannot open %s"), soundoname); fdrecord(csound, &p->fdch); - if ((p->timcount = (int32)(*p->iprd * csound->ekr)) <= 0) + if ((p->timcount = (int32)(*p->iprd * CS_EKR)) <= 0) p->timcount = 1; p->countdown = p->timcount; return OK; @@ -244,7 +244,7 @@ if (p->fdch.fd == NULL) return csound->InitError(csound, Str("Cannot open %s"), soundoname); fdrecord(csound, &p->fdch); - if ((p->timcount = (int32)(*p->iprd * csound->ekr)) <= 0) + if ((p->timcount = (int32)(*p->iprd * CS_EKR)) <= 0) p->timcount = 1; p->countdown = p->timcount; return OK; @@ -393,7 +393,7 @@ if (UNLIKELY(p->fdch.fd == NULL)) return csound->InitError(csound, Str("Cannot open %s"), soundiname); fdrecord(csound, &p->fdch); - if ((p->timcount = (int32)(*p->iprd * csound->ekr)) <= 0) + if ((p->timcount = (int32)(*p->iprd * CS_EKR)) <= 0) p->timcount = 1; p->countdown = 0; p->k[0] = p->k[1] = p->k[2] = p->k[3] = FL(0.0); @@ -419,7 +419,7 @@ if (UNLIKELY(p->fdch.fd == NULL)) return csound->InitError(csound, Str("Cannot open %s"), soundiname); fdrecord(csound, &p->fdch); - if ((p->timcount = (int32)(*p->iprd * csound->ekr)) <= 0) + if ((p->timcount = (int32)(*p->iprd * CS_EKR)) <= 0) p->timcount = 1; p->countdown = 0; p->k[0] = p->k[1] = p->k[2] = p->k[3] = FL(0.0); @@ -445,7 +445,7 @@ if (UNLIKELY(p->fdch.fd == NULL)) return csound->InitError(csound, Str("Cannot open %s"), soundiname); fdrecord(csound, &p->fdch); - if ((p->timcount = (int32)(*p->iprd * csound->ekr)) <= 0) + if ((p->timcount = (int32)(*p->iprd * CS_EKR)) <= 0) p->timcount = 1; p->countdown = 0; p->k[0] = p->k[1] = p->k[2] = p->k[3] = FL(0.0); @@ -473,7 +473,7 @@ if (UNLIKELY(p->fdch.fd == NULL)) return csound->InitError(csound, Str("Cannot open %s"), soundiname); fdrecord(csound, &p->fdch); - if ((p->timcount = (int32)(*p->iprd * csound->ekr)) <= 0) + if ((p->timcount = (int32)(*p->iprd * CS_EKR)) <= 0) p->timcount = 1; p->countdown = 0; p->k[0] = p->k[1] = p->k[2] = p->k[3] = FL(0.0); @@ -499,7 +499,7 @@ if (UNLIKELY(p->fdch.fd == NULL)) return csound->InitError(csound, Str("Cannot open %s"), soundiname); fdrecord(csound, &p->fdch); - if ((p->timcount = (int32)(*p->iprd * csound->ekr)) <= 0) + if ((p->timcount = (int32)(*p->iprd * CS_EKR)) <= 0) p->timcount = 1; p->countdown = 0; p->k[0] = p->k[1] = p->k[2] = p->k[3] = FL(0.0); @@ -527,7 +527,7 @@ if (UNLIKELY(p->fdch.fd == NULL)) return csound->InitError(csound, Str("Cannot open %s"), soundiname); fdrecord(csound, &p->fdch); - if ((p->timcount = (int32)(*p->iprd * csound->ekr)) <= 0) + if ((p->timcount = (int32)(*p->iprd * CS_EKR)) <= 0) p->timcount = 1; p->countdown = 0; p->k[0] = p->k[1] = p->k[2] = p->k[3] = FL(0.0); @@ -553,7 +553,7 @@ if (UNLIKELY(p->fdch.fd == NULL)) return csound->InitError(csound, Str("Cannot open %s"), soundiname); fdrecord(csound, &p->fdch); - if ((p->timcount = (int32)(*p->iprd * csound->ekr)) <= 0) + if ((p->timcount = (int32)(*p->iprd * CS_EKR)) <= 0) p->timcount = 1; p->countdown = 0; p->k[0] = p->k[1] = p->k[2] = p->k[3] = FL(0.0); @@ -581,7 +581,7 @@ if (UNLIKELY(p->fdch.fd == NULL)) return csound->InitError(csound, Str("Cannot open %s"), soundiname); fdrecord(csound, &p->fdch); - if ((p->timcount = (int32)(*p->iprd * csound->ekr)) <= 0) + if ((p->timcount = (int32)(*p->iprd * CS_EKR)) <= 0) p->timcount = 1; p->countdown = 0; p->k[0] = p->k[1] = p->k[2] = p->k[3] = FL(0.0); @@ -754,7 +754,7 @@ if (UNLIKELY(p->fdch.fd == NULL)) return csound->InitError(csound, Str("Cannot open %s"), soundiname); fdrecord(csound, &p->fdch); - if ((p->timcount = (int32)(*p->iprd * csound->ekr)) <= 0) + if ((p->timcount = (int32)(*p->iprd * CS_EKR)) <= 0) p->timcount = 1; p->countdown = 0; p->lasts = (char*)csound->Calloc(csound, INITSIZE); @@ -781,7 +781,7 @@ if (UNLIKELY(p->fdch.fd == NULL)) return csound->InitError(csound, Str("Cannot open %s"), soundiname); fdrecord(csound, &p->fdch); - if ((p->timcount = (int32)(*p->iprd * csound->ekr)) <= 0) + if ((p->timcount = (int32)(*p->iprd * CS_EKR)) <= 0) p->timcount = 1; p->countdown = 0; p->lasts = (char*)csound->Malloc(csound, INITSIZE); diff -Nru csound-6.01~dfsg/OOps/goto_ops.c csound-6.02~dfsg/OOps/goto_ops.c --- csound-6.01~dfsg/OOps/goto_ops.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/OOps/goto_ops.c 2014-01-07 16:54:20.000000000 +0000 @@ -94,8 +94,8 @@ int timset(CSOUND *csound, TIMOUT *p) { - if (UNLIKELY((p->cnt1 = (int32)(*p->idel * csound->ekr + FL(0.5))) < 0L || - (p->cnt2 = (int32)(*p->idur * csound->ekr + FL(0.5))) < 0L)) + if (UNLIKELY((p->cnt1 = (int32)(*p->idel * CS_EKR + FL(0.5))) < 0L || + (p->cnt2 = (int32)(*p->idur * CS_EKR + FL(0.5))) < 0L)) return csoundInitError(csound, Str("negative time period")); return OK; } diff -Nru csound-6.01~dfsg/OOps/midiout.c csound-6.02~dfsg/OOps/midiout.c --- csound-6.01~dfsg/OOps/midiout.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/OOps/midiout.c 2014-01-07 16:54:20.000000000 +0000 @@ -69,7 +69,7 @@ int xtratim(CSOUND *csound, XTRADUR *p) { int *xtra = &(p->h.insdshead->xtratim); - int tim = (int)(*p->extradur * csound->ekr); + int tim = (int)(*p->extradur * p->h.insdshead->ekr); if (*xtra < tim) /* gab-a5 revised */ *xtra = tim; return OK; @@ -77,7 +77,7 @@ int mclock_set(CSOUND *csound, MCLOCK *p) { - p->period= csound->ekr / *p->freq; + p->period= CS_EKR / *p->freq; p->clock_tics = p->period; p->beginning_flag = TRUE; return OK; diff -Nru csound-6.01~dfsg/OOps/remote.c csound-6.02~dfsg/OOps/remote.c --- csound-6.01~dfsg/OOps/remote.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/OOps/remote.c 2014-01-07 16:54:20.000000000 +0000 @@ -575,6 +575,7 @@ EVTBLK *cpp = (EVTBLK *)bp->data; /* align an EVTBLK struct */ int nn; MYFLT *f, *g; + cpp->pinstance = NULL; cpp->strarg = NULL; /* copy the initial header */ cpp->scnt = 0; cpp->opcod = evt->opcod; diff -Nru csound-6.01~dfsg/OOps/schedule.c csound-6.02~dfsg/OOps/schedule.c --- csound-6.01~dfsg/OOps/schedule.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/OOps/schedule.c 2014-01-07 16:54:20.000000000 +0000 @@ -357,6 +357,7 @@ int i, argnum; EVTBLK evt; char name[512]; + memset(&evt, 0, sizeof(EVTBLK)); if (p->timrem > 0) p->timrem--; @@ -365,7 +366,7 @@ /* Check if mintime has changed */ if (p->prvmintim != *p->mintime) { - int32 timrem = (int32) (*p->mintime * csound->ekr + FL(0.5)); + int32 timrem = (int32) (*p->mintime * CS_EKR + FL(0.5)); if (timrem > 0) { /* Adjust countdown for new mintime */ p->timrem += timrem - p->prvktim; @@ -430,7 +431,7 @@ } /* Reset min pause counter */ if (*p->mintime > FL(0.0)) - p->timrem = (int32) (*p->mintime * csound->ekr + FL(0.5)); + p->timrem = (int32) (*p->mintime * CS_EKR + FL(0.5)); else p->timrem = 0; return diff -Nru csound-6.01~dfsg/OOps/str_ops.c csound-6.02~dfsg/OOps/str_ops.c --- csound-6.01~dfsg/OOps/str_ops.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/OOps/str_ops.c 2014-01-07 16:54:20.000000000 +0000 @@ -27,6 +27,10 @@ #define CSOUND_STR_OPS_C 1 #include "str_ops.h" #include +#ifdef HAVE_CURL +#include +#include "corfile.h" +#endif #define STRSMAX 8 @@ -1003,3 +1007,29 @@ return OK; } + +#ifdef HAVE_CURL +int str_from_url(CSOUND *csound, STRCPY_OP *p) +{ + char *newVal = p->str->data; + if (strstr(newVal, ":/")==NULL) return strcpy_opcode_S(csound, p); + { + CORFIL *mm = copy_url_corefile(csound, newVal,0); + int len = corfile_length(mm); + if (p->r->data == NULL) { + p->r->data = cs_strdup(csound, corfile_body(mm)); + p->r->size = len + 1; + goto cleanup; + } + if (UNLIKELY(len >= p->r->size)) { + mfree(csound, p->r->data); + p->r->data = cs_strdup(csound, corfile_body(mm)); + p->r->size = len + 1; + } + else strcpy((char*) p->r->data, corfile_body(mm)); + cleanup: + corfile_rm(&mm); + return OK; + } +} +#endif diff -Nru csound-6.01~dfsg/OOps/ugens2.c csound-6.02~dfsg/OOps/ugens2.c --- csound-6.01~dfsg/OOps/ugens2.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/OOps/ugens2.c 2014-01-07 16:54:20.000000000 +0000 @@ -1011,7 +1011,7 @@ } p->ftp = ftp; p->phs = 0; - p->dcnt = (int32)(*p->idel * csound->ekr); + p->dcnt = (int32)(*p->idel * CS_EKR); p->kinc = (int32) (CS_KICVT / *p->idur); if (p->kinc==0) p->kinc = 1; return OK; @@ -1136,6 +1136,48 @@ Str("osciln: not initialised")); } +static int fill_func_from_array(ARRAYDAT *a, FUNC *f) +{ + int lobits, ltest, flen, i; + int nonpowof2_flag = 0; + + flen = f->flen = a->sizes[0]; + flen &= -2L; + for (ltest = flen, lobits = 0; + (ltest & MAXLEN) == 0L; + lobits++, ltest <<= 1) + ; + if (UNLIKELY(ltest != MAXLEN)) { + lobits = 0; + nonpowof2_flag = 1; + } + f->ftable = a->data; + f->lenmask = ((flen & (flen - 1L)) ? + 0L : (flen - 1L)); /* init hdr w powof2 data */ + f->lobits = lobits; + i = (1 << lobits); + f->lomask = (int32) (i - 1); + f->lodiv = FL(1.0) / (MYFLT) i; /* & other useful vals */ + f->nchanls = 1; /* presume mono for now */ + f->flenfrms = flen; + if (nonpowof2_flag) + f->lenmask = 0xFFFFFFFF; + return OK; +} + +int oscsetA(CSOUND *csound, OSC *p) +{ + FUNC *ftp = &p->FF; + int res; + + if (*p->iphs >= 0) + p->lphs = ((int32)(*p->iphs * FMAXLEN)) & PHMASK; + //check p->ifn is a valid array with power-of-two length + p->ftp = ftp; + res = fill_func_from_array((ARRAYDAT*)p->ifn, ftp); + return OK; +} + int oscset(CSOUND *csound, OSC *p) { FUNC *ftp; diff -Nru csound-6.01~dfsg/OOps/ugens4.c csound-6.02~dfsg/OOps/ugens4.c --- csound-6.01~dfsg/OOps/ugens4.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/OOps/ugens4.c 2014-01-07 16:54:20.000000000 +0000 @@ -610,7 +610,8 @@ { /* IV - Jul 11 2002 */ *p->ar = *p->base + p->num1 * *p->xamp; /* rslt = num * amp */ - p->phs += (int32)(*p->xcps * CS_KICVT); /* phs += inc */ + p->phs += (long)(*p->xcps * CS_KICVT); /* phs += inc */ + if (p->phs >= MAXLEN) { /* when phs overflows, */ p->phs &= PHMASK; /* mod the phs */ if (!p->new) { @@ -631,7 +632,7 @@ int randh(CSOUND *csound, RANDH *p) { - int32 phs = p->phs, inc; + long phs = p->phs, inc; uint32_t offset = p->h.insdshead->ksmps_offset; uint32_t early = p->h.insdshead->ksmps_no_end; uint32_t n, nsmps = CS_KSMPS; @@ -646,7 +647,7 @@ nsmps -= early; memset(&ar[nsmps], '\0', early*sizeof(MYFLT)); } - inc = (int32)(*cpsp++ * csound->sicvt); + inc = (long)(*cpsp++ * csound->sicvt); for (n=offset;nnum1 * *ampp; /* rslt = num * amp */ @@ -654,7 +655,7 @@ ampp++; phs += inc; /* phs += inc */ if (p->cpscod) - inc = (int32)(*cpsp++ * csound->sicvt); + inc = (long)(*cpsp++ * csound->sicvt); if (phs >= MAXLEN) { /* when phs o'flows, */ phs &= PHMASK; if (!p->new) { @@ -733,7 +734,7 @@ { /* rslt = (num1 + diff*phs) * amp */ /* IV - Jul 11 2002 */ *p->ar = *p->base + (p->num1 + (MYFLT)p->phs * p->dfdmax) * *p->xamp; - p->phs += (int32)(*p->xcps * CS_KICVT); /* phs += inc */ + p->phs += (long)(*p->xcps * CS_KICVT); /* phs += inc */ if (p->phs >= MAXLEN) { /* when phs overflows, */ p->phs &= PHMASK; /* mod the phs */ if (!p->new) { @@ -757,7 +758,7 @@ int randi(CSOUND *csound, RANDI *p) { - int32 phs = p->phs, inc; + long phs = p->phs, inc; uint32_t offset = p->h.insdshead->ksmps_offset; uint32_t early = p->h.insdshead->ksmps_no_end; uint32_t n, nsmps = CS_KSMPS; @@ -772,7 +773,7 @@ nsmps -= early; memset(&ar[nsmps], '\0', early*sizeof(MYFLT)); } - inc = (int32)(*cpsp++ * csound->sicvt); + inc = (long)(*cpsp++ * csound->sicvt); for (n=offset;nnum1 + (MYFLT)phs * p->dfdmax) * *ampp; @@ -780,7 +781,7 @@ ampp++; phs += inc; /* phs += inc */ if (p->cpscod) - inc = (int32)(*cpsp++ * csound->sicvt); /* (nxt inc) */ + inc = (long)(*cpsp++ * csound->sicvt); /* (nxt inc) */ if (phs >= MAXLEN) { /* when phs o'flows, */ phs &= PHMASK; if (!p->new) { diff -Nru csound-6.01~dfsg/OOps/ugens5.c csound-6.02~dfsg/OOps/ugens5.c --- csound-6.01~dfsg/OOps/ugens5.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/OOps/ugens5.c 2014-01-07 16:54:20.000000000 +0000 @@ -342,28 +342,6 @@ double c3p1, c3t4, omc3, c2sqr; double yt1, yt2, c1 = p->c1, c2 = p->c2, c3 = p->c3; - if (*p->kcf != (MYFLT)p->prvcf) { - p->prvcf = (double)*p->kcf; - p->cosf = cos(p->prvcf * (double)(csound->tpidsr)); - flag = 1; /* Mark as changed */ - } - if (*p->kbw != (MYFLT)p->prvbw) { - p->prvbw = (double)*p->kbw; - c3 = p->c3 = exp(p->prvbw * (double)(csound->mtpdsr)); - flag = 1; /* Mark as changed */ - } - if (flag) { - c3p1 = c3 + 1.0; - c3t4 = c3 * 4.0; - omc3 = 1.0 - c3; - c2 = p->c2 = c3t4 * p->cosf / c3p1; /* -B, so + below */ - c2sqr = c2 * c2; - if (p->scale == 1) - c1 = p->c1 = omc3 * sqrt(1.0 - c2sqr / c3t4); - else if (p->scale == 2) - c1 = p->c1 = sqrt((c3p1*c3p1-c2sqr) * omc3/c3p1); - else c1 = p->c1 = 1.0; - } asig = p->asig; ar = p->ar; if (UNLIKELY(offset)) memset(ar, '\0', offset*sizeof(MYFLT)); @@ -373,7 +351,33 @@ } yt1 = p->yt1; yt2 = p->yt2; for (n=offset; nkcf[n] : *p->kcf; + MYFLT bw = XINARG3 ? p->kbw[n] : *p->kbw; + if (cf != (MYFLT)p->prvcf) { + p->prvcf = (double)cf; + p->cosf = cos(cf * (double)(csound->tpidsr)); + flag = 1; /* Mark as changed */ + } + if (bw != (MYFLT)p->prvbw) { + p->prvbw = (double)bw; + c3 = p->c3 = exp(bw * (double)(csound->mtpdsr)); + flag = 1; /* Mark as changed */ + } + if (flag) { + c3p1 = c3 + 1.0; + c3t4 = c3 * 4.0; + omc3 = 1.0 - c3; + c2 = p->c2 = c3t4 * p->cosf / c3p1; /* -B, so + below */ + c2sqr = c2 * c2; + if (p->scale == 1) + c1 = p->c1 = omc3 * sqrt(1.0 - c2sqr / c3t4); + else if (p->scale == 2) + c1 = p->c1 = sqrt((c3p1*c3p1-c2sqr) * omc3/c3p1); + else c1 = p->c1 = 1.0; + flag = 0; + } + yt0 = c1 * ((double)asig[n]) + c2 * yt1 - c3 * yt2; ar[n] = (MYFLT)yt0; yt2 = yt1; yt1 = yt0; @@ -415,29 +419,6 @@ double c3p1, c3t4, omc3, c2sqr; double *yt1, *yt2, c1,c2,c3; - if (*p->kcf != (MYFLT)p->prvcf) { - p->prvcf = (double)*p->kcf; - p->cosf = cos(p->prvcf * (double)(csound->tpidsr)); - flag = 1; - } - if (*p->kbw != (MYFLT)p->prvbw) { - p->prvbw = (double)*p->kbw; - p->c3 = exp(p->prvbw * (double)(csound->mtpdsr)); - flag = 1; - } - if (flag) { - c3p1 = p->c3 + 1.0; - c3t4 = p->c3 * 4.0; - omc3 = 1.0 - p->c3; - p->c2 = c3t4 * p->cosf / c3p1; /* -B, so + below */ - c2sqr = p->c2 * p->c2; - if (p->scale == 1) - p->c1 = omc3 * sqrt(1.0 - (c2sqr / c3t4)); - else if (p->scale == 2) - p->c1 = sqrt((c3p1*c3p1-c2sqr) * omc3/c3p1); - else p->c1 = 1.0; - } - ar = p->ar; c1 = p->c1; c2 = p->c2; @@ -453,20 +434,46 @@ } for (j=0; j< p->loop; j++) { for (n=offset; nkcf[n] : *p->kcf; + MYFLT bw = XINARG3 ? p->kbw[n] : *p->kbw; + if (cf != (MYFLT)p->prvcf) { + p->prvcf = (double)cf; + p->cosf = cos(cf * (double)(csound->tpidsr)); + flag = 1; + } + if (bw != (MYFLT)p->prvbw) { + p->prvbw = (double)bw; + c3 = exp(bw * (double)(csound->mtpdsr)); + flag = 1; + } + if (flag) { + c3p1 = c3 + 1.0; + c3t4 = c3 * 4.0; + omc3 = 1.0 - c3; + c2 = c3t4 * p->cosf / c3p1; /* -B, so + below */ + c2sqr = c2 * c2; + if (p->scale == 1) + c1 = omc3 * sqrt(1.0 - (c2sqr / c3t4)); + else if (p->scale == 2) + c1 = sqrt((c3p1*c3p1-c2sqr) * omc3/c3p1); + else c1 = 1.0; + flag =0; + } + x = c1 * ((double)ar[n]) + c2 * yt1[j] - c3 * yt2[j]; yt2[j] = yt1[j]; ar[n] = (MYFLT)x; yt1[j] = x; } } + p->c1 = c1; p->c2 = c2; p->c3 = c3; return OK; } int kareson(CSOUND *csound, RESON *p) { uint32_t flag = 0; - double c3p1, c3t4, omc3, c2sqr, D = 2.0; /* 1/RMS = root2 (rand) */ + double c3p1, c3t4, omc3, c2sqr; //, D = 2.0; /* 1/RMS = root2 (rand) */ /* or 1/.5 (sine) */ double yt1, yt2, c1, c2, c3; IGN(csound); @@ -490,7 +497,7 @@ if (p->scale == 1) /* i.e. 1 - A(reson) */ p->c1 = 1.0 - omc3 * sqrt(1.0 - c2sqr / c3t4); else if (p->scale == 2) /* i.e. D - A(reson) */ - p->c1 = D - sqrt((c3p1*c3p1-c2sqr)*omc3/c3p1); + p->c1 = 2.0 - sqrt((c3p1*c3p1-c2sqr)*omc3/c3p1); else p->c1 = 0.0; /* cannot tell */ } @@ -506,7 +513,7 @@ double sig = (double) *p->asig; double ans = c1 * sig + c2 * yt1 - c3 * yt2; yt2 = yt1; - yt1 = ans - D * sig; /* yt1 contains yt1-D*xt1 */ + yt1 = ans - 2.0 * sig; /* yt1 contains yt1-D*xt1 */ *p->ar = (MYFLT)ans; } p->yt1 = yt1; p->yt2 = yt2; @@ -519,7 +526,7 @@ uint32_t early = p->h.insdshead->ksmps_no_end; uint32_t flag = 0, n, nsmps = CS_KSMPS; MYFLT *ar, *asig; - double c3p1, c3t4, omc3, c2sqr, D = 2.0; /* 1/RMS = root2 (rand) */ + double c3p1, c3t4, omc3, c2sqr;//, D = 2.0; /* 1/RMS = root2 (rand) */ /* or 1/.5 (sine) */ double yt1, yt2, c1, c2, c3; @@ -542,7 +549,7 @@ if (p->scale == 1) /* i.e. 1 - A(reson) */ p->c1 = 1.0 - omc3 * sqrt(1.0 - c2sqr / c3t4); else if (p->scale == 2) /* i.e. D - A(reson) */ - p->c1 = D - sqrt((c3p1*c3p1-c2sqr)*omc3/c3p1); + p->c1 = 2.0 - sqrt((c3p1*c3p1-c2sqr)*omc3/c3p1); else p->c1 = 0.0; /* cannot tell */ } asig = p->asig; @@ -567,7 +574,7 @@ double sig = (double)asig[n]; double ans = c1 * sig + c2 * yt1 - c3 * yt2; yt2 = yt1; - yt1 = ans - D * sig; /* yt1 contains yt1-D*xt1 */ + yt1 = ans - 2.0 * sig; /* yt1 contains yt1-D*xt1 */ ar[n] = (MYFLT)ans; } } @@ -601,7 +608,7 @@ ((LPREAD**) csound->lprdaddr)[csound->currentLPCSlot] = p; /* Build file name */ - if(stringname) strncpy(lpfilname, ((STRINGDAT*)p->ifilcod)->data, MAXNAME-1); + if (stringname) strncpy(lpfilname, ((STRINGDAT*)p->ifilcod)->data, MAXNAME-1); else if (ISSTRCOD(*p->ifilcod)) strncpy(lpfilname, get_arg_string(csound, *p->ifilcod), MAXNAME-1); else csound->strarg2name(csound, lpfilname, p->ifilcod, "lp.", 0); @@ -674,7 +681,8 @@ int lprdset(CSOUND *csound, LPREAD *p){ return lprdset_(csound, p, 0); - } +} + int lprdset_S(CSOUND *csound, LPREAD *p){ return lprdset_(csound, p, 1); } @@ -682,7 +690,7 @@ #ifdef TRACE_POLES static void - DumpPolesF(int poleCount, MYFLT *part1, MYFLT *part2, int isMagn, char *where) + DumpPolesF(int poleCount, MYFLT *part1, MYFLT *part2, int isMagn, char *where) { int i; @@ -747,7 +755,7 @@ int i; if (UNLIKELY(poleCount%2!=0)) { -/* printf (Str("Cannot handle uneven pole count yet \n")); */ + printf (Str("Cannot handle uneven pole count yet \n")); return (0); } diff -Nru csound-6.01~dfsg/OOps/ugens6.c csound-6.02~dfsg/OOps/ugens6.c --- csound-6.01~dfsg/OOps/ugens6.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/OOps/ugens6.c 2014-01-07 16:54:20.000000000 +0000 @@ -495,6 +495,7 @@ begp = (MYFLT *) q->auxch.auxp; endp = (MYFLT *) q->auxch.endp; if (!p->XINCODE) { + if(*p->xdlt == INFINITY) goto err2; delsmps = *p->xdlt * csound->esr; idelsmps = (int32)delsmps; delfrac = delsmps - idelsmps; @@ -512,6 +513,7 @@ else { MYFLT *timp = p->xdlt, *curq = q->curp; for (n=offset; nesr; idelsmps = (int32)delsmps; delfrac = delsmps - idelsmps; @@ -527,7 +529,10 @@ return OK; err1: return csound->PerfError(csound, p->h.insdshead, - Str("deltapi: not initialised")); + Str("deltapi: not initialised")); + err2: + return csound->PerfError(csound, p->h.insdshead, + Str("deltapi: INF delaytime")); } /* ***** From Hans Mikelson ************* */ @@ -604,6 +609,7 @@ begp = (MYFLT *) q->auxch.auxp; endp = (MYFLT *) q->auxch.endp; if (!p->XINCODE) { + if(*p->xdlt == INFINITY) goto err2; delsmps = *p->xdlt * csound->esr; idelsmps = (int32)delsmps; delfrac = delsmps - idelsmps; @@ -638,6 +644,7 @@ MYFLT *timp = p->xdlt, *curq = q->curp; for (n=offset; nesr; idelsmps = (int32)delsmps; delfrac = delsmps - idelsmps; @@ -665,6 +672,10 @@ err1: return csound->PerfError(csound, p->h.insdshead, Str("deltap3: not initialised")); + err2: + return csound->PerfError(csound, p->h.insdshead, + Str("deltapi: INF delaytime")); + } diff -Nru csound-6.01~dfsg/OOps/ugtabs.c csound-6.02~dfsg/OOps/ugtabs.c --- csound-6.01~dfsg/OOps/ugtabs.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/OOps/ugtabs.c 2014-01-07 16:54:20.000000000 +0000 @@ -451,7 +451,7 @@ p->mul = 1; p->len = p->ftp->flen; - return tabler_audio(csound,p);; + return tabler_audio(csound,p); } int tableirkt_kontrol(CSOUND *csound, TABL *p) { @@ -467,23 +467,23 @@ p->mul = 1; p->len = p->ftp->flen; - return tableir_kontrol(csound,p);; + return tableir_kontrol(csound,p); } -int tableirkt_audio(CSOUND *csound, TABL *p) { +int tableirkt_audio(CSOUND *csound, TABL *p) +{ - if (UNLIKELY((p->ftp = csound->FTnp2Find(csound, p->ftable)) == NULL)) + if (UNLIKELY((p->ftp = csound->FTnp2Find(csound, p->ftable)) == NULL)) return csound->PerfError(csound, p->h.insdshead, Str("table: could not find ftable %d"), (int) *p->ftable); - p->np2 = p->ftp->lenmask ? 0 : 1; - if (*p->mode) + p->np2 = p->ftp->lenmask ? 0 : 1; + if (*p->mode) p->mul = p->ftp->flen; else p->mul = 1; - p->len = p->ftp->flen; - - return tableir_audio(csound,p);; + p->len = p->ftp->flen; + return tableir_audio(csound,p); } int table3rkt_kontrol(CSOUND *csound, TABL *p) { @@ -520,13 +520,14 @@ int ndx, len; int mask; - MYFLT *func = p->ftp->ftable; + MYFLT *func; int32 iwrap = *p->wrap; if (UNLIKELY((p->ftp = csound->FTnp2Find(csound, p->ftable)) == NULL)) return csound->InitError(csound, Str("table: could not find ftable %d"), (int) *p->ftable); + func = p->ftp->ftable; mask = p->ftp->lenmask; p->np2 = mask ? 0 : 1; len = p->ftp->flen; diff -Nru csound-6.01~dfsg/Opcodes/CMakeLists.txt csound-6.02~dfsg/Opcodes/CMakeLists.txt --- csound-6.01~dfsg/Opcodes/CMakeLists.txt 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Opcodes/CMakeLists.txt 2014-01-07 16:54:20.000000000 +0000 @@ -12,6 +12,7 @@ option(BUILD_SERIAL_OPCODES "Build the serial opcode" ON) option(BUILD_PLATEREV_OPCODES "Build the platerev opcode" ON) option(BUILD_FAUST_OPCODES "Build the Faust opcodes" OFF) +option(BUILD_VST4CS_OPCODES "Build the vst4cs opcodes" OFF) find_package(Boost) check_include_file(ladspa.h LADSPA_H) @@ -22,7 +23,7 @@ check_include_file(jack/jack.h JACK_HEADER) check_include_file_cxx(gmm/gmm.h GMM_HEADER) check_include_file_cxx(eigen3/E.h GMM_HEADER) -check_include_file(lo/lo.h OSC_HEADER) +#check_include_file(lo/lo.h OSC_HEADER) find_library(LIBLO_LIBRARY lo) find_package(PNG) set(PYTHON_INCLUDE_DIRS /usr/include/Python2.7) @@ -96,7 +97,7 @@ make_plugin(dssi4cs "${dssi_SRC}" dl) endif() -check_deps(BUILD_FLUID_OPCODES FLUIDSYNTH_H FLUIDSYNTH_LIBRARY USE_OPENMP) +check_deps(BUILD_FLUID_OPCODES FLUIDSYNTH_H FLUIDSYNTH_LIBRARY) if(BUILD_FLUID_OPCODES) if(EXISTS ${FLUIDSYNTH_INCLUDE_DIR}) include_directories("${FLUIDSYNTH_INCLUDE_DIR}") @@ -123,7 +124,7 @@ make_plugin(linear_algebra linear_algebra.cpp) endif() -check_deps(BUILD_OSC_OPCODES OSC_HEADER LIBLO_LIBRARY) +check_deps(BUILD_OSC_OPCODES LIBLO_LIBRARY) if(BUILD_OSC_OPCODES) make_plugin(osc OSC.c) if(WIN32) @@ -172,13 +173,9 @@ check_deps(BUILD_FAUST_OPCODES LLVM_FOUND FAUST_LIBRARY) if(BUILD_FAUST_OPCODES) - # llvm_map_components_to_libraries(REQ_LLVM_LIBRARIES AsmParser Instrumentation Linker Archive BitReader DebugInfo JIT ipo Vectorize BitWriter TableGen XCoreCodeGen XCoreDesc XCoreInfo X86AsmParser X86Disassembler X86CodeGen X86Desc X86Info X86AsmPrinter X86Utils SparcCodeGen SparcDesc SparcInfo PTXCodeGen PTXDesc PTXInfo PTXAsmPrinter PowerPCCodeGen PowerPCDesc PowerPCAsmPrinter PowerPCInfo MSP430CodeGen MSP430Desc MSP430Info MSP430AsmPrinter MBlazeDisassembler MBlazeAsmParser MBlazeCodeGen MBlazeDesc MBlazeInfo MBlazeAsmPrinter MipsDisassembler MipsAsmParser MipsCodeGen MipsDesc MipsInfo MipsAsmPrinter HexagonCodeGen HexagonDesc HexagonInfo HexagonAsmPrinter CppBackendCodeGen CppBackendInfo CellSPUCodeGen CellSPUDesc CellSPUInfo ARMDisassembler ARMAsmParser ARMCodeGen SelectionDAG AsmPrinter ARMDesc ARMInfo ARMAsmPrinter MCDisassembler MCParser Interpreter CodeGen ScalarOpts InstCombine TransformUtils ipa Analysis MCJIT RuntimeDyld ExecutionEngine Target MC Object Core Support) - make_plugin(faustcsound faustgen.cpp) add_compiler_flags("-DFAUSTFLOAT=double" TARGETS faustcsound) target_link_libraries(faustcsound ${FAUST_LIBRARY} -L/usr/local/lib ${LLVM_LIBS}) - message("LLVM INCLUDE DIRS: ${LLVM_INCLUDE_DIRS}") - message("LLVM LIBS: ${LLVM_LIBS}") include_directories(${LLVM_INCLUDE_DIRS}) endif() @@ -189,6 +186,32 @@ # make_plugin(ogg ogg.c "${vorbis_LIBS}") #endif() +check_deps(BUILD_VST4CS_OPCODES VSTSDK2X_DIR FLTK_FOUND) +if(BUILD_VST4CS_OPCODES) + include_directories(${CMAKE_HOME_DIRECTORY}/interfaces) + include_directories(${VSTSDK2X_DIR}) + include_directories(${VSTSDK2X_DIR}/public.sdk/source/vst2.x) + include_directories(${VSTSDK2X_DIR}/pluginterfaces/source/vst2.x) + include_directories(${FLTK_INCLUDE_DIR}) + add_definitions(-DVST_FORCE_DEPRECATED=0 -DCS_VSTHOST) + set(VST4CS_SRCS + vst4cs/src/vst4cs.cpp + vst4cs/src/vsthost.cpp + vst4cs/src/fxbank.cpp + ${VSTSDK2X_DIR}/public.sdk/source/vst2.x/audioeffect.cpp + ${VSTSDK2X_DIR}/public.sdk/source/vst2.x/audioeffectx.cpp) + add_library(vst4cs SHARED ${VST4CS_SRCS}) + set_target_properties(vst4cs PROPERTIES + LINK_INTERFACE_LIBRARIES "" + RUNTIME_OUTPUT_DIRECTORY ${BUILD_BIN_DIR} + LIBRARY_OUTPUT_DIRECTORY ${BUILD_LIB_DIR} + ARCHIVE_OUTPUT_DIRECTORY ${BUILD_LIB_DIR} + ) + target_link_libraries(vst4cs ${CSOUNDLIB} ${FLTK_LIBRARIES}) + install(TARGETS vst4cs + LIBRARY DESTINATION ${LIBRARY_INSTALL_DIR} + ARCHIVE DESTINATION ${LIBRARY_INSTALL_DIR}) +endif() #set(sfont_FLAGS "") diff -Nru csound-6.01~dfsg/Opcodes/LuaCsound.cpp csound-6.02~dfsg/Opcodes/LuaCsound.cpp --- csound-6.01~dfsg/Opcodes/LuaCsound.cpp 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Opcodes/LuaCsound.cpp 2014-01-07 16:54:20.000000000 +0000 @@ -192,7 +192,8 @@ lua_pushlightuserdata(L, csound); lua_setfield(L, LUA_GLOBALSINDEX, "csound"); const char *luacode = ((STRINGDAT *)luacode_)->data; - log(csound, "Executing (L: 0x%p) Lua code:\n%s\n", L, luacode); + log(csound, "Executing (L: 0x%p) Lua code.\n", L); + warn(csound, "\n%s\n", luacode); result = luaL_dostring(L, luacode); if (result == 0) { diff -Nru csound-6.01~dfsg/Opcodes/OSC.c csound-6.02~dfsg/Opcodes/OSC.c --- csound-6.01~dfsg/Opcodes/OSC.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Opcodes/OSC.c 2014-01-07 16:54:20.000000000 +0000 @@ -29,10 +29,10 @@ /* structure for real time event */ -typedef struct rtEvt_s { - struct rtEvt_s *nxt; - EVTBLK e; -} rtEvt_t; +/* typedef struct rtEvt_s { */ +/* struct rtEvt_s *nxt; */ +/* EVTBLK e; */ +/* } rtEvt_t; */ typedef struct { OPDS h; /* default header */ diff -Nru csound-6.01~dfsg/Opcodes/afilters.c csound-6.02~dfsg/Opcodes/afilters.c --- csound-6.01~dfsg/Opcodes/afilters.c 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/Opcodes/afilters.c 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,696 @@ +/* + afilters.c: + + Copyright (C) 1991 Barry Vercoe, John ffitch, Gabriel Maldonado + + This file is part of Csound. + + The Csound Library is free software; you can redistribute it + and/or modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + Csound is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with Csound; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA +*/ + +#include "csoundCore.h" /* AFILTERS.C */ +#include "ugens5.h" +#include + +extern int rsnset(CSOUND *csound, RESON *p); + +static int aresonaa(CSOUND *csound, RESON *p) +{ + uint32_t offset = p->h.insdshead->ksmps_offset; + uint32_t early = p->h.insdshead->ksmps_no_end; + uint32_t flag = 0, n, nsmps = CS_KSMPS; + MYFLT *ar, *asig; + double c3p1, c3t4, omc3, c2sqr; /* 1/RMS = root2 (rand) */ + /* or 1/.5 (sine) */ + double yt1, yt2, c1, c2, c3; + + asig = p->asig; + ar = p->ar; + if (UNLIKELY(offset)) memset(ar, '\0', offset*sizeof(MYFLT)); + if (UNLIKELY(early)) { + nsmps -= early; + memset(&ar[nsmps], '\0', early*sizeof(MYFLT)); + } + c1 = p->c1; c2 = p->c2; c3 = p->c3; yt1 = p->yt1; yt2 = p->yt2; + if (p->scale == 1 || p->scale == 0) { + for (n=offset; nkcf[n] != (MYFLT)p->prvcf) { + p->prvcf = (double)p->kcf[n]; + p->cosf = cos(p->prvcf * (double)(csound->tpidsr)); + flag = 1; + } + if (p->kbw[n] != (MYFLT)p->prvbw) { + p->prvbw = (double)p->kbw[n]; + p->c3 = exp(p->prvbw * (double)(csound->mtpdsr)); + flag = 1; + } + if (flag) { + c3p1 = p->c3 + 1.0; + c3t4 = p->c3 * 4.0; + omc3 = 1.0 - p->c3; + p->c2 = c3t4 * p->cosf / c3p1; + c2sqr = p->c2 * p->c2; + if (p->scale == 1) /* i.e. 1 - A(reson) */ + p->c1 = 1.0 - omc3 * sqrt(1.0 - c2sqr / c3t4); + else if (p->scale == 2) /* i.e. D - A(reson) */ + p->c1 = 2.0 - sqrt((c3p1*c3p1-c2sqr)*omc3/c3p1); + else p->c1 = 0.0; /* cannot tell */ + } + ans = c1 * sig + c2 * yt1 - c3 * yt2; + yt2 = yt1; + yt1 = ans - sig; /* yt1 contains yt1-xt1 */ + ar[n] = (MYFLT)ans; + } + } + else if (p->scale == 2) { + for (n=offset; nkcf[n] != (MYFLT)p->prvcf) { + p->prvcf = (double)p->kcf[n]; + p->cosf = cos(p->prvcf * (double)(csound->tpidsr)); + flag = 1; + } + if (p->kbw[n] != (MYFLT)p->prvbw) { + p->prvbw = (double)p->kbw[n]; + p->c3 = exp(p->prvbw * (double)(csound->mtpdsr)); + flag = 1; + } + if (flag) { + c3p1 = p->c3 + 1.0; + c3t4 = p->c3 * 4.0; + omc3 = 1.0 - p->c3; + p->c2 = c3t4 * p->cosf / c3p1; + c2sqr = p->c2 * p->c2; + if (p->scale == 1) /* i.e. 1 - A(reson) */ + p->c1 = 1.0 - omc3 * sqrt(1.0 - c2sqr / c3t4); + else if (p->scale == 2) /* i.e. D - A(reson) */ + p->c1 = 2.0 - sqrt((c3p1*c3p1-c2sqr)*omc3/c3p1); + else p->c1 = 0.0; /* cannot tell */ + } + ans = c1 * sig + c2 * yt1 - c3 * yt2; + yt2 = yt1; + yt1 = ans - 2.0 * sig; /* yt1 contains yt1-D*xt1 */ + ar[n] = (MYFLT)ans; + } + } + p->yt1 = yt1; p->yt2 = yt2; + return OK; +} + +static int aresonak(CSOUND *csound, RESON *p) +{ + uint32_t offset = p->h.insdshead->ksmps_offset; + uint32_t early = p->h.insdshead->ksmps_no_end; + uint32_t n, nsmps = CS_KSMPS; + MYFLT *ar, *asig; + double c3p1, c3t4, omc3, c2sqr; /* 1/RMS = root2 (rand) */ + /* or 1/.5 (sine) */ + double yt1, yt2, c1, c2, c3; + + if (*p->kbw != (MYFLT)p->prvbw) { + p->prvbw = (double)*p->kbw; + p->c3 = exp(p->prvbw * (double)(csound->mtpdsr)); + c3p1 = p->c3 + 1.0; + c3t4 = p->c3 * 4.0; + omc3 = 1.0 - p->c3; + p->c2 = c3t4 * p->cosf / c3p1; + c2sqr = p->c2 * p->c2; + if (p->scale == 1) /* i.e. 1 - A(reson) */ + p->c1 = 1.0 - omc3 * sqrt(1.0 - c2sqr / c3t4); + else if (p->scale == 2) /* i.e. D - A(reson) */ + p->c1 = 2.0 - sqrt((c3p1*c3p1-c2sqr)*omc3/c3p1); + else p->c1 = 0.0; /* cannot tell */ + } + asig = p->asig; + ar = p->ar; + if (UNLIKELY(offset)) memset(ar, '\0', offset*sizeof(MYFLT)); + if (UNLIKELY(early)) { + nsmps -= early; + memset(&ar[nsmps], '\0', early*sizeof(MYFLT)); + } + c1 = p->c1; c2 = p->c2; c3 = p->c3; yt1 = p->yt1; yt2 = p->yt2; + if (p->scale == 1 || p->scale == 0) { + for (n=offset; nkcf[n] != (MYFLT)p->prvcf) { + p->prvcf = (double)p->kcf[n]; + p->cosf = cos(p->prvcf * (double)(csound->tpidsr)); + c3p1 = p->c3 + 1.0; + c3t4 = p->c3 * 4.0; + omc3 = 1.0 - p->c3; + p->c2 = c3t4 * p->cosf / c3p1; + c2sqr = p->c2 * p->c2; + if (p->scale == 1) /* i.e. 1 - A(reson) */ + p->c1 = 1.0 - omc3 * sqrt(1.0 - c2sqr / c3t4); + else if (p->scale == 2) /* i.e. D - A(reson) */ + p->c1 = 2.0 - sqrt((c3p1*c3p1-c2sqr)*omc3/c3p1); + else p->c1 = 0.0; /* cannot tell */ + } + ans = c1 * sig + c2 * yt1 - c3 * yt2; + yt2 = yt1; + yt1 = ans - sig; /* yt1 contains yt1-xt1 */ + ar[n] = (MYFLT)ans; + } + } + else if (p->scale == 2) { + for (n=offset; nkcf[n] != (MYFLT)p->prvcf) { + p->prvcf = (double)p->kcf[n]; + p->cosf = cos(p->prvcf * (double)(csound->tpidsr)); + c3p1 = p->c3 + 1.0; + c3t4 = p->c3 * 4.0; + omc3 = 1.0 - p->c3; + p->c2 = c3t4 * p->cosf / c3p1; + c2sqr = p->c2 * p->c2; + if (p->scale == 1) /* i.e. 1 - A(reson) */ + p->c1 = 1.0 - omc3 * sqrt(1.0 - c2sqr / c3t4); + else if (p->scale == 2) /* i.e. D - A(reson) */ + p->c1 = 2.0 - sqrt((c3p1*c3p1-c2sqr)*omc3/c3p1); + else p->c1 = 0.0; /* cannot tell */ + } + ans = c1 * sig + c2 * yt1 - c3 * yt2; + yt2 = yt1; + yt1 = ans - 2.0 * sig; /* yt1 contains yt1-D*xt1 */ + ar[n] = (MYFLT)ans; + } + } + p->yt1 = yt1; p->yt2 = yt2; + return OK; +} + +static int aresonka(CSOUND *csound, RESON *p) +{ + uint32_t offset = p->h.insdshead->ksmps_offset; + uint32_t early = p->h.insdshead->ksmps_no_end; + uint32_t n, nsmps = CS_KSMPS; + MYFLT *ar, *asig; + double c3p1, c3t4, omc3, c2sqr; /* 1/RMS = root2 (rand) */ + /* or 1/.5 (sine) */ + double yt1, yt2, c1, c2, c3; + + if (*p->kcf != (MYFLT)p->prvcf) { + p->prvcf = (double)*p->kcf; + p->cosf = cos(p->prvcf * (double)(csound->tpidsr)); + c3p1 = p->c3 + 1.0; + c3t4 = p->c3 * 4.0; + omc3 = 1.0 - p->c3; + p->c2 = c3t4 * p->cosf / c3p1; + c2sqr = p->c2 * p->c2; + if (p->scale == 1) /* i.e. 1 - A(reson) */ + p->c1 = 1.0 - omc3 * sqrt(1.0 - c2sqr / c3t4); + else if (p->scale == 2) /* i.e. D - A(reson) */ + p->c1 = 2.0 - sqrt((c3p1*c3p1-c2sqr)*omc3/c3p1); + else p->c1 = 0.0; /* cannot tell */ + } + asig = p->asig; + ar = p->ar; + if (UNLIKELY(offset)) memset(ar, '\0', offset*sizeof(MYFLT)); + if (UNLIKELY(early)) { + nsmps -= early; + memset(&ar[nsmps], '\0', early*sizeof(MYFLT)); + } + c1 = p->c1; c2 = p->c2; c3 = p->c3; yt1 = p->yt1; yt2 = p->yt2; + if (p->scale == 1 || p->scale == 0) { + for (n=offset; nkbw[n] != (MYFLT)p->prvbw) { + p->prvbw = (double)p->kbw[n]; + p->c3 = exp(p->prvbw * (double)(csound->mtpdsr)); + c3p1 = p->c3 + 1.0; + c3t4 = p->c3 * 4.0; + omc3 = 1.0 - p->c3; + p->c2 = c3t4 * p->cosf / c3p1; + c2sqr = p->c2 * p->c2; + if (p->scale == 1) /* i.e. 1 - A(reson) */ + p->c1 = 1.0 - omc3 * sqrt(1.0 - c2sqr / c3t4); + else if (p->scale == 2) /* i.e. D - A(reson) */ + p->c1 = 2.0 - sqrt((c3p1*c3p1-c2sqr)*omc3/c3p1); + else p->c1 = 0.0; /* cannot tell */ + } + ans = c1 * sig + c2 * yt1 - c3 * yt2; + yt2 = yt1; + yt1 = ans - sig; /* yt1 contains yt1-xt1 */ + ar[n] = (MYFLT)ans; + } + } + else if (p->scale == 2) { + for (n=offset; nkbw[n] != (MYFLT)p->prvbw) { + p->prvbw = (double)p->kbw[n]; + p->c3 = exp(p->prvbw * (double)(csound->mtpdsr)); + c3p1 = p->c3 + 1.0; + c3t4 = p->c3 * 4.0; + omc3 = 1.0 - p->c3; + p->c2 = c3t4 * p->cosf / c3p1; + c2sqr = p->c2 * p->c2; + if (p->scale == 1) /* i.e. 1 - A(reson) */ + p->c1 = 1.0 - omc3 * sqrt(1.0 - c2sqr / c3t4); + else if (p->scale == 2) /* i.e. D - A(reson) */ + p->c1 = 2.0 - sqrt((c3p1*c3p1-c2sqr)*omc3/c3p1); + else p->c1 = 0.0; /* cannot tell */ + } + ans = c1 * sig + c2 * yt1 - c3 * yt2; + yt2 = yt1; + yt1 = ans - 2.0 * sig; /* yt1 contains yt1-D*xt1 */ + ar[n] = (MYFLT)ans; + } + } + p->yt1 = yt1; p->yt2 = yt2; + return OK; +} + +extern int tonset(CSOUND*, TONE*); +extern int tonsetx(CSOUND *csound, TONEX *p); + +static int atonea(CSOUND *csound, TONE *p) +{ + MYFLT *ar, *asig; + uint32_t offset = p->h.insdshead->ksmps_offset; + uint32_t early = p->h.insdshead->ksmps_no_end; + uint32_t n, nsmps = CS_KSMPS; + double c2 = p->c2, yt1 = p->yt1; + + ar = p->ar; + if (UNLIKELY(offset)) memset(ar, '\0', offset*sizeof(MYFLT)); + if (UNLIKELY(early)) { + nsmps -= early; + memset(&ar[nsmps], '\0', early*sizeof(MYFLT)); + } + asig = p->asig; + for (n=offset; nkhp[n] != p->prvhp) { + double b; + p->prvhp = p->khp[n]; + b = 2.0 - cos((double)(p->khp[n] * csound->tpidsr)); + p->c2 = c2 = b - sqrt(b * b - 1.0); + /* p->c1 = c1 = 1.0 - c2; */ + } + x = yt1 = c2 * (yt1 + sig); + ar[n] = (MYFLT)x; + yt1 -= sig; /* yt1 contains yt1-xt1 */ + } + p->yt1 = yt1; + return OK; +} + +static int tonea(CSOUND *csound, TONE *p) +{ + MYFLT *ar, *asig; + uint32_t offset = p->h.insdshead->ksmps_offset; + uint32_t early = p->h.insdshead->ksmps_no_end; + uint32_t n, nsmps = CS_KSMPS; + double c1 = p->c1, c2 = p->c2; + double yt1 = p->yt1; + double prvhp = p->prvhp; + + ar = p->ar; + asig = p->asig; + if (UNLIKELY(offset)) memset(ar, '\0', offset*sizeof(MYFLT)); + if (UNLIKELY(early)) { + nsmps -= early; + memset(&ar[nsmps], '\0', early*sizeof(MYFLT)); + } + for (n=offset; nkhp[n] != prvhp) { + double b; + prvhp = (double)p->khp[n]; + b = 2.0 - cos((double)(prvhp * csound->tpidsr)); + c2 = b - sqrt(b * b - 1.0); + c1 = 1.0 - c2; + } + yt1 = c1 * (double)(asig[n]) + c2 * yt1; + ar[n] = (MYFLT)yt1; + } + p->yt1 = yt1; + p->prvhp = prvhp; + p->c1 = c1; + p->c2 = c2; + return OK; +} + +static int tonexa(CSOUND *csound, TONEX *p) /* From Gabriel Maldonado, modified */ +{ + MYFLT *ar = p->ar; + double c2 = p->c2, *yt1 = p->yt1,c1 = p->c1; + uint32_t offset = p->h.insdshead->ksmps_offset; + uint32_t early = p->h.insdshead->ksmps_no_end; + uint32_t n, nsmps = CS_KSMPS; + int j, lp = p->loop; + + memmove(ar,p->asig,sizeof(MYFLT)*nsmps); + if (UNLIKELY(offset)) memset(ar, '\0', offset*sizeof(MYFLT)); + if (UNLIKELY(early)) { + nsmps -= early; + memset(&ar[nsmps], '\0', early*sizeof(MYFLT)); + } + for (j=0; j< lp; j++) { + /* Should *yt1 be reset to something?? */ + for (n=0; nkhp[n] != p->prvhp) { + double b; + p->prvhp = (double)p->khp[n]; + b = 2.0 - cos(p->prvhp * (double)csound->tpidsr); + p->c2 = b - sqrt(b * b - 1.0); + p->c1 = 1.0 - p->c2; + } + x = c1 * ar[n] + c2 * yt1[j]; + yt1[j] = x; + ar[n] = (MYFLT)x; + } + } + return OK; +} + +static int atonexa(CSOUND *csound, TONEX *p) /* Gabriel Maldonado, modified */ +{ + MYFLT *ar = p->ar; + double c2 = p->c2, *yt1 = p->yt1; + uint32_t offset = p->h.insdshead->ksmps_offset; + uint32_t early = p->h.insdshead->ksmps_no_end; + uint32_t n, nsmps = CS_KSMPS; + int j, lp = p->loop; + MYFLT prvhp = p->prvhp; + + memmove(ar,p->asig,sizeof(MYFLT)*nsmps); + if (UNLIKELY(offset)) memset(ar, '\0', offset*sizeof(MYFLT)); + if (UNLIKELY(early)) { + nsmps -= early; + memset(&ar[nsmps], '\0', early*sizeof(MYFLT)); + } + for (j=1; jkhp[n] != prvhp) { + double b; + prvhp = p->khp[n]; + b = 2.0 - cos((double)(p->prvhp * csound->tpidsr)); + c2 = b - sqrt(b * b - 1.0); + } + x = c2 * (yt1[j] + sig); + yt1[j] = x - sig; /* yt1 contains yt1-xt1 */ + ar[n] = (MYFLT)x; + } + } + p->c2 = c2; + p->prvhp = prvhp; + return OK; +} + + +typedef struct { + OPDS h; + MYFLT *sr, *ain, *afc, *istor; + MYFLT lkf; + double a[8]; +} BFIL; + +typedef struct { + OPDS h; + MYFLT *sr, *ain, *kfo, *kbw, *istor; + MYFLT lkf, lkb; + double a[8]; +} BBFIL; + +#define ROOT2 (1.4142135623730950488) + +extern int butset(CSOUND *csound, BFIL *p); + +static int bbutset(CSOUND *csound, BBFIL *p) /* Band set-up */ +{ + if (*p->istor==FL(0.0)) { + p->a[6] = p->a[7] = 0.0; + p->lkb = FL(0.0); + p->lkf = FL(0.0); + } + return OK; +} + +static int hibuta(CSOUND *csound, BFIL *p) /* Hipass filter */ +{ + MYFLT *out, *in; + uint32_t offset = p->h.insdshead->ksmps_offset; + uint32_t early = p->h.insdshead->ksmps_no_end; + uint32_t nsmps = CS_KSMPS; + double *a; + double t, y; + uint32_t nn; + a = p->a; + + in = p->ain; + out = p->sr; + if (UNLIKELY(offset)) memset(out, '\0', offset*sizeof(MYFLT)); + if (UNLIKELY(early)) { + nsmps -= early; + memset(&out[nsmps], '\0', early*sizeof(MYFLT)); + } + + if (p->afc[0] <= FL(0.0)) { + memcpy(&out[offset], &in[offset], (nsmps-offset)*sizeof(MYFLT)); + return OK; + } + + /* if (p->afc[0] != p->lkf) { */ + /* p->lkf = p->afc[0]; */ + /* c = tan((double)(csound->pidsr * p->lkf)); */ + + /* a[1] = 1.0 / ( 1.0 + ROOT2 * c + c * c); */ + /* a[2] = -(a[1] + a[1]); */ + /* a[3] = a[1]; */ + /* a[4] = 2.0 * ( c*c - 1.0) * a[1]; */ + /* a[5] = ( 1.0 - ROOT2 * c + c * c) * a[1]; */ + /* } */ + for (nn=offset; nnafc[nn] != p->lkf) { + double c; + p->lkf = p->afc[nn]; + c = tan((double)(csound->pidsr * p->lkf)); + + a[1] = 1.0 / ( 1.0 + ROOT2 * c + c * c); + a[2] = -(a[1] + a[1]); + a[3] = a[1]; + a[4] = 2.0 * ( c*c - 1.0) * a[1]; + a[5] = ( 1.0 - ROOT2 * c + c * c) * a[1]; + } + t = (double)in[nn] - a[4] * a[6] - a[5] * a[7]; + t = csoundUndenormalizeDouble(t); /* Not needed on AMD */ + y = t * a[1] + a[2] * a[6] + a[3] * a[7]; + a[7] = a[6]; + a[6] = t; + out[nn] = (MYFLT)y; + } + return OK; +} + +static int lobuta(CSOUND *csound, BFIL *p) /* Lopass filter */ +{ + MYFLT *out, *in; + uint32_t offset = p->h.insdshead->ksmps_offset; + uint32_t early = p->h.insdshead->ksmps_no_end; + uint32_t nsmps = CS_KSMPS; + double *a = p->a; + double t, y; + uint32_t nn; + + in = p->ain; + out = p->sr; + + if (*p->afc <= FL(0.0)) { + memset(out, 0, CS_KSMPS*sizeof(MYFLT)); + return OK; + } + + if (UNLIKELY(offset)) memset(out, '\0', offset*sizeof(MYFLT)); + if (UNLIKELY(early)) { + nsmps -= early; + memset(&out[nsmps], '\0', early*sizeof(MYFLT)); + } + + /* if (p->afc[0] != p->lkf) { */ + /* p->lkf = p->afc[0]; */ + /* c = 1.0 / tan((double)(csound->pidsr * p->lkf)); */ + /* a[1] = 1.0 / ( 1.0 + ROOT2 * c + c * c); */ + /* a[2] = a[1] + a[1]; */ + /* a[3] = a[1]; */ + /* a[4] = 2.0 * ( 1.0 - c*c) * a[1]; */ + /* a[5] = ( 1.0 - ROOT2 * c + c * c) * a[1]; */ + /* } */ + + for (nn=offset; nnafc[nn] != p->lkf) { + double c; + p->lkf = p->afc[nn]; + c = 1.0 / tan((double)(csound->pidsr * p->lkf)); + a[1] = 1.0 / ( 1.0 + ROOT2 * c + c * c); + a[2] = a[1] + a[1]; + a[3] = a[1]; + a[4] = 2.0 * ( 1.0 - c*c) * a[1]; + a[5] = ( 1.0 - ROOT2 * c + c * c) * a[1]; + } + t = (double)in[nn] - a[4] * a[6] - a[5] * a[7]; + t = csoundUndenormalizeDouble(t); /* Not needed on AMD */ + y = t * a[1] + a[2] * a[6] + a[3] * a[7]; + a[7] = a[6]; + a[6] = t; + out[nn] = (MYFLT)y; + } + return OK; +} + +static int bppasxx(CSOUND *csound, BBFIL *p) /* Bandpass filter */ +{ + uint32_t offset = p->h.insdshead->ksmps_offset; + uint32_t early = p->h.insdshead->ksmps_no_end; + uint32_t nsmps = CS_KSMPS; + MYFLT *out, *in; + double *a = p->a; + double t, y; + uint32_t nn; + + in = p->ain; + out = p->sr; + if (p->kbw[0] <= FL(0.0)) { + memset(out, 0, CS_KSMPS*sizeof(MYFLT)); + return OK; + } + if (UNLIKELY(offset)) memset(out, '\0', offset*sizeof(MYFLT)); + if (UNLIKELY(early)) { + nsmps -= early; + memset(&out[nsmps], '\0', early*sizeof(MYFLT)); + } + /* if (p->kbw[0] != p->lkb || p->kfo[0] != p->lkf) { */ + /* p->lkf = p->kfo[0]; */ + /* p->lkb = p->kbw[0]; */ + /* c = 1.0 / tan((double)(csound->pidsr * p->lkb)); */ + /* d = 2.0 * cos((double)(csound->tpidsr * p->lkf)); */ + /* a[1] = 1.0 / (1.0 + c); */ + /* a[2] = 0.0; */ + /* a[3] = -a[1]; */ + /* a[4] = - c * d * a[1]; */ + /* a[5] = (c - 1.0) * a[1]; */ + /* } */ + //butter_filter(nsmps, offset, in, out, p->a); + for (nn=offset; nnkbw[nn] : *p->kbw); + fr = (XINARG2 ? p->kfo[nn] : *p->kfo); + if (bw != p->lkb || fr != p->lkf) { + double c, d; + p->lkf = fr; + p->lkb = bw; + c = 1.0 / tan((double)(csound->pidsr * bw)); + d = 2.0 * cos((double)(csound->tpidsr * fr)); + a[1] = 1.0 / (1.0 + c); + a[2] = 0.0; + a[3] = -a[1]; + a[4] = - c * d * a[1]; + a[5] = (c - 1.0) * a[1]; + } + t = (double)in[nn] - a[4] * a[6] - a[5] * a[7]; + t = csoundUndenormalizeDouble(t); /* Not needed on AMD */ + y = t * a[1] + a[2] * a[6] + a[3] * a[7]; + a[7] = a[6]; + a[6] = t; + out[nn] = (MYFLT)y; + } + return OK; +} + +static int bpcutxx(CSOUND *csound, BBFIL *p) /* Band reject filter */ +{ + uint32_t offset = p->h.insdshead->ksmps_offset; + uint32_t early = p->h.insdshead->ksmps_no_end; + uint32_t nsmps = CS_KSMPS; + MYFLT *out, *in; + double *a = p->a; + double t, y; + uint32_t nn; + + in = p->ain; + out = p->sr; + + if (UNLIKELY(offset)) memset(out, '\0', offset*sizeof(MYFLT)); + if (UNLIKELY(early)) { + nsmps -= early; + memset(&out[nsmps], '\0', early*sizeof(MYFLT)); + } + if (p->kbw[0] <= FL(0.0)) { + memcpy(&out[offset], &out[offset], (nsmps-offset)*sizeof(MYFLT)); + return OK; + } + + for (nn=offset; nnkbw[nn] : *p->kbw); + fr = (XINARG2 ? p->kfo[nn] : *p->kfo); + if (bw != p->lkb || fr != p->lkf) { + double c, d; + p->lkf = fr; + p->lkb = bw; + c = tan((double)(csound->pidsr * bw)); + d = 2.0 * cos((double)(csound->tpidsr * fr)); + a[1] = 1.0 / (1.0 + c); + a[2] = - d * a[1]; + a[3] = a[1]; + a[4] = a[2]; + a[5] = (1.0 - c) * a[1]; + } + t = (double)in[nn] - a[4] * a[6] - a[5] * a[7]; + t = csoundUndenormalizeDouble(t); /* Not needed on AMD */ + y = t * a[1] + a[2] * a[6] + a[3] * a[7]; + a[7] = a[6]; + a[6] = t; + out[nn] = (MYFLT)y; + } + return OK; +} + + + +static OENTRY afilts_localops[] = +{ + { "areson.aa", sizeof(RESON), 0,5,"a","aaaoo",(SUBR)rsnset,NULL,(SUBR)aresonaa}, + { "areson.ak", sizeof(RESON), 0,5,"a","aakoo",(SUBR)rsnset,NULL,(SUBR)aresonak}, + { "areson.ka", sizeof(RESON), 0,5,"a","akaoo",(SUBR)rsnset,NULL,(SUBR)aresonka}, + { "atone.a", sizeof(TONE), 0,5,"a","ako", (SUBR)tonset,NULL,(SUBR)atonea }, + { "atonex.a", sizeof(TONEX), 0,5, "a","aaoo",(SUBR)tonsetx,NULL,(SUBR)atonexa}, + { "tone.a", sizeof(TONE), 0,5,"a","aao", (SUBR)tonset,NULL,(SUBR)tonea }, + { "tonex.a", sizeof(TONEX), 0,5,"a","aaoo", (SUBR)tonsetx,NULL,(SUBR)tonexa }, + { "butterhp.a", sizeof(BFIL), 0,5,"a","aao", (SUBR)butset,NULL,(SUBR)hibuta }, + { "butterlp.a", sizeof(BFIL), 0,5,"a","aao", (SUBR)butset,NULL,(SUBR)lobuta }, + { "buthp.a", sizeof(BFIL), 0,5,"a","aao", (SUBR)butset,NULL,(SUBR)hibuta }, + { "butlp.a", sizeof(BFIL), 0,5,"a","aao", (SUBR)butset,NULL,(SUBR)lobuta }, + { "butterbp", sizeof(BBFIL),0,5,"a","axxo", (SUBR)bbutset,NULL,(SUBR)bppasxx}, + { "butbp", sizeof(BBFIL),0,5,"a","axxo", (SUBR)bbutset,NULL,(SUBR)bppasxx}, + { "butterbr", sizeof(BBFIL),0,5,"a","axxo", (SUBR)bbutset,NULL,(SUBR)bpcutxx}, + { "butbr", sizeof(BBFIL),0,5,"a","axxo", (SUBR)bbutset,NULL,(SUBR)bpcutxx}, +}; + +LINKAGE_BUILTIN(afilts_localops) + + diff -Nru csound-6.01~dfsg/Opcodes/biquad.c csound-6.02~dfsg/Opcodes/biquad.c --- csound-6.01~dfsg/Opcodes/biquad.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Opcodes/biquad.c 2014-01-07 16:54:20.000000000 +0000 @@ -181,7 +181,7 @@ scale = exp((1.0-pp1d2)*1.386249); /* Scaling factor */ k = res*scale; } - xn = (double)in[n] * dmax; + xn = (double)in[n] * dmax/csound->e0dbfs; xn = xn - k * y4n; /* Inverted feed back for corner peaking */ /* Four cascaded onepole filters (bilinear transform) */ @@ -202,7 +202,7 @@ y1nm1 = y1n; /* Update Y1n-1 */ y2nm1 = y2n; /* Update Y2n-1 */ y3nm1 = y3n; /* Update Y3n-1 */ - out[n] = (MYFLT)(y4n * max); + out[n] = (MYFLT)(y4n * max * csound->e0dbfs); } p->xnm1 = xnm1; p->y1nm1 = y1nm1; p->y2nm1 = y2nm1; p->y3nm1 = y3nm1; p->y1n = y1n; p->y2n = y2n; p->y3n = y3n; p->y4n = y4n; @@ -1355,7 +1355,9 @@ /* Initialize filter to zero if set to reinitialize. */ if (*p->reinit==FL(0.0)) { /* Only reset in in non-legato mode */ p->xnm1 = p->ynm1 = p->ynm2 = 0.0; + p->a0 = p->a1 = p->a2 = p->d = 0.0; } + p->lfq = -FL(1.0); p->lq = -FL(1.0); return OK; } @@ -1365,17 +1367,9 @@ uint32_t offset = p->h.insdshead->ksmps_offset; uint32_t early = p->h.insdshead->ksmps_no_end; uint32_t n, nsmps = CS_KSMPS; + MYFLT lfq = p->lfq, lq = p->lq; - double kfreq = *p->kfreq*TWOPI; - double kalpha = (CS_ESR/kfreq); - double kbeta = kalpha*kalpha; - double d = 0.5*kalpha; - - double a0 = 1.0/ (kbeta+d/(*p->kq)); - double a1 = a0 * (1.0-2.0*kbeta); - double a2 = a0 * (kbeta-d/(*p->kq)); - - double xn, yn; + double xn, yn, a0=p->a0, a1=p->a1, a2=p->a2,d=p->d; double xnm1 = p->xnm1, ynm1 = p->ynm1, ynm2 = p->ynm2; if (UNLIKELY(offset)) memset(p->aout, '\0', offset*sizeof(MYFLT)); @@ -1384,6 +1378,19 @@ memset(&p->aout[nsmps], '\0', early*sizeof(MYFLT)); } for (n=offset; nkfreq[n] : *p->kfreq; + MYFLT kq = XINARG3 ? p->kq[n] : *p->kq; + if (lfq != kfq || lq != kq) { + double kfreq = kfq*TWOPI; + double kalpha = (CS_ESR/kfreq); + double kbeta = kalpha*kalpha; + d = 0.5*kalpha; + + lq = kq; lfq = kfq; + a0 = 1.0/ (kbeta+d/kq); + a1 = a0 * (1.0-2.0*kbeta); + a2 = a0 * (kbeta-d/kq); + } xn = (double)p->ain[n]; yn = a0*xnm1 - a1*ynm1 - a2*ynm2; @@ -1397,6 +1404,8 @@ p->aout[n] = (MYFLT)yn; } p->xnm1 = xnm1; p->ynm1 = ynm1; p->ynm2 = ynm2; + p->lfq = lfq; p->lq = lq; p->d = d; + p->a0 = a0; p->a1 = a1; p->a2 = a2; return OK; } @@ -1426,7 +1435,7 @@ (SUBR)nestedapset, NULL, (SUBR)nestedap}, { "lorenz", S(LORENZ),0, 5, "aaa", "kkkkiiiio", (SUBR)lorenzset, NULL, (SUBR)lorenz}, -{ "mode", S(MODE), 0, 5, "a", "akko", (SUBR)modeset, NULL, (SUBR)mode } +{ "mode", S(MODE), 0, 5, "a", "axxo", (SUBR)modeset, NULL, (SUBR)mode } }; int biquad_init_(CSOUND *csound) diff -Nru csound-6.01~dfsg/Opcodes/biquad.h csound-6.02~dfsg/Opcodes/biquad.h --- csound-6.01~dfsg/Opcodes/biquad.h 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Opcodes/biquad.h 2014-01-07 16:54:20.000000000 +0000 @@ -121,6 +121,7 @@ typedef struct { OPDS h; MYFLT *aout, *ain, *kfreq, *kq, *reinit; - double xnm1, ynm1, ynm2; + double xnm1, ynm1, ynm2, a0, a1, a2, d; + MYFLT lfq,lq; } MODE; diff -Nru csound-6.01~dfsg/Opcodes/butter.c csound-6.02~dfsg/Opcodes/butter.c --- csound-6.01~dfsg/Opcodes/butter.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Opcodes/butter.c 2014-01-07 16:54:20.000000000 +0000 @@ -46,7 +46,7 @@ static void butter_filter(uint32_t, uint32_t, MYFLT *, MYFLT *, double *); -static int butset(CSOUND *csound, BFIL *p) /* Hi/Lo pass set-up */ +int butset(CSOUND *csound, BFIL *p) /* Hi/Lo pass set-up */ { if (*p->istor==FL(0.0)) { p->a[6] = p->a[7] = 0.0; @@ -55,16 +55,6 @@ return OK; } -static int bbutset(CSOUND *csound, BBFIL *p) /* Band set-up */ -{ - if (*p->istor==FL(0.0)) { - p->a[6] = p->a[7] = 0.0; - p->lkb = FL(0.0); - p->lkf = FL(0.0); - } - return OK; -} - static int hibut(CSOUND *csound, BFIL *p) /* Hipass filter */ { MYFLT *out, *in; @@ -113,7 +103,7 @@ out = p->sr; if (*p->kfc <= FL(0.0)) { - memset(out, 0, CS_KSMPS*sizeof(MYFLT)); + memset(out, 0, nsmps*sizeof(MYFLT)); return OK; } @@ -123,8 +113,8 @@ memset(&out[nsmps], '\0', early*sizeof(MYFLT)); } - if (*p->kfc != p->lkf) { double *a, c; - + if (*p->kfc != p->lkf) { + double *a, c; a = p->a; p->lkf = *p->kfc; c = 1.0 / tan((double)(csound->pidsr * p->lkf)); @@ -139,80 +129,6 @@ return OK; } -static int bpbut(CSOUND *csound, BBFIL *p) /* Bandpass filter */ -{ - uint32_t offset = p->h.insdshead->ksmps_offset; - uint32_t early = p->h.insdshead->ksmps_no_end; - uint32_t nsmps = CS_KSMPS; - MYFLT *out, *in; - - in = p->ain; - out = p->sr; - if (*p->kbw <= FL(0.0)) { - memset(out, 0, CS_KSMPS*sizeof(MYFLT)); - return OK; - } - if (UNLIKELY(offset)) memset(out, '\0', offset*sizeof(MYFLT)); - if (UNLIKELY(early)) { - nsmps -= early; - memset(&out[nsmps], '\0', early*sizeof(MYFLT)); - } - if (*p->kbw != p->lkb || *p->kfo != p->lkf) { - double *a, c, d; - a = p->a; - p->lkf = *p->kfo; - p->lkb = *p->kbw; - c = 1.0 / tan((double)(csound->pidsr * p->lkb)); - d = 2.0 * cos((double)(csound->tpidsr * p->lkf)); - a[1] = 1.0 / (1.0 + c); - a[2] = 0.0; - a[3] = -a[1]; - a[4] = - c * d * a[1]; - a[5] = (c - 1.0) * a[1]; - } - butter_filter(nsmps, offset, in, out, p->a); - return OK; -} - -static int bcbut(CSOUND *csound, BBFIL *p) /* Band reject filter */ -{ - uint32_t offset = p->h.insdshead->ksmps_offset; - uint32_t early = p->h.insdshead->ksmps_no_end; - uint32_t nsmps = CS_KSMPS; - MYFLT *out, *in; - - in = p->ain; - out = p->sr; - - if (UNLIKELY(offset)) memset(out, '\0', offset*sizeof(MYFLT)); - if (UNLIKELY(early)) { - nsmps -= early; - memset(&out[nsmps], '\0', early*sizeof(MYFLT)); - } - if (*p->kbw <= FL(0.0)) { - memcpy(&out[offset], &out[offset], (nsmps-offset)*sizeof(MYFLT)); - return OK; - } - - if (*p->kbw != p->lkb || *p->kfo != p->lkf) { - double *a, c, d; - - a = p->a; - p->lkf = *p->kfo; - p->lkb = *p->kbw; - c = tan((double)(csound->pidsr * p->lkb)); - d = 2.0 * cos((double)(csound->tpidsr * p->lkf)); - a[1] = 1.0 / (1.0 + c); - a[2] = - d * a[1]; - a[3] = a[1]; - a[4] = a[2]; - a[5] = (1.0 - c) * a[1]; - } - - butter_filter(nsmps, offset, in, out, p->a); - return OK; -} - /* Filter loop */ static void butter_filter(uint32_t n, uint32_t offset, @@ -234,14 +150,10 @@ #define S(x) sizeof(x) static OENTRY localops[] = { -{ "butterhp", S(BFIL), 0, 5, "a", "ako", (SUBR)butset, NULL, (SUBR)hibut }, -{ "butterlp", S(BFIL), 0, 5, "a", "ako", (SUBR)butset, NULL, (SUBR)lobut }, -{ "butterbp", S(BBFIL), 0, 5, "a", "akko", (SUBR)bbutset, NULL, (SUBR)bpbut }, -{ "butterbr", S(BBFIL), 0, 5, "a", "akko", (SUBR)bbutset, NULL, (SUBR)bcbut }, -{ "buthp", S(BFIL), 0, 5, "a", "ako", (SUBR)butset, NULL, (SUBR)hibut }, -{ "butlp", S(BFIL), 0, 5, "a", "ako", (SUBR)butset, NULL, (SUBR)lobut }, -{ "butbp", S(BBFIL), 0, 5, "a", "akko", (SUBR)bbutset, NULL, (SUBR)bpbut }, -{ "butbr", S(BBFIL), 0, 5, "a", "akko", (SUBR)bbutset, NULL, (SUBR)bcbut } +{ "butterhp.k", S(BFIL), 0, 5, "a", "ako", (SUBR)butset, NULL, (SUBR)hibut }, +{ "butterlp.k", S(BFIL), 0, 5, "a", "ako", (SUBR)butset, NULL, (SUBR)lobut }, +{ "buthp.k", S(BFIL), 0, 5, "a", "ako", (SUBR)butset, NULL, (SUBR)hibut }, +{ "butlp.k", S(BFIL), 0, 5, "a", "ako", (SUBR)butset, NULL, (SUBR)lobut }, }; int butter_init_(CSOUND *csound) diff -Nru csound-6.01~dfsg/Opcodes/cuda/adsyn.cu csound-6.02~dfsg/Opcodes/cuda/adsyn.cu --- csound-6.01~dfsg/Opcodes/cuda/adsyn.cu 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/Opcodes/cuda/adsyn.cu 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,311 @@ +// -*- c++ -*- +// adsyn.cu +// experimental cuda opcodes +// +// V Lazzarini, 2013 + +#include +#include +#define VSAMPS 16 +#define MAXBLOCK 8192 + +#define PFRACLO(x) ((MYFLT)((x) & lomask) * lodiv) + +__global__ void component(MYFLT *out, int *ndx, MYFLT *tab, + float *amp, int *inc, int vsize, + int blocks, int lobits, MYFLT lodiv, + int lomask) { + + int h = threadIdx.x*blocks + blockIdx.x; + int i, offset, n, lndx; + + offset = h*vsize; + out += offset; + + for(i=0; i < vsize; i++) { + lndx = ndx[h]; + n = lndx >> lobits; + out[i] = amp[h]*(tab[n] + PFRACLO(lndx)*(tab[n+1] - tab[n])); + ndx[h] = (lndx + inc[h]) & PHMASK; + } + +} + +__global__ void mixdown(MYFLT *out, int comps, int vsize, float kamp){ + int h = threadIdx.x; + int i; + for(i=0; i < comps; i++) + out[h] += out[h + vsize*i]; + out[h] *= kamp; +} + + + +static int destroy_cudaop(CSOUND *csound, void *pp); + +typedef struct cudaop_ { + OPDS h; + MYFLT *asig; + MYFLT *kamp, *kfreq, *itabn; + MYFLT *ftabn, *atabn, *inum; + MYFLT *out; + float *amp; + MYFLT *tab; + int *ndx, *inc; + MYFLT *ap, *fp; + FUNC *itab, *ftab, *atab; + int N, blocks; +} CUDAOP; + +static int init_cudaop(CSOUND *csound, CUDAOP *p){ + + int a, b, asize, ipsize, fpsize, tsize; + int nsmps = CS_KSMPS; + if(nsmps > 1024) return csound->InitError(csound, "ksmps is too large\n"); + + if((p->itab = + csound->FTFind(csound, p->itabn))== NULL) + return csound->InitError(csound, + "could not find table %.0f\n", *p->itabn); + + if((p->ftab = + csound->FTnp2Find(csound, p->ftabn))== NULL) + return csound->InitError(csound, + "could not find table %.0f\n", *p->ftabn); + + if((p->atab = + csound->FTnp2Find(csound, p->atabn))== NULL) + return csound->InitError(csound, + "could not find table %.0f\n", *p->atabn); + + a = p->ftab->flen; + b = p->atab->flen; + p->N = a < b ? a : b; + + if(*p->inum > 0 && *p->inum < p->N) p->N = *p->inum; + + p->blocks = p->N > 1024 ? p->N/1024 : 1; + + asize = p->N*nsmps*sizeof(MYFLT); + ipsize = p->N*sizeof(int); + fpsize = p->N*sizeof(float); + tsize = (p->itab->flen+1)*sizeof(MYFLT); + + cudaMalloc(&p->out, asize); + cudaMalloc(&p->ndx, ipsize); + cudaMalloc(&p->amp, fpsize); + cudaMalloc(&p->inc, ipsize); + cudaMalloc(&p->tab, tsize); + cudaMemset(p->ndx, 0, ipsize); + cudaMemcpy(p->tab, p->itab->ftable, tsize, cudaMemcpyHostToDevice); + + p->ap = p->atab->ftable; + p->fp = p->ftab->ftable; + + csound->RegisterDeinitCallback(csound, p, destroy_cudaop); + csound->Message(csound, "%d threads, %d blocks\n", p->N, p->blocks); + return OK; +} + +static void update_params(CSOUND *csound, CUDAOP *p){ + + int ipsize = p->N*sizeof(int); + int fpsize = p->N*sizeof(float); + float amp[MAXBLOCK]; + int inc[MAXBLOCK], i, j; + int N = p->N > MAXBLOCK ? MAXBLOCK : p->N; + + for(j=0; N > 0; j++, N = p->N - N) { + for(i=0;i < N; i++){ + amp[i] = p->ap[i]; + inc[i] = *p->kfreq*p->fp[i]*FMAXLEN/csound->GetSr(csound); + } + cudaMemcpy(&p->amp[N*j],amp,fpsize, cudaMemcpyHostToDevice); + cudaMemcpy(&p->inc[N*j],inc,ipsize, cudaMemcpyHostToDevice); + } + +} + +static int perf_cudaop(CSOUND *csound, CUDAOP *p){ + + uint32_t offset = p->h.insdshead->ksmps_offset; + uint32_t early = p->h.insdshead->ksmps_no_end; + uint32_t nsmps = CS_KSMPS; + p->ap = p->atab->ftable; + p->fp = p->ftab->ftable; + + if (UNLIKELY(offset)) memset(p->asig, '\0', offset*sizeof(MYFLT)); + if (UNLIKELY(early)) { + nsmps -= early; + memset(&(p->asig[nsmps]), '\0', early*sizeof(MYFLT)); + } + + update_params(csound, p); + component<<blocks, + p->N/p->blocks>>>(p->out,p->ndx, + p->tab,p->amp, + p->inc,nsmps, + p->blocks, + p->itab->lobits, + p->itab->lodiv, + p->itab->lomask); + mixdown<<<1,nsmps>>>(p->out,p->N,nsmps,*p->kamp); + cudaMemcpy(p->asig,p->out,nsmps*sizeof(MYFLT),cudaMemcpyDeviceToHost); + + return OK; +} + +static int destroy_cudaop(CSOUND *csound, void *pp){ + CUDAOP *p = (CUDAOP *) pp; + cudaFree(p->out); + cudaFree(p->ndx); + cudaFree(p->tab); + cudaFree(p->amp); + cudaFree(p->inc); + return OK; +} + + +#include + +typedef struct cudaop2_ { + OPDS h; + MYFLT *asig; + PVSDAT *fsig; + MYFLT *kamp, *kfreq, *itabn; + MYFLT *inum; + MYFLT *out; + float *amp; + MYFLT *tab; + int *ndx, *inc; + float *fp; + AUXCH out_; + FUNC *itab; + int N, blocks; + int count; + int vsamps; + int framecount; +} CUDAOP2; + +static int destroy_cudaop2(CSOUND *csound, void *pp); + +static int init_cudaop2(CSOUND *csound, CUDAOP2 *p){ + + int asize, ipsize, fpsize, tsize; + if(p->fsig->overlap > 1024) + return csound->InitError(csound, "overlap is too large\n"); + + if((p->itab = + csound->FTFind(csound, p->itabn))== NULL) + return csound->InitError(csound, + "could not find table %.0f\n", *p->itabn); + p->N = (p->fsig->N)/2; + + if(*p->inum > 0 && *p->inum < p->N) p->N = *p->inum; + + p->blocks = p->N > 1024 ? p->N/1024 : 1; + p->vsamps = p->fsig->overlap < VSAMPS ? VSAMPS : p->fsig->overlap; + + asize = p->N*p->vsamps*sizeof(MYFLT); + ipsize = p->N*sizeof(int); + fpsize = p->N*sizeof(float); + tsize = (p->itab->flen+1)*sizeof(MYFLT); + + cudaMalloc(&p->out, asize); + cudaMalloc(&p->ndx, ipsize); + cudaMalloc(&p->amp, fpsize); + cudaMalloc(&p->inc, ipsize); + cudaMalloc(&p->tab, tsize); + cudaMemset(p->ndx, 0, ipsize); + cudaMemcpy(p->tab,p->itab->ftable,tsize, cudaMemcpyHostToDevice); + + asize = p->vsamps*sizeof(MYFLT); + if(p->out_.auxp == NULL || + p->out_.size < asize) + csound->AuxAlloc(csound, asize , &p->out_); + + csound->RegisterDeinitCallback(csound, p, destroy_cudaop2); + p->count = 0; + + csound->Message(csound, "%d threads, %d blocks\n", p->N, p->blocks); + + return OK; +} + +static void update_params2(CSOUND *csound, CUDAOP2 *p){ + + int ipsize = p->N*sizeof(int); + int fpsize = p->N*sizeof(float); + float amp[MAXBLOCK]; + int inc[MAXBLOCK], i, j, k; + int N = p->N > MAXBLOCK ? MAXBLOCK : p->N; + + for(k=0; N > 0; k++, N = p->N - N) { + for(j=i=0;i < N; i++, j+=2){ + amp[i] = p->fp[j]; + inc[i] = MYFLT2LONG(*p->kfreq * p->fp[j+1]*FMAXLEN/csound->GetSr(csound)); + } + cudaMemcpy(&p->amp[k*N],amp,fpsize, cudaMemcpyHostToDevice); + cudaMemcpy(&p->inc[k*N],inc,ipsize, cudaMemcpyHostToDevice); + } +} + +static int perf_cudaop2(CSOUND *csound, CUDAOP2 *p){ + + uint32_t offset = p->h.insdshead->ksmps_offset; + uint32_t early = p->h.insdshead->ksmps_no_end; + uint32_t n, nsmps = CS_KSMPS; + MYFLT *out_ = (MYFLT *) p->out_.auxp; + MYFLT *asig = p->asig; + int count = p->count, vsamps = p->vsamps; + p->fp = (float *) (p->fsig->frame.auxp); + + if (UNLIKELY(offset)) memset(asig, '\0', offset*sizeof(MYFLT)); + if (UNLIKELY(early)) { + nsmps -= early; + memset(&asig[nsmps], '\0', early*sizeof(MYFLT)); + } + + for(n=offset; n < nsmps; n++){ + if(count == 0) { + update_params2(csound, p); + component<<blocks, + p->N/p->blocks>>>(p->out,p->ndx, + p->tab,p->amp, + p->inc,p->vsamps, + p->blocks, + p->itab->lobits, + p->itab->lodiv, + p->itab->lomask); + mixdown<<<1,vsamps>>>(p->out,p->N,vsamps,*p->kamp); + cudaMemcpy(out_,p->out,vsamps*sizeof(MYFLT),cudaMemcpyDeviceToHost); + count = vsamps; + } + asig[n] = (MYFLT) out_[vsamps - count]; + count--; + } + p->count = count; + return OK; +} + +static int destroy_cudaop2(CSOUND *csound, void *pp){ + CUDAOP2 *p = (CUDAOP2 *) pp; + cudaFree(p->out); + cudaFree(p->ndx); + cudaFree(p->tab); + cudaFree(p->amp); + cudaFree(p->inc); + return OK; +} + + +static OENTRY localops[] = { + {"cudasynth", sizeof(CUDAOP),0, 5, "a", "kkiiio", (SUBR) init_cudaop, NULL, + (SUBR) perf_cudaop}, + {"cudasynth", sizeof(CUDAOP2),0, 5, "a", "fkkio", (SUBR) init_cudaop2, NULL, + (SUBR) perf_cudaop2} +}; + +extern "C" { + LINKAGE +} diff -Nru csound-6.01~dfsg/Opcodes/cuda/build.sh csound-6.02~dfsg/Opcodes/cuda/build.sh --- csound-6.01~dfsg/Opcodes/cuda/build.sh 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/Opcodes/cuda/build.sh 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,5 @@ +#!/bin/sh +echo "building cuda opcodes ..." +nvcc -O3 -shared -o libcudaop1.dylib adsyn.cu -DUSE_DOUBLE -I../../include -arch=sm_30 -I/usr/local/cuda/include -L/usr/local/cuda/lib -lcufft +nvcc -O3 -shared -o libcudaop2.dylib pvsops.cu -DUSE_DOUBLE -I../../include -arch=sm_30 -I/usr/local/cuda/include -L/usr/local/cuda/lib -lcufft +echo "...done" \ No newline at end of file diff -Nru csound-6.01~dfsg/Opcodes/cuda/cuda_pvs_example.csd csound-6.02~dfsg/Opcodes/cuda/cuda_pvs_example.csd --- csound-6.01~dfsg/Opcodes/cuda/cuda_pvs_example.csd 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/Opcodes/cuda/cuda_pvs_example.csd 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,51 @@ + + +--opcode-lib=./libcudaop2.dylib + + + +ksmps = 64 +0dbfs = 1 + +instr 1 +ifftsize = 2048 +asig diskin2 "flutec3.wav", 1, 0, 1 +fsig cudanal asig, ifftsize, ifftsize/8, ifftsize, 1 +a1 pvsynth fsig +a2 linenr a1*0.5,0.005,0.01,0.01 + out a2 +endin + +instr 2 +ifftsize = 2048 +asig diskin2 "flutec3.wav", 1, 0, 1 +fsig pvsanal asig, ifftsize, ifftsize/8, ifftsize, 1 +a1 cudasynth fsig +a2 linenr a1*0.5,0.005,0.01,0.01 + out a2 +endin + + + + +i1 0 5 +i2 5 5 + + + + + + 100 + 100 + 320 + 240 + true + + + 255 + 255 + 255 + + + + diff -Nru csound-6.01~dfsg/Opcodes/cuda/cudadsyn_example.csd csound-6.02~dfsg/Opcodes/cuda/cudadsyn_example.csd --- csound-6.01~dfsg/Opcodes/cuda/cudadsyn_example.csd 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/Opcodes/cuda/cudadsyn_example.csd 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,41 @@ + + +--opcode-lib=./libcudaop1.dylib + + +ksmps = 64 +0dbfs = 1 + +i1 ftgen 1,0,512,7,1,512,0.001 +i2 ftgen 2,0,512,-7,1,512,512 +schedule 1,0,10 + +instr 1 + +a1 cudasynth 0.001, 100, -1, 2, 1, 128 + out a1 + +endin + + + +e 10 + + + + + + 100 + 100 + 320 + 240 + true + + + 255 + 255 + 255 + + + + diff -Nru csound-6.01~dfsg/Opcodes/cuda/cudadsyn_pvs_example.csd csound-6.02~dfsg/Opcodes/cuda/cudadsyn_pvs_example.csd --- csound-6.01~dfsg/Opcodes/cuda/cudadsyn_pvs_example.csd 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/Opcodes/cuda/cudadsyn_pvs_example.csd 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,43 @@ + + +--opcode-lib=./libcudaop1.dylib + + + +ksmps = 64 +0dbfs = 1 + + +instr 1 + +asig diskin2 "flutec3.wav", 1 +fsig pvsanal asig, 1024, 128, 1024, 1 +a1 cudasynth fsig,p4,p5/cpspch(8.00),-1, 128 +a2 linenr a1,0.001,0.01,0.01 + out a2 + +endin + + + + +i1 0 5 0.5 440 + + + + + + 100 + 100 + 320 + 240 + true + + + 255 + 255 + 255 + + + + diff -Nru csound-6.01~dfsg/Opcodes/cuda/pvsops.cu csound-6.02~dfsg/Opcodes/cuda/pvsops.cu --- csound-6.01~dfsg/Opcodes/cuda/pvsops.cu 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/Opcodes/cuda/pvsops.cu 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,398 @@ +// -*- c++ -*- +// pvsops.cu +// experimental cuda opcodes +// +// V Lazzarini, 2013 + +#include +#include +#define VSAMPS 16 +#define MAXBLOCK 8192 +#include + +/* kernel to convert from pvs to rectangular frame */ +__global__ void frompvs(float* inframe, double* lastph, int blocks, + double scal, double fac) { + + int k = threadIdx.x*blocks + blockIdx.x + 1; + int i = k << 1; + float mag = inframe[i]; + double delta = (inframe[i+1] - k*scal)*fac; + double phi = fmod(lastph[k-1] + delta, TWOPI); + lastph[k-1] = phi; + inframe[i] = (float) (mag*cos(phi)); + inframe[i+1] = (float) (mag*sin(phi)); +} + +__global__ void winrotate(float* inframe, float *win, int blocks, + int N, int offset){ + int k = (threadIdx.x*blocks + blockIdx.x); + inframe[k] = win[k]*inframe[(k+offset)%N]; +} + +typedef struct _pvsyn{ + OPDS h; + MYFLT *asig; + PVSDAT *fsig; + float *inframe; /* N */ + double *lastph; /* N/2 */ + float *win; /* N */ + int framecount; + int curframe; + AUXCH frames; + AUXCH count; + cufftHandle plan; + double scal, fac; +} PVSYN; + +static int destroy_pvsyn(CSOUND *csound, void *pp); + +static int pvsynset(CSOUND *csound, PVSYN *p){ + + int N = p->fsig->N; + + if((N != 0) && !(N & (N - 1))) { + int hsize = p->fsig->overlap; + int size, numframes, i; + MYFLT sum = 0.0; + float *win; + + if(p->fsig->wintype != 1) + return csound->InitError(csound, + "window type not implemented yet\n"); + numframes = N/hsize; + size = N*sizeof(float)*numframes; + if(p->frames.auxp == NULL || + p->frames.size < size) + csound->AuxAlloc(csound, size, &p->frames); + memset(p->frames.auxp, 0, size); + + size = sizeof(int)*numframes; + if(p->count.auxp == NULL || + p->count.size < size) + csound->AuxAlloc(csound, size, &p->count); + *((int *)(p->count.auxp)) = 0; + for(i=1; i < numframes; i++) + ((int *)(p->count.auxp))[i] = + (i + (1.f - (float)i/numframes))*N; + + size = (N+2)*sizeof(float); + cudaMalloc(&p->inframe, size); + size = (N/2-1)*sizeof(double); + cudaMalloc(&p->lastph, size); + cudaMemset(p->lastph, 0, size); + size = N*sizeof(float); + cudaMalloc(&p->win, size); + + win = (float *) malloc(sizeof(float)*N); + for(i=0; i < N; i++) + win[i] = (float) (0.5 - 0.5*cos(i*TWOPI/N)); + for(i = 0; i < N; i++) sum += win[i]; + sum = FL(2.0) / sum; + for(i = 0; i < N; i++) win[i] *= sum; + sum = FL(0.0); + for(i = 0; i <= N; i+=hsize) + sum += win[i] * win[i]; + sum = 2.0/(sum*N); + for(i = 0; i < N; i++) win[i] *= sum; + cudaMemcpy(p->win,win,N*sizeof(float), + cudaMemcpyHostToDevice); + free(win); + + p->framecount = 0; + p->curframe = 0; + + p->fac = TWOPI*hsize/csound->GetSr(csound); + p->scal =csound->GetSr(csound)/N; + cufftPlan1d(&p->plan, N, CUFFT_C2R, 1); + cufftSetCompatibilityMode(p->plan, CUFFT_COMPATIBILITY_NATIVE); + csound->RegisterDeinitCallback(csound, p, destroy_pvsyn); + + return OK; + } + return csound->InitError(csound, "fftsize not power-of-two \n"); + +} + +static int pvsynperf(CSOUND *csound, PVSYN *p){ + + int N = p->fsig->N, i; + int hsize = p->fsig->overlap; + uint32_t offset = p->h.insdshead->ksmps_offset; + uint32_t early = p->h.insdshead->ksmps_no_end; + uint32_t n, nsmps = CS_KSMPS; + MYFLT *asig = p->asig; + float *frames = (float *) p->frames.auxp; + int framecount = p->framecount; + int numframes = N/hsize; + int *count = (int *) p->count.auxp; + + if (UNLIKELY(offset)) memset(asig, '\0', offset*sizeof(MYFLT)); + if (UNLIKELY(early)) { + nsmps -= early; + memset(&asig[nsmps], '\0', early*sizeof(MYFLT)); + } + + for(n=offset; n < nsmps; n++) { + + if(framecount == 0) { + int bins = N/2; + int blocks; + int curframe = p->curframe; + /* start offset for current frame */ + int start = N*curframe; + float *cur = &(frames[start]); + float *win = (float *) p->win; + float *inframe = p->inframe; + float *fsig = (float *) p->fsig->frame.auxp; + /* copy fsig data to device */ + fsig[N+1] = fsig[1] = 0.f; + //csound->Message(csound, "syn %f, %f\n",fsig[41], fsig[40]); + cudaMemcpy(inframe,fsig,(N+2)*sizeof(float), + cudaMemcpyHostToDevice); + /* perf pvs to rect conversion */ + blocks = bins > 1024 ? bins/1024 : 1; + frompvs<<>>(inframe,p->lastph,blocks, + p->scal,p->fac); + /* execute inverse real FFT */ + if(cufftExecC2R(p->plan,(cufftComplex*)inframe,inframe) + != CUFFT_SUCCESS) csound->Message(csound, "cuda fft error\n"); + if (cudaDeviceSynchronize() != cudaSuccess) + csound->Message(csound,"Cuda error: Failed to synchronize\n"); + /* window and rotate data on device */ + blocks = N > 1024 ? N/1024 : 1; + winrotate<<>>(inframe,win,blocks,N,hsize*curframe); + /* copy data to current out frame */ + cudaMemcpy(cur,inframe,N*sizeof(float),cudaMemcpyDeviceToHost); + /* reset counter for this frame to the start */ + count[curframe] = start; + /* move current to next frame circularly */ + p->curframe = ++(curframe) == numframes ? 0 : curframe; + framecount = hsize; + } + asig[n] = FL(0.0); + for(i=0; i < numframes; i++){ + /* overlap-add */ + asig[n] += frames[count[i]]; + count[i]++; + } + framecount--; + } + p->framecount = framecount; + return OK; +} + +static int destroy_pvsyn(CSOUND *csound, void *pp){ + PVSYN *p = (PVSYN *) pp; + cufftDestroy(p->plan); + cudaFree(p->inframe); + cudaFree(p->lastph); + cudaFree(p->win); + return OK; +} + +__device__ double modTwoPi(double x) +{ + x = fmod(x,TWOPI); + return x <= -PI ? x + TWOPI : + (x > PI ? x - TWOPI : x); +} + +/* kernel to convert from rectangular to pvs frame */ +__global__ void topvs(float* aframe, double* oldph, int blocks, + double scal, double fac) { + int k = threadIdx.x*blocks + blockIdx.x + 1; + int i = k << 1; + + float re = aframe[i], im = aframe[i+1]; + float mag = sqrtf(re*re + im*im); + double phi = atan2(im,re); + double delta = phi - oldph[k-1]; + oldph[k-1] = phi; + aframe[i] = mag; + aframe[i+1] = (float) ((modTwoPi(delta) + k*scal)*fac); +} + +__global__ void rotatewin(float* aframe, float *win, int blocks, + int N, int offset){ + int k = (threadIdx.x*blocks + blockIdx.x); + aframe[(k+offset)%N] = win[k]*aframe[k]; +} + +typedef struct _pvan { + OPDS h; + PVSDAT *fsig; + MYFLT *asig,*fftsize,*hsize,*winsize,*wintype; + + float *aframe; /* N */ + double *oldph; /* N/2 */ + float *win; /* N */ + + int framecount; + int curframe; + AUXCH frames; + AUXCH count; + cufftHandle plan; + double scal, fac; + +} PVAN; + +static int destroy_pvanal(CSOUND *csound, void *pp); + +static int pvanalset(CSOUND *csound, PVAN *p){ + + int N = *p->fftsize; + if((N != 0) && !(N & (N - 1))) { + int size, numframes, i; + int hsize = *p->hsize; + float *win; + + p->fsig->N = N; + p->fsig->overlap = hsize; + /* ignore winsize & wintype */ + p->fsig->winsize = N; + p->fsig->wintype = 1; + p->fsig->framecount = 0; + + numframes = N/hsize; + size = N*sizeof(float)*numframes; + if(p->frames.auxp == NULL || + p->frames.size < size) + csound->AuxAlloc(csound, size, &p->frames); + memset(p->frames.auxp, 0, size); + + size = N*sizeof(float); + if(p->fsig->frame.auxp == NULL || + p->fsig->frame.size < size) + csound->AuxAlloc(csound, size, &p->fsig->frame); + memset(p->fsig->frame.auxp, 0, size); + + + size = sizeof(int)*numframes; + if(p->count.auxp == NULL || + p->count.size < size) + csound->AuxAlloc(csound, size, &p->count); + *((int *)(p->count.auxp)) = 0; + for(i=1; i < numframes; i++) + ((int *)(p->count.auxp))[i] = + (i + (float)i/numframes)*N; + + size = (N+2)*sizeof(float); + cudaMalloc(&p->aframe, size); + size = (N/2-1)*sizeof(double); + cudaMalloc(&p->oldph, size); + cudaMemset(p->oldph, 0, size); + size = N*sizeof(float); + cudaMalloc(&p->win, size); + + win = (float *) malloc(sizeof(float)*N); + for(i=0; i < N; i++) + win[i] = (float) (0.5 - 0.5*cos(i*TWOPI/N))*(4./N); + cudaMemcpy(p->win,win,N*sizeof(float), + cudaMemcpyHostToDevice); + free(win); + + p->framecount = 1; + p->curframe = numframes-1; + p->fac = csound->GetSr(csound)/(TWOPI*hsize); + p->scal = (TWOPI*hsize)/N; + cufftPlan1d(&p->plan, N, CUFFT_R2C, 1); + cufftSetCompatibilityMode(p->plan, CUFFT_COMPATIBILITY_NATIVE); + csound->RegisterDeinitCallback(csound, p, destroy_pvanal); + csound->Message(csound, "%d threads, %d blocks\n", N, N/1024); + return OK; + } + return csound->InitError(csound, "fftsize not power-of-two \n"); +} + +static int pvanalperf(CSOUND *csound, PVAN *p){ + + int N = p->fsig->N, i; + int hsize = p->fsig->overlap; + uint32_t offset = p->h.insdshead->ksmps_offset; + uint32_t early = p->h.insdshead->ksmps_no_end; + uint32_t n, nsmps = CS_KSMPS; + MYFLT *asig = p->asig; + float *frames = (float *) p->frames.auxp; + int framecount = p->framecount; + int numframes = N/hsize; + int *count = (int *) p->count.auxp; + + if (UNLIKELY(offset)) memset(asig, '\0', offset*sizeof(MYFLT)); + if (UNLIKELY(early)) { + nsmps -= early; + memset(&asig[nsmps], '\0', early*sizeof(MYFLT)); + } + + for(n=offset; n < nsmps; n++) { + for(i=0; i < numframes; i++){ + frames[count[i]] = asig[n]; + count[i]++; + } + framecount++; + + if(framecount == hsize) { + int bins = N/2; + int blocks; + int curframe = p->curframe; + /* start offset for current frame */ + int start = N*curframe; + float *cur = &(frames[start]); + float *win = (float *) p->win; + float *aframe = p->aframe; + float *fsig = (float *) p->fsig->frame.auxp; + /* copy fsig data to device */ + cudaMemcpy(aframe,cur,N*sizeof(float), + cudaMemcpyHostToDevice); + /* window and rotate data on device */ + blocks = N > 1024 ? N/1024 : 1; + rotatewin<<>>(aframe,win,blocks,N,hsize*(numframes-curframe)); + /* execute inverse real FFT */ + if(cufftExecR2C(p->plan,aframe,(cufftComplex*)aframe) + != CUFFT_SUCCESS) csound->Message(csound, "cuda fft error\n"); + if (cudaDeviceSynchronize() != cudaSuccess) + csound->Message(csound,"Cuda error: Failed to synchronize\n"); + /* perf rect to pvs conversion */ + blocks = bins > 1024 ? bins/1024 : 1; + topvs<<>>(aframe,p->oldph,blocks,p->scal,p->fac); + /* copy data to current out frame */ + cudaMemcpy(fsig,aframe,(N+2)*sizeof(float),cudaMemcpyDeviceToHost); + /* reset counter for this frame to the start */ + fsig[N+1] = fsig[1] = 0.f; + //printf("%f \n", fsig[43]); + //printf("%f \n", fsig[42]); + //csound->Message(csound, "%f, %f\n",fsig[41], fsig[40]); + count[curframe] = start; + /* move current to next frame circularly */ + p->curframe = --(curframe) < 0 ? numframes-1 : curframe; + framecount = 0; + p->fsig->framecount++; + } + } + p->framecount = framecount; + return OK; +} + +static int destroy_pvanal(CSOUND *csound, void *pp){ + PVAN *p = (PVAN *) pp; + cufftDestroy(p->plan); + cudaFree(p->aframe); + cudaFree(p->oldph); + cudaFree(p->win); + return OK; +} + +static OENTRY localops[] = { + {"cudasynth", sizeof(PVSYN),0, 5, "a", "f", (SUBR) pvsynset, NULL, + (SUBR) pvsynperf}, + {"cudanal", sizeof(PVAN),0, 5, "f", "aiiii", (SUBR) pvanalset, NULL, + (SUBR) pvanalperf} +}; + +extern "C" { + LINKAGE +} diff -Nru csound-6.01~dfsg/Opcodes/date.c csound-6.02~dfsg/Opcodes/date.c --- csound-6.01~dfsg/Opcodes/date.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Opcodes/date.c 2014-01-07 16:54:20.000000000 +0000 @@ -57,20 +57,21 @@ char *time_string; /* char *q; */ int32 tmp; + #if defined(MSVC) || (defined(__GNUC__) && defined(__i386__)) - tmp = (int32) MYFLT2LRND(*(p->timstmp)); + tmp = (int32) MYFLT2LRND(*(p->timstmp)); #else - tmp = (int32) (*(p->timstmp) + FL(0.5)); + tmp = (int32) (*(p->timstmp) + FL(0.5)); #endif if (tmp <= 0) temp_time = time(NULL); else temp_time = (time_t)tmp; time_string = ctime(&temp_time); /* printf("Timestamp = %f\ntimestring=>%s<\n", *p->timstmp, time_string); */ - p->Stime_->data[0] = '\0'; + /* q = strchr(time_string, '\n'); */ /* if (q) *q='\0'; */ - if(p->Stime_->data != NULL) csound->Free(csound, p->Stime_->data); + if (p->Stime_->data != NULL) csound->Free(csound, p->Stime_->data); p->Stime_->data = csound->Strdup(csound, time_string); p->Stime_->size = strlen(time_string)+1; return OK; @@ -83,15 +84,15 @@ static int getcurdir(CSOUND *csound, GETCWD *p) { - if(p->Scd->data == NULL){ - p->Scd->size = 1024; - p->Scd->data = csound->Calloc(csound, p->Scd->size); - } + if (p->Scd->data == NULL) { + p->Scd->size = 1024; + p->Scd->data = csound->Calloc(csound, p->Scd->size); + } #if defined(__MACH__) || defined(LINUX) || defined(__HAIKU__) - if (UNLIKELY(getcwd(p->Scd->data, p->Scd->size-1)==NULL)) + if (UNLIKELY(getcwd(p->Scd->data, p->Scd->size-1)==NULL)) #else - if (UNLIKELY( _getcwd(p->Scd->data, p->Scd->size-1)==NULL)) + if (UNLIKELY( _getcwd(p->Scd->data, p->Scd->size-1)==NULL)) #endif return csound->InitError(csound, Str("cannot determine current directory")); return OK; @@ -125,7 +126,7 @@ else csound->strarg2name(csound, name, p->Sfile, "input.", 0); p->fd = fopen(name, "r"); p->lineno = 0; - if(p->Sline->data == NULL) { + if (p->Sline->data == NULL) { p->Sline->data = (char *) csound->Calloc(csound, MAXLINE); p->Sline->size = MAXLINE; } @@ -135,11 +136,11 @@ } static int readf_init(CSOUND *csound, READF *p){ - return readf_init_(csound,p,0); + return readf_init_(csound,p,0); } static int readf_init_S(CSOUND *csound, READF *p){ - return readf_init_(csound,p,1); + return readf_init_(csound,p,1); } @@ -156,7 +157,8 @@ return OK; } else - return csound->PerfError(csound, p->h.insdshead, Str("readf: read failure")); + return csound->PerfError(csound, p->h.insdshead, + Str("readf: read failure")); } *p->line = ++p->lineno; return OK; diff -Nru csound-6.01~dfsg/Opcodes/ftgen.c csound-6.02~dfsg/Opcodes/ftgen.c --- csound-6.01~dfsg/Opcodes/ftgen.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Opcodes/ftgen.c 2014-01-07 16:54:20.000000000 +0000 @@ -188,18 +188,19 @@ return register_ftable_delete(csound, p, fno); } -/* static int ftgentmp_S(CSOUND *csound, FTGEN *p) */ -/* { */ -/* int p1, fno; */ - -/* if (UNLIKELY(ftgen_(csound, p,0,1) != OK)) */ -/* return NOTOK; */ -/* p1 = (int) MYFLT2LRND(*p->p1); */ -/* if (p1) */ -/* return OK; */ -/* fno = (int) MYFLT2LRND(*p->ifno); */ -/* return register_ftable_delete(csound, p, fno); */ -/* } */ + +static int ftgentmp_S(CSOUND *csound, FTGEN *p) +{ + int p1, fno; + + if (UNLIKELY(ftgen_(csound, p,0,1) != OK)) + return NOTOK; + p1 = (int) MYFLT2LRND(*p->p1); + if (p1) + return OK; + fno = (int) MYFLT2LRND(*p->ifno); + return register_ftable_delete(csound, p, fno); +} static int ftfree(CSOUND *csound, FTFREE *p) { @@ -272,9 +273,9 @@ if (UNLIKELY(csound->FTAlloc(csound, fno, (int) header.flen) != 0)) goto err; ftp = ft_func(csound, &fno_f); - memcpy(ftp, &header, sizeof(FUNC) - sizeof(MYFLT) - SSTRSIZ); - memset(&(ftp->ftable[0]), 0, sizeof(MYFLT) * (ftp->flen + 1)); - n = fread(&(ftp->ftable[0]), sizeof(MYFLT), ftp->flen + 1, file); + memcpy(ftp, &header, sizeof(FUNC) - sizeof(MYFLT*) - SSTRSIZ); + memset(ftp->ftable, 0, sizeof(MYFLT) * (ftp->flen + 1)); + n = fread(ftp->ftable, sizeof(MYFLT), ftp->flen + 1, file); if (UNLIKELY(n!=ftp->flen + 1)) goto err4; /* ***** Need to do byte order here ***** */ argp++; @@ -374,7 +375,7 @@ goto err; ftp = ft_func(csound, &fno_f); memcpy(ftp, &header, sizeof(FUNC) - sizeof(MYFLT)); - memset(&(ftp->ftable[0]), 0, sizeof(MYFLT) * (ftp->flen + 1)); + memset(ftp->ftable, 0, sizeof(MYFLT) * (ftp->flen + 1)); for (j = 0; j <= ftp->flen; j++) { if (UNLIKELY(NULL==fgets(s, 64, file))) goto err4; ftp->ftable[j] = (MYFLT) cs_strtod(s, &endptr); @@ -586,8 +587,8 @@ { "ftgen.S", S(FTGEN), TW, 1, "i", "iiiSim", (SUBR) ftgen_S, NULL, NULL }, { "ftgen.iS", S(FTGEN), TW, 1, "i", "iiiiSm", (SUBR) ftgen_iS, NULL, NULL }, { "ftgen.SS", S(FTGEN), TW, 1, "i", "iiiSSm", (SUBR) ftgen_SS, NULL, NULL }, - { "ftgentmp", S(FTGEN), TW, 1, "i", "iiiiim", (SUBR) ftgentmp, NULL, NULL }, - { "ftgentmp.S", S(FTGEN), TW, 1, "i", "iiiiSm", (SUBR) ftgentmp, NULL, NULL }, + { "ftgentmp.i", S(FTGEN), TW, 1, "i", "iiiiim", (SUBR) ftgentmp, NULL, NULL }, + { "ftgentmp.iS", S(FTGEN), TW, 1, "i", "iiiiSm", (SUBR) ftgentmp_S, NULL,NULL}, { "ftfree", S(FTFREE), TW, 1, "", "ii", (SUBR) ftfree, NULL, NULL }, { "ftsave", S(FTLOAD), TR, 1, "", "iim", (SUBR) ftsave, NULL, NULL }, { "ftsave.S", S(FTLOAD), TR, 1, "", "Sim", (SUBR) ftsave_S, NULL, NULL }, diff -Nru csound-6.01~dfsg/Opcodes/gab/gab.c csound-6.02~dfsg/Opcodes/gab/gab.c --- csound-6.01~dfsg/Opcodes/gab/gab.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Opcodes/gab/gab.c 2014-01-07 16:54:20.000000000 +0000 @@ -33,6 +33,8 @@ #include #include "interlocks.h" +#define FLT_MAX ((MYFLT)0x7fffffff) + static int krsnsetx(CSOUND *csound, KRESONX *p) /* Gabriel Maldonado, modifies for arb order */ { @@ -539,7 +541,7 @@ count = p->count; ar = p->sr; - if (UNLIKELY(offset)) memset(ar, 0, nsmps*sizeof(MYFLT)); + memset(ar, 0, nsmps*sizeof(MYFLT)); if (UNLIKELY(early)) { nsmps -= early; memset(&ar[nsmps], '\0', early*sizeof(MYFLT)); @@ -711,7 +713,17 @@ static int partial_maximum_set(CSOUND *csound,P_MAXIMUM *p) { - p->max = 0; + int flag = (int) *p->imaxflag; + switch (flag) { + case 1: + p->max = 0; break; + case 2: + p->max = -FLT_MAX; break; + case 3: + p->max = FLT_MAX; break; + case 4: + p->max = 0; break; + } p->counter = 0; return OK; } @@ -759,13 +771,22 @@ Str("max_k: invalid imaxflag value")); } if (*p->ktrig) { - if (flag == 4) { + switch (flag) { + case 4: *p->kout = p->max / (MYFLT) p->counter; p->counter = 0; - } - else + p->max = FL(0.0); + break; + case 1: + *p->kout = p->max; + p->max = 0; break; + case 2: *p->kout = p->max; - p->max = FL(0.0); + p->max = -FLT_MAX; break; + case 3: + *p->kout = p->max; + p->max = FLT_MAX; break; + } } return OK; } diff -Nru csound-6.01~dfsg/Opcodes/imageOpcodes.h csound-6.02~dfsg/Opcodes/imageOpcodes.h --- csound-6.01~dfsg/Opcodes/imageOpcodes.h 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Opcodes/imageOpcodes.h 2014-01-07 16:54:20.000000000 +0000 @@ -38,7 +38,7 @@ typedef struct { OPDS h; - MYFLT *kn; + MYFLT *kn; STRINGDAT *ifilnam ; } IMGLOAD; diff -Nru csound-6.01~dfsg/Opcodes/lowpassr.c csound-6.02~dfsg/Opcodes/lowpassr.c --- csound-6.01~dfsg/Opcodes/lowpassr.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Opcodes/lowpassr.c 2014-01-07 16:54:20.000000000 +0000 @@ -50,7 +50,10 @@ uint32_t n, nsmps = CS_KSMPS; if (p->okf != kfco || p->okr != kres) { /* Only if changed */ - b = 10.0 / (*p->kres * sqrt((double)kfco)) - 1.0; + if (kfco<=FL(0.0)) + return csound->PerfError(csound, p->h.insdshead, + Str("Cutoff parameter must be positive")); + b = 10.0 / (kres * sqrt((double)kfco)) - 1.0; p->k = k = 1000.0 / (double)kfco; p->coef1 = coef1 = (b+2.0 * k); p->coef2 = coef2 = 1.0/(1.0 + b + k); @@ -77,6 +80,170 @@ return OK; } +static int lowpraa(CSOUND *csound, LOWPR *p) +{ + double b, k = p->k; + MYFLT *ar, *asig; + double yn, ynm1, ynm2 ; + MYFLT *fco = p->kfco; + MYFLT *res = p->kres; + MYFLT okf = p->okf, okr = p->okr; + double coef1 = p->coef1, coef2 = p->coef2; + uint32_t offset = p->h.insdshead->ksmps_offset; + uint32_t early = p->h.insdshead->ksmps_no_end; + uint32_t n, nsmps = CS_KSMPS; + + if (okf!= fco[0] || okr != res[0]) { /* Only if changed */ + if (fco[0]<=FL(0.0)) + return csound->PerfError(csound, p->h.insdshead, + Str("Cutoff parameter must be positive")); + b = 10.0 / (res[0] * sqrt((double)fco[0])) - 1.0; + p->k = k = 1000.0 / (double)fco[0]; + p->coef1 = coef1 = (b+2.0 * k); + p->coef2 = coef2 = 1.0/(1.0 + b + k); + okf = fco[0]; okr = res[0]; + /* remember to save recalculation */ + } + ar = p->ar; + asig = p->asig; + ynm1 = p->ynm1; + ynm2 = p->ynm2; + + if (UNLIKELY(offset)) memset(ar, '\0', offset*sizeof(MYFLT)); + if (UNLIKELY(early)) { + nsmps -= early; + memset(&ar[nsmps], '\0', early*sizeof(MYFLT)); + } + for (n=offset; nPerfError(csound, p->h.insdshead, + Str("Cutoff parameter must be positive")); + b = 10.0 / (res[n] * sqrt((double)fco[n])) - 1.0; + p->k = k = 1000.0 / (double)fco[0]; + p->coef1 = coef1 = (b+2.0 * k); + p->coef2 = coef2 = 1.0/(1.0 + b + k); + okf = fco[n]; okr = res[n]; + /* remember to save recalculation */ + } + ar[n] = (MYFLT)(yn = (coef1 * ynm1 - k * ynm2 + (double)asig[n]) * coef2); + ynm2 = ynm1; + ynm1 = yn; + } + p->ynm1 = ynm1; + p->ynm2 = ynm2; /* And save */ + p->okf = okf; p->okr = okr; + return OK; +} + +static int lowprak(CSOUND *csound, LOWPR *p) +{ + double b, k = p->k; + MYFLT *ar, *asig; + double yn, ynm1, ynm2 ; + MYFLT *fco = p->kfco; + MYFLT kres = *p->kres; + MYFLT okf = p->okf, okr = p->okr; + double coef1 = p->coef1, coef2 = p->coef2; + uint32_t offset = p->h.insdshead->ksmps_offset; + uint32_t early = p->h.insdshead->ksmps_no_end; + uint32_t n, nsmps = CS_KSMPS; + + if (okf != fco[0] || okr != kres) { /* Only if changed */ + if (fco[0]<=FL(0.0)) + return csound->PerfError(csound, p->h.insdshead, + Str("Cutoff parameter must be positive")); + b = 10.0 / (kres * sqrt((double)fco[0])) - 1.0; + p->k = k = 1000.0 / (double)fco[0]; + p->coef1 = coef1 = (b+2.0 * k); + p->coef2 = coef2 = 1.0/(1.0 + b + k); + okf = fco[0]; okr = kres; /* remember to save recalculation */ + } + ar = p->ar; + asig = p->asig; + ynm1 = p->ynm1; + ynm2 = p->ynm2; + + if (UNLIKELY(offset)) memset(ar, '\0', offset*sizeof(MYFLT)); + if (UNLIKELY(early)) { + nsmps -= early; + memset(&ar[nsmps], '\0', early*sizeof(MYFLT)); + } + for (n=offset; nPerfError(csound, p->h.insdshead, + Str("Cutoff parameter must be positive")); + b = 10.0 / (kres * sqrt((double)fco[n])) - 1.0; + p->k = k = 1000.0 / (double)fco[n]; + p->coef1 = coef1 = (b+2.0 * k); + p->coef2 = coef2 = 1.0/(1.0 + b + k); + okf = fco[n]; /* remember to save recalculation */ + } + ar[n] = (MYFLT)(yn = (coef1 * ynm1 - k * ynm2 + (double)asig[n]) * coef2); + ynm2 = ynm1; + ynm1 = yn; + } + p->ynm1 = ynm1; + p->ynm2 = ynm2; /* And save */ + p->okf = okf; p->okr = okr; + + return OK; +} + +static int lowprka(CSOUND *csound, LOWPR *p) +{ + double b, k = p->k; + MYFLT *ar, *asig; + double yn, ynm1, ynm2 ; + MYFLT fco = *p->kfco; + MYFLT *res = p->kres; + MYFLT okr = p->okr, okf = p->okf; + double coef1 = p->coef1, coef2 = p->coef2; + uint32_t offset = p->h.insdshead->ksmps_offset; + uint32_t early = p->h.insdshead->ksmps_no_end; + uint32_t n, nsmps = CS_KSMPS; + + if (okf!= fco || okr != res[0]) { /* Only if changed */ + if (fco<=FL(0.0)) + return csound->PerfError(csound, p->h.insdshead, + Str("Cutoff parameter must be positive")); + b = 10.0 / (res[0] * sqrt((double)fco)) - 1.0; + p->k = k = 1000.0 / (double)fco; + p->coef1 = coef1 = (b+2.0 * k); + p->coef2 = coef2 = 1.0/(1.0 + b + k); + okf = fco; okr = res[0]; /* remember to save recalculation */ + } + ar = p->ar; + asig = p->asig; + ynm1 = p->ynm1; + ynm2 = p->ynm2; + + if (UNLIKELY(offset)) memset(ar, '\0', offset*sizeof(MYFLT)); + if (UNLIKELY(early)) { + nsmps -= early; + memset(&ar[nsmps], '\0', early*sizeof(MYFLT)); + } + for (n=offset; nk = k = 1000.0 / (double)fco; + p->coef1 = coef1 = (b+2.0 * k); + p->coef2 = coef2 = 1.0/(1.0 + b + k); + okr = res[n]; /* remember to save recalculation */ + } + ar[n] = (MYFLT)(yn = (coef1 * ynm1 - k * ynm2 + (double)asig[n]) * coef2); + ynm2 = ynm1; + ynm1 = yn; + } + p->ynm1 = ynm1; + p->ynm2 = ynm2; /* And save */ + p->okf = okf; p->okr = okr; + + return OK; +} + static int lowpr_setx(CSOUND *csound, LOWPRX *p) { int j; @@ -95,19 +262,12 @@ MYFLT b, k = p->k; MYFLT *ar, *asig, yn,*ynm1, *ynm2 ; MYFLT coef1 = p->coef1, coef2 = p->coef2; - MYFLT kfco = *p->kfco, kres = *p->kres; + MYFLT *kfco = p->kfco, *kres = p->kres; uint32_t offset = p->h.insdshead->ksmps_offset; uint32_t early = p->h.insdshead->ksmps_no_end; uint32_t n, nsmps = CS_KSMPS; int j; - if (p->okf != kfco || p->okr != kres) { /* Only if changed */ - b = FL(10.0) / (*p->kres * SQRT(kfco)) - FL(1.0); - p->k = k = FL(1000.0) / kfco; - p->coef1 = coef1 = (b+FL(2.0) * k); - p->coef2 = coef2 = FL(1.0)/(FL(1.0) + b + k); - p->okf = kfco; p->okr = kres; /* remember to save recalculation */ - } ynm1 = p->ynm1; ynm2 = p->ynm2; @@ -122,12 +282,24 @@ ar = p->ar; for (n=offset;nokf != fco || p->okr != res) { /* Only if changed */ + b = FL(10.0) / (res * SQRT(fco)) - FL(1.0); + k = FL(1000.0) / fco; + coef1 = (b+FL(2.0) * k); + coef2 = FL(1.0)/(FL(1.0) + b + k); + p->okf = fco; p->okr = res; /* remember to save recalculation */ + } ar[n] = yn = (coef1 * ynm1[j] - k * ynm2[j] + asig[n]) * coef2; ynm2[j] = ynm1[j]; ynm1[j] = yn; } asig= p->ar; } + p->k = k; + p->coef1 = coef1; + p->coef2 = coef2; return OK; } @@ -166,6 +338,7 @@ nsmps -= early; memset(&p->ar[nsmps], '\0', early*sizeof(MYFLT)); } + ar = p->ar; for (j=0; j< p->loop; j++) { MYFLT lynm1 = ynm1[j]; MYFLT lynm2 = ynm2[j]; @@ -181,7 +354,6 @@ coef1 = (b+FL(2.0) *k); coef2 = FL(1.0)/(FL(1.0) + b + k); - ar = p->ar; for (n=offset;nout; + MYFLT *in = p->in; + MYFLT *freq = p->freq; + MYFLT *res = p->res; + MYFLT cfreq = freq[0], cres = res[0]; + double res4; + double *delay = p->delay; + double *tanhstg = p->tanhstg; + double stg[4], input; + double acr, tune; +#define THERMAL (0.000025) /* (1.0 / 40000.0) transistor thermal voltage */ + int j, k; + uint32_t offset = p->h.insdshead->ksmps_offset; + uint32_t early = p->h.insdshead->ksmps_no_end; + uint32_t i, nsmps = CS_KSMPS; + + if (p->oldfreq != cfreq || p->oldres != cres) { + double f, fc, fc2, fc3, fcr; + p->oldfreq = cfreq; + /* sr is half the actual filter sampling rate */ + fc = (double)(cfreq/CS_ESR); + f = 0.5*fc; + fc2 = fc*fc; + fc3 = fc2*fc; + /* frequency & amplitude correction */ + fcr = 1.8730*fc3 + 0.4955*fc2 - 0.6490*fc + 0.9988; + acr = -3.9364*fc2 + 1.8409*fc + 0.9968; + tune = (1.0 - exp(-(TWOPI*f*fcr))) / THERMAL; /* filter tuning */ + p->oldres = cres; + p->oldacr = acr; + p->oldtune = tune; + } + else { + cres = p->oldres; + acr = p->oldacr; + tune = p->oldtune; + } + res4 = 4.0*(double)cres*acr; + + if (UNLIKELY(offset)) memset(out, '\0', offset*sizeof(MYFLT)); + if (UNLIKELY(early)) { + nsmps -= early; + memset(&out[nsmps], '\0', early*sizeof(MYFLT)); + } + for (i = offset; i < nsmps; i++) { + if (p->oldfreq != freq[i] || p->oldres != res[i]) { + double f, fc, fc2, fc3, fcr; + p->oldfreq = freq[i]; + /* sr is half the actual filter sampling rate */ + fc = (double)(freq[i]/CS_ESR); + f = 0.5*fc; + fc2 = fc*fc; + fc3 = fc2*fc; + /* frequency & amplitude correction */ + fcr = 1.8730*fc3 + 0.4955*fc2 - 0.6490*fc + 0.9988; + acr = -3.9364*fc2 + 1.8409*fc + 0.9968; + tune = (1.0 - exp(-(TWOPI*f*fcr))) / THERMAL; /* filter tuning */ + p->oldres = cres; + p->oldacr = acr; + p->oldtune = tune; + res4 = 4.0*(double)res[i]*acr; + } + /* oversampling */ + for (j = 0; j < 2; j++) { + /* filter stages */ + input = in[i] - res4 /*4.0*res*acr*/ *delay[5]; + delay[0] = stg[0] = delay[0] + tune*(tanh(input*THERMAL) - tanhstg[0]); +#if 0 + input = stg[0]; + stg[1] = delay[1] + tune*((tanhstg[0] = tanh(input*THERMAL)) - tanhstg[1]); + input = delay[1] = stg[1]; + stg[2] = delay[2] + tune*((tanhstg[1] = tanh(input*THERMAL)) - tanhstg[2]); + input = delay[2] = stg[2]; + stg[3] = delay[3] + tune*((tanhstg[2] = + tanh(input*THERMAL)) - tanh(delay[3]*THERMAL)); + delay[3] = stg[3]; +#else + for (k = 1; k < 4; k++) { + input = stg[k-1]; + stg[k] = delay[k] + + tune*((tanhstg[k-1] = tanh(input*THERMAL)) + - (k != 3 ? tanhstg[k] : tanh(delay[k]*THERMAL))); + delay[k] = stg[k]; + } +#endif + /* 1/2-sample delay for phase compensation */ + delay[5] = (stg[3] + delay[4])*0.5; + delay[4] = stg[3]; + } + out[i] = (MYFLT) delay[5]; + } + return OK; +} + +static int moogladder_process_ak(CSOUND *csound,moogladder *p) +{ + MYFLT *out = p->out; + MYFLT *in = p->in; + MYFLT *freq = p->freq; + MYFLT res = *p->res; + double res4; + double *delay = p->delay; + double *tanhstg = p->tanhstg; + double stg[4], input; + double acr, tune; +#define THERMAL (0.000025) /* (1.0 / 40000.0) transistor thermal voltage */ + int j, k; + uint32_t offset = p->h.insdshead->ksmps_offset; + uint32_t early = p->h.insdshead->ksmps_no_end; + uint32_t i, nsmps = CS_KSMPS; + + if (res < 0) res = 0; + + if (p->oldfreq != freq[0] || p->oldres != res) { + double f, fc, fc2, fc3, fcr; + p->oldfreq = freq[0]; + /* sr is half the actual filter sampling rate */ + fc = (double)(freq[0]/CS_ESR); + f = 0.5*fc; + fc2 = fc*fc; + fc3 = fc2*fc; + /* frequency & amplitude correction */ + fcr = 1.8730*fc3 + 0.4955*fc2 - 0.6490*fc + 0.9988; + acr = -3.9364*fc2 + 1.8409*fc + 0.9968; + tune = (1.0 - exp(-(TWOPI*f*fcr))) / THERMAL; /* filter tuning */ + p->oldres = res; + p->oldacr = acr; + p->oldtune = tune; + } + else { + res = p->oldres; + acr = p->oldacr; + tune = p->oldtune; + } + res4 = 4.0*(double)res*acr; + + if (UNLIKELY(offset)) memset(out, '\0', offset*sizeof(MYFLT)); + if (UNLIKELY(early)) { + nsmps -= early; + memset(&out[nsmps], '\0', early*sizeof(MYFLT)); + } + for (i = offset; i < nsmps; i++) { + if (p->oldfreq != freq[i]) { + double f, fc, fc2, fc3, fcr; + p->oldfreq = freq[i]; + /* sr is half the actual filter sampling rate */ + fc = (double)(freq[i]/CS_ESR); + f = 0.5*fc; + fc2 = fc*fc; + fc3 = fc2*fc; + /* frequency & amplitude correction */ + fcr = 1.8730*fc3 + 0.4955*fc2 - 0.6490*fc + 0.9988; + acr = -3.9364*fc2 + 1.8409*fc + 0.9968; + tune = (1.0 - exp(-(TWOPI*f*fcr))) / THERMAL; /* filter tuning */ + p->oldacr = acr; + p->oldtune = tune; + res4 = 4.0*(double)res*acr; + } + /* oversampling */ + for (j = 0; j < 2; j++) { + /* filter stages */ + input = in[i] - res4 /*4.0*res*acr*/ *delay[5]; + delay[0] = stg[0] = delay[0] + tune*(tanh(input*THERMAL) - tanhstg[0]); +#if 0 + input = stg[0]; + stg[1] = delay[1] + tune*((tanhstg[0] = tanh(input*THERMAL)) - tanhstg[1]); + input = delay[1] = stg[1]; + stg[2] = delay[2] + tune*((tanhstg[1] = tanh(input*THERMAL)) - tanhstg[2]); + input = delay[2] = stg[2]; + stg[3] = delay[3] + tune*((tanhstg[2] = + tanh(input*THERMAL)) - tanh(delay[3]*THERMAL)); + delay[3] = stg[3]; +#else + for (k = 1; k < 4; k++) { + input = stg[k-1]; + stg[k] = delay[k] + + tune*((tanhstg[k-1] = tanh(input*THERMAL)) + - (k != 3 ? tanhstg[k] : tanh(delay[k]*THERMAL))); + delay[k] = stg[k]; + } +#endif + /* 1/2-sample delay for phase compensation */ + delay[5] = (stg[3] + delay[4])*0.5; + delay[4] = stg[3]; + } + out[i] = (MYFLT) delay[5]; + } + return OK; +} + +static int moogladder_process_ka(CSOUND *csound,moogladder *p) +{ + MYFLT *out = p->out; + MYFLT *in = p->in; + MYFLT freq = *p->freq; + MYFLT *res = p->res; + MYFLT cres = res[0]; + double res4; + double *delay = p->delay; + double *tanhstg = p->tanhstg; + double stg[4], input; + double acr, tune; +#define THERMAL (0.000025) /* (1.0 / 40000.0) transistor thermal voltage */ + int j, k; + uint32_t offset = p->h.insdshead->ksmps_offset; + uint32_t early = p->h.insdshead->ksmps_no_end; + uint32_t i, nsmps = CS_KSMPS; + + if (cres < 0) cres = 0; + + if (p->oldfreq != freq || p->oldres != cres) { + double f, fc, fc2, fc3, fcr; + p->oldfreq = freq; + /* sr is half the actual filter sampling rate */ + fc = (double)(freq/CS_ESR); + f = 0.5*fc; + fc2 = fc*fc; + fc3 = fc2*fc; + /* frequency & amplitude correction */ + fcr = 1.8730*fc3 + 0.4955*fc2 - 0.6490*fc + 0.9988; + acr = -3.9364*fc2 + 1.8409*fc + 0.9968; + tune = (1.0 - exp(-(TWOPI*f*fcr))) / THERMAL; /* filter tuning */ + p->oldres = cres; + p->oldacr = acr; + p->oldtune = tune; + } + else { + cres = p->oldres; + acr = p->oldacr; + tune = p->oldtune; + } + res4 = 4.0*(double)cres*acr; + + if (UNLIKELY(offset)) memset(out, '\0', offset*sizeof(MYFLT)); + if (UNLIKELY(early)) { + nsmps -= early; + memset(&out[nsmps], '\0', early*sizeof(MYFLT)); + } + for (i = offset; i < nsmps; i++) { + if (cres != res[i]) { + double f, fc, fc2, fc3, fcr; + /* sr is half the actual filter sampling rate */ + fc = (double)(freq/CS_ESR); + f = 0.5*fc; + fc2 = fc*fc; + fc3 = fc2*fc; + /* frequency & amplitude correction */ + fcr = 1.8730*fc3 + 0.4955*fc2 - 0.6490*fc + 0.9988; + acr = -3.9364*fc2 + 1.8409*fc + 0.9968; + tune = (1.0 - exp(-(TWOPI*f*fcr))) / THERMAL; /* filter tuning */ + p->oldres = cres = res[i]; + p->oldacr = acr; + p->oldtune = tune; + res4 = 4.0*(double)cres*acr; + } + /* oversampling */ + for (j = 0; j < 2; j++) { + /* filter stages */ + input = in[i] - res4 /*4.0*res*acr*/ *delay[5]; + delay[0] = stg[0] = delay[0] + tune*(tanh(input*THERMAL) - tanhstg[0]); +#if 0 + input = stg[0]; + stg[1] = delay[1] + tune*((tanhstg[0] = tanh(input*THERMAL)) - tanhstg[1]); + input = delay[1] = stg[1]; + stg[2] = delay[2] + tune*((tanhstg[1] = tanh(input*THERMAL)) - tanhstg[2]); + input = delay[2] = stg[2]; + stg[3] = delay[3] + tune*((tanhstg[2] = + tanh(input*THERMAL)) - tanh(delay[3]*THERMAL)); + delay[3] = stg[3]; +#else + for (k = 1; k < 4; k++) { + input = stg[k-1]; + stg[k] = delay[k] + + tune*((tanhstg[k-1] = tanh(input*THERMAL)) + - (k != 3 ? tanhstg[k] : tanh(delay[k]*THERMAL))); + delay[k] = stg[k]; + } +#endif + /* 1/2-sample delay for phase compensation */ + delay[5] = (stg[3] + delay[4])*0.5; + delay[4] = stg[3]; + } + out[i] = (MYFLT) delay[5]; + } + return OK; +} + static int statevar_init(CSOUND *csound,statevar *p) { if (*p->istor==FL(0.0)) { @@ -140,8 +429,8 @@ MYFLT *outbp = p->outbp; MYFLT *outbr = p->outbr; MYFLT *in = p->in; - MYFLT freq = *p->freq; - MYFLT res = *p->res; + MYFLT *freq = p->freq; + MYFLT *res = p->res; double lpd = p->lpd; double bpd = p->bpd; double lp = p->lp, hp = 0.0, bp = 0.0, br = 0.0; @@ -151,23 +440,6 @@ uint32_t early = p->h.insdshead->ksmps_no_end; uint32_t i, nsmps = CS_KSMPS; - if (p->oldfreq != freq || p->oldres != res) { - f = 2.0*sin(freq*(double)csound->pidsr/ostimes); - q = 1.0/res; - lim = ((2.0 - f) *0.05)/ostimes; - /* csound->Message(csound, "lim: %f, q: %f \n", lim, q); */ - - if (q < lim) q = lim; - p->oldq = q; - p->oldf = f; - p->oldfreq = freq; - p->oldres = res; - } - else { - q = p->oldq; - f = p->oldf; - } - if (UNLIKELY(offset)) { memset(outhp, '\0', offset*sizeof(MYFLT)); memset(outlp, '\0', offset*sizeof(MYFLT)); @@ -181,7 +453,24 @@ memset(&outbp[nsmps], '\0', early*sizeof(MYFLT)); memset(&outbr[nsmps], '\0', early*sizeof(MYFLT)); } + q = p->oldq; + f = p->oldf; + for (i=offset; ioldfreq != fr|| p->oldres != rs) { + f = 2.0*sin(fr*(double)csound->pidsr/ostimes); + q = 1.0/rs; + lim = ((2.0 - f) *0.05)/ostimes; + /* csound->Message(csound, "lim: %f, q: %f \n", lim, q); */ + + if (q < lim) q = lim; + p->oldq = q; + p->oldf = f; + p->oldfreq = fr; + p->oldres = rs; + } for (j=0; jout; MYFLT *in = p->in; - MYFLT freq = *p->freq; - MYFLT ris = *p->ris; - MYFLT dec = *p->dec; + MYFLT *freq = p->freq; + MYFLT *ris = p->ris; + MYFLT *dec = p->dec; double *delay = p->delay,ang,fsc,rrad1,rrad2; double w1,y1,w2,y2; uint32_t offset = p->h.insdshead->ksmps_offset; uint32_t early = p->h.insdshead->ksmps_no_end; uint32_t i, nsmps = CS_KSMPS; - - ang = (double)csound->tpidsr*freq; /* pole angle */ - fsc = sin(ang) - 3.0; /* freq scl */ - rrad1 = pow(10.0, fsc/(dec*CS_ESR)); /* filter radii */ - rrad2 = pow(10.0, fsc/(ris*CS_ESR)); + MYFLT lfrq = -FL(1.0), lrs = -FL(1.0), ldc = -FL(1.0); if (UNLIKELY(offset)) memset(out, '\0', offset*sizeof(MYFLT)); if (UNLIKELY(early)) { @@ -239,6 +524,16 @@ memset(&out[nsmps], '\0', early*sizeof(MYFLT)); } for (i=offset;itpidsr*frq; /* pole angle */ + fsc = sin(ang) - 3.0; /* freq scl */ + rrad1 = pow(10.0, fsc/(dc*CS_ESR)); /* filter radii */ + rrad2 = pow(10.0, fsc/(rs*CS_ESR)); + } w1 = in[i] + 2.0*rrad1*cos(ang)*delay[0] - rrad1*rrad1*delay[1]; y1 = w1 - delay[1]; @@ -257,11 +552,17 @@ } static OENTRY localops[] = { - {"moogladder", sizeof(moogladder), 0, 5, "a", "akkp", + {"moogladder.kk", sizeof(moogladder), 0, 5, "a", "akkp", (SUBR) moogladder_init, NULL, (SUBR) moogladder_process }, - {"statevar", sizeof(statevar), 0, 5, "aaaa", "akkop", + {"moogladder.aa", sizeof(moogladder), 0, 5, "a", "aaap", + (SUBR) moogladder_init, NULL, (SUBR) moogladder_process_aa }, + {"moogladder.ak", sizeof(moogladder), 0, 5, "a", "aakp", + (SUBR) moogladder_init, NULL, (SUBR) moogladder_process_ak }, + {"moogladder.ka", sizeof(moogladder), 0, 5, "a", "akap", + (SUBR) moogladder_init, NULL, (SUBR) moogladder_process_ka }, + {"statevar", sizeof(statevar), 0, 5, "aaaa", "axxop", (SUBR) statevar_init, NULL, (SUBR) statevar_process }, - {"fofilter", sizeof(fofilter), 0, 5, "a", "akkkp", + {"fofilter", sizeof(fofilter), 0, 5, "a", "axxxp", (SUBR) fofilter_init, NULL, (SUBR) fofilter_process } }; diff -Nru csound-6.01~dfsg/Opcodes/pan2.c csound-6.02~dfsg/Opcodes/pan2.c --- csound-6.01~dfsg/Opcodes/pan2.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Opcodes/pan2.c 2014-01-07 16:54:20.000000000 +0000 @@ -41,7 +41,7 @@ static int pan2set(CSOUND *csound, PAN2 *p) { int type = p->type = MYFLT2LRND(*p->itype); - if (UNLIKELY(type <0 || type > 2)) + if (UNLIKELY(type <0 || type > 3)) return csound->InitError(csound, Str("Unknown panning type")); return OK; } diff -Nru csound-6.01~dfsg/Opcodes/partikkel.c csound-6.02~dfsg/Opcodes/partikkel.c --- csound-6.01~dfsg/Opcodes/partikkel.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Opcodes/partikkel.c 2014-01-07 16:54:20.000000000 +0000 @@ -28,7 +28,6 @@ /* Assume csound and p pointers are always available */ #define frand() (csound->RandMT(&p->randstate)/(double)(0xffffffff)) - /* linear interpolation between x and y by z * NOTE: arguments evaluated more than once, do not pass anything with side * effects @@ -98,62 +97,61 @@ pg = csound->QueryGlobalVariable(csound, "partikkel"); if (pg == NULL) { - char *t; - int i; + int i; - if (UNLIKELY(csound->CreateGlobalVariable(csound, "partikkel", - sizeof(PARTIKKEL_GLOBALS)) != 0)) - return INITERROR("could not allocate globals"); - pg = csound->QueryGlobalVariable(csound, "partikkel"); - pg->rootentry = NULL; - /* build default tables. allocate enough for three, plus extra for the - * ftable data itself */ - t = pg->tablestorage = csound->Calloc(csound, 4*sizeof(FUNC) - + 12*sizeof(MYFLT)); - pg->ooo_tab = (FUNC *)t; - t += sizeof(FUNC) + 2*sizeof(MYFLT); - pg->zzz_tab = (FUNC *)t; - t += sizeof(FUNC) + 2*sizeof(MYFLT); - pg->zzo_tab = (FUNC *)t; - t += sizeof(FUNC) + 2*sizeof(MYFLT); - pg->zzhhhhz_tab = (FUNC *)t; - /* we only fill in the entries in the FUNC struct that we use */ - /* table with data [1.0, 1.0, 1.0], used as default by envelopes */ - pg->ooo_tab->flen = 2; - pg->ooo_tab->lobits = 31; - for (i = 0; i <= 2; ++i) - pg->ooo_tab->ftable[i] = FL(1.0); - /* table with data [0.0, 0.0, 0.0], used as default by grain - * distribution table, channel masks and grain waveforms */ - pg->zzz_tab->flen = 2; - pg->zzz_tab->lobits = 31; - /* table with data [0.0, 0.0, 1.0], used as default by gain masks, - * fm index table, and wave start and end freq tables */ - pg->zzo_tab->ftable[2] = FL(1.0); - /* table with data [0.0, 0.0, 0.5, 0.5, 0.5, 0.5, 0.0], used as default - * by wave gain table */ - for (i = 2; i <= 5; ++i) - pg->zzhhhhz_tab->ftable[i] = FL(0.5); + if (UNLIKELY(csound->CreateGlobalVariable(csound, "partikkel", + sizeof(PARTIKKEL_GLOBALS)) != 0)) + return INITERROR("could not allocate globals"); + pg = csound->QueryGlobalVariable(csound, "partikkel"); + pg->rootentry = NULL; + /* build default tables. allocate enough for three, plus extra for the + * ftable data itself */ + /* we only fill in the entries in the FUNC struct that we use */ + /* table with data [1.0, 1.0, 1.0], used as default by envelopes */ + pg->ooo_tab = (FUNC *)csound->Calloc(csound, sizeof(FUNC)); + pg->ooo_tab->ftable = (MYFLT*)csound->Calloc(csound, 3*sizeof(MYFLT)); + pg->ooo_tab->flen = 2; + pg->ooo_tab->lobits = 31; + for (i = 0; i <= 2; ++i) + pg->ooo_tab->ftable[i] = FL(1.0); + /* table with data [0.0, 0.0, 0.0], used as default by grain + * distribution table, channel masks and grain waveforms */ + pg->zzz_tab = (FUNC *)csound->Calloc(csound, sizeof(FUNC)); + pg->zzz_tab->ftable = (MYFLT*)csound->Calloc(csound, 3*sizeof(MYFLT)); + pg->zzz_tab->flen = 2; + pg->zzz_tab->lobits = 31; + /* table with data [0.0, 0.0, 1.0], used as default by gain masks, + * fm index table, and wave start and end freq tables */ + pg->zzo_tab = (FUNC *)csound->Calloc(csound, sizeof(FUNC)); + pg->zzo_tab->ftable = (MYFLT*)csound->Calloc(csound, 4*sizeof(MYFLT)); + pg->zzo_tab->ftable[2] = FL(1.0); + pg->zzo_tab->flen = 3; /* JPff */ + /* table with data [0.0, 0.0, 0.5, 0.5, 0.5, 0.5, 0.0], used as default + * by wave gain table */ + pg->zzhhhhz_tab = (FUNC *)csound->Calloc(csound, sizeof(FUNC)); + pg->zzhhhhz_tab->ftable = (MYFLT*)csound->Calloc(csound, 8*sizeof(MYFLT)); + for (i = 2; i <= 5; ++i) + pg->zzhhhhz_tab->ftable[i] = FL(0.5); } p->globals = pg; if ((int)*p->opcodeid == 0) { - /* opcodeid 0 means we do not bother with the sync opcode */ - p->globals_entry = NULL; - return OK; + /* opcodeid 0 means we do not bother with the sync opcode */ + p->globals_entry = NULL; + return OK; } /* try to find entry corresponding to our opcodeid */ pe = &pg->rootentry; while (*pe != NULL && (*pe)->id != *p->opcodeid) - pe = &((*pe)->next); + pe = &((*pe)->next); /* check if one already existed, if not, create one */ if (*pe == NULL) { - *pe = csound->Malloc(csound, sizeof(PARTIKKEL_GLOBALS_ENTRY)); - (*pe)->id = *p->opcodeid; - (*pe)->partikkel = p; - /* allocate table for sync data */ - (*pe)->synctab = csound->Calloc(csound, 2*CS_KSMPS*sizeof(MYFLT)); - (*pe)->next = NULL; + *pe = csound->Malloc(csound, sizeof(PARTIKKEL_GLOBALS_ENTRY)); + (*pe)->id = *p->opcodeid; + (*pe)->partikkel = p; + /* allocate table for sync data */ + (*pe)->synctab = csound->Calloc(csound, 2*CS_KSMPS*sizeof(MYFLT)); + (*pe)->next = NULL; } p->globals_entry = *pe; return OK; diff -Nru csound-6.01~dfsg/Opcodes/partikkel.h csound-6.02~dfsg/Opcodes/partikkel.h --- csound-6.01~dfsg/Opcodes/partikkel.h 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Opcodes/partikkel.h 2014-01-07 16:54:20.000000000 +0000 @@ -73,7 +73,7 @@ FUNC *zzz_tab; FUNC *zzo_tab; FUNC *zzhhhhz_tab; - char *tablestorage; + //char *tablestorage; PARTIKKEL_GLOBALS_ENTRY *rootentry; } PARTIKKEL_GLOBALS; diff -Nru csound-6.01~dfsg/Opcodes/pitch.c csound-6.02~dfsg/Opcodes/pitch.c --- csound-6.01~dfsg/Opcodes/pitch.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Opcodes/pitch.c 2014-01-07 16:54:20.000000000 +0000 @@ -670,6 +670,7 @@ *lphs++ = ((int32) (*p->iphs * FMAXLEN)) & PHMASK; } while (--count); } + return OK; } @@ -2145,23 +2146,16 @@ uint32_t offset = p->h.insdshead->ksmps_offset; uint32_t early = p->h.insdshead->ksmps_no_end; uint32_t n, nsmps = CS_KSMPS; - MYFLT kfcn = FL(2.0) * *p->fco * csound->onedsr; - MYFLT kp = ((-FL(2.7528)*kfcn + FL(3.0429))*kfcn + - FL(1.718))*kfcn - FL(0.9984); - MYFLT kp1 = kp+FL(1.0); - MYFLT kp1h = FL(0.5)*kp1; - /* Version using log */ - /* MYFLT kres = *p->res * (FL(2.2173) - FL(1.6519)*log(kp+FL(1.0))); */ - MYFLT kres = *p->res * (((-FL(2.7079)*kp1 + FL(10.963))*kp1 - - FL(14.934))*kp1 + FL(8.4974)); MYFLT ay1 = p->ay1; MYFLT ay2 = p->ay2; MYFLT aout = p->aout; MYFLT *ain = p->ain; MYFLT *ar = p->ar; - double dist = (double)*p->dist; MYFLT lastin = p->lastin; - double value = 1.0+(dist*(1.5+2.0*(double)kres*(1.0-(double)kfcn))); + double value = 0.0; + int flag = 1; + MYFLT lfc, lrs, kres, kfcn, kp, kp1, kp1h; + double lds = 0.0; if (UNLIKELY(offset)) memset(ar, '\0', offset*sizeof(MYFLT)); if (UNLIKELY(early)) { @@ -2169,13 +2163,37 @@ memset(&ar[nsmps], '\0', early*sizeof(MYFLT)); } for (n=offset;nfco[n] : *p->fco); + res = (XINARG3 ? p->res[n] : *p->res); + dist = (double)(XINARG4 ? p->dist[n] : *p->dist); + if (fco != lfc || flag) { + lfc = fco; + kfcn = FL(2.0) * fco * csound->onedsr; + kp = ((-FL(2.7528)*kfcn + FL(3.0429))*kfcn + + FL(1.718))*kfcn - FL(0.9984); + kp1 = kp+FL(1.0); + kp1h = FL(0.5)*kp1; + flag = 1; + } + if (res != lrs || flag) { + lrs = res; + kres = res * (((-FL(2.7079)*kp1 + FL(10.963))*kp1 + - FL(14.934))*kp1 + FL(8.4974)); + flag = 1; + } + if (dist != lds || flag) { + lds = dist; + value = 1.0+(dist*(1.5+2.0*(double)kres*(1.0-(double)kfcn))); + } + flag = 0; + lastin = ain[n] - TANH(kres*aout); + ay1 = kp1h * (lastin + ax1) - kp*ay1; + ay2 = kp1h * (ay1 + ay11) - kp*ay2; + aout = kp1h * (ay2 + ay31) - kp*aout; ar[n] = TANH(aout*value); } diff -Nru csound-6.01~dfsg/Opcodes/pvlock.c csound-6.02~dfsg/Opcodes/pvlock.c --- csound-6.01~dfsg/Opcodes/pvlock.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Opcodes/pvlock.c 2014-01-07 16:54:20.000000000 +0000 @@ -35,10 +35,16 @@ double pos; MYFLT accum; AUXCH outframe[MAXOUTS], win, bwin[MAXOUTS], fwin[MAXOUTS], - nwin[MAXOUTS], prev[MAXOUTS], framecount[MAXOUTS]; + nwin[MAXOUTS], prev[MAXOUTS], framecount[MAXOUTS], indata[2]; + MYFLT *tab; + int curbuf; + SNDFILE *sf; + FDCH fdch; + MYFLT resamp; } DATASPACE; + static int sinit(CSOUND *csound, DATASPACE *p) { @@ -47,9 +53,7 @@ unsigned int size; int decim = *p->idecim; - if (N) { - for (i=0; N; i++){ N >>= 1; } @@ -61,7 +65,7 @@ p->cnt = p->hsize; p->curframe = 0; - nchans = csound->GetOutputArgCnt(p); + nchans = p->nchans; if (UNLIKELY(nchans < 1 || nchans > MAXOUTS)) csound->InitError(csound, Str("invalid number of output arguments")); @@ -103,8 +107,12 @@ return OK; } +static int sinit1(CSOUND *csound, DATASPACE *p){ + p->nchans = csound->GetOutputArgCnt(p); + return sinit(csound, p); +} -static int sprocess(CSOUND *csound, DATASPACE *p) +static int sprocess1(CSOUND *csound, DATASPACE *p) { uint32_t offset = p->h.insdshead->ksmps_offset; uint32_t early = p->h.insdshead->ksmps_no_end; @@ -163,10 +171,9 @@ sizefrs = size/nchans; while(spos > sizefrs) spos -= sizefrs; while(spos <= 0) spos += sizefrs; - pos = spos; for (j = 0; j < nchans; j++) { - + pos = spos; bwin = (MYFLT *) p->bwin[j].auxp; fwin = (MYFLT *) p->fwin[j].auxp; prev = (MYFLT *)p->prev[j].auxp; @@ -306,6 +313,7 @@ static int sinit2(CSOUND *csound, DATASPACE *p) { unsigned int size,i; + p->nchans = csound->GetOutputArgCnt(p); sinit(csound, p); size = p->N*sizeof(MYFLT); for (i=0; i < p->nchans; i++) @@ -379,10 +387,10 @@ sizefrs = size/nchans; while(spos > sizefrs) spos -= sizefrs; while(spos <= 0) spos += sizefrs; - pos = spos; - for (j = 0; j < nchans; j++) { + for (j = 0; j < nchans; j++) { + pos = spos; bwin = (MYFLT *) p->bwin[j].auxp; fwin = (MYFLT *) p->fwin[j].auxp; nwin = (MYFLT *) p->nwin[j].auxp; @@ -518,6 +526,288 @@ return OK; } +#if 0 +#define BUFS 10 + +/* file-reading version of temposcal */ +static int sinit3(CSOUND *csound, DATASPACE *p) +{ + unsigned int size,i; + char *name; + SF_INFO sfinfo; + // open file + name = ((STRINGDATA *)p->num)->data; + sf = (SNDFILE *) csound->FileOpen2(csound, &(p->sf), CSFILE_SND_R, name, &sfinfo, + "SFDIR;SSDIR", CSFTYPE_UNKNOWN_AUDIO, 0); + if(sfinfo.rate != CS_ESR) + p->resamp = CS_ESR/sfinfo.rate; + else + p->resamp = 1; + p->nchans = sfinfo.chans; + + sinit(csound, p); + size = p->N*sizeof(MYFLT); + for (i=0; i < p->nchans; i++) + if (p->nwin[i].auxp == NULL || p->nwin[i].size < size) + csound->AuxAlloc(csound, size, &p->nwin[i]); + + size = p->N*sizeof(MYFLT)*BUFS; + if (p->indata[0].auxp == NULL || p->indata[0].size < size) + csound->AuxAlloc(csound, size, &p->indata[0]); + if (p->indata[1].auxp == NULL || p->indata[1].size < size) + csound->AuxAlloc(csound, size, &p->indata[1]); + + memset(&(p->fdch), 0, sizeof(FDCH)); + p->fdch.fd = fd; + fdrecord(csound, &(p->fdch)); + + // fill buffers + fillbuffer(csound, p, 0); + fillbuffer(csound, p, size/sizeof(MYFLT)); + p->pos = *p->offset*CS_ESR + p->hsize; + p->tscale = 0; + p->accum = 0; + p->tab = (MYFLT *) p->indata[0].auxp; + p->curbuf = 0; + + + return OK; +} + +/* + this will read a buffer full of samples + from disk position offset samps from the last + call to fillbuf +*/ + +MYFLT *fillbuf(CSOUND *csound, DATASPACE *p, int offset){ + + sf_count_t sampsread; + + // find read position + sf_seek(p->sf, offset, SEEK_CUR); + + // fill p->curbuf + sampsread = sf_read_MYFLT(p->sf, p->indata[curbuf].auxp, + p->indata[curbuf].size/sizeof(MYFLT)); + + // place read pointer at the read position + sf_seek(p->sf, -sampsread, SEEK_CUR); + + // point to the other + p->curbuf = p->curbuf ? 0 : 1; + return (p->tab = (MYFLT *) p->indata[p->curbuf].auxp); +} + +static int sprocess3(CSOUND *csound, DATASPACE *p) +{ + uint32_t offset = p->h.insdshead->ksmps_offset; + uint32_t early = p->h.insdshead->ksmps_no_end; + MYFLT pitch = *p->kpitch*p->resamp, time = *p->time, lock = *p->klock; + MYFLT *out, amp =*p->kamp; + MYFLT *tab,frac, dbtresh = *p->dbthresh; + FUNC *ft; + int N = p->N, hsize = p->hsize, cnt = p->cnt, sizefrs, nchans = p->nchans; + int nsmps = CS_KSMPS, n; + int size, post, i, j; + double pos, spos = p->pos; + MYFLT *fwin, *bwin; + MYFLT in, *nwin, *prev; + MYFLT *win = (MYFLT *) p->win.auxp, *outframe; + MYFLT powrat; + MYFLT ph_real, ph_im, tmp_real, tmp_im, div; + int *framecnt, curframe = p->curframe; + int decim = p->decim; + int outnum = csound->GetOutputArgCnt(p); + + if (UNLIKELY(early)) { + nsmps -= early; + for (j=0; j < nchans; j++) { + out = p->out[j]; + memset(&out[nsmps], '\0', early*sizeof(MYFLT)); + } + } + if (UNLIKELY(offset)) { + for (j=0; j < nchans; j++) { + out = p->out[j]; + memset(out, '\0', offset*sizeof(MYFLT)); + } + } + + for (n=offset; n < nsmps; n++) { + + if (cnt == hsize){ + tab = p->tab; + size = indata[0].size/sizeof(MYFLT); + + if (time < 0 || time >= 1 || !*p->konset) { + spos += hsize*time; + } + else if (p->tscale) { + spos += hsize*(time/(1+p->accum)); + p->accum=0.0; + } + else { + spos += hsize; + p->accum++; + p->tscale = 1; + } + if (UNLIKELY((int) ft->nchanls != nchans)) + return csound->PerfError(csound, p->h.insdshead, + Str("number of output arguments " + "inconsistent with number of " + "sound file channels")); + sizefrs = size/nchans; + + while(spos > sizefrs) { + tab = fillbuffer(csound, p, size*sizeof(MYFLT)); + spos -= sizefrs; + } + while(spos <= 0){ + tab = fillbuffer(csound, p, -size*sizeof(MYFLT)); + spos += sizefrs; + } + + for (j = 0; j < nchans; j++) { + pos = spos; + bwin = (MYFLT *) p->bwin[j].auxp; + fwin = (MYFLT *) p->fwin[j].auxp; + nwin = (MYFLT *) p->nwin[j].auxp; + prev = (MYFLT *)p->prev[j].auxp; + framecnt = (int *)p->framecount[j].auxp; + outframe= (MYFLT *) p->outframe[j].auxp; + + for (i=0; i < N; i++) { + post = (int) pos; + frac = pos - post; + post *= nchans; + post += j; + + while(post < 0) post += size; + while(post >= size) post -= size; + in = tab[post] + frac*(tab[post+nchans] - tab[post]); + + fwin[i] = in * win[i]; + + post = (int) (pos - hsize*pitch); + post *= nchans; + post += j; + if (post >= 0 && post < size) + in = tab[post] + frac*(tab[post+nchans] - tab[post]); + else in = (MYFLT) 0; + bwin[i] = in * win[i]; + post = (int) pos + hsize; + post *= nchans; + post += j; + while(post < 0) post += size; + while(post >= size) post -= size; + in = tab[post] + frac*(tab[post+nchans] - tab[post]); + nwin[i] = in * win[i]; + pos += pitch; + } + + csound->RealFFT(csound, bwin, N); + bwin[N] = bwin[1]; + bwin[N+1] = FL(0.0); + csound->RealFFT(csound, fwin, N); + csound->RealFFT(csound, nwin, N); + + tmp_real = tmp_im = (MYFLT) 1e-20; + for (i=2; i < N; i++) { + tmp_real += nwin[i]*nwin[i] + nwin[i+1]*nwin[i+1]; + tmp_im += fwin[i]*fwin[i] + fwin[i+1]*fwin[i+1]; + } + powrat = FL(20.0)*LOG10(tmp_real/tmp_im); + if (powrat > dbtresh) p->tscale=0; + /*else tscale=1;*/ + + fwin[N] = fwin[1]; + fwin[N+1] = FL(0.0); + + for (i=0; i < N + 2; i+=2) { + + div = FL(1.0)/(HYPOT(prev[i], prev[i+1]) + 1.0e-20); + ph_real = prev[i]*div; + ph_im = prev[i+1]*div; + + tmp_real = bwin[i] * ph_real + bwin[i+1] * ph_im; + tmp_im = bwin[i] * ph_im - bwin[i+1] * ph_real; + bwin[i] = tmp_real; + bwin[i+1] = tmp_im; + } + + for (i=0; i < N + 2; i+=2) { + if (lock) { + if (i > 0) { + if (i < N) { + tmp_real = bwin[i] + bwin[i-2] + bwin[i+2]; + tmp_im = bwin[i+1] + bwin[i-1] + bwin[i+3]; + } + else { + tmp_real = bwin[i] + bwin[i-2]; + tmp_im = FL(0.0); + } + } + else { + tmp_real = bwin[i] + bwin[i+2]; + tmp_im = FL(0.0); + } + } + else { + tmp_real = bwin[i]; + tmp_im = bwin[i+1]; + } + + tmp_real += 1e-15; + div = FL(1.0)/(HYPOT(tmp_real, tmp_im)); + + ph_real = tmp_real*div; + ph_im = tmp_im*div; + + tmp_real = fwin[i] * ph_real - fwin[i+1] * ph_im; + tmp_im = fwin[i] * ph_im + fwin[i+1] * ph_real; + + prev[i] = fwin[i] = tmp_real; + prev[i+1] = fwin[i+1] = tmp_im; + } + + fwin[1] = fwin[N]; + csound->InverseRealFFT(csound, fwin, N); + + framecnt[curframe] = curframe*N; + + for (i=0;iout[j]; + framecnt = (int *) p->framecount[j].auxp; + outframe = (MYFLT *) p->outframe[j].auxp; + out[n] = (MYFLT) 0; + + for (i = 0; i < decim; i++) { + out[n] += outframe[framecnt[i]]; + framecnt[i]++; + } + out[n] *= amp*(2./3.); + } + cnt++; + } + p->cnt = cnt; + p->curframe = curframe; + p->pos = spos; + return OK; + +} + +#endif + typedef struct { OPDS h; @@ -587,7 +877,7 @@ static OENTRY pvlock_localops[] = { {"mincer", sizeof(DATASPACE), 0, 5, "mm", "akkkkoo", - (SUBR)sinit, NULL,(SUBR)sprocess }, + (SUBR)sinit1, NULL,(SUBR)sprocess1 }, {"temposcal", sizeof(DATASPACE), 0, 5, "mm", "kkkkkooPOP", (SUBR)sinit2, NULL,(SUBR)sprocess2 }, {"pvslock", sizeof(PVSLOCK), 0, 3, "f", "fk", (SUBR) pvslockset, diff -Nru csound-6.01~dfsg/Opcodes/pvsbasic.c csound-6.02~dfsg/Opcodes/pvsbasic.c --- csound-6.01~dfsg/Opcodes/pvsbasic.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Opcodes/pvsbasic.c 2014-01-07 16:54:20.000000000 +0000 @@ -1290,7 +1290,7 @@ kdepth = kdepth >= 0 ? (kdepth <= 1 ? kdepth : 1) : FL(0.0); dirgain = (1 - kdepth); for (i = 0; i < N + 2; i += 2) { - fout[i] = (float) (fin[i] * dirgain + fil[i] * kdepth)*g; + fout[i] = (float) (fin[i] * (dirgain + fil[i] * kdepth))*g; fout[i + 1] = fin[i + 1]; } diff -Nru csound-6.01~dfsg/Opcodes/py/pythonopcodes.c csound-6.02~dfsg/Opcodes/py/pythonopcodes.c --- csound-6.01~dfsg/Opcodes/py/pythonopcodes.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Opcodes/py/pythonopcodes.c 2014-01-07 16:54:20.000000000 +0000 @@ -48,7 +48,7 @@ int i; statement[0] = '\0'; - if (argc > 0) { + if (argc-skip > 0) { sprintf(statement, "%s(%0.6f", callable, *(argv[skip])); for (i = skip+1; i < argc; ++i) { sprintf(statement + strlen(statement), ", %f", *(argv[i])); diff -Nru csound-6.01~dfsg/Opcodes/repluck.c csound-6.02~dfsg/Opcodes/repluck.c --- csound-6.01~dfsg/Opcodes/repluck.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Opcodes/repluck.c 2014-01-07 16:54:20.000000000 +0000 @@ -95,7 +95,7 @@ /* Set initial shape */ if (plk != FL(0.0)) { - initial_shape = (MYFLT*)malloc(rail_len*sizeof(MYFLT)); + initial_shape = (MYFLT*) malloc(rail_len*sizeof(MYFLT)); if (pickpt < 1) pickpt = 1; /* Place for pluck, in range (0,1.0) */ upslope = FL(1.0)/(MYFLT)pickpt; /* Slightly faster to precalculate */ downslope = FL(1.0)/(MYFLT)(rail_len - pickpt - 1); diff -Nru csound-6.01~dfsg/Opcodes/sfont.c csound-6.02~dfsg/Opcodes/sfont.c --- csound-6.01~dfsg/Opcodes/sfont.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Opcodes/sfont.c 2014-01-07 16:54:20.000000000 +0000 @@ -51,7 +51,7 @@ static void splitDefaults(splitType *split); #define MAX_SFONT (10) -#define MAX_SFPRESET (512) +#define MAX_SFPRESET (16384) #define GLOBAL_ATTENUATION (FL(0.3)) #define ONETWELTH (0.08333333333333333333333333333) @@ -62,8 +62,8 @@ SFBANK *sfArray; int currSFndx; int maxSFndx; - presetType *presetp[MAX_SFPRESET]; - SHORT *sampleBase[MAX_SFPRESET]; + presetType **presetp; + SHORT **sampleBase; MYFLT pitches[128]; } sfontg; @@ -92,6 +92,9 @@ } free(sfArray); globals->currSFndx = 0; + csound->Free(csound, globals->presetp); + csound->Free(csound, globals->sampleBase); + csound->DestroyGlobalVariable(csound, "::sfontg"); return 0; } @@ -2597,14 +2600,18 @@ return csound->InitError(csound, Str("error... could not create sfont globals\n")); - globals->sfArray = (SFBANK *)malloc(MAX_SFONT*sizeof(SFBANK)); + globals->sfArray = (SFBANK *) malloc(MAX_SFONT*sizeof(SFBANK)); + globals->presetp = + (presetType **) csound->Malloc(csound, MAX_SFPRESET *sizeof(presetType *)); + globals->sampleBase = + (SHORT **) csound->Malloc(csound, MAX_SFPRESET*sizeof(SHORT *)); globals->currSFndx = 0; globals->maxSFndx = MAX_SFONT; for (j=0; j<128; j++) { - globals->pitches[j] = (MYFLT) (440.0 * pow (2.0,(j - 69.0)/12.0)); + globals->pitches[j] = (MYFLT) (440.0 * pow(2.0, (double)(j- 69)/12.0)); } - return OK; + return OK; } int sfont_ModuleInit(CSOUND *csound) diff -Nru csound-6.01~dfsg/Opcodes/signalflowgraph.cpp csound-6.02~dfsg/Opcodes/signalflowgraph.cpp --- csound-6.01~dfsg/Opcodes/signalflowgraph.cpp 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Opcodes/signalflowgraph.cpp 2014-01-07 16:54:20.000000000 +0000 @@ -32,20 +32,26 @@ * outleta Sname, asignal * outletk Sname, ksignal * outletf Sname, fsignal + * outletv Sname, xsignal[] * * Outlets send a, k, or f-rate signals out from an instrument. + * A- and k-rate signals may be arrays. * * The name of the outlet is implicitly qualified by the instrument name * or number,`so it is valid to use the same outlet name in more than one * instrument (but not to use the same outlet name twice in one instrument). * - * asignal inleta Sname - * ksignal inletk Sname - * fsignal inletf Sname + * asignal inleta Sname + * ksignal inletk Sname + * fsignal inletf Sname + * xsignal[] inletv SName + * + * Inlets receive a, k, or f-rate signals from outlets in + * other instruments. A- and k-rate signals may be arrays. * - * Inlets receive a, k, or f-rate signals from outlets in other instruments. * Outlets are connected to inlets of the same type using the connect - * opcode. + * opcode. If arrays are used, the inlets and outlets must be a-rate + * and the same shape. * * The name of the inlet is implicitly qualified by the instrument name, * or number, so it is valid to use the same inlet name in more than one @@ -91,6 +97,9 @@ * to ftgenonce with the same arguments receives the same instance of the * function table data. Every change in the value of any ftgenonce argument * causes the creation of a new function table. + * + * TODO: The inletv opcode always crashes. Not sure why. Perhaps the + * array operations are not ready for prime time at a-rate. */ #include "OpcodeBase.hpp" @@ -105,19 +114,26 @@ #include #include "text.h" +namespace csound { + struct SignalFlowGraph; struct Outleta; struct Outletk; struct Outletf; struct Outletkid; +struct Outletv; struct Inleta; struct Inletk; struct Inletf; struct Inletkid; +struct Inletv; struct Connect; struct AlwaysOn; struct FtGenOnce; +static void* cs_sfg_ftables = 0; +static void* cs_sfg_ports = 0; + #if defined(ISSTRCOD) #undef ISSTRCOD #endif @@ -196,16 +212,19 @@ std::map > > aoutletsForCsoundsForSourceOutletIds; std::map > > koutletsForCsoundsForSourceOutletIds; std::map > > foutletsForCsoundsForSourceOutletIds; +std::map > > voutletsForCsoundsForSourceOutletIds; std::map > > kidoutletsForCsoundsForSourceOutletIds; std::map > > ainletsForCsoundsForSinkInletIds; std::map > > kinletsForCsoundsForSinkInletIds; std::map > > finletsForCsoundsForSinkInletIds; +std::map > > vinletsForCsoundsForSinkInletIds; std::map > > kidinletsForCsoundsForSinkInletIds; std::map > > connectionsForCsounds; std::map > functionTablesForCsoundsForEvtblks; std::map *> * > > aoutletVectorsForCsounds; std::map *> * > > koutletVectorsForCsounds; std::map *> * > > foutletVectorsForCsounds; +std::map *> * > > voutletVectorsForCsounds; std::map *> * > > kidoutletVectorsForCsounds; // For true thread-safety, access to shared data must be protected. @@ -218,7 +237,8 @@ */ struct SignalFlowGraph : public OpcodeBase { int init(CSOUND *csound) { -#pragma omp critical (cs_sfg_ports) +//#pragma omp critical (cs_sfg_ports) + csound->LockMutex(cs_sfg_ports); { aoutletsForCsoundsForSourceOutletIds[csound].clear(); ainletsForCsoundsForSinkInletIds[csound].clear(); @@ -226,14 +246,19 @@ kinletsForCsoundsForSinkInletIds[csound].clear(); foutletsForCsoundsForSourceOutletIds[csound].clear(); finletsForCsoundsForSinkInletIds[csound].clear(); + voutletsForCsoundsForSourceOutletIds[csound].clear(); + vinletsForCsoundsForSinkInletIds[csound].clear(); kidoutletsForCsoundsForSourceOutletIds[csound].clear(); kidinletsForCsoundsForSinkInletIds[csound].clear(); connectionsForCsounds[csound].clear(); } -#pragma omp critical (critical_section_ftables) + csound->UnlockMutex(cs_sfg_ports); +//#pragma omp critical (cs_sfg_ftables) + csound->LockMutex(cs_sfg_ftables); { functionTablesForCsoundsForEvtblks[csound].clear(); } + csound->UnlockMutex(cs_sfg_ftables); return OK; }; }; @@ -250,7 +275,8 @@ char sourceOutletId[0x100]; int init(CSOUND *csound) { //warn(csound, "BEGAN Outleta::init()...\n"); -#pragma omp critical (cs_sfg_ports) +//#pragma omp critical (cs_sfg_ports) + csound->LockMutex(cs_sfg_ports); { sourceOutletId[0] = 0; const char *insname = @@ -269,6 +295,7 @@ this, aoutlets.size(), sourceOutletId); } } + csound->UnlockMutex(cs_sfg_ports); //warn(csound, "ENDED Outleta::init()...\n"); return OK; } @@ -290,7 +317,8 @@ std::vector< std::vector *> *sourceOutlets; int sampleN; int init(CSOUND *csound) { -#pragma omp critical (cs_sfg_ports) +//#pragma omp critical (cs_sfg_ports) + csound->LockMutex(cs_sfg_ports); { warn(csound, "BEGAN Inleta::init()...\n"); sampleN = opds.insdshead->ksmps; @@ -335,15 +363,16 @@ } warn(csound, "ENDED Inleta::init().\n"); } + csound->UnlockMutex(cs_sfg_ports); return OK; } /** * Sum arate values from active outlets feeding this inlet. */ int audio(CSOUND *csound) { -#pragma omp critical (cs_sfg_ports) +//#pragma omp critical (cs_sfg_ports) + csound->LockMutex(cs_sfg_ports); { - //warn(csound, "BEGAN Inleta::audio()...\n"); // Zero the inlet buffer. for (int sampleI = 0; sampleI < sampleN; sampleI++) { @@ -361,13 +390,7 @@ Outleta *sourceOutlet = instances->at(instanceI); // Skip inactive instances. if (sourceOutlet->opds.insdshead->actflg) { - // Loop over the samples in the inlet buffer. - uint32_t sampleOffset = kperiodOffset(); - uint32_t sampleI; - for (sampleI = 0; sampleI < sampleOffset; ++sampleI) { - asignal[sampleI] = FL(0.0); - } - for ( ; sampleI < sampleN; ++sampleI) { + for (int sampleI = 0, sampleN = ksmps(); sampleI < sampleN; ++sampleI) { asignal[sampleI] += sourceOutlet->asignal[sampleI]; } } @@ -375,6 +398,7 @@ } //warn(csound, "ENDED Inleta::audio().\n"); } + csound->UnlockMutex(cs_sfg_ports); return OK; } }; @@ -390,9 +414,9 @@ */ char sourceOutletId[0x100]; int init(CSOUND *csound) { -#pragma omp critical (cs_sfg_ports) +//#pragma omp critical (cs_sfg_ports) + csound->LockMutex(cs_sfg_ports); { - const char *insname = csound->GetInstrumentList(csound)[opds.insdshead->insno]->insname; if (insname) { @@ -409,6 +433,7 @@ this, koutlets.size(), sourceOutletId); } } + csound->UnlockMutex(cs_sfg_ports); return OK; } }; @@ -429,7 +454,8 @@ std::vector< std::vector *> *sourceOutlets; int ksmps; int init(CSOUND *csound) { -#pragma omp critical (cs_sfg_ports) +//#pragma omp critical (cs_sfg_ports) + csound->LockMutex(cs_sfg_ports); { ksmps = opds.insdshead->ksmps; @@ -471,13 +497,14 @@ } } } + csound->UnlockMutex(cs_sfg_ports); return OK; } /** * Sum krate values from active outlets feeding this inlet. */ int kontrol(CSOUND *csound) { -#pragma omp critical (cs_sfg_ports) +//#pragma omp critical (cs_sfg_ports) { // Zero the inlet buffer. *ksignal = FL(0.0); @@ -498,6 +525,7 @@ } } } + csound->UnlockMutex(cs_sfg_ports); return OK; } }; @@ -513,7 +541,7 @@ */ char sourceOutletId[0x100]; int init(CSOUND *csound) { -#pragma omp critical (cs_sfg_ports) +//#pragma omp critical (cs_sfg_ports) { const char *insname = csound->GetInstrumentList(csound)[opds.insdshead->insno]->insname; @@ -530,6 +558,7 @@ warn(csound, "Created instance 0x%x of outlet %s\n", this, sourceOutletId); } } + csound->UnlockMutex(cs_sfg_ports); return OK; } }; @@ -552,7 +581,8 @@ int lastframe; bool fsignalInitialized; int init(CSOUND *csound) { -#pragma omp critical (cs_sfg_ports) +//#pragma omp critical (cs_sfg_ports) + csound->LockMutex(cs_sfg_ports); { ksmps = opds.insdshead->ksmps; lastframe = 0; @@ -595,6 +625,7 @@ } } } + csound->UnlockMutex(cs_sfg_ports); return OK; } /** @@ -602,7 +633,8 @@ */ int audio(CSOUND *csound) { int result = OK; -#pragma omp critical (cs_sfg_ports) +//#pragma omp critical (cs_sfg_ports) + csound->LockMutex(cs_sfg_ports); { float *sink = 0; float *source = 0; @@ -686,10 +718,164 @@ } } } + csound->UnlockMutex(cs_sfg_ports); return result; } }; +struct Outletv : public OpcodeBase { + /** + * Inputs. + */ + STRINGDAT *Sname; + ARRAYDAT *vsignal; + /** + * State. + */ + char sourceOutletId[0x100]; + int init(CSOUND *csound) { + warn(csound, "BEGAN Outletv::init()...\n"); +//#pragma omp critical (cs_sfg_ports) + csound->UnlockMutex(cs_sfg_ports); + { + sourceOutletId[0] = 0; + const char *insname = + csound->GetInstrumentList(csound)[opds.insdshead->insno]->insname; + if (insname) { + std::sprintf(sourceOutletId, "%s:%s", insname, (char *)Sname->data); + } else { + std::sprintf(sourceOutletId, "%d:%s", opds.insdshead->insno, + (char *)Sname->data); + } + std::vector &voutlets = + voutletsForCsoundsForSourceOutletIds[csound][sourceOutletId]; + if (std::find(voutlets.begin(), voutlets.end(), this) == voutlets.end()) { + voutlets.push_back(this); + warn(csound, "Created instance 0x%x of %d instances of outlet %s (out arraydat: 0x%x dims: %2d size: %4d [%4d] data: 0x%x (0x%x))\n", + this, voutlets.size(), sourceOutletId, vsignal, vsignal->dimensions, vsignal->sizes[0], vsignal->arrayMemberSize, vsignal->data, &vsignal->data); + } + } + warn(csound, "ENDED Outletv::init()...\n"); + csound->UnlockMutex(cs_sfg_ports); + return OK; + } +}; + +struct Inletv : public OpcodeBase { + /** + * Output. + */ + ARRAYDAT *vsignal; + /** + * Inputs. + */ + STRINGDAT *Sname; + /** + * State. + */ + char sinkInletId[0x100]; + std::vector< std::vector *> *sourceOutlets; + size_t arraySize; + size_t myFltsPerArrayElement; + int sampleN; + int init(CSOUND *csound) { +//#pragma omp critical (cs_sfg_ports) + csound->LockMutex(cs_sfg_ports); + { + warn(csound, "BEGAN Inletv::init()...\n"); + sampleN = opds.insdshead->ksmps; + // The array elements may be krate (1 MYFLT) or arate (ksmps MYFLT). + myFltsPerArrayElement = vsignal->arrayMemberSize / sizeof(MYFLT); + warn(csound, "myFltsPerArrayElement: %d\n", myFltsPerArrayElement); + arraySize = myFltsPerArrayElement; + for(size_t dimension = 0; dimension < vsignal->dimensions; ++dimension) { + arraySize *= MYFLT2LRND(vsignal->sizes[dimension]); + } + warn(csound, "arraySize: %d\n", arraySize); + warn(csound, "sourceOutlets: 0x%x\n", sourceOutlets); + if (std::find(voutletVectorsForCsounds[csound].begin(), + voutletVectorsForCsounds[csound].end(), + sourceOutlets) == voutletVectorsForCsounds[csound].end()) { + sourceOutlets = new std::vector< std::vector *>; + voutletVectorsForCsounds[csound].push_back(sourceOutlets); + } + warn(csound, "sourceOutlets: 0x%x\n", sourceOutlets); + sinkInletId[0] = 0; + const char *insname = + csound->GetInstrumentList(csound)[opds.insdshead->insno]->insname; + if (insname) { + std::sprintf(sinkInletId, "%s:%s", insname, (char *)Sname->data); + } else { + std::sprintf(sinkInletId, "%d:%s", opds.insdshead->insno, + (char *)Sname->data); + } + std::vector &vinlets = + vinletsForCsoundsForSinkInletIds[csound][sinkInletId]; + if (std::find(vinlets.begin(), vinlets.end(), this) == vinlets.end()) { + vinlets.push_back(this); + warn(csound, "Created instance 0x%x of inlet %s (in arraydat: 0x%x dims: %2d size: %4d [%4d] data: 0x%x (0x%x))\n", + this, sinkInletId, vsignal, vsignal->dimensions, vsignal->sizes[0], vsignal->arrayMemberSize, vsignal->data, &vsignal->data); + } + // Find source outlets connecting to this. + // Any number of sources may connect to any number of sinks. + std::vector &sourceOutletIds = + connectionsForCsounds[csound][sinkInletId]; + for (size_t i = 0, n = sourceOutletIds.size(); i < n; i++) { + const std::string &sourceOutletId = sourceOutletIds[i]; + std::vector &voutlets = + voutletsForCsoundsForSourceOutletIds[csound][sourceOutletId]; + if (std::find(sourceOutlets->begin(), sourceOutlets->end(), + &voutlets) == sourceOutlets->end()) { + sourceOutlets->push_back(&voutlets); + warn(csound, + Str("Connected instances of outlet %s to instance 0x%x of " + "inlet %s\n"), sourceOutletId.c_str(), this, sinkInletId); + } + } + warn(csound, "ENDED Inletv::init().\n"); + } + csound->UnlockMutex(cs_sfg_ports); + return OK; + } + /** + * Sum values from active outlets feeding this inlet. + */ + int audio(CSOUND *csound) { +//#pragma omp critical (cs_sfg_ports) + csound->LockMutex(cs_sfg_ports); + { + //warn(csound, "BEGAN Inletv::audio()...\n"); + //for (uint32_t signalI = 0; signalI < arraySize; ++signalI) { + // vsignal->data[signalI] = FL(0.0); + //} + // Loop over the source connections... + for (size_t sourceI = 0, sourceN = sourceOutlets->size(); + sourceI < sourceN; + sourceI++) { + // Loop over the source connection instances... + std::vector *instances = sourceOutlets->at(sourceI); + for (size_t instanceI = 0, instanceN = instances->size(); + instanceI < instanceN; + instanceI++) { + Outletv *sourceOutlet = instances->at(instanceI); + // Skip inactive instances. + if (sourceOutlet->opds.insdshead->actflg) { + for (uint32_t signalI = 0; signalI < arraySize; ++signalI) { + ARRAYDAT *insignal = sourceOutlet->vsignal; + MYFLT *indata = insignal->data; + //warn(csound, "Inletv::audio: sourceOutlet: 0%x in arraydat: 0x%x data: 0x%x (0x%x)\n", sourceOutlet, insignal, indata, &insignal->data); + vsignal->data[signalI] += indata[signalI]; + } + } + } + } + //warn(csound, "ENDED Inletv::audio().\n"); + } + csound->UnlockMutex(cs_sfg_ports); + return OK; + } +}; + struct Outletkid : public OpcodeBase { /** * Inputs. @@ -703,7 +889,8 @@ char sourceOutletId[0x100]; char *instanceId; int init(CSOUND *csound) { -#pragma omp critical (cs_sfg_ports) +//#pragma omp critical (cs_sfg_ports) + csound->LockMutex(cs_sfg_ports); { const char *insname = csound->GetInstrumentList(csound)[opds.insdshead->insno]->insname; instanceId = csound->strarg2name(csound, @@ -727,6 +914,7 @@ warn(csound, "Created instance 0x%x of %d instances of outlet %s\n", this, koutlets.size(), sourceOutletId); } } + csound->UnlockMutex(cs_sfg_ports); return OK; } }; @@ -749,9 +937,9 @@ std::vector< std::vector *> *sourceOutlets; int ksmps; int init(CSOUND *csound) { -#pragma omp critical (cs_sfg_ports) +//#pragma omp critical (cs_sfg_ports) + csound->LockMutex(cs_sfg_ports); { - ksmps = opds.insdshead->ksmps; if (std::find(kidoutletVectorsForCsounds[csound].begin(), kidoutletVectorsForCsounds[csound].end(), @@ -788,15 +976,17 @@ } } } + csound->UnlockMutex(cs_sfg_ports); return OK; } /** * Replay instance signal. */ int kontrol(CSOUND *csound) { -#pragma omp critical (cs_sfg_ports) +//#pragma omp critical (cs_sfg_ports) + csound->LockMutex(cs_sfg_ports); { - // Zero the inlet buffer. + // Zero the / buffer. *ksignal = FL(0.0); // Loop over the source connections... for (size_t sourceI = 0, sourceN = sourceOutlets->size(); @@ -817,6 +1007,7 @@ } } } + csound->UnlockMutex(cs_sfg_ports); return OK; } }; @@ -830,7 +1021,8 @@ MYFLT *Sink; STRINGDAT *Sinlet; int init(CSOUND *csound) { -#pragma omp critical (cs_sfg_ports) +//#pragma omp critical (cs_sfg_ports) + csound->LockMutex(cs_sfg_ports); { std::string sourceOutletId = csound->strarg2name(csound, (char *) 0, @@ -862,6 +1054,7 @@ warn(csound, "Connected outlet %s to inlet %s.\n", sourceOutletId.c_str(), sinkInletId.c_str()); connectionsForCsounds[csound][sinkInletId].push_back(sourceOutletId); } + csound->UnlockMutex(cs_sfg_ports); return OK; } }; @@ -875,7 +1068,8 @@ STRINGDAT *Sink; STRINGDAT *Sinlet; int init(CSOUND *csound) { -#pragma omp critical (cs_sfg_ports) +//#pragma omp critical (cs_sfg_ports) + csound->LockMutex(cs_sfg_ports); { std::string sourceOutletId = csound->strarg2name(csound, (char *) 0, @@ -904,6 +1098,7 @@ warn(csound, "Connected outlet %s to inlet %s.\n", sourceOutletId.c_str(), sinkInletId.c_str()); connectionsForCsounds[csound][sinkInletId].push_back(sourceOutletId); } + csound->UnlockMutex(cs_sfg_ports); return OK; } }; @@ -918,7 +1113,8 @@ MYFLT *Sink; STRINGDAT *Sinlet; int init(CSOUND *csound) { -#pragma omp critical (cs_sfg_ports) +//#pragma omp critical (cs_sfg_ports) + csound->LockMutex(cs_sfg_ports); { std::string sourceOutletId = csound->strarg2name(csound, (char *) 0, @@ -949,6 +1145,7 @@ sourceOutletId.c_str(), sinkInletId.c_str()); connectionsForCsounds[csound][sinkInletId].push_back(sourceOutletId); } + csound->UnlockMutex(cs_sfg_ports); return OK; } }; @@ -962,7 +1159,8 @@ STRINGDAT *Sink; STRINGDAT *Sinlet; int init(CSOUND *csound) { -#pragma omp critical (cs_sfg_ports) +//#pragma omp critical (cs_sfg_ports) + csound->LockMutex(cs_sfg_ports); { std::string sourceOutletId = csound->strarg2name(csound, (char *) 0, @@ -990,6 +1188,7 @@ sourceOutletId.c_str(), sinkInletId.c_str()); connectionsForCsounds[csound][sinkInletId].push_back(sourceOutletId); } + csound->UnlockMutex(cs_sfg_ports); return OK; } }; @@ -1057,7 +1256,7 @@ for (size_t pfieldI = 4, argumI = 0; argumI < argumN; pfieldI++, argumI++) { evtblk.p[pfieldI] = *argums[argumI]; } - csound->insert_score_event(csound, &evtblk, FL(0.0)); + csound->insert_score_event_at_sample(csound, &evtblk, 0); return OK; } }; @@ -1079,7 +1278,8 @@ EventBlock eventBlock; int init(CSOUND *csound) { int result; -#pragma omp critical (cs_ftables) +//#pragma omp critical (cs_ftables) + csound->LockMutex(cs_sfg_ftables); { // Default output. *ifno = FL(0.0); @@ -1123,6 +1323,7 @@ } } } + csound->UnlockMutex(cs_sfg_ftables); return OK; } }; @@ -1144,7 +1345,8 @@ EventBlock eventBlock; int init(CSOUND *csound) { int result = OK; -#pragma omp critical (cs_ftables) +//#pragma omp critical (cs_ftables) + csound->LockMutex(cs_sfg_ftables); { // Default output. *ifno = FL(0.0); @@ -1208,6 +1410,7 @@ } } } + csound->UnlockMutex(cs_sfg_ftables); return OK; } }; @@ -1316,6 +1519,28 @@ (SUBR)&Inletf::audio_ }, { + (char *)"outletv", + sizeof(Outletv), + CW, + 5, + (char *)"", + (char *)"Sa[]", + (SUBR)&Outletv::init_, + 0, + (SUBR)&Outletv::audio_ + }, + { + (char *)"inletv", + sizeof(Inletv), + CR, + 5, + (char *)"a[]", + (char *)"S", + (SUBR)&Inletv::init_, + 0, + (SUBR)&Inletv::audio_ + }, + { (char *)"connect", sizeof(Connect), 0, @@ -1408,11 +1633,23 @@ PUBLIC int csoundModuleCreate(CSOUND *csound) { + if(csound->GetDebug(csound)) { + csound->Message(csound, "signalflowgraph: csoundModuleCreate(%p)\n", csound); + } + if (cs_sfg_ports == 0) { + cs_sfg_ports = csound->Create_Mutex(1); + } + if (cs_sfg_ftables == 0) { + cs_sfg_ftables = csound->Create_Mutex(1); + } return 0; } PUBLIC int csoundModuleInit(CSOUND *csound) { + if(csound->GetDebug(csound)) { + csound->Message(csound, "signalflowgraph: csoundModuleInit(%p)\n", csound); + } OENTRY *ep = (OENTRY *)&(oentries[0]); int err = 0; while (ep->opname != 0) { @@ -1433,8 +1670,11 @@ PUBLIC int csoundModuleDestroy(CSOUND *csound) { - //csound->Message(csound, "signalflowgraph: CsoundModuleDestroy(%p)\n", csound); -#pragma omp critical (cs_sfg_ports) + if(csound->GetDebug(csound)) { + csound->Message(csound, "signalflowgraph: csoundModuleDestroy(%p)\n", csound); + } +//#pragma omp critical (cs_sfg_ports) + csound->LockMutex(cs_sfg_ports); { if (aoutletsForCsoundsForSourceOutletIds.find(csound) != aoutletsForCsoundsForSourceOutletIds.end()) { aoutletsForCsoundsForSourceOutletIds[csound].clear(); @@ -1467,12 +1707,17 @@ connectionsForCsounds[csound].clear(); } } -#pragma omp critical (critical_section_ftables) + csound->UnlockMutex(cs_sfg_ports); +//#pragma omp critical (cs_sfg_ftables) + csound->LockMutex(cs_sfg_ftables); { if (functionTablesForCsoundsForEvtblks.find(csound) != functionTablesForCsoundsForEvtblks.end()) { functionTablesForCsoundsForEvtblks[csound].clear(); } } + csound->UnlockMutex(cs_sfg_ftables); return 0; } } + +} diff -Nru csound-6.01~dfsg/Opcodes/signalflowgraphtest.csd csound-6.02~dfsg/Opcodes/signalflowgraphtest.csd --- csound-6.01~dfsg/Opcodes/signalflowgraphtest.csd 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Opcodes/signalflowgraphtest.csd 2014-01-07 16:54:20.000000000 +0000 @@ -1,6 +1,6 @@ -csound -m255 -RWfo signalflowgraphtest.wav +csound -m255 -RWfdo dac @@ -63,8 +63,8 @@ i 2 2 1 101 i 1 5 10 i 2 7 1 102 -i 2 12 1 101 -i 2 17 1 102 +i 2 12 1 101 +i 2 17 1 102 i 3 20 10 1 1 i 3 21 10 2 1 diff -Nru csound-6.01~dfsg/Opcodes/spectra.c csound-6.02~dfsg/Opcodes/spectra.c --- csound-6.01~dfsg/Opcodes/spectra.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Opcodes/spectra.c 2014-01-07 16:54:20.000000000 +0000 @@ -1255,10 +1255,10 @@ { "adsynt",S(HSBOSC), TR, 5, "a", "kkiiiio", (SUBR)adsyntset, NULL, (SUBR)adsynt }, { "mpulse", S(IMPULSE), 0, 5, "a", "kko", (SUBR)impulse_set, NULL, (SUBR)impulse }, -{ "lpf18", S(LPF18), 0, 5, "a", "akkko", (SUBR)lpf18set, NULL, (SUBR)lpf18db }, -{ "waveset", S(BARRI), 0, 5, "a", "ako", (SUBR)wavesetset, NULL, (SUBR)waveset}, +{ "lpf18", S(LPF18), 0, 5, "a", "axxxo", (SUBR)lpf18set, NULL, (SUBR)lpf18db }, +{ "waveset", S(BARRI), 0, 5, "a", "ako", (SUBR)wavesetset, NULL, (SUBR)waveset}, { "pinkish", S(PINKISH), 0, 5, "a", "xoooo", (SUBR)pinkset, NULL, (SUBR)pinkish }, -{ "noise", S(VARI), 0, 5, "a", "xk", (SUBR)varicolset, NULL, (SUBR)varicol }, +{ "noise", S(VARI), 0, 5, "a", "xk", (SUBR)varicolset, NULL, (SUBR)varicol }, { "transeg", S(TRANSEG),0, 3, "k", "iiim", (SUBR)trnset,(SUBR)ktrnseg, NULL}, { "transeg.a", S(TRANSEG),0, 5, "a", "iiim", diff -Nru csound-6.01~dfsg/Opcodes/tl/fractalnoise.cpp csound-6.02~dfsg/Opcodes/tl/fractalnoise.cpp --- csound-6.01~dfsg/Opcodes/tl/fractalnoise.cpp 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Opcodes/tl/fractalnoise.cpp 2014-01-07 16:54:20.000000000 +0000 @@ -40,11 +40,11 @@ /* VECTOR INTRINSICS */ -inline void *aligned_calloc(size_t nmemb, size_t size) -{ - return (void*)(((unsigned long)(calloc((nmemb*size)+15, - (sizeof(char))))+15) & 0xfffffff0); -} +//inline void *aligned_calloc(size_t nmemb, size_t size) +//{ +// return (void*)(((unsigned long)(calloc((nmemb*size)+15, +// (sizeof(char))))+15) & 0xfffffff0); +//} /* ABSTRACT USER INTERFACE */ diff -Nru csound-6.01~dfsg/Opcodes/ugsc.c csound-6.02~dfsg/Opcodes/ugsc.c --- csound-6.01~dfsg/Opcodes/ugsc.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Opcodes/ugsc.c 2014-01-07 16:54:20.000000000 +0000 @@ -47,20 +47,15 @@ static int svf(CSOUND *csound, SVF *p) { - MYFLT f1, q1, scale; + MYFLT f1 = FL(0.0), q1 = FL(1.0), scale = FL(1.0), + lfco = -FL(1.0), lq = -FL(1.0); MYFLT *low, *high, *band, *in, ynm1, ynm2; MYFLT low2, high2, band2; - MYFLT kfco = *p->kfco, kq = *p->kq; + MYFLT *kfco = p->kfco, *kq = p->kq; uint32_t offset = p->h.insdshead->ksmps_offset; uint32_t early = p->h.insdshead->ksmps_no_end; uint32_t n, nsmps = CS_KSMPS; - /* calculate frequency and Q coefficients */ - f1 = FL(2.0) * (MYFLT)sin((double)(kfco * csound->pidsr)); - /* Protect against division by zero */ - if (UNLIKELY(kqin; low = p->low; band = p->band; @@ -68,13 +63,6 @@ ynm1 = p->ynm1; ynm2 = p->ynm2; - /* if there is a non-zero value for iscl, set scale to be - * equal to the Q coefficient. - */ - if (*p->iscl) - scale = q1; - else - scale = FL(1.0); /* equations derived from Hal Chamberlin, "Musical Applications * of Microprocessors. @@ -91,6 +79,20 @@ memset(&band[nsmps], '\0', early*sizeof(MYFLT)); } for (n=offset; npidsr)); + /* Protect against division by zero */ + if (UNLIKELY(qiscl) scale = q1; + } low[n] = low2 = ynm2 + f1 * ynm1; high[n] = high2 = scale * in[n] - low2 - q1 * ynm1; band[n] = band2 = f1 * high2 + ynm1; @@ -211,9 +213,6 @@ } if (!(*p->istor)) p->xnm1 = p->xnm2 = p->ynm1 = p->ynm2 = 0.0; - -/* p->aratemod = (XINARG2) ? 1 : 0; */ - return OK; } @@ -231,26 +230,16 @@ * */ - double r, scale; /* radius & scaling factor */ - double c1, c2; /* filter coefficients */ + double r = 0.0, scale = 1.0; /* radius & scaling factor */ + double c1=0.0, c2=0.0; /* filter coefficients */ MYFLT *out, *in; double xn, yn, xnm1, xnm2, ynm1, ynm2; - MYFLT kcf = *p->kcf, kbw = *p->kbw; + MYFLT *kcf = p->kcf, *kbw = p->kbw; + MYFLT lcf = -FL(1.0), lbw = -FL(1.0); uint32_t offset = p->h.insdshead->ksmps_offset; uint32_t early = p->h.insdshead->ksmps_no_end; uint32_t n, nsmps = CS_KSMPS; - r = exp((double)(kbw * csound->mpidsr)); - c1 = 2.0 * r * cos((double)(kcf * csound->tpidsr)); - c2 = r * r; - - /* calculation of scaling coefficients */ - if (p->scaletype == 1) - scale = 1.0 - r; - else if (p->scaletype == 2) - scale = sqrt(1.0 - r); - else scale = 1.0; - out = p->out; in = p->in; xnm1 = p->xnm1; @@ -264,6 +253,18 @@ memset(&out[nsmps], '\0', early*sizeof(MYFLT)); } for (n=offset; nmpidsr)); + c1 = 2.0 * r * cos((double)(cf * csound->tpidsr)); + c2 = r * r; + if (p->scaletype == 1) + scale = 1.0 - r; + else if (p->scaletype == 2) + scale = sqrt(1.0 - r); + } xn = (double)in[n]; out[n] = (MYFLT)(yn = scale * (xn - r * xnm2) + c1 * ynm1 - c2 * ynm2); xnm2 = xnm1; @@ -291,28 +292,20 @@ * */ - double r, scale; /* radius & scaling factor */ - double c1, c2; /* filter coefficients */ + double r = 0.0, scale = 1.0; /* radius & scaling factor */ + double c1=0.0, c2=0.0; /* filter coefficients */ MYFLT *out, *in; double xn, yn, xnm1, xnm2, ynm1, ynm2; - MYFLT kcf = *p->kcf, kbw = *p->kbw; + MYFLT *kcf = p->kcf, *kbw = p->kbw; + MYFLT lcf = -FL(1.0), lbw = -FL(1.0); uint32_t offset = p->h.insdshead->ksmps_offset; uint32_t early = p->h.insdshead->ksmps_no_end; uint32_t n, nsmps = CS_KSMPS; - r = exp(-(double)(kbw * csound->pidsr)); - c1 = 2.0 * r * cos((double)(csound->tpidsr*kcf)); - c2 = r * r; - /* Normalizing factors derived from equations in Ken Steiglitz, * "A Note on Constant-Gain Digital Resonators," Computer * Music Journal, vol. 18, no. 4, pp. 8-10, Winter 1982. */ - if (p->scaletype == 1) - scale = (1.0 - c2) * 0.5; - else if (p->scaletype == 2) - scale = sqrt((1.0 - c2) * 0.5); - else scale = 1.0; out = p->out; in = p->in; @@ -327,6 +320,18 @@ memset(&out[nsmps], '\0', early*sizeof(MYFLT)); } for (n=offset; npidsr)); + c1 = 2.0 * r * cos((double)(csound->tpidsr*cf)); + c2 = r * r; + if (p->scaletype == 1) + scale = (1.0 - c2) * 0.5; + else if (p->scaletype == 2) + scale = sqrt((1.0 - c2) * 0.5); + } xn = (double)in[n]; out[n] = (MYFLT)(yn = scale * (xn - xnm2) + c1 * ynm1 - c2 * ynm2); xnm2 = xnm1; @@ -571,14 +576,152 @@ return OK; } +static int lp2aa(CSOUND *csound, LP2 *p) +{ + double a, b, c, temp; + MYFLT *out, *in; + double yn, ynm1, ynm2; + MYFLT *fcop = p->kfco, *resp = p->kres; + MYFLT fco = fcop[0], res = resp[0]; + uint32_t offset = p->h.insdshead->ksmps_offset; + uint32_t early = p->h.insdshead->ksmps_no_end; + uint32_t n, nsmps = CS_KSMPS; + + temp = (double)(csound->mpidsr * fco / res); + /* (-PI_F * kfco / (kres * CS_ESR)); */ + a = 2.0 * cos((double) (fco * csound->tpidsr)) * exp(temp); + b = exp(temp+temp); + c = 1.0 - a + b; + + out = p->out; + in = p->in; + ynm1 = p->ynm1; + ynm2 = p->ynm2; + + if (UNLIKELY(offset)) memset(out, '\0', offset*sizeof(MYFLT)); + if (UNLIKELY(early)) { + nsmps -= early; + memset(&out[nsmps], '\0', early*sizeof(MYFLT)); + } + for (n=offset; nmpidsr * fco / res); + /* (-PI_F * kfco / (kres * CS_ESR)); */ + a = 2.0 * cos((double) (fco * csound->tpidsr)) * exp(temp); + b = exp(temp+temp); + c = 1.0 - a + b; + } + out[n] = (MYFLT)(yn = a * ynm1 - b * ynm2 + c * (double)in[n]); + ynm2 = ynm1; + ynm1 = yn; + } + p->ynm1 = ynm1; + p->ynm2 = ynm2; + return OK; +} + +static int lp2ka(CSOUND *csound, LP2 *p) +{ + double a, b, c, temp; + MYFLT *out, *in; + double yn, ynm1, ynm2; + MYFLT *resp = p->kres; + MYFLT fco = *p->kfco, res = resp[0]; + uint32_t offset = p->h.insdshead->ksmps_offset; + uint32_t early = p->h.insdshead->ksmps_no_end; + uint32_t n, nsmps = CS_KSMPS; + + temp = (double)(csound->mpidsr * fco / res); + /* (-PI_F * kfco / (kres * CS_ESR)); */ + a = 2.0 * cos((double) (fco * csound->tpidsr)) * exp(temp); + b = exp(temp+temp); + c = 1.0 - a + b; + + out = p->out; + in = p->in; + ynm1 = p->ynm1; + ynm2 = p->ynm2; + + if (UNLIKELY(offset)) memset(out, '\0', offset*sizeof(MYFLT)); + if (UNLIKELY(early)) { + nsmps -= early; + memset(&out[nsmps], '\0', early*sizeof(MYFLT)); + } + for (n=offset; nmpidsr * fco / res); + /* (-PI_F * kfco / (kres * CS_ESR)); */ + a = 2.0 * cos((double) (fco * csound->tpidsr)) * exp(temp); + b = exp(temp+temp); + c = 1.0 - a + b; + } + out[n] = (MYFLT)(yn = a * ynm1 - b * ynm2 + c * (double)in[n]); + ynm2 = ynm1; + ynm1 = yn; + } + p->ynm1 = ynm1; + p->ynm2 = ynm2; + return OK; +} + +static int lp2ak(CSOUND *csound, LP2 *p) +{ + double a, b, c, temp; + MYFLT *out, *in; + double yn, ynm1, ynm2; + MYFLT *fcop = p->kfco; + MYFLT fco = fcop[0], res = *p->kres; + uint32_t offset = p->h.insdshead->ksmps_offset; + uint32_t early = p->h.insdshead->ksmps_no_end; + uint32_t n, nsmps = CS_KSMPS; + + temp = (double)(csound->mpidsr * fco / res); + /* (-PI_F * kfco / (kres * CS_ESR)); */ + a = 2.0 * cos((double) (fco * csound->tpidsr)) * exp(temp); + b = exp(temp+temp); + c = 1.0 - a + b; + + out = p->out; + in = p->in; + ynm1 = p->ynm1; + ynm2 = p->ynm2; + + if (UNLIKELY(offset)) memset(out, '\0', offset*sizeof(MYFLT)); + if (UNLIKELY(early)) { + nsmps -= early; + memset(&out[nsmps], '\0', early*sizeof(MYFLT)); + } + for (n=offset; nmpidsr * fco / res); + /* (-PI_F * kfco / (kres * CS_ESR)); */ + a = 2.0 * cos((double) (fco * csound->tpidsr)) * exp(temp); + b = exp(temp+temp); + c = 1.0 - a + b; + } + out[n] = (MYFLT)(yn = a * ynm1 - b * ynm2 + c * (double)in[n]); + ynm2 = ynm1; + ynm1 = yn; + } + p->ynm1 = ynm1; + p->ynm2 = ynm2; + return OK; +} + #define S(x) sizeof(x) static OENTRY localops[] = { -{ "svfilter", S(SVF), 0, 5, "aaa", "akko", (SUBR)svfset, NULL, (SUBR)svf }, +{ "svfilter", S(SVF), 0, 5, "aaa", "axxo", (SUBR)svfset, NULL, (SUBR)svf }, { "hilbert", S(HILBERT), 0, 5, "aa", "a", (SUBR)hilbertset, NULL, (SUBR)hilbert }, -{ "resonr", S(RESONZ), 0, 5, "a", "akkoo", (SUBR)resonzset, NULL, (SUBR)resonr}, -{ "resonz", S(RESONZ), 0, 5, "a", "akkoo", (SUBR)resonzset, NULL, (SUBR)resonz}, -{ "lowpass2", S(LP2), 0, 5, "a", "akko", (SUBR)lp2_set, NULL, (SUBR)lp2 }, +{ "resonr", S(RESONZ), 0, 5, "a", "axxoo", (SUBR)resonzset, NULL, (SUBR)resonr}, +{ "resonz", S(RESONZ), 0, 5, "a", "axxoo", (SUBR)resonzset, NULL, (SUBR)resonz}, +{ "lowpass2.kk", S(LP2), 0, 5, "a", "akko", (SUBR)lp2_set, NULL, (SUBR)lp2 }, +{ "lowpass2.aa", S(LP2), 0, 5, "a", "aaao", (SUBR)lp2_set, NULL, (SUBR)lp2aa }, +{ "lowpass2.ak", S(LP2), 0, 5, "a", "aakao", (SUBR)lp2_set, NULL, (SUBR)lp2ak }, +{ "lowpass2.ka", S(LP2), 0, 5, "a", "akao", (SUBR)lp2_set, NULL, (SUBR)lp2ka }, { "phaser2", S(PHASER2), 0, 5, "a", "akkkkkk",(SUBR)phaser2set,NULL,(SUBR)phaser2}, { "phaser1", S(PHASER1), 0, 5, "a", "akkko", (SUBR)phaser1set, NULL,(SUBR)phaser1} }; diff -Nru csound-6.01~dfsg/Opcodes/vpvoc.c csound-6.02~dfsg/Opcodes/vpvoc.c --- csound-6.01~dfsg/Opcodes/vpvoc.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Opcodes/vpvoc.c 2014-01-07 16:54:20.000000000 +0000 @@ -55,7 +55,9 @@ return NOTOK; flength = nxtfunc->flen; p->outfunc = - (FUNC*) csound->Calloc(csound, sizeof(FUNC) + flength * sizeof(MYFLT)); + (FUNC*) csound->Calloc(csound, sizeof(FUNC)); + p->outfunc->ftable = + (MYFLT*)csound->Calloc(csound, (1 + flength) * sizeof(MYFLT)); p->outfunc->flen = nxtfunc->flen; p->outfunc->lenmask = nxtfunc->lenmask; p->outfunc->lobits = nxtfunc->lobits; diff -Nru csound-6.01~dfsg/Opcodes/vst4cs/src/fxbank.h csound-6.02~dfsg/Opcodes/vst4cs/src/fxbank.h --- csound-6.01~dfsg/Opcodes/vst4cs/src/fxbank.h 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Opcodes/vst4cs/src/fxbank.h 2014-01-07 16:54:20.000000000 +0000 @@ -162,7 +162,7 @@ return NULL; return p->prgName; } - void SetProgramName(int nProgram, char *name = "") + void SetProgramName(int nProgram, const char *name = "") { fxProgram *p = GetProgram(nProgram); if (!p) diff -Nru csound-6.01~dfsg/Opcodes/vst4cs/src/vst4cs.cpp csound-6.02~dfsg/Opcodes/vst4cs/src/vst4cs.cpp --- csound-6.01~dfsg/Opcodes/vst4cs/src/vst4cs.cpp 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Opcodes/vst4cs/src/vst4cs.cpp 2014-01-07 16:54:20.000000000 +0000 @@ -35,7 +35,20 @@ #include "vsthost.h" #include "fxbank.h" -#include "InOut/widglobals.h" //gab +// These two collections replace similar ones that used to be in widglobals.h. + +std::vector &vstPlugEditors() +{ + static std::vector vstPlugEditors_; + return vstPlugEditors_; +} + +std::vector &vstPlugins() +{ + static std::vector vstPlugins_; + return vstPlugins_; +} + extern "C" { std::string version = "0.2beta"; @@ -43,14 +56,18 @@ static void path_convert(char *in); #endif + static MYFLT getCurrentTime(CSOUND *csound) + { + return csound->GetCurrentTimeSamples(csound) / csound->GetSr(csound); + } + static int vstinit(CSOUND *csound, void *data) { VSTINIT *p = (VSTINIT *) data; VSTPlugin *plugin = new VSTPlugin(csound); - - *p->iVSThandle = (MYFLT) ST(vstPlugins).size(); - ST(vstPlugins).push_back(plugin); - if ((int) ST(vstPlugins).size() == 1) { + *p->iVSThandle = (MYFLT) vstPlugins().size(); + vstPlugins().push_back(plugin); + if ((int) vstPlugins().size() == 1) { plugin->Log("============================================================\n"); plugin->Log("vst4cs version %s by Andres Cabrera and Michael Gogins\n", version.c_str()); @@ -59,8 +76,8 @@ plugin->Log("VST Plug-In Technology by Steinberg\n"); plugin->Log("============================================================\n"); } - char vstplugname[0x100]; - strcpy(vstplugname, (char *) p->iplugin); + char vstplugname[0x100]; + strncpy(vstplugname,((STRINGDAT *)p->iplugin)->data, MAXNAME-1); #if WIN32 path_convert(vstplugname); #endif @@ -77,8 +94,7 @@ static int vstinfo(CSOUND *csound, void *data) { VSTINFO *p = (VSTINFO *) data; - VSTPlugin *plugin = ST(vstPlugins)[(size_t) *p->iVSThandle]; - + VSTPlugin *plugin = vstPlugins()[(size_t) *p->iVSThandle]; plugin->Info(); return OK; } @@ -90,18 +106,12 @@ p->opcodeInChannels = (size_t) (csound->GetInputArgCnt(data) - 1); if (p->opcodeInChannels > 32) csound->InitError(csound, "vstaudio: too many input args"); - VSTPlugin *plugin = ST(vstPlugins)[(size_t) *p->iVSThandle]; - // if (!plugin) { - // csound->InitError(csound, "vstaudio_init: invalid plugin pointer!"); - // return NOTOK; - // } - + VSTPlugin *plugin = vstPlugins()[(size_t) *p->iVSThandle]; plugin->Debug("vstaudio_init.\n"); - p->framesPerBlock = csound->Getksmps(csound); + p->framesPerBlock = csound->GetKsmps(csound); p->pluginInChannels = (size_t) plugin->getNumInputs(); p->pluginOutChannels = (size_t) plugin->getNumOutputs(); p->opcodeOutChannels = (size_t) csound->GetOutputArgCnt(data); - return OK; } @@ -109,7 +119,7 @@ { VSTAUDIO *p = (VSTAUDIO *) data; size_t i, j; - VSTPlugin *plugin = ST(vstPlugins)[(size_t) *p->iVSThandle]; + VSTPlugin *plugin = vstPlugins()[(size_t) *p->iVSThandle]; uint32_t offset = p->h.insdshead->ksmps_offset; for(j=0; j < p->pluginOutChannels; j++) memset(p->aouts[j], '\0', offset*sizeof(MYFLT)); @@ -118,7 +128,7 @@ for (j = 0; j < p->pluginInChannels && j < p->opcodeInChannels; j++) for (i = offset; i < p->framesPerBlock; i++) plugin->inputs_[j][i] = - (float) (p->ains[j][i] * csound->dbfs_to_float); + (float) (p->ains[j][i] / csound->Get0dBFS(csound)); for ( ; j < p->pluginInChannels; j++) for (i = 0; i < p->framesPerBlock; i++) plugin->inputs_[j][i] = 0.0f; @@ -129,7 +139,7 @@ p->framesPerBlock); for (j = 0; j < p->pluginOutChannels && j < p->opcodeOutChannels; j++) for (i = offset; i < p->framesPerBlock; i++) - p->aouts[j][i] = (MYFLT) plugin->outputs_[j][i] * csound->e0dbfs; + p->aouts[j][i] = (MYFLT) plugin->outputs_[j][i] * csound->Get0dBFS(csound); for ( ; j < p->opcodeOutChannels; j++) for (i = 0; i < p->framesPerBlock; i++) p->aouts[j][i] = FL(0.0); @@ -149,15 +159,14 @@ { VSTAUDIO *p = (VSTAUDIO *) data; size_t i, j; - VSTPlugin *plugin = ST(vstPlugins)[(size_t) *p->iVSThandle]; + VSTPlugin *plugin = vstPlugins()[(size_t) *p->iVSThandle]; uint32_t offset = p->h.insdshead->ksmps_offset; for(j=0; j < p->pluginOutChannels; j++) memset(p->aouts[j], '\0', offset*sizeof(MYFLT)); - // plugin->Debug("vstaudio: plugin %x.\n", plugin); for (j = 0; j < p->pluginInChannels && j < p->opcodeInChannels; j++) for (i = offset; i < p->framesPerBlock; i++) plugin->inputs_[j][i] = - (float) (p->ains[j][i] * csound->dbfs_to_float); + (float) (p->ains[j][i] / csound->Get0dBFS(csound)); for ( ; j < p->pluginInChannels; j++) for (i = 0; i < p->framesPerBlock; i++) plugin->inputs_[j][i] = 0.0f; @@ -168,77 +177,22 @@ p->framesPerBlock); for (j = 0; j < p->pluginOutChannels && j < p->opcodeOutChannels; j++) for (i = offset; i < p->framesPerBlock; i++) - p->aouts[j][i] = (MYFLT) plugin->outputs_[j][i] * csound->e0dbfs; + p->aouts[j][i] = (MYFLT) plugin->outputs_[j][i] * csound->Get0dBFS(csound); for ( ; j < p->opcodeOutChannels; j++) for (i = 0; i < p->framesPerBlock; i++) p->aouts[j][i] = FL(0.0); - return OK; } - //~ static int vstnote_init(CSOUND *csound, void *data) - //~ { - //~ VSTNOTE *p = (VSTNOTE *) data; - //~ p->vstHandle = (size_t) *p->iVSThandle; - //~ VSTPlugin *vstPlugin = ST(vstPlugins)[p->vstHandle]; - - //~ int rounded = (int) ((double) *p->knote + 0.5); - //~ int cents = (int) (((double) *p->knote - (double) rounded) * 100.0 - //~ + 100.5) - 100; - //~ int veloc = (int) *p->kveloc; - //~ double deltaTime = - //~ ((double) p->h.insdshead->p2 + csound->timeOffs) - csound->curTime; - //~ int deltaFrames = - //~ (int) (deltaTime * (double) vstPlugin->framesPerSecond - //~ + (deltaTime < 0.0 ? -0.5 : 0.5)); - //~ long framesRemaining = - //~ (long) ((double) *p->kdur * (double) vstPlugin->framesPerSecond + 0.5) - //~ + (long) deltaFrames; - - //~ p->chn = (int) *p->kchan & 15; - //~ p->note = (rounded >= 0 ? (rounded < 128 ? rounded : 127) : 0); - //~ veloc = (veloc >= 0 ? (veloc < 128 ? veloc : 127) : 0); - //~ if (deltaFrames < 0) - //~ deltaFrames = 0; - //~ else if (deltaFrames >= (int) vstPlugin->framesPerBlock) - //~ deltaFrames = (int) vstPlugin->framesPerBlock - 1; - //~ if (framesRemaining < 0L) - //~ framesRemaining = 0L; - //~ p->framesRemaining = (size_t) framesRemaining; - - //~ vstPlugin->Debug("vstnote_init\n"); - //~ vstPlugin->AddMIDI(144 | p->chn | (p->note << 8) | (veloc << 16), - //~ deltaFrames, cents); - - //~ return OK; - //~ } - - //~ static int vstnote(CSOUND *csound, void *data) - //~ { - //~ VSTNOTE *p = (VSTNOTE *) data; - - //~ if (p->framesRemaining >= (size_t) csound->ksmps) { - //~ p->framesRemaining -= (size_t) csound->ksmps; - //~ return OK; - //~ } - - //~ VSTPlugin *plugin = ST(vstPlugins)[p->vstHandle]; - //~ plugin->Debug("vstnote.\n"); - //~ plugin->AddMIDI(128 | p->chn | (p->note << 8), (int) p->framesRemaining, 0); - //~ p->framesRemaining = 0; /* ~((size_t) 0); */ - //~ return OK; - //~ } static int vstmidiout_init(CSOUND *csound, void *data) { VSTMIDIOUT *p = (VSTMIDIOUT *) data; VSTPlugin *plugin; - p->vstHandle = (size_t) *p->iVSThandle; - plugin = ST(vstPlugins)[p->vstHandle]; + plugin = vstPlugins()[p->vstHandle]; plugin->Debug("vstmidiout_init.\n"); p->prvMidiData = 0; - return OK; } @@ -247,7 +201,6 @@ VSTMIDIOUT *p = (VSTMIDIOUT *) data; VSTPlugin *plugin; int st, ch, d1, d2, midiData; - st = (int) *(p->kstatus); if (st < 128 || st >= 240) { p->prvMidiData = 0; @@ -270,12 +223,10 @@ d2 = 0; d1 = (d1 >= 0 ? (d1 < 128 ? d1 : 127) : 0); midiData = st | ch | (d1 << 8) | (d2 << 16); - if (midiData == p->prvMidiData) return OK; - p->prvMidiData = midiData; - plugin = ST(vstPlugins)[p->vstHandle]; + plugin = vstPlugins()[p->vstHandle]; plugin->Debug("vstmidiout. kstatus = %i kdata1 = %i kdata2 = %i" "--- mididata = %i\n", (int) *(p->kstatus), @@ -283,7 +234,6 @@ (int) *(p->kdata2), midiData); plugin->AddMIDI(midiData, 0, 0); - return OK; } @@ -295,11 +245,9 @@ static int vstparamget(CSOUND *csound, void *data) { VSTPARAMGET *p = (VSTPARAMGET *) data; - VSTPlugin *plugin = ST(vstPlugins)[(size_t) *p->iVSThandle]; - + VSTPlugin *plugin = vstPlugins()[(size_t) *p->iVSThandle]; plugin->Debug("vstparamset(%d).\n", int(*p->kparam)); *p->kvalue = plugin->GetParamValue(int(*p->kparam)); - if (*(p->kvalue) == FL(-1.0)) plugin->Log("Invalid parameter number %d.\n", int(*p->kparam)); return OK; @@ -308,8 +256,7 @@ static int vstparamset_init(CSOUND *csound, void *data) { VSTPARAMSET *p = (VSTPARAMSET *) data; - VSTPlugin *plugin = ST(vstPlugins)[(size_t) *p->iVSThandle]; - + VSTPlugin *plugin = vstPlugins()[(size_t) *p->iVSThandle]; plugin->Debug("vstparamset_init.\n"); p->oldkparam = 0; p->oldkvalue = 0; @@ -319,25 +266,22 @@ static int vstparamset(CSOUND *csound, void *data) { VSTPARAMSET *p = (VSTPARAMSET *) data; - VSTPlugin *plugin = ST(vstPlugins)[(size_t) *p->iVSThandle]; - + VSTPlugin *plugin = vstPlugins()[(size_t) *p->iVSThandle]; if (*p->kparam == p->oldkparam && *p->kvalue == p->oldkvalue) return OK; p->oldkparam = *p->kparam; p->oldkvalue = *p->kvalue; plugin->Debug("vstsend(%d, %f).\n", int(*p->kparam), *p->kvalue); plugin->SetParameter(int(*p->kparam), float(*p->kvalue)); - return OK; } + static int vstbankload(CSOUND *csound, void *data) { VSTBANKLOAD *p = (VSTBANKLOAD *) data; - VSTPlugin *plugin = ST(vstPlugins)[(size_t) *p->iVSThandle]; + VSTPlugin *plugin = vstPlugins()[(size_t) *p->iVSThandle]; void *dummyPointer = 0; - CFxBank fxBank((char *) p->ibank); /* load the bank */ - plugin->Dispatch(effBeginLoadBank, 0, 0, (VstPatchChunkInfo *) fxBank.GetChunk(), 0); if (plugin->Dispatch(effBeginLoadBank, @@ -345,7 +289,6 @@ csound->InitError(csound, "Error: BeginLoadBank."); return NOTOK; } - // csound->Message(csound, "EffBeginLoadBank\n"); if (fxBank.IsLoaded()) { if (plugin->aeffect->uniqueID != fxBank.GetFxID()) { csound->InitError(csound, "Loaded bank ID doesn't match plug-in ID."); @@ -362,13 +305,9 @@ plugin->Log("Chunks loaded OK.\n"); } else { - // int cProg = plugin->EffGetProgram(); int cProg = plugin->Dispatch(effGetProgram, 0, 0, dummyPointer, 0); - // csound->Message(csound, "Current Program= %i\n", cProg); int i, j; int nParms = fxBank.GetNumParams(); - - // csound->Message(csound, "nParms= %i\n", nParms); for (i = 0; i < fxBank.GetNumPrograms(); i++) { plugin->Dispatch(effSetProgram, 0, i, dummyPointer, 0); plugin->Dispatch(effSetProgramName, 0, 0, fxBank.GetProgramName(i), @@ -376,21 +315,14 @@ for (j = 0; j < nParms; j++) plugin->SetParameter(j, fxBank.GetProgParm(i, j)); } - // pEffect->EffSetProgram(cProg); plugin->Dispatch(effSetProgram, 0, cProg, dummyPointer, 0); - // csound->Message(csound, "Programs OK\n"); } - // pEffect->SetChunkFile(dlg.GetPathName()); - // ShowDetails(); - // OnSetProgram(); } else { csound->InitError(csound, "Problem loading bank."); return NOTOK; /* check if error loading */ } plugin->Log("Bank loaded OK.\n"); - // if (fxBank.SetChunk()) { - // } return OK; } @@ -399,7 +331,7 @@ // The changes here are part of an attempt to map 0 to 1 and others VSTPROGSET *p = (VSTPROGSET *) data; int program = (int)*p->iprogram; - VSTPlugin *plugin = ST(vstPlugins)[(size_t) *p->iVSThandle]; + VSTPlugin *plugin = vstPlugins()[(size_t) *p->iVSThandle]; if (program<=0) { csound->Message(csound, "VSTprogset: Program %d treated as 1\n", program); program = 1; @@ -411,18 +343,17 @@ static int vstedit_init(CSOUND *csound, void *data) { VSTEDIT *p = (VSTEDIT *) data; - VSTPlugin *plugin = ST(vstPlugins)[(size_t) *p->iVSThandle]; - + VSTPlugin *plugin = vstPlugins()[(size_t) *p->iVSThandle]; plugin->OpenEditor(); - plugin->targetFLpanel = ST(fl_windows).size()-1; //gab - ST(VSTplugEditors).push_back(plugin); //gab + //plugin->targetFLpanel = vstPlugEditors().size()-1; //gab + vstPlugEditors().push_back(plugin); //gab return OK; } static int vstSetTempo(CSOUND *csound, void *data) { VSTTEMPO *p = (VSTTEMPO *)data; - VSTPlugin *plugin = ST(vstPlugins)[(size_t) *p->iVSThandle]; + VSTPlugin *plugin = vstPlugins()[(size_t) *p->iVSThandle]; plugin->vstTimeInfo.tempo = *p->tempo; return OK; } @@ -430,17 +361,11 @@ int vstbanksave(CSOUND *csound, void *data) { VSTBANKLOAD *p = (VSTBANKLOAD *)data; - VSTPlugin *plugin = ST(vstPlugins)[(size_t) *p->iVSThandle]; + VSTPlugin *plugin = vstPlugins()[(size_t) *p->iVSThandle]; char bankname[512]; //gab - // if (*p->ibank == SSTRCOD) { strcpy(bankname, (char *) p->ibank); /* use that */ - // } - - //------------ - //CSmpEffect *pEffect = (CSmpEffect *)GetApp()->vstHost.GetAt(nEffect); if (!plugin) return NOTOK; - CFxBank b; if (plugin->aeffect->flags & effFlagsProgramChunks) @@ -484,9 +409,6 @@ if (b.SaveBank(bankname)) { plugin->Log("%s Bank saved OK.\n",bankname); - //pEffect->SetChunkFile(bankname); - // ShowDetails(); - // OnSetProgram(); } else { plugin->Log("Error: Error saving file\n"); @@ -526,13 +448,10 @@ { VSTNOTEOUT *p = (VSTNOTEOUT *)data; size_t vstHandle = (size_t) *p->iVSThandle; - p->vstPlugin = ST(vstPlugins)[vstHandle]; - p->startTime = CURTIME; - // The note may be scheduled to turn on some frames after the actual - // start of this kperiod. - // Use the warped p2 to compute this time. - double onTime = double(csound->timeOffs + p->h.insdshead->p2); - double deltaTime = onTime - CURTIME; + p->vstPlugin = vstPlugins()[vstHandle]; + p->startTime = getCurrentTime(csound); + double onTime = double(p->h.insdshead->p2); + double deltaTime = onTime - getCurrentTime(csound); int deltaFrames = 0; if (deltaTime > 0) { deltaFrames = int(deltaTime / csound->GetSr(csound)); @@ -565,7 +484,7 @@ p->on = true; if (csound->GetDebug(csound)) { csound->Message(csound, "vstnote_init: on time: %f\n", onTime); - csound->Message(csound, " csound time: %f\n", CURTIME); + csound->Message(csound, " csound time: %f\n", getCurrentTime(csound)); csound->Message(csound, " delta time: %f\n", deltaTime); csound->Message(csound, " delta frames: %d\n", deltaFrames); csound->Message(csound, " off time: %f\n", p->offTime); @@ -581,10 +500,10 @@ { VSTNOTEOUT *p = (VSTNOTEOUT *)data; if (p->on) { - if (CURTIME >= p->offTime || p->h.insdshead->relesing) { + if (getCurrentTime(csound) >= p->offTime || p->h.insdshead->relesing) { // The note may be scheduled to turn off // some frames after the actual start of this kperiod. - double deltaTime = p->offTime - CURTIME; + double deltaTime = p->offTime - getCurrentTime(csound); int deltaFrames = 0; if (deltaTime > 0) { deltaFrames = int(deltaTime / csound->GetSr(csound)); @@ -594,7 +513,7 @@ p->on = false; if (csound->GetDebug(csound)) { csound->Message(csound, "vstnote_perf: csound time: %f\n", - CURTIME); + getCurrentTime(csound)); csound->Message(csound, " off time: %f\n", p->offTime); csound->Message(csound, " delta time: %f\n", @@ -612,30 +531,26 @@ } static OENTRY localops[] = { - { "vstinit", sizeof(VSTINIT), 1, "i", "So", &vstinit, 0, 0 }, - { "vstinfo", sizeof(VSTINFO), 1, "", "i", &vstinfo, 0, 0 }, - { "vstaudio", sizeof(VSTAUDIO), 5, "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm", + { "vstinit", sizeof(VSTINIT), 0, 1, "i", "To", &vstinit, 0, 0 }, + { "vstinfo", sizeof(VSTINFO), 0, 1, "", "i", &vstinfo, 0, 0 }, + { "vstaudio", sizeof(VSTAUDIO), 0, 5, "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm", "iy", &vstaudio_init, 0, &vstaudio }, - { "vstaudiog", sizeof(VSTAUDIO), 5, "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm", + { "vstaudiog", sizeof(VSTAUDIO), 0, 5, "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm", "iy", &vstaudio_init, 0, &vstaudiog }, - { "vstmidiout", sizeof(VSTMIDIOUT), 3, "", "ikkkk", &vstmidiout_init, + { "vstmidiout", sizeof(VSTMIDIOUT), 0, 3, "", "ikkkk", &vstmidiout_init, &vstmidiout, 0 }, - { "vstparamget", sizeof(VSTPARAMGET),3, "k", "ik", &vstparamget_init, + { "vstparamget", sizeof(VSTPARAMGET),0, 3, "k", "ik", &vstparamget_init, &vstparamget, 0 }, - { "vstparamset", sizeof(VSTPARAMSET),3, "", "ikk", &vstparamset_init, + { "vstparamset", sizeof(VSTPARAMSET),0, 3, "", "ikk", &vstparamset_init, &vstparamset, 0 }, - { "vstbankload", sizeof(VSTBANKLOAD),1, "", "iS", &vstbankload, 0, 0 }, - { "vstprogset", sizeof(VSTPROGSET), 1, "", "ii", &vstprogset, 0, 0 }, - { "vstedit", sizeof(VSTEDIT), 1, "", "i", &vstedit_init, 0, 0 }, - { "vsttempo", sizeof(VSTTEMPO), 2, "" ,"ki", 0, + { "vstbankload", sizeof(VSTBANKLOAD),0, 1, "", "iT", &vstbankload, 0, 0 }, + { "vstprogset", sizeof(VSTPROGSET), 0, 1, "", "ii", &vstprogset, 0, 0 }, + { "vstedit", sizeof(VSTEDIT), 0, 1, "", "i", &vstedit_init, 0, 0 }, + { "vsttempo", sizeof(VSTTEMPO), 0, 2, "", "ki", 0, &vstSetTempo, 0/*, &vstedit_deinit*/}, - { "vstnote", sizeof(VSTNOTEOUT), 3, "" ,"iiiii", &vstnote_init, - &vstnote_perf, 0 }, - { "vstbanksave", sizeof(VSTBANKLOAD), 1, "" ,"iS", &vstbanksave, - 0, 0/*, 0 */}, - //{ "vstnote", sizeof(VSTNOTE), 3, "", "iiiii", &vstnote_init, - &vstnote, 0 }, - { NULL, 0, 0, NULL, NULL, (SUBR) NULL, (SUBR) NULL, (SUBR) NULL } + { "vstnote", sizeof(VSTNOTEOUT), 0, 3, "", "iiiii", &vstnote_init, &vstnote_perf, 0 }, + { "vstbanksave", sizeof(VSTBANKLOAD),0, 1, "", "iT", &vstbanksave, 0, 0 }, + { 0, 0, 0, 0, 0, 0, (SUBR) 0, (SUBR) 0, (SUBR) 0 } }; PUBLIC int csoundModuleCreate(CSOUND *csound) @@ -649,8 +564,12 @@ int err = 0; while (ep->opname != NULL) { err |= csound->AppendOpcode(csound, - ep->opname, ep->dsblksiz, ep->thread, - ep->outypes, ep->intypes, + ep->opname, + ep->dsblksiz, + ep->flags, + ep->thread, + ep->outypes, + ep->intypes, (int (*)(CSOUND *, void *)) ep->iopadr, (int (*)(CSOUND *, void *)) ep->kopadr, (int (*)(CSOUND *, void *)) ep->aopadr); @@ -661,13 +580,11 @@ PUBLIC int csoundModuleDestroy(CSOUND *csound) { - if (csound->widgetGlobals) { - for (size_t i = 0, n = ST(vstPlugins).size(); i < n; ++i) { - if (ST(vstPlugins)[i]) { - delete ST(vstPlugins)[i]; + for (size_t i = 0, n = vstPlugins().size(); i < n; ++i) { + if (vstPlugins()[i]) { + delete vstPlugins()[i]; } - } - ST(vstPlugins).clear(); + vstPlugins().clear(); } return 0; } diff -Nru csound-6.01~dfsg/Opcodes/vst4cs/src/vsthost.cpp csound-6.02~dfsg/Opcodes/vst4cs/src/vsthost.cpp --- csound-6.01~dfsg/Opcodes/vst4cs/src/vsthost.cpp 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Opcodes/vst4cs/src/vsthost.cpp 2014-01-07 16:54:20.000000000 +0000 @@ -655,8 +655,8 @@ { size_t i; Debug("VSTPlugin::Init.\n"); - framesPerSecond = (size_t) ((long) (csound->esr + FL(0.5))); - framesPerBlock = csound->ksmps; + framesPerSecond = (size_t) ((long) (csound->GetSr(csound) + FL(0.5))); + framesPerBlock = csound->GetKsmps(csound); Log("VSTPlugin::Init framesPerSecond %d framesPerBlock %d " "channels %d in / %d out.\n", framesPerSecond, framesPerBlock, getNumInputs(), getNumOutputs()); @@ -926,7 +926,7 @@ { Debug("VSGPlugin::GetTime().\n"); if (csound) - vstTimeInfo.samplePos = csound->icurTime; + vstTimeInfo.samplePos = csound->GetCurrentTimeSamples(csound); else vstTimeInfo.samplePos = 0; vstTimeInfo.sampleRate = framesPerSecond; diff -Nru csound-6.01~dfsg/Top/argdecode.c csound-6.02~dfsg/Top/argdecode.c --- csound-6.01~dfsg/Top/argdecode.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Top/argdecode.c 2014-01-07 16:54:20.000000000 +0000 @@ -26,6 +26,7 @@ #include "csmodule.h" #include + extern void strset_option(CSOUND *csound, char *s); /* from str_ops.c */ #define FIND(MSG) if (*s == '\0') \ @@ -219,6 +220,10 @@ Str_noop("--nchnls_i=N\t\t override number of input audio channels"), Str_noop("--0dbfs=N\t\t override 0dbfs (max positive signal amplitude)"), Str_noop("--sinesize\t\tlength of internal sine table"), + Str_noop("--daemon\t\t daemon mode: do not exit if CSD/orchestra is " + "not given, is empty or does not compile"), + Str_noop("--port=N\t\t listen to UDP port N for instruments/orchestra " + "code (implies --daemon)"), " ", Str_noop("--help\t\t\tLong help"), @@ -452,9 +457,10 @@ if (UNLIKELY(*s == '\0')) dieu(csound, Str("no midifile name")); O->FMidiname = s; /* Midifile name */ if (!strcmp(O->FMidiname, "stdin")) { - set_stdin_assign(csound, STDINASSIGN_MIDIFILE, 1); #if defined(WIN32) csoundDie(csound, Str("-F: stdin not supported on this platform")); +#else + set_stdin_assign(csound, STDINASSIGN_MIDIFILE, 1); #endif } else @@ -917,6 +923,16 @@ !(strcmp(s, "old-parser"))) { return 1; /* ignore flag, this is here for backwards compatibility */ } + else if (!(strcmp(s, "daemon"))) { + O->daemon = 1; + return 1; + } + else if (!(strncmp(s, "port=",5))) { + s += 5; + O->daemon = atoi(s); + return 1; + } + csoundErrorMsg(csound, Str("unknown long option: '--%s'"), s); return 0; } @@ -1101,10 +1117,11 @@ FIND(Str("no midi device_name")); O->Midiname = s; /* Midi device name */ s += (int) strlen(s); - if (!strcmp(O->Midiname, "stdin")) { - set_stdin_assign(csound, STDINASSIGN_MIDIDEV, 1); + if (strcmp(O->Midiname, "stdin")==0) { #if defined(WIN32) csoundDie(csound, Str("-M: stdin not supported on this platform")); +#else + set_stdin_assign(csound, STDINASSIGN_MIDIDEV, 1); #endif } else @@ -1115,10 +1132,11 @@ FIND(Str("no midifile name")); O->FMidiname = s; /* Midifile name */ s += (int) strlen(s); - if (!strcmp(O->FMidiname, "stdin")) { - set_stdin_assign(csound, STDINASSIGN_MIDIFILE, 1); + if (strcmp(O->FMidiname, "stdin")==0) { #if defined(WIN32) csoundDie(csound, Str("-F: stdin not supported on this platform")); +#else + set_stdin_assign(csound, STDINASSIGN_MIDIFILE, 1); #endif } else @@ -1281,6 +1299,7 @@ oparms->useCsdLineCounts = p->csd_line_counts; oparms->heartbeat = p->heartbeat; oparms->ringbell = p->ring_bell; + oparms->daemon = p->daemon; /* message level */ if(p->message_level > 0) @@ -1361,6 +1380,7 @@ p->e0dbfs_override = oparms->e0dbfs_override; p->heartbeat = oparms->heartbeat; p->ring_bell = oparms->ringbell; + p->daemon = oparms->daemon; } diff -Nru csound-6.01~dfsg/Top/csmodule.c csound-6.02~dfsg/Top/csmodule.c --- csound-6.01~dfsg/Top/csmodule.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Top/csmodule.c 2014-01-07 16:54:20.000000000 +0000 @@ -88,11 +88,13 @@ #endif #endif +#if !(defined (NACL)) #if defined(LINUX) || defined(NEW_MACH_CODE) #include #elif defined(WIN32) #include #endif +#endif #if defined(HAVE_DIRENT_H) @@ -129,6 +131,7 @@ static const char *plugindir64_envvar = "OPCODE6DIR64"; /* default directory to load plugins from if environment variable is not set */ +#if !(defined (NACL)) #if !(defined(_CSOUND_RELEASE_) && (defined(LINUX) || defined(__MACH__))) # define ENABLE_OPCODEDIR_WARNINGS 1 # ifdef CS_DEFAULT_PLUGINDIR @@ -145,6 +148,7 @@ # endif # endif #endif +#endif #if (TARGET_OS_IPHONE != 0) && (TARGET_IPHONE_SIMULATOR != 0) # define ENABLE_OPCODEDIR_WARNINGS 0 @@ -243,7 +247,7 @@ err = csoundOpenLibrary(&h, libraryPath); if (UNLIKELY(err)) { char ERRSTR[256]; - #if defined(LINUX) +#if !(defined(NACL)) && defined(LINUX) sprintf(ERRSTR, Str("could not open library '%s' (%s)"), libraryPath, dlerror()); #else @@ -409,7 +413,12 @@ if (dname == NULL) # endif #endif +#ifdef CS_DEFAULT_PLUGINDIR dname = CS_DEFAULT_PLUGINDIR; +#else + dname = ""; +#endif + } dir = opendir(dname); if (UNLIKELY(dir == (DIR*) NULL)) { @@ -462,7 +471,9 @@ continue; } sprintf(buf, "%s%c%s", dname, DIRSEP, fname); -/* printf("Loading: %s\n", buf); */ + if (csound->oparms->odebug) { + csoundMessage(csound, Str("Loading '%s'\n"), buf); + } n = csoundLoadExternal(csound, buf); if (UNLIKELY(n == CSOUND_ERROR)) continue; /* ignore non-plugin files */ @@ -673,7 +684,7 @@ return (void*) GetProcAddress((HMODULE) library, procedureName); } -#elif defined(LINUX) || defined (NEW_MACH_CODE) +#elif !(defined(NACL)) && (defined(LINUX) || defined (NEW_MACH_CODE)) PUBLIC int csoundOpenLibrary(void **library, const char *libraryPath) { @@ -788,11 +799,14 @@ extern long pvlock_localops_init(CSOUND *, void *); extern long fareyseq_localops_init(CSOUND *, void *); extern long cpumeter_localops_init(CSOUND *, void *); -extern long mp3in_localops_init(CSOUND *, void *); extern long gendy_localops_init(CSOUND *, void *); extern long scnoise_localops_init(CSOUND *, void *); +#ifndef NACL extern long socksend_localops_init(CSOUND *, void *); +extern long mp3in_localops_init(CSOUND *, void *); extern long sockrecv_localops_init(CSOUND *, void *); +#endif +extern long afilts_localops_init(CSOUND *, void *); extern int stdopc_ModuleInit(CSOUND *csound); extern int pvsopc_ModuleInit(CSOUND *csound); @@ -819,12 +833,17 @@ fareyseq_localops_init, hrtfearly_localops_init, hrtfreverb_localops_init, minmax_localops_init, vaops_localops_init, pvsgendy_localops_init, - socksend_localops_init, sockrecv_localops_init, #ifndef WIN32 cpumeter_localops_init, #endif - mp3in_localops_init, gendy_localops_init, - scnoise_localops_init, NULL }; +#ifndef NACL + mp3in_localops_init, + sockrecv_localops_init, + socksend_localops_init, +#endif + gendy_localops_init, + scnoise_localops_init, afilts_localops_init, + NULL }; typedef NGFENS* (*FGINITFN)(CSOUND *); diff -Nru csound-6.01~dfsg/Top/csound.c csound-6.02~dfsg/Top/csound.c --- csound-6.01~dfsg/Top/csound.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Top/csound.c 2014-01-07 16:54:20.000000000 +0000 @@ -610,7 +610,7 @@ FL(0.0), FL(0.0), FL(0.0), /* prvbt, curbt, nxtbt */ FL(0.0), FL(0.0), /* curp2, nxtim */ 0, /* cyclesRemaining */ - { 0, NULL, '\0', 0, FL(0.0), FL(0.0), { FL(0.0) }, {NULL}}, /* evt */ + { 0, NULL, NULL, '\0', 0, FL(0.0), FL(0.0), { FL(0.0) }, {NULL}}, /* evt */ NULL, /* memalloc_db */ (MGLOBAL*) NULL, /* midiGlobals */ NULL, /* envVarDB */ @@ -622,7 +622,7 @@ NULL, NULL, NULL, /* tseg, tpsave, tplim */ 0, 0, 0, 0, 0, 0, /* acount, kcount, icount, Bcount, bcount, tcount */ (MYFLT*) NULL, /* gbloffbas */ -#if defined(WIN32) && (__GNUC_VERSION__ < 40800) +#if defined(WIN32) //&& (__GNUC_VERSION__ < 40800) (pthread_t){0, 0}, /* file_io_thread */ #else (pthread_t)0, /* file_io_thread */ @@ -630,7 +630,7 @@ 0, /* file_io_start */ NULL, /* file_io_threadlock */ 0, /* realtime_audio_flag */ -#if defined(WIN32) && (__GNUC_VERSION__ < 40800) +#if defined(WIN32) //&& (__GNUC_VERSION__ < 40800) (pthread_t){0, 0}, /* init pass thread */ #else (pthread_t)0, /* init pass thread */ @@ -675,14 +675,14 @@ }, { NULL, - {'\0'}, {'\0'}, {'\0'}, /* orcname, sconame, midname */ + NULL, NULL, NULL, /* orcname, sconame, midname */ 0, 0 /* midiSet, csdlinecount */ }, { NULL, NULL, /* Linep, Linebufend */ 0, /* stdmode */ { - 0, NULL, 0, 0, FL(0.0), FL(0.0), { FL(0.0) }, + 0, NULL, NULL, 0, 0, FL(0.0), FL(0.0), { FL(0.0) }, {NULL}, }, /* EVTBLK prve */ NULL, /* Linebuf */ @@ -804,7 +804,8 @@ 1, /* useCsdLineCounts */ 0, /* samp acc */ 0, /* realtime */ - 0.0 /* 0dbfs override */ + 0.0, /* 0dbfs override */ + 0 /* no exit on compile error */ }, {0, 0, {0}}, /* REMOT_BUF */ @@ -852,8 +853,8 @@ {NULL}, /* message buffer struct */ 0, /* jumpset */ 0, /* info_message_request */ - 0, /* modules loaded */ - NULL /* self-reference */ + 0 /* modules loaded */ + /*, NULL */ /* self-reference */ }; /* from threads.c */ @@ -1142,7 +1143,7 @@ /* NB: as suggested by F Pinot, keep the address of the pointer to CSOUND inside the struct, so it can be cleared later */ - csound->self = &csound; + //csound->self = &csound; return csound; } @@ -1216,7 +1217,7 @@ csoundDestroyMutex(csound->API_lock); } /* clear the pointer */ - *(csound->self) = NULL; + //*(csound->self) = NULL; free((void*) csound); } @@ -1880,6 +1881,7 @@ } if (aTime > 0.0) { EVTBLK evt; + memset(&evt, 0, sizeof(EVTBLK)); evt.strarg = NULL; evt.scnt = 0; evt.opcod = 'a'; evt.pcnt = 3; @@ -2101,6 +2103,7 @@ EVTBLK evt; int i; int ret; + memset(&evt, 0, sizeof(EVTBLK)); evt.strarg = NULL; evt.scnt = 0; evt.opcod = type; @@ -2121,6 +2124,7 @@ EVTBLK evt; int i; int ret; + memset(&evt, 0, sizeof(EVTBLK)); evt.strarg = NULL; evt.scnt = 0; evt.opcod = type; @@ -2677,7 +2681,7 @@ /* VL 07.06.2013 - check if the status is COMP before resetting. */ - CSOUND **self = csound->self; + //CSOUND **self = csound->self; saved_env = (CSOUND*) malloc(sizeof(CSOUND)); memcpy(saved_env, csound, sizeof(CSOUND)); memcpy(csound, &cenviron_, sizeof(CSOUND)); @@ -2702,7 +2706,7 @@ csound->enableHostImplementedMIDIIO = saved_env->enableHostImplementedMIDIIO; memcpy(&(csound->exitjmp), &(saved_env->exitjmp), sizeof(jmp_buf)); csound->memalloc_db = saved_env->memalloc_db; - csound->self = self; + //csound->self = self; free(saved_env); } @@ -2759,13 +2763,14 @@ return CSOUND_SUCCESS; } + + PUBLIC void csoundReset(CSOUND *csound) { char *s; int i, max_len; OPARMS *O = csound->oparms; - #ifdef HAVE_PTHREAD_SPIN_LOCK pthread_spin_init(&csound->spoutlock, PTHREAD_PROCESS_PRIVATE); pthread_spin_init(&csound->spinlock, PTHREAD_PROCESS_PRIVATE); diff -Nru csound-6.01~dfsg/Top/main.c csound-6.02~dfsg/Top/main.c --- csound-6.01~dfsg/Top/main.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Top/main.c 2014-01-07 16:54:20.000000000 +0000 @@ -37,7 +37,7 @@ #include #endif - +extern int UDPServerStart(CSOUND *csound, int port); extern void dieu(CSOUND *, char *, ...); extern int argdecode(CSOUND *, int, char **); extern int init_pvsys(CSOUND *); @@ -49,48 +49,49 @@ extern void cs_init_math_constants_macros(CSOUND *csound, PRE_PARM *yyscanner); extern void cs_init_omacros(CSOUND *csound, PRE_PARM*, NAMES *nn); -void checkOptions(CSOUND *csound) { - const char *csrcname; - const char *home_dir; - FILE *csrc = NULL; - void *fd = NULL; - char *s; - /* IV - Feb 17 2005 */ - csrcname = csoundGetEnv(csound, "CSOUND6RC"); - if (csrcname != NULL && csrcname[0] != '\0') { - fd = csound->FileOpen2(csound, &csrc, CSFILE_STD, csrcname, "r", NULL, - CSFTYPE_OPTIONS, 0); - if (fd == NULL) - csoundMessage(csound, Str("WARNING: cannot open csound6rc file %s\n"), - csrcname); - else - csound->Message(csound, Str("Reading options from $CSOUND6RC: %s \n"), - csrcname); - } - if (fd == NULL && ((home_dir = csoundGetEnv(csound, "HOME")) != NULL && - home_dir[0] != '\0')) { - s = csoundConcatenatePaths(csound, home_dir, ".csound6rc"); - fd = csound->FileOpen2(csound, &csrc, CSFILE_STD, s, "r", NULL, - CSFTYPE_OPTIONS, 0); - if (fd != NULL) - csound->Message(csound, Str("Reading options from $HOME/.csound6rc\n")); - mfree(csound, s); - } - /* read global .csound6rc file (if exists) */ - if (fd != NULL) { - - readOptions(csound, csrc, 0); - csound->FileClose(csound, fd); - } - /* check for .csound6rc in current directory */ - fd = csound->FileOpen2(csound, &csrc, CSFILE_STD, ".csound6rc", "r", NULL, +void checkOptions(CSOUND *csound) +{ + const char *csrcname; + const char *home_dir; + FILE *csrc = NULL; + void *fd = NULL; + char *s; + /* IV - Feb 17 2005 */ + csrcname = csoundGetEnv(csound, "CSOUND6RC"); + if (csrcname != NULL && csrcname[0] != '\0') { + fd = csound->FileOpen2(csound, &csrc, CSFILE_STD, csrcname, "r", NULL, CSFTYPE_OPTIONS, 0); - if (fd != NULL) { - readOptions(csound, csrc, 0); - csound->Message(csound, - Str("Reading options from local directory .csound6rc \n")); - csound->FileClose(csound, fd); - } + if (fd == NULL) + csoundMessage(csound, Str("WARNING: cannot open csound6rc file %s\n"), + csrcname); + else + csound->Message(csound, Str("Reading options from $CSOUND6RC: %s \n"), + csrcname); + } + if (fd == NULL && ((home_dir = csoundGetEnv(csound, "HOME")) != NULL && + home_dir[0] != '\0')) { + s = csoundConcatenatePaths(csound, home_dir, ".csound6rc"); + fd = csound->FileOpen2(csound, &csrc, CSFILE_STD, s, "r", NULL, + CSFTYPE_OPTIONS, 0); + if (fd != NULL) + csound->Message(csound, Str("Reading options from $HOME/.csound6rc\n")); + mfree(csound, s); + } + /* read global .csound6rc file (if exists) */ + if (fd != NULL) { + + readOptions(csound, csrc, 0); + csound->FileClose(csound, fd); + } + /* check for .csound6rc in current directory */ + fd = csound->FileOpen2(csound, &csrc, CSFILE_STD, ".csound6rc", "r", NULL, + CSFTYPE_OPTIONS, 0); + if (fd != NULL) { + readOptions(csound, csrc, 0); + csound->Message(csound, + Str("Reading options from local directory .csound6rc \n")); + csound->FileClose(csound, fd); + } } @@ -124,53 +125,6 @@ /* do not allow orc/sco/csd name in .csound6rc */ csound->orcname_mode = 2; checkOptions(csound); - /* { */ - /* const char *csrcname; */ - /* const char *home_dir; */ - /* FILE *csrc = NULL; */ - /* void *fd = NULL; */ - /* /\* IV - Feb 17 2005 *\/ */ - - /* csrcname = csoundGetEnv(csound, "CSOUND6RC"); */ - /* if (csrcname != NULL && csrcname[0] != '\0') { */ - /* fd = csound->FileOpen2(csound, &csrc, CSFILE_STD, csrcname, "r", NULL, */ - /* CSFTYPE_OPTIONS, 0); */ - /* if (fd == NULL) */ - /* csoundMessage(csound, Str("WARNING: cannot open csound6rc file %s\n"), */ - /* csrcname); */ - /* else */ - /* csound->Message(csound, Str("Reading options from $CSOUND6RC: %s \n"), */ - /* csrcname); */ - /* } */ - /* if (fd == NULL && ((home_dir = csoundGetEnv(csound, "HOME")) != NULL && */ - /* home_dir[0] != '\0')) { */ - /* csound->Message(csound, Str("Reading options from $HOME/.csound6rc\n")); */ - /* s = csoundConcatenatePaths(csound, home_dir, ".csound6rc"); */ - - /* fd = csound->FileOpen2(csound, &csrc, CSFILE_STD, s, "r", NULL, */ - /* CSFTYPE_OPTIONS, 0); */ - - /* csound->Message(csound, Str("%s=%p\n"), s,fd); */ - /* if (fd != NULL) */ - /* csound->Message(csound, Str("Reading options from $HOME/.csound6rc\n")); */ - /* mfree(csound, s); */ - /* } */ - /* /\* read global .csound6rc file (if exists) *\/ */ - /* if (fd != NULL) { */ - - /* readOptions(csound, csrc, 0); */ - /* csound->FileClose(csound, fd); */ - /* } */ - /* /\* check for .csound6rc in current directory *\/ */ - /* fd = csound->FileOpen2(csound, &csrc, CSFILE_STD, ".csound6rc", "r", NULL, */ - /* CSFTYPE_OPTIONS, 0); */ - /* if (fd != NULL) { */ - /* readOptions(csound, csrc, 0); */ - /* csound->Message(csound, */ - /* Str("Reading options from local directory .csound6rc \n")); */ - /* csound->FileClose(csound, fd); */ - /* } */ - /* } */ if (csound->delayederrormessages) { if (O->msglevel>8) csound->Warning(csound, csound->delayederrormessages); @@ -183,7 +137,8 @@ csound->info_message_request = 0; csound->LongJmp(csound, 1); } - else dieu(csound, Str("no orchestra name")); + else if(csound->oparms->daemon == 0) + dieu(csound, Str("no orchestra name")); } else if (csound->use_only_orchfile == 0 @@ -204,13 +159,14 @@ mfree(csound, fileDir); } + if(csound->orchname != NULL) { csound->csdname = csound->orchname; /* save original CSD name */ if (!read_unified_file(csound, &(csound->orchname), &(csound->scorename))) { csound->Die(csound, Str("Reading CSD failed ... stopping")); } - csdFound = 1; + } } /* IV - Feb 19 2005: run a second pass of argdecode so that */ @@ -255,13 +211,13 @@ mfree(csound, fileDir); } - if (csound->orchstr==NULL) { + if (csound->orchstr==NULL && csound->orchname) { /* does not deal with search paths */ csound->Message(csound, Str("orchname: %s\n"), csound->orchname); csound->orchstr = copy_to_corefile(csound, csound->orchname, NULL, 0); if (csound->orchstr==NULL) csound->Die(csound, - Str("Failed to open input file %s\n"), csound->orchname); + Str("Failed to open input file - %s\n"), csound->orchname); corfile_puts("\n#exit\n", csound->orchstr); corfile_putc('\0', csound->orchstr); corfile_putc('\0', csound->orchstr); @@ -275,14 +231,26 @@ if (csoundInitModules(csound) != 0) csound->LongJmp(csound, 1); if(csoundCompileOrc(csound, NULL) != 0){ - csoundDie(csound, Str("cannot compile orchestra \n")); + if(csound->oparms->daemon == 0) + csoundDie(csound, Str("cannot compile orchestra \n")); + else { + /* VL -- 21-10-13 Csound does not need to die on + failure to compile. It can carry on, because new + instruments can be compiled again */ + csound->Warning(csound, Str("cannot compile orchestra.")); + csound->Warning(csound, Str("Csound will start with no instruments")); + } } csound->modules_loaded = 1; s = csoundQueryGlobalVariable(csound, "_RTMIDI"); if(csound->enableHostImplementedMIDIIO == 1) { - strcpy(s, "hostbased"); - csoundSetConfigurationVariable(csound,"rtmidi", s); + if (s == NULL) { + s = strdup("hostbased"); + } else { + strcpy(s, "hostbased"); + } + csoundSetConfigurationVariable(csound,"rtmidi", s); } @@ -428,9 +396,9 @@ csound->LongJmp(csound, 1); csound->modules_loaded = 1; } - if (csound->instr0 == NULL) { /* compile empty instr 1 to allow csound to + if (csound->instr0 == NULL) { /* compile dummy instr0 to allow csound to start with no orchestra */ - csoundCompileOrc(csound, "instr 1 \n endin \n"); + csoundCompileOrc(csound, "idummy = 0 \n"); } if ((n = setjmp(csound->exitjmp)) != 0) { @@ -511,6 +479,10 @@ csound->WaitBarrier(csound->barrier2); } csound->engineStatus |= CS_STATE_COMP; + if(csound->oparms->daemon > 1) + UDPServerStart(csound,csound->oparms->daemon); + + return musmon(csound); } diff -Nru csound-6.01~dfsg/Top/one_file.c csound-6.02~dfsg/Top/one_file.c --- csound-6.01~dfsg/Top/one_file.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Top/one_file.c 2014-01-07 16:54:20.000000000 +0000 @@ -73,80 +73,69 @@ #endif -CS_NOINLINE char *csoundTmpFileName(CSOUND *csound, char *buf, const char *ext) +CS_NOINLINE char *csoundTmpFileName(CSOUND *csound, const char *ext) { - size_t nBytes = L_tmpnam+4; - if (buf == NULL) { - nBytes = (size_t) (L_tmpnam); - if (ext != NULL && ext[0] != (char) 0) - nBytes += strlen(ext); - buf = csound->Malloc(csound, nBytes); - } - { + size_t nBytes = 256; + char lbuf[256]; #if defined(LINUX) || defined(__MACH__) - struct stat tmp; - do { + struct stat tmp; #elif defined(WIN32) - struct _stat tmp; - do { + struct _stat tmp; #endif + do { #ifndef WIN32 - // if (UNLIKELY(mytmpnam(buf) == NULL)) - // csound->Die(csound, Str(" *** cannot create temporary file")); - int fd; - char *tmpdir = getenv("TMPDIR"); - if (tmpdir != NULL && tmpdir[0] != '\0') - snprintf(buf, nBytes, "%s/csound-XXXXXX", tmpdir); - else - strcpy(buf, "/tmp/csound-XXXXXX"); - umask(0077); + int fd; + char *tmpdir = getenv("TMPDIR"); + if (tmpdir != NULL && tmpdir[0] != '\0') + snprintf(lbuf, nBytes, "%s/csound-XXXXXX", tmpdir); + else + strcpy(lbuf, "/tmp/csound-XXXXXX"); + umask(0077); /* ensure exclusive access on buggy implementations of mkstemp */ - if (UNLIKELY((fd = mkstemp(buf)) < 0)) - csound->Die(csound, Str(" *** cannot create temporary file")); - close(fd); - unlink(buf); + if (UNLIKELY((fd = mkstemp(lbuf)) < 0)) + csound->Die(csound, Str(" *** cannot create temporary file")); + close(fd); + unlink(lbuf); #else - { - char *s = (char*) csoundGetEnv(csound, "SFDIR"); - if (s == NULL) - s = (char*) csoundGetEnv(csound, "HOME"); - s = _tempnam(s, "cs"); - if (UNLIKELY(s == NULL)) - csound->Die(csound, Str(" *** cannot create temporary file")); - strncpy(buf, s, nBytes); - free(s); - } + { + char *s = (char*) csoundGetEnv(csound, "SFDIR"); + if (s == NULL) + s = (char*) csoundGetEnv(csound, "HOME"); + s = _tempnam(s, "cs"); + if (UNLIKELY(s == NULL)) + csound->Die(csound, Str(" *** cannot create temporary file")); + strncpy(lbuf, s, nBytes); + free(s); + } #endif - if (ext != NULL && ext[0] != (char) 0) { + if (ext != NULL && ext[0] != (char) 0) { #if !defined(LINUX) && !defined(__MACH__) && !defined(WIN32) - char *p; - /* remove original extension (does not work on OS X */ - /* and may be a bad idea) */ - if ((p = strrchr(buf, '.')) != NULL) - *p = '\0'; + char *p; + /* remove original extension (does not work on OS X */ + /* and may be a bad idea) */ + if ((p = strrchr(lbuf, '.')) != NULL) + *p = '\0'; #endif - strncat(buf, ext, nBytes); - } + strncat(lbuf, ext, nBytes); + } #ifdef __MACH__ - /* on MacOS X, store temporary files in /tmp instead of /var/tmp */ - /* (suggested by Matt Ingalls) */ - if (strncmp(buf, "/var/tmp/", 9) == 0) { - int i = 3; - do { - i++; - buf[i - 4] = buf[i]; - } while (buf[i] != (char) 0); - } + /* on MacOS X, store temporary files in /tmp instead of /var/tmp */ + /* (suggested by Matt Ingalls) */ + if (strncmp(lbuf, "/var/tmp/", 9) == 0) { + int i = 3; + do { + i++; + lbuf[i - 4] = lbuf[i]; + } while (lbuf[i] != '\0'); + } #endif #if defined(LINUX) || defined(__MACH__) - /* if the file already exists, try again */ - } while (stat(buf, &tmp) == 0); + /* if the file already exists, try again */ + } while (stat(lbuf, &tmp) == 0); #elif defined(WIN32) - } while (_stat(buf, &tmp) == 0); + } while (_stat(lbuf, &tmp) == 0); #endif - } - - return buf; + return strdup(lbuf); } static inline void alloc_globals(CSOUND *csound) @@ -157,12 +146,6 @@ STA(csdlinecount) = 0; } -/* char *get_sconame(CSOUND *csound) */ -/* { */ -/* //alloc_globals(csound); */ -/* return STA(sconame); */ -/* } */ - static char *my_fgets(CSOUND *csound, char *s, int n, FILE *stream) { char *a = s; @@ -349,9 +332,7 @@ } if (UNLIKELY(readingCsOptions)) csoundErrorMsg(csound, Str("Missing end tag ")); - /* else */ - /* STA(csdlinecount) = 0; */ - return FALSE; + return FALSE; } static int createOrchestra(CSOUND *csound, FILE *unf) @@ -403,12 +384,12 @@ static int createExScore(CSOUND *csound, char *p, FILE *unf) { - char extname[L_tmpnam + 4]; + char *extname; char *q; - char prog[L_tmpnam + 4]; + char prog[256]; void *fd; FILE *scof; - char buffer[CSD_MAX_LINE_LEN]; + char buffer[CSD_MAX_LINE_LEN]; p = strstr(p, "bin=\""); if (UNLIKELY(p==NULL)) { @@ -423,8 +404,9 @@ *q = '\0'; strcpy(prog, p+5); /* after "tempStatus |= csScoInMask; @@ -533,7 +515,8 @@ char buffer[CSD_MAX_LINE_LEN]; /* Generate MIDI file name */ - csoundTmpFileName(csound, STA(midname), ".mid"); + if (STA(midname)) free(STA(midname)); + STA(midname) = csoundTmpFileName(csound, ".mid"); fd = csoundFileOpenWithType(csound, &midf, CSFILE_STD, STA(midname), "wb", NULL, CSFTYPE_STD_MIDI, 1); if (UNLIKELY(fd == NULL)) { @@ -743,7 +726,7 @@ return 0; } alloc_globals(csound); - STA(orcname)[0] = STA(sconame)[0] = STA(midname)[0] = '\0'; + STA(orcname) = STA(sconame) = STA(midname) = NULL; STA(midiSet) = FALSE; #ifdef _DEBUG csoundMessage(csound, "Calling unified file system with %s\n", name); @@ -803,10 +786,6 @@ r = createExScore(csound, p, unf); result = r && result; } - /* else if (strstr(p, "") == p) { */ - /* r = createMIDI(csound, unf); */ - /* result = r && result; */ - /* } */ else if (strstr(p, "") == p) { r = createMIDI2(csound, unf); result = r && result; diff -Nru csound-6.01~dfsg/Top/server.c csound-6.02~dfsg/Top/server.c --- csound-6.01~dfsg/Top/server.c 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/Top/server.c 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,132 @@ +/* + server.c: + + Copyright (C) 2013 V Lazzarini, John ffitch + + This file is part of Csound. + + The Csound Library is free software; you can redistribute it + and/or modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + Csound is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with Csound; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA +*/ +#ifdef NACL +typedef unsigned int u_int32_t; +#endif + +#include "csoundCore.h" +#ifdef WIN32 +#include +#include +#else +#include +#include +#include +#endif + + + +typedef struct { + int port; + int sock; + CSOUND *cs; + void *thrid; + void *cb; + struct sockaddr_in server_addr; +} UDPCOM; + +#define MAXSTR 1048576 /* 1MB */ + +static uintptr_t udp_recv(void *pdata) +{ + struct sockaddr from; + socklen_t clilen = sizeof(from); + UDPCOM *p = (UDPCOM *) pdata; + CSOUND *csound = p->cs; + int port = p->port; + char *orchestra = csound->Malloc(csound, MAXSTR); + + csound->Message(csound, "UDP server started on port %d \n",port); + while(recvfrom(p->sock, (void *)orchestra, MAXSTR, 0, &from, &clilen) > 0) { + if(csound->oparms->odebug) + csound->Message(csound, "orchestra: \n%s\n", orchestra); + if(strncmp("##close##",orchestra,9)==0) break; + csoundCompileOrc(csound, orchestra); + } + csound->Message(csound, "UDP server on port %d stopped\n",port); + csound->Free(csound, orchestra); + return (uintptr_t) 0; + +} + +static int udp_start(CSOUND *csound, UDPCOM *p) +{ +#ifdef WIN32 + WSADATA wsaData = {0}; + int err; + if ((err=WSAStartup(MAKEWORD(2,2), &wsaData))!= 0) + csound->InitError(csound, Str("Winsock2 failed to start: %d"), err); +#endif + p->cs = csound; + p->sock = socket(AF_INET, SOCK_DGRAM, 0); + if (UNLIKELY(p->sock < 0)) { + return csound->InitError + (csound, Str("creating socket")); + } + /* create server address: where we want to send to and clear it out */ + memset(&p->server_addr, 0, sizeof(p->server_addr)); + p->server_addr.sin_family = AF_INET; /* it is an INET address */ + p->server_addr.sin_addr.s_addr = htonl(INADDR_ANY); + + p->server_addr.sin_port = htons((int) p->port); /* the port */ + /* associate the socket with the address and port */ + if (UNLIKELY(bind(p->sock, (struct sockaddr *) &p->server_addr, + sizeof(p->server_addr)) < 0)){ + csound->Warning(csound, Str("bind failed")); + return NOTOK; + } + /* create thread */ + p->thrid = csoundCreateThread(udp_recv, (void *) p); + + return OK; +} + +int UDPServerClose(CSOUND *csound) +{ + UDPCOM *p = (UDPCOM *) csound->QueryGlobalVariable(csound,"::UDPCOM"); + + if(p != NULL){ + const char *mess = "##close##"; + const struct sockaddr *to = (const struct sockaddr *) (&p->server_addr); + sendto(p->sock,mess,sizeof(mess)+1,0,to,sizeof(p->server_addr)); + csoundJoinThread(p->thrid); +#ifndef WIN32 + close(p->sock); +#else + closesocket(p->sock); +#endif + csound->DestroyGlobalVariable(csound,"::UDPCOM"); + } + return OK; +} + +int UDPServerStart(CSOUND *csound, int port){ + UDPCOM *connection; + csound->CreateGlobalVariable(csound, "::UDPCOM", sizeof(UDPCOM)); + connection = (UDPCOM *) csound->QueryGlobalVariable(csound, "::UDPCOM"); + if(connection != NULL){ + connection->port = port; + return udp_start(csound, connection); + } + else return NOTOK; +} diff -Nru csound-6.01~dfsg/Top/threads.c csound-6.02~dfsg/Top/threads.c --- csound-6.01~dfsg/Top/threads.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Top/threads.c 2014-01-07 16:54:20.000000000 +0000 @@ -167,7 +167,7 @@ #define BARRIER_SERIAL_THREAD (-1) #if !defined(HAVE_PTHREAD_BARRIER_INIT) -#if !defined(__MACH__) && !defined(__HAIKU__) && !defined(ANDROID) +#if !defined(__MACH__) && !defined(__HAIKU__) && !defined(ANDROID) && !defined(NACL) typedef struct barrier { pthread_mutex_t mut; diff -Nru csound-6.01~dfsg/Top/threadsafe.c csound-6.02~dfsg/Top/threadsafe.c --- csound-6.01~dfsg/Top/threadsafe.c 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/Top/threadsafe.c 2014-01-07 16:54:20.000000000 +0000 @@ -147,14 +147,18 @@ if (csoundGetChannelPtr(csound, &pstring, name, CSOUND_STRING_CHANNEL | CSOUND_INPUT_CHANNEL) == CSOUND_SUCCESS){ - int size = csoundGetChannelDatasize(csound, name); + + STRINGDAT* stringdat = (STRINGDAT*) pstring; + int size = stringdat->size; //csoundGetChannelDatasize(csound, name); int *lock = csoundGetChannelLock(csound, (char*) name); + csoundSpinLock(lock); - if(strlen(string) > (unsigned int) size) { - if(pstring!=NULL) mfree(csound,pstring); - pstring = (MYFLT *) cs_strdup(csound, string); - set_channel_data_ptr(csound,name,(void*)pstring, strlen(string)+1); - } else strcpy((char *) pstring, string); + if(strlen(string) + 1 > (unsigned int) size) { + if(stringdat->data!=NULL) mfree(csound,stringdat->data); + stringdat->data = cs_strdup(csound, string); + stringdat->size = strlen(string) + 1; + //set_channel_data_ptr(csound,name,(void*)pstring, strlen(string)+1); + } else strcpy((char *) stringdat->data, string); csoundSpinUnLock(lock); } } @@ -167,7 +171,7 @@ == CSOUND_SUCCESS){ int *lock = csoundGetChannelLock(csound, (char*) name); csoundSpinLock(lock); - strcpy(string, (char *) pstring); + strcpy(string, ((STRINGDAT *) pstring)->data); csoundSpinUnLock(lock); } } diff -Nru csound-6.01~dfsg/all_string_files csound-6.02~dfsg/all_string_files --- csound-6.01~dfsg/all_string_files 2013-10-18 18:39:41.000000000 +0000 +++ csound-6.02~dfsg/all_string_files 2014-01-07 16:54:20.000000000 +0000 @@ -170,6 +170,7 @@ ./Opcodes/LuaCsound.cpp ./Opcodes/OSC.c ./Opcodes/Vosim.c +./Opcodes/afilters.c ./Opcodes/ambicode.c ./Opcodes/ambicode1.c ./Opcodes/ampmidid.cpp @@ -621,3 +622,5 @@ ./util1/scot/scot_main.c ./util1/sortex/smain.c ./util1/sortex/xmain.c +./Opcodes/cuda/adsyn.cu +./Opcodes/cuda/pvsops.cu diff -Nru csound-6.01~dfsg/debian/changelog csound-6.02~dfsg/debian/changelog --- csound-6.01~dfsg/debian/changelog 2013-11-19 03:02:48.000000000 +0000 +++ csound-6.02~dfsg/debian/changelog 2014-01-22 13:09:12.000000000 +0000 @@ -1,3 +1,9 @@ +csound (1:6.02~dfsg-1) unstable; urgency=medium + + * New upstream version + + -- Felipe Sateler Wed, 22 Jan 2014 10:08:39 -0300 + csound (1:6.01~dfsg-2) unstable; urgency=low * Upload to unstable diff -Nru csound-6.01~dfsg/debian/control csound-6.02~dfsg/debian/control --- csound-6.01~dfsg/debian/control 2013-11-19 03:02:48.000000000 +0000 +++ csound-6.02~dfsg/debian/control 2014-01-22 13:09:12.000000000 +0000 @@ -52,7 +52,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Breaks: libcsound64-5.1 (<< 1:5.08.2~dfsg-1) -Recommends: csound-gui, csound-utils, csound-manpages +Recommends: csound-utils, csound-manpages Description: powerful and versatile sound synthesis software Csound is a sound and music synthesis system. Drawing from over 450 signal processing modules, it can be used to model virtually any @@ -107,7 +107,6 @@ Package: libcsound64-dev Architecture: all -Priority: extra Section: libdevel Depends: libcsound64-6.0 (>= ${source:Version}), libcsound64-6.0 (<< ${source:Version}.1~), ${misc:Depends} Description: development files for Csound @@ -118,7 +117,6 @@ Package: libcsnd-dev Architecture: all -Priority: extra Section: libdevel Depends: libcsnd6-6.0 (>= ${source:Version}), libcsnd6-6.0 (<< ${source:Version}.1~), ${misc:Depends} Replaces: libcsnd5.1 @@ -134,7 +132,6 @@ Package: libcsoundac-dev Architecture: all -Priority: extra Section: libdevel Depends: libcsoundac6.0 (>= ${source:Version}), libcsoundac6.0 (<< ${source:Version}.1~), ${misc:Depends} Replaces: libcsoundac5.1 @@ -218,7 +215,6 @@ Package: libcsound64-doc Architecture: all -Priority: extra Section: doc Depends: ${misc:Depends} Recommends: csound, libcsound64-dev diff -Nru csound-6.01~dfsg/debian/control.in csound-6.02~dfsg/debian/control.in --- csound-6.01~dfsg/debian/control.in 2013-11-19 03:02:48.000000000 +0000 +++ csound-6.02~dfsg/debian/control.in 2014-01-22 13:09:12.000000000 +0000 @@ -21,7 +21,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Breaks: libcsound64-5.1 (<< 1:5.08.2~dfsg-1) -Recommends: csound-gui, csound-utils, csound-manpages +Recommends: csound-utils, csound-manpages Description: powerful and versatile sound synthesis software Csound is a sound and music synthesis system. Drawing from over 450 signal processing modules, it can be used to model virtually any @@ -76,7 +76,6 @@ Package: libcsound64-dev Architecture: all -Priority: extra Section: libdevel Depends: libcsound64-6.0 (>= ${source:Version}), libcsound64-6.0 (<< ${source:Version}.1~), ${misc:Depends} Description: development files for Csound @@ -87,7 +86,6 @@ Package: libcsnd-dev Architecture: all -Priority: extra Section: libdevel Depends: libcsnd6-6.0 (>= ${source:Version}), libcsnd6-6.0 (<< ${source:Version}.1~), ${misc:Depends} Replaces: libcsnd5.1 @@ -103,7 +101,6 @@ Package: libcsoundac-dev Architecture: all -Priority: extra Section: libdevel Depends: libcsoundac6.0 (>= ${source:Version}), libcsoundac6.0 (<< ${source:Version}.1~), ${misc:Depends} Replaces: libcsoundac5.1 @@ -187,7 +184,6 @@ Package: libcsound64-doc Architecture: all -Priority: extra Section: doc Depends: ${misc:Depends} Recommends: csound, libcsound64-dev diff -Nru csound-6.01~dfsg/debian/copyright_hints csound-6.02~dfsg/debian/copyright_hints --- csound-6.01~dfsg/debian/copyright_hints 2013-11-19 03:02:48.000000000 +0000 +++ csound-6.02~dfsg/debian/copyright_hints 2014-01-22 13:09:12.000000000 +0000 @@ -7,7 +7,6 @@ Files: AUTHORS BUILDING_FOR_ANDROID CMakeLists.txt - CsoundLib.framework/readme.txt Custom.cmake.ex Doxyfile Doxyfile-CsoundAC @@ -31,6 +30,12 @@ Known_Problems Makefile-win32 Opcodes/CMakeLists.txt + Opcodes/cuda/adsyn.cu + Opcodes/cuda/build.sh + Opcodes/cuda/cuda_pvs_example.csd + Opcodes/cuda/cudadsyn_example.csd + Opcodes/cuda/cudadsyn_pvs_example.csd + Opcodes/cuda/pvsops.cu Opcodes/doppler.cpp Opcodes/dssi4cs/src/load.c Opcodes/dssi4cs/src/utils.h @@ -144,18 +149,18 @@ debian/custom.py debian/gbp.conf debian/libcsnd-dev.install + debian/libcsnd6-6.0.install debian/libcsnd6-java.examples debian/libcsnd6-java.install - debian/libcsnd6.0.install debian/libcsound64-6.0.install debian/libcsound64-6.0.symbols debian/libcsound64-dev.install debian/libcsound64-doc.doc-base debian/libcsound64-doc.docs + debian/libcsound64-doc.linktrees debian/libcsoundac-dev.install debian/libcsoundac6.0.install debian/liblua5.1-luacsnd.install - debian/patches/0000-fix-openmp-option.diff debian/patches/2000-avoid-nonfree-scansyn-plugin.diff debian/patches/2001-lua-link.diff debian/patches/2004-fix-gettext.diff @@ -172,6 +177,8 @@ debian/python-csoundac.install debian/source/format debian/watch + doc/.gitignore + doc/csound_system_documentation/csound_system_documentation.tex etc/.csoundrc etc/.csoundrc_windows examples/CloudStrata.csd @@ -278,6 +285,7 @@ frontends/beats/test.xs frontends/max_csound_tilde/CHANGES.TXT frontends/max_csound_tilde/CMakeLists.txt + frontends/max_csound_tilde/ChangeLog frontends/max_csound_tilde/DIARY.TXT frontends/max_csound_tilde/MAC_CHANGES.TXT frontends/max_csound_tilde/installer/.gitignore @@ -362,7 +370,31 @@ linseg longline.c matrix.tk + mingw64-linux/.gitignore + mingw64-linux/Custom-mingw64-i686.cmake + mingw64-linux/Custom-mingw64.cmake + mingw64-linux/README.md + mingw64-linux/Toolchain-mingw64-i686.cmake + mingw64-linux/Toolchain-mingw64.cmake + mingw64-linux/build-deps.sh + mingw64-linux/build-deps32.sh + mingw64-linux/build.sh + mingw64-linux/build32.sh + mingw64-linux/download-deps.sh + mingw64-linux/download-deps32.sh + mingw64-linux/release.sh mkdb.c + nacl/Makefile + nacl/build.sh + nacl/csound/docs/pnacl_csound.html + nacl/csound/docs/pnacl_csound.tex + nacl/csound/gm.csd + nacl/csound/manifest.json + nacl/csound/package.sh + nacl/csound/start.html + nacl/csound/stria.csd + nacl/csound/test.csd + nacl/csound/trapped.csd nsliders.tk pkgbuild.tcl pluginSDK/SConstruct @@ -508,6 +540,7 @@ tests/regression/testUI.py tests/soak/00README tests/soak/0dbfs.csd + tests/soak/CMakeLists.txt tests/soak/Sample_CheckSums tests/soak/a.csd tests/soak/abs.csd @@ -1352,7 +1385,6 @@ tests/soak/zkr.csd tests/soak/zkw.csd tests/soak/zkwm.csd - todo util/CMakeLists.txt util/README.adsyn util/atsa_main.c @@ -1815,7 +1847,7 @@ Opcodes/ftgen.c Copyright: 1991, 1994-1995, 1998, 2000, 2004 1991, 1997, 1999, 2002, 2005 - 1991, 1997, 2003, 2006, 2012 + 1991, 1997, 2003, 2006, 2012, 2006 2006-2007 2013 @@ -1840,6 +1872,20 @@ License: LGPL-2.1+ FIXME +Files: nacl/csound/canvas.html + nacl/csound/csdplayer.html + nacl/csound/effects.html + nacl/csound/interactive.html + nacl/csound/midiplayer.html + nacl/csound/minimal.html + nacl/csound/render.html + nacl/csound/sliders.html + nacl/csound/stria.html + nacl/csound/trapped.html +Copyright: 2013, V Lazzarini +License: UNKNOWN + FIXME + Files: H/midiout.h OOps/midiout.c Opcodes/flanger.c @@ -1866,6 +1912,19 @@ License: LGPL-2.1+ FIXME +Files: H/ugtabs.h + InOut/cmidi.c + OOps/ugtabs.c + Opcodes/pvlock.c + nacl/csound/csound.cpp + nacl/csound/csound.js + nacl/csound/index.html +Copyright: 2009, V Lazzarini + 2011, V Lazzarini + 2013, V Lazzarini +License: LGPL-2.1+ + FIXME + Files: InOut/circularbuffer.c InOut/rtauhal.c InOut/rtpulse.c @@ -1909,6 +1968,25 @@ License: LGPL-ever FIXME +Files: frontends/CsoundAC/allegrord.cpp + frontends/CsoundAC/allegrosmfwr.cpp + nacl/csound/sf_GMbank.sf2 + tests/soak/HRTFcompact + tests/soak/fox_nopoles.lpc + tests/soak/kickroll.het +Copyright: +License: UNKNOWN + FIXME + +Files: H/aops.h + H/ugens5.h + OOps/aops.c + OOps/ugens5.c + Opcodes/afilters.c +Copyright: 1991, Barry Vercoe, John ffitch, Gabriel Maldonado +License: LGPL-2.1+ + FIXME + Files: H/cmath.h OOps/cmath.c Opcodes/cross2.c @@ -1937,23 +2015,6 @@ License: LGPL-2.1+ FIXME -Files: frontends/CsoundAC/allegrord.cpp - frontends/CsoundAC/allegrosmfwr.cpp - samples/sf_GMbank.sf2 - tests/soak/HRTFcompact - tests/soak/kickroll.het -Copyright: -License: UNKNOWN - FIXME - -Files: H/aops.h - H/ugens5.h - OOps/aops.c - OOps/ugens5.c -Copyright: 1991, Barry Vercoe, John ffitch, Gabriel Maldonado -License: LGPL-2.1+ - FIXME - Files: Opcodes/py/pycall-gen.py Opcodes/py/pythonhelper.h Opcodes/py/pythonopcodes.c @@ -1962,16 +2023,6 @@ License: LGPL-2.1+ FIXME -Files: H/ugtabs.h - InOut/cmidi.c - OOps/ugtabs.c - Opcodes/pvlock.c -Copyright: 2009, V Lazzarini - 2011, V Lazzarini - 2013, V Lazzarini -License: LGPL-2.1+ - FIXME - Files: examples/lua/Lindenmayer.lua examples/python/Koch.py examples/python/Lindenmayer.py @@ -1989,16 +2040,6 @@ License: UNKNOWN FIXME -Files: Engine/csound_orc.l - Engine/csound_pre.lex - Engine/csound_prs.lex -Copyright: 2006, - 2011 - 2013, - || (pos && (c == '_' || isdigit))); -License: LGPL-2.1+ - FIXME - Files: Engine/cs_par_base.c Engine/cs_par_dispatch.c Engine/cs_par_orc_semantic_analysis.c @@ -2125,6 +2166,14 @@ License: LGPL FIXME +Files: Engine/csound_orc.l + Engine/csound_pre.lex +Copyright: 2006 + 2011, + || (pos && (c == '_' || isdigit))); +License: LGPL-2.1+ + FIXME + Files: util1/scot/scot.c util1/scot/scot.h Copyright: 1991, Alan deLespinasse @@ -2355,7 +2404,7 @@ Files: frontends/max_csound_tilde/installer/PkgResources/en.lproj/background.tiff installer/macosx/PkgResources/en.lproj/background.tiff -Copyright: 9ހ!|DP:.SMUU'ys+@;%7@ g. ˒x'ȭ 22}HOSjChHY( +Copyright: &R nc~9mg-(`7 lpFd License: UNKNOWN FIXME @@ -2393,9 +2442,14 @@ License: LGPL FIXME +Files: frontends/CsoundAC/ChordSpace.hpp +Copyright: +License: LGPL-2.1+ + FIXME + Files: Engine/csound_orc_semantics.c Copyright: && !is_in_var_arg) { - 2006 + 2006, License: LGPL-2.1+ FIXME @@ -2438,8 +2492,8 @@ FIXME Files: Opcodes/pvscent.c -Copyright: Alan OCinneide, 2005 - John ffitch, 2005, +Copyright: Alan OCinneide, 2005, + John ffitch, 2005 V Lazzarin, 2012, License: LGPL-2.1+ FIXME @@ -2681,11 +2735,6 @@ License: LGPL-2.1+ FIXME -Files: frontends/CsoundAC/ChordSpace.hpp -Copyright: Interchange by inversion; -License: LGPL-2.1+ - FIXME - Files: H/str_ops.h Copyright: 2005, Matt J. Ingalls, John ffitch 2005-2006, Istvan Varga @@ -2787,7 +2836,7 @@ Files: Opcodes/dam.c Copyright: 1997, Marc Resibois - Marc Resibois 1997 + Marc Resibois 1997, License: LGPL-2.1+ FIXME @@ -2915,6 +2964,11 @@ License: LGPL-2.1+ FIXME +Files: Top/server.c +Copyright: 2013, V Lazzarini, John ffitch +License: LGPL-2.1+ + FIXME + Files: Opcodes/scoreline.c Copyright: Victor Lazzarini, 2004,2008 License: LGPL-2.1+ @@ -2971,15 +3025,7 @@ FIXME Files: How_to_Build_Csound_on_Windows.doc -Copyright: yK http://stackoverflow.com/questions/6716654/segmentation-fault-using-openmp-and-sseDyK yK http://sourceforge.net/projects/mingwbuilds/files/latest/download?source=filesDyK yK http://sourceforge.net/projects/mingwbuilds/files/external-binary-packages/msys%2B7za%2Bwget%2Bsvn%2Bgit%2Bmercurial%2Bcvs-rev13.7z/downloadDyK yK @http://qt-project.org/downloadsDyK yK ,http://www.cmake.org/DyK yK ,http://www.scons.org/-DyK yK http://sourceforge.net/p/csound/csound6-git/ci/29e5d7338d30a86dae4f2eed20f31d38dd73caff/tree/DyK yK @http://git-scm.com/download/winDyK yK <http://cunit.sourceforge.net/DyK yK http://www.oracle.com/technetwork/java/javase/downloads/index.htmlDyK yK Dhttp://www.swig.org/download.htmlDyK yK phttp://www.python.org/ftp/python/2.7.3/python-2.7.3.msiDyK yK &http://luajit.org/DyK yK 8http://www.tug.org/protext/DyK yK Jhttp://www.stack.nl/~dimitri/doxygenDyK yK Jhttp://www.stack.nl/~dimitri/doxygenDyK yK 2http://www.graphviz.org/DyK yK Lhttp://www.gtk.org/download/index.phpDyK yK Phttp://www.zlatkovic.com/libxml.en.htmlDyK yK ~http://www.oasis-open.org/docbook/xml/4.5/docbook-xml-4.5.zipD-DyK yK http://sourceforge.net/project/downloading.php?group_id=21935&filename=docbook-xsl-1.76.1.zipDyK yK ,http://www.boost.org/DyK yK *http://www.fltk.org/DyK yK jhttp://eigen.tuxfamily.org/index.php?title=Main_PageDyK yK Xhttp://sourceforge.net/projects/fluidsynth/DyK FDyK yK vhttp://download.gna.org/getfem/html/homepage/download.htmlDyK yK Jhttp://www.mega-nerd.com/libsndfile/DyK yK Jhttp://code.google.com/p/libmusicxmlDyK yK <http://liblo.sourceforge.net/DyK yK |http://www.steinberg.net/en/company/3rd_party_developer.htmlIDyK yK zhttps://github.com/adfernandes/precompiled-portaudio-windowsDyK yK Dhttp://portmedia.sourceforge.net/DyK yK Dhttp://portmedia.sourceforge.net/DyK yK Rhttps://ccrma.stanford.edu/software/stk/DyK yK |http://msdn.microsoft.com/en-us/windows/desktop/hh852363.aspxDyK yK .http://qt-project.org/DyK yK @http://qt-project.org/downloadsDyK yK Vhttp://sourceforge.net/projects/qutecsoundDyK yK Jhttp://www.jrsoftware.org/isinfo.phpDyK yK Jhttp://www.jrsoftware.org/isinfo.phpDyK yK Lhttp://nsis.sourceforge.net/Main_PageDyK yK >http://www.michael-gogins.com/M 0rCaolan80 2 9afx2t) -License: UNKNOWN - FIXME - -Files: tests/soak/fox.pvx -Copyright:  DΜ:g+Dť#:k4D97uF) 7lwF#7RF6ēFs86iFd7RF64F7FO{,78CF?7Fow=7F1963MFz7kږF h7Fp7DF6|'F6ޗF 7)F-&7eژF6DF7iFs6FH'7BFhf7wFs27Fr6- Ft7wdFsa7F7FD6kFm7F z74F$~G6PF6Fa 77l F6vjF96(Fd57F6 tFe73ϟF&6FB07-F.`6`F 7,F76BFϜ7F6F̤s6F7(FlE7FsU7AF=%6v8F7 - 7 'Fg70(F - E:xkEug:ԗE.m:Q$E:E9Eϗ9FE9:E79E +Copyright: yK http://stackoverflow.com/questions/6716654/segmentation-fault-using-openmp-and-sseDyK yK http://sourceforge.net/projects/mingwbuilds/files/latest/download?source=filesDyK FD:\mingw32-4.8.1& D:\mingw32-4.8.1DyK yK http://sourceforge.net/projects/mingw/files/MinGW/Extension/gdb/DyK yK http://sourceforge.net/projects/mingwbuilds/files/external-binary-packages/msys%2B7za%2Bwget%2Bsvn%2Bgit%2Bmercurial%2Bcvs-rev13.7z/downloadDyK yK @http://qt-project.org/downloadsDyK yK ,http://www.cmake.org/DyK yK ,http://www.scons.org/-DyK yK http://sourceforge.net/p/csound/csound6-git/ci/29e5d7338d30a86dae4f2eed20f31d38dd73caff/tree/DyK yK @http://git-scm.com/download/winDyK yK <http://cunit.sourceforge.net/DyK yK http://www.oracle.com/technetwork/java/javase/downloads/index.htmlDyK yK Dhttp://www.swig.org/download.htmlDyK yK phttp://www.python.org/ftp/python/2.7.3/python-2.7.3.msiDyK yK &http://luajit.org/DyK yK 8http://www.tug.org/protext/DyK yK Jhttp://www.stack.nl/~dimitri/doxygenDyK yK Jhttp://www.stack.nl/~dimitri/doxygenDyK yK 2http://www.graphviz.org/DyK yK Lhttp://www.gtk.org/download/index.phpDyK yK Phttp://www.zlatkovic.com/libxml.en.htmlDyK yK ~http://www.oasis-open.org/docbook/xml/4.5/docbook-xml-4.5.zipD-DyK yK http://sourceforge.net/project/downloading.php?group_id=21935&filename=docbook-xsl-1.76.1.zipDyK yK ,http://www.boost.org/DyK yK *http://www.fltk.org/DyK yK jhttp://eigen.tuxfamily.org/index.php?title=Main_PageDyK yK Xhttp://sourceforge.net/projects/fluidsynth/DyK FDyK yK vhttp://download.gna.org/getfem/html/homepage/download.htmlDyK yK Jhttp://www.mega-nerd.com/libsndfile/DyK yK Jhttp://code.google.com/p/libmusicxmlDyK yK <http://liblo.sourceforge.net/DyK yK |http://www.steinberg.net/en/company/3rd_party_developer.htmlIDyK yK zhttps://github.com/adfernandes/precompiled-portaudio-windowsDyK yK Dhttp://portmedia.sourceforge.net/DyK yK Dhttp://portmedia.sourceforge.net/DyK yK Rhttps://ccrma.stanford.edu/software/stk/DyK yK |http://msdn.microsoft.com/en-us/windows/desktop/hh852363.aspxDyK yK .http://qt-project.org/DyK yK @http://qt-project.org/downloadsDyK yK Vhttp://sourceforge.net/projects/qutecsoundDyK yK Jhttp://www.jrsoftware.org/isinfo.phpDyK yK Jhttp://www.jrsoftware.org/isinfo.phpDyK yK Lhttp://nsis.sourceforge.net/Main_PageDyK yK >http://www.michael-gogins.com/M 0@Caolan80 2bgy2t*.).b*4!rl)T)8) How to Build Csound 6 and CsoundQt on Windows Michael Gogins michael.gogins@gmail.com 12 October 2013 Introduction This document provides up to date instructions for building Csound 6 and CsoundQt on Windows. This document should be updated in reasonable detail with each release of Csound 6 for Windows, and pushed to Git head. As a result of efforts to improve and simplify Csound's build system, which had become quite tedious, the build system and the installer for Csound 6 are different from what they were for Csound 5. Csound 5 uses SCons for building, Csound 6 uses CMake. Csound 5 uses a Nullsoft installer script that provides many options and sets some environment variables, Csound 6 has an Inno Setup Compiler script.a similar installer but does not set any environment variables. There is also the option to make a Windows release by making the install target, and then zip up the entire install directory tree in file named according to the pattern csound-version-minorversion-win32.zip. Filesystem The conceit of these instructions is that Csound is built in a standard Linux environment (which is simulated using MSys), using the standard GNU compiler (which is MinGW). To assist us in this delusion: Toolchain binaries must go in the system path: either /usr/bin or /usr/local/bin for binaries that are designed for MinGW or MSys, or the usual Program Files directories for regular Windows programs. It doesn't really matter where the tool executables actually go, as long as they are in the system PATH environment variable. So they can go where their Windows installers by default puts them. Third party software that we simply install can go /usr/opt or else where their Windows installers by default puts them. For third party software that we build, we install sources into /usr/local/src. If there is an install target, we make the install targets which should, normally, end up in the more or less standard /usr/local/bin, /usr/local/lib, and /usr/local/include. If there is no install target, we leave the third party software where it was built. Note: /usr/local in this document is relative to the MSys directory and would actually be something like C:\msys\local. Code Generation Csound 6 for Windows is built for the 32 bit architecture. Code is built optimized for release but also including debugging information. Code generation for all builds must be for release versions of all runtime libraries and all third party libraries. Not only all components of Csound and CsoundAC, but also all third-party libraries that Csound links with dynamically  including Qt, FLTK, PortAudio, CsoundQt, and FluidSynth  must be built with code generated for propagating exceptions across image boundaries (dwarf2), and using the Posix threading model. In general, at least the following compiler options should be used for building all Csound related code. The reason for the stack realignment option is given in:  HYPERLINK "http://stackoverflow.com/questions/6716654/segmentation-fault-using-openmp-and-sse"http://stackoverflow.com/questions/6716654/segmentation-fault-using-openmp-andand-sse. C Options -g -O2 -fopenmp -march=nocona -mstackrealign -DNDEBUG -I/usr/local/include C++ Options -g -O2 -std=gnu++11 -fopenmp -march=nocona -mstackrealign -DNDEBUG -I/usr/local/include Toolchain Tools are listed more or less in the order they should be installed. MinGW Compiler Updated 12 October 2013. All C++ binaries that are packaged with Csound must be built with the same C++ ABI. In practice, this means building everything with the same compiler. Download the MinGW-build installer from  HYPERLINK "http://sourceforge.net/projects/mingwbuilds/files/latest/download?source=files"http://sourceforge.net/projects/mingwbuilds/files/latest/download?source=files and run it. Install to a directory such as  HYPERLINK "/D:/mingw32-4.8.1"D:/mingw32-4.8.1. In 4.8.1, you must comment out, in cmath, the line using ::hypot as that function is actually a macro. Replace the MinGW-builds debugger, which is crap, with the latest one from  HYPERLINK "http://sourceforge.net/projects/mingw/files/MinGW/Extension/gdb/"http://sourceforge.net/projects/mingw/files/MinGW/Extension/gdb/. MSys Checked 25 July 2013. In addition to the compiler, building Csound and its dependencies requires some other tools. Install MSys from  HYPERLINK "http://sourceforge.net/projects/mingwbuilds/files/external-binary-packages/msys%2B7za%2Bwget%2Bsvn%2Bgit%2Bmercurial%2Bcvs-rev13.7z/download"http://sourceforge.net/projects/mingwbuilds/files/external-binary-packages/msys%2B7za%2Bwget%2Bsvn%2Bgit%2Bmercurial%2Bcvs-rev13.7z/download. This includes bison, flex, autotools and some other goodies. Edit the MSys etc/fstab file to map the MinGW directory to /mingw. The Qt SDK Updated 12 October 2013. At the moment, the prebuilt Qt SDK is subject to the MinGW bug mentioned above. Download Qt sources from  HYPERLINK "http://qt-project.org/downloads"http://qt-project.org/downloads and build them in a plain Windows console with only the MinGW bin directory in the PATH with the command: configure.bat -debug-and-release -developer-build -opensource -confirm-license -nomake examples -nomake tests -no-angle -opengl desktop -platform win32-g++ CMake Updated 13 October 2013. Csound itself is built using CMake. Install CMake from  HYPERLINK "http://www.cmake.org/"http://www.cmake.org/. SCons Checked 26 July 2013. SCons (Software Construction) is a build system that is particularly easy to use. It is used here to make custom builds of some third-party software that lacks a Windows build system, or has a Windows build system that lacks features Csound needs.. Install SCons for Windows from  HYPERLINK "http://www.scons.org/"http://www.scons.org/. Git Checked 26 July 2013. Csound 6 source code is maintained in a Git repository at  HYPERLINK "http://sourceforge.net/p/csound/csound6-git/ci/29e5d7338d30a86dae4f2eed20f31d38dd73caff/tree/"http://sourceforge.net/p/csound/csound6-git/ci/29e5d7338d30a86dae4f2eed20f31d38dd73caff/tree/. Install Git from  HYPERLINK "http://git-scm.com/download/win"http://git-scm.com/download/win. CUnit Done 26 July 2013. CUnit is used to run unit tests for Csound. Install CUnit source code from  HYPERLINK "http://cunit.sourceforge.net/"http://cunit.sourceforge.net/ in /usr/local/src. Configure with ./configure. Make with make. Install with make install. Java SDK Checked 26 July 2013. The Java SDK is used for generating Java bindings to the Csound API and CsoundAC. Some examples of Java programs using Csound also require the SDK. Java is also used to build Csound apps for iOS and Android. Install the Java SE SDK from  HYPERLINK "http://www.oracle.com/technetwork/java/javase/downloads/index.html"http://www.oracle.com/technetwork/java/javase/downloads/index.html. SWIG Updated 13 October 2013. SWIG is used for automatically generating the bindings to the Csound API and to CsoundAC for the Python, Java, and Lua programming languages. Install SwigWin from  HYPERLINK "http://www.swig.org/download.html"http://www.swig.org/download.html. Python Checked 26 July 2013. The Csound API has a Python interface, and some Csound examples use Python. Install Python from  HYPERLINK "http://www.python.org/ftp/python/2.7.3/python-2.7.3.msi"http://www.python.org/ftp/python/2.7.3/python-2.7.3.msi. LuaJIT Done 26 July 2013. The Csound API has a Lua interface, and the Lua opcodes require LuaJIT in particular, which is bundled with the Csound Windows distribution. Install LuaJIT source code from  HYPERLINK "http://luajit.org/"http://luajit.org/ in /usr/src. Build LuaJIT with make. Install with make install. LaTeX Checked 26 July 2013. LaTeX is used for typesetting the Csound and Csound AC tutorials that are included in the Windows release. Install proTeXT from  HYPERLINK "http://www.tug.org/protext/"http://www.tug.org/protext/. Doxygen Checked 26 July 2013. Doxygen is used to generate the Csound API and CsoundAC API documentation from comments in the source code. Install Doxygen to the current version (1.8.2-20121118) from  HYPERLINK "http://www.stack.nl/~dimitri/doxygen"http://www.stack.nl/~dimitri/doxyge HYPERLINK "http://www.stack.nl/~dimitri/doxygen"n. Dot Checked 26 July 2013. Install ATT Graphviz to version 2.30.1 from  HYPERLINK "http://www.graphviz.org/"http://www.graphviz.org GTK+ Bundle Done 17 August 2013. Fluidsynth and perhaps some other third party packages require some GTK and GNU libraries not supplied with Msys. Download the all-in-one GTK+ stack from  HYPERLINK "http://www.gtk.org/download/index.php"http://www.gtk.org/download/index.php. Unzip it into the Msys directory so bin, lib, include, etc. all match. DocBook Done 26 July 2013. DocBook is used to generate the Csound Reference Manual from XML source files. Install the current Windows build of xsltproc and libxml2 from  HYPERLINK "http://www.zlatkovic.com/libxml.en.html"http://www.zlatkovic.com/libxml.en.html into /usr/local. Install the current  HYPERLINK "http://www.oasis-open.org/docbook/xml/4.5/docbook-xml-4.5.zipD"http://www.oasis-open.org/docbook/xml/4.5/docbook-xml-4.5.zip DocBook XML DTDs. Copy this tree to one directory above the Csound manual directory. Install the current DocBook XSL stylesheets from  HYPERLINK "http://sourceforge.net/project/downloading.php?group_id=21935&filename=docbook-xsl-1.76.1.zip"http://sourceforge.net/project/downloading.php?group_id=21935&filename=docbook-xsl-1.76.1.zip into /usr/local/opt. Third Party Packages In general, the most recent versions of all tools and third-party packages that are in general use should be used for Csound. Sometimes this is packaged as a released version, sometimes it is packaged as a beta version, sometimes it is always built from sources. If in doubt, search the World Wide Web or check mailing lists for the software. If the library does not come pre-built for Windows or with a functional build system for MinGW/MSys, create a CMake file for the library. Boost Done 26 July 2013. Parts of boost are required by CsoundAC. Install boost source code from  HYPERLINK "http://www.boost.org/"http://www.boost.org/. We use only the header files, so just copy the boost directory and all its contents to /usr/local/include. FLTK Done 17 August 2013. FLTK is used by the FLTK widgets opcodes. Install the latest FLTK 1.3 source code from  HYPERLINK "http://www.fltk.org/"http://www.fltk.org/ into /usr/local/src. Configure with ./configure --enable-threads --enable-gl --enable-shared --enable-localjpeg --enable-localzlib  enable-localpng. Make with make. Install with make install. Eigen Done 26 July 2013. Eigen is a C++ library for matrix arithmetic and linear algebra, used by CsoundAC. Install Eigen source code from  HYPERLINK "http://eigen.tuxfamily.org/index.php?title=Main_Page"http://eigen.tuxfamily.org/index.php?title=Main_Page in /usr/local/include. Eigen is a header file-only library and does not need to be built or installed. However, there is another bug in the MinGW 4.8.1 compiler that causes any #pragma GCC optimize to cause an out of memory error in large files with cc1plus.exe. About line 25 of the Eigen Core header, comment out the pragma so it reads like this: // Disable the ipa-cp-clone optimization flag with MinGW 6.x or newer (enabled by default with -O3) // See http://eigen.tuxfamily.org/bz/show_bug.cgi?id=556 for details. #if defined(__MINGW32__) && EIGEN_GNUC_AT_LEAST(4,6) // #pragma GCC optimize ("-fno-ipa-cp-clone") #endif Fluidsynth Done 26 July 2013. FluidSynth is used by the fluid opcodes to provide an all-in-one sampled synthesis solution for Csound. Install FluidSynth source code from  HYPERLINK "http://sourceforge.net/projects/fluidsynth/"http://sourceforge.net/projects/fluidsynth/ in /usr/local/src. Csound does not require any of FluidSynth's internal audio or soundfile drivers. Configure with cmake-gui . &. Change DEFAULT_SOUNDFONT to C: HYPERLINK "//soundfonts//default.sf2"\\soundfonts\\default.sf2. Add -march=nocona to the CFLAGS. Set CMAKE_INSTALL_PREFIX to D:/msys/local. Make with mingw32-make. Install with mingw32-make install. gmm++ Done 26 July 2013. The linear algebra opcodes use gmm++ to implement efficient matrix arithmetic and some matrix decompositions. Download the gmm++ standalone source code from  HYPERLINK "http://download.gna.org/getfem/html/homepage/download.html"http://download.gna.org/getfem/html/homepage/download.html. This is a header file only library. Install the gmm-4.2/include/gmm directory into /usr/local/include. libsndfile Done 26 July 2013. This is required by Csound for reading and writing soundfiles. It is a pre-built library. Install libsndfile from  HYPERLINK "http://www.mega-nerd.com/libsndfile/"http://www.mega-nerd.com/libsndfile/ in /usr/opt. MusicXML Done 26 July 2013. MusicXML is used by the CppSound class in the Csound API to import MusicXML files. Install the MusicXML source code in /usr/local with git clone  HYPERLINK "http://code.google.com/p/libmusicxml"http://code.google.com/p/libmusicxml. Configure with cmake-gui cmake, setting CMAKE_INSTALL_PREFIX to D:/msys/local. Set CMAKE_BUILD_TYPE to RelWithDebInfo. Add -march=nocona to CFLAGS. Make with mingw32-make in the cmake directory. Install with mingw32-make install in the cmake directory. OpenSoundControl Done 28 July 2013. Csound uses the OpenSoundControl protocol in the OSC opcodes for low-latency network communications to and from Csound. Update liblo tag 0.26 from the tarball at  HYPERLINK "http://liblo.sourceforge.net/"http://liblo.sourceforge.net (not SVN!). First, as libtool for shared libraries is useless for MinGW, configure with ./configure  enable-static  disable-shared to generate config.h. Make with mingw32-make. Install with mingw32-make install. In Csound's CmakeCache.txt, set CMAKE_STANDARD_CXX_LIBRARIES to include -lwsock32 -lws2_32. Pure Data Done 28 July 2013. Install Pure Data source code using Git from git://pure-data.git.sourceforge.net/gitroot/pure-data/pure-data into usr/local/src. Steinberg Proprietary SDKs Done 28 July 2013. Steinberg's VST SDK is used by CsoundVST and the vst4cs opcodes, the VSTModuleArchitectureSDK is used for the ScoreGenerator VST plugin that is part of CsoundAC, and the ASIO SDK is used by the PortAudio library that Csound uses for real-time audio input and output. Install the VST SDK 2.4 from  HYPERLINK "http://www.steinberg.net/en/company/3rd_party_developer.htmlI"http://www.steinberg.net/en/company/3rd_party_developer.html in /usr/local/src/Steinberg. Install the ASIO SDK in /usr/local/src/asiosdk2 Please note, these SDKs are proprietary software and you must agree to Steinberg's license terms for use. PortAudio Updated 13 October 2013. Use the precompiled Windows binary from  HYPERLINK "https://github.com/adfernandes/precompiled-portaudio-windows"https://github.com/adfernandes/precompiled-portaudio-windows. Install in /usr/local/include and /usr/local/lib. PortMidi Done 28 July 2013. Csound can use the PortMidi library for MIDI input and output. Install the PortMidi source code using Subversion from  HYPERLINK "http://portmedia.sourceforge.net/"http://portmedia.sourceforge.net. Configure with cmake-gui. Make with make. Run the test programs to ensure that the build works. PortSMF Done 28 July 2013. PortSMF is used by CsoundAC for importing and exporting standard MIDI files (format 1). The PortSMF source code has been incorporated into the Csound 6 Git repository. From time to time, replace the Csound 6 sources with current PortSMF sources from  HYPERLINK "http://portmedia.sourceforge.net/"http://portmedia.sourceforge.net/. Synthesis Toolkit in C++ (STK) Done 28 July 2013. Install the STK source code from  HYPERLINK "https://ccrma.stanford.edu/software/stk/"https://ccrma.stanford.edu/software/stk/ in /usr/local/src. Make sure you do not define a RAWWAVE_PATH environment variable in your build environment. Configure with ./configure. Edit Stk.h, and make sure to #include <cstring> before any other #include. Make with make (not mingw32-make). Windows SDK The Windows SDK for Windows 8 contains header files and libraries that used to belong to the DirectX SDK, and that are used by some third-party dependencies of Csound, such as PortAudio, which we have to build. Install the Windows SDK from  HYPERLINK "http://msdn.microsoft.com/en-us/windows/desktop/hh852363.aspx"http://msdn.microsoft.com/en-us/windows/desktop/hh852363.aspx. Currently, this does not include Visual Studio, but that is OK. Qt SDK Done 25 July 2013. CsoundQt uses the Qt SDK from  HYPERLINK "http://qt-project.org/"http://qt-project.org/. Currently, the executable packages available for Qt are not binary compatible with the toolchain described here, so it is necessary to build the Qt libraries from source. Obtain the Qt libraries source code from  HYPERLINK "http://qt-project.org/downloads"http://qt-project.org/downloads. Unpack the zip file. Open a plain Windows console with MinGW in the PATH. Change to the SDK source code directory and configure Qt with: D:\qt-everywhere-opensource-src-5.1.0>configure.bat -release -force-debug-info -skip qtjsbackend -opensource -confirm-license -nomake demos -nomake examples -nomake tests -no-angle -opengl desktop -nomake webkit -nomake webkit-examples Compile Qt with: make CXXFLAGS="-g -O2 -mstackrealign -march=nocona -fopenmp -DNDEBUG" Building Csound 6 Create and/or update a shell script to set up all environment variables and paths for building Csound and for running Csound from and in the build environment. This is an example of such a script (6env): #!/bin/sh echo "Configure for development..." export PATH=${PATH}:/c/Program_Files_x86/SciTE export PATH=${PATH}:/c/Program_Files_x86/Git/bin export PATH=${PATH}:/c/mingw32-4.7.2/msys/1.0/local/bin export PATH=${PATH}:/c/Program_Files_x86/swigwin-2.0.10 export PATH=${PATH}:/c/Python27 echo "Configure for Android/ARM, armeabi-v7a (ARMv7 VFP), Android 2.3.3+///" export SDK=/d/Android/adt-bundle-windows-x86-20130514/sdk export NDK=/d/Android/android-ndk-r8e export ANDROID_NDK_ROOT=$NDK export CSOUND_HOME=/c/Users/new/csound-csound6-git export NDK_MODULE_PATH=${CSOUND_HOME}/android/pluginlibs export PATH=${PATH}:$NDK_MODULE_PATH export NDKABI=9 export NDKVER=$NDK/toolchains/arm-linux-androideabi-4.7 export NDKP=$NDKVER/prebuilt/windows/bin/arm-linux-androideabi- export NDKF="--sysroot $NDK/platforms/android-$NDKABI/arch-arm" export NDKARCH="-march=armv7-a -mfloat-abi=softfp -Wl,--fix-cortex-a8" echo "Configure shared libraries and programs needed to run Csound..." export PATH=${PATH}:/c/mingw32-4.7.2/msys/1.0/opt/Mega-Nerd/libsndfile/bin export PATH=${PATH}:/c/mingw32-4.7.2/msys/1.0/local/src/portaudio export PATH=${PATH}:/c/mingw32-4.7.2/msys/1.0/local/src/portmidi export PATH=${PATH}:/c/mingw32-4.7.2/msys/1.0/local/src/fluidsynth/src/.libs export PATH=${PATH}:/c/mingw32-4.7.2/msys/1.0/local/src/libmusicxml-3.00-src/cmake export PATH=${PATH}:/c/mingw32-4.7.2/msys/1.0/local/src/luajit-2.0/src export PATH=${PATH}:/c/Program_Files/Modartt/Pianoteq\ 4 export PATH=${PATH}:/c/Program_Files/BWF_MetaEdit_CLI_Windows_x64 export PATH=${PATH}:/c/Program_Files_x86/sox-14-4-1 export PATH=${PATH}:/c/Program_Files_x86/Audacity export PATH=${PATH}:/c/Program_Files_x86/Lame\ For\ Audacity export PATH=/c/Users/new/csound-csound6-git:${PATH} echo "Configure environment variables needed to run Csound..." export OPCODE6DIR64=/c/Users/new/csound-csound6-git export RAWWAVE_PATH=/c/mingw32-4.7.2/msys/1.0/local/src/stk-4.4.4/rawwaves export PYTHONPATH=/c/Users/new/csound-csound6-git echo "Configure environment variables needed to run LuaJIT with ufo libraries..." export LUA_PATH="./?.lua;../?.lua;D:/ufo/?.lua;D:/ufo/ffi/?.lua;D:/ufo/bin/Windows/x86/?.lua;" export LUA_CPATH="D:/ufo/?;D:/ufo/bin/?;" export PATH=${PATH}:/d/ufo/bin echo In the Msys shell, change to the Csound root directory and execute source 6env to actually create your Csound environment. Update the Csound source code by executing git pull. Execute cmake-gui . & to configure your Cmake build system for your environment. When using CMake, generate MSys makefiles, not MinGW makefiles. Pay attention to CMake's error messages. It may be that a variable for an include path or library is missing from the initial state of the cache. Go ahead and add the variable called for by the error message. Configure for double-precision samples. Change to examples/java and execute make to build the Java example jars. Build the examples for the manual using a command line such as python csd2docbook.py -a. Build the manual itself using a command line such as mingw32-make html-dist XSL_BASE_PATH=/usr/local/opt/docbook-xsl-1.76.1. Build the API reference by executing doxygen Doxyfile and doxygen Doxyfile-CsoundAC. Do not strip debugging information out of the binaries, this might conceivably come in useful for remote debugging and is a relatively small part of the package. Building CsoundQt In the Csound build environment, obtain the CsoundQt source from SourceForge at  HYPERLINK "http://sourceforge.net/projects/qutecsound"http://sourceforge.net/projects/qutecsound using git: git clone git://git.code.sf.net/p/qutecsound/code qutecsound-code In the CsoundQt source directory create a config.user.pri file containing paths to third party packages customized for your Csound build environment, such as: CSOUND_INTERFACES_INCLUDE_DIR = C:\\Users\\new\\csound-csound6-git\\interfaces DEFAULT_CSOUND_API_INCLUDE_DIRS = C:\\Users\\new\\csound-csound6-git\\include C:\\Users\\new\\csound-csound6-git\\interfaces DEFAULT_CSOUND_LIBRARY_DIRS = "C:\\Users\new\\csound-csound6-git" DEFAULT_LIBSNDFILE_INCLUDE_DIRS = "C:\\mingw32-4.7.2\\msys\\1.0\\opt\\Mega-Nerd\\libsndfile\\include" DEFAULT_LIBSNDFILE_LIBRARY_DIRS = "C:\\mingw32-4.7.2\\msys\\1.0\\opt\\Mega-Nerd\\libsndfile\\bin" build32: DEFAULT_CSOUND_LIBS = csound32.dll build64: DEFAULT_CSOUND_LIBS = csound64.dll LIBSNDFILE_LIB = libsndfile-1.dll DEFAULT_PYTHON_INCLUDE_DIRS = "C:\\Python27\\include" DEFAULT_PYTHONQT_SRC_DIRS = "$$(PROGRAMFILES)\\PythonQt" To configure and create the makefile, execute: qmake qcs.pro To build CsoundQt, execute: make CXXFLAGS="-DUSE_QT5 -DCSOUND6 -DUSE_DOUBLE -march=nocona -g -O2 -fopenmp -mstackrealign" Building the Installer Build the installer using Inno Setup Compiler NSIS from  HYPERLINK "http://www.jrsoftware.org/isinfo.php"http:// HYPERLINK "http://www.jrsoftware.org/isinfo.php"www.jrsoftware.org/isinfo.php HYPERLINK "http://nsis.sourceforge.net/Main_Page"nsis.sourceforge.net/Main_Page with the NONFREE (VST) stuff. The deployment of CsoundQt takes special care. The Qt libraries load some DLLs through dynamic linking and other DLLs as plugin modules. There are no helpful error messages or logs. Either the Qt plugins load, or they don't and the application crashes. It seems the only way to get it straight is: Use the Dependency Walker utility to identify the dynamically linked Qt DLLs and put them into the Csound bin directory. Use the Process Explorer utility to identify the Qt plugins that CsoundQt loads when it is running. These go into specific subdirectories of the Csound bin directory as follows. Having too many Qt libraries apparently is as bad as not having the required ones. Currently the list of Qt libraries is: mkg@sorabji /c/Program_Files_x86/csound6/bin $ ls -ll Qt*.dll platforms plugins/* -rwxr-xr-x 1 mkg Administrators 9527492 Jul 25 23:22 Qt5Core.dll -rwxr-xr-x 1 mkg Administrators 9678079 Jul 25 23:26 Qt5Gui.dll -rwxr-xr-x 1 mkg Administrators 783361 Jul 25 23:32 Qt5PrintSupport.dll -rwxr-xr-x 1 mkg Administrators 12456443 Jul 25 23:31 Qt5Widgets.dll -rwxr-xr-x 1 mkg Administrators 611324 Jul 25 23:23 Qt5Xml.dll platforms: total 2354 -rwxr-xr-x 1 mkg Administrators 2409481 Aug 2 19:27 qwindows.dll plugins/accessible: total 605 -rwxr-xr-x 1 mkg Administrators 618749 Aug 2 19:27 qtaccessiblewidgets.dll plugins/imageformats: total 2450 -rwxr-xr-x 1 mkg Administrators 131180 Aug 2 19:27 qgif.dll -rwxr-xr-x 1 mkg Administrators 135293 Aug 2 19:27 qico.dll -rwxr-xr-x 1 mkg Administrators 409066 Aug 2 19:27 qjpeg.dll -rwxr-xr-x 1 mkg Administrators 628497 Aug 2 19:27 qmng.dll -rwxr-xr-x 1 mkg Administrators 132618 Aug 2 19:27 qsvg.dll -rwxr-xr-x 1 mkg Administrators 197247 Aug 2 19:27 qsvgicon.dll -rwxr-xr-x 1 mkg Administrators 128440 Aug 2 19:27 qtga.dll -rwxr-xr-x 1 mkg Administrators 618469 Aug 2 19:27 qtiff.dll -rwxr-xr-x 1 mkg Administrators 123177 Aug 2 19:27 qwbmp.dll plugins/printsupport: total 102 -rwxr-xr-x 1 mkg Administrators 103642 Jul 25 23:34 windowsprintersupport.dll Build the installer again, this time without the NONFREE stuff. Perform functional tests below. Update this document to reflect any changes in procedure or dependencies. Label Csound in Git for the Windows release. Upload the free software installer to SourceForge and update the release package. Upload the NONFREE installer to  HYPERLINK "http://www.michael-gogins.com/"http://www.michael-gogins.com/.  &FJLjlx     ( * B D J L \ ^ j License: UNKNOWN FIXME @@ -3006,8 +3052,29 @@ FIXME Files: Opcodes/py/index.html -Copyright: © 2002, by Maurizio Umberto Puxeddu. All rights - 2004, Michael Gogins

+Copyright: © 2004, by Michael Gogins

+ 2002, Maurizio Umberto Puxeddu. All rights +License: UNKNOWN + FIXME + +Files: po/french.po +Copyright: (param1)" + (utilisation de type virgule flottante incompatible)" + : tat %d.\n" + alors que le fichier %s n'en a que %d" + appel" + appele\n" + compil proprement.\n" + correctement en mode MIDI, ne pas " + de csoundPerform().\n" + enlev.\n" + non trouv" + par une chaîne vide" + soit il ne contient pas de " + supprims\n" + tronqu à la dernière trame" + à %d avec %d canaux audio\n" + à une source sans boucle" License: UNKNOWN FIXME @@ -3031,7 +3098,6 @@ Copyright: @G>{?ǘ>e?ID>>f>m>ՙ3>\j?y8e>X#@#i>Y?>k?>K5=ۗ>1>,ZWp>-q>%r>5Em>@ڌ>q}?Za>e{?>P=ل>hI9>ܺ=0U)=B-=A@R=.F@F<?$aYw?<&>cFq?AEE3?2Aa|?nY"@?Y?F>L>?Q_>?=-?@(??K#?0=s>?5w?.>#,>7B@d?}@&?0???.?>t?V? >h?#A?6/?翍>??R+ɱ0?o9@U`4?&@'?h?e#?#?w?w=?ү9> j?ܺtQ>d 0T> 8@p>>C@.> ?ɲ>'%Z??/t#=?G? ҿG?f3">@@>d@>?v>yC?1 >Y>?>9J>u5`-}>f࿬H>)>C>i@|>r? >*?n>>舾<=g =߶X4=˿<25w<JB*i*?Qc:=>MKE?D2 ?u>?$@?(?> @,?U?Pt?p7C?|?ʦ>_ ?_&>~,>Ϻ?~?rE@t#?"E >r<@bD>D?K>c?2>(=%= >@Q>6y?V>:(>|>\;9>@k><?>T>6>T>wпA>Y*}>&@A>J?\>W ?ʔ>qm>Ζ¿I)>m r=80@n=S?zf - >zEKgW>dO@;>M?Q>ӗ?F>O"?e>_>d7>[ License: UNKNOWN FIXME @@ -3046,13 +3112,6 @@ License: UNKNOWN FIXME -Files: tests/soak/fox_nopoles.lpc -Copyright: 2ſ쒢?Q4м-f(?Rzѿ[Y - ICպ?jwY{M?ޤ W? - ІAĿm'n?Iiʰ?ɲT ⿉P C5z3Ή-?޺H/?[Fo?K*΀SM.4z2ѿR? 31@$39{W^@L @?˞F?4F@\BӲ̿,?R˿q8?@^,ǿ?L?z?Iu߿|KY?7rȿMo4?6?e1>Ы@:>&?I=|=#<Y=d?2=7C> =p? =+\mӦt3c0:OS¯YoJ|z4э+*au? e4D阳6Lw +License: UNKNOWN + FIXME + +Files: tests/soak/fox_poles.lpc +Copyright: ^r@P? ^rؿNho?X9>N? ?N,g'? ?N,g'߿1>?L + ?곭0Ῐ ?곭0?y!&?Dw@y!&?DwZ〝?du??Z〝?du?܈d?//܈d?//?''M°?Šq@"PU@eK?fW^@ 8d?Y? 8d?YͿijR?a`𿳱ijR?a`?"ލ?lA"ލ?lA?"H5?=i"H5?=i@x?0h=2x?0h=2@M:?NM:?N?Yu?~u`Yu?~u`?ύ+5_?Hύ+5_?H@_>?_17ֿ_>?_17? + z8?_L>? z8׿DGV?D DGV?D @޴?SA3?޴?SA3K?m.sK?m.s?%+X?u3B@%+X?u3B?*x|⿓?*x|?Ný,?x%?Ný,?x%T?ٮ@T?ٮ}?ǫ + ?8?~_9 ?8bM?TbM?T?Nq?Ͻd\?,9?Ͻd\?,9}%(.?N!}%(.?N!@fm + ?ggM?{ CK@׊>@p{lC5,?VΛ`@y6[?xQAݡy6[?xQAݡ?cd;?GW+Bcd;?GW+B?P# $?@P# $?@?Jէ?:|@Jէ?:|K-??xOK-??xO@-O?&9"-O?&9"??c??c޿>kl?g^a@>kl?g^aΑ? +License: UNKNOWN + FIXME + Files: tests/soak/beats.mp3 Copyright: b#rX& *@P(@n'' ?'%E~? 96Odw@АsO@$ńf11eW7k License: UNKNOWN @@ -3104,17 +3182,6 @@ License: UNKNOWN FIXME -Files: po/french.po -Copyright: enlev.\n" - positionne à %f secondes\n" - sur Bison" - trouv dans la liste des fichiers " - un nombre d'chantillons de %d, au lieu " - à : %s pour criture" - à zro" -License: UNKNOWN - FIXME - Files: todo.txt Copyright: infringement and to License: UNKNOWN @@ -3126,8 +3193,7 @@ FIXME Files: ChangeLog -Copyright: tag in output soundfile (no spaces) - terms +Copyright: terms License: UNKNOWN FIXME @@ -3136,24 +3202,43 @@ License: UNKNOWN FIXME +Files: Engine/csound_prs.lex +Copyright: || (pos && (c == '_' || isdigit))); +License: UNKNOWN + FIXME + +Files: samples/sf_GMbank.sf2 +Copyright:  +2,e(-$E6` r⧪ep.d:>69-,0.(N64^y2̵L1:2_*J49Z"Q%/%!qܶ*j5e/&u8KB)2E-X:z'oQi&%%!I7Cc-9g(5u) !l/QR  #;FL(<)215+M+(.Kȣ~hZ,A8t+)/ ,#*T5-j%tU鑠 U2;103(k%^49)Děؠ:r$19,s-7?1d#mI[,@:(" +License: UNKNOWN + FIXME + Files: design.jpg -Copyright: ?ܢnWO)$If1c~4SQ:I~˿ɫ .o_ŜbY,_kVze[GX+X#b;!0qk[N{ٳ3)tle?|TY7iYs{)21qH,q.Fͯ,efN3n1c,LF8LAᅽ/dO_uH*^Et ?q Qǟ>Y!RN +Copyright: vUj߇kRy,q̍O2z5ػvkFJYr?튡NUG޶hUhFk޺١[N%#)/8 >2tt5,k^XddquKMԖ)~d8jl/ License: UNKNOWN FIXME -Files: tests/soak/fox_poles.lpc -Copyright: z8?_L>? z8׿DGV?D DGV?D @޴?SA3?޴?SA3K?m.sK?m.s?%+X?u3B@%+X?u3B?*x|⿓?*x|?Ný,?x%?Ný,?x%T?ٮ@T?ٮ}?ǫ - nN?D? nN?D< +Files: doc/csound_system_documentation/images/overview.png +Copyright: ~k~q!okG n؞1mA 8c.g)~B?^M*U3e8m;/!.ȓ*%ź'%I"8 9d.C"$@"0GPUp^Eq^1N:k>uE_L$>Zi` 憭U^֜Y%JcLC4gIC-[z`1h_9([~xP:,xgIʏt.MX7Rra License: UNKNOWN FIXME -Files: tests/soak/test1.png -Copyright: jNacHQq/S\mnĬBSgwjB?x GZ\ +Files: tests/soak/hrtf-44100-left.dat +Copyright: ?:̽?VՆ[#>V:@F>o?R>n2^>"v#>0@>c>KL?q> License: UNKNOWN FIXME -Files: tests/soak/kickroll.pvx -Copyright: 4E;87E;q9E㽲:;E:?EM/F;BEf;0DEU`k;ELGE;IE;)pLEDY;%OEh/;QE,;TE:9WE_;RZE>Z;A +Files: tests/soak/fox.pvx +Copyright: E;VE:@b:EA:uEh:REd:E:uEE:Eu:sEj:E9&Eg_9Ek1:LcE^9$ED9EC[:/ZE +License: UNKNOWN + FIXME + +Files: doc/csound_system_documentation/images/compiler.png +Copyright: 6ur6mUω}}}A7iwo_|iBf2u_M6GD?ROkno}}>jnN/,ŀ8+9_dybTڎ-4Oa` m7Cze{Aa;᝕bToD-_ +License: UNKNOWN + FIXME + +Files: tests/soak/test1.png +Copyright: jNacHQq/S\mnĬBSgwjB?x GZ\ License: UNKNOWN FIXME diff -Nru csound-6.01~dfsg/debian/patches/0000-fix-openmp-option.diff csound-6.02~dfsg/debian/patches/0000-fix-openmp-option.diff --- csound-6.01~dfsg/debian/patches/0000-fix-openmp-option.diff 2013-11-19 03:02:48.000000000 +0000 +++ csound-6.02~dfsg/debian/patches/0000-fix-openmp-option.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -diff --git a/Opcodes/CMakeLists.txt b/Opcodes/CMakeLists.txt -index 7b07ee2..216c37a 100644 ---- a/Opcodes/CMakeLists.txt -+++ b/Opcodes/CMakeLists.txt -@@ -96,7 +96,7 @@ if(BUILD_DSSI_OPCODES) - make_plugin(dssi4cs "${dssi_SRC}" dl) - endif() - --check_deps(BUILD_FLUID_OPCODES FLUIDSYNTH_H FLUIDSYNTH_LIBRARY USE_OPENMP) -+check_deps(BUILD_FLUID_OPCODES FLUIDSYNTH_H FLUIDSYNTH_LIBRARY USE_OPEN_MP) - if(BUILD_FLUID_OPCODES) - if(EXISTS ${FLUIDSYNTH_INCLUDE_DIR}) - include_directories("${FLUIDSYNTH_INCLUDE_DIR}") diff -Nru csound-6.01~dfsg/debian/patches/0001-removed-linking-to-JNI-Libraries-on-Linux-as-they-ar.patch csound-6.02~dfsg/debian/patches/0001-removed-linking-to-JNI-Libraries-on-Linux-as-they-ar.patch --- csound-6.01~dfsg/debian/patches/0001-removed-linking-to-JNI-Libraries-on-Linux-as-they-ar.patch 2013-11-19 03:02:48.000000000 +0000 +++ csound-6.02~dfsg/debian/patches/0001-removed-linking-to-JNI-Libraries-on-Linux-as-they-ar.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -From 914263532ef61c46854fe6ba4ba56730aa39a500 Mon Sep 17 00:00:00 2001 -From: Steven Yi -Date: Sun, 20 Oct 2013 15:23:54 -0400 -Subject: [PATCH] removed linking to JNI Libraries on Linux as they are not - necessary and caused problems; need to review if we can remove on all - platforms - ---- - interfaces/CMakeLists.txt | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/interfaces/CMakeLists.txt b/interfaces/CMakeLists.txt -index 1883832..029a193 100644 ---- a/interfaces/CMakeLists.txt -+++ b/interfaces/CMakeLists.txt -@@ -113,7 +113,12 @@ if(BUILD_PYTHON_INTERFACE OR BUILD_JAVA_INTERFACE OR BUILD_LUA_INTERFACE) - # The java package needs this unset or it will litter us with .java files - unset(CMAKE_SWIG_OUTDIR) - INCLUDE_DIRECTORIES(${JNI_INCLUDE_DIRS}) -- set(swigjava_LIBS ${JNI_LIBRARIES} ${CSOUNDLIB} ${LIBSNDFILE_LIBRARY} libcsnd6) -+ -+ if(LINUX) -+ set(swigjava_LIBS ${CSOUNDLIB} ${LIBSNDFILE_LIBRARY} libcsnd6) -+ else() -+ set(swigjava_LIBS ${JNI_LIBRARIES} ${CSOUNDLIB} ${LIBSNDFILE_LIBRARY} libcsnd6) -+ endif() - - list(APPEND javaSwigOptions -package csnd6 -includeall) - SET_SOURCE_FILES_PROPERTIES(java_interface.i PROPERTIES CPLUSPLUS ON) --- -1.8.4.rc3 - diff -Nru csound-6.01~dfsg/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff csound-6.02~dfsg/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff --- csound-6.01~dfsg/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff 2013-11-19 03:02:48.000000000 +0000 +++ csound-6.02~dfsg/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff 2014-01-22 13:09:12.000000000 +0000 @@ -6,7 +6,7 @@ Author: Felipe Sateler --- a/Opcodes/CMakeLists.txt +++ b/Opcodes/CMakeLists.txt -@@ -69,10 +69,6 @@ +@@ -70,10 +70,6 @@ if(BUILD_PLATEREV_OPCODES) make_plugin(platerev platerev.c m) endif() diff -Nru csound-6.01~dfsg/debian/patches/2001-lua-link.diff csound-6.02~dfsg/debian/patches/2001-lua-link.diff --- csound-6.01~dfsg/debian/patches/2001-lua-link.diff 2013-11-19 03:02:48.000000000 +0000 +++ csound-6.02~dfsg/debian/patches/2001-lua-link.diff 2014-01-22 13:09:12.000000000 +0000 @@ -8,7 +8,7 @@ Author: Felipe Sateler --- a/frontends/CsoundAC/CMakeLists.txt +++ b/frontends/CsoundAC/CMakeLists.txt -@@ -150,10 +150,10 @@ +@@ -145,10 +145,10 @@ if(BUILD_CSOUND_AC) PROPERTIES CPLUSPLUS ON SWIG_MODULE_NAME luaCsoundAC) SWIG_ADD_MODULE(luaCsoundAC lua luaCsoundAC.i) @@ -23,7 +23,7 @@ --- a/interfaces/CMakeLists.txt +++ b/interfaces/CMakeLists.txt -@@ -152,7 +152,7 @@ +@@ -157,7 +157,7 @@ if(BUILD_PYTHON_INTERFACE OR BUILD_JAVA_ endif() if(BUILD_LUA_INTERFACE) diff -Nru csound-6.01~dfsg/debian/patches/2004-fix-gettext.diff csound-6.02~dfsg/debian/patches/2004-fix-gettext.diff --- csound-6.01~dfsg/debian/patches/2004-fix-gettext.diff 2013-11-19 03:02:48.000000000 +0000 +++ csound-6.02~dfsg/debian/patches/2004-fix-gettext.diff 2014-01-22 13:09:12.000000000 +0000 @@ -2,7 +2,7 @@ Author: Felipe Sateler --- a/Top/getstring.c +++ b/Top/getstring.c -@@ -77,10 +77,7 @@ +@@ -77,10 +77,7 @@ void init_getstring(void *cs) /* setlocale (LC_MESSAGES, s); /\* Set to particular value *\/ */ /* textdomain("csound6"); */ /* This is not needed when using dgettext */ /* bind_textdomain_codeset("csound6", "UTF-8"); */ diff -Nru csound-6.01~dfsg/debian/patches/series csound-6.02~dfsg/debian/patches/series --- csound-6.01~dfsg/debian/patches/series 2013-11-19 03:02:48.000000000 +0000 +++ csound-6.02~dfsg/debian/patches/series 2014-01-22 13:09:12.000000000 +0000 @@ -1,5 +1,3 @@ -0000-fix-openmp-option.diff -0001-removed-linking-to-JNI-Libraries-on-Linux-as-they-ar.patch 2000-avoid-nonfree-scansyn-plugin.diff 2001-lua-link.diff 2004-fix-gettext.diff diff -Nru csound-6.01~dfsg/debian/rules csound-6.02~dfsg/debian/rules --- csound-6.01~dfsg/debian/rules 2013-11-19 03:02:48.000000000 +0000 +++ csound-6.02~dfsg/debian/rules 2014-01-22 13:09:12.000000000 +0000 @@ -34,7 +34,7 @@ DEB_UPSTREAM_PACKAGE = Csound DEB_UPSTREAM_TARBALL_BASENAME_MANGLE = s/(\-|~rc[0-9])//g -DEB_UPSTREAM_TARBALL_MD5 = 8d24dbd41eff829147accb5ffbd08b40 +DEB_UPSTREAM_TARBALL_MD5 = c99a890eb771a7626768ad7cec579958 # Non-DFSG license: limited to educational and research purposes DEB_UPSTREAM_REPACKAGE_EXCLUDES = ./Opcodes/scansyn* @@ -108,6 +108,9 @@ -DBUILD_PD_CLASS=ON \ -DBUILD_WIIMOTE_OPCODES=OFF \ -DBUILD_P5GLOVE_OPCODES=OFF \ + -DUSE_CURL=OFF \ + -DBUILD_VST4CS_OPCODES=OFF \ + -DBUILD_FAUST_OPCODES=OFF \ # Language Wrappers @@ -173,7 +176,7 @@ rm -f build-arch-stamp build-indep-stamp manpages-stamp \ build-doxygen-stamp rm -f Custom.cmake - rm -rf doc/ + rm -rf doc/csound # fail-missing stuff rm -f debian/cdbs-install-diff rm -f debian/cdbs-reduced-install-list diff -Nru csound-6.01~dfsg/doc/.gitignore csound-6.02~dfsg/doc/.gitignore --- csound-6.01~dfsg/doc/.gitignore 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/doc/.gitignore 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,4 @@ +*.log +*.out +*.aux +*.pdf diff -Nru csound-6.01~dfsg/doc/csound_system_documentation/csound_system_documentation.tex csound-6.02~dfsg/doc/csound_system_documentation/csound_system_documentation.tex --- csound-6.01~dfsg/doc/csound_system_documentation/csound_system_documentation.tex 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/doc/csound_system_documentation/csound_system_documentation.tex 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,306 @@ +\documentclass[]{book} + +%\usepackage{url} +\usepackage{hyperref} +\usepackage[pdftex]{graphicx} +\usepackage[tikz]{bclogo} +\sloppy +\newenvironment{contentsmall}{\small} + +\title{Csound System Documentation} +\author{Steven Yi} + +\begin{document} +\maketitle + +%=========================== +\chapter{Introduction} + +... + +\section{Orientation} + +\subsection{CMake Build System} + +For Csound 6, we use the \href{http://www.cmake.org}{CMake} build +system. CMake is a meta-build system in that builds project files that +are then used with other build systems. This can produce files for +command-line build systems such as Make or +\href{http://martine.github.io/ninja/}{Ninja}, as well as build projects +for IDE's such as XCode, Eclipse, or KDevelop. + +CMake organizes the build files into ones called CMakeLists.txt. Csound +has a top-level CMakeLists.txt that defines some useful functions, as +well as defines the build for libcsound. From there, other +CMakeLists.txt files are included into the top-level one that has build +information for other artifacts, such as command-line executables, +plugin libraries, and GUI applications. + +\subsection{Dependencies} + +\paragraph{Targets: libcsound, Executables, Plugin Libraries, and other +Libraries} + +\subsection{Source Tree Walkthrough} + +\begin{description} + +\item[cs6] root of Csound 6 + +\item[cs6/include] public headers that will get distributed and used by host-applications +and plugin libraries + +\item[cs6/H] private headers that are only used within libcsound itself + +\item[cs6/Top] Contains source files for the parts that wrap the engine, including +argument parsing, module loading, CSD reading, CScore, and others + +\item[cs6/Engine] Contains source files for the audio engine and compiler of Csound + +\item[cs6/InOut] Contains source files for plugin libraries dealing with input and +output, particularly audio, midi, and graphs + +\item[cs6/OOps] Contains source files for opcodes. Originally named for ``Original +Opcodes'', now contains mostly opcodes built-in to libcsound + +\item[cs6/Opcodes] Contains source files for opcodes. Those that do not have external +library dependencies have been folded back into libcsound. Those with +external dependencies are built as separate opcode plugins. + +\item[cs6/interfaces] Contains the source files for building the various interface wrapper +libraries (i.e.~Java, Python), as well as the C++ interface library. + +\item[cs6/frontends] Contains the source files for building various frontends (i.e.~CsoundAC, +csoundapi\textasciitilde{}, beats). + +\item[cs6/util] Contains the source files for the main csound-related utilities +(i.e.~pvanal, lpanal, dnoise, etc.). The files here are used to build +individual commandline programs, as well as altogether for the stdutil +plugin library. + +\item[cs6/util1] Contains the source files for building various frontends (i.e.~CsoundAC, +csoundapi\textasciitilde{}, beats). + +\item[cs6/installer] Contains the source code and build scripts for creating various +platform-specific installers. + +\item[cs6/android] Contains example projects and build scripts for building Csound for +Android. + +\item[cs6/iOS] Contains example projects and build scripts for building Csound for iOS. + +\end{description} + + +%=========================== +\chapter{High-Level Architecture} + +\begin{figure}[htbp] +\centerline{\framebox{ + \includegraphics[width=0.8\textwidth]{images/overview.png}}} +\caption{Csound System Architecture Overview} +\label{overview} +\end{figure} + +The architecture of Csound follows in the tradition of Music-N. In general, Csound ORC code is used to define \emph{Instruments}, which are then instantiated at run-time by Csound SCO events, MIDI events, Remote events, or API calls. Instruments in turn are made up of a series of \emph{Opcodes}, which are the Unit-Generators of Music-N heritage. + +In further detail, Csound Orchestra code is used to define instrument templates. The ORC code, as text, goes through the Csound Orchestra Compiler, and at the end is compiled into INSTRTXT instances that are held in a linked-list. The information held in INSTRTXT instances include information relevant for runtime instantiation, initiation, and performance of an instrument. This information includes what opcodes are used and in what order for both initialization and performance time, what variables are required (including the names of the variables as well as their types), as well as how the memory for variables and opcodes are all hooked up to teach other. + +For traditional Music-N systems that were not capable of accepting realtime events, a score was used as the single source of events that would trigger changes to the state of the system, such as initializing new instances of instruments or creating new function tables. In Csound, this system is still in place with the processing of SCO code at compile-time, but it also augmented with the processing of events at runtime. Before run-time, if a Csound SCO block is passed to the Score compiler, it will be processed, sorted, time-warped, and re-written as a well-formatted string. This well-formatted string, read in using the CORFILE mechanism, represented the notes of a note-list composition. + +In addition to the well-formatted SCO, realtime events can also affect the state of the system. In general, the main performance function, kperf(), is used to process pending events (sensevents()), expire current instances (timeexpire(), beatexpire()), as well as run active instances. In sensevents(), events that a processed are new SCO events that have arrived via STDIN pipe, SCO events from the API (csoundReadScore()), MIDI events, as well as Remote events. + +At runtime, kperf() is called once per-audio buffer. The buffer is of ksmps size. Within that kperf() call, sensevents() is called to update the state of Csound and active instruments are performed. In general, an application such as the csound command-line executable or an API host application will repeatedly call kperf(). Csound will continue to run until an end condition is met: end of Score, end of MIDI file (if MIDI file was supplied at commandline), encounter of the 'e' event, or an API application stops Csound. + +%=========================== +\chapter{Prelude to Processing} + +\section{Csound Configuration (Commandline Args/Options)} + +\section{ORC/SCO/CSD Input} + +Text is read through one of two primary paths: + +\begin{itemize} +\itemsep1pt\parskip0pt\parsep0pt +\item + from files +\item + from memory +\end{itemize} + +Both of the paths actually filter through the CORFILE system\ldots{} + +%=========================== +\chapter{Orchestra Compiler} + +\section{Introduction} + +\section{Compiler Phases} + +\begin{figure}[htbp] +\centerline{\framebox{ + \includegraphics[width=0.8\textwidth]{images/compiler.png}}} +\caption{Csound Compiler Phases} +\label{overview} +\end{figure} + +Csound compiler is separated into a number of distinct phases, as illustrated by the figure above. The following subsections will discuss each phase of the compiler. It will include relevant data structures, functions, and files to consult. + +\subsection{CORFIL} + +The CORFIL mechanism is an implementation of an in-memory file system. ... + +\subsection{Pre-Processing} + +% using bclogo, but would be happy to switch to something else too +\begin{bclogo}[couleur=blue!30,arrondi=0.1,ombre=true,logo=\bcetoile] +{Important Files} +Engine/csound\_pre.l (Flex file) +\end{bclogo} + +The Orchestra Pre-Processor is responsible for processing the following things: + +\begin{itemize} + \item \#include - processing to include text from an external file + \item \#define - reading in Orchestra Macro definitions + \item \#undef - un-define a macro + \item \$MACRO - processing Orchestra Macro usages + \item \#ifdef, \#ifndef, \#else, \#end - conditionally include text +\end{itemize} + +The pre-processor is generated using \href{http://flex.sourceforge.net/}{Flex}. It is given text and the expanded processed text is returned (this is done with the text wrapped in a CORFIL). The call to csound\_prelex() is done within new\_orc\_parser.c::csoundParseOrc(), with most of the implementation of the pre-processor utility functions done within csound\_pre.l. + +\subsection{Lexer} + +\begin{bclogo}[couleur=blue!30,arrondi=0.1,ombre=true,logo=\bcetoile] +{Important Files} +Engine/csound\_orc.l (Flex file) +\end{bclogo} + +The lexing phase reads in a stream of characters and breaks them up into +tokens. (Lexers are also known as\emph{scanners} or \emph{tokenizers}.) +Csound uses the \href{http://flex.sourceforge.net/}{Flex} tool to +generate its lexing code. The source for this is found in +Engine/csound\_orc.l. + + +\subsection{Parser} + +\begin{bclogo}[couleur=blue!30,arrondi=0.1,ombre=true,logo=\bcetoile] +{Important Files} +Engine/csound\_orc.y (Bison file) +\end{bclogo} + +The parsing phase uses the tokens generated from the lexing phase and +uses rules defined in a \emph{grammar} to structure the tokens into a +TREE. The parsing code was originally done with hand-written code, but +is now generated using the +\href{http://www.gnu.org/software/bison/}{Bison} parser-generator tool. +The source for this is found in Engine/csound\_orc.y. + + +\subsection{Semantic Analysis} + +\begin{bclogo}[couleur=blue!30,arrondi=0.1,ombre=true,logo=\bcetoile] +{Important Files} +Engine/csound\_orc\_semantics.c +Engine/csound\_type\_system.c +Engine/csound\_standard\_types.c +\end{bclogo} + +\subsubsection{Type System} + +\subsubsection{Lookup} + +\subsubsection{Expressions} + +\subsubsection{Blocks} + +\subsubsection{Compiler} + +\section{Runtime Data Structures} + +Instruments, Opcodes, Instrument Instances, Opcode Instances + +\subsection{Labels, Block Expressions} + +\subsection{Expression Expansion} + +\subsection{Transactional Compilation} + + +%=========================== +\chapter{Score Compiler} + +\subsection{Event Parsing} + +\subsection{Score Sorting} + +\begin{center}\rule{3in}{0.4pt}\end{center} + + +%=========================== +\chapter{Runtime} + +\section{Introduction} + +\section{Instrument Instance Lifecycle} + +\section{Performance} + +\section{Scheduler and senseEvents} + +\subsection{Realtime Events} + +\section{SCO} + +\section{MIDI} + +\section{Channels} + + +%=========================== +\chapter{API and Wrappers} + + + +%=========================== +\chapter{Developer Information} + +\section{Csound Testing} + +The csound6/tests folder contains various forms of tests for Csound. The +tests are generally written to aid development, testing that new code +functions as expected and that they handle errors correctly. The +following describes the various forms of tests. + +\subsection{tests/commandline} + +This folder contains CSD's that get run by a python test +runner(test.py). These are generally used for testing the compiler and +can be considered integration tests. These can be run from the CMake +generated build file, i.e. ``make csdtests''. + +Note: Some tests in the tests/commandline folder are not added to the +test suite. These are generally ones that people have contributed to +illustrate a bug, and were used during debugging. It is useful to have +these around and ideally we will extend the test suite to do runtime +testing as well as compiler testing. + +\subsection{tests/c} + +This folder contains unit tests written in C, using the CUnit library. +Currently there are tests for various parts of the compiler and some API +methods. These tests serve to help ensure we didn't break something +moving forward, and also act as a documentation on how functions are +used. These can be run from the CMake generated tests using ``make +test'' or calling ``ctest''. + +\subsection{tests/python} + +This folder is intended for tests of the Csound API using Python. The +idea is that it would be useful to test from a host language to make +sure our assumptions about the C API still work from a host language. + +\end{document} Binary files /tmp/YoCR1bco_Y/csound-6.01~dfsg/doc/csound_system_documentation/images/compiler.png and /tmp/drTeJpx12F/csound-6.02~dfsg/doc/csound_system_documentation/images/compiler.png differ Binary files /tmp/YoCR1bco_Y/csound-6.01~dfsg/doc/csound_system_documentation/images/overview.png and /tmp/drTeJpx12F/csound-6.02~dfsg/doc/csound_system_documentation/images/overview.png differ diff -Nru csound-6.01~dfsg/examples/CsoundAC.csd csound-6.02~dfsg/examples/CsoundAC.csd --- csound-6.01~dfsg/examples/CsoundAC.csd 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/examples/CsoundAC.csd 2014-01-07 16:54:20.000000000 +0000 @@ -1,6 +1,6 @@ -csound -f -h -+rtmidi=null -M0 -d -n -m7 --midi-key=4 --midi-velocity=5 temp.orc temp.sco +csound -f -h -+rtmidi=null -M0 -d -n -m7 --midi-key=4 --midi-velocity=5 @@ -8,23 +8,23 @@ Copyright (c) 2006-1012 by Michael Gogins. All rights reserved. -This software is licensed under the terms of the +This software is licensed under the terms of the GNU Lesser General Public License, version 3.0. -This file contains instrument definitions that require Windows, some -SoundFonts, and the vst4cs opcodes. This file should also +This file contains instrument definitions that require Windows, some +SoundFonts, and the vst4cs opcodes. This file should also run "as is" in CsoundVST in VST hosts, or to receive MIDI. -Instruments are fungible: they all use the same pfields, have their own -ftables, do not use UDOs, use aoutlets, produce more or less the same output +Instruments are fungible: they all use the same pfields, have their own +ftables, do not use UDOs, use aoutlets, produce more or less the same output amplitudes, and therefore can be cut and pasted with impunity. -These instruments should be regarded as starting points. Many have highly +These instruments should be regarded as starting points. Many have highly tunable parameters. HOW TO USE -Paste this entire file into your piece's code as a string constant. +Paste this entire file into your piece's code as a string constant. Cut and paste the instruments to get them into the order you want. @@ -34,7 +34,7 @@ Modify instruments if desired, or copy them and change them. -In your piece, load the whole orchestra into Csound, +In your piece, load the whole orchestra into Csound, and send Csound notes from your piece. @@ -42,6 +42,11 @@ sr = 48000 ksmps = 20 nchnls = 2 +; + + +#define FLUID #fluid# +;#define VST #vst# iampdbfs init 32768 prints "Default amplitude at 0 dBFS: %9.4f\n", iampdbfs idbafs init dbamp(iampdbfs) @@ -54,9 +59,12 @@ prints "Amplitude at headroom: %9.4f\n", iampheadroom prints "Balance so the overall amps at the end of performance -6 dbfs.\n" +#ifdef VST giPianoteq vstinit "C:\\utah\\opt\\pianoteq-3.5\\Pianoteq.dll", 0 vstinfo giPianoteq +#endif +#ifdef FLUID giFluidsynth fluidEngine 0, 0 giFluidSteinway fluidLoad "Piano Steinway Grand Model C (21,738KB).sf2", giFluidsynth, 1 fluidProgramSelect giFluidsynth, 0, giFluidSteinway, 0, 1 @@ -66,6 +74,7 @@ fluidProgramSelect giFluidsynth, 2, giFluidMarimba, 0, 0 giFluidOrgan fluidLoad "Organ Jeux V1.4 (3,674KB).SF2", giFluidsynth, 1 fluidProgramSelect giFluidsynth, 3, giFluidOrgan, 0, 4 +#endif giFlatQ init sqrt(0.5) giseed init 0.5 @@ -249,9 +258,15 @@ connect "Xing", "outright", "Reverberation", "inright" connect "ZakianFlute", "outleft", "Reverberation", "inleft" connect "ZakianFlute", "outright", "Reverberation", "inright" - + +#ifdef VST alwayson "VstPianoteqAudio", 0, 1.5 +#endif + +#ifdef FLUID alwayson "FluidAudio", 0, 32 +#endif + alwayson "Reverberation" alwayson "Compressor" alwayson "ParametricEq1" @@ -263,7 +278,6 @@ // Original by Hans Mikelson. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -276,10 +290,10 @@ i_pitchclassset = p10 i_homogeneity = p11 ifrequency = cpsmidinn(i_midikey) -iamplitude = ampdb(i_midivelocity) +iamplitude = ampdb(i_midivelocity) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; p1 p2 p3 p4 p5 p6 p7 - ; Start Dur Amp Frqc U V + ; Start Dur Amp Frqc U V ; i 4 32 6 6000 6.00 3 2 ; i 4 36 4 . 5.11 5.6 0.4 ; i 4 + 4 . 6.05 2 8.5 @@ -316,13 +330,12 @@ aoutright = aampenv * aoy outleta "outleft", aoutleft outleta "outright", aoutright - endin + endin instr BandedWG ////////////////////////////////////////////// // By Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -346,13 +359,12 @@ outleta "outleft", aoutleft outleta "outright", aoutright endin - + instr BassModel ////////////////////////////////////////////// // Original by Hans Mikelson. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -387,7 +399,7 @@ afiltr init 0 afeedbk init 0 koutenv linseg 0, .01, 1, p3 - .11 , 1, .1 , 0 ; Output envelope -kfltenv linseg 0, 1.5, 1, 1.5, 0 +kfltenv linseg 0, 1.5, 1, 1.5, 0 ; This envelope loads the string with a triangle wave. kenvstr linseg 0, ipluck / 4, -ip4 / 2, ipluck / 2, ip4 / 2, ipluck / 4, 0, p3 - ipluck, 0 aenvstr = kenvstr @@ -399,7 +411,7 @@ ; Delay line with filtered feedback adline delay ablock + ainput, 1 / ifqc - 15 / sr afiltr tone adline, 400 - ; Resonance of the body + ; Resonance of the body abody1 reson afiltr, 110, 40 abody1 = abody1 / 5000 abody2 reson afiltr, 70, 20 @@ -415,13 +427,12 @@ aoutleft, aoutright pan2 asignal * iamplitude * adeclick, i_pan outleta "outleft", aoutleft outleta "outright", aoutright - endin + endin instr ChebyshevDrone ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; By Michael Gogins. ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -459,7 +470,6 @@ // Original by Jon Nelson. // Adapted by Michael Gogins. /////////////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -522,7 +532,6 @@ ////////////////////////////////////////////////////// // By Michael Gogins. ////////////////////////////////////////////////////// - pset 0, 0, 1000 i_instrument = p1 i_time = p2 i_duration = p3 @@ -547,7 +556,7 @@ ihertzright = cpsmidinn(ikeyin - idetune) iamplitude = ampdb(i_midivelocity) isine ftgenonce 0, 0, 65536, 10, 1 -icosine ftgenonce 0, 0, 65536, 11, 1 +icosine ftgenonce 0, 0, 65536, 11, 1 igenleft = isine igenright = icosine kvibrato oscili 1.0 / 120.0, 7.0, icosine @@ -574,7 +583,6 @@ // Original by John ffitch. // Adapted by Michael Gogins. ////////////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -594,7 +602,7 @@ adeclick linsegr 0.0, iattack, 1.0, isustain, 1.0, irelease, 0.0 ifrequency = cpsmidinn(i_midikey) ; Normalize so iamplitude for p5 of 80 == ampdb(80). -iamplitude = ampdb(i_midivelocity) +iamplitude = ampdb(i_midivelocity) idur = 50 iamp = iamplitude iffitch1 ftgenonce 0, 0, 65536, 10, 1 @@ -631,7 +639,6 @@ // Original by Perry Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -653,7 +660,7 @@ ivibedepth = 0.2 iviberate = 6 isine ftgenonce 0, 0, 65536, 10, 1 -icosine ftgenonce 0, 0, 65536, 11, 1 +icosine ftgenonce 0, 0, 65536, 11, 1 icookblank ftgenonce 0, 0, 65536, 10, 0 ; Blank wavetable for some Cook FM opcodes. ifn1 = isine ifn2 = icosine @@ -676,7 +683,6 @@ ; Original pfields ; p1 p2 p3 p4 p5 p6 p7 p8 p9 ; ins st dur db func at dec freq1 freq2 - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -746,7 +752,6 @@ ////////////////////////////////////////////// // By Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -767,7 +772,6 @@ ////////////////////////////////////////////// // By Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -788,7 +792,6 @@ ////////////////////////////////////////////// // By Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -804,12 +807,11 @@ ichannel = 3 fluidNote giFluidsynth, ichannel, i_midikey, i_midivelocity endin - + instr FluidSteinway ////////////////////////////////////////////// // By Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -825,13 +827,12 @@ ichannel = 0 fluidNote giFluidsynth, ichannel, i_midikey, i_midivelocity endin - + instr Flute ////////////////////////////////////////////////////// // Original by James Kelley. // Adapted by Michael Gogins. ////////////////////////////////////////////////////// - pset 0, 0, 1000 i_instrument = p1 i_time = p2 i_duration = p3 @@ -903,7 +904,6 @@ ////////////////////////////////////////////////////// // By Michael Gogins. ////////////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -943,7 +943,6 @@ ////////////////////////////////////////////////////// // By Michael Gogins. ////////////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -984,7 +983,6 @@ // Original by Thomas Kung. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -1028,7 +1026,7 @@ ao2 oscili a2 * ipch, ipch, icosine ; Final output left isine ftgenonce 2, 0, 65536, 10, 1 - + aoutl oscili 1 * kadsr * a4, ao2 + cpsmidinn(ioct + ishift), isine ; Final output right aoutr oscili 1 * kadsr * a4, ao2 + cpsmidinn(ioct - ishift), isine @@ -1044,7 +1042,6 @@ // Original by Steven Yi. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -1073,7 +1070,7 @@ kenv linseg 0, i_duration * .5, 1, i_duration * .5, 0 kgoto endEnvelope env2: -kenv linseg 0, i_duration - .1, 1, .1, 0 +kenv linseg 0, i_duration - .1, 1, .1, 0 kgoto endEnvelope endEnvelope: kc1 = 5 @@ -1102,7 +1099,6 @@ // Original by Hans Mikelson. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -1167,7 +1163,6 @@ ////////////////////////////////////////////// // By Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -1207,7 +1202,6 @@ ////////////////////////////////////////////////////// // By Michael Gogins. ////////////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -1284,7 +1278,6 @@ // Original by Perry Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 1000 i_instrument = p1 i_time = p2 i_duration = p3 @@ -1340,7 +1333,6 @@ ; i 3 + 4 . 8.05 2 8.5 0.7 ; i 3 . 2 . 8.02 4 5 0.6 ; i 3 . 2 . 8.02 5 0.5 1.2 - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -1355,7 +1347,7 @@ ifrequency = cpsmidinn(i_midikey) iamplitude = ampdb(i_midivelocity) * 4 iHz = ifrequency -ifqc init iHz +ifqc init iHz ip4 init iamplitude ifqci init iHz ia = 0.6 ; p6 @@ -1393,7 +1385,7 @@ ////////////////////////////////////////////// // By Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 1000 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -1438,7 +1430,7 @@ // Original by Thomas Kung. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 1000 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -1495,7 +1487,6 @@ ////////////////////////////////////////////////////// // By Michael Gogins. ////////////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -1550,7 +1541,7 @@ outleta "outleft", aoutleft outleta "outright", aoutright endin - + instr PRCBowed ////////////////////////////////////////////////////// // By Michael Gogins. @@ -1568,12 +1559,12 @@ i_homogeneity = p11 ifrequency = cpsmidinn(i_midikey) iamplitude = ampdb(i_midivelocity) * 6 - ; Controllers: + ; Controllers: ; 1 Vibrato Gain ; 2 Bow Pressure ; 4 Bow Position ; 11 Vibrato Frequency - ; 128 Volume + ; 128 Volume asignal STKBowed ifrequency, 1.0, 1, 1.8, 2, 120.0, 4, 50.0, 11, 20.0 iattack = 0.005 isustain = p3 @@ -1584,13 +1575,12 @@ outleta "outleft", aoutleft outleta "outright", aoutright endin - + instr STKBandedWG ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -1613,14 +1603,13 @@ aoutleft, aoutright pan2 asignal * iamplitude * adeclick, i_pan outleta "outleft", aoutleft outleta "outright", aoutright - endin - + endin + instr STKBeeThree ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -1645,14 +1634,13 @@ aoutleft, aoutright pan2 aphased * iamplitude * adeclick, i_pan outleta "outleft", aoutleft outleta "outright", aoutright - endin + endin instr STKBlowBotl ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -1676,14 +1664,13 @@ aoutleft, aoutright pan2 asignal * iamplitude * adeclick, i_pan outleta "outleft", aoutleft outleta "outright", aoutright - endin + endin instr STKBlowHole ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -1707,14 +1694,13 @@ aoutleft, aoutright pan2 asignal * iamplitude * adeclick, i_pan outleta "outleft", aoutleft outleta "outright", aoutright - endin + endin instr STKBowed ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -1728,12 +1714,12 @@ i_homogeneity = p11 ifrequency = cpsmidinn(i_midikey) iamplitude = ampdb(i_midivelocity) * 8 - ; Controllers: + ; Controllers: ; 1 Vibrato Gain ; 2 Bow Pressure ; 4 Bow Position ; 11 Vibrato Frequency - ; 128 Volume + ; 128 Volume asignal STKBowed ifrequency, 1.0, 1, 0.8, 2, 120.0, 4, 20.0, 11, 20.0 idampingattack = .002 idampingrelease = .01 @@ -1744,14 +1730,13 @@ aoutleft, aoutright pan2 asignal * iamplitude * adeclick, i_pan outleta "outleft", aoutleft outleta "outright", aoutright - endin + endin instr STKClarinet ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -1775,14 +1760,13 @@ aoutleft, aoutright pan2 asignal * iamplitude * adeclick, i_pan outleta "outleft", aoutleft outleta "outright", aoutright - endin + endin instr STKDrummer ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -1806,14 +1790,13 @@ aoutleft, aoutright pan2 asignal * iamplitude * adeclick, i_pan outleta "outleft", aoutleft outleta "outright", aoutright - endin + endin instr STKFlute ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -1843,14 +1826,13 @@ aoutleft, aoutright pan2 asignal * iamplitude * adeclick, i_pan outleta "outleft", aoutleft outleta "outright", aoutright - endin + endin instr STKFMVoices ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -1880,14 +1862,13 @@ aoutleft, aoutright pan2 asignal * iamplitude * adeclick, i_pan outleta "outleft", aoutleft outleta "outright", aoutright - endin + endin instr STKHvyMetl ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -1917,14 +1898,13 @@ aoutleft, aoutright pan2 asignal * iamplitude * adeclick, i_pan outleta "outleft", aoutleft outleta "outright", aoutright - endin + endin instr STKMandolin ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -1948,14 +1928,13 @@ aoutleft, aoutright pan2 asignal * iamplitude * adeclick, i_pan outleta "outleft", aoutleft outleta "outright", aoutright - endin - + endin + instr STKModalBar ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -1996,14 +1975,13 @@ aoutleft, aoutright pan2 asignal * iamplitude * adeclick, i_pan outleta "outleft", aoutleft outleta "outright", aoutright - endin - + endin + instr STKMoog ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -2027,14 +2005,13 @@ aoutleft, aoutright pan2 asignal * iamplitude * adeclick, i_pan outleta "outleft", aoutleft outleta "outright", aoutright - endin - + endin + instr STKPercFlut ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -2058,14 +2035,13 @@ aoutleft, aoutright pan2 asignal * iamplitude * adeclick, i_pan outleta "outleft", aoutleft outleta "outright", aoutright - endin - + endin + instr STKPlucked ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -2089,14 +2065,13 @@ aoutleft, aoutright pan2 asignal * iamplitude * adeclick, i_pan outleta "outleft", aoutleft outleta "outright", aoutright - endin - + endin + instr STKResonate ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -2109,7 +2084,7 @@ i_pitchclassset = p10 i_homogeneity = p11 ifrequency = cpsmidinn(i_midikey) -iamplitude = ampdb(i_midivelocity) +iamplitude = ampdb(i_midivelocity) ;Control Change Numbers: ; * Resonance Frequency (0-Nyquist) = 2 ; * Pole Radii = 4 @@ -2126,14 +2101,13 @@ aoutleft, aoutright pan2 asignal * iamplitude * adeclick, i_pan outleta "outleft", aoutleft outleta "outright", aoutright - endin - + endin + instr STKRhodey ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -2157,14 +2131,13 @@ aoutleft, aoutright pan2 asignal * iamplitude * adeclick, i_pan outleta "outleft", aoutleft outleta "outright", aoutright - endin - + endin + instr STKSaxofony ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -2196,14 +2169,13 @@ aoutleft, aoutright pan2 asignal * iamplitude * adeclick, i_pan outleta "outleft", aoutleft outleta "outright", aoutright - endin + endin instr STKShakers ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -2257,14 +2229,13 @@ aoutleft, aoutright pan2 asignal * iamplitude * adeclick, i_pan outleta "outleft", aoutleft outleta "outright", aoutright - endin + endin instr STKSimple ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -2293,14 +2264,13 @@ aoutleft, aoutright pan2 asignal * iamplitude * adeclick, i_pan outleta "outleft", aoutleft outleta "outright", aoutright - endin + endin instr STKSitar ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -2324,14 +2294,13 @@ aoutleft, aoutright pan2 asignal * iamplitude * adeclick, i_pan outleta "outleft", aoutleft outleta "outright", aoutright - endin + endin instr STKTubeBell ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -2355,14 +2324,13 @@ aoutleft, aoutright pan2 asignal * iamplitude * adeclick, i_pan outleta "outleft", aoutleft outleta "outright", aoutright - endin + endin instr STKVoicForm ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -2386,14 +2354,13 @@ aoutleft, aoutright pan2 asignal * iamplitude * adeclick, i_pan outleta "outleft", aoutleft outleta "outright", aoutright - endin + endin instr STKWhistle ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -2417,14 +2384,13 @@ aoutleft, aoutright pan2 asignal * iamplitude * adeclick, i_pan outleta "outleft", aoutleft outleta "outright", aoutright - endin + endin instr STKWurley ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -2448,7 +2414,7 @@ aoutleft, aoutright pan2 asignal * iamplitude * adeclick, i_pan outleta "outleft", aoutleft outleta "outright", aoutright - endin + endin instr StringPad ////////////////////////////////////////////// @@ -2457,7 +2423,6 @@ ////////////////////////////////////////////// ; String-pad borrowed from the piece "Dorian Gray", ; http://akozar.spymac.net/music/ Modified to fit my needs - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -2499,7 +2464,6 @@ // Original by Hans Mikelson. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 1000 i_instrument = p1 i_time = p2 i_duration = p3 @@ -2559,7 +2523,6 @@ // Original by Perry Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -2596,11 +2559,11 @@ outleta "outright", aoutright endin +#ifdef VST instr VstPianoteq ////////////////////////////////////////////// // By Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -2616,13 +2579,13 @@ ichannel = 0 vstnote giPianoteq, ichannel, i_midikey, i_midivelocity, i_duration endin - +#endif + instr WaveguideGuitar ////////////////////////////////////////////////////// // Original by Jeff Livingston. // Adapted by Michael Gogins. ////////////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -2639,17 +2602,17 @@ iHz = ifrequency ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; The model takes pluck position, and pickup position (in % of string length), and generates - ; a pluck excitation signal, representing the string displacement. The pluck consists - ; of a forward and backward traveling displacement wave, which are recirculated thru two - ; separate delay lines, to simulate the one dimensional string waveguide, with + ; a pluck excitation signal, representing the string displacement. The pluck consists + ; of a forward and backward traveling displacement wave, which are recirculated thru two + ; separate delay lines, to simulate the one dimensional string waveguide, with ; fixed ends. ; ; Losses due to internal friction of the string, and with air, as well as - ; losses due to the mechanical impedance of the string terminations are simulated by + ; losses due to the mechanical impedance of the string terminations are simulated by ; low pass filtering the signal inside the feedback loops. ; Delay line outputs at the bridge termination are summed and fed into an IIR filter ; modeled to simulate the lowest two vibrational modes (resonances) of the guitar body. - ; The theory implies that force due to string displacement, which is equivalent to + ; The theory implies that force due to string displacement, which is equivalent to ; displacement velocity times bridge mechanical impedance, is the input to the guitar ; body resonator model. Here we have modified the transfer fuction representing the bridge ; mech impedance, to become the string displacement to bridge input force transfer function. @@ -2658,15 +2621,15 @@ ; (based on a simplified model, viewing the top plate as a force driven spring). ; ; The effects of pluck hardness, and contact with frets during pluck release, - ; have been modeled by injecting noise into the initial pluck, proportional to initial + ; have been modeled by injecting noise into the initial pluck, proportional to initial ; string displacement. ; ; Note on pluck shape: Starting with a triangular displacment, I found a decent sounding ; initial pluck shape after some trial and error. This pluck shape, which is a linear - ; ramp, with steep fall off, doesn't necessarily agree with the pluck string models I've - ; studied. I found that initial pluck shape significantly affects the realism of the + ; ramp, with steep fall off, doesn't necessarily agree with the pluck string models I've + ; studied. I found that initial pluck shape significantly affects the realism of the ; sound output, but I the treatment of this topic in musical acoustics literature seems - ; rather limited as far as I've encountered. + ; rather limited as far as I've encountered. ; ; Original pfields ; p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 @@ -2684,26 +2647,26 @@ afwav init 0 abkwav init 0 abkdout init 0 -afwdout init 0 +afwdout init 0 iEstr init 1.0 / cpspch(6.04) ifqc init iHz ; cpspch(p5) ; note:delay time=2x length of string (time to traverse it) -idlt init 1.0 / ifqc +idlt init 1.0 / ifqc ipluck = 0.5 * idlt * ip6 * ifqc / cpspch(8.02) ifbfac = ip7 ; feedback factor ; (exponentialy scaled) additive noise to add hi freq content -ibrightness = ip10 * exp(ip6 * log(2)) / 2 -ivibRate = ip11 +ibrightness = ip10 * exp(ip6 * log(2)) / 2 +ivibRate = ip11 ivibDepth pow 2, ip12 / 12 ; vibrato depth, +,- ivibDepth semitones -ivibDepth = idlt - 1.0 / (ivibDepth * ifqc) +ivibDepth = idlt - 1.0 / (ivibDepth * ifqc) ; vibrato start delay (secs) -ivibStDly = ip13 +ivibStDly = ip13 ; termination impedance model ; cutoff freq of LPF due to mech. impedance at the nut (2kHz-10kHz) -if0 = 10000 +if0 = 10000 ; damping parameter of nut impedance -iA0 = ip7 +iA0 = ip7 ialpha = cos(2 * 3.14159265 * if0 * 1 / sr) ; FIR LPF model of nut impedance, H(z)=a0+a1z^-1+a0z^-2 ia0 = 0.3 * iA0 / (2 * (1 - ialpha)) @@ -2724,35 +2687,35 @@ isegB2 = ipluck iplkdelB = (ipluck / 2 > idlt / 2 - ippos ? 0 : idlt / 2 - ippos - ipluck / 2) ; EXCITATION SIGNAL GENERATION - ; the two excitation signals are fed into the fwd delay represent the 1st and 2nd - ; reflections off of the left boundary, and two accelerations fed into the bkwd delay + ; the two excitation signals are fed into the fwd delay represent the 1st and 2nd + ; reflections off of the left boundary, and two accelerations fed into the bkwd delay ; represent the the 1st and 2nd reflections off of the right boundary. - ; Likewise for the backward traveling acceleration waves, only they encouter the + ; Likewise for the backward traveling acceleration waves, only they encouter the ; terminations in the opposite order. ipw = 1 ipamp = ip4 * ipluck ; 4 / ipluck aenvstrf linseg 0, isegF, -ipamp / 2, isegF2, 0 adel1 delayr (idlt > 0) ? idlt : 0.01 ; initial forward traveling wave (pluck to bridge) -aenvstrf1 deltapi iplkdelF - ; first forward traveling reflection (nut to bridge) -aenvstrf2 deltapi iplkdelB + idlt / 2 +aenvstrf1 deltapi iplkdelF + ; first forward traveling reflection (nut to bridge) +aenvstrf2 deltapi iplkdelB + idlt / 2 delayw aenvstrf - ; inject noise for attack time string fret contact, and pre pluck vibrations against pick + ; inject noise for attack time string fret contact, and pre pluck vibrations against pick anoiz rand ibrightness aenvstrf1 = aenvstrf1 + anoiz*aenvstrf1 aenvstrf2 = aenvstrf2 + anoiz*aenvstrf2 ; filter to account for losses along loop path -aenvstrf2 filter2 aenvstrf2, 3, 0, ia0, ia1, ia0 +aenvstrf2 filter2 aenvstrf2, 3, 0, ia0, ia1, ia0 ; combine into one signal (flip refl wave's phase) aenvstrf = aenvstrf1 - aenvstrf2 - ; initial backward excitation wave -aenvstrb linseg 0, isegB, - ipamp / 2, isegB2, 0 + ; initial backward excitation wave +aenvstrb linseg 0, isegB, - ipamp / 2, isegB2, 0 adel2 delayr (idlt > 0) ? idlt : 0.01 ; initial bdwd traveling wave (pluck to nut) -aenvstrb1 deltapi iplkdelB - ; first forward traveling reflection (nut to bridge) -aenvstrb2 deltapi idlt / 2 + iplkdelF +aenvstrb1 deltapi iplkdelB + ; first forward traveling reflection (nut to bridge) +aenvstrb2 deltapi idlt / 2 + iplkdelF delayw aenvstrb ; initial bdwd traveling wave (pluck to nut) ; aenvstrb1 delay aenvstrb, iplkdelB @@ -2773,31 +2736,31 @@ ainputf tone ainputf, sr * 0.9 / 2 ainputb tone ainputb, sr * 0.9 / 2 ; Vibrato generator -icosine ftgenonce 0, 0, 65536, 11, 1.0 +icosine ftgenonce 0, 0, 65536, 11, 1.0 avib poscil ivibDepth, ivibRate, icosine avibdl delayr (((ivibStDly * 1.1)) > 0.0) ? (ivibStDly * 1.1) : 0.01 avibrato deltapi ivibStDly delayw avib - ; Dual Delay line, - ; NOTE: delay length longer than needed by a bit so that the output at t=idlt will be interpolated properly + ; Dual Delay line, + ; NOTE: delay length longer than needed by a bit so that the output at t=idlt will be interpolated properly ;forward traveling wave delay line afd delayr (((idlt + ivibDepth) * 1.1) > 0.0) ? ((idlt + ivibDepth) * 1.1) : 0.01 ; output tap point for fwd traveling wave -afwav deltapi ipupos +afwav deltapi ipupos ; output at end of fwd delay (left string boundary) -afwdout deltapi idlt - 1 / sr + avibrato - ; lpf/attn due to reflection impedance -afwdout filter2 afwdout, 3, 0, ia0, ia1, ia0 +afwdout deltapi idlt - 1 / sr + avibrato + ; lpf/attn due to reflection impedance +afwdout filter2 afwdout, 3, 0, ia0, ia1, ia0 delayw ainputf + afwdout * ifbfac * ifbfac ; backward trav wave delay line abkwd delayr (((idlt + ivibDepth) * 1.1) > 0) ? ((idlt + ivibDepth) * 1.1) : 0.01 ; output tap point for bkwd traveling wave -abkwav deltapi idlt / 2 - ipupos +abkwav deltapi idlt / 2 - ipupos ; output at the left boundary -; abkterm deltapi idlt/2 +; abkterm deltapi idlt/2 ; output at end of bkwd delay (right string boundary) -abkdout deltapi idlt - 1 / sr + avibrato -abkdout filter2 abkdout, 3, 0, ia0, ia1, ia0 +abkdout deltapi idlt - 1 / sr + avibrato +abkdout filter2 abkdout, 3, 0, ia0, ia1, ia0 delayw ainputb + abkdout * ifbfac * ifbfac ; resonant body filter model, from Cuzzucoli and Lombardo ; IIR filter derived via bilinear transform method @@ -2811,7 +2774,7 @@ outleta "outleft", aoutleft outleta "outright", aoutright endin - + instr Xing ////////////////////////////////////////////// // Original by Andrew Horner. @@ -2892,7 +2855,6 @@ if35 ftgenonce 0, 0, 65536, -10, 2661, 87, 33, 18 if36 ftgenonce 0, 0, 65536, -10, 174, 12 if37 ftgenonce 0, 0, 65536, -10, 314, 13 - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -3098,11 +3060,11 @@ // OUTPUT INSTRUMENTS MUST GO BELOW HERE ////////////////////////////////////////////// +#ifdef FLUID instr FluidAudio ////////////////////////////////////////////// // By Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -3114,12 +3076,13 @@ outleta "outleft", aoutleft outleta "outright", aoutright endin +#endif +#ifdef VST instr VstPianoteqAudio ////////////////////////////////////////////// // By Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -3128,12 +3091,12 @@ ainleft init 0.0 ainright init 0.0 aoutleft, aoutright vstaudiog giPianoteq, ainleft, ainright -aoutleft = i_midivelocity * aoutleft -aoutright = i_midivelocity * aoutright +aoutleft = i_midivelocity * aoutleft +aoutright = i_midivelocity * aoutright outleta "outleft", aoutleft outleta "outright", aoutright endin - +#endif instr Reverberation ////////////////////////////////////////////// // By Michael Gogins. @@ -3168,7 +3131,7 @@ endif outleta "outleft", aoutleft outleta "outright", aoutright - endin + endin instr ParametricEq1 ////////////////////////////////////////////// @@ -3230,9 +3193,8 @@ aoutright = gkMasterLevel * ainright outs aoutleft, aoutright endin - + -f 0 3600 diff -Nru csound-6.01~dfsg/examples/CsoundVST.csd csound-6.02~dfsg/examples/CsoundVST.csd --- csound-6.01~dfsg/examples/CsoundVST.csd 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/examples/CsoundVST.csd 2014-01-07 16:54:20.000000000 +0000 @@ -8,23 +8,23 @@ Copyright (c) 2006-1012 by Michael Gogins. All rights reserved. -This software is licensed under the terms of the +This software is licensed under the terms of the GNU Lesser General Public License, version 3.0. -This file contains only instrument definitions that should work -on all platforms. This file should run "as is" in CsoundVST in VST hosts, +This file contains only instrument definitions that should work +on all platforms. This file should run "as is" in CsoundVST in VST hosts, or to receive MIDI. -Instruments are fungible: they all use the same pfields, have their own -ftables, do not use UDOs, use aoutlets, produce more or less the same output +Instruments are fungible: they all use the same pfields, have their own +ftables, do not use UDOs, use aoutlets, produce more or less the same output amplitudes, and therefore can be cut and pasted with impunity. -These instruments should be regarded as starting points. Many have highly +These instruments should be regarded as starting points. Many have highly tunable parameters. HOW TO USE -Paste this entire file into your piece's code as a string constant. +Paste this entire file into your piece's code as a string constant. Cut and paste the instruments to get them into the order you want. @@ -34,7 +34,7 @@ Modify instruments if desired, or copy them and change them. -In your piece, load the whole orchestra into Csound, +In your piece, load the whole orchestra into Csound, and send Csound notes from your piece. @@ -234,7 +234,7 @@ connect "Xing", "outright", "Reverberation", "inright" connect "ZakianFlute", "outleft", "Reverberation", "inleft" connect "ZakianFlute", "outright", "Reverberation", "inright" - + alwayson "Reverberation" alwayson "Compressor" alwayson "ParametricEq1" @@ -246,7 +246,6 @@ // Original by Hans Mikelson. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 i_instrument = p1 i_time = p2 i_duration = p3 @@ -259,10 +258,10 @@ i_pitchclassset = p10 i_homogeneity = p11 ifrequency = cpsmidinn(i_midikey) -iamplitude = ampdb(i_midivelocity) +iamplitude = ampdb(i_midivelocity) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; p1 p2 p3 p4 p5 p6 p7 - ; Start Dur Amp Frqc U V + ; Start Dur Amp Frqc U V ; i 4 32 6 6000 6.00 3 2 ; i 4 36 4 . 5.11 5.6 0.4 ; i 4 + 4 . 6.05 2 8.5 @@ -300,13 +299,13 @@ outleta "outleft", aoutleft outleta "outright", aoutright prints "instr %4d t %9.4f d %9.4f k %9.4f v %9.4f p %9.4f\n", p1, p2, p3, p4, p5, p7 - endin + endin instr BandedWG ////////////////////////////////////////////// // By Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -331,13 +330,13 @@ outleta "outright", aoutright prints "instr %4d t %9.4f d %9.4f k %9.4f v %9.4f p %9.4f\n", p1, p2, p3, p4, p5, p7 endin - + instr BassModel ////////////////////////////////////////////// // Original by Hans Mikelson. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -372,7 +371,7 @@ afiltr init 0 afeedbk init 0 koutenv linseg 0, .01, 1, p3 - .11 , 1, .1 , 0 ; Output envelope -kfltenv linseg 0, 1.5, 1, 1.5, 0 +kfltenv linseg 0, 1.5, 1, 1.5, 0 ; This envelope loads the string with a triangle wave. kenvstr linseg 0, ipluck / 4, -ip4 / 2, ipluck / 2, ip4 / 2, ipluck / 4, 0, p3 - ipluck, 0 aenvstr = kenvstr @@ -384,7 +383,7 @@ ; Delay line with filtered feedback adline delay ablock + ainput, 1 / ifqc - 15 / sr afiltr tone adline, 400 - ; Resonance of the body + ; Resonance of the body abody1 reson afiltr, 110, 40 abody1 = abody1 / 5000 abody2 reson afiltr, 70, 20 @@ -401,13 +400,13 @@ outleta "outleft", aoutleft outleta "outright", aoutright prints "instr %4d t %9.4f d %9.4f k %9.4f v %9.4f p %9.4f\n", p1, p2, p3, p4, p5, p7 - endin + endin instr ChebyshevDrone ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; By Michael Gogins. ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -446,7 +445,7 @@ // Original by Jon Nelson. // Adapted by Michael Gogins. /////////////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -510,7 +509,6 @@ ////////////////////////////////////////////////////// // By Michael Gogins. ////////////////////////////////////////////////////// - pset 0, 0, 1000 i_instrument = p1 i_time = p2 i_duration = p3 @@ -535,7 +533,7 @@ ihertzright = cpsmidinn(ikeyin - idetune) iamplitude = ampdb(i_midivelocity) isine ftgenonce 0, 0, 65536, 10, 1 -icosine ftgenonce 0, 0, 65536, 11, 1 +icosine ftgenonce 0, 0, 65536, 11, 1 igenleft = isine igenright = icosine kvibrato oscili 1.0 / 120.0, 7.0, icosine @@ -563,7 +561,7 @@ // Original by John ffitch. // Adapted by Michael Gogins. ////////////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -583,7 +581,7 @@ adeclick linsegr 0.0, iattack, 1.0, isustain, 1.0, irelease, 0.0 ifrequency = cpsmidinn(i_midikey) ; Normalize so iamplitude for p5 of 80 == ampdb(80). -iamplitude = ampdb(i_midivelocity) +iamplitude = ampdb(i_midivelocity) idur = 50 iamp = iamplitude iffitch1 ftgenonce 0, 0, 65536, 10, 1 @@ -621,7 +619,7 @@ // Original by Perry Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -643,7 +641,7 @@ ivibedepth = 0.2 iviberate = 6 isine ftgenonce 0, 0, 65536, 10, 1 -icosine ftgenonce 0, 0, 65536, 11, 1 +icosine ftgenonce 0, 0, 65536, 11, 1 icookblank ftgenonce 0, 0, 65536, 10, 0 ; Blank wavetable for some Cook FM opcodes. ifn1 = isine ifn2 = icosine @@ -667,7 +665,7 @@ ; Original pfields ; p1 p2 p3 p4 p5 p6 p7 p8 p9 ; ins st dur db func at dec freq1 freq2 - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -739,7 +737,6 @@ // Original by James Kelley. // Adapted by Michael Gogins. ////////////////////////////////////////////////////// - pset 0, 0, 1000 i_instrument = p1 i_time = p2 i_duration = p3 @@ -812,7 +809,7 @@ ////////////////////////////////////////////////////// // By Michael Gogins. ////////////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -853,7 +850,7 @@ ////////////////////////////////////////////////////// // By Michael Gogins. ////////////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -895,7 +892,7 @@ // Original by Thomas Kung. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -955,7 +952,7 @@ // Original by Steven Yi. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -984,7 +981,7 @@ kenv linseg 0, i_duration * .5, 1, i_duration * .5, 0 kgoto endEnvelope env2: -kenv linseg 0, i_duration - .1, 1, .1, 0 +kenv linseg 0, i_duration - .1, 1, .1, 0 kgoto endEnvelope endEnvelope: kc1 = 5 @@ -1014,7 +1011,7 @@ // Original by Hans Mikelson. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -1080,7 +1077,7 @@ ////////////////////////////////////////////// // By Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -1121,7 +1118,7 @@ ////////////////////////////////////////////////////// // By Michael Gogins. ////////////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -1200,7 +1197,6 @@ // Original by Perry Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 1000 i_instrument = p1 i_time = p2 i_duration = p3 @@ -1257,7 +1253,7 @@ ; i 3 + 4 . 8.05 2 8.5 0.7 ; i 3 . 2 . 8.02 4 5 0.6 ; i 3 . 2 . 8.02 5 0.5 1.2 - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -1272,7 +1268,7 @@ ifrequency = cpsmidinn(i_midikey) iamplitude = ampdb(i_midivelocity) * 4 iHz = ifrequency -ifqc init iHz +ifqc init iHz ip4 init iamplitude ifqci init iHz ia = 0.6 ; p6 @@ -1311,7 +1307,6 @@ ////////////////////////////////////////////// // By Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 1000 i_instrument = p1 i_time = p2 i_duration = p3 @@ -1357,7 +1352,6 @@ // Original by Thomas Kung. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 1000 i_instrument = p1 i_time = p2 i_duration = p3 @@ -1415,7 +1409,7 @@ ////////////////////////////////////////////////////// // By Michael Gogins. ////////////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -1472,7 +1466,7 @@ outleta "outright", aoutright prints "instr %4d t %9.4f d %9.4f k %9.4f v %9.4f p %9.4f\n", p1, p2, p3, p4, p5, p7 endin - + instr PRCBeeThreeDelayed ////////////////////////////////////////////////////// // By Michael Gogins. @@ -1497,16 +1491,16 @@ asignal STKBeeThree ifrequency, 1, 2, 3, 1, 0, 11, 0 amodulator oscils 0.00015, 0.2, 0.0 ; Read delayed signal, first delayr instance: -adump delayr 4.0 +adump delayr 4.0 adly1 deltapi 0.03 + amodulator; associated with first delayr instance ; Read delayed signal, second delayr instance: -adump delayr 4.0 +adump delayr 4.0 adly2 deltapi 0.029 + amodulator ; associated with second delayr instance ; Do some cross-coupled manipulation: afdbk1 = 0.7 * adly1 + 0.7 * adly2 + asignal -afdbk2 = -0.7 * adly1 + 0.7 * adly2 + asignal +afdbk2 = -0.7 * adly1 + 0.7 * adly2 + asignal ; Feed back signal, associated with first delayr instance: - delayw afdbk1 + delayw afdbk1 ; Feed back signal, associated with second delayr instance: delayw afdbk2 asignal2 = adly1 + adly2 @@ -1516,7 +1510,7 @@ outleta "outright", aoutright prints "instr %4d t %9.4f d %9.4f k %9.4f v %9.4f p %9.4f\n", p1, p2, p3, p4, p5, p7 endin - + instr PRCBowed ////////////////////////////////////////////////////// // By Michael Gogins. @@ -1534,12 +1528,12 @@ i_homogeneity = p11 ifrequency = cpsmidinn(i_midikey) iamplitude = ampdb(i_midivelocity) * 6 - ; Controllers: + ; Controllers: ; 1 Vibrato Gain ; 2 Bow Pressure ; 4 Bow Position ; 11 Vibrato Frequency - ; 128 Volume + ; 128 Volume asignal STKBowed ifrequency, 1.0, 1, 1.8, 2, 120.0, 4, 50.0, 11, 20.0 iattack = 0.005 isustain = p3 @@ -1551,13 +1545,13 @@ outleta "outright", aoutright prints "instr %4d t %9.4f d %9.4f k %9.4f v %9.4f p %9.4f\n", p1, p2, p3, p4, p5, p7 endin - + instr STKBandedWG ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -1581,14 +1575,14 @@ outleta "outleft", aoutleft outleta "outright", aoutright prints "instr %4d t %9.4f d %9.4f k %9.4f v %9.4f p %9.4f\n", p1, p2, p3, p4, p5, p7 - endin - + endin + instr STKBeeThree ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -1614,14 +1608,14 @@ outleta "outleft", aoutleft outleta "outright", aoutright prints "instr %4d t %9.4f d %9.4f k %9.4f v %9.4f p %9.4f\n", p1, p2, p3, p4, p5, p7 - endin + endin instr STKBlowBotl ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -1646,14 +1640,14 @@ outleta "outleft", aoutleft outleta "outright", aoutright prints "instr %4d t %9.4f d %9.4f k %9.4f v %9.4f p %9.4f\n", p1, p2, p3, p4, p5, p7 - endin + endin instr STKBlowHole ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -1678,14 +1672,14 @@ outleta "outleft", aoutleft outleta "outright", aoutright prints "instr %4d t %9.4f d %9.4f k %9.4f v %9.4f p %9.4f\n", p1, p2, p3, p4, p5, p7 - endin + endin instr STKBowed ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -1699,12 +1693,12 @@ i_homogeneity = p11 ifrequency = cpsmidinn(i_midikey) iamplitude = ampdb(i_midivelocity) * 8 - ; Controllers: + ; Controllers: ; 1 Vibrato Gain ; 2 Bow Pressure ; 4 Bow Position ; 11 Vibrato Frequency - ; 128 Volume + ; 128 Volume asignal STKBowed ifrequency, 1.0, 1, 0.8, 2, 120.0, 4, 20.0, 11, 20.0 idampingattack = .002 idampingrelease = .01 @@ -1716,14 +1710,14 @@ outleta "outleft", aoutleft outleta "outright", aoutright prints "instr %4d t %9.4f d %9.4f k %9.4f v %9.4f p %9.4f\n", p1, p2, p3, p4, p5, p7 - endin + endin instr STKClarinet ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -1748,14 +1742,14 @@ outleta "outleft", aoutleft outleta "outright", aoutright prints "instr %4d t %9.4f d %9.4f k %9.4f v %9.4f p %9.4f\n", p1, p2, p3, p4, p5, p7 - endin + endin instr STKDrummer ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -1780,14 +1774,14 @@ outleta "outleft", aoutleft outleta "outright", aoutright prints "instr %4d t %9.4f d %9.4f k %9.4f v %9.4f p %9.4f\n", p1, p2, p3, p4, p5, p7 - endin + endin instr STKFlute ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -1818,14 +1812,14 @@ outleta "outleft", aoutleft outleta "outright", aoutright prints "instr %4d t %9.4f d %9.4f k %9.4f v %9.4f p %9.4f\n", p1, p2, p3, p4, p5, p7 - endin + endin instr STKFMVoices ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -1856,14 +1850,14 @@ outleta "outleft", aoutleft outleta "outright", aoutright prints "instr %4d t %9.4f d %9.4f k %9.4f v %9.4f p %9.4f\n", p1, p2, p3, p4, p5, p7 - endin + endin instr STKHvyMetl ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -1894,14 +1888,14 @@ outleta "outleft", aoutleft outleta "outright", aoutright prints "instr %4d t %9.4f d %9.4f k %9.4f v %9.4f p %9.4f\n", p1, p2, p3, p4, p5, p7 - endin + endin instr STKMandolin ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -1926,14 +1920,14 @@ outleta "outleft", aoutleft outleta "outright", aoutright prints "instr %4d t %9.4f d %9.4f k %9.4f v %9.4f p %9.4f\n", p1, p2, p3, p4, p5, p7 - endin - + endin + instr STKModalBar ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -1975,14 +1969,14 @@ outleta "outleft", aoutleft outleta "outright", aoutright prints "instr %4d t %9.4f d %9.4f k %9.4f v %9.4f p %9.4f\n", p1, p2, p3, p4, p5, p7 - endin - + endin + instr STKMoog ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -2007,14 +2001,14 @@ outleta "outleft", aoutleft outleta "outright", aoutright prints "instr %4d t %9.4f d %9.4f k %9.4f v %9.4f p %9.4f\n", p1, p2, p3, p4, p5, p7 - endin - + endin + instr STKPercFlut ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -2039,14 +2033,14 @@ outleta "outleft", aoutleft outleta "outright", aoutright prints "instr %4d t %9.4f d %9.4f k %9.4f v %9.4f p %9.4f\n", p1, p2, p3, p4, p5, p7 - endin - + endin + instr STKPlucked ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -2071,14 +2065,14 @@ outleta "outleft", aoutleft outleta "outright", aoutright prints "instr %4d t %9.4f d %9.4f k %9.4f v %9.4f p %9.4f\n", p1, p2, p3, p4, p5, p7 - endin - + endin + instr STKResonate ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -2091,7 +2085,7 @@ i_pitchclassset = p10 i_homogeneity = p11 ifrequency = cpsmidinn(i_midikey) -iamplitude = ampdb(i_midivelocity) +iamplitude = ampdb(i_midivelocity) ;Control Change Numbers: ; * Resonance Frequency (0-Nyquist) = 2 ; * Pole Radii = 4 @@ -2109,14 +2103,14 @@ outleta "outleft", aoutleft outleta "outright", aoutright prints "instr %4d t %9.4f d %9.4f k %9.4f v %9.4f p %9.4f\n", p1, p2, p3, p4, p5, p7 - endin - + endin + instr STKRhodey ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -2141,14 +2135,14 @@ outleta "outleft", aoutleft outleta "outright", aoutright prints "instr %4d t %9.4f d %9.4f k %9.4f v %9.4f p %9.4f\n", p1, p2, p3, p4, p5, p7 - endin - + endin + instr STKSaxofony ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -2181,14 +2175,14 @@ outleta "outleft", aoutleft outleta "outright", aoutright prints "instr %4d t %9.4f d %9.4f k %9.4f v %9.4f p %9.4f\n", p1, p2, p3, p4, p5, p7 - endin + endin instr STKShakers ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -2243,14 +2237,14 @@ outleta "outleft", aoutleft outleta "outright", aoutright prints "instr %4d t %9.4f d %9.4f k %9.4f v %9.4f p %9.4f\n", p1, p2, p3, p4, p5, p7 - endin + endin instr STKSimple ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -2280,14 +2274,14 @@ outleta "outleft", aoutleft outleta "outright", aoutright prints "instr %4d t %9.4f d %9.4f k %9.4f v %9.4f p %9.4f\n", p1, p2, p3, p4, p5, p7 - endin + endin instr STKSitar ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -2312,14 +2306,14 @@ outleta "outleft", aoutleft outleta "outright", aoutright prints "instr %4d t %9.4f d %9.4f k %9.4f v %9.4f p %9.4f\n", p1, p2, p3, p4, p5, p7 - endin + endin instr STKTubeBell ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -2344,14 +2338,14 @@ outleta "outleft", aoutleft outleta "outright", aoutright prints "instr %4d t %9.4f d %9.4f k %9.4f v %9.4f p %9.4f\n", p1, p2, p3, p4, p5, p7 - endin + endin instr STKVoicForm ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -2376,14 +2370,14 @@ outleta "outleft", aoutleft outleta "outright", aoutright prints "instr %4d t %9.4f d %9.4f k %9.4f v %9.4f p %9.4f\n", p1, p2, p3, p4, p5, p7 - endin + endin instr STKWhistle ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -2408,14 +2402,14 @@ outleta "outleft", aoutleft outleta "outright", aoutright prints "instr %4d t %9.4f d %9.4f k %9.4f v %9.4f p %9.4f\n", p1, p2, p3, p4, p5, p7 - endin + endin instr STKWurley ////////////////////////////////////////////// // Original by Perry R. Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -2440,7 +2434,7 @@ outleta "outleft", aoutleft outleta "outright", aoutright prints "instr %4d t %9.4f d %9.4f k %9.4f v %9.4f p %9.4f\n", p1, p2, p3, p4, p5, p7 - endin + endin instr StringPad ////////////////////////////////////////////// @@ -2449,7 +2443,7 @@ ////////////////////////////////////////////// ; String-pad borrowed from the piece "Dorian Gray", ; http://akozar.spymac.net/music/ Modified to fit my needs - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -2492,7 +2486,6 @@ // Original by Hans Mikelson. // Adapted by Michael Gogins. ////////////////////////////////////////////// - pset 0, 0, 1000 i_instrument = p1 i_time = p2 i_duration = p3 @@ -2553,7 +2546,7 @@ // Original by Perry Cook. // Adapted by Michael Gogins. ////////////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -2596,7 +2589,7 @@ // Original by Jeff Livingston. // Adapted by Michael Gogins. ////////////////////////////////////////////////////// - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -2613,17 +2606,17 @@ iHz = ifrequency ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; The model takes pluck position, and pickup position (in % of string length), and generates - ; a pluck excitation signal, representing the string displacement. The pluck consists - ; of a forward and backward traveling displacement wave, which are recirculated thru two - ; separate delay lines, to simulate the one dimensional string waveguide, with + ; a pluck excitation signal, representing the string displacement. The pluck consists + ; of a forward and backward traveling displacement wave, which are recirculated thru two + ; separate delay lines, to simulate the one dimensional string waveguide, with ; fixed ends. ; ; Losses due to internal friction of the string, and with air, as well as - ; losses due to the mechanical impedance of the string terminations are simulated by + ; losses due to the mechanical impedance of the string terminations are simulated by ; low pass filtering the signal inside the feedback loops. ; Delay line outputs at the bridge termination are summed and fed into an IIR filter ; modeled to simulate the lowest two vibrational modes (resonances) of the guitar body. - ; The theory implies that force due to string displacement, which is equivalent to + ; The theory implies that force due to string displacement, which is equivalent to ; displacement velocity times bridge mechanical impedance, is the input to the guitar ; body resonator model. Here we have modified the transfer fuction representing the bridge ; mech impedance, to become the string displacement to bridge input force transfer function. @@ -2632,15 +2625,15 @@ ; (based on a simplified model, viewing the top plate as a force driven spring). ; ; The effects of pluck hardness, and contact with frets during pluck release, - ; have been modeled by injecting noise into the initial pluck, proportional to initial + ; have been modeled by injecting noise into the initial pluck, proportional to initial ; string displacement. ; ; Note on pluck shape: Starting with a triangular displacment, I found a decent sounding ; initial pluck shape after some trial and error. This pluck shape, which is a linear - ; ramp, with steep fall off, doesn't necessarily agree with the pluck string models I've - ; studied. I found that initial pluck shape significantly affects the realism of the + ; ramp, with steep fall off, doesn't necessarily agree with the pluck string models I've + ; studied. I found that initial pluck shape significantly affects the realism of the ; sound output, but I the treatment of this topic in musical acoustics literature seems - ; rather limited as far as I've encountered. + ; rather limited as far as I've encountered. ; ; Original pfields ; p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 @@ -2658,26 +2651,26 @@ afwav init 0 abkwav init 0 abkdout init 0 -afwdout init 0 +afwdout init 0 iEstr init 1.0 / cpspch(6.04) ifqc init iHz ; cpspch(p5) ; note:delay time=2x length of string (time to traverse it) -idlt init 1.0 / ifqc +idlt init 1.0 / ifqc ipluck = 0.5 * idlt * ip6 * ifqc / cpspch(8.02) ifbfac = ip7 ; feedback factor ; (exponentialy scaled) additive noise to add hi freq content -ibrightness = ip10 * exp(ip6 * log(2)) / 2 -ivibRate = ip11 +ibrightness = ip10 * exp(ip6 * log(2)) / 2 +ivibRate = ip11 ivibDepth pow 2, ip12 / 12 ; vibrato depth, +,- ivibDepth semitones -ivibDepth = idlt - 1.0 / (ivibDepth * ifqc) +ivibDepth = idlt - 1.0 / (ivibDepth * ifqc) ; vibrato start delay (secs) -ivibStDly = ip13 +ivibStDly = ip13 ; termination impedance model ; cutoff freq of LPF due to mech. impedance at the nut (2kHz-10kHz) -if0 = 10000 +if0 = 10000 ; damping parameter of nut impedance -iA0 = ip7 +iA0 = ip7 ialpha = cos(2 * 3.14159265 * if0 * 1 / sr) ; FIR LPF model of nut impedance, H(z)=a0+a1z^-1+a0z^-2 ia0 = 0.3 * iA0 / (2 * (1 - ialpha)) @@ -2698,35 +2691,35 @@ isegB2 = ipluck iplkdelB = (ipluck / 2 > idlt / 2 - ippos ? 0 : idlt / 2 - ippos - ipluck / 2) ; EXCITATION SIGNAL GENERATION - ; the two excitation signals are fed into the fwd delay represent the 1st and 2nd - ; reflections off of the left boundary, and two accelerations fed into the bkwd delay + ; the two excitation signals are fed into the fwd delay represent the 1st and 2nd + ; reflections off of the left boundary, and two accelerations fed into the bkwd delay ; represent the the 1st and 2nd reflections off of the right boundary. - ; Likewise for the backward traveling acceleration waves, only they encouter the + ; Likewise for the backward traveling acceleration waves, only they encouter the ; terminations in the opposite order. ipw = 1 ipamp = ip4 * ipluck ; 4 / ipluck aenvstrf linseg 0, isegF, -ipamp / 2, isegF2, 0 adel1 delayr (idlt > 0) ? idlt : 0.01 ; initial forward traveling wave (pluck to bridge) -aenvstrf1 deltapi iplkdelF - ; first forward traveling reflection (nut to bridge) -aenvstrf2 deltapi iplkdelB + idlt / 2 +aenvstrf1 deltapi iplkdelF + ; first forward traveling reflection (nut to bridge) +aenvstrf2 deltapi iplkdelB + idlt / 2 delayw aenvstrf - ; inject noise for attack time string fret contact, and pre pluck vibrations against pick + ; inject noise for attack time string fret contact, and pre pluck vibrations against pick anoiz rand ibrightness aenvstrf1 = aenvstrf1 + anoiz*aenvstrf1 aenvstrf2 = aenvstrf2 + anoiz*aenvstrf2 ; filter to account for losses along loop path -aenvstrf2 filter2 aenvstrf2, 3, 0, ia0, ia1, ia0 +aenvstrf2 filter2 aenvstrf2, 3, 0, ia0, ia1, ia0 ; combine into one signal (flip refl wave's phase) aenvstrf = aenvstrf1 - aenvstrf2 - ; initial backward excitation wave -aenvstrb linseg 0, isegB, - ipamp / 2, isegB2, 0 + ; initial backward excitation wave +aenvstrb linseg 0, isegB, - ipamp / 2, isegB2, 0 adel2 delayr (idlt > 0) ? idlt : 0.01 ; initial bdwd traveling wave (pluck to nut) -aenvstrb1 deltapi iplkdelB - ; first forward traveling reflection (nut to bridge) -aenvstrb2 deltapi idlt / 2 + iplkdelF +aenvstrb1 deltapi iplkdelB + ; first forward traveling reflection (nut to bridge) +aenvstrb2 deltapi idlt / 2 + iplkdelF delayw aenvstrb ; initial bdwd traveling wave (pluck to nut) ; aenvstrb1 delay aenvstrb, iplkdelB @@ -2747,31 +2740,31 @@ ainputf tone ainputf, sr * 0.9 / 2 ainputb tone ainputb, sr * 0.9 / 2 ; Vibrato generator -icosine ftgenonce 0, 0, 65536, 11, 1.0 +icosine ftgenonce 0, 0, 65536, 11, 1.0 avib poscil ivibDepth, ivibRate, icosine avibdl delayr (((ivibStDly * 1.1)) > 0.0) ? (ivibStDly * 1.1) : 0.01 avibrato deltapi ivibStDly delayw avib - ; Dual Delay line, - ; NOTE: delay length longer than needed by a bit so that the output at t=idlt will be interpolated properly + ; Dual Delay line, + ; NOTE: delay length longer than needed by a bit so that the output at t=idlt will be interpolated properly ;forward traveling wave delay line afd delayr (((idlt + ivibDepth) * 1.1) > 0.0) ? ((idlt + ivibDepth) * 1.1) : 0.01 ; output tap point for fwd traveling wave -afwav deltapi ipupos +afwav deltapi ipupos ; output at end of fwd delay (left string boundary) -afwdout deltapi idlt - 1 / sr + avibrato - ; lpf/attn due to reflection impedance -afwdout filter2 afwdout, 3, 0, ia0, ia1, ia0 +afwdout deltapi idlt - 1 / sr + avibrato + ; lpf/attn due to reflection impedance +afwdout filter2 afwdout, 3, 0, ia0, ia1, ia0 delayw ainputf + afwdout * ifbfac * ifbfac ; backward trav wave delay line abkwd delayr (((idlt + ivibDepth) * 1.1) > 0) ? ((idlt + ivibDepth) * 1.1) : 0.01 ; output tap point for bkwd traveling wave -abkwav deltapi idlt / 2 - ipupos +abkwav deltapi idlt / 2 - ipupos ; output at the left boundary -; abkterm deltapi idlt/2 +; abkterm deltapi idlt/2 ; output at end of bkwd delay (right string boundary) -abkdout deltapi idlt - 1 / sr + avibrato -abkdout filter2 abkdout, 3, 0, ia0, ia1, ia0 +abkdout deltapi idlt - 1 / sr + avibrato +abkdout filter2 abkdout, 3, 0, ia0, ia1, ia0 delayw ainputb + abkdout * ifbfac * ifbfac ; resonant body filter model, from Cuzzucoli and Lombardo ; IIR filter derived via bilinear transform method @@ -2786,7 +2779,7 @@ outleta "outright", aoutright prints "instr %4d t %9.4f d %9.4f k %9.4f v %9.4f p %9.4f\n", p1, p2, p3, p4, p5, p7 endin - + instr Xing ////////////////////////////////////////////// // Original by Andrew Horner. @@ -2868,7 +2861,7 @@ if35 ftgenonce 0, 0, 65536, -10, 2661, 87, 33, 18 if36 ftgenonce 0, 0, 65536, -10, 174, 12 if37 ftgenonce 0, 0, 65536, -10, 314, 13 - pset 0, 0, 3600 + i_instrument = p1 i_time = p2 i_duration = p3 @@ -3109,7 +3102,7 @@ endif outleta "outleft", aoutleft outleta "outright", aoutright - endin + endin instr ParametricEq1 ////////////////////////////////////////////// @@ -3171,7 +3164,7 @@ aoutright = gkMasterLevel * ainright outs aoutleft, aoutright endin - + f 0 3600 diff -Nru csound-6.01~dfsg/examples/hommage.csd csound-6.02~dfsg/examples/hommage.csd --- csound-6.01~dfsg/examples/hommage.csd 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/examples/hommage.csd 2014-01-07 16:54:20.000000000 +0000 @@ -8,12 +8,10 @@ kr = 4410 ksmps = 10 nchnls= 2 - +0dbfs = 1 instr 1 -ii active 0 -print ii kfreq expon p5, p3, p6 kinterval expon p7, p3, p8 kglissdur line p9, p3, p10 @@ -100,7 +98,7 @@ aout10r = -(kpa10-1)*aout10 -kline linen ampdb(p4)*32767, p14, p3, p14 +kline linen ampdb(p4)*0dbfs, p14, p3, p14 ;kpleft = (sqrt(2)/2)*(1-kpan/sqrt(1+(kpan*kpan))) ;kpright = (sqrt(2)/2)* (1+kpan/sqrt(1+(kpan*kpan))) @@ -115,8 +113,6 @@ instr 2 -ii active 2 -print ii kfreq expon p5, p3, p6 kinterval expon p7, p3, p8 @@ -218,7 +214,7 @@ aout10r = -(kpa10-1)*aout10 -kline linen ampdb(p4)*32767, p14, p3, p14 +kline linen ampdb(p4)*0dbfs, p14, p3, p14 ;kpleft = (sqrt(2)/2)*(1-kpan/sqrt(1+(kpan*kpan))) ;kpright = (sqrt(2)/2)* (1+kpan/sqrt(1+(kpan*kpan))) @@ -233,8 +229,6 @@ instr 3 -ii active 0 -print ii kfreq0 expon p5, p3, p6 kinterval expon p7, p3, p8 @@ -328,7 +322,8 @@ aout10r = -(kpa10-1)*aout10 -kline linen ampdb(p4)*20000, p14, p3, p14 + +kline linen ampdb(p4)*0dbfs*.6, p14, p3, p14 ;kpleft = (sqrt(2)/2)*(1-kpan/sqrt(1+(kpan*kpan))) ;kpright = (sqrt(2)/2)* (1+kpan/sqrt(1+(kpan*kpan))) @@ -371,129 +366,4 @@ - - - - 755 - 61 - 297 - 497 - true - - - 212 - 208 - 200 - - - slider1 - 5 - 5 - 20 - 100 - {c337f225-a9f2-4de2-9e9d-e5cef5316d07} - true - 0 - -3 - 0.00000000 - 1.00000000 - 0.00000000 - lin - continuous - -1.00000000 - false - - - slider2 - 45 - 5 - 20 - 100 - {dfc06bbd-8563-4f7e-8ae3-845b96d54c38} - true - 0 - -3 - 0.00000000 - 1.00000000 - 0.00000000 - lin - continuous - -1.00000000 - false - - - slider3 - 85 - 5 - 20 - 100 - {e3c628a3-55e7-4178-8529-2a65308e2429} - true - 0 - -3 - 0.00000000 - 1.00000000 - 0.00000000 - lin - continuous - -1.00000000 - false - - - slider4 - 125 - 5 - 20 - 100 - {d594b856-3e0f-4f15-9838-6cffc5f12288} - true - 0 - -3 - 0.00000000 - 1.00000000 - 0.00000000 - lin - continuous - -1.00000000 - false - - - slider5 - 165 - 5 - 20 - 100 - {a710f9ee-5cc2-4dea-91b6-187b0dd8eac5} - true - 0 - -3 - 0.00000000 - 1.00000000 - 0.00000000 - lin - continuous - -1.00000000 - false - - - - - -Version: 3 -Render: Real -Ask: Yes -Functions: ioObject -Listing: Window -WindowBounds: 755 61 297 497 -CurrentView: io -IOViewEdit: On -Options: - - -ioView nobackground {54484, 53456, 51400} -ioSlider {5, 5} {20, 100} 0.000000 1.000000 0.000000 slider1 -ioSlider {45, 5} {20, 100} 0.000000 1.000000 0.000000 slider2 -ioSlider {85, 5} {20, 100} 0.000000 1.000000 0.000000 slider3 -ioSlider {125, 5} {20, 100} 0.000000 1.000000 0.000000 slider4 -ioSlider {165, 5} {20, 100} 0.000000 1.000000 0.000000 slider5 - + diff -Nru csound-6.01~dfsg/examples/python/Lindenmayer.py csound-6.02~dfsg/examples/python/Lindenmayer.py --- csound-6.01~dfsg/examples/python/Lindenmayer.py 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/examples/python/Lindenmayer.py 2014-01-07 16:54:20.000000000 +0000 @@ -1,5 +1,8 @@ # Copyright (c) 2002, 2003 by Michael Gogins. All rights reserved. # Tutorial demonstrating a MusicModel composition based on a Lindenmayer system. +# This should be run from the csound/examples/python directory. +# If you have bwfmetaedit, sox, and lame installed, change the last line to +# model.performAll(). import gc import os import sys @@ -19,12 +22,12 @@ lindenmayer = CsoundAC.Lindenmayer() print 'lindenmayer:', lindenmayer lindenmayer.setAxiom("b") -lindenmayer.setAngle(2.0 * math.pi / 9.0) -lindenmayer.addRule("b", " b [ Ti-1 a b ] Tt+1 Tk-3.1 a N b Tt+3 N Tt+1.3 Tk+2 b [ Ti+1 a b ] N") +lindenmayer.setAngle(2.0 * math.pi / 3.0) +lindenmayer.addRule("b", " b [ Ti-1 a N b ] Tt+1 Tk-3.1 a N b Tt+3 N Tt+1.3 Tk+2 b [ Ti+1 a b ] N") lindenmayer.addRule("a", " N Tt+1.1 Tk+1 N [ Tk+2 b ] Tk+3 N Tk-3 Tt-1 [ Tt+1 Tk-4 a ] N ") -lindenmayer.setIterationCount(5) +lindenmayer.setIterationCount(6) lindenmayer.generate() -print 'generated...' +print 'generated...' random = CsoundAC.Random() print 'random:', random @@ -33,7 +36,7 @@ rescale = CsoundAC.Rescale() rescale.setRescale( 0, 1, 1, 0, 60) rescale.setRescale( 1, 1, 1, 2, 4) -rescale.setRescale( 3, 1, 1, 2, 6) +rescale.setRescale( 3, 1, 1, 2, 8) rescale.setRescale( 4, 1, 1, 36, 60) rescale.setRescale( 5, 1, 1, 20, 15) rescale.setRescale( 7, 1, 1, -0.75, 1.5) @@ -49,7 +52,7 @@ print 'Filename:', filename model.setConformPitches(True) csound.load('../CsoundAC.csd') -csound.setCommand("csound -m3 -RWZdfo" + filename) +csound.setCommand("csound -m195 -RWdfo" + filename + '.wav') csound.setFilename(filename) score = model.getScore() print 'Events in generated score:', len(score) @@ -63,38 +66,14 @@ score.arrange(5, 7) score.arrange(6, 5) score.arrange(7, 9) -model.createCsoundScore(''' -; EFFECTS MATRIX - -; Chorus to Reverb -i 1 0 0 200 210 0.0 -; Chorus to Output -i 1 0 0 200 220 0.05 -; Reverb to Output -i 1 0 0 210 220 2.0 - -; SOUNDFONTS OUTPUT - -; Insno Start Dur Key Amplitude -i 190 0 %f 0 64. - -; MASTER EFFECT CONTROLS - -; Chorus. -; Insno Start Dur Delay Divisor of Delay -i 200 0 %f 10 30 - -; Reverb. -; Insno Start Dur Level Feedback Cutoff -i 210 0 %f 0.81 0.0 16000 - -; Master output. -; Insno Start Dur Fadein Fadeout -i 220 0 %f 0.1 0.1 - -''' % (duration, duration, duration, duration)) -#print csound.getScore() -print csound.getCommand() -model.performAll() -# Takes so long it never finished... -#model.translateToNotation() +score.setDuration(180.0) +duration = score.getDuration() +print 'Duration: %9.4f' % (duration) +print 'Command: ', csound.getCommand() +print 'Score:' +model.createCsoundScore() +scoreString = csound.getScore() +print scoreString +print 'Performing...' +# model.performAll() +model.perform() diff -Nru csound-6.01~dfsg/examples/python/drone.py csound-6.02~dfsg/examples/python/drone.py --- csound-6.01~dfsg/examples/python/drone.py 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/examples/python/drone.py 2014-01-07 16:54:20.000000000 +0000 @@ -6,12 +6,12 @@ This software is licensed under the terms of the GNU Lesser General Public License. -This composition simulates some of the effects in +This composition simulates some of the effects in LaMonte Young's early electronic pieces, using Csound. The piece uses just intonation chords without thirds or sixths, tones with varying harmonic content, tones with waveshaping distortion, -and varying amounts of reverberation +and varying amounts of reverberation to produce a slow progression of rich drones. The purpose of the GUI is to enable the user to interactively fine-tune @@ -33,7 +33,7 @@ ''' Psyco (http://www.psyco.org) is a just-in-time compiler for Python. -One imagines that using Psyco here will make execution +One imagines that using Psyco here will make execution faster and therefore smoother. ''' try: @@ -44,13 +44,13 @@ from Tkinter import * import tkFileDialog -import Tix +import Tix print __doc__ ''' A class that contains all control channel configuration values, in order to simplify saving and restoring configurations. -Naming convention: +Naming convention: Csound global variable name equals Csound control channel name, equals Tkinter widget name, equals configuration variable name, and the widget command handler name is the same but prefixed with "on_". @@ -104,11 +104,8 @@ ; Bind named control channels to global variables. -gkDistortFactor chnexport "gkDistortFactor", 3 gkDistortFactor init 1.0 -gkReverbscFeedback chnexport "gkReverbscFeedback", 3 gkReverbscFeedback init 0.9 -gkMasterLevel chnexport "gkMasterLevel", 3 gkMasterLevel init 1.0 gareverb1 init 0 @@ -120,7 +117,7 @@ isustain init p3 - iattack p3 = p3 + idecay print p1, p2, p3, p4, p5, p6 -ifundamental = p4 +ifundamental = p4 inumerator = p5 idenominator = p6 ivelocity = p7 @@ -135,8 +132,8 @@ gareverb1 = gareverb1 + aleft gareverb2 = gareverb1 + aright endin - - + + instr 30 aleft, aright reverbsc gareverb1, gareverb2, gkReverbscFeedback, 15000.0 aleft = gkMasterLevel * (gareverb1 + aleft * 0.8) @@ -152,30 +149,30 @@ ; a good small "live" room sound, .8 ; a small hall, .9 a large hall, ; .99 an enormous stone cavern. - + ; p5 = amount of random pitch modulation ; for the delay lines. 1 is the "normal" ; amount, but this may be too high for ; held pitches such as piano tones. ; Adjust to taste. - + ; p6 = cutoff frequency of lowpass filters ; in feedback loops of delay lines, ; in Hz. Lower cutoff frequencies results ; in a sound with more high-frequency ; damping. - -; 8 delay line FDN reverb, with feedback matrix based upon + +; 8 delay line FDN reverb, with feedback matrix based upon ; physical modeling scattering junction of 8 lossless waveguides -; of equal characteristic impedance. Based on Julius O. Smith III, +; of equal characteristic impedance. Based on Julius O. Smith III, ; "A New Approach to Digital Reverberation using Closed Waveguide -; Networks," Proceedings of the International Computer Music +; Networks," Proceedings of the International Computer Music ; Conference 1985, p. 47-53 (also available as a seperate ; publication from CCRMA), as well as some more recent papers by ; Smith and others. ; Coded by Sean Costello, October 1999 -ipitchmod = 0.98 -itone = 16000 +ipitchmod = 0.98 +itone = 16000 ain1 = gareverb1 ain2 = gareverb2 asignal = (ain1 + ain2) * 0.5 @@ -206,37 +203,37 @@ k6 randi .0011, 1.897, .7 k7 randi .0017, 0.891, .9 k8 randi .0006, 3.221, .44 -; apj is used to calculate "resultant junction pressure" for +; apj is used to calculate "resultant junction pressure" for ; the scattering junction of 8 lossless waveguides ; of equal characteristic impedance. If you wish to -; add more delay lines, simply add them to the following -; equation, and replace the .25 by 2/N, where N is the +; add more delay lines, simply add them to the following +; equation, and replace the .25 by 2/N, where N is the ; number of delay lines. apj = .25 * (afilt1 + afilt2 + afilt3 + afilt4 + afilt5 + afilt6 + afilt7 + afilt8) adum1 delayr 1 adel1 deltapi idel1 + k1 * ipitchmod - delayw asignal + apj - afilt1 + delayw asignal + apj - afilt1 adum2 delayr 1 adel2 deltapi idel2 + k2 * ipitchmod - delayw asignal + apj - afilt2 + delayw asignal + apj - afilt2 adum3 delayr 1 adel3 deltapi idel3 + k3 * ipitchmod - delayw asignal + apj - afilt3 + delayw asignal + apj - afilt3 adum4 delayr 1 adel4 deltapi idel4 + k4 * ipitchmod - delayw asignal + apj - afilt4 + delayw asignal + apj - afilt4 adum5 delayr 1 adel5 deltapi idel5 + k5 * ipitchmod - delayw asignal + apj - afilt5 + delayw asignal + apj - afilt5 adum6 delayr 1 adel6 deltapi idel6 + k6 * ipitchmod - delayw asignal + apj - afilt6 + delayw asignal + apj - afilt6 adum7 delayr 1 adel7 deltapi idel7 + k7 * ipitchmod - delayw asignal + apj - afilt7 + delayw asignal + apj - afilt7 adum8 delayr 1 adel8 deltapi idel8 + k8 * ipitchmod - delayw asignal + apj - afilt8 + delayw asignal + apj - afilt8 ; 1st order lowpass filters in feedback ; loops of delay lines. afilt1 tone adel1 * gkReverbscFeedback, itone @@ -249,7 +246,7 @@ afilt8 tone adel8 * gkReverbscFeedback, itone ; The outputs of the delay lines are summed ; and sent to the stereo outputs. This could -; easily be modified for a 4 or 8-channel +; easily be modified for a 4 or 8-channel ; sound system. aout1 = (afilt1 + afilt3 + afilt5 + afilt7) aout2 = (afilt2 + afilt4 + afilt6 + afilt8) @@ -261,13 +258,21 @@ gareverb2 = 0 endin +instr 50 +gkHarmonicTableFactor chnget "gkHarmonicTableFactor" +gkDistortTableFactor chnget "gkDistortTableFactor" +gkDistortFactor chnget "gkDistortFactor" +gkReverbscFeedback chnget "gkReverbscFeedback" +gkMasterLevel chnget "gkMasterLevel" +endin + ''' csoundScore = '''\ ; A few harmonics... -f 1 0 65536 10 3 0 1 0 0 2 +f 1 0 65536 10 3 0 1 0 0 2 ; ...distorted by waveshaping. -f 2 0 65536 13 1 1 0 3 0 2 +f 2 0 65536 13 1 1 0 3 0 2 ; Change the tempo, if you like. t 0 30 @@ -290,12 +295,14 @@ i 30 0 -1 +i 50 0 -1 + s 10.0 e 10.0 ''' csoundCommands = { - 'Audio': 'csound --messagelevel=1 --noheader --nodisplays --sample-rate=44100 --control-rate=100 --midi-key=4 --midi-velocity=5 --output=%s' % ( dacName), + 'Audio': 'csound --messagelevel=3 --noheader --nodisplays --sample-rate=44100 --control-rate=100 --midi-key=4 --midi-velocity=5 --output=%s' % ( dacName), 'Preview': 'csound --messagelevel=3 -W -f --rewrite --dither --nopeaks --nodisplays --sample-rate=44100 --control-rate=441 --midi-key=4 --midi-velocity=5 -+id_artist=%s -+id_copyright=Copyright_2007_by_%s -+id_title=%s --output=%s' % (author, author, title, soundfileName), 'CD': 'csound --messagelevel=3 -W -f --rewrite --dither --nopeaks --nodisplays --sample-rate=44100 --control-rate=44100 --midi-key=4 --midi-velocity=5 -+id_artist=%s -+id_copyright=Copyright_2007_by_%s -+id_title=%s --output=%s' % (author, author, title, soundfileName), 'Master': 'csound --messagelevel=3 -W -f --rewrite --dither --nopeaks --nodisplays --sample-rate=88200 --control-rate=88200 --midi-key=4 --midi-velocity=5 -+id_artist=%s -+id_copyright=Copyright_2007_by_%s -+id_title=%s --output=%s' % (author, author, title, soundfileName) @@ -312,7 +319,7 @@ self.master.title('D R O N E') self.pack() self.csound = csnd6.CppSound() - self.csound.setPythonMessageCallback() + #self.csound.setPythonMessageCallback() self.playing = False self.thread_ = thread_ @@ -326,7 +333,7 @@ self.harmonicsFrame = Frame( self.leftFrame, - bd = 2, + bd = 2, relief = 'groove' ) self.harmonicsFrame.grid(row=r, column=c, sticky=N+E+W+S, padx=4, pady=4) @@ -339,9 +346,9 @@ r = r + 1 self.gkHarmonicTableFactor = Scale( - self.harmonicsFrame, - from_ = 0.0, - to = 2.0, + self.harmonicsFrame, + from_ = 0.0, + to = 2.0, resolution = 0.001, length = 250, orient = HORIZONTAL, @@ -366,9 +373,9 @@ r = r + 1 self.gkDistortTableFactor = Scale( - self.distortFrame, - from_ = 0.0, - to = 10.0, + self.distortFrame, + from_ = 0.0, + to = 10.0, resolution = 0.001, length = 250, orient = HORIZONTAL, @@ -379,9 +386,9 @@ r = r + 1 self.gkDistortFactor = Scale( - self.distortFrame, - from_ = 0.0, - to = 1.0, + self.distortFrame, + from_ = 0.0, + to = 1.0, resolution = 0.001, length = 250, orient = HORIZONTAL, @@ -412,9 +419,9 @@ r = r + 1 self.gkReverbscFeedback = Scale( - self.reverbFrame, - from_ = 0.0, - to = 0.9999, + self.reverbFrame, + from_ = 0.0, + to = 0.9999, resolution = 0.001, length = 250, orient = HORIZONTAL, @@ -439,9 +446,9 @@ r = r + 1 self.gkMasterLevel = Scale( - self.FactorFrame, - from_ = 0.0, - to = 2.0, + self.FactorFrame, + from_ = 0.0, + to = 2.0, resolution = 0.001, length = 250, orient = HORIZONTAL, @@ -528,7 +535,7 @@ r = r + 1 self.configure() - + ''' Set initial control channel values. ''' @@ -565,15 +572,15 @@ message = 'f 2 0 65536 13 1 %f 0 %f 0 %f\n' % (f * 1.0, f * 2.0, f * 3.0) self.csound.inputMessage(message) self.csound.SetChannel("gkDistortFactor", float(self.gkDistortFactor.get())) - self.csound.SetChannel("gkReverbscFeedback", float(self.gkReverbscFeedback.get())) + self.csound.SetChannel("gkReverbscFeedback", float(self.gkReverbscFeedback.get())) self.csound.SetChannel("gkMasterLevel", float(self.gkMasterLevel.get())) # Tkinter only likes 1 thread per application. - # So, we hack the rules and switch back and forth between + # So, we hack the rules and switch back and forth between # computing sound and handling GUI events. # When the user closes the application, self.update will raise # an exception because the application has been destroyed. kperiod = 1 - while self.playing and not self.csound.performKsmps(): + while self.playing and not self.csound.PerformKsmps(): kperiod = kperiod + 1 if kperiod % 10000 == 0: scoreTime = self.csound.GetScoreTime() @@ -582,8 +589,8 @@ self.update() except TclError: traceback.print_exc() - self.csound.cleanup() self.playing = False + self.csound.Reset() self.playButton['text'] = 'Play' self.playing = False if output != 'Audio': @@ -591,7 +598,7 @@ print print 'Soundfile: "%s"' % soundfileName os.spawnl(os.P_NOWAIT, soundfilePlayer, soundfilePlayer, soundfileName) - print + print except: traceback.print_exc() else: @@ -601,7 +608,7 @@ self.playing = False except: print traceback.print_exc() - + def on_load(self): try: filename = tkFileDialog.askopenfilename(filetypes=[('Drone files', "*.pickled"), ("All files", "*")]) @@ -614,7 +621,7 @@ except: traceback.print_exc() - + def on_save(self): try: self.configuration.output = self.outputStringVar.get() @@ -626,13 +633,13 @@ self.master.title('D R O N E %s' % filename) except: traceback.print_exc() - + def on_gkHarmonicTableFactor(self, value): f = float(value) self.configuration.gkHarmonicTableFactor = f message = 'f 1 0 65536 10 3 0 %f 0 0 %f\n' % (f * 1.0, f * 2.0) self.csound.inputMessage(message) - + def on_gkDistortTableFactor(self, value): f = float(value) self.configuration.gkDistortTableFactor = f @@ -655,7 +662,7 @@ tk = Tix.Tk() application = Application(tk) application.mainloop() - # Before the application exits, its reference to Csound + # Before the application exits, its reference to Csound # must be nulled, so that Csound is not deleted twice # (once by Tkinter and once by the Python garbage collector). application.csound = None diff -Nru csound-6.01~dfsg/frontends/CMakeLists.txt csound-6.02~dfsg/frontends/CMakeLists.txt --- csound-6.01~dfsg/frontends/CMakeLists.txt 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/frontends/CMakeLists.txt 2014-01-07 16:54:20.000000000 +0000 @@ -3,39 +3,11 @@ option(BUILD_WINSOUND "Build the Winsound frontend. Requires FLTK headers and libs." OFF) option(BUILD_CSOUND_VST "Build the CsoundVST frontend. Requires the Steinberg VST SDK 2.3." OFF) - - # first, try to use fltk-config for fltk >= 1.3 (FindFLTK is buggy - # on Unix, where e.g. xft and xinerama options are not dealt with) - find_program(FLTK_CONFIG_SCRIPT fltk-config) - if(FLTK_CONFIG_SCRIPT) - execute_process(COMMAND ${FLTK_CONFIG_SCRIPT} --api-version - OUTPUT_VARIABLE FLTK_VERSION) - string(STRIP FLTK_VERSION FLTK_VERSION) - if(FLTK_VERSION GREATER 1.1) - set(HAVE_FLTK "Fltk") - set(FLTK_FOUND 1) - message(STATUS "Using fltk-config script for Fltk " ${FLTK_VERSION}) - execute_process(COMMAND ${FLTK_CONFIG_SCRIPT} --includedir - OUTPUT_VARIABLE FLTK_INCLUDE_DIR) - string(STRIP FLTK_INCLUDE_DIR FLTK_INCLUDE_DIR) - execute_process(COMMAND ${FLTK_CONFIG_SCRIPT} --ldflags - OUTPUT_VARIABLE FLTK_LIBRARIES) - string(STRIP FLTK_LIBRARIES FLTK_LIBRARIES) - string(REGEX MATCH "fltk[_ ]jpeg" FLTK_JPEG ${FLTK_LIBRARIES}) - string(REGEX MATCH "fltk[_ ]z" FLTK_Z ${FLTK_LIBRARIES}) - string(REGEX MATCH "fltk[_ ]png" FLTK_PNG ${FLTK_LIBRARIES}) - endif(FLTK_VERSION GREATER 1.1) - endif(FLTK_CONFIG_SCRIPT) - if(NOT HAVE_FLTK) - - set(FLTK_SKIP_OPENGL true) - find_package(FLTK) - endif() - find_package(FLEX) find_package(BISON) find_path(PD_HEADER_PATH m_pd.h) +find_library(PD_LIBRARY pd.dll) ## Csound Commandline Executable ## set(CS_MAIN_SRCS csound/csound_main.c) @@ -58,7 +30,7 @@ endif() math(EXPR i "${i}+1") endwhile() - + set_target_properties(${libname} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BUILD_PLUGINS_DIR} LIBRARY_OUTPUT_DIRECTORY ${BUILD_PLUGINS_DIR} @@ -83,7 +55,7 @@ check_deps(BUILD_CSBEATS FLEX_EXECUTABLE BISON_EXECUTABLE) if(BUILD_CSBEATS) - + BISON_TARGET(csbeats_PARSER beats/beats.y ${CMAKE_CURRENT_BINARY_DIR}/beats.tab.c) FLEX_TARGET(csbeats_SCANNER beats/beats.l ${CMAKE_CURRENT_BINARY_DIR}/beatslex.yy.c) @@ -98,34 +70,44 @@ ${BISON_csbeats_PARSER_OUTPUTS}) make_executable(csbeats "${csbeats_SRCS}" "m") - + endif() #PD Interface -check_deps(BUILD_PD_CLASS PD_HEADER_PATH) +if(WIN_32) + check_deps(BUILD_PD_CLASS PD_HEADER_PATH PD_LIBRARY) +else() + check_deps(BUILD_PD_CLASS PD_HEADER_PATH) +endif() if(BUILD_PD_CLASS) - include_directories(${PD_HEADER_PATH}) if(LINUX) set(pdname "csound6~.pd_linux") elseif(APPLE) - set(pdname "csound6~.pd_darwin") + set(pdname "csound6~.pd_darwin") elseif(WIN32) set(pdname "csound6~.dll") endif() - add_library(${pdname} MODULE csoundapi_tilde/csoundapi_tilde.c) - target_link_libraries (${pdname} ${CSOUNDLIB}) + if(WIN32) + target_link_libraries (${pdname} ${CSOUNDLIB} ${PD_LIBRARY}) + set_target_properties(${pdname} PROPERTIES "LINK_FLAGS" + "-Wl,--allow-multiple-definition") + else() + target_link_libraries (${pdname} ${CSOUNDLIB}) + endif() set_target_properties(${pdname} PROPERTIES PREFIX "" - SUFFIX "") + SUFFIX "" + RUNTIME_OUTPUT_DIRECTORY ${BUILD_PLUGINS_DIR} + LIBRARY_OUTPUT_DIRECTORY ${BUILD_PLUGINS_DIR} + ARCHIVE_OUTPUT_DIRECTORY ${BUILD_PLUGINS_DIR}) if(APPLE) - set_target_properties(${pdname} PROPERTIES "LINK_FLAGS" - "-flat_namespace -undefined suppress") - ENDIF(APPLE) + set_target_properties(${pdname} PROPERTIES "LINK_FLAGS" + "-flat_namespace -undefined suppress") + endif(APPLE) install(TARGETS ${pdname} LIBRARY DESTINATION ${LIBRARY_INSTALL_DIR}) - endif() @@ -137,13 +119,13 @@ set(WINSOUND_H ${CMAKE_CURRENT_BINARY_DIR}/winsound.h) set_source_files_properties(${WINSOUND_CXX} GENERATED) set_source_files_properties(${WINSOUND_H} GENERATED) - add_custom_target(winsound_fl COMMAND fluid -c -o ${WINSOUND_CXX} -h ${WINSOUND_H} ${WINSOUND_FL}) - + add_custom_target(winsound_fl COMMAND fluid -c -o ${WINSOUND_CXX} -h $ --{WINSOUND_H} ${WINSOUND_FL}) + set(WINSOUND_SRCS ${WINSOUND_CXX} winsound/main.cxx) make_executable(winsound "${WINSOUND_SRCS}" "${FLTK_LIBRARIES}") target_link_libraries (winsound ${CSOUNDLIB}) - add_dependencies(winsound winsound_fl) + add_dependencies(winsound winsound_fl) include_directories(${FLTK_INCLUDE_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/winsound) diff -Nru csound-6.01~dfsg/frontends/CsoundAC/CMakeLists.txt csound-6.02~dfsg/frontends/CsoundAC/CMakeLists.txt --- csound-6.01~dfsg/frontends/CsoundAC/CMakeLists.txt 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/frontends/CsoundAC/CMakeLists.txt 2014-01-07 16:54:20.000000000 +0000 @@ -9,11 +9,6 @@ find_package(Boost) find_library(MUSICXML_LIBRARY musicxml2) -IF(APPLE) -find_library(FLTK libfltk) -ELSE(APPLE) -# find_package(FLTK) -ENDIF(APPLE) find_package(SWIG) find_package(PythonLibs) find_library(LUAJIT_LIBRARY luajit) diff -Nru csound-6.01~dfsg/frontends/CsoundAC/MusicModel.cpp csound-6.02~dfsg/frontends/CsoundAC/MusicModel.cpp --- csound-6.01~dfsg/frontends/CsoundAC/MusicModel.cpp 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/frontends/CsoundAC/MusicModel.cpp 2014-01-07 16:54:20.000000000 +0000 @@ -72,10 +72,10 @@ } cppSound->addScoreLine(score.getCsoundScore(tonesPerOctave, conformPitches)); char buffer[0x100]; - std::sprintf(buffer, "\ns %9.3f", extendSeconds); - cppSound->addScoreLine(buffer); - //std::sprintf(buffer, "\ne %9.3f", extendSeconds); + //std::sprintf(buffer, "\ns %9.3f", extendSeconds); //cppSound->addScoreLine(buffer); + std::sprintf(buffer, "\ne %9.3f\n", extendSeconds); + cppSound->addScoreLine(buffer); //cppSound->exportForPerformance(); } diff -Nru csound-6.01~dfsg/frontends/CsoundVST/CMakeLists.txt csound-6.02~dfsg/frontends/CsoundVST/CMakeLists.txt --- csound-6.01~dfsg/frontends/CsoundVST/CMakeLists.txt 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/frontends/CsoundVST/CMakeLists.txt 2014-01-07 16:54:20.000000000 +0000 @@ -46,8 +46,31 @@ target_link_libraries(CsoundVST libcsnd6 ${CSOUNDLIB} ${FLTK_LIBRARIES} ${LIBSNDFILE_LIBRARY} ${MUSICXML_LIBRARY}) endif() + set(CSOUNDVST_MAIN_SRCS + csoundvst_main.cpp + ${VSTSDK2X_DIR}/public.sdk/source/vst2.x/audioeffect.cpp + ${VSTSDK2X_DIR}/public.sdk/source/vst2.x/audioeffectx.cpp) + add_executable(csoundvstmain ${CSOUNDVST_MAIN_SRCS}) + set_target_properties(csoundvstmain PROPERTIES + LINK_INTERFACE_LIBRARIES "" + OUTPUT_NAME csoundvstmain + RUNTIME_OUTPUT_DIRECTORY ${BUILD_BIN_DIR} + LIBRARY_OUTPUT_DIRECTORY ${BUILD_LIB_DIR} + ARCHIVE_OUTPUT_DIRECTORY ${BUILD_LIB_DIR} + ) + target_link_libraries(csoundvstmain ${CsoundVST} libcsnd6 ${CSOUNDLIB} ${FLTK_LIBRARIES} ${LIBSNDFILE_LIBRARY}) + + if(MUSICXML_LIBRARY) + target_link_libraries(csoundvstmain ${CsoundVST} libcsnd6 ${CSOUNDLIB} ${FLTK_LIBRARIES} ${LIBSNDFILE_LIBRARY} ${MUSICXML_LIBRARY}) + endif() + + install(TARGETS CsoundVST + RUNTIME DESTINATION ${LIBRARY_INSTALL_DIR} LIBRARY DESTINATION ${LIBRARY_INSTALL_DIR} ARCHIVE DESTINATION ${LIBRARY_INSTALL_DIR}) + install(TARGETS csoundvstmain + RUNTIME DESTINATION "${EXECUTABLE_INSTALL_DIR}") + endif() diff -Nru csound-6.01~dfsg/frontends/CsoundVST/CsoundVST.cpp csound-6.02~dfsg/frontends/CsoundVST/CsoundVST.cpp --- csound-6.01~dfsg/frontends/CsoundVST/CsoundVST.cpp 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/frontends/CsoundVST/CsoundVST.cpp 2014-01-07 16:54:20.000000000 +0000 @@ -170,7 +170,7 @@ sprintf(buffer, "Program%d", (int)(i + 1)); bank[i].name = buffer; } - setCommand("csound -f -h -+rtmidi=null -M0 -d -n -m7 --midi-key-oct=4 --midi-velocity=5 temp.orc temp.sco"); + setCommand("csound -f -h -+rtmidi=null -M0 -d -n -m7 --midi-key-oct=4 --midi-velocity=5"); } CsoundVST::CsoundVST() : @@ -269,6 +269,11 @@ return 0; } +int CsoundVST::midiDeviceClose(CSOUND *csound, void *userData) +{ + return 0; +} + uintptr_t CsoundVST::performanceThreadRoutine() { stop(); @@ -284,15 +289,15 @@ vstcommand.append(command); if (command.find(".orc") == std::string::npos && command.find(".sco") == std::string::npos) { updateCommand = true; - vstcommand.append(" temp.orc temp.sco"); + //vstcommand.append(" temp.orc temp.sco"); } if (updateCommand) { setCommand(vstcommand); std::string buffer = getCommand(); csoundVstFltk->commandInput->value(buffer.c_str()); } - exportForPerformance(); - Message("Saved as: '%s' and '%s'.\n", getOrcFilename().c_str(), getScoFilename().c_str()); + //exportForPerformance(); + //Message("Saved as: '%s' and '%s'.\n", getOrcFilename().c_str(), getScoFilename().c_str()); reset(); // FLTK flags is the sum of any of the following values: // 1: disable widget opcodes by setting up dummy opcodes instead @@ -320,8 +325,11 @@ } if(getIsVst()) { Message("Compiling for VST performance.\n"); + SetHostImplementedAudioIO(1, 0); + SetHostImplementedMIDIIO(1); SetExternalMidiInOpenCallback(&CsoundVST::midiDeviceOpen); SetExternalMidiReadCallback(&CsoundVST::midiRead); + SetExternalMidiInCloseCallback(&CsoundVST::midiDeviceClose); if(compile()) { Message("Csound compilation failed.\n"); reset(); @@ -466,10 +474,10 @@ midiData[cnt + 1] = (unsigned char) event.midiData[1]; midiData[cnt + 2] = (unsigned char) event.midiData[2]; csoundVST->midiEventQueue.pop_front(); - //~ Message("CsoundVST::midiRead(%x, %x, %x)\n", - //~ (int) midiData[cnt + 0], - //~ (int) midiData[cnt + 1], - //~ (int) midiData[cnt + 2]); + //csoundVST->Message("CsoundVST::midiRead(%x, %x, %x)\n", + //(int) midiData[cnt + 0], + //(int) midiData[cnt + 1], + //(int) midiData[cnt + 2]); switch ((int) midiData[cnt] & 0xF0) { case 0x80: /* note off */ case 0x90: /* note on */ @@ -814,6 +822,17 @@ extern "C" { + PUBLIC AEffect* VSTPluginMain(audioMasterCallback audioMaster) + { + if (!audioMaster (0, audioMasterVersion, 0, 0, 0, 0)) { + return 0; + } + AudioEffect* effect = new CsoundVST(audioMaster); + if (!effect) { + return 0; + } + return effect->getAeffect(); + } SILENCE_PUBLIC CsoundVST* CreateCsoundVST() { CsoundVST *csoundVST = new CsoundVST; diff -Nru csound-6.01~dfsg/frontends/CsoundVST/CsoundVST.hpp csound-6.02~dfsg/frontends/CsoundVST/CsoundVST.hpp --- csound-6.01~dfsg/frontends/CsoundVST/CsoundVST.hpp 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/frontends/CsoundVST/CsoundVST.hpp 2014-01-07 16:54:20.000000000 +0000 @@ -132,6 +132,7 @@ virtual VstIntPtr dispatcher (VstInt32 opcode, VstInt32 index, VstIntPtr value, void* ptr, float opt); static int midiDeviceOpen(CSOUND *csound, void **userData, const char *devName); + static int midiDeviceClose(CSOUND *csound, void *userData); static int midiRead(CSOUND *csound, void *userData, unsigned char *buf, int nbytes); }; @@ -140,8 +141,9 @@ extern "C" { - SILENCE_PUBLIC CsoundVST* CreateCsoundVST(); - SILENCE_PUBLIC void RunCsoundVST(const char *filename); + SILENCE_PUBLIC AEffect* VSTPluginMain(audioMasterCallback audioMaster); + SILENCE_PUBLIC CsoundVST* CreateCsoundVST(); + SILENCE_PUBLIC void RunCsoundVST(const char *filename); } #endif diff -Nru csound-6.01~dfsg/frontends/CsoundVST/CsoundVSTMain.cpp csound-6.02~dfsg/frontends/CsoundVST/CsoundVSTMain.cpp --- csound-6.01~dfsg/frontends/CsoundVST/CsoundVSTMain.cpp 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/frontends/CsoundVST/CsoundVSTMain.cpp 2014-01-07 16:54:20.000000000 +0000 @@ -25,6 +25,25 @@ #include "CsoundVST.hpp" +#ifdef VSTPluginMain +#undef VSTPluginMain +#endif + +extern "C" +{ + PUBLIC AEffect* VSTPluginMain(audioMasterCallback audioMaster) + { + if (!audioMaster (0, audioMasterVersion, 0, 0, 0, 0)) { + return 0; + } + AudioEffect* effect = new CsoundVST(audioMaster); + if (!effect) { + return 0; + } + return effect->getAeffect(); + } +}; + AudioEffect *createEffectInstance(audioMasterCallback audioMaster) { return new CsoundVST (audioMaster); diff -Nru csound-6.01~dfsg/frontends/csoundapi_tilde/csoundapi_tilde.c csound-6.02~dfsg/frontends/csoundapi_tilde/csoundapi_tilde.c --- csound-6.01~dfsg/frontends/csoundapi_tilde/csoundapi_tilde.c 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/frontends/csoundapi_tilde/csoundapi_tilde.c 2014-01-07 16:54:20.000000000 +0000 @@ -24,10 +24,10 @@ */ #include -#include +#include #include #include "csound.h" - + #define CS_MAX_CHANS 32 #define MAXMESSTRING 16384 @@ -341,7 +341,7 @@ t_sample *out[CS_MAX_CHANS], *in[CS_MAX_CHANS]; t_int i, n, end = x->end, run = x->run; MYFLT *csout, *csin; - + csout = csoundGetSpout(x->csound); csin = csoundGetSpin(x->csound); diff -Nru csound-6.01~dfsg/frontends/max_csound_tilde/ChangeLog csound-6.02~dfsg/frontends/max_csound_tilde/ChangeLog --- csound-6.01~dfsg/frontends/max_csound_tilde/ChangeLog 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/frontends/max_csound_tilde/ChangeLog 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,14 @@ +csound~ + +This ChangeLog tracks changes after Matt Ingalls and Davis Pyon's original +project work was moved into the Csound 6 central repository. + + +v1.1.1 +====== + +* fixed issues when running in 32-bit mode Max/MSP due to direct accessing of +values in t_atom, rather than using atom_getlong, atom_getfloat, etc. + +* fixed invalue channel callback code; caused crashes when invalue opcode was +used diff -Nru csound-6.01~dfsg/frontends/max_csound_tilde/installer/build-installer.sh csound-6.02~dfsg/frontends/max_csound_tilde/installer/build-installer.sh --- csound-6.01~dfsg/frontends/max_csound_tilde/installer/build-installer.sh 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/frontends/max_csound_tilde/installer/build-installer.sh 2014-01-07 16:54:20.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/sh -export CS_TILDE_VERSION=1.1.0 +export CS_TILDE_VERSION=1.1.1 export MANUAL_DIR=`pwd`/../../../manual6 export PACKAGE_NAME=csound~_${CS_TILDE_VERSION}.pkg export DMG_DIR="csound~_${CS_TILDE_VERSION}" @@ -67,7 +67,7 @@ echo "building packages ..." #pkgbuild --identifier com.csound.csound6Environment.csound~ --root installer/Package_Contents/ --version 1 --scripts ../PkgResources/csound~ csound~_v1.1.0.pkg -pkgbuild --identifier com.csound.csound6Environment.csound~ --root installer/Package_Contents/ --version 1 csound~_v1.1.0.pkg +pkgbuild --identifier com.csound.csound6Environment.csound~ --root installer/Package_Contents/ --version 1 csound~_v${CS_TILDE_VERSION}.pkg #echo "building product..." diff -Nru csound-6.01~dfsg/frontends/max_csound_tilde/src/Args.cpp csound-6.02~dfsg/frontends/max_csound_tilde/src/Args.cpp --- csound-6.01~dfsg/frontends/max_csound_tilde/src/Args.cpp 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/frontends/max_csound_tilde/src/Args.cpp 2014-01-07 16:54:20.000000000 +0000 @@ -146,12 +146,12 @@ { if(argv[i].a_type == A_LONG) { - sprintf(tmp2, "%d", argv[i].a_w.w_long); + sprintf(tmp2, "%lld", (long long)atom_getlong(&argv[i])); m_list.push_back(tmp2); } else if(argv[i].a_type == A_FLOAT) { - sprintf(tmp2, "%f", argv[i].a_w.w_float); + sprintf(tmp2, "%f", atom_getfloat(&argv[i])); m_list.push_back(tmp2); } else if(argv[i].a_type == A_SYM) diff -Nru csound-6.01~dfsg/frontends/max_csound_tilde/src/CsoundObject.cpp csound-6.02~dfsg/frontends/max_csound_tilde/src/CsoundObject.cpp --- csound-6.01~dfsg/frontends/max_csound_tilde/src/CsoundObject.cpp 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/frontends/max_csound_tilde/src/CsoundObject.cpp 2014-01-07 16:54:20.000000000 +0000 @@ -512,8 +512,12 @@ void inputValueCallback(CSOUND *csound, const char *name, void *channelValuePtr, const void *channelType) { - CsoundObject *cso = (CsoundObject *) csoundGetHostData(csound); - if(cso->m_x->input) cso->m_iChanGroup.GetVal(name, (MYFLT*)channelValuePtr ); +// CsoundObject *cso = (CsoundObject *) csoundGetHostData(csound); + + t_csound *x = (t_csound *) csoundGetHostData(csound); + if(x->input) { + x->cso->m_iChanGroup.GetVal(name, (MYFLT*)channelValuePtr ); + } } void outputValueCallback(CSOUND *csound, const char *name, void *channelValuePtr, const void *channelType) diff -Nru csound-6.01~dfsg/frontends/max_csound_tilde/src/CsoundTable.cpp csound-6.02~dfsg/frontends/max_csound_tilde/src/CsoundTable.cpp --- csound-6.01~dfsg/frontends/max_csound_tilde/src/CsoundTable.cpp 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/frontends/max_csound_tilde/src/CsoundTable.cpp 2014-01-07 16:54:20.000000000 +0000 @@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include #include "CsoundTable.h" #include "buffer.h" // Leave this out of CsoundTable.h; it causes conflicts with boost/max header combo. diff -Nru csound-6.01~dfsg/frontends/max_csound_tilde/src/channel.cpp csound-6.02~dfsg/frontends/max_csound_tilde/src/channel.cpp --- csound-6.01~dfsg/frontends/max_csound_tilde/src/channel.cpp 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/frontends/max_csound_tilde/src/channel.cpp 2014-01-07 16:54:20.000000000 +0000 @@ -104,7 +104,7 @@ ChannelGroup::ChannelGroup(t_object *o, CSOUND *c, Direction d) : - m_channels(), m_direction(d), m_obj(o), m_csound(c), m_lock("ChannelGroup"), m_cmp_co("", 0), + m_channels(), m_direction(d), m_obj(o), m_csound(c), m_lock((char*)"ChannelGroup"), m_cmp_co((char*)"", 0), m_audio_thread_atom_buffer(2), m_clock_thread_atom_buffer(2) { diff -Nru csound-6.01~dfsg/frontends/max_csound_tilde/src/csound~.cpp csound-6.02~dfsg/frontends/max_csound_tilde/src/csound~.cpp --- csound-6.01~dfsg/frontends/max_csound_tilde/src/csound~.cpp 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/frontends/max_csound_tilde/src/csound~.cpp 2014-01-07 16:54:20.000000000 +0000 @@ -180,12 +180,12 @@ switch(arg) { case 0: sprintf(s, "(signal) Audio In 0 / (int) MIDI Input"); break; - default: sprintf(s, "(signal) Audio In %l", arg); break; + default: sprintf(s, "(signal) Audio In %ld", arg); break; } } else if(msg == ASSIST_OUTLET) { - if(arg < x->numOutSignals) sprintf(s, "(signal) Audio Out %l", arg); + if(arg < x->numOutSignals) sprintf(s, "(signal) Audio Out %ld", arg); else { i = arg - x->numOutSignals; @@ -366,7 +366,8 @@ void csound_dsp64(t_csound *x, t_object *dsp64, short *count, double samplerate, long maxvectorsize, long flags) { CsoundObject *cso = x->cso; - int i=0, totalVectors=0; +// int i=0, totalVectors=0; + int totalVectors=0; // void **perform_args; totalVectors = x->numInSignals + x->numOutSignals; @@ -429,8 +430,8 @@ name = argv[0].a_w.w_sym->s_name; switch(argv[1].a_type) { - case A_FLOAT: f_val = (MYFLT) argv[1].a_w.w_float; break; - case A_LONG: f_val = (MYFLT) argv[1].a_w.w_long; break; + case A_FLOAT: f_val = (MYFLT) atom_getfloat(&argv[1]); break; + case A_LONG: f_val = (MYFLT) atom_getlong(&argv[1]); break; case A_SYM: s_val = argv[1].a_w.w_sym->s_name; break; } @@ -476,7 +477,7 @@ switch(argv[i].a_type) { case A_LONG: - buffer[i] = (byte) argv[i].a_w.w_long; + buffer[i] = (byte) atom_getlong(&argv[i]); break; default: object_error(x->m_obj, "Only integers are allowed in midi messages."); @@ -543,12 +544,12 @@ switch(argv[i].a_type) { case A_LONG: - sprintf(tmp, " %lld", argv[i].a_w.w_long); + sprintf(tmp, " %lld", (long long)atom_getlong(&argv[i])); totalSize += strlen(tmp); strncat(buffer, tmp, MAX_EVENT_MESSAGE_SIZE - strlen(buffer) - 1); break; case A_FLOAT: - sprintf(tmp, " %f", argv[i].a_w.w_float); + sprintf(tmp, " %f", atom_getfloat(&argv[i])); totalSize += strlen(tmp); strncat(buffer, tmp, MAX_EVENT_MESSAGE_SIZE - strlen(buffer) - 1); break; @@ -649,7 +650,7 @@ switch(argv[i].a_type) { case A_LONG: - iarg = argv[i].a_w.w_long; + iarg = atom_getlong(&argv[i]); if(lastAttr != NULL) { @@ -664,9 +665,9 @@ else { if(numArgCount == 0) - x->numInSignals = x->numOutSignals = argv[i].a_w.w_long; + x->numInSignals = x->numOutSignals = atom_getlong(&argv[i]); else if(numArgCount == 1) - x->numOutSignals = argv[i].a_w.w_long; + x->numOutSignals = atom_getlong(&argv[i]); else object_error(x->m_obj, "Too many integer arguments."); ++numArgCount; @@ -1019,8 +1020,8 @@ float sizeSeconds = 0.0f; if(argc < 3 || argv[0].a_type != A_LONG || argv[1].a_type != A_LONG || argv[2].a_type != A_SYM) return; - tableNum = argv[0].a_w.w_long; - channel = argv[1].a_w.w_long; + tableNum = atom_getlong(&argv[0]); + channel = atom_getlong(&argv[1]); strncpy(filename, argv[2].a_w.w_sym->s_name, MAX_STRING_LENGTH-1); // If 4'th argument exists, it specifies offset time in seconds. @@ -1028,8 +1029,8 @@ { switch(argv[3].a_type) { - case A_FLOAT: offsetSeconds = argv[3].a_w.w_float; break; - case A_LONG: offsetSeconds = (float) argv[3].a_w.w_long; break; + case A_FLOAT: offsetSeconds = (float) atom_getfloat(&argv[3]); break; + case A_LONG: offsetSeconds = (float) atom_getlong(&argv[3]); break; } } @@ -1038,8 +1039,8 @@ { switch(argv[4].a_type) { - case A_FLOAT: sizeSeconds = argv[4].a_w.w_float; break; - case A_LONG: sizeSeconds = (float) argv[4].a_w.w_long; break; + case A_FLOAT: sizeSeconds = atom_getfloat(&argv[4]); break; + case A_LONG: sizeSeconds = (float) atom_getlong(&argv[4]); break; } } @@ -1072,16 +1073,16 @@ float sizeSeconds = 0.0f; if(argc < 3 || argv[0].a_type != A_LONG || argv[1].a_type != A_LONG || argv[2].a_type != A_SYM) return; - tableNum = argv[0].a_w.w_long; - channel = argv[1].a_w.w_long; + tableNum = atom_getlong(&argv[0]); + channel = atom_getlong(&argv[1]); // If 4'th argument exists, it specifies offset time in seconds. if(argc > 3) { switch(argv[3].a_type) { - case A_FLOAT: offsetSeconds = argv[3].a_w.w_float; break; - case A_LONG: offsetSeconds = (float) argv[3].a_w.w_long; break; + case A_FLOAT: offsetSeconds = (float) atom_getfloat(&argv[3]); break; + case A_LONG: offsetSeconds = (float) atom_getlong(&argv[3]); break; } } @@ -1090,8 +1091,8 @@ { switch(argv[4].a_type) { - case A_FLOAT: sizeSeconds = argv[4].a_w.w_float; break; - case A_LONG: sizeSeconds = (float) argv[4].a_w.w_long; break; + case A_FLOAT: sizeSeconds = (float) atom_getfloat(&argv[4]); break; + case A_LONG: sizeSeconds = (float) atom_getlong(&argv[4]); break; } } @@ -1112,16 +1113,16 @@ float sizeSeconds = 0.0f; if(argc < 3 || argv[0].a_type != A_LONG || argv[1].a_type != A_LONG || argv[2].a_type != A_SYM) return; - tableNum = argv[0].a_w.w_long; - channel = argv[1].a_w.w_long; + tableNum = atom_getlong(&argv[0]); + channel = atom_getlong(&argv[1]); // If 4'th argument exists, it specifies offset time in seconds. if(argc > 3) { switch(argv[3].a_type) { - case A_FLOAT: offsetSeconds = argv[3].a_w.w_float; break; - case A_LONG: offsetSeconds = (float) argv[3].a_w.w_long; break; + case A_FLOAT: offsetSeconds = (float) atom_getfloat(&argv[3]); break; + case A_LONG: offsetSeconds = (float) atom_getlong(&argv[3]); break; } } @@ -1130,8 +1131,8 @@ { switch(argv[4].a_type) { - case A_FLOAT: sizeSeconds = argv[4].a_w.w_float; break; - case A_LONG: sizeSeconds = (float) argv[4].a_w.w_long; break; + case A_FLOAT: sizeSeconds = (float) atom_getfloat(&argv[4]); break; + case A_LONG: sizeSeconds = (float) atom_getlong(&argv[4]); break; } } @@ -1151,8 +1152,8 @@ MYFLT val; if(argc != 2 || argv[0].a_type != A_LONG || argv[1].a_type != A_LONG) return; - tableNum = argv[0].a_w.w_long; - index = argv[1].a_w.w_long; + tableNum = atom_getlong(&argv[0]); + index = atom_getlong(&argv[1]); if(index < 0) return; { @@ -1167,9 +1168,9 @@ switch(result) { case 0: - x->atomList[1].a_w.w_long = tableNum; - x->atomList[2].a_w.w_long = index; - x->atomList[3].a_w.w_float = (float) val; + atom_setlong(&x->atomList[1], (t_atom_long)tableNum); + atom_setlong(&x->atomList[2], (t_atom_long)index); + atom_setfloat(&x->atomList[3], (t_atom_float)val); outlet_list(x->message_outlet, 0L, 4, x->atomList); break; case 1: @@ -1188,9 +1189,9 @@ if(argc != 3 || argv[0].a_type != A_LONG || argv[1].a_type != A_LONG || (argv[2].a_type != A_FLOAT && argv[2].a_type != A_LONG)) return; - tableNum = argv[0].a_w.w_long; - index = argv[1].a_w.w_long; - val = (float)(argv[2].a_type == A_FLOAT ? argv[2].a_w.w_float : argv[2].a_w.w_long); + tableNum = atom_getlong(&argv[0]); + index = atom_getlong(&argv[1]); + val = (float)(argv[2].a_type == A_FLOAT ? atom_getfloat(&argv[2]) : atom_getlong(&argv[2])); if(index < 0) return; { @@ -1232,11 +1233,11 @@ switch(argv[i].a_type) { case A_FLOAT: - snprintf(tmp, MAX_STRING_LENGTH-1, "%l", argv[i].a_w.w_long); + snprintf(tmp, MAX_STRING_LENGTH-1, "%f", (float)atom_getfloat(&argv[i])); args[i] = strdup(tmp); break; case A_LONG: - snprintf(tmp, MAX_STRING_LENGTH-1, "%f", argv[i].a_w.w_float); + snprintf(tmp, MAX_STRING_LENGTH-1, "%lld", (long long)atom_getlong(&argv[i])); args[i] = strdup(tmp); break; case A_SYM: @@ -1276,10 +1277,10 @@ switch(argv[i].a_type) { case A_FLOAT: - snprintf(tmp, MAX_STRING_LENGTH-1, "%d", argv[i].a_w.w_long); + snprintf(tmp, MAX_STRING_LENGTH-1, "%f", (float)atom_getfloat(&argv[i])); break; case A_LONG: - snprintf(tmp, MAX_STRING_LENGTH-1, "%f", argv[i].a_w.w_float); + snprintf(tmp, MAX_STRING_LENGTH-1, "%lld", (long long)atom_getlong(argv[i])); break; case A_SYM: strncpy(tmp, argv[i].a_w.w_sym->s_name, MAX_STRING_LENGTH-1); diff -Nru csound-6.01~dfsg/frontends/max_csound_tilde/src/message_buffer.h csound-6.02~dfsg/frontends/max_csound_tilde/src/message_buffer.h --- csound-6.01~dfsg/frontends/max_csound_tilde/src/message_buffer.h 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/frontends/max_csound_tilde/src/message_buffer.h 2014-01-07 16:54:20.000000000 +0000 @@ -69,4 +69,4 @@ } // namespace dvx -#endif _MESSAGE_BUFFER_H \ No newline at end of file +#endif //_MESSAGE_BUFFER_H \ No newline at end of file diff -Nru csound-6.01~dfsg/frontends/max_csound_tilde/src/midi.cpp csound-6.02~dfsg/frontends/max_csound_tilde/src/midi.cpp --- csound-6.01~dfsg/frontends/max_csound_tilde/src/midi.cpp 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/frontends/max_csound_tilde/src/midi.cpp 2014-01-07 16:54:20.000000000 +0000 @@ -25,7 +25,7 @@ using namespace dvx; -MidiBuffer::MidiBuffer(t_object * o) : m_buffer(BUFFER_SIZE), m_sysex(false), m_lock("MidiBuffer"), m_obj(o) +MidiBuffer::MidiBuffer(t_object * o) : m_buffer(BUFFER_SIZE), m_sysex(false), m_lock((char*)"MidiBuffer"), m_obj(o) { memset(m_activeNoteMatrix, 0, MIDI_MATRIX_SIZE); } diff -Nru csound-6.01~dfsg/frontends/max_csound_tilde/src/sequencer.cpp csound-6.02~dfsg/frontends/max_csound_tilde/src/sequencer.cpp --- csound-6.01~dfsg/frontends/max_csound_tilde/src/sequencer.cpp 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/frontends/max_csound_tilde/src/sequencer.cpp 2014-01-07 16:54:20.000000000 +0000 @@ -132,7 +132,7 @@ m_csound(c), m_inChannelGroup(g), m_midiInputBuffer(m), - m_lock("Sequencer"), + m_lock((char*)"Sequencer"), m_time(0), m_timerRes(1), m_nticks(0), m_fticks(0), m_nSamples(0), m_sr(DEFAULT_SAMPLE_RATE), m_playing(false), m_recording(false), diff -Nru csound-6.01~dfsg/frontends/max_csound_tilde/src/util.cpp csound-6.02~dfsg/frontends/max_csound_tilde/src/util.cpp --- csound-6.01~dfsg/frontends/max_csound_tilde/src/util.cpp 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/frontends/max_csound_tilde/src/util.cpp 2014-01-07 16:54:20.000000000 +0000 @@ -68,8 +68,8 @@ { int i=0, len=0; len = strlen(str); - while(i(opcode)->audio(csound); } /** - * For sample accurate timing, kperf may be called at some - * offset after the first frame of the kperiod. Hence, opcodes - * must output zeros up until the offset, and then output - * their signal until the end of the kperiod. After the first - * kperiod of activation, the offset will always be 0. + This is how to compute audio signals for normal opcodes: + (1) Zero all frames from 0 up to but not including Offset. + (2) Compute all frames from ksmps_offset up to but not including End. + (3) Zero all frames from End up to but not including ksmps. + Example from a C opcode: + uint32_t offset = p->h.insdshead->ksmps_offset; + uint32_t early = p->h.insdshead->ksmps_no_end; + uint32_t n, nsmps = CS_KSMPS; + if (UNLIKELY(offset)) memset(p->r, '\0', offset*sizeof(MYFLT)); + if (UNLIKELY(early)) { + nsmps -= early; + memset(&p->r[nsmps], '\0', early*sizeof(MYFLT)); + } + for (n = offset; n < nsmps; n++) { + input1 = MYFLT2LRND(p->a[n]); + p->r[n] = (MYFLT) (input1 >> input2); + } + So in C++ it should look like this (which is much easier to understand): + int frameIndex = 0; + for( ; frameIndex < kperiodOffset(); ++frameIndex) { + asignal[frameIndex] = 0; + } + for( ; frameIndex < kperiodEnd(); ++frameIndex) { + asignal[frameIndex] = compute(); + } + for( ; frameIndex < ksmps(); ++frameIndex) { + asignal[frameIndex] = 0; + } */ uint32_t kperiodOffset() const { return opds.insdshead->ksmps_offset; } + uint32_t kperiodEnd() const + { + uint32_t end = opds.insdshead->ksmps_no_end; + if (end) { + return end; + } else { + return ksmps(); + } + } uint32_t ksmps() const { return opds.insdshead->ksmps; @@ -140,16 +172,48 @@ return reinterpret_cast(opcode)->audio(csound); } /** - * For sample accurate timing, kperf may be called at some - * offset after the first frame of the kperiod. Hence, opcodes - * must output zeros up until the offset, and then output - * their signal until the end of the kperiod. After the first - * kperiod of activation, the offset will always be 0. + This is how to compute audio signals for normal opcodes: + (1) Zero all frames from 0 up to but not including Offset. + (2) Compute all frames from ksmps_offset up to but not including End. + (3) Zero all frames from End up to but not including ksmps. + Example from a C opcode: + uint32_t offset = p->h.insdshead->ksmps_offset; + uint32_t early = p->h.insdshead->ksmps_no_end; + uint32_t n, nsmps = CS_KSMPS; + if (UNLIKELY(offset)) memset(p->r, '\0', offset*sizeof(MYFLT)); + if (UNLIKELY(early)) { + nsmps -= early; + memset(&p->r[nsmps], '\0', early*sizeof(MYFLT)); + } + for (n = offset; n < nsmps; n++) { + input1 = MYFLT2LRND(p->a[n]); + p->r[n] = (MYFLT) (input1 >> input2); + } + So in C++ it should look like this (which is much easier to understand): + int frameIndex = 0; + for( ; frameIndex < kperiodOffset(); ++frameIndex) { + asignal[frameIndex] = 0; + } + for( ; frameIndex < kperiodEnd(); ++frameIndex) { + asignal[frameIndex] = compute(); + } + for( ; frameIndex < ksmps(); ++frameIndex) { + asignal[frameIndex] = 0; + } */ uint32_t kperiodOffset() const { return opds.insdshead->ksmps_offset; } + uint32_t kperiodEnd() const + { + uint32_t end = opds.insdshead->ksmps_no_end; + if (end) { + return end; + } else { + return ksmps(); + } + } uint32_t ksmps() const { return opds.insdshead->ksmps; diff -Nru csound-6.01~dfsg/include/csound.h csound-6.02~dfsg/include/csound.h --- csound-6.01~dfsg/include/csound.h 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/include/csound.h 2014-01-07 16:54:20.000000000 +0000 @@ -394,6 +394,7 @@ int nchnls_override; /* overriding number of out channels */ int nchnls_i_override; /* overriding number of in channels */ MYFLT e0dbfs_override; /* overriding 0dbfs */ + int daemon; /* daemon mode */ } CSOUND_PARAMS; /** @@ -2176,7 +2177,7 @@ * void *out - preallocated buffer with at least items number of elements, where * buffer contents will be read into * int items - number of samples to be read - * returns the actual number of samples read (0 <= n <= items) + * returns the actual number of items read (0 <= n <= items) */ PUBLIC int csoundReadCircularBuffer(CSOUND *csound, void *circular_buffer, void *out, int items); @@ -2187,7 +2188,7 @@ * void *out - preallocated buffer with at least items number of elements, where * buffer contents will be read into * int items - number of samples to be read - * returns the actual number of samples read (0 <= n <= items) + * returns the actual number of items read (0 <= n <= items) */ PUBLIC int csoundPeekCircularBuffer(CSOUND *csound, void *circular_buffer, void *out, int items); diff -Nru csound-6.01~dfsg/include/csoundCore.h csound-6.02~dfsg/include/csoundCore.h --- csound-6.01~dfsg/include/csoundCore.h 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/include/csoundCore.h 2014-01-07 16:54:20.000000000 +0000 @@ -47,7 +47,7 @@ #include #endif -#if (defined(__MACH__) || defined(ANDROID)) +#if (defined(__MACH__) || defined(ANDROID) || defined(NACL)) #define BARRIER_SERIAL_THREAD (-1) typedef struct { pthread_mutex_t mut; @@ -93,7 +93,7 @@ #define CURTIME (((double)csound->icurTime)/((double)csound->esr)) #define CURTIME_inc (((double)csound->ksmps)/((double)csound->esr)) -#ifdef USE_DOUBLE +#ifdef B64BIT #define MAXLEN 0x40000000 #define FMAXLEN ((MYFLT)(MAXLEN)) #define PHMASK 0x3fffffff @@ -213,6 +213,7 @@ int sampleAccurate; /* switch for score events sample accuracy */ int realtime; /* realtime priority mode */ MYFLT e0dbfs_override; + int daemon; } OPARMS; typedef struct arglst { @@ -425,6 +426,8 @@ /** String argument(s) (NULL if none) */ int scnt; char *strarg; + /* instance pointer */ + void *pinstance; /** Event type */ char opcod; /** Number of p-fields */ @@ -514,6 +517,7 @@ int tieflag; int reinitflag; MYFLT retval; + MYFLT *lclbas; /* base for variable memory pool */ char *strarg; /* string argument */ /* Copy of required p-field values for quick access */ MYFLT p0; @@ -621,7 +625,7 @@ /** GEN01 parameters */ GEN01ARGS gen01args; /** table data (flen + 1 MYFLT values) */ - MYFLT ftable[1]; + MYFLT *ftable; } FUNC; typedef struct { @@ -903,19 +907,24 @@ MYFLT (*GetSr)(CSOUND *); MYFLT (*GetKr)(CSOUND *); uint32_t (*GetKsmps)(CSOUND *); + /** Get number of output channels */ uint32_t (*GetNchnls)(CSOUND *); + /** Get number of input channels */ uint32_t (*GetNchnls_i)(CSOUND *); MYFLT (*Get0dBFS) (CSOUND *); + /** Get number of control blocks elapsed */ long (*GetKcounter)(CSOUND *); int64_t (*GetCurrentTimeSamples)(CSOUND *); long (*GetInputBufferSize)(CSOUND *); long (*GetOutputBufferSize)(CSOUND *); MYFLT *(*GetInputBuffer)(CSOUND *); MYFLT *(*GetOutputBuffer)(CSOUND *); + /** Set internal debug mode */ void (*SetDebug)(CSOUND *, int d); int (*GetDebug)(CSOUND *); int (*GetSizeOfMYFLT)(void); void (*GetOParms)(CSOUND *, OPARMS *); + /** Get environment variable */ const char *(*GetEnv)(CSOUND *, const char *name); /**@}*/ /** @name Message printout */ @@ -945,10 +954,15 @@ int (*GetZakBounds)(CSOUND *, MYFLT **); int (*GetTieFlag)(CSOUND *); int (*GetReinitFlag)(CSOUND *); + /** Current maximum number of strings, accessible through the strset + and strget opcodes */ int (*GetStrsmax)(CSOUND *); char *(*GetStrsets)(CSOUND *, long); + /* Fast power of two function from a precomputed table */ MYFLT (*Pow2)(CSOUND *, MYFLT a); + /* Fast power function for positive integers */ MYFLT (*intpow)(MYFLT, int32); + /* Returns a string name for the file type */ char *(*type2string)(int type); /**@}*/ /** @name Arguments to opcodes */ @@ -981,8 +995,12 @@ int (*hfgens)(CSOUND *, FUNC **, const EVTBLK *, int); int (*FTAlloc)(CSOUND *, int tableNum, int len); int (*FTDelete)(CSOUND *, int tableNum); + /** Find tables with power of two size. If table exists but is + not a power of 2, NULL is returned. */ FUNC *(*FTFind)(CSOUND *, MYFLT *argp); + /** Find any table, except deferred load tables. */ FUNC *(*FTFindP)(CSOUND *, MYFLT *argp); + /** Find any table. */ FUNC *(*FTnp2Find)(CSOUND *, MYFLT *argp); int (*GetTable)(CSOUND *, MYFLT **tablePtr, int tableNum); int (*TableLength)(CSOUND *, int table); @@ -1239,18 +1257,20 @@ int (*sprintf)(char *str, const char *format, ...); int (*sscanf)(char *str, const char *format, ...); /**@}*/ - /** @name Placeholders */ + /** @name Placeholders + To allow the API to grow while maintining backward binary compatibility. */ /**@{ */ SUBR dummyfn_2[48]; /**@}*/ - /* NO MORE PUBLIC VARIABLES IN CSOUND struct - - NB: if a new variable member is needed by the library, add it below, as a - private data member. - - If access is required solely by plugins (and not by internally by the - library), use the CreateGlobalVariable() etc. interface, instead of adding - to CSOUND. +#ifdef __BUILDING_LIBCSOUND + /* ------- private data (not to be used by hosts or externals) ------- */ + /** @name Private Data + Private Data in the CSOUND struct to be used internally by the Csound + library and should be hidden from plugins. + If a new variable member is needed by the library, add it below, as a + private data member. If access is required solely by plugins (and not + internally by the library), use the CreateGlobalVariable() etc. interface, + instead of adding to CSOUND. If you find that a plugin needs to access existing private data, first check above for an existing interface; if none is available, @@ -1259,17 +1279,19 @@ below: 1) To get the data member value: + \code returnType (*GetVar)(CSOUND *) - + \endcode 2) in case of pointers, data should be copied out to a supplied memory slot, rather than the pointer being obtained: + \code void (*GetData)(CSOUND *, dataType *) dataType var; csound->GetData(csound, &var); + \endcode */ -#ifdef __BUILDING_LIBCSOUND - /* ------- private data (not to be used by hosts or externals) ------- */ + /**@{ */ SUBR first_callback_; channelCallback_t InputChannelCallback_; channelCallback_t OutputChannelCallback_; @@ -1477,9 +1499,9 @@ } sreadStatics; struct onefileStatics__ { NAMELST *toremove; - char orcname[L_tmpnam + 4]; - char sconame[L_tmpnam + 4]; - char midname[L_tmpnam + 4]; + char *orcname; + char *sconame; + char *midname; int midiSet; int csdlinecount; } onefileStatics; @@ -1636,7 +1658,8 @@ int jumpset; int info_message_request; int modules_loaded; - struct CSOUND_ **self; + /*struct CSOUND_ **self;*/ + /**@}*/ #endif /* __BUILDING_LIBCSOUND */ }; diff -Nru csound-6.01~dfsg/include/sysdep.h csound-6.02~dfsg/include/sysdep.h --- csound-6.01~dfsg/include/sysdep.h 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/include/sysdep.h 2014-01-07 16:54:20.000000000 +0000 @@ -31,6 +31,22 @@ #endif #endif +/* this checks for 64BIT builds */ +#if defined(__MACH__) || defined(LINUX) +#include +#if ( __WORDSIZE == 64 ) +#define B64BIT +#endif +#endif + +#if defined(WIN32) +#if _WIN64 +#define B64BIT +#endif +#endif + + + #ifdef HAVE_GCC3 # undef HAVE_GCC3 #endif @@ -408,4 +424,3 @@ /* #endif */ #endif /* CSOUND_SYSDEP_H */ - diff -Nru csound-6.01~dfsg/include/text.h csound-6.02~dfsg/include/text.h --- csound-6.01~dfsg/include/text.h 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/include/text.h 2014-01-07 16:54:20.000000000 +0000 @@ -110,7 +110,8 @@ extern "C" { #endif #include -char *csoundLocalizeString(const char *s); + char *csoundLocalizeString(const char *s) + __attribute__ ((format (printf, 1,0))); /* This could be gettext but this indirection helps debugging */ #define Str(x) csoundLocalizeString(x) void init_getstring(void*); @@ -129,7 +130,8 @@ #ifdef __BUILDING_LIBCSOUND -char *csoundLocalizeString(const char *s); + char *csoundLocalizeString(const char *s) + __attribute__ ((format (printf, 1,0))); /* Deal with localisation of mesages */ #define Str(x) (x) diff -Nru csound-6.01~dfsg/include/version.h csound-6.02~dfsg/include/version.h --- csound-6.01~dfsg/include/version.h 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/include/version.h 2014-01-07 16:54:20.000000000 +0000 @@ -24,7 +24,7 @@ #ifndef CSOUND_VERSION_H #define CSOUND_VERSION_H -#define VERSION "6.01.0" +#define VERSION "6.02.0" /* Define to the full name of this package. */ #define CS_PACKAGE_NAME "Csound" @@ -38,7 +38,7 @@ /* Define to the version of this package. */ #define CS_PACKAGE_VERSION VERSION #define CS_VERSION (6) -#define CS_SUBVER (1) +#define CS_SUBVER (2) #define CS_PATCHLEVEL (0) #define CS_APIVERSION 3 /* should be increased anytime a new version diff -Nru csound-6.01~dfsg/installer/macosx/PkgResources/CsoundLib64/postinstall csound-6.02~dfsg/installer/macosx/PkgResources/CsoundLib64/postinstall --- csound-6.01~dfsg/installer/macosx/PkgResources/CsoundLib64/postinstall 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/installer/macosx/PkgResources/CsoundLib64/postinstall 2014-01-07 16:54:20.000000000 +0000 @@ -1,5 +1,6 @@ #!/bin/sh /bin/ln -sF /Library/Frameworks/CsoundLib64.framework/Resources/Java/lib_jcsound6.jnilib /Library/Java/Extensions/lib_jcsound6.jnilib +/bin/ln -sF /Library/Frameworks/CsoundLib64.framework/Versions/6.0/libcsnd6.6.0.dylib /usr/local/lib/libcsnd.6.0.dylib PY_SRC_DIR="/Library/Frameworks/CsoundLib64.framework/Resources/Python/Current" @@ -9,6 +10,12 @@ /bin/ln -sF $PY_SRC_DIR/_CsoundAC.so $PYTHON_DIR /bin/ln -sF $PY_SRC_DIR/_csnd6.so $PYTHON_DIR /bin/ln -sF $PY_SRC_DIR/csnd6.py $PYTHON_DIR +else + mkdir -p $PYTHON_DIR + /bin/ln -sF $PY_SRC_DIR/CsoundAC.py $PYTHON_DIR + /bin/ln -sF $PY_SRC_DIR/_CsoundAC.so $PYTHON_DIR + /bin/ln -sF $PY_SRC_DIR/_csnd6.so $PYTHON_DIR + /bin/ln -sF $PY_SRC_DIR/csnd6.py $PYTHON_DIR fi diff -Nru csound-6.01~dfsg/installer/macosx/PkgResources/CsoundLib64/postupgrade csound-6.02~dfsg/installer/macosx/PkgResources/CsoundLib64/postupgrade --- csound-6.01~dfsg/installer/macosx/PkgResources/CsoundLib64/postupgrade 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/installer/macosx/PkgResources/CsoundLib64/postupgrade 2014-01-07 16:53:48.000000000 +0000 @@ -1,5 +1,6 @@ #!/bin/sh /bin/ln -sF /Library/Frameworks/CsoundLib64.framework/Resources/Java/lib_jcsound6.jnilib /Library/Java/Extensions/lib_jcsound6.jnilib +/bin/ln -sF /Library/Frameworks/CsoundLib64.framework/Versions/6.0/libcsnd6.6.0.dylib /usr/local/lib/libcsnd.6.0.dylib PY_SRC_DIR="/Library/Frameworks/CsoundLib64.framework/Resources/Python/Current" diff -Nru csound-6.01~dfsg/installer/macosx/release-build-10.8.sh csound-6.02~dfsg/installer/macosx/release-build-10.8.sh --- csound-6.01~dfsg/installer/macosx/release-build-10.8.sh 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/installer/macosx/release-build-10.8.sh 2014-01-07 16:54:20.000000000 +0000 @@ -1,9 +1,9 @@ #!/bin/sh export MANUAL_DIR=`pwd`/../../../manual6 -export PACKAGE_NAME=csound6.00.1-OSX10.8-x86_64.pkg -export DMG_DIR="Csound 6.00.1" -export DMG_NAME="csound6.00.1-OSX10.8-x86_64.dmg" +export PACKAGE_NAME=csound6.02.0-OSX10.9-x86_64.pkg +export DMG_DIR="Csound 6.02.0" +export DMG_NAME="csound6.02.0-OSX10.9-x86_64.dmg" # If arg2 passed in, will cd into that dir and rebuild, otherwise # will clone from repo and do a fresh build @@ -44,8 +44,8 @@ mkdir build cd build # RUN CMAKE TWICE TO GET AROUND ISSUE WITH UNIVERSAL BUILD -cmake .. -DBUILD_INSTALLER=1 -DCMAKE_INSTALL_PREFIX=dist -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=0 -DBUILD_CSOUND_AC=1 -cmake .. -DBUILD_INSTALLER=1 -DCMAKE_INSTALL_PREFIX=dist -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES="i386;x86_64" -DBUILD_TESTS=0 -DBUILD_CSOUND_AC=1 +cmake .. -DBUILD_INSTALLER=1 -DCMAKE_INSTALL_PREFIX=dist -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=0 -DBUILD_CSOUND_AC=1 -DBUILD_FAUST_OPCODES=1 +cmake .. -DBUILD_INSTALLER=1 -DCMAKE_INSTALL_PREFIX=dist -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES="i386;x86_64" -DBUILD_TESTS=0 -DBUILD_CSOUND_AC=1 -DBUILD_FAUST_OPCODES=1 make -j6 install # BUILD FLOAT CSOUND5 @@ -69,6 +69,7 @@ export PYTHON_DIR=Versions/$CSLIBVERSION/Resources/Python/Current export TCLTK_DIR=Versions/$CSLIBVERSION/Resources/TclTk export JAVA_DIR=Versions/$CSLIBVERSION/Resources/Java +export LUA_DIR=Versions/$CSLIBVERSION/Resources/Luajit export CSLADSPA_DIR=Versions/$CSLIBVERSION/Resources/csladspa export SAMPLES_DIR=Versions/$CSLIBVERSION/Resources/samples export PD_DIR=Versions/$CSLIBVERSION/Resources/PD @@ -94,6 +95,7 @@ mkdir -p $FRAMEWORK64_DIR/$TCLTK_DIR mkdir -p $FRAMEWORK64_DIR/$PYTHON_DIR mkdir -p $FRAMEWORK64_DIR/$JAVA_DIR +mkdir -p $FRAMEWORK64_DIR/$LUA_DIR mkdir -p $FRAMEWORK64_DIR/$SAMPLES_DIR mkdir -p $FRAMEWORK64_DIR/$PD_DIR mkdir -p $FRAMEWORK64_DIR/../Documentation @@ -133,6 +135,8 @@ cp $DIST/lib/libCsoundAC.6.0.dylib $FRAMEWORK64_DIR/Versions/$CSLIBVERSION/ cp $DIST/lib/lib_jcsound6.jnilib $FRAMEWORK64_DIR/$JAVA_DIR cp $DIST/lib/csnd6.jar $FRAMEWORK64_DIR/$JAVA_DIR +cp $DIST/lib/luaCsnd6.so $FRAMEWORK64_DIR/$LUA_DIR +cp $DIST/lib/luaCsoundAC.so $FRAMEWORK64_DIR/$LUA_DIR cp $DIST/lib/csound6~.pd_darwin $FRAMEWORK64_DIR/$PD_DIR cp csound6/examples/csoundapi_tilde/csound6~-help.pd $FRAMEWORK64_DIR/$PD_DIR/ cp csound6/examples/csoundapi_tilde/csapi_demo.csd $FRAMEWORK64_DIR/$PD_DIR/ diff -Nru csound-6.01~dfsg/installer/windows/csound6.iss csound-6.02~dfsg/installer/windows/csound6.iss --- csound-6.01~dfsg/installer/windows/csound6.iss 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/installer/windows/csound6.iss 2014-01-07 16:54:20.000000000 +0000 @@ -11,12 +11,19 @@ ; All of these changes SHOULD be in the #defines immediately following this. ; Also, this installer assumes LuaJIT and CsoundAC are part of Csound core. ; At this time the following features are not included in the installer: -; Cabbage, CsoundVST. +; Cabbage, faustgen. ; I hope to change this soon. +; Uncomment the following line to build for CsoundVST. +#define CSOUNDVST + #define MyAppName "Csound6" #define MyAppVersion "6" -#define MyAppMinVersion "6.00.1" +#ifdef CSOUNDVST +#define MyAppMinVersion "6.02.0-vst" +#else +#define MyAppMinVersion "6.02.0" +#endif #define MyAppPublisher "Csound" #define MyAppURL "http://sourceforge.net/projects/csound" ; If you are not Michael Gogins, change this to your MinGW dll directory. @@ -26,9 +33,9 @@ ; If you are not Michael Gogins, change this to your MSys /usr/local/ directory. #define MyMSysUsrLocalDir "D:\msys\local\" ; If you are not Michael Gogins, change this to your Csound build directory. -#define MySourceDir "C:\Users\mkg.sorabji\csound-csound6-git\" +#define MySourceDir "C:\Users\mike\csound-csound6-git\" ; If you are not Michael Gogins, change this to your Csound reference manual build directory. -#define MyManualSourceDir "C:\Users\mkg.sorabji\csound-manual6-git\" +#define MyManualSourceDir "C:\Users\mike\csound-manual6-git\" ; If you are not Michael Gogins, change this to your Csound tutorial directory. #define MyCsoundTutorialSourceDir "D:\Dropbox\tutorial\" ; If you are not Michael Gogins, change this to your CsoundAC tutorial directory. @@ -52,18 +59,25 @@ ; If you are not Michael Gogins, change this to your STK dll directory. #define MyLibStkSourceDir "D:\msys\local\src\stk-4.4.4\" ; If you are not Michael Gogins, change this to your CsoundQt bin directory. -#define MyCsoundQtBinDir "C:\Users\mkg.sorabji\qutecsound-code\bin\" +#define MyCsoundQtBinDir "C:\Users\mike\qutecsound-code\bin\" ; If you are not Michael Gogins, change this to your Qt SDK DLL directory. -#define MyQtSdkBinDir "D:\qt-everywhere-opensource-src-5.1.0\qtbase\bin\" +#define MyQtSdkBinDir "D:\qt-everywhere-opensource-src-5.1.1\qtbase\bin\" [Components] Name: "core"; Description: "Core Csound"; Types: full custom; Flags: fixed Name: "python"; Description: "Python features (requires Python 2.7)"; Types: full; +Name: "pd"; Description: "Pure Data csound~ object (requires Pure Data)"; Types: full; +#ifdef CSOUNDVST +Name: "csoundvst"; Description: "Csound VST plugin and vst4cs opcodes"; Types: full; +#endif [Dirs] -; ALL programs and shared libraries (including opcodes and other modules) go here. +; ALL programs and shared libraries (except opcodes and other Csound modules) go here. Name: "{app}\bin"; Permissions: users-modify #define APP_BIN "{app}\bin\" +; ALL Csound opcodes and other Csound modules go here. +Name: "{app}\plugins64"; Permissions: users-modify +#define APP_PLUGINS64 "{app}\plugins64\" ; All C or C++ include files for Csound and other components used by Csound go here. ; This is a convenience for people like me who program in C or C++ and might use ; features of these third party components. @@ -130,12 +144,51 @@ ; No idea why this other name is needed. Source: "{#MyMSysBinDir}libiconv-2.dll"; DestDir: "{#APP_BIN}"; DestName: "iconv.dll"; Components: core; Source: "{#MyMSysUsrLocalDir}bin/*.dll"; DestDir: "{#APP_BIN}"; Components: core; +Source: "csound64.dll"; DestDir: "{#APP_BIN}"; Flags: ignoreversion; Components: core; +Source: "csnd6.dll"; DestDir: "{#APP_BIN}"; Flags: ignoreversion; Components: core; Source: "*.exe"; DestDir: "{#APP_BIN}"; Flags: ignoreversion; Components: core; Source: "*.jar"; DestDir: "{#APP_BIN}"; Flags: ignoreversion; Components: core; -Source: "*.dll*"; DestDir: "{#APP_BIN}"; Flags: ignoreversion; Excludes: "py.dll"; Components: core; -Source: "py.dll"; DestDir: "{#APP_BIN}"; Flags: ignoreversion; Components: python; Source: "*.pyd"; DestDir: "{#APP_BIN}"; Flags: ignoreversion; Components: python; Source: "*.py"; DestDir: "{#APP_BIN}"; Flags: ignoreversion; Components: python; +Source: "csound6~.dll"; DestDir: "{#APP_BIN}"; Flags: ignoreversion; Components: pd; +Source: "CsoundAC.dll"; DestDir: "{#APP_BIN}"; Flags: ignoreversion; Components: core; +#ifdef CSOUNDVST +Source: "CsoundVST.dll"; DestDir: "{#APP_BIN}"; Flags: ignoreversion; Components: csoundvst; +#endif +Source: "luaCsnd6.dll"; DestDir: "{#APP_BIN}"; Flags: ignoreversion; Components: core; +Source: "luaCsoundAC.dll"; DestDir: "{#APP_BIN}"; Flags: ignoreversion; Components: core; +Source: "_jcsound6.dll"; DestDir: "{#APP_BIN}"; Flags: ignoreversion; Components: core; + +Source: "LuaCsound.dll"; DestDir: "{#APP_PLUGINS64}"; Flags: ignoreversion; Components: core; +Source: "ampmidid.dll"; DestDir: "{#APP_PLUGINS64}"; Flags: ignoreversion; Components: core; +Source: "cellular.dll"; DestDir: "{#APP_PLUGINS64}"; Flags: ignoreversion; Components: core; +Source: "chua.dll"; DestDir: "{#APP_PLUGINS64}"; Flags: ignoreversion; Components: core; +Source: "cs_date.dll"; DestDir: "{#APP_PLUGINS64}"; Flags: ignoreversion; Components: core; +Source: "csladspa.dll"; DestDir: "{#APP_PLUGINS64}"; Flags: ignoreversion; Components: core; +Source: "doppler.dll"; DestDir: "{#APP_PLUGINS64}"; Flags: ignoreversion; Components: core; +Source: "fareygen.dll"; DestDir: "{#APP_PLUGINS64}"; Flags: ignoreversion; Components: core; +Source: "fluidOpcodes.dll"; DestDir: "{#APP_PLUGINS64}"; Flags: ignoreversion; Components: core; +Source: "fractalnoise.dll"; DestDir: "{#APP_PLUGINS64}"; Flags: ignoreversion; Components: core; +Source: "image.dll"; DestDir: "{#APP_PLUGINS64}"; Flags: ignoreversion; Components: core; +Source: "ipmidi.dll"; DestDir: "{#APP_PLUGINS64}"; Flags: ignoreversion; Components: core; +Source: "linear_algebra.dll"; DestDir: "{#APP_PLUGINS64}"; Flags: ignoreversion; Components: core; +Source: "mixer.dll"; DestDir: "{#APP_PLUGINS64}"; Flags: ignoreversion; Components: core; +Source: "osc.dll"; DestDir: "{#APP_PLUGINS64}"; Flags: ignoreversion; Components: core; +Source: "platerev.dll"; DestDir: "{#APP_PLUGINS64}"; Flags: ignoreversion; Components: core; +Source: "pmidi.dll"; DestDir: "{#APP_PLUGINS64}"; Flags: ignoreversion; Components: core; +Source: "rtpa.dll"; DestDir: "{#APP_PLUGINS64}"; Flags: ignoreversion; Components: core; +Source: "rtwinmm.dll"; DestDir: "{#APP_PLUGINS64}"; Flags: ignoreversion; Components: core; +Source: "scansyn.dll"; DestDir: "{#APP_PLUGINS64}"; Flags: ignoreversion; Components: core; +Source: "serial.dll"; DestDir: "{#APP_PLUGINS64}"; Flags: ignoreversion; Components: core; +Source: "signalflowgraph.dll"; DestDir: "{#APP_PLUGINS64}"; Flags: ignoreversion; Components: core; +Source: "stdutil.dll"; DestDir: "{#APP_PLUGINS64}"; Flags: ignoreversion; Components: core; +Source: "stk.dll"; DestDir: "{#APP_PLUGINS64}"; Flags: ignoreversion; Components: core; +Source: "system_call.dll"; DestDir: "{#APP_PLUGINS64}"; Flags: ignoreversion; Components: core; +Source: "virtual.dll"; DestDir: "{#APP_PLUGINS64}"; Flags: ignoreversion; Components: core; +#ifdef CSOUNDVST +Source: "vst4cs.dll"; DestDir: "{#APP_PLUGINS64}"; Flags: ignoreversion; Components: csoundvst; +#endif +Source: "widgets.dll"; DestDir: "{#APP_PLUGINS64}"; Flags: ignoreversion; Components: core; Source: "{#MyCsoundQtBinDir}CsoundQt-d-cs6.exe"; DestDir: "{#APP_BIN}"; Components: core; Source: "{#MyQtSdkBinDir}Qt5PrintSupport.dll"; DestDir: "{#APP_BIN}"; Components: core; @@ -152,9 +205,11 @@ Source: {#MyLibSndfileSourceDir}\include\*.*; DestDir: "{#APP_INCLUDE}\sndfile"; Flags: ignoreversion; Components: core; ; Ignore the unspeakably stupid libtool crap. -Source: {#MyPortAudioSourceDir}\lib\.libs\*x86.dll; DestDir: "{#APP_BIN}"; Components: core +Source: {#MyPortAudioSourceDir}\lib\.libs\*.dll; DestDir: "{#APP_BIN}"; Components: core Source: {#MyPortAudioSourceDir}\bin\.libs\pa_devs.exe; DestDir: "{#APP_BIN}"; Components: core Source: {#MyPortAudioSourceDir}\bin\.libs\pa_minlat.exe; DestDir: "{#APP_BIN}"; Components: core +; Required by pre-built portaudio_x86.dll (built with MSVC). +Source: "C:\Windows\system32\msvcr110.dll"; DestDir: "{#APP_BIN}"; Components: core Source: {#MyPortMidiSourceDir}*.dll; DestDir: "{#APP_BIN}"; Flags: ignoreversion; Components: core @@ -209,7 +264,7 @@ [Registry] Root: HKCU; Subkey: "Environment"; ValueType:string; ValueName:"RAWWAVE_PATH"; ValueData:"{#APP_SAMPLES}"; Flags: preservestringtype uninsdeletekey; Components: core -Root: HKCU; Subkey: "Environment"; ValueType:string; ValueName:"OPCODE6DIR64"; ValueData:"{#APP_BIN}"; Flags: preservestringtype uninsdeletekey; Components: core +Root: HKCU; Subkey: "Environment"; ValueType:string; ValueName:"OPCODE6DIR64"; ValueData:"{#APP_PLUGINS64}"; Flags: preservestringtype uninsdeletekey; Components: core Root: HKCU; Subkey: "Environment"; ValueType:string; ValueName:"PYTHONPATH"; ValueData:"{#APP_BIN}"; Flags: preservestringtype uninsdeletekey; Components: python [Tasks] diff -Nru csound-6.01~dfsg/interfaces/CMakeLists.txt csound-6.02~dfsg/interfaces/CMakeLists.txt --- csound-6.01~dfsg/interfaces/CMakeLists.txt 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/interfaces/CMakeLists.txt 2014-01-07 16:54:20.000000000 +0000 @@ -77,7 +77,12 @@ if(BUILD_PYTHON_INTERFACE) INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH}) - set(swigpython_LIBS ${CSOUNDLIB} ${LIBSNDFILE_LIBRARY} ${LIBSNDFILE_LIBRARY} ${PYTHON_LIBRARY} libcsnd6) + if(WIN32) + set(swigpython_LIBS ${CSOUNDLIB} ${LIBSNDFILE_LIBRARY} ${PYTHON_LIBRARY} libcsnd6) + else() + # Note: Do not link to PYTHON_LIBRARY so that it can be loaded in any python + set(swigpython_LIBS ${CSOUNDLIB} ${LIBSNDFILE_LIBRARY} libcsnd6) + endif() # Had: SWIG_FLAGS "-threads" SET_SOURCE_FILES_PROPERTIES(python_interface.i @@ -113,7 +118,12 @@ # The java package needs this unset or it will litter us with .java files unset(CMAKE_SWIG_OUTDIR) INCLUDE_DIRECTORIES(${JNI_INCLUDE_DIRS}) - set(swigjava_LIBS ${JNI_LIBRARIES} ${CSOUNDLIB} ${LIBSNDFILE_LIBRARY} libcsnd6) + + if(LINUX) + set(swigjava_LIBS ${CSOUNDLIB} ${LIBSNDFILE_LIBRARY} libcsnd6) + else() + set(swigjava_LIBS ${JNI_LIBRARIES} ${CSOUNDLIB} ${LIBSNDFILE_LIBRARY} libcsnd6) + endif() list(APPEND javaSwigOptions -package csnd6 -includeall) SET_SOURCE_FILES_PROPERTIES(java_interface.i PROPERTIES CPLUSPLUS ON) diff -Nru csound-6.01~dfsg/interfaces/CppSound.cpp csound-6.02~dfsg/interfaces/CppSound.cpp --- csound-6.01~dfsg/interfaces/CppSound.cpp 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/interfaces/CppSound.cpp 2014-01-07 16:54:20.000000000 +0000 @@ -51,7 +51,7 @@ int returnValue = 0; argv.push_back(const_cast("")); go = false; - csound->orcname_mode = 0; + csound->orcname_mode = 1; // Changed to use only internally stored Csound orchestra and score. returnValue = csoundCompileOrc(csound, getOrchestra().c_str()); returnValue = csoundReadScore(csound, const_cast(getScore().c_str())); diff -Nru csound-6.01~dfsg/interfaces/python_interface.i csound-6.02~dfsg/interfaces/python_interface.i --- csound-6.01~dfsg/interfaces/python_interface.i 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/interfaces/python_interface.i 2014-01-07 16:54:20.000000000 +0000 @@ -402,8 +402,9 @@ static void PythonCallback(void *p){ PyObject *res; + PyGILState_STATE stat; CsoundPerformanceThread *t = (CsoundPerformanceThread *) p; - PyGILState_STATE stat = PyGILState_Ensure(); + stat = PyGILState_Ensure(); res = PyEval_CallObject(t->pydata.func, t->pydata.data); if (res == NULL){ PyErr_SetString(PyExc_TypeError, "Exception in callback"); diff -Nru csound-6.01~dfsg/mingw64-linux/.gitignore csound-6.02~dfsg/mingw64-linux/.gitignore --- csound-6.01~dfsg/mingw64-linux/.gitignore 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/mingw64-linux/.gitignore 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,8 @@ +/build +/build32 +/cache +/cache32 +/csound-mingw64 +/csound-mingw64-i686 +/mingw64 +/mingw64-i686 diff -Nru csound-6.01~dfsg/mingw64-linux/Custom-mingw64-i686.cmake csound-6.02~dfsg/mingw64-linux/Custom-mingw64-i686.cmake --- csound-6.01~dfsg/mingw64-linux/Custom-mingw64-i686.cmake 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/mingw64-linux/Custom-mingw64-i686.cmake 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,25 @@ +# CUSTOM PROPERTIES TO SET + +# GLOBAL + +#set(CMAKE_BUILD_TYPE "Debug") +set(CMAKE_VERBOSE_MAKEFILE ON) +set(BUILD_STATIC_LIBRARY ON) +set(USE_OPEN_MP OFF) +set(TCL_VERSION 8.5) +#set(PYTHON_INCLUDE_DIRS "/usr/include/python2.7") +##set(BUILD_CSOUND_AC OFF) +##set(BUILD_CSOUND_AC_PYTHON_INTERFACE OFF) +##set(BUILD_CSOUND_AC_LUA_INTERFACE OFF) + + +GET_FILENAME_COMPONENT(MINGW_DEPS_DIR "${CMAKE_CURRENT_BINARY_DIR}/../mingw64" ABSOLUTE) +list(APPEND CMAKE_SYSTEM_LIBRARY_PATH "$MINGW_DEPS_DIR/usr/local/lib") +set(CMAKE_SYSTEM_INCLUDE_PATH "$CMAKE_SYSTEM_INCLUDE_PATH};$MINGW_DEPS_DIR/usr/local/include") + +#### NOTE the processor type needs setting +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -W -Wall -O3 -mtune=core2 -I${MINGW_DEPS_DIR}/usr/local/include --sysroot=/usr/i686-w64-mingw32") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -W -Wall -O3 -mtune=core2 -fpermissive") +## also to test multicore +#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -W -Wno-missing-field-initializers -Wno-unused-parameter -O3 -mtune=core2 -DJPFF") + diff -Nru csound-6.01~dfsg/mingw64-linux/Custom-mingw64.cmake csound-6.02~dfsg/mingw64-linux/Custom-mingw64.cmake --- csound-6.01~dfsg/mingw64-linux/Custom-mingw64.cmake 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/mingw64-linux/Custom-mingw64.cmake 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,25 @@ +# CUSTOM PROPERTIES TO SET + +# GLOBAL + +#set(CMAKE_BUILD_TYPE "Debug") +set(CMAKE_VERBOSE_MAKEFILE ON) +set(BUILD_STATIC_LIBRARY ON) +set(USE_OPEN_MP OFF) +set(TCL_VERSION 8.5) +#set(PYTHON_INCLUDE_DIRS "/usr/include/python2.7") +##set(BUILD_CSOUND_AC OFF) +##set(BUILD_CSOUND_AC_PYTHON_INTERFACE OFF) +##set(BUILD_CSOUND_AC_LUA_INTERFACE OFF) + + +GET_FILENAME_COMPONENT(MINGW_DEPS_DIR "${CMAKE_CURRENT_BINARY_DIR}/../mingw64" ABSOLUTE) +list(APPEND CMAKE_SYSTEM_LIBRARY_PATH "$MINGW_DEPS_DIR/usr/local/lib") +set(CMAKE_SYSTEM_INCLUDE_PATH "$CMAKE_SYSTEM_INCLUDE_PATH};$MINGW_DEPS_DIR/usr/local/include") + +#### NOTE the processor type needs setting +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -W -Wall -O3 -mtune=core2 -I${MINGW_DEPS_DIR}/usr/local/include --sysroot=/usr/x86_64-w64-mingw32") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -W -Wall -O3 -mtune=core2 -fpermissive") +## also to test multicore +#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -W -Wno-missing-field-initializers -Wno-unused-parameter -O3 -mtune=core2 -DJPFF") + diff -Nru csound-6.01~dfsg/mingw64-linux/README.md csound-6.02~dfsg/mingw64-linux/README.md --- csound-6.01~dfsg/mingw64-linux/README.md 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/mingw64-linux/README.md 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,35 @@ +Cross-compiling Windows 64-bit (x86\_64) from Linux +================================================== + +This directory contains scripts for cross-compiling a Windows 64-bit version +of Csound from Linux. These scripts were developed using Debian. + +## Instructions + +1. Install mingw-64 package using aptitude: + + sudo aptitude install mingw-w64 + +2. Create a directory called mingw64 in your home directory. This is where the +dependencies will be built and installed to:: + + mkdir ~/mingw64 + +3. Run the download-deps.sh script. This script will download source and +binary versions of dependencies that Csound will need. A folder called cache +will be created and files will be downloaded to there. A second folder, build, +will hold the unarchived versions of the dependencies. + +4. Run the build-deps.sh script. This will be the dependencies and install +them into ~/mingw64. + +5. Run the build.sh script. This will run Cmake and then compile Csound. + +## Notes + +Currently not all dependencies have been worked through for building. See the +build-deps.sh script and see where "exit" is put in. Anything after exit has +not yet been updated for building. + +* wiiuse - I tried v0.12 binary release of wiiuse from sf.net/projects/wiiuse, +but found it was compiled for win32 and not w64. Not including as of now. diff -Nru csound-6.01~dfsg/mingw64-linux/Toolchain-mingw64-i686.cmake csound-6.02~dfsg/mingw64-linux/Toolchain-mingw64-i686.cmake --- csound-6.01~dfsg/mingw64-linux/Toolchain-mingw64-i686.cmake 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/mingw64-linux/Toolchain-mingw64-i686.cmake 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,19 @@ +# the name of the target operating system +SET(CMAKE_SYSTEM_NAME Windows) + +# which compilers to use for C and C++ +SET(CMAKE_C_COMPILER i686-w64-mingw32-gcc) +SET(CMAKE_CXX_COMPILER i686-w64-mingw32-g++) +SET(CMAKE_RC_COMPILER i686-w64-mingw32-windres) + +GET_FILENAME_COMPONENT(MINGW_DEPS_DIR "${CMAKE_CURRENT_BINARY_DIR}/../mingw64-i686" ABSOLUTE) +message(STATUS ">>> ${MINGW_DEPS_DIR}") +# here is the target environment located +SET(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32 ${MINGW_DEPS_DIR} ${MINGW_DEPS_DIR}/usr/local) + +# adjust the default behaviour of the FIND_XXX() commands: +# search headers and libraries in the target environment, search +# programs in the host environment +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) diff -Nru csound-6.01~dfsg/mingw64-linux/Toolchain-mingw64.cmake csound-6.02~dfsg/mingw64-linux/Toolchain-mingw64.cmake --- csound-6.01~dfsg/mingw64-linux/Toolchain-mingw64.cmake 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/mingw64-linux/Toolchain-mingw64.cmake 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,19 @@ +# the name of the target operating system +SET(CMAKE_SYSTEM_NAME Windows) + +# which compilers to use for C and C++ +SET(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc) +SET(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++) +SET(CMAKE_RC_COMPILER x86_64-w64-mingw32-windres) + +GET_FILENAME_COMPONENT(MINGW_DEPS_DIR "${CMAKE_CURRENT_BINARY_DIR}/../mingw64" ABSOLUTE) +message(STATUS ">>> ${MINGW_DEPS_DIR}") +# here is the target environment located +SET(CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32 ${MINGW_DEPS_DIR} ${MINGW_DEPS_DIR}/usr/local) + +# adjust the default behaviour of the FIND_XXX() commands: +# search headers and libraries in the target environment, search +# programs in the host environment +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) diff -Nru csound-6.01~dfsg/mingw64-linux/build-deps.sh csound-6.02~dfsg/mingw64-linux/build-deps.sh --- csound-6.01~dfsg/mingw64-linux/build-deps.sh 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/mingw64-linux/build-deps.sh 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,123 @@ +#!/bin/sh + +export MINGW64_INSTALL_ROOT=`pwd`/mingw64 +echo $MINGW64_INSTALL_ROOT + +cd build + +mkdir -p $MINGW64_INSTALL_ROOT + +export CFLAGS="-I${MINGW64_INSTALL_ROOT}/usr/local/include" +export CPPFLAGS="-I${MINGW64_INSTALL_ROOT}/usr/local/include" +export LDFLAGS="-L${MINGW64_INSTALL_ROOT}/usr/local/lib" +export PKG_CONFIG_PATH="${MINGW64_INSTALL_ROOT}/usr/local/lib/pkg-config" +export PKG_CONFIG_LIBDIR="${MINGW64_INSTALL_ROOT}/usr/local/lib" + + +# PORTAUDIO +if [ ! -f portaudio/.complete ]; then +cd portaudio +./configure --host=x86_64-w64-mingw32 --prefix=$MINGW64_INSTALL_ROOT/usr/local +make +make install +touch .complete +cd .. +fi + + +# PORTMIDI +#if [ ! -f portmidi-cmake/.complete ]; +#then + +#rm -rf portmidi-cmake +#mkdir portmidi-cmake +#cd portmidi-cmake +#cmake ../portmidi-svn -DCMAKE_TOOLCHAIN_FILE=../../Toolchain-mingw64.cmake +#make +#DESTDIR=$HOME/mingw64 make install +#touch .complete +#cd .. + +#fi + + + +# OGG + +if [ ! -f libogg-1.3.0/.complete ]; then + +cd libogg-1.3.0 +./configure --host=x86_64-w64-mingw32 --prefix=$MINGW64_INSTALL_ROOT/usr/local +make +make install +touch .complete +cd .. +fi + + + +# VORBIS +if [ ! -f libvorbis-1.3.3/.complete ]; then + +cd libvorbis-1.3.3 +./configure --host=x86_64-w64-mingw32 --prefix=$MINGW64_INSTALL_ROOT/usr/local +make +make install +touch .complete +cd .. +fi + + +# FLAC + +if [ ! -f flac-1.2.1/.complete ]; then + +cd flac-1.2.1 +./configure --host=x86_64-w64-mingw32 --disable-cpplibs --disable-asm-optimizations --enable-sse --prefix=${MINGW64_INSTALL_ROOT}/usr/local +make +make install +touch .complete +cd .. +fi + + +# LIBSNDFILE +if [ ! -f libsndfile-1.0.25/.complete ]; then +cd libsndfile-1.0.25 +./configure --host=x86_64-w64-mingw32 --disable-disable-sqlite --prefix=$MINGW64_INSTALL_ROOT/usr/local +make +make install +touch .complete +cd .. +fi + +# FLTK +if [ ! -f fltk-1.3.2/.complete ]; then +cd fltk-1.3.2 +./configure --host=x86_64-w64-mingw32 --prefix=$MINGW64_INSTALL_ROOT/usr/local --enable-threads --enable-gl --enable-shared --enable-localjpeg --enable-localzlib --enable-localpng +make || true +make install +# touch .complete +cd .. +fi + + +# LIBLO +#if [ ! -f liblo-0.26/.complete ]; then +#cd liblo-0.26 +#./configure --host=x86_64-w64-mingw32 --prefix=$MINGW64_INSTALL_ROOT/usr/local +#make install +##touch .complete +#cd .. +#fi + +exit + +# LIBPNG +if [ ! -f libpng-1.6.7/.complete ]; then +cd libpng-1.6.7 +./configure --host=x86_64-w64-mingw32 --prefix=$MINGW64_INSTALL_ROOT/usr/local +make install +##touch .complete +cd .. +fi diff -Nru csound-6.01~dfsg/mingw64-linux/build-deps32.sh csound-6.02~dfsg/mingw64-linux/build-deps32.sh --- csound-6.01~dfsg/mingw64-linux/build-deps32.sh 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/mingw64-linux/build-deps32.sh 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,123 @@ +#!/bin/sh + +export MINGW64_INSTALL_ROOT=`pwd`/mingw64-i686 +echo $MINGW64_INSTALL_ROOT + +cd build32 + +mkdir -p $MINGW64_INSTALL_ROOT + +export CFLAGS="-I${MINGW64_INSTALL_ROOT}/usr/local/include" +export CPPFLAGS="-I${MINGW64_INSTALL_ROOT}/usr/local/include" +export LDFLAGS="-L${MINGW64_INSTALL_ROOT}/usr/local/lib" +export PKG_CONFIG_PATH="${MINGW64_INSTALL_ROOT}/usr/local/lib/pkg-config" +export PKG_CONFIG_LIBDIR="${MINGW64_INSTALL_ROOT}/usr/local/lib" + + +# PORTAUDIO +if [ ! -f portaudio/.complete ]; then +cd portaudio +./configure --host=i686-w64-mingw32 --prefix=$MINGW64_INSTALL_ROOT/usr/local +make +make install +touch .complete +cd .. +fi + + +# PORTMIDI +#if [ ! -f portmidi-cmake/.complete ]; +#then + +#rm -rf portmidi-cmake +#mkdir portmidi-cmake +#cd portmidi-cmake +#cmake ../portmidi-svn -DCMAKE_TOOLCHAIN_FILE=../../Toolchain-mingw64.cmake +#make +#DESTDIR=$HOME/mingw64 make install +#touch .complete +#cd .. + +#fi + + + +# OGG + +if [ ! -f libogg-1.3.0/.complete ]; then + +cd libogg-1.3.0 +./configure --host=i686-w64-mingw32 --prefix=$MINGW64_INSTALL_ROOT/usr/local +make +make install +touch .complete +cd .. +fi + + + +# VORBIS +if [ ! -f libvorbis-1.3.3/.complete ]; then + +cd libvorbis-1.3.3 +./configure --host=i686-w64-mingw32 --prefix=$MINGW64_INSTALL_ROOT/usr/local +make +make install +touch .complete +cd .. +fi + + +# FLAC + +if [ ! -f flac-1.2.1/.complete ]; then + +cd flac-1.2.1 +./configure --host=i686-w64-mingw32 --disable-cpplibs --disable-asm-optimizations --enable-sse --prefix=${MINGW64_INSTALL_ROOT}/usr/local +make +make install +touch .complete +cd .. +fi + + +# LIBSNDFILE +if [ ! -f libsndfile-1.0.25/.complete ]; then +cd libsndfile-1.0.25 +./configure --host=i686-w64-mingw32 --disable-disable-sqlite --prefix=$MINGW64_INSTALL_ROOT/usr/local +make +make install +touch .complete +cd .. +fi + +# FLTK +if [ ! -f fltk-1.3.2/.complete ]; then +cd fltk-1.3.2 +./configure --host=i686-w64-mingw32 --prefix=$MINGW64_INSTALL_ROOT/usr/local --enable-threads --enable-gl --enable-shared --enable-localjpeg --enable-localzlib --enable-localpng +make || true +make install +# touch .complete +cd .. +fi + + +# LIBLO +#if [ ! -f liblo-0.26/.complete ]; then +#cd liblo-0.26 +#./configure --host=i686-w64-mingw32 --prefix=$MINGW64_INSTALL_ROOT/usr/local +#make install +##touch .complete +#cd .. +#fi + +exit + +# LIBPNG +if [ ! -f libpng-1.6.7/.complete ]; then +cd libpng-1.6.7 +./configure --host=i686-w64-mingw32 --prefix=$MINGW64_INSTALL_ROOT/usr/local +make install +##touch .complete +cd .. +fi diff -Nru csound-6.01~dfsg/mingw64-linux/build.sh csound-6.02~dfsg/mingw64-linux/build.sh --- csound-6.01~dfsg/mingw64-linux/build.sh 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/mingw64-linux/build.sh 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,7 @@ +#!/bin/bash + +mkdir csound-mingw64 +cd csound-mingw64 +cmake ../.. -DCMAKE_TOOLCHAIN_FILE=../Toolchain-mingw64.cmake -DCMAKE_INSTALL_PREFIX=dist -DCUSTOM_CMAKE=../Custom-mingw64.cmake +make -j6 install + diff -Nru csound-6.01~dfsg/mingw64-linux/build32.sh csound-6.02~dfsg/mingw64-linux/build32.sh --- csound-6.01~dfsg/mingw64-linux/build32.sh 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/mingw64-linux/build32.sh 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,7 @@ +#!/bin/bash + +mkdir csound-mingw64-i686 +cd csound-mingw64-i686 +cmake ../.. -DCMAKE_TOOLCHAIN_FILE=../Toolchain-mingw64-i686.cmake -DCMAKE_INSTALL_PREFIX=dist -DCUSTOM_CMAKE=../Custom-mingw64-i686.cmake +make -j6 install + diff -Nru csound-6.01~dfsg/mingw64-linux/download-deps.sh csound-6.02~dfsg/mingw64-linux/download-deps.sh --- csound-6.01~dfsg/mingw64-linux/download-deps.sh 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/mingw64-linux/download-deps.sh 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,62 @@ +#!/bin/bash + +flac_src="http://sourceforge.net/projects/flac/files/flac-src/flac-1.2.1-src/flac-1.2.1.tar.gz" +ogg_src="http://downloads.xiph.org/releases/ogg/libogg-1.3.0.tar.gz" +vorbis_src="http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.3.tar.gz" +libsndfile_src="http://www.mega-nerd.com/libsndfile/files/libsndfile-1.0.25.tar.gz" +liblo_src="http://sourceforge.net/projects/liblo/files/liblo/0.26/liblo-0.26.tar.gz" +#wiiuse_src="http://sourceforge.net/projects/wiiuse/files/wiiuse/v0.12/wiiuse_v0.12_src.tar.gz" +#wiiuse_src="http://codemist.co.uk/jpff/wiiuse_v0.13a.zip" +#wiiuse="http://sourceforge.net/projects/wiiuse/files/wiiuse/v0.12/wiiuse_v0.12_win.zip" +#portaudio_src="http://www.portaudio.com/archives/pa_stable_v19_20111121.tgz" +portaudio_src="http://portaudio.com/archives/pa_snapshot.tgz" +#portmidi_src="http://sourceforge.net/projects/portmedia/files/portmidi/217/portmidi-src-217.zip" +boost_src="http://sourceforge.net/projects/boost/files/boost/1.52.0/boost_1_52_0.tar.gz" +#fltk_src="http://ftp.easysw.com/pub/fltk/1.3.1/fltk-1.3.1-source.tar.gz" +fltk_src="http://fltk.org/pub/fltk/1.3.2/fltk-1.3.2-source.tar.gz" +#png_src="ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.5.13.tar.gz" +png_src="http://sourceforge.net/projects/libpng/files/libpng16/1.6.7/libpng-1.6.7.tar.gz" +fluidsynth_src="http://sourceforge.net/projects/fluidsynth/files/older%20releases/fluidsynth-1.0.9.tar.gz" +luajit_src="http://luajit.org/download/LuaJIT-2.0.2.tar.gz" + +pthreads="ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-2-9-1-release.zip" +zlib="http://zlib.net/zlib128-dll.zip" +packages=($pthreads $portaudio_src $portmidi_src $flac_src $ogg_src $vorbis_src $libsndfile_src $liblo_src $fltk_src $png_src $boost_src $fluidsynth_src $luajit_src $zlib) + + +#prepare +mkdir -p cache +#rm -rf build +mkdir -p build +mkdir -p mingw64/usr/local/lib +mkdir -p mingw64/usr/local/include + +cd cache +for i in ${packages[*]}; do + echo $i + wget -nc $i +done + +cd ../build +for i in `ls ../cache | grep zip`; do + unzip ../cache/$i +done + +for i in `ls ../cache | grep -v zip`; do + tar xzvf ../cache/$i +done + +cp Pre-built.2/dll/x64/pthreadGC2.dll ../mingw64/usr/local/lib +cp Pre-built.2/include/* ../mingw64/usr/local/include + +#cp wiiuse_v0.12_win/wiiuse.dll ../mingw64/usr/local/lib +#cp wiiuse_v0.12_win/wiiuse.lib ../mingw64/usr/local/lib +#cp wiiuse_v0.12_win/wiiuse.h ../mingw64/usr/local/include + + +cp zlib1.dll ../mingw64/usr/local/lib +cp lib/* ../mingw64/usr/local/lib +cp include/* ../mingw64/usr/local/include/ + +svn co https://svn.code.sf.net/p/portmedia/code/portmidi/trunk portmidi-svn + diff -Nru csound-6.01~dfsg/mingw64-linux/download-deps32.sh csound-6.02~dfsg/mingw64-linux/download-deps32.sh --- csound-6.01~dfsg/mingw64-linux/download-deps32.sh 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/mingw64-linux/download-deps32.sh 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,62 @@ +#!/bin/bash + +flac_src="http://sourceforge.net/projects/flac/files/flac-src/flac-1.2.1-src/flac-1.2.1.tar.gz" +ogg_src="http://downloads.xiph.org/releases/ogg/libogg-1.3.0.tar.gz" +vorbis_src="http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.3.tar.gz" +libsndfile_src="http://www.mega-nerd.com/libsndfile/files/libsndfile-1.0.25.tar.gz" +liblo_src="http://sourceforge.net/projects/liblo/files/liblo/0.26/liblo-0.26.tar.gz" +#wiiuse_src="http://sourceforge.net/projects/wiiuse/files/wiiuse/v0.12/wiiuse_v0.12_src.tar.gz" +#wiiuse_src="http://codemist.co.uk/jpff/wiiuse_v0.13a.zip" +#wiiuse="http://sourceforge.net/projects/wiiuse/files/wiiuse/v0.12/wiiuse_v0.12_win.zip" +#portaudio_src="http://www.portaudio.com/archives/pa_stable_v19_20111121.tgz" +portaudio_src="http://portaudio.com/archives/pa_snapshot.tgz" +#portmidi_src="http://sourceforge.net/projects/portmedia/files/portmidi/217/portmidi-src-217.zip" +boost_src="http://sourceforge.net/projects/boost/files/boost/1.52.0/boost_1_52_0.tar.gz" +#fltk_src="http://ftp.easysw.com/pub/fltk/1.3.1/fltk-1.3.1-source.tar.gz" +fltk_src="http://fltk.org/pub/fltk/1.3.2/fltk-1.3.2-source.tar.gz" +#png_src="ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.5.13.tar.gz" +png_src="http://sourceforge.net/projects/libpng/files/libpng16/1.6.7/libpng-1.6.7.tar.gz" +fluidsynth_src="http://sourceforge.net/projects/fluidsynth/files/older%20releases/fluidsynth-1.0.9.tar.gz" +luajit_src="http://luajit.org/download/LuaJIT-2.0.2.tar.gz" + +pthreads="ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-2-9-1-release.zip" +zlib="http://zlib.net/zlib128-dll.zip" +packages=($pthreads $portaudio_src $portmidi_src $flac_src $ogg_src $vorbis_src $libsndfile_src $liblo_src $fltk_src $png_src $boost_src $fluidsynth_src $luajit_src $zlib) + + +#prepare +mkdir -p cache32 +#rm -rf build +mkdir -p build32 +mkdir -p mingw64-i686/usr/local/lib +mkdir -p mingw64-i686/usr/local/include + +cd cache32 +for i in ${packages[*]}; do + echo $i + wget -nc $i +done + +cd ../build32 +for i in `ls ../cache32 | grep zip`; do + echo "Unzipping $i" + unzip ../cache32/$i +done + +for i in `ls ../cache32 | grep -v zip`; do + tar xzvf ../cache32/$i +done + +cp Pre-built.2/dll/x86/pthreadGC2.dll ../mingw64-i686/usr/local/lib +cp Pre-built.2/include/* ../mingw64-i686/usr/local/include + +#cp wiiuse_v0.12_win/wiiuse.dll ../mingw64/usr/local/lib +#cp wiiuse_v0.12_win/wiiuse.lib ../mingw64/usr/local/lib #cp wiiuse_v0.12_win/wiiuse.h ../mingw64/usr/local/include + + +cp zlib1.dll ../mingw64-i686/usr/local/lib +cp lib/* ../mingw64-i686/usr/local/lib +cp include/* ../mingw64-i686/usr/local/include/ + +svn co https://svn.code.sf.net/p/portmedia/code/portmidi/trunk portmidi-svn + diff -Nru csound-6.01~dfsg/mingw64-linux/release.sh csound-6.02~dfsg/mingw64-linux/release.sh --- csound-6.01~dfsg/mingw64-linux/release.sh 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/mingw64-linux/release.sh 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,23 @@ +#!/bin/bash + + +MINGW64_ROOT=`pwd`/mingw64/usr/local +rm -rf csound-w64 +mkdir csound-w64 +cp -r csound-mingw64/dist/* csound-w64 + +cp csound-mingw64/csound64.dll csound-w64/bin +cp csound-mingw64/csnd6.dll csound-w64/lib + +cd csound-w64/bin + +cp $MINGW64_ROOT/bin/libvorbis-0.dll . +cp $MINGW64_ROOT/bin/libogg-0.dll . +cp $MINGW64_ROOT/bin/libvorbisenc-2.dll . +cp $MINGW64_ROOT/bin/libportaudio-2.dll . +cp $MINGW64_ROOT/bin/libvorbisfile-3.dll . +cp $MINGW64_ROOT/bin/libsndfile-1.dll . +cp $MINGW64_ROOT/lib/pthreadGC2.dll . + +cd ../.. +zip -r csound-w64.zip csound-w64 diff -Nru csound-6.01~dfsg/nacl/Makefile csound-6.02~dfsg/nacl/Makefile --- csound-6.01~dfsg/nacl/Makefile 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/nacl/Makefile 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,234 @@ +# Makefile for NaCl Csound lib +# V Lazzarini 2013 + +VALID_TOOLCHAINS := pnacl newlib glibc +LOCAL_INCLUDES := -I../Engine -I../include -I../H -I. -I.. +NACL_CFLAGS ?= -Wno-long-long +NACL_CXXFLAGS ?= -Wno-long-long + +NACL_SDK_ROOT ?= $(abspath $(CURDIR)/../../..) +include $(NACL_SDK_ROOT)/tools/common.mk + +CSOUND_SRC_ROOT := ../ + +TARGET = csound +CFLAGS = -O3 $(LOCAL_INCLUDES) $(NACL_INCLUDES) -DENABLE_OPCODEDIR_WARNINGS -D__BUILDING_LIBCSOUND -DENABLE_NEW_PARSER -DLINUX -DHAVE_DIRENT_H -DHAVE_FCNTL_H -DHAVE_UNISTD_H -DHAVE_STDINT_H -DHAVE_SYS_TIME_H -DHAVE_SYS_TYPES_H -DHAVE_TERMIOS_H -DHAVE_STRTOK_R -DNACL -Wno-format -Wno-empty-body + +SOURCES := $(CSOUND_SRC_ROOT)/Engine/auxfd.c \ +$(CSOUND_SRC_ROOT)/Engine/cfgvar.c \ +$(CSOUND_SRC_ROOT)/Engine/corfiles.c \ +$(CSOUND_SRC_ROOT)/Engine/entry1.c \ +$(CSOUND_SRC_ROOT)/Engine/envvar.c \ +$(CSOUND_SRC_ROOT)/Engine/extract.c \ +$(CSOUND_SRC_ROOT)/Engine/fgens.c \ +$(CSOUND_SRC_ROOT)/Engine/insert.c \ +$(CSOUND_SRC_ROOT)/Engine/linevent.c \ +$(CSOUND_SRC_ROOT)/Engine/memalloc.c \ +$(CSOUND_SRC_ROOT)/Engine/memfiles.c \ +$(CSOUND_SRC_ROOT)/Engine/musmon.c \ +$(CSOUND_SRC_ROOT)/Engine/namedins.c \ +$(CSOUND_SRC_ROOT)/Engine/rdscor.c \ +$(CSOUND_SRC_ROOT)/Engine/scsort.c \ +$(CSOUND_SRC_ROOT)/Engine/scxtract.c \ +$(CSOUND_SRC_ROOT)/Engine/sort.c \ +$(CSOUND_SRC_ROOT)/Engine/sread.c \ +$(CSOUND_SRC_ROOT)/Engine/swritestr.c \ +$(CSOUND_SRC_ROOT)/Engine/twarp.c \ +$(CSOUND_SRC_ROOT)/Engine/csound_type_system.c \ +$(CSOUND_SRC_ROOT)/Engine/csound_standard_types.c \ +$(CSOUND_SRC_ROOT)/Engine/csound_data_structures.c \ +$(CSOUND_SRC_ROOT)/Engine/pools.c \ +$(CSOUND_SRC_ROOT)/InOut/libsnd.c \ +$(CSOUND_SRC_ROOT)/InOut/libsnd_u.c \ +$(CSOUND_SRC_ROOT)/InOut/midifile.c \ +$(CSOUND_SRC_ROOT)/InOut/midirecv.c \ +$(CSOUND_SRC_ROOT)/InOut/midisend.c \ +$(CSOUND_SRC_ROOT)/InOut/winascii.c \ +$(CSOUND_SRC_ROOT)/InOut/windin.c \ +$(CSOUND_SRC_ROOT)/InOut/window.c \ +$(CSOUND_SRC_ROOT)/InOut/winEPS.c \ +$(CSOUND_SRC_ROOT)/InOut/circularbuffer.c \ +$(CSOUND_SRC_ROOT)/OOps/aops.c \ +$(CSOUND_SRC_ROOT)/OOps/bus.c \ +$(CSOUND_SRC_ROOT)/OOps/cmath.c \ +$(CSOUND_SRC_ROOT)/OOps/diskin2.c \ +$(CSOUND_SRC_ROOT)/OOps/disprep.c \ +$(CSOUND_SRC_ROOT)/OOps/dumpf.c \ +$(CSOUND_SRC_ROOT)/OOps/fftlib.c \ +$(CSOUND_SRC_ROOT)/OOps/goto_ops.c \ +$(CSOUND_SRC_ROOT)/OOps/midiinterop.c \ +$(CSOUND_SRC_ROOT)/OOps/midiops.c \ +$(CSOUND_SRC_ROOT)/OOps/midiout.c \ +$(CSOUND_SRC_ROOT)/OOps/mxfft.c \ +$(CSOUND_SRC_ROOT)/OOps/oscils.c \ +$(CSOUND_SRC_ROOT)/OOps/pstream.c \ +$(CSOUND_SRC_ROOT)/OOps/pvfileio.c \ +$(CSOUND_SRC_ROOT)/OOps/pvsanal.c \ +$(CSOUND_SRC_ROOT)/OOps/random.c \ +$(CSOUND_SRC_ROOT)/OOps/remote.c \ +$(CSOUND_SRC_ROOT)/OOps/schedule.c \ +$(CSOUND_SRC_ROOT)/OOps/sndinfUG.c \ +$(CSOUND_SRC_ROOT)/OOps/str_ops.c \ +$(CSOUND_SRC_ROOT)/OOps/ugens1.c \ +$(CSOUND_SRC_ROOT)/OOps/ugens2.c \ +$(CSOUND_SRC_ROOT)/OOps/ugens2a.c \ +$(CSOUND_SRC_ROOT)/OOps/ugens3.c \ +$(CSOUND_SRC_ROOT)/OOps/ugens4.c \ +$(CSOUND_SRC_ROOT)/OOps/ugens5.c \ +$(CSOUND_SRC_ROOT)/OOps/ugens6.c \ +$(CSOUND_SRC_ROOT)/OOps/ugtabs.c \ +$(CSOUND_SRC_ROOT)/OOps/ugrw1.c \ +$(CSOUND_SRC_ROOT)/OOps/ugrw2.c \ +$(CSOUND_SRC_ROOT)/OOps/vdelay.c \ +$(CSOUND_SRC_ROOT)/OOps/compile_ops.c \ +$(CSOUND_SRC_ROOT)/Opcodes/babo.c \ +$(CSOUND_SRC_ROOT)/Opcodes/bilbar.c \ +$(CSOUND_SRC_ROOT)/Opcodes/compress.c \ +$(CSOUND_SRC_ROOT)/Opcodes/eqfil.c \ +$(CSOUND_SRC_ROOT)/Opcodes/Vosim.c \ +$(CSOUND_SRC_ROOT)/Opcodes/pitch.c \ +$(CSOUND_SRC_ROOT)/Opcodes/pitch0.c \ +$(CSOUND_SRC_ROOT)/Opcodes/spectra.c \ +$(CSOUND_SRC_ROOT)/Opcodes/ambicode1.c \ +$(CSOUND_SRC_ROOT)/Opcodes/sfont.c \ +$(CSOUND_SRC_ROOT)/Opcodes/grain4.c \ +$(CSOUND_SRC_ROOT)/Opcodes/hrtferX.c \ +$(CSOUND_SRC_ROOT)/Opcodes/loscilx.c \ +$(CSOUND_SRC_ROOT)/Opcodes/minmax.c \ +$(CSOUND_SRC_ROOT)/Opcodes/pan2.c \ +$(CSOUND_SRC_ROOT)/Opcodes/afilters.c \ +$(CSOUND_SRC_ROOT)/Opcodes/phisem.c \ +$(CSOUND_SRC_ROOT)/Opcodes/arrays.c \ +$(CSOUND_SRC_ROOT)/Opcodes/hrtfopcodes.c \ +$(CSOUND_SRC_ROOT)/Opcodes/stackops.c \ +$(CSOUND_SRC_ROOT)/Opcodes/vbap.c \ +$(CSOUND_SRC_ROOT)/Opcodes/vbap1.c \ +$(CSOUND_SRC_ROOT)/Opcodes/vbap_n.c \ +$(CSOUND_SRC_ROOT)/Opcodes/vbap_zak.c \ +$(CSOUND_SRC_ROOT)/Opcodes/vaops.c \ +$(CSOUND_SRC_ROOT)/Opcodes/ugakbari.c \ +$(CSOUND_SRC_ROOT)/Opcodes/harmon.c \ +$(CSOUND_SRC_ROOT)/Opcodes/pitchtrack.c \ +$(CSOUND_SRC_ROOT)/Opcodes/partikkel.c \ +$(CSOUND_SRC_ROOT)/Opcodes/shape.c \ +$(CSOUND_SRC_ROOT)/Opcodes/tabsum.c \ +$(CSOUND_SRC_ROOT)/Opcodes/crossfm.c \ +$(CSOUND_SRC_ROOT)/Opcodes/pvlock.c \ +$(CSOUND_SRC_ROOT)/Opcodes/fareyseq.c \ +$(CSOUND_SRC_ROOT)/Opcodes/modmatrix.c \ +$(CSOUND_SRC_ROOT)/Opcodes/scoreline.c \ +$(CSOUND_SRC_ROOT)/Opcodes/modal4.c \ +$(CSOUND_SRC_ROOT)/Opcodes/physutil.c \ +$(CSOUND_SRC_ROOT)/Opcodes/physmod.c \ +$(CSOUND_SRC_ROOT)/Opcodes/mandolin.c \ +$(CSOUND_SRC_ROOT)/Opcodes/singwave.c \ +$(CSOUND_SRC_ROOT)/Opcodes/fm4op.c \ +$(CSOUND_SRC_ROOT)/Opcodes/moog1.c \ +$(CSOUND_SRC_ROOT)/Opcodes/shaker.c \ +$(CSOUND_SRC_ROOT)/Opcodes/bowedbar.c \ +$(CSOUND_SRC_ROOT)/Opcodes/gab/tabmorph.c \ +$(CSOUND_SRC_ROOT)/Opcodes/gab/hvs.c \ +$(CSOUND_SRC_ROOT)/Opcodes/gab/sliderTable.c \ +$(CSOUND_SRC_ROOT)/Opcodes/gab/newgabopc.c \ +$(CSOUND_SRC_ROOT)/Opcodes/ftest.c \ +$(CSOUND_SRC_ROOT)/Opcodes/hrtfearly.c \ +$(CSOUND_SRC_ROOT)/Opcodes/hrtfreverb.c \ +$(CSOUND_SRC_ROOT)/Opcodes/cpumeter.c \ +$(CSOUND_SRC_ROOT)/Opcodes/gendy.c \ +$(CSOUND_SRC_ROOT)/Opcodes/tl/sc_noise.c \ +$(CSOUND_SRC_ROOT)/Top/argdecode.c \ +$(CSOUND_SRC_ROOT)/Top/cscore_internal.c \ +$(CSOUND_SRC_ROOT)/Top/cscorfns.c \ +$(CSOUND_SRC_ROOT)/Top/csmodule.c \ +$(CSOUND_SRC_ROOT)/Top/csound.c \ +$(CSOUND_SRC_ROOT)/Top/getstring.c \ +$(CSOUND_SRC_ROOT)/Top/main.c \ +$(CSOUND_SRC_ROOT)/Top/new_opts.c \ +$(CSOUND_SRC_ROOT)/Top/one_file.c \ +$(CSOUND_SRC_ROOT)/Top/opcode.c \ +$(CSOUND_SRC_ROOT)/Top/threads.c \ +$(CSOUND_SRC_ROOT)/Top/utility.c \ +$(CSOUND_SRC_ROOT)/Top/threadsafe.c \ +$(CSOUND_SRC_ROOT)/Opcodes/ambicode.c \ +$(CSOUND_SRC_ROOT)/Opcodes/bbcut.c \ +$(CSOUND_SRC_ROOT)/Opcodes/biquad.c \ +$(CSOUND_SRC_ROOT)/Opcodes/butter.c \ +$(CSOUND_SRC_ROOT)/Opcodes/clfilt.c \ +$(CSOUND_SRC_ROOT)/Opcodes/cross2.c \ +$(CSOUND_SRC_ROOT)/Opcodes/dam.c \ +$(CSOUND_SRC_ROOT)/Opcodes/dcblockr.c \ +$(CSOUND_SRC_ROOT)/Opcodes/filter.c \ +$(CSOUND_SRC_ROOT)/Opcodes/flanger.c \ +$(CSOUND_SRC_ROOT)/Opcodes/follow.c \ +$(CSOUND_SRC_ROOT)/Opcodes/fout.c \ +$(CSOUND_SRC_ROOT)/Opcodes/freeverb.c \ +$(CSOUND_SRC_ROOT)/Opcodes/ftconv.c \ +$(CSOUND_SRC_ROOT)/Opcodes/ftgen.c \ +$(CSOUND_SRC_ROOT)/Opcodes/gab/gab.c \ +$(CSOUND_SRC_ROOT)/Opcodes/gab/vectorial.c \ +$(CSOUND_SRC_ROOT)/Opcodes/grain.c \ +$(CSOUND_SRC_ROOT)/Opcodes/locsig.c \ +$(CSOUND_SRC_ROOT)/Opcodes/lowpassr.c \ +$(CSOUND_SRC_ROOT)/Opcodes/metro.c \ +$(CSOUND_SRC_ROOT)/Opcodes/midiops2.c \ +$(CSOUND_SRC_ROOT)/Opcodes/midiops3.c \ +$(CSOUND_SRC_ROOT)/Opcodes/newfils.c \ +$(CSOUND_SRC_ROOT)/Opcodes/nlfilt.c \ +$(CSOUND_SRC_ROOT)/Opcodes/oscbnk.c \ +$(CSOUND_SRC_ROOT)/Opcodes/pluck.c \ +$(CSOUND_SRC_ROOT)/Opcodes/repluck.c \ +$(CSOUND_SRC_ROOT)/Opcodes/reverbsc.c \ +$(CSOUND_SRC_ROOT)/Opcodes/seqtime.c \ +$(CSOUND_SRC_ROOT)/Opcodes/sndloop.c \ +$(CSOUND_SRC_ROOT)/Opcodes/sndwarp.c \ +$(CSOUND_SRC_ROOT)/Opcodes/space.c \ +$(CSOUND_SRC_ROOT)/Opcodes/spat3d.c \ +$(CSOUND_SRC_ROOT)/Opcodes/syncgrain.c \ +$(CSOUND_SRC_ROOT)/Opcodes/ugens7.c \ +$(CSOUND_SRC_ROOT)/Opcodes/ugens9.c \ +$(CSOUND_SRC_ROOT)/Opcodes/ugensa.c \ +$(CSOUND_SRC_ROOT)/Opcodes/uggab.c \ +$(CSOUND_SRC_ROOT)/Opcodes/ugmoss.c \ +$(CSOUND_SRC_ROOT)/Opcodes/ugnorman.c \ +$(CSOUND_SRC_ROOT)/Opcodes/ugsc.c \ +$(CSOUND_SRC_ROOT)/Opcodes/wave-terrain.c \ +$(CSOUND_SRC_ROOT)/Opcodes/stdopcod.c \ +$(CSOUND_SRC_ROOT)/Opcodes/ifd.c \ +$(CSOUND_SRC_ROOT)/Opcodes/partials.c \ +$(CSOUND_SRC_ROOT)/Opcodes/psynth.c \ +$(CSOUND_SRC_ROOT)/Opcodes/pvsbasic.c \ +$(CSOUND_SRC_ROOT)/Opcodes/pvscent.c \ +$(CSOUND_SRC_ROOT)/Opcodes/pvsdemix.c \ +$(CSOUND_SRC_ROOT)/Opcodes/pvs_ops.c \ +$(CSOUND_SRC_ROOT)/Opcodes/pvsband.c \ +$(CSOUND_SRC_ROOT)/Opcodes/pvsbuffer.c \ +$(CSOUND_SRC_ROOT)/Opcodes/pvsgendy.c \ +$(CSOUND_SRC_ROOT)/Opcodes/dsputil.c \ +$(CSOUND_SRC_ROOT)/Opcodes/pvadd.c \ +$(CSOUND_SRC_ROOT)/Opcodes/pvinterp.c \ +$(CSOUND_SRC_ROOT)/Opcodes/pvocext.c \ +$(CSOUND_SRC_ROOT)/Opcodes/pvread.c \ +$(CSOUND_SRC_ROOT)/Opcodes/ugens8.c \ +$(CSOUND_SRC_ROOT)/Opcodes/vpvoc.c \ +$(CSOUND_SRC_ROOT)/Opcodes/pvoc.c \ +$(CSOUND_SRC_ROOT)/Engine/csound_orc_semantics.c \ +$(CSOUND_SRC_ROOT)/Engine/csound_orc_expressions.c \ +$(CSOUND_SRC_ROOT)/Engine/csound_orc_optimize.c \ +$(CSOUND_SRC_ROOT)/Engine/csound_orc_compile.c \ +$(CSOUND_SRC_ROOT)/Engine/new_orc_parser.c \ +$(CSOUND_SRC_ROOT)/Engine/symbtab.c \ +$(CSOUND_SRC_ROOT)/Engine/cs_new_dispatch.c \ +$(CSOUND_SRC_ROOT)/Engine/cs_par_base.c \ +$(CSOUND_SRC_ROOT)/Engine/cs_par_orc_semantic_analysis.c \ +$(CSOUND_SRC_ROOT)/Engine/cs_par_dispatch.c \ +$(CSOUND_SRC_ROOT)/Top/server.c \ +csound_orclex.c \ +csound_prelex.c \ +csound_orcparse.c \ + +# Build rules generated by macros from common.mk: +$(foreach src,$(SOURCES),$(eval $(call COMPILE_RULE,$(src),$(CFLAGS)))) +$(eval $(call LIB_RULE,$(TARGET),$(SOURCES))) + + + diff -Nru csound-6.01~dfsg/nacl/build.sh csound-6.02~dfsg/nacl/build.sh --- csound-6.01~dfsg/nacl/build.sh 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/nacl/build.sh 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,11 @@ +#!/bin/sh + +flex -B -t ../Engine/csound_orc.l > csound_orclex.c +flex -B ../Engine/csound_pre.lex > csound_prelex.c +bison -d -pcsound_orc --report=itemset -o csound_orcparse.c ../Engine/csound_orc.y + +# Actually build Csound. +export TOOLCHAIN=pnacl +make + + diff -Nru csound-6.01~dfsg/nacl/csound/Makefile csound-6.02~dfsg/nacl/csound/Makefile --- csound-6.01~dfsg/nacl/csound/Makefile 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/nacl/csound/Makefile 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,31 @@ +# Copyright (c) 2013 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# GNU Makefile based on shared rules provided by the Native Client SDK. +# See README.Makefiles for more details. + +VALID_TOOLCHAINS := pnacl newlib glibc + +NACL_SDK_ROOT ?= $(abspath $(CURDIR)/../../..) +include $(NACL_SDK_ROOT)/tools/common.mk + +TARGET = csound +#DEPS = csound sndfile +LIBS = $(DEPS) ppapi_cpp ppapi pthread csound nacl_io sndfile + +CFLAGS = -Wno-unused-variable -I../../include +SOURCES = csound.cpp + +# Build rules generated by macros from common.mk: +#$(foreach dep,$(DEPS),$(eval $(call DEPEND_RULE,$(dep)))) +$(foreach src,$(SOURCES),$(eval $(call COMPILE_RULE,$(src),$(CFLAGS)))) + +ifeq ($(CONFIG),Release) +$(eval $(call LINK_RULE,$(TARGET)_unstripped,$(SOURCES),$(LIBS),$(DEPS))) +$(eval $(call STRIP_RULE,$(TARGET),$(TARGET)_unstripped)) +else +$(eval $(call LINK_RULE,$(TARGET),$(SOURCES),$(LIBS),$(DEPS))) +endif + +$(eval $(call NMF_RULE,$(TARGET),)) diff -Nru csound-6.01~dfsg/nacl/csound/canvas.html csound-6.02~dfsg/nacl/csound/canvas.html --- csound-6.01~dfsg/nacl/csound/canvas.html 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/nacl/csound/canvas.html 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,109 @@ + + + + + Canvas Example + + + + + +

+ + +

+ + +
+ + + diff -Nru csound-6.01~dfsg/nacl/csound/csdplayer.html csound-6.02~dfsg/nacl/csound/csdplayer.html --- csound-6.01~dfsg/nacl/csound/csdplayer.html 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/nacl/csound/csdplayer.html 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,88 @@ + + + + + csd player + + + + + +

+ + +

+ + +
+ + + diff -Nru csound-6.01~dfsg/nacl/csound/csound.cpp csound-6.02~dfsg/nacl/csound/csound.cpp --- csound-6.01~dfsg/nacl/csound/csound.cpp 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/nacl/csound/csound.cpp 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,632 @@ +/* + * Csound pnacl interactive frontend + * + * Copyright (C) 2013 V Lazzarini + * + * This file belongs to Csound. + * + * This software is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include +#include +#include +#include +#include "ppapi/cpp/audio.h" +#include "ppapi/cpp/var_array_buffer.h" +#include "ppapi/cpp/completion_callback.h" +#include "ppapi/cpp/instance.h" +#include "ppapi/cpp/url_loader.h" +#include "ppapi/cpp/url_request_info.h" +#include "ppapi/utility/completion_callback_factory.h" +#include "ppapi/cpp/module.h" +#include "ppapi/cpp/var.h" +#include +#include +#include "nacl_io/nacl_io.h" +#include +#include +#include + +namespace { + const char* const kPlaySoundId = "playCsound"; + const char* const kStopSoundId = "pauseCsound"; + const char* const kOrchestraId = "orchestra"; + const char* const kScoreId = "score"; + const char* const kEventId = "event"; + const char* const kChannelId = "channel"; + const char* const kSChannelId = "schannel"; + const char* const kChannelOutId = "outchannel"; + const char* const kCopyId = "copyToLocal"; + const char* const kCopyUrlId = "copyUrlToLocal"; + const char* const kGetFileId = "getFile"; + const char* const kCsdId = "csd"; + const char* const kRenderId = "render"; + static const char kMessageArgumentSeparator = ':'; + static const char kUrlArgumentSeparator = '#'; + + const double kDefaultFrequency = 440.0; + const double kPi = 3.141592653589; + const double kTwoPi = 2.0 * kPi; + const uint32_t kSampleFrameCount =512u; + const uint32_t kChannels = 2u; +} // namespace + + +struct UrlReader { + + std::string mem; + char buffer[32768]; + int bytes; + std::string url; + pp::Instance *instance; + pp::URLLoader url_loader; + pp::URLRequestInfo url_request; + pp::CompletionCallbackFactory cc_factory; + + static UrlReader *Create(pp::Instance *inst, char *path); + UrlReader(pp::Instance *inst, char *path); + void Start(); + void ReadBody(); + void OnRead(int32_t result); + void OnOpenUrl(int32_t result); + UrlReader(const UrlReader&); + void operator=(const UrlReader&); + +}; + +class CsoundInstance : public pp::Instance { + + pp::Audio dac; + CSOUND *csound; + int count; + PPB_GetInterface get_browser_interface_; + int fileResult; + char *from; + char *dest; + char *csd; + bool compiled; + bool finished; + + void PlayCsound(); + void PlayCsd(char *c, bool dac); + void CopyFileToLocalAsync(char *from, char *to); + void CopyFromURLToLocalAsync(char *URL, char *name); + void GetFileFromLocalAsync(char *src); + + static void CsoundCallback(void* samples, + uint32_t buffer_size, + void* data) { + CsoundInstance* instance = (CsoundInstance*) data; + CSOUND *csound_ = instance->csound; + if(csound_ != NULL && !instance->isFinished()) { + int count_ = instance->count; + int n, buffsamps = buffer_size / sizeof(short); + short* buff = (short*) samples; + MYFLT _0dbfs = csoundGet0dBFS(csound_); + MYFLT *spout = csoundGetSpout(csound_); + int ksmps = csoundGetKsmps(csound_)*csoundGetNchnls(csound_); + while(csoundGetMessageCnt(csound_)){ + instance->PostMessage(csoundGetFirstMessage(csound_)); + csoundPopFirstMessage(csound_); + } + + MYFLT scale = 32768./_0dbfs; + if(spout != NULL) + for(n=0; n < buffsamps; n++) { + if(count_ == 0) { + int ret = csoundPerformKsmps(csound_); + if(ret != 0) { + instance->isFinished(true); + return; + } + count_ = ksmps; + } + buff[n] = (int16_t) (scale*spout[ksmps-count_]); + count_--; + } + instance->count = count_; + } else + memset(samples,0,buffer_size); + } + + public: + char *GetDestFileName(){ return dest; } + void SetFileResult(int res){ fileResult = res; } + char *GetSrcFileName(){ return from; } + bool isCompiled() { return compiled; } + void isCompiled(bool c) { compiled = c; } + bool isFinished() { return finished; } + void isFinished(bool f) { finished = f; } + virtual bool Init(uint32_t argc, const char* argn[], const char* argv[]); + virtual void HandleMessage(const pp::Var& var_message); + CSOUND *GetCsound() { return csound; } + char *GetCsd() { return csd;} + bool StartDAC(); + + explicit CsoundInstance(PP_Instance instance, + PPB_GetInterface get_browser_interface) + : pp::Instance(instance), + csound(NULL), count(0), fileResult(0), + from(NULL), dest(NULL), csd(NULL), compiled(false), finished(false) + + { + get_browser_interface_ = get_browser_interface; + } + + virtual ~CsoundInstance() { + if(dest) free(dest); + if(from) free(from); + if(csound){ + csoundDestroyMessageBuffer(csound); + csoundDestroy(csound); + } + } + + +}; + +bool CsoundInstance::Init(uint32_t argc, + const char* argn[], + const char* argv[]) { + + csound = csoundCreate(NULL); + csoundCreateMessageBuffer(csound, 0); + nacl_io_init_ppapi(pp_instance(),get_browser_interface_); + + // this is to prevent a segfault with Csound + umount("/"); + mount("", "/", "memfs", 0, ""); + + mount("", /* source */ + "/local", /* target */ + "html5fs", /* filesystemtype */ + 0, /* mountflags */ + "type=TEMPORARY"); /* data */ + + mount("", /* source. Use relative URL */ + "/http", /* target */ + "httpfs", /* filesystemtype */ + 0, /* mountflags */ + ""); /* data */ + return true; +} + +bool CsoundInstance::StartDAC(){ + MYFLT sr = csoundGetSr(csound); + PP_AudioSampleRate isr; + if(sr == 44100.) isr = PP_AUDIOSAMPLERATE_44100; + else if (sr == 48000.) isr = PP_AUDIOSAMPLERATE_48000; + else { + PostMessage("Csound error: unsupported SR \n"); + return false; + } + if(csoundGetNchnls(csound) != 2) { + PostMessage("Csound error: only stereo output is supported \n"); + return false; + } + + int frames = + pp::AudioConfig::RecommendSampleFrameCount(this, + PP_AUDIOSAMPLERATE_44100, kSampleFrameCount); + dac = pp::Audio( + this, + pp::AudioConfig(this, PP_AUDIOSAMPLERATE_44100, frames), + CsoundCallback, + this); + dac.StartPlayback(); + return true; +} + +void* compileThreadFunc(void *data) { + CsoundInstance *p = (CsoundInstance *) data; + CSOUND *csound = p->GetCsound(); + char *csd = p->GetCsd(); + char *argv[] = {(char *)"csound", p->GetCsd(), (char *)"-+rtaudio=null"}; + MYFLT sr = 0.0; + if(csoundCompile(csound,3,argv) == 0){ + if(p->StartDAC()) + p->isCompiled(true); + else { + free(csd); + return NULL; + } + } + free(csd); + return NULL; +} + +void* compileThreadFuncNoDAC(void *data) { + CsoundInstance *p = (CsoundInstance *) data; + CSOUND *csound = p->GetCsound(); + char *csd = p->GetCsd(); + char *argv[] = {(char *)"csound", p->GetCsd()}; + MYFLT sr = 0.0; + int ret = csoundCompile(csound,2,argv); + while(csoundGetMessageCnt(csound)){ + p->PostMessage(csoundGetFirstMessage(csound)); + csoundPopFirstMessage(csound); + } + if(ret == 0) { + p->isCompiled(true); + while(csoundPerformKsmps(csound) == 0) { + while(csoundGetMessageCnt(csound)){ + p->PostMessage(csoundGetFirstMessage(csound)); + csoundPopFirstMessage(csound); + } + } + csoundCleanup(csound); + while(csoundGetMessageCnt(csound)){ + p->PostMessage(csoundGetFirstMessage(csound)); + csoundPopFirstMessage(csound); + } + p->PostMessage("finished render"); + } + free(csd); + return NULL; +} + + +void CsoundInstance::PlayCsd(char *c, bool dac) { + if(!compiled){ + csd = strdup(c); + pthread_t t; + if(dac) + pthread_create(&t, NULL, compileThreadFunc, this); + else + pthread_create(&t, NULL, compileThreadFuncNoDAC, this); + } else + PostMessage("Csound is already started \n" + "Refresh page to play a different CSD\n"); +} + + + +void CsoundInstance::PlayCsound() { + if(!compiled) { + csoundSetHostImplementedAudioIO(csound,1,0); + csoundSetOption(csound, (char *) "-odac"); + csoundSetOption(csound, (char *) "--nchnls=2"); + csoundSetOption(csound, (char *) "-r44100"); + csoundSetOption(csound, (char *) "-k689.0625"); + csoundSetOption(csound, (char *) "--0dbfs=1"); + csoundSetOption(csound, (char *) "-b1024"); + csoundSetOption(csound, (char *) "--daemon"); + csoundStart(csound); + compiled = true; + StartDAC(); + return; + } + dac.StartPlayback(); +} + +void CsoundInstance::HandleMessage(const pp::Var& var_message) { + if (!var_message.is_string()) { + return; + } + std::string message = var_message.AsString(); + if (message == kPlaySoundId) { + if(!compiled) { + PlayCsound(); + PostMessage("Csound: running...\n"); + } else { + dac.StartPlayback(); + PostMessage("Csound: running...\n"); + } + } else if (message == kStopSoundId) { + dac.StopPlayback(); + PostMessage("Csound: paused...\n"); + } else if (message.find(kCsdId) == 0) { + size_t sep_pos = message.find_first_of(kMessageArgumentSeparator); + if (sep_pos != std::string::npos) { + std::string string_arg = message.substr(sep_pos + 1); + PlayCsd((char *)string_arg.c_str(), true); + } + } else if (message.find(kRenderId) == 0) { + size_t sep_pos = message.find_first_of(kMessageArgumentSeparator); + if (sep_pos != std::string::npos) { + std::string string_arg = message.substr(sep_pos + 1); + PlayCsd((char *)string_arg.c_str(), false); + } + } else if (message.find(kOrchestraId) == 0) { + size_t sep_pos = message.find_first_of(kMessageArgumentSeparator); + if (sep_pos != std::string::npos) { + std::string string_arg = message.substr(sep_pos + 1); + if(compiled) csoundCompileOrc(csound, (char *) string_arg.c_str()); + else PostMessage("engine has not started yet\n"); + } + } else if (message.find(kScoreId) == 0) { + size_t sep_pos = message.find_first_of(kMessageArgumentSeparator); + if (sep_pos != std::string::npos) { + std::string string_arg = message.substr(sep_pos + 1); + csoundReadScore(csound, (char *) string_arg.c_str()); + } + } else if (message.find(kEventId) == 0) { + size_t sep_pos = message.find_first_of(kMessageArgumentSeparator); + if (sep_pos != std::string::npos) { + std::string string_arg = message.substr(sep_pos + 1); + csoundInputMessage(csound, (char *) string_arg.c_str()); + } + } else if(message.find(kChannelId) == 0){ + size_t sep_pos = message.find_first_of(kMessageArgumentSeparator); + if (sep_pos != std::string::npos) { + std::string string_arg = message.substr(sep_pos + 1); + sep_pos = string_arg.find_first_of(kMessageArgumentSeparator); + std::string channel = string_arg.substr(0, sep_pos); + std::string svalue = string_arg.substr(sep_pos + 1); + std::istringstream stream(svalue); + MYFLT val; + if (stream >> val) { + csoundSetControlChannel(csound,(char *)channel.c_str(), val); + return; + } + } + } else if(message.find(kSChannelId) == 0){ + size_t sep_pos = message.find_first_of(kMessageArgumentSeparator); + if (sep_pos != std::string::npos) { + std::string string_arg = message.substr(sep_pos + 1); + sep_pos = string_arg.find_first_of(kMessageArgumentSeparator); + std::string channel = string_arg.substr(0, sep_pos); + std::string svalue = string_arg.substr(sep_pos + 1); + csoundSetStringChannel(csound,(char *)channel.c_str(),(char *)svalue.c_str()); + return; + } + } + else if(message.find(kChannelOutId) == 0){ + size_t sep_pos = message.find_first_of(kMessageArgumentSeparator); + if (sep_pos != std::string::npos) { + std::string string_arg = message.substr(sep_pos + 1); + sep_pos = string_arg.find_first_of(kMessageArgumentSeparator); + std::string channel = string_arg.substr(0); + char mess[64]; + int err; + MYFLT val = csoundGetControlChannel(csound,(char *)channel.c_str(), &err); + sprintf(mess, "::control::%s:%f",(char *)channel.c_str(),val); + PostMessage(mess); + return; + } + } else if (message.find(kCopyId) == 0) { + size_t sep_pos = message.find_first_of(kMessageArgumentSeparator); + if (sep_pos != std::string::npos) { + std::string string_arg = message.substr(sep_pos + 1); + if (sep_pos != std::string::npos) { + std::string string_arg = message.substr(sep_pos + 1); + sep_pos = string_arg.find_first_of(kUrlArgumentSeparator); + std::string src = string_arg.substr(0, sep_pos); + std::string sname = string_arg.substr(sep_pos + 1); + CopyFileToLocalAsync((char *) src.c_str(), (char *) sname.c_str()); + } + } + } else if (message.find(kCopyUrlId) == 0) { + size_t sep_pos = message.find_first_of(kMessageArgumentSeparator); + if (sep_pos != std::string::npos) { + std::string string_arg = message.substr(sep_pos + 1); + if (sep_pos != std::string::npos) { + std::string string_arg = message.substr(sep_pos + 1); + sep_pos = string_arg.find_first_of(kUrlArgumentSeparator); + std::string surl = string_arg.substr(0, sep_pos); + std::string sname = string_arg.substr(sep_pos + 1); + CopyFromURLToLocalAsync((char *) surl.c_str(), (char *) sname.c_str()); + } + } + } else if (message.find(kGetFileId) == 0) { + size_t sep_pos = message.find_first_of(kMessageArgumentSeparator); + if (sep_pos != std::string::npos) { + std::string string_arg = message.substr(sep_pos + 1); + GetFileFromLocalAsync((char *)string_arg.c_str()); + } + } else { + PostMessage("message not handled: "); + PostMessage(message.c_str()); + PostMessage("\n"); + } +} + +void* fileThreadFunc(void *data){ + + CsoundInstance *p = (CsoundInstance*) data; + FILE *fp_in, *fp_out; + int retval=0; + char *rem_name; + rem_name = (char *) + malloc(strlen(p->GetSrcFileName())+strlen("http/"))+1; + sprintf(rem_name,"http/%s",p->GetSrcFileName()); + p->PostMessage("Copying: "); + p->PostMessage(rem_name); + p->PostMessage("\n"); + if((fp_in = fopen(rem_name, "r"))!= NULL){ + char *local_name = (char *) + malloc(strlen(p->GetDestFileName())+strlen("local/"))+1; + sprintf(local_name,"local/%s",p->GetDestFileName()); + if((fp_out = fopen(local_name, "w"))!=NULL) { + char buffer[512]; + int read; + while((read = fread(buffer,1,512,fp_in))) + fwrite(buffer,1,read,fp_out); + fclose(fp_out); + retval = 0; + p->PostMessage("copied file: "); + p->PostMessage(local_name); + p->PostMessage("\n"); + } else retval = -1; + free(local_name); + fclose(fp_in); + } else retval = -1; + free(rem_name); + if(retval < 0){ + p->PostMessage(rem_name); + p->PostMessage(": could not copy file\n"); + } else p->PostMessage("Complete"); + p->SetFileResult(retval); + return NULL; +} + +void CsoundInstance::CopyFileToLocalAsync(char *src , char *name){ + pthread_t id; + if(dest) free(name); + dest = strdup(name); + if(from) free(from); + from = strdup(src); + pthread_create(&id, NULL, &fileThreadFunc,(void*) this); +} + + +void* fileReadThreadFunc(void *data){ + + CsoundInstance *p = (CsoundInstance*) data; + FILE *fp_in; + p->PostMessage("Reading:"); + if((fp_in = fopen(p->GetSrcFileName(), "r"))!= NULL){ + fseek(fp_in, 0, SEEK_END); + long size = ftell(fp_in); + fseek(fp_in, 0 ,SEEK_SET); + char *buffer = (char *) malloc(size); + long pos = 0, bytes =0; + while((bytes = + fread(&buffer[pos],1,16384,fp_in)) + != 0) pos += bytes; + fclose(fp_in); + pp::VarArrayBuffer v2 = pp::VarArrayBuffer(size); + void* pDst = v2.Map(); + memcpy(pDst,buffer,size); + v2.Unmap(); + p->PostMessage(v2); + } + p->PostMessage("Complete"); + return NULL; +} + +void CsoundInstance::GetFileFromLocalAsync(char *src){ + pthread_t id; + if(from) free(from); + from = strdup(src); + pthread_create(&id, NULL, &fileReadThreadFunc,(void*) this); +} + + + +void* urlThreadFunc(void *data) { + UrlReader *d = ((UrlReader*)data); + CsoundInstance *p = (CsoundInstance *) d->instance; + + char *local_name = (char *) + malloc(strlen(p->GetDestFileName())+strlen("local/")+1); + sprintf(local_name,"local/%s",p->GetDestFileName()); + p->PostMessage("Copying memory into: "); + p->PostMessage(local_name); + p->PostMessage("\n"); + FILE *fp_out; + const char *buffer = d->mem.data(); + if((fp_out = fopen(local_name, "w"))!= NULL){ + int cnt = 0; + while(cnt < d->bytes) { + cnt += fwrite(&buffer[cnt],1,512,fp_out); + } + fclose(fp_out); + p->PostMessage(local_name); + p->PostMessage(": copied "); + p->PostMessage(pp::Var(cnt)); + p->PostMessage(" bytes\n"); + } + free(local_name); + delete d; + p->PostMessage("Complete"); + return NULL; + } + + UrlReader *UrlReader::Create(pp::Instance *inst, char *path){ + return new UrlReader(inst, path); + } + + UrlReader::UrlReader(pp::Instance *inst, char *path) : + url(path), instance(inst), + url_request(inst), url_loader(inst), cc_factory(this), bytes(0) + { + url_request.SetURL(url); + url_request.SetMethod("GET"); + url_request.SetProperty(PP_URLREQUESTPROPERTY_ALLOWCROSSORIGINREQUESTS, pp::Var(true)); + instance->PostMessage("UrlReader\n"); + } + + void UrlReader::Start() { + pp::CompletionCallback cc = + cc_factory.NewCallback(&UrlReader::OnOpenUrl); + url_loader.Open(url_request,cc); + } + + void UrlReader::ReadBody(){ + pp::CompletionCallback cc = + cc_factory.NewOptionalCallback(&UrlReader::OnRead); + int result; + do { + result = url_loader.ReadResponseBody(buffer,512,cc); + if(result > 0){ + bytes += result; + int end = std::min(32768,result); + mem.insert(mem.end(), buffer, buffer+end); + } + } + while(result > 0); + if (result != PP_OK_COMPLETIONPENDING) { + cc.Run(result); + } + } + + void UrlReader::OnRead(int32_t result){ + if (result == PP_OK){ + pthread_t id; + pthread_create(&id, NULL, + &urlThreadFunc,(void*)this); + instance->PostMessage("...done\n"); + } + else if (result > 0) { + bytes += result; + int end = std::min(32768,result); + mem.insert(mem.end(), buffer, buffer+end); + ReadBody(); + } + } + + void UrlReader::OnOpenUrl(int32_t result){ + if(result != PP_OK){ + instance->PostMessage("URL open failed.\n"); + return; + } + instance->PostMessage("loading URL data into memory...\n"); + ReadBody(); + } + + void CsoundInstance::CopyFromURLToLocalAsync(char *URL,char *name){ + if(dest) free(dest); + dest = strdup(name); + UrlReader *r = UrlReader::Create(this, URL); + PostMessage("created URL urlReader \n"); + if(r != NULL) r->Start(); + } + + class CsoundModule : public pp::Module { + public: + CsoundModule() : pp::Module() {} + ~CsoundModule() { + } + + virtual pp::Instance* CreateInstance(PP_Instance instance) { + return new CsoundInstance(instance, get_browser_interface()); + } + }; + + namespace pp { + Module* CreateModule() { return new CsoundModule(); } + } diff -Nru csound-6.01~dfsg/nacl/csound/csound.js csound-6.02~dfsg/nacl/csound/csound.js --- csound-6.01~dfsg/nacl/csound/csound.js 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/nacl/csound/csound.js 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,338 @@ +/* + * Csound pnacl interactive frontend + * + * Copyright (C) 2013 V Lazzarini + * + * This file belongs to Csound. + * + * This software is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + +var csound = (function() { + + /** + * Loads csound pNaCl module + */ + function createModule() { + var model = document.createElement('embed'); + model.setAttribute('name', 'csound_module'); + model.setAttribute('id', 'csound_module'); + model.setAttribute('path', 'pnacl/Release'); + model.setAttribute('src', 'pnacl/Release/csound.nmf'); + var mimetype = 'application/x-pnacl'; + model.setAttribute('type', mimetype); + var csoundhook = document.getElementById('engine'); + csoundhook.appendChild(model); + } + + /** + * Attaches handlers for events + */ + function attachDefaultListeners() { + var csoundhook= document.getElementById('engine'); + csoundhook.addEventListener('load', moduleDidLoad, true); + csoundhook.addEventListener('message', handleMessage, true); + csoundhook.addEventListener('crash', handleCrash, true); + csoundhook.addEventListener('progress', handleProgress, true); + if (typeof window.attachListeners !== 'undefined') { + window.attachListeners(); + } + } + + /** + * Creates a progress count + */ + var progressCount=0; + function handleProgress(event) { + var loadPercent = 0.0; + var loadPercentString; + if (event.lengthComputable && event.total > 0) { + loadPercent = (event.loaded / event.total) * 100.0; + loadPercentString = 'loading... (' + loadPercent.toFixed(2) + '%)'; + } else { + loadPercent = -1.0; + progressCount++; + loadPercentString = 'loading... (count=' + progressCount + ')'; + } + updateStatus(loadPercentString); + } + + /** + * Handles a crash or exit event + */ + function handleCrash(event) { + if (csound.module.exitStatus == -1) { + updateStatus('Ops, something went wrong... please refresh page',1); + } else { + updateStatus('Csound has exited [' + csound.module.exitStatus + ']', 1); + } + if (typeof window.handleCrash !== 'undefined') { + window.handleCrash(csound.module.lastError); + } + } + + /** + * After module loading, point the member var to it + */ + function moduleDidLoad() { + csound.module = document.getElementById('csound_module'); + updateStatus('ready', 1); + if (typeof window.moduleDidLoad !== 'undefined') { + window.moduleDidLoad(); + } + } + + /** + * Unloads/destroys module. + */ + function destroyModule() { + csound.module.parentNode.removeChild(csound.module); + csound.module = null; + } + + var fileData = null; + function handleFileMessage(event) { + updateStatus("fetching file data\n"); + fileData = event.data; + updateStatus("finished fetching file data\n"); + var csoundhook= document.getElementById('engine'); + csoundhook.removeEventListener('message', handleFileMessage, true); + csoundhook.addEventListener('message', handleMessage, true); + } + + /** + * handles messages by passing them to the window handler + * + * @param {Event} event A message event. + * message_event.data contains + * the data sent from the csound module. + */ + function handleMessage(event) { + if (typeof window.handleMessage !== 'undefined') { + if(event.data == "Reading:"){ + var csoundhook= document.getElementById('engine'); + csoundhook.removeEventListener('message', handleMessage, true); + csoundhook.addEventListener('message', handleFileMessage, true); + } + else + window.handleMessage(event); + return; + } + } + + var statusText = 'not loaded'; + /** + * Prints current status to the console + * @param {string} opt_message The status message. + */ + function updateStatus(opt_message, keep) { + if (opt_message) { + statusText = 'Csound: ' + opt_message + '\n'; + } + var statusField = document.getElementById('console'); + if (statusField) { + var fieldType = statusField.tagName.toLowerCase(); + if(fieldType == 'div') { + statusText += "
"; + if(!keep) statusField.innerHTML = statusText ; + else + statusField.innerHTML += statusText; + } else { + if(!keep) statusField.value = statusText; + else statusField.value += statusText; + } + } + } + + /** + * Starts audio playback + */ + function Play() { + csound.module.postMessage('playCsound'); + } + + /** + * Pauses audio playback + */ + function Pause() { + csound.module.postMessage('pauseCsound'); + } + + /** + * Sends code to be compiled by Csound + * + * @param {string} s A string containing the code. + */ + function CompileOrc(s) { + csound.module.postMessage('orchestra:' + s); + } + + /** + * Starts audio playback with a CSD + * + * @param {string} s A string containing the pathname to the CSD. + */ + function PlayCsd(s) { + csound.module.postMessage('csd:' + s); + } + + /** + * Starts audio rendering with a CSD (no RT audio playback) + * + * @param {string} s A string containing the pathname to the CSD. + */ + function RenderCsd(s) { + csound.module.postMessage('render:' + s); + } + + + /** + * Sends a score to be read by Csound + * + * @param {string} s A string containing the score. + */ + function ReadScore(s) { + csound.module.postMessage('score:' + s); + } + + /** + * Sends line events to Csound + * + * @param {string} s A string containing the line events. + */ + function Event(s) { + csound.module.postMessage('event:' + s); + } + + /** + * Sets the value of a control channel in Csound + * + * @param {string} name The channel to be set. + * @param {string} value The value to set the channel. + */ + function SetChannel(name, value){ + var channel = 'channel:' + name + ':'; + csound.module.postMessage(channel + value); + } + + /** + * Sets the value of a string channel in Csound + * + * @param {string} name The channel to be set. + * @param {string} string The string to set the channel. + */ + function SetStringChannel(name, value){ + var channel = 'schannel:' + name + ':'; + csound.module.postMessage(channel + value); + } + + + /** + * Requests the value of a control channel in Csound + * + * @param {string} name The channel requested + * + * The channel value will be passed from csound as + * a message with the following format: + * + * ::control::channel:value + */ + function RequestChannel(name){ + var channel = 'outchannel:' + name; + csound.module.postMessage(channel); + } + + /** + * Copies a server file to local/. (not persistent) + * + * @param {string} src The src name + * @param {string} dest The dest name + */ + function CopyToLocal(src, dest) { + var ident = 'copyToLocal:' + src + '#'; + csound.module.postMessage(ident + dest); + } + + /** + * Copies a URL file to local/. (not persistent) + * + * NB: works with the origin URL and CORS-ready URLs + * + * @param {string} url The url name + * @param {string} name The file name + */ + function CopyUrlToLocal(url, name) { + var ident = 'copyUrlToLocal:' + url + '#'; + csound.module.postMessage(ident + name); + } + + /** + * Requests the data from a local file + * module sends "Complete" message when done. + * + * @param {string} url The file name + */ + function RequestFileFromLocal(name) { + csound.module.postMessage("getFile:" + name); + } + /** + * Returns the most recently requested file data. + * + */ + function GetFileData(){ + return fileData; + } + + return { + module: null, + attachDefaultListeners: attachDefaultListeners, + createModule: createModule, + destroyModule: destroyModule, + updateStatus: updateStatus, + Play: Play, + Pause: Pause, + PlayCsd: PlayCsd, + RenderCsd: RenderCsd, + CompileOrc: CompileOrc, + ReadScore: ReadScore, + Event: Event, + SetChannel: SetChannel, + CopyToLocal: CopyToLocal, + CopyUrlToLocal: CopyUrlToLocal, + RequestFileFromLocal: RequestFileFromLocal, + GetFileData : GetFileData, + RequestChannel: RequestChannel, + SetStringChannel: SetStringChannel + }; + +}()); + +document.addEventListener('DOMContentLoaded', function() { + + csound.updateStatus('page loaded'); + if (!(navigator.mimeTypes['application/x-pnacl'] !== undefined)) { + csound.updateStatus('No support for pNaCl (maybe disabled?)'); + } else if (csound.module == null) { + csound.updateStatus('loading csound module'); + csound.attachDefaultListeners(); + csound.createModule(); + } else { + csound.updateStatus('not ready'); + } + +}); + + diff -Nru csound-6.01~dfsg/nacl/csound/docs/pnacl_csound.html csound-6.02~dfsg/nacl/csound/docs/pnacl_csound.html --- csound-6.01~dfsg/nacl/csound/docs/pnacl_csound.html 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/nacl/csound/docs/pnacl_csound.html 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,739 @@ + + +Csound for Portable Native Client + + + + + + + + +
+ + + + + + + +

Csound for Portable Native Client

+
Victor Lazzarini

+
November 26, 2013
+
+

1 Introduction

+

Native Client (NaCl) is a sandboxing technology developed by Google that allows +C/C++ modules to extend the support provided by HTML5. Portable +Native Client (pNaCl) is one of the toolchains in the NaCl SDK (the +others are newlib and glibc). The advantage of pNaCl over the other +options is that it only requires a single module to be built for all supported +architectures. +

The other major advantage is that pNaCl is, as of Google Chrome 31, enabled +by default in the browser. This means that users just need to load a page +containing the pNaCl application and it will work. pNaCl modules are compiled +to llvm bytecode that is translated to a native binary by the browser. To check +whether your version of Chrome supports pNaCl, use the following address: +
+

chrome://nacl
+

Porting Csound to pNaCl involved three steps, following the SDK +installation:
+

    +
  1. Building libsndfile as a pNaCl library + + + +
    2. +
  2. Build Csound as a pNaCl library +
    3. +
  3. Developing the pNaCl module to provide an interface to the Csound + library
+

+

2 Building Csound for pNaCl

+

+

2.1 Building the libraries

+

With the NaCl SDK installed, and the NACL_SDK_ROOT set +as per installation instructions and the libsndfile-nacl sources +(https://www.dropbox.com/s/ezfo9rmo5wtzptz/libsndfile-nacl.tar.gz), +you can use the make command to build libsndfile. To build the Csound library, +run the build.sh script in the ./nacl subdirectory of the Csound 6 sources. When +libraries are built, they are added to the SDK, and made readily available for +applications to be built with them. +

+

2.2 Building the pNaCl Csound module

+

Once the libraries are built, you can run make in the ./nacl/csound subdirectory +of the Csound sources. This will build the nacl module in pnacl/Release. There is +a package.sh that can be used to copy and package all the relevant files for +HTML5 development. This package is self-contained, i.e. it does not have any +dependencies, and it can be expanded elsewhere in your project application +folders. +

+

2.3 Running the example application

+

NaCl pages need to be served over http, which means they will not work when +opened as local files. You need to start a local server, and this can be done with +the python script httpd.py found in the $NACL_SDK_ROOT/tools directory. + + + +If you start this script in the top level directory of the pNaCl Csound +package, then the example will be found at the http://localhost:5103 +address. +

+

3 Csound pNaCl module reference

+

The interface to Csound is found in the csound.js javascript file. Csound +is ready on module load, and can accept control messages from then +on. +

+

3.1 Control functions

+

The following control functions can be used to interact with Csound: +

    +
  • csound.Play() - starts performance +
    • +
  • csound.PlayCsd(s) - starts performance from a CSD file s, which can + be in ./http/ (ORIGIN server) or ./local/ (local sandbox). +
    • +
  • csound.RenderCsd(s) - renders a CSD file s, which can be in ./http/ + (ORIGIN server) or ./local/ (local sandbox), with no RT audio output. + The “finished render” message is issued on completion. +
    • +
  • csound.Pause() - pauses performance +
    • +
  • csound.CompileOrc(s) - compiles the Csound code in the string s +
    • +
  • csound.ReadScore(s) - reads the score in the string s (with + preprocessing support) +
    • +
  • csound.Event(s) - sends in the line events contained in the string s + (no preprocessing) + + + +
    • +
  • csound.SetChannel(name, value) - sends the control channel name + the value value, both arguments being strings.
+

+

3.2 Filesystem functions

+

In order to facilitate access to files, the following filesystem functions can be +used: +

    +
  • csound.CopyToLocal(src, dest) - copies the file src in the ORIGIN + directory to the local file dest, which can be accessed at ./local/dest. + The “Complete” message is issued on completion. +
    • +
  • csound.CopyUrlToLocal(url,dest) - copies the url url to the local + file dest, which can be accessed at ./local/dest. Currently only ORIGIN + and CORS urls are allowed remotely, but local files can also be passed + if encoded as urls with the webkitURL.createObjectURL() javascript + method. The “Complete” message is issued on completion. +
    • +
  • csound.RequestFileFromLocal(src) - requests the data from the + local file src. The “Complete” message is issued on completion. +
    • +
  • csound.GetFileData() - returns the most recently requested file data + as an ArrayObject.
+

+

3.3 Callbacks

+

The csound.js module will call the following window functions when it +starts: +

    +
  • function moduleDidLoad(): this is called as soon as the module is + loaded + + + +
    • +
  • function handleMessage(message): called when there are messages + from Csound (pnacl module). The string message.data contains the + message. +
    • +
  • function attachListeners(): this is called when listeners for + different events are to be attached.
+

You should implement these functions in your HTML page script, in order to +use the Csound javascript interface. In addition to the above, Csound javascript +module messages are always sent to the HTML element with id=‘console’, which +is normally of type <div> or <textarea>. +

+

3.4 Example

+

Here is a minimal HTML example showing the use of Csound +

+ +

,  
<!DOCTYPE html> 
<html> 
<!-- 
 Csound pnacl minimal example 
 Copyright (C) 2013 V Lazzarini 
--> 
<head> 
 <title>Minimal Csound Example</title> 
 <script type="text/javascript" src="csound.js"></script> 
 <script type="text/javascript"> 
 // called by csound.js 
 function moduleDidLoad() { 
  csound.Play(); 
  csound.CompileOrc( 
  "instr 1 \n" + 
  "a1 oscili 0.1,440+rnd(440)\n" + 
  "outs a1,a1 \n" + 
  "endin"); 
  document.getElementById("tit").innerHTML = "Click on the page below to play"; 
 } 
 function attachListeners() { 
   document.getElementById("mess"). 
       addEventListener("click",Play); 
 } 
 function handleMessage(message) { 
   var mess = message.data; 
   var messField = document.getElementById("mess") 
   messField.innerText += mess; 
 } 
 
 // click handler 
 function Play() { 
   csound.Event("i 1 0 5"); 
 } 
 </script> 
</head> 
<body> 
  <div id="console"></div> 
   <h3 id="tit"> </h3> 
  <div id="mess"> 
 
  </div> 
  <!--pNaCl csound module--> 
  <div id="engine"></div> 
</body> 
</html> + +

+

+

4 Limitations

+

The following limitations apply: +

    +
  • no realtime audio input (not supported yet in Pepper/NaCl) +
    • +
  • no MIDI in the NaCl module. However, it might be possible to + implement MIDI in javascript, and using the csound.js functions, send + data to Csound, and respond to MIDI NOTE messages. +
    • +
  • no plugins, as pNaCl does not support dlopen() and friends. This + + + + means some opcodes are not available as they reside in plugin libraries. + It might be possible to add some of these opcodes statically to the + Csound pNaCl library in the future.
+ + + + + + Binary files /tmp/YoCR1bco_Y/csound-6.01~dfsg/nacl/csound/docs/pnacl_csound.pdf and /tmp/drTeJpx12F/csound-6.02~dfsg/nacl/csound/docs/pnacl_csound.pdf differ diff -Nru csound-6.01~dfsg/nacl/csound/docs/pnacl_csound.tex csound-6.02~dfsg/nacl/csound/docs/pnacl_csound.tex --- csound-6.01~dfsg/nacl/csound/docs/pnacl_csound.tex 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/nacl/csound/docs/pnacl_csound.tex 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,134 @@ +\documentclass[11pt]{article} +\usepackage{listings} +\usepackage{hyperref} + +\lstset { +basicstyle={\ttfamily, \footnotesize}, +showspaces=false, showstringspaces=false +} +\begin{document} + + + +\title{Csound for Portable Native Client} +\author{Victor Lazzarini} +\date{\today} +\maketitle + +\section{Introduction} + +Native Client (NaCl) is a sandboxing technology developed by Google that allows C/C++ modules to extend the support provided +by HTML5. Portable Native Client (pNaCl) is one of the toolchains in the NaCl SDK (the others are newlib and glibc). The advantage +of pNaCl over the other options is that it only requires a single module to be built for all supported architectures. + +The other major advantage is that pNaCl is, as of Google Chrome 31, enabled by default in the browser. This means that users +just need to load a page containing the pNaCl application and it will work. pNaCl modules are compiled to llvm bytecode that is +translated to a native binary by the browser. To check whether your version of Chrome supports pNaCl, use the following address: +\\ + + {\tt chrome://nacl } +\\ + +Porting Csound to pNaCl involved three steps, following the SDK installation: +\\ +\begin{enumerate} +\item Building libsndfile as a pNaCl library +\item Build Csound as a pNaCl library +\item Developing the pNaCl module to provide an interface to the Csound library +\end{enumerate} + + +\section{Building Csound for pNaCl} + +\subsection{Building the libraries} + +With the NaCl SDK installed, and the NACL\_SDK\_ROOT set as per installation instructions and the libsndfile-nacl sources +(\url{https://www.dropbox.com/s/ezfo9rmo5wtzptz/libsndfile-nacl.tar.gz}), +you can use the make command to build libsndfile. To build the Csound library, run the build.sh script in the ./nacl subdirectory +of the Csound 6 sources. When libraries are built, they are added to the SDK, and made readily available for applications to be +built with them. + +\subsection{Building the pNaCl Csound module} + +Once the libraries are built, you can run make in the ./nacl/csound subdirectory of the Csound sources. This will build the +nacl module in pnacl/Release. There is a package.sh that can be used to copy and package all the relevant files for +HTML5 development. This package is self-contained, i.e. it does not have any dependencies, and it can be expanded +elsewhere in your project application folders. + + +\subsection{Running the example application} + +NaCl pages need to be served over http, which means they will not work when opened as local files. You need to start a local server, +and this can be done with the python script httpd.py found in the \$NACL\_SDK\_ROOT/tools directory. If you start this script +in the top level directory of the pNaCl Csound package, then the example will be found at the {\tt http://localhost:5103} address. + +\section{Csound pNaCl module reference} + +The interface to Csound is found in the csound.js javascript file. Csound is ready on module load, and can accept control messages +from then on. + +\subsection{Control functions} + +The following control functions can be used to interact with Csound: + +\begin{itemize} +\item {\tt csound.Play()} - starts performance +\item {\tt csound.PlayCsd(s)} - starts performance from a CSD file s, which can be in ./http/ (ORIGIN server) or ./local/ (local sandbox). +\item {\tt csound.RenderCsd(s)} - renders a CSD file s, which can be in ./http/ (ORIGIN server) or ./local/ (local sandbox), with no RT audio output. +The ``finished render" message is issued on completion. +\item {\tt csound.Pause()} - pauses performance +\item {\tt csound.CompileOrc(s)} - compiles the Csound code in the string s +\item {\tt csound.ReadScore(s)} - reads the score in the string s (with preprocessing support) +\item {\tt csound.Event(s)} - sends in the line events contained in the string s (no preprocessing) +\item {\tt csound.SetChannel(name, value)} - sends the control channel \emph{name} the value \emph{value}, both arguments being strings. +\end{itemize} + +\subsection{Filesystem functions} + +In order to facilitate access to files, the following filesystem functions can be used: + +\begin{itemize} +\item {\tt csound.CopyToLocal(src, dest)} - copies the file \emph{src} in the ORIGIN directory to the local file \emph{dest}, which can +be accessed at ./local/\emph{dest}. The ``Complete" message is issued on completion. +\item {\tt csound.CopyUrlToLocal(url,dest)} - copies the url \emph{url} to the local file \emph{dest}, which can +be accessed at ./local/\emph{dest}. Currently only ORIGIN and CORS urls are allowed remotely, but local files can +also be passed if encoded as urls with the webkitURL.createObjectURL() javascript method. The ``Complete" message is issued on completion. +\item {\tt csound.RequestFileFromLocal(src)} - requests the data from the local file \emph{src}. The ``Complete" message is issued on completion. +\item {\tt csound.GetFileData()} - returns the most recently requested file data as an ArrayObject. +\end{itemize} + + +\subsection{Callbacks} + +The csound.js module will call the following window functions when it starts: + +\begin{itemize} +\item {\tt function moduleDidLoad()}: this is called as soon as the module is loaded +\item {\tt function handleMessage(message)}: called when there are messages from Csound (pnacl module). +The string message.data contains the message. +\item {\tt function attachListeners()}: this is called when listeners for different events are to be attached. +\end{itemize} + +You should implement these functions in your HTML page script, in order to use the Csound javascript interface. +In addition to the above, Csound javascript module messages are always sent to the HTML element with id=`console', +which is normally of type \textless div\textgreater \, or \textless textarea\textgreater . + +\subsection{Example} + +Here is a minimal HTML example showing the use of Csound + +\lstinputlisting[language=HTML]{../minimal.html} + +\section{Limitations} + +The following limitations apply: + +\begin{itemize} +\item no realtime audio input (not supported yet in Pepper/NaCl) +\item no MIDI in the NaCl module. However, it might be possible to implement MIDI in javascript, and using the csound.js functions, +send data to Csound, and respond to MIDI NOTE messages. +\item no plugins, as pNaCl does not support dlopen() and friends. This means some opcodes are not available as they reside in plugin libraries. +It might be possible to add some of these opcodes statically to the Csound pNaCl library in the future. +\end {itemize} + +\end{document} diff -Nru csound-6.01~dfsg/nacl/csound/effects.html csound-6.02~dfsg/nacl/csound/effects.html --- csound-6.01~dfsg/nacl/csound/effects.html 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/nacl/csound/effects.html 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,155 @@ + + + + + Effects Example + + + + + + +

+ + +

+

+ + +

+

+

+    reverb            flanger            dry signal
+
+

+ + +
+ + + diff -Nru csound-6.01~dfsg/nacl/csound/gm.csd csound-6.02~dfsg/nacl/csound/gm.csd --- csound-6.01~dfsg/nacl/csound/gm.csd 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/nacl/csound/gm.csd 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,151 @@ + + +-odac -d -F./local/midifile.mid + + +nchnls=2 +ksmps = 64 + + +ichn = 1 +lp1: massign ichn, 0 +loop_le ichn, 1, 16, lp1 +pgmassign 0, 0 +gisf sfload "./local/sf_GMbank.sf2" +sfpassign 0, gisf + +/* this instrument parses MIDI input + to trigger the GM soundfont synthesis + instrument (instr 10 +*/ +instr 1 +idkit = 317 /* drum-kit preset was 317*/ +tableiw idkit, 9, 1 +irel = 0.5 /* release envelope */ + +ipg = 1 +ivol = 2 +ipan = 3 + +nxt: + kst, kch, kd1, kd2 midiin + + if (kst != 0) then + kch = kch - 1 + if (kst == 144 && kd2 != 0) then ; note on + kpg table kch, ipg + /* instrument identifier is 10.[chn][note] */ + kinst = 10 + kd1/100000 + kch/100 + if kch == 9 then + /* exclusive identifiers */ + if kpg == idkit+7 then + krel = 2 /* add extra release time for orch perc*/ + else + krel = 0.5 + endif + if (kd1 == 29 || kd1 == 30) then ; EXC7 + kinst = 10.97 + elseif (kd1 == 42 || kd1 == 44 || kd1 == 46 || kd1 == 49) then ; EXC1 + kinst = 10.91 + elseif (kd1 == 71 || kd1 == 72) then ; EXC2 + kinst = 10.92 + elseif (kd1 == 73 || kd1 == 74) then ; EXC3 + kinst = 10.93 + elseif (kd1 == 78 || kd1 == 79) then ; EXC4 + kinst = 10.94 + elseif (kd1 == 80 || kd1 == 81) then ; EXC5 + kinst = 10.95 + elseif (kd1 == 86 || kd1 == 87) then ; EXC6 + kinst = 10.96 + endif + else + krel = 0.5 + endif + event "i", kinst, 0, -1, kd1, kd2, kpg, kch,krel + + elseif (kst == 128 || (kst == 144 && kd2 == 0)) then ; note off + kpg table kch, ipg + kinst = 10 + kd1/100000 + kch/100 + if kch == 9 then + if (kd1 == 29 || kd1 == 30) then ; EXC7 + kinst = 10.97 + elseif (kd1 == 42 || kd1 == 44 || kd1 == 46 || kd1 == 49) then ; EXC1 + kinst = 10.91 + elseif (kd1 == 71 || kd1 == 72) then ; EXC2 + kinst = 10.92 + elseif (kd1 == 73 || kd1 == 74) then ; EXC3 + kinst = 10.93 + elseif (kd1 == 78 || kd1 == 79) then ; EXC4 + kinst = 10.94 + elseif (kd1 == 80 || kd1 == 81) then ; EXC5 + kinst = 10.95 + elseif (kd1 == 86 || kd1 == 87) then ; EXC6 + kinst = 10.96 + endif + else + kpg = 0 + endif + event "i", -kinst, 0, 1 + + elseif (kst == 192) then /* program change msgs */ + if kch == 9 then + kpg = idkit + if kd1 == 8 then + kpg = idkit+1 + elseif kd1 == 16 then + kpg = idkit+2 + elseif kd1 == 24 then + kpg = idkit+3 + elseif kd1 == 25 then + kpg = idkit+4 + elseif kd1 == 32 then + kpg = idkit+5 + elseif kd1 == 40 then + kpg = idkit+6 + elseif kd1 == 48 then + kpg = idkit+7 + endif + else + kpg = kd1 + endif + tablew kpg, kch, ipg + elseif (kst == 176 && kd1 == 11) then /* volume msgs */ + tablew kd2, kch, ivol + elseif (kst == 176 && kd1 == 7) then /* pan msgs */ + tablew kd2, kch, ipan + endif + kgoto nxt + endif + +endin + +/* this is the GM soundfont synthesizer instrument */ +instr 10 +kenv linenr 10,0.001,p8,0.001 +iamp table p5, 5 +a1, a2 sfplay p5, p4, iamp,1, p6, 0, 0, 2 +kv table p7, 2 +kvol tablei kv, 5 +kpan table p7, 3 +kpan = (kpan - 64)/128 + outs a1*kvol*(0.5-kpan/2)*kenv, a2*kvol*(0.5+kpan/2)*kenv +endin + +instr 11 + +endin + + + +/* program preset (memory) table */ +f1 0 16 -2 0 0 0 0 0 0 0 0 226 0 0 0 0 0 0 0 +/* velocity (memory) table */ +f2 0 16 -2 127 127 127 127 127 127 127 127 127 127 127 127 127 127 127 127 +/* pan (memory) table */ +f3 0 16 -2 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 +f5 0 128 5 0.1 128 1 /* velocity mapping: less nuanced */ +f6 0 128 5 0.01 128 1 /* velocity mapping: more nuanced */ +i 1 0 360000 +e + + diff -Nru csound-6.01~dfsg/nacl/csound/index.html csound-6.02~dfsg/nacl/csound/index.html --- csound-6.01~dfsg/nacl/csound/index.html 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/nacl/csound/index.html 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,221 @@ + + + + + Csound for pNaCl + + + + + + +
+
+ Csound for Portable Native Client +
+
+
+
+
+
Examples
+
+
+ Minimal +
+
+
+
+ Trapped +
+
+
+
+ Stria +
+
+
+
+ File Render +
+
+
+
+ Sliders +
+
+
+
+ Canvas +
+
+
+
+ Effects +
+
+
+
+ MIDIPlayer +
+
+
+
+ CSDPlayer +
+
+
+
+ Interactive +
+
+
Reference
+
+
+ pNaCl-Csound +
+
+
+
+
+ +
+
+
+
+
+ + diff -Nru csound-6.01~dfsg/nacl/csound/interactive.html csound-6.02~dfsg/nacl/csound/interactive.html --- csound-6.01~dfsg/nacl/csound/interactive.html 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/nacl/csound/interactive.html 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,138 @@ + + + + + + + Interactive Csound + + + + + + + + +

+ +

+

+ + +
+ +

+

+

+ + +

+ +

+ +
+ + diff -Nru csound-6.01~dfsg/nacl/csound/manifest.json csound-6.02~dfsg/nacl/csound/manifest.json --- csound-6.01~dfsg/nacl/csound/manifest.json 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/nacl/csound/manifest.json 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,14 @@ +{ + "name": "csound", + "version": "31.0.1650.48", + "manifest_version": 2, + "description": "Csound", + "offline_enabled": true, + + "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCMN716Qyu0l2EHNFqIJVqVysFcTR6urqhaGGqW4UK7slBaURz9+Sb1b4Ot5P1uQNE5c+CTU5Vu61wpqmSqMMxqHLWdPPMh8uRlyctsb2cxWwG6XoGSvpX29NsQVUFXd4v2tkJm3G9t+V0X8TYskrvWQmnyOW8OEIDvrBhUEfFxWQIDAQAB", + "oauth2": { + "client_id": "903965034255.apps.googleusercontent.com", + "scopes": ["https://www.googleapis.com/auth/drive"] + }, + "permissions": [] +} diff -Nru csound-6.01~dfsg/nacl/csound/midiplayer.html csound-6.02~dfsg/nacl/csound/midiplayer.html --- csound-6.01~dfsg/nacl/csound/midiplayer.html 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/nacl/csound/midiplayer.html 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,89 @@ + + + + + midi player + + + + + + +

+ + +

+ +
+ + + diff -Nru csound-6.01~dfsg/nacl/csound/minimal.html csound-6.02~dfsg/nacl/csound/minimal.html --- csound-6.01~dfsg/nacl/csound/minimal.html 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/nacl/csound/minimal.html 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,56 @@ + + + + + Minimal Csound Example + + + + +
+

+
+ +
+ +
+ + + diff -Nru csound-6.01~dfsg/nacl/csound/package.sh csound-6.02~dfsg/nacl/csound/package.sh --- csound-6.01~dfsg/nacl/csound/package.sh 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/nacl/csound/package.sh 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,14 @@ +#!/bin/sh +# script to package csound for a website +make +mkdir csound +cp csound.js ./csound +cp index.html ./csound +cp manifest.json ./csound +mkdir ./csound/pnacl +mkdir ./csound/pnacl/Release +cp -R ./pnacl/Release/csound_unstripped.pexe ./csound/pnacl/Release/. +cp -R ./pnacl/Release/csound.nmf ./csound/pnacl/Release/. +tar cf csound.tar csound +gzip csound.tar + diff -Nru csound-6.01~dfsg/nacl/csound/render.html csound-6.02~dfsg/nacl/csound/render.html --- csound-6.01~dfsg/nacl/csound/render.html 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/nacl/csound/render.html 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,60 @@ + + + + + Simple File Render Example + + + + +
+
+ +
+ + Binary files /tmp/YoCR1bco_Y/csound-6.01~dfsg/nacl/csound/sf_GMbank.sf2 and /tmp/drTeJpx12F/csound-6.02~dfsg/nacl/csound/sf_GMbank.sf2 differ diff -Nru csound-6.01~dfsg/nacl/csound/sliders.html csound-6.02~dfsg/nacl/csound/sliders.html --- csound-6.01~dfsg/nacl/csound/sliders.html 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/nacl/csound/sliders.html 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,89 @@ + + + + + Sliders Example + + + + + + + +

+ fundamental

+

+ amplitude

+

+ filter frequency

+ + +
+ + + diff -Nru csound-6.01~dfsg/nacl/csound/start.html csound-6.02~dfsg/nacl/csound/start.html --- csound-6.01~dfsg/nacl/csound/start.html 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/nacl/csound/start.html 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,20 @@ + + + + + + +

+Csound is a powerful music programming language that can be used in a +variety of applications, from music composition, installations, +live-electronics, to multimedia, games programming, and audio research. +

+

+It now runs as a Native Client on supported browsers (e.g. Chrome +31 and later). The example links on the left column are designed to introduce some +of the basic possibilities of Csound in this platform. +

+ + + + diff -Nru csound-6.01~dfsg/nacl/csound/stria.csd csound-6.02~dfsg/nacl/csound/stria.csd --- csound-6.01~dfsg/nacl/csound/stria.csd 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/nacl/csound/stria.csd 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,706 @@ + + +-d + + + + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; Stria +;;; by John Chowning +;;; Reconstruction - ORChestra csound code +;;; Kevin Dahan 2007-20010 +;;; kevin.dahan@wanadoo.fr +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; The basis for this code was the original MUS10 orchestra file +;;; with modifications by John Chowning and Kevin Dahan +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; - Initial release : 2007 +;;; - 11/2009: sco modifications for correcting END +;;; - 08/2010: orc modifications (butlp filters) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + + + sr = 48000 + kr = 4800 + ksmps = 10 + nchnls = 2 + + gaudio init 0 + ga1 init 0 + ga2 init 0 + ga3 init 0 + ga4 init 0 + + + +instr 1 ; vlna + + iamp = p4 ; amp + isk = p14 + idis = p15 ; distance + ifc = p5 ; Freq Carrier + ifma = p6 ; Freq ModA + indxa1 = p7 ; indx ampA1 + indxa2 = p8 ; indx ampA2 + + idifa = p8-p7 + + ifmb = p9 ; Freq ModB + indxb1 = p10 ; index ampB1 + indxb2 = p11 ; index ampB2 + + ; get correct index values for end.mem + ;if ( p32 == 1 ) then + ;indxb2 = indxa2 + ;endif + + idifb = p11-p10 + + imag = 1 ; fun to test + + ifactor = (p3-(p12+p13))/2 + + ; generate global envelop pointer + kndx linseg 0, p12, 0.25, ifactor, 0.5, ifactor, 0.75, p13, 1 + + ; generate first envelop (env) + ifn1 = p28 + ixmode = 1 + ktable table kndx, ifn1, ixmode + kenv = ktable*iamp + + ; generate second envelop (skew) + ifn2 = p29 + ktable2 table kndx, ifn2, ixmode + ksk = ktable2*isk + kskew = 1+ksk + + ; generate third envelop (fda) + ifn3 = p30 + ktable3 table kndx, ifn3, ixmode + kfda = ktable3*(ifma*idifa*imag) + + ; generate fourth envelop(fdb) + ifn4 = p31 + ktable4 table kndx, ifn4, ixmode + kfdb = ktable4*(ifmb*idifb*imag) + + + amoda oscil (ifma*indxa1*imag)+kfda, (ifma*imag)*kskew, 1 + amodb oscil (ifma*indxb1*imag)+kfdb, (ifmb*imag)*kskew, 1 + asig oscil kenv, ((ifc*imag)*kskew)+amoda+amodb, 1 + + gaudio = gaudio+(asig*p16) ; sends reverb signal + asig = asig*idis ; adjust distance + + + aout1 = asig*p22 ; FL + aout2 = asig*p23 ; FR + aout3 = asig*p24 ; RR + aout4 = asig*p25 ; RL + + ga1 = ga1+aout1 + ga2 = ga2+aout2 + ga3 = ga3+aout3 + ga4 = ga4+aout4 + +endin + + +; p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 +; i beg dur amp Fc FmA ia1 ia2 FmB ib1 ib2 +; insa 1.000 6.924 151.644 2618 4235.924 0.056 0.223 4235.924 .000 1.023 + +; p12 p13 p14 p15 p16 p17 p18 p19 p20 p21 +; att dec %skew dis %rev +; 1.385 2.306 0.006 0.333 0.150 .000 .000 .000 .000 .000 + +; p22 p23 p24 p25 p26 p27 p28 p29 p30 p31 +; ch1 ch2 ch3 ch4 - - ampF skewF IAF IBF +; 0.82 0.997 .000 .000 .000 .000 F2 F6 F2 F4 + + +instr 99 ; reverb unit + + a1 init 0 + a2 init 0 + a3 init 0 + a4 init 0 + a5 init 0 + a6 init 0 + a7 init 0 + idummy = p7 + + ; factor to compensate changing rate (1 to disable) + ifactor = 2 + imag = 1 + + + a1 alpass gaudio, 20*(647/25600)*ifactor, 647/25600*ifactor + a2 alpass a1, 20*(213/25600)*ifactor, 213/25600*ifactor + a3 alpass a2, 20*(67/25600)*ifactor, 67/25600*ifactor + + a4 comb a3, 32*(3201/25600)*ifactor, 3201/25600*ifactor + a5 comb a3, 27*(3667/25600)*ifactor, 3667/25600*ifactor + a6 comb a3, 25*(4053/25600)*ifactor, 4053/25600*ifactor + a7 comb a3, 25*(4451/25600)*ifactor, 4451/25600*ifactor + + afirstline = a4-a5+a6-a7 + asecondline = a4+a5+a6+a7 + athirdline = a4-a5-a6-a7 + afourthline = a4+a5-a6-a7 + + arev1 poscil p5-p4, imag/p3, 9 + arevsc line p4, p3, p5 + + aos1 oscili 1000*p6, 0.0089*arevsc, 1, 0.75 ; 0.013 + amod1 = 1000+aos1 + az1 vdelay afirstline, (amod1/25.600)*ifactor, 10000 + + aos2 oscili 1000*p6, 0.0083*arevsc, 1, 0.75 ; 0.011 + amod2 = 1000+aos2 + az2 vdelay asecondline, (amod2/25.600)*ifactor, 10000 + + aos3 oscili 1000*p6, 0.0097*arevsc, 1 ; 0.017 + amod3 = 1000+aos3 + az3 vdelay athirdline, (amod3/25.600)*ifactor, 10000 + + aos4 oscili 1000*p6, 0.0101*arevsc, 1 ; 0.019 + amod4 = 1000+aos4 + az4 vdelay afourthline, (amod4/25.600)*ifactor, 10000 + + ; get correct scaling for multiple reverb instances + kenv linseg 1, p3-2, 1, 2, 0 + az1 = az1*kenv + az2 = az2*kenv + az3 = az3*kenv + az4 = az4*kenv + + ga1 = ga1+az1 + ga2 = ga2+az2 + ga3 = ga3+az3 + ga4 = ga4+az4 + + gaudio = 0 + +endin + + +instr 999 ; global amplitude shaping envelope + ; filter banks + + +;; filter banks + alpa1 butterlp ga1, 11500 + alpa2 butterlp alpa1, 11500 + alpa3 butterlp alpa2, 11500 + aout1 butterlp alpa3, 11500 +;;; + alpb1 butterlp ga2, 11500 + alpb2 butterlp alpb1, 11500 + alpb3 butterlp alpb2, 11500 + aout2 butterlp alpb3, 11500 +;;; + alpc1 butterlp ga3, 11500 + alpc2 butterlp alpc1, 11500 + alpc3 butterlp alpc2, 11500 + aout3 butterlp alpc3, 11500 +;;; + alpd1 butterlp ga4, 11500 + alpd2 butterlp alpd1, 11500 + alpd3 butterlp alpd2, 11500 + aout4 butterlp alpd3, 11500 +; + ga1=aout1 + ga2=aout2 + ga3=aout3 + ga4=aout4 +; end filters + + + kpointer linseg 0, 427, 0.1, 77, 0.35, 1, 0.45, 33, 0.45, 1, 0.35, 4, 0.45, 9, 0.5, 15, 0.5, 26, 0.8, 43, 0.8, 27, 0.9, 1, 0.8, 294, 0.95 + kv tablei kpointer, 2, 1 + kenv = 1+(kv*18) + + ga1 = ga1*kenv + ga2 = ga2*kenv + ga3 = ga3*kenv + ga4 = ga4*kenv + + + outs ga2+ga3, ga1+ga4 + + ; uncomment below to generate + ; the quadraphonic version files + ; fout "stria-FL.wav", 8, ga1 + ; fout "stria-FR.wav", 8, ga2 + ; fout "stria-RR.wav", 8, ga3 + ; fout "stria-RL.wav", 8, ga4 + + ga1 = 0 + ga2 = 0 + ga3 = 0 + ga4 = 0 + + +endin + + + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; Stria +;;; Reconstruction - SCOre csound code +;;; Kevin Dahan 2007-2010 +;;; kevin.dahan@wanadoo.fr +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; The sections files were generated by the Stria Editor +;;; Scripts were used to get this unified score file +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; - Initial release : 2007 +;;; - 11/2009: sco modifications for correcting END +;;; - 08/2010: orc modifications (butlp filters) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + + +f1 0 16385 10 1 +f2 0 16385 7 0 4096 0.33 4096 1 4096 0.33 4096 0 +f3 0 16385 7 1 2094 0.543 3152 0.367 7383 0.2037 1284 0.0845 2471 0 +f4 0 16385 27 0 1 1500 0.4 2500 0.2 3220 0.15 4220 0.08 5464 0 16384 0 +f5 0 16385 7 0.6904 2525 1 3465 0.71 4004 0.255 1351 0.15 5039 0 +f6 0 16385 7 -0.5 3276 0.04 3276 0.08 3276 0.01 6552 0.03 +f7 0 16385 27 0 0 3000 0.35 3010 0.85 3100 1 6034 0.857 7415 0.44 8967 0.214 11296 0.107 16384 0 +f8 0 16385 27 0 0 2071 0.135 3279 0.270 3712 0.416 3889 0.827 4580 0.949 5270 0.998 6478 1 7253 0.916 8113 0.7 10093 0.365 11557 0.234 16384 0 +f9 0 16385 7 0 16384 1 + +i999 0 958 + + + ; HERE BEGINS T0 + +i99 0 166.5 1 1 -1 1 + +i1 0 6.92408976486792 151.643578037035 2618.0 4235.924 0.0557108233095435 0.222843293238174 4235.924 0.0 1.02284329323817 1.38481795297358 2.30572189170102 0.00603328971269218 0.333333333333333 0.15 0.0 0.0 0.0 0.0 0.0 0.0824589821479948 0.996594459277753 0.0 0.0 0.0 0.0 2 6 2 4 +i1 6.11 11.4854240255147 262.383167925406 1306.50712934472 2113.92853527976 0.0888164664157662 0.355265865663065 2113.92853527976 0.0 1.15526586566306 2.29708480510293 3.82464620049638 0.012712535264081 0.333333333333333 0.15 0.0 0.0 0.0 0.0 0.0 0.0 0.795675476248549 0.605723151692788 0.0 0.0 0.0 2 6 2 4 +i1 7.52 16.0664467710903 253.198382335726 1378.26148199818 2230.02707787305 0.0861397115548856 0.344558846219542 2230.02707787305 0.0 1.14455884621954 3.21328935421807 5.35012677477308 0.0121378438838932 0.333333333333333 0.15 0.0 0.0 0.0 0.0 0.0 0.0 0.497406700782887 0.867517477643121 0.0 0.0 0.0 2 6 2 4 +i1 9.87 19.7842379027059 226.158364195146 1618.04697156984 2618.0 0.0781937666376515 0.312775066550606 2618.0 0.0 1.11277506655061 3.95684758054119 6.58815122160108 0.0104656246379764 0.333333333333333 0.15 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.918118019899393 0.396307079845942 0.0 0.0 2 6 2 4 +i1 19.74 18.8953661445148 280.959379480871 1174.01085761855 1899.54956762682 0.0941976167618449 0.37679046704738 1899.54956762682 0.0 1.17679046704738 3.77907322890297 6.29215692612344 0.0138846218935772 0.333333333333333 0.15 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.646311997023912 0.76307326155682 0.0 0.0 2 6 2 4 +i1 23.5 19.8905448259147 271.639586810663 1238.48841553191 2003.87425633064 0.091503213516639 0.366012854066556 2003.87425633064 0.0 1.16601285406656 3.97810896518294 6.62355142702959 0.0132949739666077 0.333333333333333 0.15 0.0 0.0 0.0 0.0 0.0 0.17021556146672 0.0 0.0 0.985406851323132 0.0 0.0 2 6 2 4 +i1 29.61 18.418359133736 208.645942239337 1800.65617813689 2913.46169622549 0.0729919712870603 0.291967885148241 2913.46169622549 0.0 1.09196788514824 3.6836718267472 6.13331359153409 0.00939929994978247 0.333333333333333 0.15 0.0 0.0 0.0 0.0 0.0 0.705284439812917 0.0 0.0 0.708924438115784 0.0 0.0 2 6 2 4 +i1 31.02 19.6168904622996 299.756989669625 1054.9513759619 1706.91132630635 0.0996004555869564 0.398401822347826 1706.91132630635 0.0 1.19840182234783 3.92337809245992 6.53242452394576 0.0150834117743569 0.333333333333333 0.15 0.0 0.0 0.0 0.0 0.0 0.993858377931494 0.0 0.0 0.110659498532117 0.0 0.0 2 6 2 4 +i1 33.37 19.6731896206745 244.09363506259 1453.95663758265 2352.50183960872 0.0834753561322195 0.333901424528878 2352.50183960872 0.0 1.13390142452888 3.9346379241349 6.5511721436846 0.0115714384197226 0.333333333333333 0.15 0.0 0.0 0.0 0.0 0.0 0.707106781186548 0.707106781186548 0.0 0.0 0.0 0.0 2 6 2 4 +i1 43.24 11.76 159.31543151211 2481.70300723024 4015.39546569853 0.0580713638780977 0.232285455512391 4015.39546569853 0.0 1.03228545551239 2.352 3.91608 0.00647590556338725 0.333333333333333 0.15 0.0 0.0 0.0 0.0 0.0 0.0 0.982764316668615 0.18486291646209 0.0 0.0 0.0 2 6 2 4 +i1 47.0 18.1049301931734 226.163179071595 1618.0 4235.924 0.0781951906102547 0.312780762441019 2617.924 0.0 1.11278076244102 3.62098603863469 6.02894175432676 0.0104659196776628 0.574349177498518 0.15 0.0 0.0 0.0 0.0 0.0 0.714233564695764 0.699907433209551 0.0 0.0 0.0 0.0 2 6 2 4 +i1 56.6637168141593 26.4813927740452 271.644630717956 1238.45246246867 3242.26854674297 0.0915046746259445 0.366018698503778 2003.8160842743 0.0 1.16601869850378 5.29627855480905 8.81830379375706 0.0132952922199101 0.329876977693224 0.15 0.0 0.0 0.0 0.0 0.0 0.417386554817328 0.908729037644182 0.0 0.0 0.0 0.0 2 6 2 4 +i1 58.8938053097345 34.2745034157637 280.964455586016 1173.97677632551 3073.47120042019 0.0941990814077735 0.376796325631094 1899.49442409468 0.0 1.17679632563109 6.85490068315275 11.4134096374493 0.0138849439155704 0.238494846850876 0.15 0.0 0.0 0.0 0.0 0.0 0.0 0.911463029196111 0.411381995727389 0.0 0.0 0.0 2 6 2 4 +i1 62.6106194690266 40.0898893261355 151.647696461915 2617.924 6853.725032 0.0557120937154946 0.222848374861978 4235.801032 0.0 1.02284837486198 8.0179778652271 13.3499331456031 0.00603352635463881 0.1894645708138 0.15 0.0 0.0 0.0 0.0 0.0 0.0 0.687734378306626 0.725962412866671 0.0 0.0 0.0 2 6 2 4 +i1 62.6106194690266 3.87206669176598 200.074273033913 1899.49442409468 4972.87640227986 0.0704288374299709 0.281715349719884 3073.38197818519 0.0 1.08171534971988 0.774413338353196 1.28939820835807 0.00888248972609565 0.574349177498518 0.18 0.0 0.0 0.0 0.0 0.0 0.652653788699936 0.757656275692097 0.0 0.0 0.0 0.0 2 6 2 4 +i1 63.6427527875971 5.93003789723267 191.629050784239 2003.8160842743 5245.99050863012 0.0678920100000773 0.271568040000309 3242.17442435582 0.0 1.07156804000031 1.18600757944653 1.97470261977848 0.00837675461761272 0.329876977693224 0.18 0.0 0.0 0.0 0.0 0.0 0.0636619779629336 0.997971518913164 0.0 0.0 0.0 0.0 2 6 2 4 +i1 64.2779117528713 7.58191097243329 208.650633017524 1800.60390545945 4713.98102449284 0.0729933707999995 0.291973483199998 2913.37711903339 0.0 1.0919734832 1.51638219448666 2.52477635382029 0.00939958371262867 0.238494846850876 0.18 0.0 0.0 0.0 0.0 0.0 0.0 0.750941460610668 0.660368777832445 0.0 0.0 0.0 2 6 2 4 +i1 65.9452040367161 8.3282182140776 217.349765352234 1706.86177502263 4468.56412700923 0.0755830195555152 0.302332078222061 2761.70235198661 0.0 1.10233207822206 1.66564364281552 2.77329666528784 0.00992755893618056 0.1894645708138 0.18 0.0 0.0 0.0 0.0 0.0 0.0 0.31433988174598 0.94931050702282 0.0 0.0 0.0 2 6 2 4 +i1 66.1833886486939 9.57834931228062 167.160926494354 2352.43354696555 6158.67102595582 0.0604733220576009 0.241893288230404 3806.23747899027 0.0 1.0418932882304 1.91566986245612 3.18959032098945 0.00693214235687275 0.158489319246111 0.18 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.779039120653999 0.626975317289799 0.0 0.0 2 6 2 4 +i1 66.5803630019903 10.5833398711496 159.319643707318 2481.63096390383 6496.90986350023 0.0580726566823344 0.232290626729337 4015.2788995964 0.0 1.03229062672934 2.11666797422992 3.52425217709282 0.00647614955139746 0.136979319126435 0.18 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.295906800943429 0.955216815783425 0.0 0.0 2 6 2 4 +i1 67.6124963205609 10.9235967789178 159.319643707318 2481.63096390383 6496.90986350023 0.0580726566823344 0.232290626729337 4015.2788995964 0.0 1.03229062672934 2.18471935578357 3.63755772737964 0.00647614955139746 0.121087014505174 0.18 0.0 0.0 0.0 0.0 0.0 0.677819728709998 0.0 0.0 0.735228138315928 0.0 0.0 2 6 2 4 +i1 68.2476552858351 11.4089969738856 167.160926494354 2352.43354696555 6158.67102595582 0.0604733220576009 0.241893288230404 3806.23747899027 0.0 1.0418932882304 2.28179939477711 3.79919599230389 0.00693214235687275 0.108818820412016 0.18 0.0 0.0 0.0 0.0 0.0 0.982764316668617 0.18486291646208 0.0 0.0 0.0 0.0 2 6 2 4 +i1 69.9149475696798 10.7222205719131 217.349765352234 1706.86177502263 4468.56412700923 0.0755830195555152 0.302332078222061 2761.70235198661 0.0 1.10233207822206 2.14444411438262 3.57049945044707 0.00992755893618056 0.0990334698870002 0.18 0.0 0.0 0.0 0.0 0.0 0.602774947395158 0.797911249947489 0.0 0.0 0.0 0.0 2 6 2 4 +i1 78.2212389380531 37.8782418572725 244.098555409736 1453.91442952136 3806.34797648691 0.0834767989876134 0.333907195950454 2352.43354696555 0.0 1.13390719595045 7.5756483714545 12.6134545384717 0.0115717436151763 0.158489319246111 0.15 0.0 0.0 0.0 0.0 0.0 0.0 0.704500884560253 0.709703109513986 0.0 0.0 0.0 2 6 2 4 +i1 84.1681415929204 39.143845455577 183.323155853709 2113.86716837041 5534.10424679373 0.0653854619159253 0.261541847663701 3420.23707842332 0.0 1.0615418476637 7.8287690911154 13.0349005367071 0.00788283480327883 0.136979319126435 0.15 0.0 0.0 0.0 0.0 0.0 0.0 0.324003541730447 0.946055867772156 0.0 0.0 0.0 2 6 2 4 +i1 93.8318584070797 36.5613111530691 175.164551797319 2229.96234064695 5838.04140781372 0.0629117345208969 0.251646938083588 3608.07906716677 0.0 1.05164693808359 7.31226223061383 12.174916613972 0.00740116241332872 0.121087014505174 0.15 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.834338455511919 0.551252520768827 0.0 0.0 2 6 2 4 +i1 96.0619469026549 38.3591083378155 226.163179071595 1618.0 4235.924 0.0781951906102547 0.312780762441019 2617.924 0.0 1.11278076244102 7.67182166756311 12.7735830764926 0.0104659196776628 0.108818820412016 0.15 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.519228164962198 0.854635660799377 0.0 0.0 2 6 2 4 +i1 99.778761061947 38.426053488985 200.074273033913 1899.49442409468 4972.87640227986 0.0704288374299709 0.281715349719884 3073.38197818519 0.0 1.08171534971988 7.685210697797 12.795875811832 0.00888248972609565 0.0990334698870002 0.15 0.0 0.0 0.0 0.0 0.0 0.417917193846515 0.0 0.0 0.908485123206459 0.0 0.0 2 6 2 4 +i1 115.389380530973 26.7640838311215 191.629050784239 2003.8160842743 5245.99050863012 0.0678920100000773 0.271568040000309 3242.17442435582 0.0 1.07156804000031 5.35281676622429 8.91243991576345 0.00837675461761272 0.091028210151304 0.15 0.0 0.0 0.0 0.0 0.0 0.797911249947489 0.0 0.0 0.602774947395158 0.0 0.0 2 6 2 4 +i1 121.336283185841 22.6637168141593 309.224472101786 1000.0 2618.0 0.102306118025447 0.409224472101786 1618.0 0.0 1.20922447210179 4.53274336283185 7.54701769911504 0.015691835407634 0.0843454880117311 0.15 0.0 0.0 0.0 0.0 0.0 0.93998278464313 0.34122187001209 0.0 0.0 0.0 0.0 2 6 2 4 +i1 131.0 7.16804107060211 226.163179071595 1618.0 4235.924 0.195487976525637 0.781951906102547 618.076 0.0 2.78195190610255 2.3869576765105 2.3869576765105 0.0104659196776628 0.574349177498518 0.15 0.0 0.0 0.0 0.0 0.0 0.892134229710651 0.0 0.0 0.451770424196387 0.0 0.0 2 6 3 4 +i1 136.712121212121 10.3835521140669 262.388175196419 1306.46920171224 3420.33637008265 0.222044806852523 0.888179227410093 499.071235054077 0.0 2.88817922741009 3.45772285398429 3.45772285398429 0.0127128494571601 0.329876977693224 0.15 0.0 0.0 0.0 0.0 0.0 0.794343163506279 0.60746929024506 0.0 0.0 0.0 0.0 2 6 3 4 +i1 138.030303030303 13.6928748410727 253.203348442892 1378.22147135164 3608.18381199859 0.215352904518709 0.861411618074834 526.480602056326 0.0 2.86141161807483 4.55972732207721 4.55972732207721 0.0121381537241887 0.238494846850876 0.15 0.0 0.0 0.0 0.0 0.0 0.128652611961004 0.991689722360584 0.0 0.0 0.0 0.0 2 6 3 4 +i1 140.227272727273 15.83227710448 309.224472101786 1000.0 2618.0 0.255765295063617 1.02306118025447 382.0 0.0 3.02306118025447 5.27214827579183 5.27214827579183 0.015691835407634 0.1894645708138 0.15 0.0 0.0 0.0 0.0 0.0 0.0 0.595478209559355 0.803371459500513 0.0 0.0 0.0 2 6 3 4 +i1 140.227272727273 2.28074034064612 253.203348442892 1378.22147135164 3608.18381199859 0.215352904518709 0.861411618074834 526.480602056326 0.0 2.86141161807483 0.759486533435159 0.759486533435159 0.0121381537241887 0.574349177498518 0.18 0.0 0.0 0.0 0.0 0.0 0.892134229710651 0.0 0.0 0.451770424196387 0.0 0.0 2 6 3 4 +i1 141.377584824075 3.54875775015584 262.388175196419 1306.46920171224 3420.33637008265 0.222044806852523 0.888179227410093 499.071235054077 0.0 2.88817922741009 1.18173633080189 1.18173633080189 0.0127128494571601 0.329876977693224 0.18 0.0 0.0 0.0 0.0 0.0 0.794343163506279 0.60746929024506 0.0 0.0 0.0 0.0 2 6 3 4 +i1 142.085469191338 4.54910406185185 244.098555409736 1453.91442952136 3806.34797648691 0.208691997469034 0.834767989876135 555.395312077158 0.0 2.83476798987613 1.51485165259667 1.51485165259667 0.0115717436151764 0.238494846850876 0.18 0.0 0.0 0.0 0.0 0.0 0.128652611961004 0.991689722360584 0.0 0.0 0.0 0.0 2 6 3 4 +i1 143.943665655403 4.53876104988217 235.082307238671 1533.7645017947 4015.39546569853 0.202068256271698 0.80827302508679 585.898039685576 0.0 2.80827302508679 1.51140742961076 1.51140742961076 0.011014155333197 0.1894645708138 0.18 0.0 0.0 0.0 0.0 0.0 0.0 0.595478209559355 0.803371459500513 0.0 0.0 0.0 2 6 3 4 +i1 144.209122293127 5.22300850642397 290.339572128172 1112.85779076604 2913.46169622548 0.242247217794351 0.968988871177404 425.111676072626 0.0 2.9689888711774 1.73926183263918 1.73926183263918 0.0144812696839037 0.158489319246111 0.18 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.802318780412055 0.596895782024058 0.0 0.0 2 6 3 4 +i1 144.651550022666 5.65208539970136 299.762117303771 1054.92075094105 2761.78252596368 0.249004809376694 0.996019237506777 402.979726859483 0.0 2.99601923750678 1.88214443810055 1.88214443810055 0.0150837404703623 0.136979319126435 0.18 0.0 0.0 0.0 0.0 0.0 0.341221870012101 0.0 0.0 0.939982784643126 0.0 0.0 2 6 3 4 +i1 145.801862119469 5.24359242598595 299.762117303771 1054.92075094105 2761.78252596368 0.249004809376694 0.996019237506777 402.979726859483 0.0 2.99601923750678 1.74611627785332 1.74611627785332 0.0150837404703623 0.121087014505174 0.18 0.0 0.0 0.0 0.0 0.0 0.962246181277055 0.0 0.0 0.272180613963824 0.0 0.0 2 6 3 4 +i1 149.454545454545 11.8768424837005 244.098555409736 1453.91442952136 3806.34797648691 0.208691997469034 0.834767989876134 555.395312077158 0.0 2.83476798987613 3.95498854707225 3.95498854707225 0.0115717436151763 0.158489319246111 0.15 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.913361963623495 0.407148527451387 0.0 0.0 2 6 3 4 +i1 152.969696969697 10.6345504330282 299.762117303771 1054.92075094105 2761.78252596368 0.249004809376694 0.996019237506777 402.979726859483 0.0 2.99601923750678 3.5413052941984 3.5413052941984 0.0150837404703623 0.136979319126435 0.15 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.272180613963824 0.962246181277055 0.0 0.0 2 6 3 4 +i1 158.681818181818 6.31818181818184 290.339572128172 1112.85779076604 2913.46169622548 0.242247217794351 0.968988871177404 425.111676072626 0.0 2.9689888711774 2.10395454545455 2.10395454545455 0.0144812696839037 0.121087014505174 0.15 0.0 0.0 0.0 0.0 0.0 0.857556448398586 0.0 0.0 0.514389869466734 0.0 0.0 2 6 3 4 + + ; HERE BEGINS T286 + +i99 165.0 272.5 1 1.5 -1 2 + + +i1 165.0 5.81377674149945 309.224472101786 1000.0 1618.0 0.102306118025447 0.409224472101786 618.0 0.0 2.30922447210179 0.3 2.75188837074973 0.015691835407634 0.722981180798466 0.05 0.0 0.0 0.0 0.0 0.0 0.679538707270587 0.0 0.0 0.733639656317064 0.0 0.0 7 6 2 4 +i1 165.26 8.05748347810903 347.32949375779 807.459333567517 1306.46920171224 0.113096606682433 0.452386426729732 499.009868144726 0.0 2.44846815319664 0.3 3.87374173905451 0.0181704420589385 0.415243646538506 0.05 0.0 0.0 0.0 0.0 0.0 0.795602827508137 0.605818570911339 0.0 0.0 0.0 0.0 7 6 2 4 +i1 165.32 9.82188576598201 337.778381656262 851.805606521408 1378.22147135164 0.110406445573558 0.44162578229423 526.41586483023 0.0 2.41472639441562 0.3 4.755942882991 0.0175448235763721 0.30021334189347 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.788501827979772 0.615032411562642 0.0 0.0 0.0 7 6 2 4 +i1 165.42 11.2518940627789 395.067899088516 618.046971569839 1000.0 0.126406195817568 0.505624783270272 381.95302843016 0.0 2.60620558272364 0.3 5.47094703138947 0.021338326118007 0.238494846850876 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.707106781186548 0.707106781186548 0.0 0.0 7 6 2 4 +i1 165.84 12.16 366.444441303383 725.572791301305 1173.97677632551 0.11845262050476 0.47381048201904 448.403985024206 0.0 2.51376525561652 0.3 5.925 0.0194308800440795 0.199503715965179 0.05 0.0 0.0 0.0 0.0 0.0 0.85599767270379 0.0 0.0 0.516979674963818 0.0 0.0 7 6 2 4 +i1 166.0 9.71467391304348 442.34841315922 473.066621669944 765.42179386197 0.348450253014605 1.39380101205842 180.711449477919 0.0 3.39380101205842 1.21351275706117 4.6853107976642 0.0245382316121305 0.25 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.979862881115132 0.19967156585942 0.0 0.0 0.0 2 6 3 4 +i1 173.77173913043478 11.4955799702211 375.997154128076 687.798387370852 1112.85779076604 0.302789345936031 1.21115738374412 262.738983975665 0.0 3.21115738374412 1.81811778029987 5.209442776107 0.0200648516068878 0.25 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.733639656317064 0.679538707270587 0.0 0.0 0.0 2 6 3 4 +i1 175.5652173913043 19.0437766884714 470.315227971341 402.960800596601 651.9905753653 0.367412453803356 1.46964981521342 153.931025827901 0.0 3.46964981521342 2.1405760557365 9.39767596054912 0.0264577897392984 0.25 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.313189040592021 0.949690804869169 0.0 0.0 0.0 2 6 3 4 +i1 178.554347826087 26.6388527066539 414.062967550319 555.369227495281 898.587410087365 0.329105539622232 1.31642215848893 212.151044903197 0.0 3.31642215848893 3.68800643240628 12.5292385472674 0.02261678037788 0.25 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.795602827508137 0.605818570911339 0.0 0.0 2 6 3 4 +i1 178.554347826087 1.16763259969718 404.57692639963 585.870522518875 947.93850543554 0.322578656780332 1.29031462712133 223.80253960221 0.0 3.29031462712133 0.388821655699162 0.467053039878874 0.0219771001463047 0.25 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.979862881115132 0.19967156585942 0.0 0.0 0.0 2 6 3 4 +i1 179.5738788214588 2.73076271324995 404.57692639963 585.870522518875 947.93850543554 0.322578656780332 1.29031462712133 223.80253960221 0.0 3.29031462712133 0.909343983512233 1.09230508529998 0.0219771001463047 0.25 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.733639656317064 0.679538707270587 0.0 0.0 0.0 2 6 3 4 +i1 180.2012825109184 4.47555334507082 395.067899088516 618.046971569839 1000.0 0.31601548954392 1.26406195817568 236.093943139679 0.0 3.26406195817568 1.49035926390858 1.79022133802833 0.021338326118007 0.25 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.313189040592021 0.949690804869169 0.0 0.0 0.0 2 6 3 4 +i1 181.8482171957499 5.93139269432422 337.778381656262 851.805606521409 1378.22147135164 0.276016113933894 1.10406445573558 325.389741691178 0.0 3.10406445573558 1.97515376720997 2.37255707772969 0.0175448235763721 0.25 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.795602827508137 0.605818570911339 0.0 0.0 2 6 3 4 +i1 182.0834935792973 7.81798468953082 347.32949375779 807.459333567518 1306.46920171224 0.282741516706083 1.13096606682433 308.449465422792 0.0 3.13096606682433 2.60338890161376 3.12719387581233 0.0181704420589385 0.25 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.375601183960091 0.926781393106151 0.0 0.0 2 6 3 4 +i1 182.4756208852096 9.6775365286959 366.444441303383 725.572791301305 1173.97677632551 0.2961315512619 1.1845262050476 277.168806277098 0.0 3.1845262050476 3.22261966405573 3.87101461147836 0.0194308800440794 0.25 0.06 0.0 0.0 0.0 0.0 0.0 0.615032411562642 0.0 0.0 0.788501827979772 0.0 0.0 2 6 3 4 +i1 183.4951518805814 11.0894687782312 356.886759307554 765.421793861969 1238.45246246867 0.289447848890405 1.15779139556162 292.391125255272 0.0 3.15779139556162 3.69279310315099 4.43578751129249 0.0187992720292845 0.25 0.06 0.0 0.0 0.0 0.0 0.0 0.961907109208383 0.0 0.0 0.27337650457633 0.0 0.0 2 6 3 4 +i1 184.1225555700411 12.6533547811611 328.239506008815 898.587410087365 1453.91442952136 0.269275481882427 1.07710192752971 343.260390653373 0.0 3.07710192752971 4.21356714212666 5.06134191246445 0.016922868075431 0.25 0.06 0.0 0.0 0.0 0.0 0.0 0.707106781186548 0.707106781186548 0.0 0.0 0.0 0.0 2 6 3 4 +i1 185.7694902548726 13.1000749625187 385.539866053671 651.990575365299 1054.92075094105 0.309418233690738 1.23767293476295 249.060399789544 0.0 3.23767293476295 4.36232496251874 5.24002998500749 0.0207007918651621 0.25 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.947371065153513 0.320137571849818 0.0 0.0 0.0 2 6 3 4 +i1 191.1086956521739 29.7568871356357 347.32949375779 807.459333567518 1306.46920171224 0.282741516706083 1.13096606682433 308.449465422792 0.0 3.13096606682433 5.18574499033073 13.0737767691953 0.0181704420589385 0.25 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.73388567534891 0.679273005144231 0.0 0.0 2 6 3 4 +i1 195.8913043478261 34.8925523807336 395.067899088516 618.046971569839 1000.0 0.31601548954392 1.26406195817568 236.093943139679 0.0 3.26406195817568 5.16602954410809 16.1179333570392 0.021338326118007 0.25 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.13873380200061 0.990329708825528 0.0 0.0 2 6 3 4 +i1 203.6630434782609 37.0290276477871 318.719287364986 947.93850543554 1533.7645017947 0.262523742570026 1.0500949702801 362.112509076376 0.0 3.0500949702801 7.09415690726342 15.7268488300778 0.0163050439963448 0.25 0.05 0.0 0.0 0.0 0.0 0.0 0.726466345851977 0.0 0.0 0.68720204332094 0.0 0.0 2 6 3 4 +i1 205.4565217391304 42.5097170557671 414.062967550319 555.369227495281 898.587410087365 0.329105539622232 1.31642215848893 212.151044903197 0.0 3.31642215848893 5.88524256910961 19.9938935596693 0.02261678037788 0.25 0.05 0.0 0.0 0.0 0.0 0.0 0.947371065153513 0.320137571849819 0.0 0.0 0.0 0.0 2 6 3 4 +i1 208.445652173913 46.554347826087 470.315227971341 402.960800596601 651.9905753653 0.367412453803356 1.46964981521342 153.931025827901 0.0 3.46964981521342 5.23284450753288 22.9735247677585 0.0264577897392984 0.25 0.05 0.0 0.0 0.0 0.0 0.0 0.543160998397533 0.839628566581554 0.0 0.0 0.0 0.0 2 6 3 4 +i1 233.0 9.71467391304348 461.045559003734 1112.8055180886 425.059403395186 0.722289818279313 1.44457963655863 687.746114693411 0.0 3.44457963655863 1.13135341228917 4.75862274650608 0.0258194447538013 0.222222222222222 0.04 0.0 0.0 0.0 0.0 0.0 0.868996625981625 0.494818011022792 0.0 0.0 0.0 0.0 2 6 3 4 +i1 240.7717391304348 11.4955799702211 525.09894804293 765.385840798723 292.355172192025 0.808240653788723 1.61648130757745 473.030668606697 0.0 3.61648130757745 1.0370787940788 5.90441350073792 0.0302704029791161 0.222222222222222 0.04 0.0 0.0 0.0 0.0 0.0 0.577278975454 0.816546988543084 0.0 0.0 0.0 0.0 2 6 3 4 +i1 242.5652173913043 19.0437766884714 534.063638813721 725.538710008265 277.134724984058 0.820151853887488 1.64030370777498 448.403985024207 0.0 3.64030370777498 1.65424031347557 9.83996638650759 0.0309004345888089 0.222222222222222 0.04 0.0 0.0 0.0 0.0 0.0 0.0 0.945045631346524 0.326938457011178 0.0 0.0 0.0 2 6 3 4 +i1 245.554347826087 26.6388527066539 479.569328975657 999.953028430161 381.953028430161 0.747305228471033 1.49461045694207 618.0 0.0 3.49461045694207 2.88880746095766 13.2406638258594 0.0270970856380866 0.222222222222222 0.04 0.0 0.0 0.0 0.0 0.0 0.0 0.654222996629699 0.756301706120552 0.0 0.0 0.0 2 6 3 4 +i1 245.554347826087 1.16763259969718 451.722644857788 1173.92163279337 448.403985024206 0.709647918702138 1.41929583740428 725.517647769166 0.0 3.41929583740428 0.388821655699162 0.467053039878874 0.0251795216065399 0.222222222222222 0.048 0.0 0.0 0.0 0.0 0.0 0.868996625981625 0.494818011022792 0.0 0.0 0.0 0.0 2 6 3 4 +i1 246.5738788214588 2.73076271324995 442.361745876421 1238.39429041233 473.030668606697 0.696918662261636 1.39383732452327 765.363621805636 0.0 3.39383732452327 0.909343983512233 1.09230508529998 0.024539142145765 0.222222222222222 0.048 0.0 0.0 0.0 0.0 0.0 0.577278975454 0.816546988543084 0.0 0.0 0.0 0.0 2 6 3 4 +i1 247.2012825109184 4.47555334507082 479.569328975657 999.953028430161 381.953028430161 0.747305228471033 1.49461045694207 618.0 0.0 3.49461045694207 1.49035926390858 1.79022133802833 0.0270970856380866 0.222222222222222 0.048 0.0 0.0 0.0 0.0 0.0 0.0 0.945045631346524 0.326938457011178 0.0 0.0 0.0 2 6 3 4 +i1 248.8482171957499 5.93139269432422 395.081430905728 1617.924 618.0 0.632049688024089 1.26409937604818 999.924 0.0 3.26409937604818 1.97515376720997 2.37255707772969 0.0213392333544138 0.222222222222222 0.048 0.0 0.0 0.0 0.0 0.0 0.0 0.654222996629699 0.756301706120552 0.0 0.0 0.0 2 6 3 4 +i1 249.0834935792973 7.81798468953082 432.965241176763 1306.40783480289 499.009868144726 0.684104119309227 1.36820823861845 807.397966658167 0.0 3.36820823861845 2.60338890161376 3.12719387581233 0.0238985390179608 0.222222222222222 0.048 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.967522671348027 0.252784256684585 0.0 0.0 2 6 3 4 +i1 249.4756208852096 9.6775365286959 423.535808051102 1378.15673412554 526.415864830231 0.671206780984075 1.34241356196815 851.740869295313 0.0 3.34241356196815 3.22261966405573 3.87101461147836 0.0232579643486208 0.222222222222222 0.048 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.645568743750533 0.763702165174591 0.0 0.0 2 6 3 4 +i1 250.4951518805814 11.0894687782312 479.569328975657 999.953028430161 381.953028430161 0.747305228471033 1.49461045694207 618.0 0.0 3.49461045694207 3.69279310315099 4.43578751129249 0.0270970856380866 0.222222222222222 0.048 0.0 0.0 0.0 0.0 0.0 0.360889756803138 0.0 0.0 0.932608483466976 0.0 0.0 2 6 3 4 +i1 251.1225555700411 12.6533547811611 451.722644857788 1173.92163279337 448.403985024206 0.709647918702138 1.41929583740428 725.517647769166 0.0 3.41929583740428 4.21356714212666 5.06134191246445 0.0251795216065399 0.222222222222222 0.048 0.0 0.0 0.0 0.0 0.0 0.839628566581558 0.0 0.0 0.543160998397527 0.0 0.0 2 6 3 4 +i1 252.7694902548726 13.1000749625187 442.361745876421 1238.39429041233 473.030668606697 0.696918662261636 1.39383732452327 765.363621805636 0.0 3.39383732452327 4.36232496251874 5.2400299850075 0.024539142145765 0.222222222222222 0.048 0.0 0.0 0.0 0.0 0.0 0.832187361878503 0.554494539855621 0.0 0.0 0.0 0.0 2 6 3 4 +i1 258.1086956521739 29.7568871356357 497.919480801851 898.545202026075 343.218182592084 0.771955847973845 1.54391169594769 555.327019433991 0.0 3.54391169594769 3.00096923101212 14.9950245999245 0.028370571241847 0.222222222222222 0.04 0.0 0.0 0.0 0.0 0.0 0.0 0.577591598504103 0.816325881825068 0.0 0.0 0.0 2 6 3 4 +i1 262.8913043478261 34.8925523807336 404.590428285151 1533.69245846829 585.825996359163 0.645175922333573 1.29035184466715 947.866462109127 0.0 3.29035184466715 4.99601007309841 16.2663419659384 0.0219780089027582 0.222222222222222 0.04 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.902369623822601 0.430962947365846 0.0 0.0 2 6 3 4 +i1 270.663043478261 37.0290276477871 461.045559003734 1112.8055180886 425.059403395186 0.722289818279313 1.44457963655863 687.746114693411 0.0 3.44457963655863 4.31233381151641 18.138248882361 0.0258194447538013 0.222222222222222 0.04 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.516982125923783 0.855996192442073 0.0 0.0 2 6 3 4 +i1 272.45652173913 42.5097170557671 551.848132400556 651.959950344454 249.029774768699 0.843702260883414 1.68740452176683 402.930175575755 0.0 3.68740452176683 3.4197083747458 22.2167130501744 0.0321550842070785 0.222222222222222 0.04 0.0 0.0 0.0 0.0 0.0 0.554494539855621 0.0 0.0 0.832187361878503 0.0 0.0 2 6 3 4 +i1 275.445652173913 46.554347826087 479.569328975657 999.953028430161 381.953028430161 0.747305228471033 1.49461045694207 618.0 0.0 3.49461045694207 5.0485112411176 23.1395276660462 0.0270970856380866 0.222222222222222 0.04 0.0 0.0 0.0 0.0 0.0 0.953914178340796 0.0 0.0 0.300079556718556 0.0 0.0 2 6 3 4 +i1 309.0 5.115342817721 604.028189151685 180.711449477919 292.391125255272 0.456116385813461 1.82446554325384 292.391125255272 0.0 3.82446554325384 0.323863033764286 2.7551817118486 0.0358702620751375 0.285714285714286 0.03 0.0 0.0 0.0 0.0 0.0 0.67068695667376 0.0 0.0 0.741740524811534 0.0 0.0 2 6 3 4 +i1 313.804347826087 11.9155309045005 612.563803130726 171.303341333188 277.168806277099 0.461684318619812 1.84673727447925 277.168806277099 0.0 3.84673727447925 0.723828039540941 6.44662389382305 0.0364824522352314 0.285714285714286 0.03 0.0 0.0 0.0 0.0 0.0 0.933662205681764 0.0 0.0 0.358154834787223 0.0 0.0 2 6 3 4 +i1 314.913043478261 19.9193526281712 479.548124351676 382.0 1000.076 0.373638334668349 1.4945533386734 618.076 0.0 3.4945533386734 2.16030082288839 9.90061995340637 0.0270956184925496 0.285714285714286 0.03 0.0 0.0 0.0 0.0 0.0 0.829539098239132 0.558448640872738 0.0 0.0 0.0 0.0 2 6 3 4 +i1 316.760869565217 28.3092258111092 586.818048222922 201.106144432125 325.389741691178 0.444859283991788 1.77943713596715 325.389741691178 0.0 3.77943713596715 1.9444464292013 15.1049586673153 0.0346395931544237 0.285714285714286 0.03 0.0 0.0 0.0 0.0 0.0 0.472262214769916 0.881458110462779 0.0 0.0 0.0 0.0 2 6 3 4 +i1 316.760869565217 1.16763259969718 551.827791666159 249.060399789544 402.979726859483 0.421837692204006 1.68735076881602 402.979726859483 0.0 3.68735076881602 0.388821655699162 0.467053039878874 0.0321536456854432 0.285714285714286 0.036 0.0 0.0 0.0 0.0 0.0 0.67068695667376 0.0 0.0 0.741740524811534 0.0 0.0 2 6 3 4 +i1 317.391125089629 2.78585372786682 569.418976524678 223.80253960221 362.112509076376 0.433435034240228 1.73374013696091 362.112509076376 0.0 3.73374013696091 0.927689291379651 1.11434149114673 0.0334006423698743 0.285714285714286 0.036 0.0 0.0 0.0 0.0 0.0 0.933662205681764 0.0 0.0 0.358154834787223 0.0 0.0 2 6 3 4 +i1 317.778974643113 4.626309603429 578.142364808991 212.151044903197 343.260390653373 0.439168443838704 1.75667377535481 343.260390653373 0.0 3.75667377535481 1.54056109794186 1.8505238413716 0.0340211414607042 0.285714285714286 0.036 0.0 0.0 0.0 0.0 0.0 0.829539098239132 0.558448640872738 0.0 0.0 0.0 0.0 2 6 3 4 +i1 318.797079721009 6.36964650733724 525.078274062478 292.391125255272 765.479965918303 0.40410657645942 1.61642630583768 473.088840663031 0.0 3.61642630583768 2.1210922869433 2.5478586029349 0.0302689519342413 0.285714285714286 0.036 0.0 0.0 0.0 0.0 0.0 0.472262214769916 0.881458110462779 0.0 0.0 0.0 0.0 2 6 3 4 +i1 318.942523303566 8.44556880620706 516.065549383694 308.449465422792 807.520700476869 0.398105066475659 1.59242026590264 499.071235054077 0.0 3.59242026590264 2.81237441246695 3.37822752248282 0.0296372244304749 0.285714285714286 0.036 0.0 0.0 0.0 0.0 0.0 0.0 0.85505788678467 0.518532554664927 0.0 0.0 0.0 2 6 3 4 +i1 319.184929274493 10.5613590299076 516.065549383694 308.449465422792 807.520700476869 0.398105066475659 1.59242026590264 499.071235054077 0.0 3.59242026590264 3.51693255695922 4.22454361196303 0.0296372244304749 0.285714285714286 0.036 0.0 0.0 0.0 0.0 0.0 0.0 0.460198732166751 0.88781593076049 0.0 0.0 0.0 2 6 3 4 +i1 319.815184798905 12.4501814389696 525.078274062478 292.391125255272 765.479965918303 0.40410657645942 1.61642630583768 473.088840663031 0.0 3.61642630583768 4.14591041917686 4.98007257558782 0.0302689519342413 0.285714285714286 0.036 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.815341924357393 0.578979746092369 0.0 0.0 2 6 3 4 +i1 320.203034352389 14.4775602611509 578.142364808991 212.151044903197 343.260390653373 0.439168443838704 1.75667377535481 343.260390653373 0.0 3.75667377535481 4.82102756696324 5.79102410446035 0.0340211414607042 0.285714285714286 0.036 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.300079556718619 0.953914178340776 0.0 0.0 2 6 3 4 +i1 321.221139430285 15.8549475262369 569.418976524678 223.80253960221 362.112509076376 0.433435034240228 1.73374013696091 362.112509076376 0.0 3.73374013696091 5.27969752623689 6.34197901049477 0.0334006423698743 0.285714285714286 0.036 0.0 0.0 0.0 0.0 0.0 0.715849372807894 0.0 0.0 0.698254735358483 0.0 0.0 2 6 3 4 +i1 324.521739130435 34.2219389310815 516.065549383694 308.449465422792 807.520700476869 0.398105066475659 1.59242026590264 499.071235054077 0.0 3.59242026590264 3.205561101899 17.4689719580637 0.0296372244304749 0.285714285714286 0.03 0.0 0.0 0.0 0.0 0.0 0.358658507277838 0.933468839949804 0.0 0.0 0.0 0.0 2 6 3 4 +i1 327.478260869565 41.6298050471128 507.005392853021 325.389741691178 851.870343747504 0.392057528291909 1.56823011316764 526.480602056326 0.0 3.56823011316764 4.04700380023606 21.1157059300242 0.0290039055329241 0.285714285714286 0.03 0.0 0.0 0.0 0.0 0.0 0.0 0.780573384236221 0.625064150165415 0.0 0.0 0.0 2 6 3 4 +i1 332.282608695652 47.4015458730724 560.6475324544 236.093943139679 382.0 0.427658336508217 1.71063334603287 382.0 0.0 3.71063334603287 3.66789587457888 24.9080207266517 0.032778129487174 0.285714285714286 0.03 0.0 0.0 0.0 0.0 0.0 0.0 0.249588438644338 0.968352007947049 0.0 0.0 0.0 2 6 3 4 +i1 333.391304347826 55.4361031547783 534.043075486827 277.168806277098 725.627934833444 0.410062281517837 1.64024912607135 448.459128556345 0.0 3.64024912607135 4.81588595896445 28.6435837533478 0.0308989875408837 0.285714285714286 0.03 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.698254735358483 0.715849372807894 0.0 0.0 2 6 3 4 +i1 335.239130434783 62.7608695652173 525.078274062478 292.391125255272 765.479965918303 0.40410657645942 1.61642630583768 473.088840663031 0.0 3.61642630583768 5.66248991421196 32.2350811743555 0.0302689519342413 0.285714285714286 0.03 0.0 0.0 0.0 0.0 0.0 0.339010898732406 0.0 0.0 0.940782445914382 0.0 0.0 2 6 3 4 +i1 345.0 10.5195057123088 395.081430905728 618.0 999.924 0.316024844012045 1.26409937604818 381.924 0.0 3.26409937604818 1.55739557199992 4.85934446344849 0.0213392333544138 0.285714285714286 0.05 0.0 0.0 0.0 0.0 0.0 0.979862881115132 0.19967156585942 0.0 0.0 0.0 0.0 2 6 3 4 +i1 352.771739130435 17.6227239746567 432.965241176763 499.009868144726 807.397966658166 0.342052059654614 1.36820823861846 308.38809851344 0.0 3.36820823861845 2.27867567826597 8.43069600441899 0.0238985390179608 0.285714285714286 0.05 0.0 0.0 0.0 0.0 0.0 0.733639656317064 0.679538707270587 0.0 0.0 0.0 0.0 2 6 3 4 +i1 354.565217391304 24.7164668104899 423.535808051102 526.41586483023 851.740869295313 0.335603390492037 1.34241356196815 325.325004465082 0.0 3.34241356196815 3.3073640213309 11.7258488759932 0.0232579643486208 0.285714285714286 0.05 0.0 0.0 0.0 0.0 0.0 0.31318904059202 0.949690804869169 0.0 0.0 0.0 0.0 2 6 3 4 +i1 357.554347826087 30.5800083501496 479.569328975657 381.95302843016 618.0 0.373652614235517 1.49461045694207 236.046971569839 0.0 3.49461045694207 3.3161997346828 15.1995889167993 0.0270970856380866 0.285714285714286 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.795602827508137 0.605818570911339 0.0 0.0 0.0 2 6 3 4 +i1 357.554347826087 2.40119152128788 423.535808051102 526.41586483023 851.740869295313 0.335603390492037 1.34241356196815 325.325004465082 0.0 3.34241356196815 0.799596776588865 0.960476608515153 0.0232579643486208 0.285714285714286 0.06 0.0 0.0 0.0 0.0 0.0 0.979862881115132 0.19967156585942 0.0 0.0 0.0 0.0 2 6 3 4 +i1 358.573878821459 4.21744646145737 432.965241176763 499.009868144725 807.397966658166 0.342052059654614 1.36820823861846 308.38809851344 0.0 3.36820823861845 1.4044096716653 1.68697858458295 0.0238985390179608 0.285714285714286 0.06 0.0 0.0 0.0 0.0 0.0 0.733639656317064 0.679538707270587 0.0 0.0 0.0 0.0 2 6 3 4 +i1 359.201282510918 5.84137624896715 414.076434089433 555.327019433991 898.519117444197 0.329114790987478 1.31645916394991 343.192098010206 0.0 3.31645916394991 1.94517829090606 2.33655049958686 0.0226176901949176 0.285714285714286 0.06 0.0 0.0 0.0 0.0 0.0 0.31318904059202 0.949690804869169 0.0 0.0 0.0 0.0 2 6 3 4 +i1 360.84821719575 6.77383081490628 404.590428285151 585.825996359163 947.866462109126 0.322587961166787 1.29035184466715 362.040465749963 0.0 3.29035184466715 2.25568566136379 2.70953232596251 0.0219780089027582 0.285714285714286 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.795602827508137 0.605818570911339 0.0 0.0 0.0 2 6 3 4 +i1 361.083493579297 8.14181660912297 461.045559003734 425.059403395186 687.746114693411 0.361144909139656 1.44457963655863 262.686711298225 0.0 3.44457963655863 2.71122493083795 3.25672664364919 0.0258194447538013 0.285714285714286 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.375601183960091 0.926781393106151 0.0 0.0 0.0 2 6 3 4 +i1 361.47562088521 9.32142690321748 470.328394438652 402.930175575755 651.941024081571 0.367421344005192 1.46968537602077 249.010848505816 0.0 3.46968537602077 3.10403515877142 3.72857076128699 0.0264586978851749 0.285714285714286 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.788501827979772 0.615032411562642 0.0 0.0 2 6 3 4 +i1 362.495151880581 9.89549516571722 470.328394438652 402.930175575755 651.941024081571 0.367421344005192 1.46968537602077 249.010848505816 0.0 3.46968537602077 3.29519989018383 3.95819806628689 0.0264586978851749 0.285714285714286 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.27337650457633 0.961907109208383 0.0 0.0 2 6 3 4 +i1 363.122555570041 10.5948289468131 461.045559003734 425.059403395186 687.746114693411 0.361144909139656 1.44457963655863 262.686711298225 0.0 3.44457963655863 3.52807803928875 4.23793157872522 0.0258194447538013 0.285714285714286 0.06 0.0 0.0 0.0 0.0 0.0 0.707106781186548 0.0 0.0 0.707106781186548 0.0 0.0 2 6 3 4 +i1 364.769490254873 10.1326836581709 404.590428285151 585.825996359163 947.866462109126 0.322587961166787 1.29035184466715 362.040465749963 0.0 3.29035184466715 3.37418365817093 4.05307346326838 0.0219780089027582 0.285714285714286 0.06 0.0 0.0 0.0 0.0 0.0 0.947371065153513 0.320137571849818 0.0 0.0 0.0 0.0 2 6 3 4 +i1 370.108695652174 29.9846046794495 461.045559003734 425.059403395186 687.746114693411 0.361144909139656 1.44457963655863 262.686711298225 0.0 3.44457963655863 3.49195301086634 14.6876182515034 0.0258194447538013 0.285714285714286 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.73388567534891 0.679273005144231 0.0 0.0 0.0 2 6 3 4 +i1 374.891304347826 32.0111077827232 442.361745876421 473.030668606697 765.363621805635 0.348459331130818 1.39383732452327 292.332953198939 0.0 3.39383732452327 3.99848421725848 15.4388808848799 0.024539142145765 0.285714285714286 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.13873380200061 0.990329708825528 0.0 0.0 0.0 2 6 3 4 +i1 382.663043478261 30.5764886156085 451.722644857788 448.403985024206 725.517647769166 0.354823959351069 1.41929583740428 277.113662744959 0.0 3.41929583740428 3.68838789825075 14.8635535927988 0.0251795216065399 0.285714285714286 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.68720204332094 0.726466345851977 0.0 0.0 2 6 3 4 +i1 384.45652173913 32.867949539765 479.569328975657 381.95302843016 618.0 0.373652614235517 1.49461045694207 236.046971569839 0.0 3.49461045694207 3.56431183063437 16.336794804704 0.0270970856380866 0.285714285714286 0.05 0.0 0.0 0.0 0.0 0.0 0.320137571849819 0.0 0.0 0.947371065153513 0.0 0.0 2 6 3 4 +i1 387.445652173913 33.554347826087 423.535808051102 526.41586483023 851.740869295313 0.335603390492037 1.34241356196815 325.325004465082 0.0 3.34241356196815 4.48998004488744 15.9186672900279 0.0232579643486208 0.285714285714286 0.05 0.0 0.0 0.0 0.0 0.0 0.839628566581554 0.0 0.0 0.543160998397533 0.0 0.0 2 6 3 4 +i1 403.0 6.85315417937716 432.965241176763 1306.40783480289 499.009868144726 0.684104119309227 1.36820823861845 807.397966658166 0.0 3.36820823861845 0.886135183778124 3.2785430697792 0.0238985390179608 0.333333333333333 0.04 0.0 0.0 0.0 0.0 0.0 0.816546988543084 0.0 0.0 0.577278975454 0.0 0.0 2 6 3 4 +i1 403.52 10.0873577421032 479.569328975657 999.953028430161 381.953028430161 0.747305228471033 1.49461045694207 618.0 0.0 3.49461045694207 1.09390725747953 5.01385379562566 0.0270970856380866 0.333333333333333 0.04 0.0 0.0 0.0 0.0 0.0 0.654222996629699 0.756301706120552 0.0 0.0 0.0 0.0 2 6 3 4 +i1 403.64 12.7773405801176 404.590428285151 1533.69245846829 585.825996359163 0.645175922333573 1.29035184466715 947.866462109127 0.0 3.29035184466715 1.82949420120164 5.95658893117307 0.0219780089027582 0.333333333333333 0.04 0.0 0.0 0.0 0.0 0.0 0.0 0.645568743750533 0.763702165174591 0.0 0.0 0.0 2 6 3 4 +i1 403.84 15.0096745510933 497.919480801851 898.545202026075 343.218182592084 0.771955847973845 1.54391169594769 555.327019433991 0.0 3.54391169594769 1.51371920355857 7.56364192613984 0.028370571241847 0.333333333333333 0.04 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.543160998397529 0.839628566581557 0.0 0.0 2 6 3 4 +i1 404.68 16.32 551.848132400556 651.959950344454 249.029774768699 0.843702260883414 1.68740452176683 402.930175575755 0.0 3.68740452176683 1.31286784625352 8.52926770844401 0.0321550842070785 0.333333333333333 0.04 0.0 0.0 0.0 0.0 0.0 0.96835331645743 0.0 0.0 0.249583361837075 0.0 0.0 2 6 3 4 +i1 405.0 5.65857866142481 328.253054101597 2352.32304946891 898.519117444198 0.538570145538911 1.07714029107782 1453.80393202471 0.0 3.07714029107782 1.0506129688637 2.43145882404407 0.0169237493829048 0.333333333333333 0.04 0.0 0.0 0.0 0.0 0.0 0.733083070829506 0.0 0.0 0.680139111699351 0.0 0.0 2 6 3 4 +i1 406.464788732394 6.62523910382093 347.343076706898 2113.76787671108 807.397966658166 0.565502128707892 1.13100425741578 1306.36991005291 0.0 3.13100425741578 1.15453071435435 2.91086313772198 0.0181713337835612 0.333333333333333 0.04 0.0 0.0 0.0 0.0 0.0 0.988481757015846 0.151340067552735 0.0 0.0 0.0 0.0 2 6 3 4 +i1 406.802816901408 7.5634734550978 337.791951621765 2229.85759581513 851.740869295313 0.552051372063029 1.10410274412606 1378.11672651982 0.0 3.10410274412606 1.36064708280938 3.28687947986947 0.017545710419483 0.333333333333333 0.04 0.0 0.0 0.0 0.0 0.0 0.681365263145279 0.73194356215419 0.0 0.0 0.0 0.0 2 6 3 4 +i1 407.366197183099 8.0589155472912 309.237947911611 2617.801032 999.924 0.51154980993464 1.02309961986928 1617.877032 0.0 3.02309961986928 1.59262650543716 3.3820149686308 0.0156927035906633 0.333333333333333 0.04 0.0 0.0 0.0 0.0 0.0 0.0 0.957873710064086 0.287189755332712 0.0 0.0 0.0 2 6 3 4 +i1 407.366197183099 1.67366411112564 337.791951621765 2229.85759581513 851.740869295313 0.552051372063029 1.10410274412606 1378.11672651982 0.0 3.10410274412606 0.557330149004839 0.334732822225129 0.017545710419483 0.333333333333333 0.048 0.0 0.0 0.0 0.0 0.0 0.733083070829506 0.0 0.0 0.680139111699351 0.0 0.0 2 6 3 4 +i1 407.630372409655 2.05668421051855 347.343076706898 2113.76787671108 807.397966658166 0.565502128707892 1.13100425741578 1306.36991005291 0.0 3.13100425741578 0.684875842102678 0.411336842103711 0.0181713337835612 0.333333333333333 0.048 0.0 0.0 0.0 0.0 0.0 0.988481757015846 0.151340067552735 0.0 0.0 0.0 0.0 2 6 3 4 +i1 407.792941779844 2.3090107946423 309.237947911611 2617.801032 999.924 0.51154980993464 1.02309961986928 1617.877032 0.0 3.02309961986928 0.768900594615886 0.46180215892846 0.0156927035906633 0.333333333333333 0.048 0.0 0.0 0.0 0.0 0.0 0.681365263145279 0.73194356215419 0.0 0.0 0.0 0.0 2 6 3 4 +i1 408.21968637659 2.2671946144616 395.081430905728 1617.924 618.0 0.632049688024089 1.26409937604818 999.924 0.0 3.26409937604818 0.754975806615714 0.453438922892321 0.0213392333544138 0.333333333333333 0.048 0.0 0.0 0.0 0.0 0.0 0.0 0.957873710064086 0.287189755332712 0.0 0.0 0.0 2 6 3 4 +i1 408.280649890411 2.42834941487713 356.900346837754 2003.72196188715 765.363621805636 0.578914733657398 1.1578294673148 1238.35834008152 0.0 3.1578294673148 0.808640355154086 0.485669882975427 0.0188001680062192 0.333333333333333 0.048 0.0 0.0 0.0 0.0 0.0 0.0 0.578987684438555 0.815336287226614 0.0 0.0 0.0 2 6 3 4 +i1 408.382255746779 2.52150174660491 366.458025508551 1899.40520185968 725.517647769166 0.592282069263508 1.18456413852702 1173.88755409051 0.0 3.18456413852702 0.839660081619434 0.504300349320981 0.0194317796704722 0.333333333333333 0.048 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.846679766162923 0.532102784779687 0.0 0.0 2 6 3 4 +i1 408.646430973336 2.43143648414349 309.237947911611 2617.801032 999.924 0.51154980993464 1.02309961986928 1617.877032 0.0 3.02309961986928 0.809668349219782 0.486287296828698 0.0156927035906633 0.333333333333333 0.048 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.24958336183706 0.968353316457434 0.0 0.0 2 6 3 4 +i1 408.809000343525 2.40226726210926 337.791951621765 2229.85759581513 851.740869295313 0.552051372063029 1.10410274412606 1378.11672651982 0.0 3.10410274412606 0.799954998282384 0.480453452421853 0.017545710419483 0.333333333333333 0.048 0.0 0.0 0.0 0.0 0.0 0.792799912988597 0.0 0.0 0.609481991502024 0.0 0.0 2 6 3 4 +i1 409.732394366197 6.85064967668511 356.900346837754 2003.72196188715 765.363621805636 0.578914733657398 1.1578294673148 1238.35834008152 0.0 3.1578294673148 1.15612446113827 3.04206894485958 0.0188001680062192 0.333333333333333 0.04 0.0 0.0 0.0 0.0 0.0 0.0 0.80274727168076 0.596319392447617 0.0 0.0 0.0 2 6 3 4 +i1 410.633802816901 6.5655006022269 376.010727604031 1800.51932826735 687.746114693411 0.605597580554072 1.21119516110814 1112.77321357394 0.0 3.21119516110814 1.03833803824561 2.97532437263611 0.0200657543073603 0.333333333333333 0.04 0.0 0.0 0.0 0.0 0.0 0.0 0.161378653759059 0.986892562597831 0.0 0.0 0.0 2 6 3 4 +i1 412.098591549296 5.59446930622569 385.553421899788 1706.78160104555 651.941024081572 0.618855269871713 1.23771053974343 1054.84057696398 0.0 3.23771053974343 0.856160701258549 2.56003298234494 0.0207016970926654 0.333333333333333 0.04 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.609481991502024 0.792799912988597 0.0 0.0 2 6 3 4 +i1 412.43661971831 5.56338028169014 328.253054101597 2352.32304946891 898.519117444198 0.538570145538911 1.07714029107782 1453.80393202471 0.0 3.07714029107782 1.03293774362633 2.39055262581119 0.0169237493829048 0.333333333333333 0.04 0.0 0.0 0.0 0.0 0.0 0.565115261318735 0.0 0.0 0.825011964413037 0.0 0.0 2 6 3 4 + + + ; HERE BEGINS T466 + +i99 417 143 1.5 2.0 -1 1 ; was 145.5 + +i1 417.0 12.318894847309 309.224472101786 1000.0 2618.0 0.255765295063616 1.02306118025447 1618.0 0.0 3.02306118025447 2.43460324325138 5.16967395133329 0.015691835407634 0.25 0.05 0.0 0.0 0.0 0.0 0.0 0.979862881115132 0.19967156585942 0.0 0.0 0.0 0.0 2 6 3 4 +i1 424.77173913043478 20.9805028297928 347.32949375779 807.459333567517 2113.92853527976 0.282741516706083 1.13096606682433 1306.46920171224 0.0 3.13096606682433 3.65628087871878 9.21784625024491 0.0181704420589385 0.25 0.05 0.0 0.0 0.0 0.0 0.0 0.733639656317064 0.679538707270587 0.0 0.0 0.0 0.0 2 6 3 4 +i1 426.56521739130435 29.5530005646369 337.778381656262 851.805606521408 2230.02707787305 0.276016113933894 1.10406445573558 1378.22147135164 0.0 3.10406445573558 5.31673920291337 12.8427257833114 0.0175448235763721 0.25 0.05 0.0 0.0 0.0 0.0 0.0 0.31318904059202 0.949690804869169 0.0 0.0 0.0 0.0 2 6 3 4 +i1 429.554347826087 36.845845250403 395.067899088516 618.046971569839 1618.04697156984 0.31601548954392 1.26406195817568 1000.0 0.0 3.26406195817568 5.455225030953 17.0202188636018 0.021338326118007 0.25 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.795602827508137 0.605818570911339 0.0 0.0 0.0 2 6 3 4 +i1 429.554347826087 2.81192164992923 337.778381656262 851.805606521408 2230.02707787305 0.276016113933894 1.10406445573558 1378.22147135164 0.0 3.10406445573558 0.936369909426433 1.12476865997169 0.0175448235763721 0.25 0.06 0.0 0.0 0.0 0.0 0.0 0.979862881115132 0.19967156585942 0.0 0.0 0.0 0.0 2 6 3 4 +i1 430.5738788214588 4.98389598273843 347.32949375779 807.459333567517 2113.92853527976 0.282741516706083 1.13096606682433 1306.46920171224 0.0 3.13096606682433 1.6596373622519 1.99355839309537 0.0181704420589385 0.25 0.06 0.0 0.0 0.0 0.0 0.0 0.733639656317064 0.679538707270587 0.0 0.0 0.0 0.0 2 6 3 4 +i1 431.2012825109185 6.94536764937024 328.239506008815 898.587410087364 2352.50183960872 0.269275481882427 1.07710192752971 1453.91442952136 0.0 3.07710192752971 2.31280742724029 2.7781470597481 0.016922868075431 0.25 0.06 0.0 0.0 0.0 0.0 0.0 0.31318904059202 0.949690804869169 0.0 0.0 0.0 0.0 2 6 3 4 +i1 432.8482171957499 8.20407619431193 318.719287364986 947.938505435539 2481.70300723024 0.262523742570026 1.0500949702801 1533.7645017947 0.0 3.0500949702801 2.73195737270587 3.28163047772477 0.0163050439963448 0.25 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.795602827508137 0.605818570911339 0.0 0.0 0.0 2 6 3 4 +i1 433.0834935792973 9.89017138859535 375.997154128076 687.798387370851 1800.65617813689 0.302789345936031 1.21115738374412 1112.85779076604 0.0 3.21115738374412 3.29342707240225 3.95606855543814 0.0200648516068878 0.25 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.375601183960091 0.926781393106151 0.0 0.0 0.0 2 6 3 4 +i1 433.4756208852096 11.3815477011155 385.539866053671 651.990575365299 1706.91132630635 0.309418233690739 1.23767293476295 1054.92075094105 0.0 3.23767293476295 3.79005538447146 4.5526190804462 0.0207007918651621 0.25 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.788501827979772 0.615032411562642 0.0 0.0 2 6 3 4 +i1 434.4951518805814 12.2622038110422 385.539866053671 651.990575365299 1706.91132630635 0.309418233690739 1.23767293476295 1054.92075094105 0.0 3.23767293476295 4.08331386907704 4.90488152441686 0.0207007918651621 0.25 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.27337650457633 0.961907109208383 0.0 0.0 2 6 3 4 +i1 435.1225555700411 13.2637611967701 375.997154128076 687.798387370851 1800.65617813689 0.302789345936031 1.21115738374412 1112.85779076604 0.0 3.21115738374412 4.41683247852446 5.30550447870805 0.0200648516068878 0.25 0.06 0.0 0.0 0.0 0.0 0.0 0.707106781186548 0.0 0.0 0.707106781186548 0.0 0.0 2 6 3 4 +i1 436.7694902548726 13.1000749625187 318.719287364986 947.938505435539 2481.70300723024 0.262523742570026 1.0500949702801 1533.7645017947 0.0 3.0500949702801 4.36232496251874 5.2400299850075 0.0163050439963448 0.25 0.06 0.0 0.0 0.0 0.0 0.0 0.947371065153513 0.320137571849818 0.0 0.0 0.0 0.0 2 6 3 4 +i1 442.1086956521739 37.6440637133285 375.997154128076 687.798387370851 1800.65617813689 0.302789345936031 1.21115738374412 1112.85779076604 0.0 3.21115738374412 5.95370931586215 17.0591302294198 0.0200648516068878 0.25 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.73388567534891 0.679273005144231 0.0 0.0 0.0 2 6 3 4 +i1 446.8913043478261 41.0363988973241 356.886759307554 765.421793861969 2003.87425633063 0.289447848890405 1.15779139556162 1238.45246246867 0.0 3.15779139556162 6.92567258639775 18.2221690097282 0.0187992720292845 0.25 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.13873380200061 0.990329708825528 0.0 0.0 0.0 2 6 3 4 +i1 454.6630434782609 40.9449264903655 366.444441303383 725.572791301305 1899.54956762682 0.2961315512619 1.1845262050476 1173.97677632551 0.0 3.1845262050476 6.69035625193552 18.3701126921116 0.0194308800440795 0.25 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.68720204332094 0.726466345851977 0.0 0.0 2 6 3 4 +i1 456.4565217391304 44.5604146348152 395.067899088516 618.046971569839 1618.04697156984 0.31601548954392 1.26406195817568 1000.0 0.0 3.26406195817568 6.59740840937364 20.5838135774373 0.021338326118007 0.25 0.05 0.0 0.0 0.0 0.0 0.0 0.320137571849819 0.0 0.0 0.947371065153513 0.0 0.0 2 6 3 4 +i1 459.445652173913 46.554347826087 337.778381656262 851.805606521408 2230.02707787305 0.276016113933894 1.10406445573558 1378.22147135164 0.0 3.10406445573558 8.37537039975565 20.2309312668157 0.0175448235763721 0.25 0.05 0.0 0.0 0.0 0.0 0.0 0.839628566581554 0.0 0.0 0.543160998397533 0.0 0.0 2 6 3 4 +i1 472.0 15.346028453163 347.32949375779 2113.92853527976 807.459333567518 0.565483033412165 1.13096606682433 1306.46920171224 0.0 3.13096606682433 2.67435870592661 6.74232319314424 0.0181704420589385 0.333333333333333 0.05 0.0 0.0 0.0 0.0 0.0 0.494818011022792 0.0 0.0 0.868996625981625 0.0 0.0 2 6 3 4 +i1 476.804347826087 25.2766581120306 395.067899088516 1618.04697156984 618.046971569839 0.63203097908784 1.26406195817568 1000.0 0.0 3.26406195817568 3.74234481783485 11.676058732904 0.021338326118007 0.333333333333333 0.05 0.0 0.0 0.0 0.0 0.0 0.816546988543084 0.0 0.0 0.577278975454 0.0 0.0 2 6 3 4 +i1 477.9130434782609 34.5013308058732 318.719287364986 2481.70300723024 947.93850543554 0.525047485140052 1.0500949702801 1533.7645017947 0.0 3.0500949702801 6.6098914768801 14.6532936047242 0.0163050439963448 0.333333333333333 0.05 0.0 0.0 0.0 0.0 0.0 0.945045631346524 0.326938457011178 0.0 0.0 0.0 0.0 2 6 3 4 +i1 479.7608695652174 42.4638387166638 414.062967550319 1453.95663758265 555.369227495281 0.658211079244464 1.31642215848893 898.587410087365 0.0 3.31642215848893 5.87889095886631 19.9723152784608 0.02261678037788 0.333333333333333 0.05 0.0 0.0 0.0 0.0 0.0 0.654222996629699 0.756301706120552 0.0 0.0 0.0 0.0 2 6 3 4 +i1 479.7608695652174 3.50289779909155 337.778381656262 2230.02707787305 851.805606521409 0.552032227867788 1.10406445573558 1378.22147135164 0.0 3.10406445573558 1.16646496709749 1.40115911963662 0.0175448235763721 0.333333333333333 0.06 0.0 0.0 0.0 0.0 0.0 0.494818011022792 0.0 0.0 0.868996625981625 0.0 0.0 2 6 3 4 +i1 480.3911250896291 5.90968818710535 347.32949375779 2113.92853527976 807.459333567518 0.565483033412165 1.13096606682433 1306.46920171224 0.0 3.13096606682433 1.96792616630608 2.36387527484214 0.0181704420589385 0.333333333333333 0.06 0.0 0.0 0.0 0.0 0.0 0.816546988543084 0.0 0.0 0.577278975454 0.0 0.0 2 6 3 4 +i1 480.7789746431132 8.01300328468285 366.444441303383 1899.54956762682 725.572791301305 0.5922631025238 1.1845262050476 1173.97677632551 0.0 3.1845262050476 2.66833009379939 3.20520131387314 0.0194308800440794 0.333333333333333 0.06 0.0 0.0 0.0 0.0 0.0 0.945045631346524 0.326938457011178 0.0 0.0 0.0 0.0 2 6 3 4 +i1 481.7970797210091 9.55446976100585 356.886759307554 2003.87425633064 765.421793861969 0.57889569778081 1.15779139556162 1238.45246246867 0.0 3.15779139556162 3.18163843041495 3.82178790440234 0.0187992720292845 0.333333333333333 0.06 0.0 0.0 0.0 0.0 0.0 0.654222996629699 0.756301706120552 0.0 0.0 0.0 0.0 2 6 3 4 +i1 481.9425233035656 11.3309195755984 328.239506008815 2352.50183960872 898.587410087365 0.538550963764854 1.07710192752971 1453.91442952136 0.0 3.07710192752971 3.77319621867427 4.53236783023937 0.016922868075431 0.333333333333333 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.967522671348027 0.252784256684585 0.0 0.0 0.0 2 6 3 4 +i1 482.1849292744932 12.9349703068045 385.539866053671 1706.91132630635 651.990575365299 0.618836467381477 1.23767293476295 1054.92075094105 0.0 3.23767293476295 4.30734511216591 5.17398812272181 0.0207007918651621 0.333333333333333 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.645568743750533 0.763702165174591 0.0 0.0 0.0 2 6 3 4 +i1 482.8151847989049 14.1171787993481 375.997154128076 1800.65617813689 687.798387370852 0.605578691872061 1.21115738374412 1112.85779076604 0.0 3.21115738374412 4.70102054018293 5.64687151973926 0.0200648516068878 0.333333333333333 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.932608483466976 0.360889756803138 0.0 0.0 2 6 3 4 +i1 483.203034352389 15.355771553545 414.062967550319 1453.95663758265 555.369227495281 0.658211079244464 1.31642215848893 898.587410087365 0.0 3.31642215848893 5.11347192733047 6.14230862141798 0.02261678037788 0.333333333333333 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.543160998397529 0.839628566581557 0.0 0.0 2 6 3 4 +i1 484.2211394302849 15.8549475262369 328.239506008815 2352.50183960872 898.587410087365 0.538550963764854 1.07710192752971 1453.91442952136 0.0 3.07710192752971 5.27969752623687 6.34197901049474 0.016922868075431 0.333333333333333 0.06 0.0 0.0 0.0 0.0 0.0 0.554494539855621 0.0 0.0 0.832187361878503 0.0 0.0 2 6 3 4 +i1 487.5217391304348 45.9135490630469 356.886759307554 2003.87425633064 765.421793861969 0.57889569778081 1.15779139556162 1238.45246246867 0.0 3.15779139556162 7.74878441175564 20.3878623208783 0.0187992720292845 0.333333333333333 0.05 0.0 0.0 0.0 0.0 0.0 0.577591598504103 0.816325881825068 0.0 0.0 0.0 0.0 2 6 3 4 +i1 490.4782608695652 50.9858902284831 366.444441303383 1899.54956762682 725.572791301305 0.5922631025238 1.1845262050476 1173.97677632551 0.0 3.1845262050476 8.33103875594685 22.8750331112514 0.0194308800440794 0.333333333333333 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.902369623822601 0.430962947365846 0.0 0.0 0.0 2 6 3 4 +i1 495.2826086956522 53.7483009172156 395.067899088516 1618.04697156984 618.046971569839 0.63203097908784 1.26406195817568 1000.0 0.0 3.26406195817568 7.95772425743393 24.8279782683973 0.021338326118007 0.333333333333333 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.516982125923783 0.855996192442073 0.0 0.0 0.0 2 6 3 4 +i1 496.3913043478261 58.7988666949511 337.778381656262 2230.02707787305 851.805606521409 0.552032227867788 1.10406445573558 1378.22147135164 0.0 3.10406445573558 10.5782233164508 25.5519814199962 0.0175448235763721 0.333333333333333 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.832187361878503 0.554494539855621 0.0 0.0 2 6 3 4 +i1 498.2391304347826 62.7608695652174 347.32949375779 2113.92853527976 807.459333567518 0.565483033412165 1.13096606682433 1306.46920171224 0.0 3.13096606682433 10.9373626163627 27.5741745027358 0.0181704420589385 0.333333333333333 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.300079556718556 0.953914178340796 0.0 0.0 2 6 3 4 +i1 506.0 11.813890274583 366.444441303383 725.572791301305 1899.54956762682 0.2961315512619 1.1845262050476 1173.97677632551 0.0 3.1845262050476 1.93037676296317 5.30035133235364 0.0194308800440795 0.285714285714286 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.741740524811534 0.67068695667376 0.0 0.0 2 6 3 4 +i1 508.9673913043478 18.1562786968453 337.778381656262 851.805606521408 2230.02707787305 0.276016113933894 1.10406445573558 1378.22147135164 0.0 3.10406445573558 3.26640939607496 7.89009928243909 0.0175448235763721 0.285714285714286 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.358154834787223 0.933662205681764 0.0 0.0 2 6 3 4 +i1 509.6521739130435 23.7978204368564 507.013372378538 325.374459503564 851.83033498033 0.392062860990882 1.56825144396353 526.455875476766 0.0 3.56825144396353 2.31340843486878 12.0709339871828 0.0290044625378748 0.285714285714286 0.05 0.0 0.0 0.0 0.0 0.0 0.558448640872738 0.0 0.0 0.829539098239132 0.0 0.0 2 6 3 4 +i1 510.7934782608696 28.4598346299059 534.050929443477 277.155788824009 725.593855141254 0.410067493259931 1.64026997303972 448.438066317246 0.0 3.64026997303972 2.47230112403258 14.7051438031583 0.0308995402253298 0.285714285714286 0.05 0.0 0.0 0.0 0.0 0.0 0.881458110462779 0.0 0.0 0.472262214769916 0.0 0.0 2 6 3 4 +i1 510.7934782608696 2.69664886702438 461.0323342074 425.091710365173 1112.89009773602 0.361135955154663 1.44454382061865 687.798387370851 0.0 3.44454382061865 0.897984072719118 1.07865954680975 0.0258185355125504 0.285714285714286 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.741740524811534 0.67068695667376 0.0 0.0 2 6 3 4 +i1 511.1827537318297 4.2448850746441 470.315227971341 402.9608005966 1054.9513759619 0.367412453803356 1.46964981521342 651.990575365298 0.0 3.46964981521342 1.41354672985648 1.69795402985764 0.0264577897392985 0.285714285714286 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.358154834787223 0.933662205681764 0.0 0.0 2 6 3 4 +i1 511.4223078678052 5.52703712743767 525.086170281785 292.377392873883 765.444014543827 0.404111828308715 1.61644731323486 473.066621669943 0.0 3.61644731323486 1.84050336343675 2.21081485097507 0.0302695061452219 0.285714285714286 0.06 0.0 0.0 0.0 0.0 0.0 0.558448640872738 0.0 0.0 0.829539098239132 0.0 0.0 2 6 3 4 +i1 512.0511374747409 6.40358819198229 516.073487511781 308.434978848705 807.482774625909 0.398110358676628 1.59244143470651 499.047795777204 0.0 3.59244143470651 2.1323948679301 2.56143527679292 0.0296377800855718 0.285714285714286 0.06 0.0 0.0 0.0 0.0 0.0 0.881458110462779 0.0 0.0 0.472262214769916 0.0 0.0 2 6 3 4 +i1 512.1409702757317 7.42665125789485 497.906502341292 343.244269156539 898.613496651819 0.385969228971635 1.54387691588654 555.36922749528 0.0 3.54387691588654 2.47307486887898 2.97066050315794 0.0283696678745975 0.285714285714286 0.06 0.0 0.0 0.0 0.0 0.0 0.85505788678467 0.518532554664927 0.0 0.0 0.0 0.0 2 6 3 4 +i1 512.2906916107164 8.32489395711743 507.013372378538 325.374459503564 851.83033498033 0.392062860990882 1.56825144396353 526.455875476766 0.0 3.56825144396353 2.7721896877201 3.32995758284697 0.0290044625378748 0.285714285714286 0.06 0.0 0.0 0.0 0.0 0.0 0.460198732166751 0.88781593076049 0.0 0.0 0.0 0.0 2 6 3 4 +i1 512.6799670816766 8.9469732419555 534.050929443477 277.155788824009 725.593855141254 0.410067493259931 1.64026997303972 448.438066317246 0.0 3.64026997303972 2.97934208957118 3.5787892967822 0.0308995402253298 0.285714285714286 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.815341924357393 0.578979746092369 0.0 0.0 0.0 2 6 3 4 +i1 512.9195212176521 9.60300054423511 479.556223241403 381.982059066649 1000.02903063649 0.37364378861352 1.49457515445408 618.046971569839 0.0 3.49457515445408 3.19779918123029 3.84120021769404 0.027096178852588 0.285714285714286 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.300079556718619 0.953914178340776 0.0 0.0 0.0 2 6 3 4 +i1 513.5483508245877 9.7994752623688 488.753755168254 362.09550217483 947.966024693704 0.379829484431759 1.51931793772704 585.870522518874 0.0 3.51931793772704 3.26322526236881 3.91979010494752 0.0277335251434269 0.285714285714286 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.698254735358483 0.715849372807894 0.0 0.0 2 6 3 4 +i1 515.5869565217391 30.0946886578885 560.65525889718 236.082854800154 381.982059066649 0.427663430242165 1.71065372096866 381.982059066649 0.0 3.71065372096866 2.32862425125124 15.8138861842461 0.0327786772055172 0.285714285714286 0.05 0.0 0.0 0.0 0.0 0.0 0.933468839949804 0.0 0.0 0.358658507277838 0.0 0.0 2 6 3 4 +i1 517.413043478261 32.8165305158115 309.224472101786 1000.0 2618.0 0.255765295063616 1.02306118025447 1618.0 0.0 3.02306118025447 6.48558434959815 13.7715895040523 0.015691835407634 0.285714285714286 0.05 0.0 0.0 0.0 0.0 0.0 0.780573384236221 0.625064150165415 0.0 0.0 0.0 0.0 2 6 3 4 +i1 520.380434782609 34.0670197197014 423.522381795836 526.455875476766 1378.26148199817 0.335594194735217 1.34237677894087 851.805606521408 0.0 3.34237677894087 4.55880295513434 16.1616911725569 0.0232570539011493 0.285714285714286 0.05 0.0 0.0 0.0 0.0 0.0 0.249588438644338 0.968352007947049 0.0 0.0 0.0 0.0 2 6 3 4 +i1 521.065217391304 36.7743122138692 395.067899088516 618.046971569839 1618.04697156984 0.31601548954392 1.26406195817568 1000.0 0.0 3.26406195817568 5.44463418118996 16.9871755739307 0.021338326118007 0.285714285714286 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.698254735358483 0.715849372807894 0.0 0.0 0.0 2 6 3 4 +i1 522.20652173913 38.7934782608695 560.65525889718 236.082854800154 381.982059066649 0.427663430242165 1.71065372096866 381.982059066649 0.0 3.71065372096866 3.00170688906495 20.3848478674196 0.0327786772055172 0.285714285714286 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.940782445914382 0.339010898732406 0.0 0.0 2 6 3 4 +i1 527.0 7.30313216974222 423.522381795836 1378.26148199817 526.455875476766 0.671188389470434 1.34237677894087 851.805606521408 0.0 6.73022244351515 0.977295366342347 3.46466957458801 0.0232570539011493 0.3125 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.587539680641157 0.809195355691125 0.0 0.0 0.0 7 6 3 4 +i1 528.836956521739 11.2229848890673 404.576926399631 1533.80902795441 585.870522518874 0.645157313560665 1.29031462712133 947.938505435539 0.0 6.58888853844414 1.60701400400662 5.23190646401365 0.0219771001463047 0.3125 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.96088436133683 0.276949894634956 0.0 0.0 7 6 3 4 +i1 529.260869565217 14.7099144105886 604.035707395738 473.080355095071 180.702962221188 0.912242588891413 1.82448517778283 292.377392873883 0.0 7.79800745435897 0.931281726635651 7.92295855291605 0.0358708007758759 0.3125 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.695096385897394 0.718916555875841 0.0 0.0 7 6 3 4 +i1 529.967391304348 17.5909997550079 461.0323342074 1112.89009773602 425.091710365173 0.722271910309325 1.44454382061865 687.79838737085 0.0 6.99184053752153 2.04871902868347 8.61665938501661 0.0258185355125504 0.3125 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.134370642923261 0.990931143077252 0.0 0.0 7 6 3 4 +i1 529.967391304348 1.66701929961507 442.348413159221 1238.48841553191 473.066621669943 0.69690050602921 1.39380101205842 765.421793861968 0.0 6.86447061610543 0.555117426771819 0.833509649807535 0.0245382316121305 0.3125 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.587539680641157 0.809195355691125 0.0 0.0 0.0 7 6 3 4 +i1 530.208371357799 2.6239931682786 451.709364512829 1174.01085761855 448.438066317246 0.709629885273221 1.41925977054644 725.572791301304 0.0 6.92900059656946 0.873789725036775 1.3119965841393 0.0251786115605311 0.3125 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.96088436133683 0.276949894634956 0.0 0.0 7 6 3 4 +i1 530.356666775308 3.41646153220665 451.709364512829 1174.01085761855 448.438066317246 0.709629885273221 1.41925977054644 725.572791301304 0.0 6.92900059656946 1.13768169022481 1.70823076610333 0.0251786115605311 0.3125 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.695096385897394 0.718916555875841 0.0 0.0 7 6 3 4 +i1 530.745942246268 3.95796455259058 442.348413159221 1238.48841553191 473.066621669943 0.69690050602921 1.39380101205842 765.421793861968 0.0 6.86447061610543 1.31800219601266 1.97898227629529 0.0245382316121305 0.3125 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.134370642923261 0.990931143077252 0.0 0.0 7 6 3 4 +i1 530.801553027834 4.59024764594002 385.539866053672 1706.91132630635 651.990575365298 0.618836467381477 1.23767293476295 1054.92075094105 0.0 6.44031505770969 1.52855246609803 2.29512382297001 0.0207007918651621 0.3125 0.06 0.0 0.0 0.0 0.0 0.0 0.688369188783976 0.0 0.0 0.725360503427703 0.0 0.0 7 6 3 4 +i1 530.894237663777 5.14532210953212 395.067899088516 1618.04697156984 618.046971569838 0.632030979087841 1.26406195817568 999.999999999999 0.0 6.5155139568091 1.7133922624742 2.57266105476606 0.021338326118007 0.3125 0.06 0.0 0.0 0.0 0.0 0.0 0.996590817101929 0.0 0.0 0.0825029894495307 0.0 0.0 7 6 3 4 +i1 531.135217717228 5.52948634190051 414.062967550319 1453.95663758264 555.36922749528 0.658211079244465 1.31642215848893 898.587410087363 0.0 6.66045221113843 1.84131895185287 2.76474317095026 0.02261678037788 0.3125 0.06 0.0 0.0 0.0 0.0 0.0 0.678090203287911 0.734978690986997 0.0 0.0 0.0 0.0 7 6 3 4 +i1 531.283513134737 5.93470528342363 404.576926399631 1533.80902795441 585.870522518874 0.645157313560665 1.29031462712133 947.938505435538 0.0 6.58888853844414 1.97625685938007 2.96735264171181 0.0219771001463047 0.3125 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.940782445914392 0.339010898732376 0.0 0.0 0.0 7 6 3 4 +i1 531.672788605697 6.05547226386807 375.997154128077 1800.65617813689 687.79838737085 0.605578691872062 1.21115738374412 1112.85779076604 0.0 6.36328285379882 2.01647226386807 3.02773613193403 0.0200648516068878 0.3125 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.5315858779452 0.847004400442661 0.0 0.0 0.0 7 6 3 4 +i1 532.934782608696 18.5984887780441 534.050929443477 725.593855141254 277.155788824008 0.820134986519862 1.64026997303972 448.438066317246 0.0 7.43798031222932 1.61564764199115 9.60980467944019 0.0308995402253298 0.3125 0.05 0.0 0.0 0.0 0.0 0.0 0.276297312648905 0.0 0.0 0.961072211138681 0.0 0.0 7 6 3 4 +i1 534.065217391304 20.2791427975514 551.835560606268 652.009503066686 249.048702470086 0.843685649624714 1.68737129924943 402.960800596599 0.0 7.53523685619084 1.63145229778179 10.5983382398258 0.0321541951134574 0.3125 0.05 0.0 0.0 0.0 0.0 0.0 0.771803939897814 0.0 0.0 0.635860580912366 0.0 0.0 7 6 3 4 +i1 535.902173913043 21.0491700649693 309.224472101786 2618.0 1000.0 0.511530590127233 1.02306118025447 1618.0 0.0 5.77306118025447 4.1599817469924 8.83336918861898 0.015691835407634 0.3125 0.05 0.0 0.0 0.0 0.0 0.0 0.925914822694368 0.377732367046905 0.0 0.0 0.0 0.0 7 6 3 4 +i1 536.326086956522 22.7211999797178 497.906502341292 898.613496651819 343.244269156539 0.771938457943271 1.54387691588654 555.36922749528 0.0 7.22697945651947 2.29154253621874 11.4495083365409 0.0283696678745975 0.3125 0.05 0.0 0.0 0.0 0.0 0.0 0.5315858779452 0.847004400442661 0.0 0.0 0.0 0.0 7 6 3 4 +i1 537.032608695652 23.9673913043478 347.32949375779 2113.92853527976 807.459333567517 0.565483033412165 1.13096606682433 1306.46920171224 0.0 6.1211703829916 4.17680716471766 10.5301445754299 0.0181704420589385 0.3125 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.824679016782209 0.565601024821499 0.0 0.0 0.0 7 6 3 4 +i1 540.0 13.2501042340841 542.980086809307 262.706677005677 687.766080400863 0.415986052703258 1.66394421081303 100.353950616169 0.0 7.48733009281855 1.10782838259425 6.88611672213454 0.0315286866970051 0.333333333333333 0.05 0.0 0.0 0.0 0.0 0.0 0.432313502516143 0.901723369743862 0.0 0.0 0.0 0.0 7 6 3 4 +i1 542.6 13.3359458116696 679.301430634373 111.674430652694 180.68922879606 0.504905989611254 2.01962395844502 42.6596325093293 0.0 8.12566121376759 0.572368634803272 7.44114115691695 0.0413064958418055 0.333333333333333 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.901773222170767 0.432209504494929 0.0 0.0 0.0 7 6 3 4 +i1 543.2 13.9908549236199 488.766798121653 362.067982916664 947.893979275827 0.379838244917218 1.51935297966887 138.309969474166 0.0 7.17063668259897 1.46337066484931 7.00272270786223 0.0277344303281817 0.333333333333333 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.653841652622872 0.756631411782112 0.0 0.0 0.0 7 6 3 4 +i1 544.2 13.9868938843515 507.02628494957 325.349731044641 851.765595874871 0.392071490408751 1.568285961635 124.283597259053 0.0 7.28197069759547 1.35960761474257 7.09461704577191 0.0290053638933855 0.333333333333333 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.151776741251332 0.988414802001228 0.0 0.0 0.0 7 6 3 4 +i1 544.2 2.84177760604969 423.535808051102 526.41586483023 1378.15673412554 0.335603390492038 1.34241356196815 201.090860365148 0.0 6.73032035693565 0.946311942814547 1.13671104241988 0.0232579643486208 0.333333333333333 0.06 0.0 0.0 0.0 0.0 0.0 0.37446861885629 0.927239587966272 0.0 0.0 0.0 0.0 7 6 3 4 +i1 544.513793103448 3.03207110481027 479.569328975657 381.95302843016 999.95302843016 0.373652614235517 1.49461045694207 145.906056860321 0.0 7.11266601249762 1.00967967790182 1.21282844192411 0.0270970856380866 0.333333333333333 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.847539159002055 0.530732864968893 0.0 0.0 0.0 7 6 3 4 +i1 544.706896551724 3.1331833577807 470.328394438652 402.930175575755 1054.87119965733 0.367421344005192 1.46968537602077 153.919327069938 0.0 7.05310878457934 1.04335005814097 1.25327334311228 0.0264586978851749 0.333333333333333 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.527430427514229 0.849598225123003 0.0 0.0 0.0 7 6 3 4 +i1 545.213793103448 2.88773699003756 507.02628494957 325.349731044641 851.765595874871 0.392071490408751 1.568285961635 124.283597259053 0.0 7.28197069759547 0.961616417682508 1.15509479601502 0.0290053638933855 0.333333333333333 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.901709121535229 0.432343220300915 0.0 0.0 7 6 3 4 +i1 545.286206896552 2.95514966854424 423.535808051102 526.41586483023 1378.15673412554 0.335603390492038 1.34241356196815 201.090860365148 0.0 6.73032035693565 0.984064839625231 1.1820598674177 0.0232579643486208 0.333333333333333 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.566720151497293 0.82391035306451 0.0 0.0 7 6 3 4 +i1 545.406896551724 2.95360703094958 461.045559003734 425.059403395186 1112.8055180886 0.361144909139656 1.44457963655863 162.372692096961 0.0 6.99192867849516 0.983551141306211 1.18144281237983 0.0258194447538013 0.333333333333333 0.06 0.0 0.0 0.0 0.0 0.0 0.445162202519112 0.0 0.0 0.895449950275465 0.0 0.0 7 6 3 4 +i1 545.720689655172 2.74767459732217 451.722644857788 448.403985024206 1173.92163279337 0.354823959351069 1.41929583740428 171.290322279247 0.0 6.92909111734061 0.914975640908284 1.09906983892887 0.0251795216065399 0.333333333333333 0.06 0.0 0.0 0.0 0.0 0.0 0.863232185466191 0.0 0.0 0.50480708590041 0.0 0.0 7 6 3 4 +i1 545.913793103448 2.63343565141745 507.02628494957 325.349731044641 851.765595874871 0.392071490408751 1.568285961635 124.283597259053 0.0 7.28197069759547 0.876934071922012 1.05337426056698 0.0290053638933855 0.333333333333333 0.06 0.0 0.0 0.0 0.0 0.0 0.824679016782221 0.565601024821481 0.0 0.0 0.0 0.0 7 6 3 4 +i1 546.420689655172 2.18931034482762 479.569328975657 381.95302843016 999.95302843016 0.373652614235517 1.49461045694207 145.906056860321 0.0 7.11266601249762 0.729040344827597 0.875724137931047 0.0270970856380866 0.333333333333333 0.06 0.0 0.0 0.0 0.0 0.0 0.278581075830704 0.960412715549418 0.0 0.0 0.0 0.0 7 6 3 4 +i1 548.4 10.9689370975312 629.518920947043 153.912098126513 249.029774768698 0.472715960875905 1.89086384350362 58.7944214843281 0.0 7.91512812508787 0.612558754964729 5.98529637960171 0.0377019228369478 0.333333333333333 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.997660570188092 0.0683621729611622 0.0 0.0 7 6 3 4 +i1 550.0 9.9316849659218 432.965241176763 499.009868144726 1306.40783480289 0.342052059654614 1.36820823861846 190.621769631285 0.0 6.79831581647286 1.28419925367904 4.75130955235746 0.0238985390179608 0.333333333333333 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.740698372109432 0.671837719657386 0.0 0.0 7 6 3 4 +i1 552.6 7.82165928679667 578.162373265378 212.124958338741 343.218182592083 0.439181581198788 1.75672632479515 81.0317340853991 0.0 7.6718137657976 0.559179283528587 4.1529001392491 0.0340225662459521 0.333333333333333 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.283162982695075 0.95907180400178 0.0 0.0 7 6 3 4 +i1 553.2 7.45954949836233 679.301430634373 111.674430652694 180.68922879606 0.504905989611254 2.01962395844502 42.6596325093293 0.0 8.12566121376759 0.320158181723336 4.16225152442891 0.0413064958418055 0.333333333333333 0.05 0.0 0.0 0.0 0.0 0.0 0.640427247682067 0.0 0.0 0.768018841192306 0.0 0.0 7 6 3 4 +i1 554.2 6.65820886405468 542.980086809307 262.706677005677 687.766080400863 0.415986052703258 1.66394421081303 100.353950616169 0.0 7.48733009281855 0.556686394803313 3.46029001645818 0.0315286866970051 0.333333333333333 0.05 0.0 0.0 0.0 0.0 0.0 0.960412715549418 0.0 0.0 0.278581075830704 0.0 0.0 7 6 3 4 +i1 558.4 2.60000000000005 711.711039811068 90.1725613513566 145.899204266495 0.525721030789763 2.10288412315905 34.4459184362182 0.0 8.25140807215534 0.0926825424275219 1.46893115368133 0.0436701322768886 0.333333333333333 0.05 0.0 0.0 0.0 0.0 0.0 0.737179162706139 0.675697330224025 0.0 0.0 0.0 0.0 7 6 3 4 + + + + ; HERE BEGINS T610 + +i99 560 145.5 2.0 2.5 -1 2 ; added 2 seconds + + +i1 560.0 2.24155471787774 711.998748177312 90.0 145.62 0.525905366478134 2.10362146591254 145.62 0.0 4.10362146591254 0.0797690826980116 1.26655029990773 0.0436911682492207 0.415243646538506 0.1 0.0 0.0 0.0 0.0 0.0 0.0 0.979862881115132 0.19967156585942 0.0 0.0 0.0 2 6 3 4 +i1 560.105978260869565 3.87095735675139 604.354467266373 180.343447584687 291.795698192024 0.456329404406116 1.82531761762446 291.795698192024 0.0 3.82531761762446 0.244694090780623 2.08530301215215 0.035893641561222 0.238494846850876 0.1 0.0 0.0 0.0 0.0 0.0 0.0 0.733639656317064 0.679538707270587 0.0 0.0 0.0 2 6 3 4 +i1 560.130434782608696 5.34400519023468 612.888336845481 170.954498168521 276.604378036667 0.461895824654044 1.84758329861618 276.604378036667 0.0 3.84758329861618 0.324115835171845 2.89173597613485 0.0365057515683368 0.172427285990596 0.1 0.0 0.0 0.0 0.0 0.0 0.0 0.313189040592021 0.949690804869169 0.0 0.0 0.0 2 6 3 4 +i1 560.171195652173913 6.7056389678007 638.220701932647 145.62 235.61316 0.478363526986209 1.91345410794484 235.61316 0.0 3.91345410794484 0.358273906482056 3.67435272622558 0.038329482051552 0.136979319126435 0.1 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.795602827508137 0.605818570911339 0.0 0.0 2 6 3 4 +i1 560.342391304347826 7.90922010117131 587.147887281498 200.696610658226 324.727116045009 0.445075426156271 1.78030170462508 324.727116045009 0.0 3.78030170462508 0.542417701046081 4.22090506821631 0.0346631319534721 0.114584795172499 0.1 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.375601183960091 0.926781393106151 0.0 0.0 2 6 3 4 +i1 560.407608695652174 9.10406193429372 595.774524263279 190.248045153337 307.821337058099 0.450722890277742 1.80289156111097 307.821337058099 0.0 3.80289156111097 0.59955356884302 4.88179950020151 0.0352794318061628 0.0990334698870002 0.1 0.0 0.0 0.0 0.0 0.0 0.615032411562642 0.0 0.0 0.788501827979772 0.0 0.0 2 6 3 4 +i1 560.513586956521739 10.2122660732139 654.89270206233 130.852298656922 211.7190192269 0.489158399989967 1.95663359995987 211.7190192269 0.0 3.95663359995987 0.500262049203254 5.63896460465497 0.0395348973105535 0.0875436327263116 0.1 0.0 0.0 0.0 0.0 0.0 0.961907109208383 0.0 0.0 0.27337650457633 0.0 0.0 2 6 3 4 +i1 560.53804347826087 11.3413359128132 569.752452051813 223.346786751345 361.375100963676 0.43365442107359 1.73461768429436 361.375100963676 0.0 3.73461768429436 0.842466622797122 5.99215726842411 0.0334243372789412 0.0786739592745751 0.1 0.0 0.0 0.0 0.0 0.0 0.707106781186548 0.707106781186548 0.0 0.0 0.0 0.0 2 6 3 4 +i1 560.578804347826087 12.4211956521739 621.376823037393 162.05435149135 262.203940713005 0.467423039013765 1.86969215605506 262.203940713005 0.0 3.86969215605506 0.722498909598584 6.75045028523334 0.0371157587739571 0.0715993349974727 0.1 0.0 0.0 0.0 0.0 0.0 0.0 0.947371065153513 0.320137571849818 0.0 0.0 0.0 2 6 3 4 +i1 561.0 3.78929141627599 620.964100815747 162.477237451842 262.88817019708 0.467154515396837 1.86861806158735 100.410932745238 0.0 3.86861806158735 0.220862196158137 2.05890956715411 0.0370860732747416 0.367067187749554 0.1 0.0 0.0 0.0 0.0 0.0 0.545719059450368 0.83796820235174 0.0 0.0 0.0 0.0 2 6 3 4 +i1 562.28169014084507 6.1747394838633 479.450237058961 382.216904 1000.643854672 0.373572414519151 1.4942896580766 236.210046672 0.0 3.4942896580766 0.669920862656183 3.06883228444298 0.0270888458165461 0.21082473737065 0.1 0.0 0.0 0.0 0.0 0.0 0.0 0.90128589500632 0.433224809380368 0.0 0.0 0.0 2 6 3 4 +i1 562.57746478873239 8.40571013235542 569.326102108582 223.929617262027 362.318120729959 0.433373931013169 1.73349572405268 138.388503467932 0.0 3.73349572405268 0.625604317508352 4.44000814811341 0.033394043594707 0.152422317565759 0.1 0.0 0.0 0.0 0.0 0.0 0.0 0.547246473177531 0.836971503454421 0.0 0.0 0.0 2 6 3 4 +i1 563.07042253521127 10.2978380697974 586.726186652032 201.220334817339 325.574501734455 0.444799084684512 1.77919633873805 124.354166917116 0.0 3.77919633873805 0.707619777021497 5.49433591011579 0.0346330378356634 0.121087014505174 0.1 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.867607125959757 0.497250314211917 0.0 0.0 2 6 3 4 +i1 565.14084507042254 10.8889011598828 309.115498844327 1000.6148061873 2619.60956259834 0.255687581907311 1.02275032762924 618.379950223749 0.0 3.02275032762924 2.15275725844062 4.56893175462845 0.0156848149977717 0.101290697337442 0.1 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.412852054997587 0.910798100944589 0.0 0.0 2 6 3 4 +i1 565.92957746478873 11.9722131329813 533.948148207867 277.326185917823 726.03995473286 0.409999288688799 1.6399971547552 171.387582897214 0.0 3.6399971547552 1.0404788360532 6.18560201969129 0.0308923075885241 0.0875436327263116 0.1 0.0 0.0 0.0 0.0 0.0 0.669263246403153 0.0 0.0 0.743025374407841 0.0 0.0 2 6 3 4 +i1 567.2112676056338 12.3916969979284 551.73389190187 249.201819153303 403.208543390045 0.421775655856973 1.68710262342789 154.006724236741 0.0 3.68710262342789 0.997353388590166 6.47576967018674 0.0321470050824437 0.0773868434546829 0.1 0.0 0.0 0.0 0.0 0.0 0.947371065153512 0.320137571849823 0.0 0.0 0.0 0.0 2 6 3 4 +i1 567.50704225352113 13.4929577464789 347.21965213663 807.955764561784 2115.22819162275 0.282664305732981 1.13065722293192 499.316662499183 0.0 3.13065722293192 2.35228703710703 5.92743554906711 0.0181632311325367 0.0695462271867977 0.1 0.0 0.0 0.0 0.0 0.0 0.454629935826364 0.890680426107207 0.0 0.0 0.0 0.0 2 6 3 4 +i1 568.0 3.97875598708979 578.474014398118 211.7190192269 342.561373109124 0.439386194093824 1.7575447763753 130.842353882224 0.0 3.75754477637529 1.3249257437009 1.3249257437009 0.0340447588684588 0.367067187749554 0.1 0.0 0.0 0.0 0.0 0.0 0.779092892604458 0.626908497863299 0.0 0.0 0.0 0.0 2 6 3 4 +i1 569.46478873239437 6.44421645155635 679.594340609654 111.46072162218 180.343447584687 0.50509457663439 2.02037830653756 68.8827259625072 0.0 4.02037830653756 2.14592407836827 2.14592407836827 0.0413278018953212 0.21082473737065 0.1 0.0 0.0 0.0 0.0 0.0 0.348558041073124 0.937287198249964 0.0 0.0 0.0 0.0 2 6 3 4 +i1 569.80281690140845 8.75916124648352 543.298638576031 262.203940713005 686.449916786647 0.416196955958848 1.66478782383539 162.042035360637 0.0 3.66478782383539 2.91680069507901 2.91680069507901 0.0315511610713428 0.152422317565759 0.1 0.0 0.0 0.0 0.0 0.0 0.0 0.78016353789743 0.625575618239207 0.0 0.0 0.0 2 6 3 4 +i1 570.3661971830986 10.7023093215569 711.998748177312 90.0 145.62 0.525905366478134 2.10362146591254 55.62 0.0 4.10362146591254 3.56386900407844 3.56386900407844 0.0436911682492207 0.121087014505174 0.1 0.0 0.0 0.0 0.0 0.0 0.0 0.248834419796655 0.968546039961169 0.0 0.0 0.0 2 6 3 4 +i1 572.7323943661972 11.1693435521001 489.095491794136 361.375100963676 946.080014322903 0.380059006120067 1.52023602448027 223.329812395552 0.0 3.52023602448027 3.71939140284932 3.71939140284932 0.0277572430347123 0.101290697337442 0.1 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.692548382984986 0.721371428062466 0.0 0.0 2 6 3 4 +i1 573.6338028169014 12.2071818019463 507.351691265742 324.727116045009 850.135589805834 0.392288948176314 1.56915579270526 200.681357715816 0.0 3.56915579270526 4.06499154004813 4.06499154004813 0.0290280799087036 0.0875436327263116 0.1 0.0 0.0 0.0 0.0 0.0 0.372473958185936 0.0 0.0 0.928042644749314 0.0 0.0 2 6 3 4 +i1 575.0985915492958 12.4929570346837 560.982845353137 235.61316 381.22209288 0.427879386267326 1.7115175450693 145.60893288 0.0 3.7115175450693 4.16015469254967 4.16015469254967 0.0328019004508914 0.0773868434546829 0.1 0.0 0.0 0.0 0.0 0.0 0.890680426107204 0.0 0.0 0.45462993582637 0.0 0.0 2 6 3 4 +i1 575.4366197183099 13.5633802816901 452.057326073969 447.545883663327 1171.67512343059 0.355051179841929 1.42020471936772 276.583356103936 0.0 3.42020471936772 4.51660563380282 4.51660563380282 0.0252024573300638 0.0695462271867977 0.1 0.0 0.0 0.0 0.0 0.0 0.718237302017147 0.695798230804828 0.0 0.0 0.0 0.0 2 6 3 4 +i1 581.0 3.97875598708979 433.013661344173 498.872651735417 807.175950507904 0.342085124289085 1.36834049715634 1306.04860224332 0.0 3.36834049715634 1.3249257437009 1.3249257437009 0.0239018342869357 0.367067187749554 0.1 0.0 0.0 0.0 0.0 0.0 0.957163611283976 0.289547614795595 0.0 0.0 0.0 0.0 2 6 3 4 +i1 582.4647887323944 6.44421645155635 497.966442365893 343.12380536704 555.174317083871 0.386009385973193 1.54403754389277 898.298122450911 0.0 3.54403754389277 2.14592407836827 2.14592407836827 0.0283738400381008 0.21082473737065 0.1 0.0 0.0 0.0 0.0 0.0 0.656253877288457 0.754540157012115 0.0 0.0 0.0 0.0 2 6 3 4 +i1 582.8028169014085 8.75916124648351 404.639284239736 585.664907481304 947.605820304749 0.322621628317973 1.29048651327189 1533.27072778605 0.0 3.29048651327189 2.91680069507901 2.91680069507901 0.0219812972378036 0.152422317565759 0.1 0.0 0.0 0.0 0.0 0.0 0.0 0.958035275615692 0.286650328232788 0.0 0.0 0.0 2 6 3 4 +i1 583.3661971830986 10.7023093215569 461.093412027422 424.94252168843 687.55700009188 0.361177308230308 1.44470923292123 1112.49952178031 0.0 3.44470923292123 3.56386900407844 3.56386900407844 0.0258227348164763 0.121087014505174 0.1 0.0 0.0 0.0 0.0 0.0 0.0 0.609175682324023 0.79303530064245 0.0 0.0 0.0 2 6 3 4 +i1 585.7323943661972 11.1693435521001 551.893622406894 248.961297222089 402.81937890534 0.421881183468316 1.68752473387327 651.780676127428 0.0 3.68752473387327 3.71939140284932 3.71939140284932 0.032158301344836 0.101290697337442 0.1 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.888143967065316 0.459565331335473 0.0 0.0 2 6 3 4 +i1 586.6338028169014 12.2071818019463 479.616751118098 381.848 617.830064 0.373684548827896 1.49473819531158 999.678064 0.0 3.49473819531158 4.06499154004813 4.06499154004813 0.0271003668083671 0.0875436327263116 0.1 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.412843304333135 0.910802067447861 0.0 0.0 2 6 3 4 +i1 588.0985915492958 12.4929570346837 525.145183345083 292.274781142605 472.900595888735 0.404151078108574 1.6166043124343 765.17537703134 0.0 3.6166043124343 4.16015469254967 4.16015469254967 0.0302736481287335 0.0773868434546829 0.1 0.0 0.0 0.0 0.0 0.0 0.695798230804816 0.0 0.0 0.71823730201716 0.0 0.0 2 6 3 4 +i1 588.4366197183099 13.5633802816901 534.109626639204 277.058519212821 448.280684086344 0.410106443317365 1.64042577326946 725.339203299164 0.0 3.64042577326946 4.51660563380282 4.51660563380282 0.0309036707977969 0.0695462271867977 0.1 0.0 0.0 0.0 0.0 0.0 0.908317821837858 0.418280688690895 0.0 0.0 0.0 0.0 2 6 3 4 +i1 594.0 3.97875598708979 309.115498844327 1000.6148061873 2619.60956259834 0.255687581907311 1.02275032762924 1618.99475641104 0.0 3.02275032762924 1.3249257437009 1.3249257437009 0.0156848149977717 0.367067187749554 0.1 0.0 0.0 0.0 0.0 0.0 0.880148497569861 0.0 0.0 0.474698453995287 0.0 0.0 2 6 3 4 +i1 597.2957746478873 5.84021635155467 533.948148207867 277.326185917823 726.03995473286 0.409999288688799 1.6399971547552 448.713768815037 0.0 3.6399971547552 1.94479204506771 1.94479204506771 0.0308923075885241 0.21082473737065 0.1 0.0 0.0 0.0 0.0 0.0 0.860142775889833 0.510053335529269 0.0 0.0 0.0 0.0 2 6 3 4 +i1 598.056338028169 7.73093982356542 551.73389190187 249.201819153303 403.208543390045 0.421775655856973 1.68710262342789 403.208543390045 0.0 3.68710262342789 2.57440296124728 2.57440296124728 0.0321470050824437 0.152422317565759 0.1 0.0 0.0 0.0 0.0 0.0 0.476453599822028 0.879199617388811 0.0 0.0 0.0 0.0 2 6 3 4 +i1 599.3239436619718 9.0035300641669 347.21965213663 807.955764561784 2115.22819162275 0.282664305732981 1.13065722293192 1307.27242706097 0.0 3.13065722293192 2.99817551136758 2.99817551136758 0.0181632311325367 0.121087014505174 0.1 0.0 0.0 0.0 0.0 0.0 0.0 0.824785702709663 0.565445439105956 0.0 0.0 0.0 2 6 3 4 +i1 604.6478873239437 7.10776407860912 497.801545211789 343.455297856971 899.16596978955 0.385898911027562 1.54359564411025 555.710671932579 0.0 3.54359564411025 2.36688543817684 2.36688543817684 0.0283623624584608 0.101290697337442 0.1 0.0 0.0 0.0 0.0 0.0 0.0 0.313011421027813 0.949749361835084 0.0 0.0 0.0 2 6 3 4 +i1 606.6760563380282 6.61268968373079 603.937319486719 180.814059520425 292.557148304048 0.456057056751216 1.82422822700486 292.557148304048 0.0 3.82422822700486 2.20202566468235 2.20202566468235 0.0358637511128619 0.0875436327263116 0.1 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.69254316644671 0.721376436133011 0.0 0.0 2 6 3 4 +i1 609.9718309859155 4.51872914020474 460.925385449698 425.353059378875 1113.57430945389 0.361063543102754 1.44425417241101 688.221250075019 0.0 3.44425417241102 1.50473680368818 1.50473680368818 0.0258111826451242 0.0773868434546829 0.1 0.0 0.0 0.0 0.0 0.0 0.418280688690953 0.0 0.0 0.908317821837831 0.0 0.0 2 6 3 4 +i1 610.7323943661972 4.26760563380282 637.812254073956 146.0 236.228 0.47809864735312 1.91239458941248 236.228 0.0 3.91239458941248 1.42111267605634 1.42111267605634 0.038300000428719 0.0695462271867977 0.1 0.0 0.0 0.0 0.0 0.0 0.930474229128564 0.0 0.0 0.366357351403796 0.0 0.0 2 6 3 4 +i1 612.0 4.2812883293879 404.467738156478 1534.75202323493 586.230719341074 0.645006823452219 1.29001364690444 223.94013478829 0.0 3.29001364690444 0.642193249408185 3.21096624704092 0.0219697513163385 0.30021334189347 0.15 0.0 0.0 0.0 0.0 0.0 0.636907391451222 0.0 0.0 0.77094031851681 0.0 0.0 2 6 3 4 +i1 612.7065217391304 6.20267122495464 423.413804640485 1379.10884568502 526.779543806348 0.671039655744937 1.34207931148987 201.229785734025 0.0 3.34207931148987 1.08664910993415 4.32804564499288 0.0232496913513765 0.172427285990596 0.15 0.0 0.0 0.0 0.0 0.0 0.909700580274315 0.0 0.0 0.415264800155965 0.0 0.0 2 6 3 4 +i1 612.8695652173913 7.82669941626877 479.450237058961 1000.643854672 382.216904 0.747144829038301 1.4942896580766 146.006857328 0.0 3.4942896580766 1.42117488380732 5.37102937060712 0.0270888458165461 0.124661682827355 0.15 0.0 0.0 0.0 0.0 0.0 0.855748259755463 0.517392419663738 0.0 0.0 0.0 0.0 2 6 3 4 +i1 613.1413043478261 9.13421387677914 366.334588698751 1900.71742245407 726.01887794273 0.592109719164062 1.18421943832812 277.339211374123 0.0 3.18421943832812 1.76063993322179 6.0966750964216 0.0194236051549689 0.0990334698870002 0.15 0.0 0.0 0.0 0.0 0.0 0.516915436088436 0.856036466474123 0.0 0.0 0.0 0.0 2 6 3 4 +i1 614.2826086956522 9.64068792037229 385.430242060887 1707.96074595093 652.391423205093 0.618684411418004 1.23736882283601 249.213523664345 0.0 3.23736882283601 2.38789655252241 5.72651642734431 0.0206934716240528 0.0828426505153634 0.15 0.0 0.0 0.0 0.0 0.0 0.0 0.880507784360693 0.474031688476861 0.0 0.0 0.0 2 6 3 4 +i1 614.7173913043478 10.4142649675736 515.969604842962 807.979220031885 308.62460658208 0.796082202344728 1.59216440468946 117.894599714354 0.0 3.59216440468946 2.83808182131301 5.91724993970965 0.0296305085857606 0.0715993349974727 0.15 0.0 0.0 0.0 0.0 0.0 0.0 0.505917821049028 0.862581682129295 0.0 0.0 0.0 2 6 3 4 +i1 615.4239130434783 10.8158050311945 328.129947191086 2353.94817229534 899.139867186912 0.538395843671782 1.07679168734356 343.471429265401 0.0 3.07679168734356 3.44250394389821 5.71744437230292 0.0169157414583561 0.063292398959856 0.15 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.841993124783052 0.539488255495959 0.0 0.0 2 6 3 4 +i1 615.5869565217391 11.5660952121325 442.240592003287 1239.24984587268 473.35746595595 0.696753674564038 1.39350734912808 180.822551995173 0.0 3.39350734912808 3.81558085847421 6.01306173420106 0.0245308683266507 0.0568797919744227 0.15 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.366357351403727 0.930474229128591 0.0 0.0 2 6 3 4 +i1 615.8586956521739 12.1413043478261 620.964100815747 425.365407648921 162.477237451842 0.934309030793675 1.86861806158735 62.0663047066035 0.0 3.86861806158735 4.25176984120156 6.13927727072198 0.0370860732747416 0.0517649717608577 0.15 0.0 0.0 0.0 0.0 0.0 0.68430282476572 0.0 0.0 0.729197945703124 0.0 0.0 2 6 3 4 +i1 628.0 3.97875598708979 534.109626639204 725.339203299164 277.058519212821 0.820212886634729 1.64042577326946 105.836354339297 0.0 3.64042577326946 0.596813398063469 2.98406699031735 0.0309036707977969 0.367067187749554 0.15 0.0 0.0 0.0 0.0 0.0 0.260716319445175 0.0 0.0 0.965415455011448 0.0 0.0 2 6 3 4 +i1 629.4647887323944 6.44421645155635 507.073008078686 851.531379631668 325.260267238987 0.784205430063062 1.56841086012612 124.249422085293 0.0 3.56841086012612 1.18201124468153 4.40160624366877 0.0290086254080192 0.21082473737065 0.15 0.0 0.0 0.0 0.0 0.0 0.743952973335741 0.0 0.0 0.668231975787533 0.0 0.0 2 6 3 4 +i1 629.8028169014084 8.75916124648352 337.841054517244 2229.24443549085 851.506659851357 0.552120644492805 1.10424128898561 325.275544063219 0.0 3.10424128898561 1.68296104306452 5.85503776030278 0.0175489195080182 0.152422317565759 0.15 0.0 0.0 0.0 0.0 0.0 0.966279675525058 0.257494832311617 0.0 0.0 0.0 0.0 2 6 3 4 +i1 630.3661971830986 10.7023093215569 366.50717963952 1898.88290845776 725.318146851704 0.592350699212918 1.18470139842584 277.071532097351 0.0 3.18470139842584 2.22171900002489 6.90115094400948 0.019435034993153 0.121087014505174 0.15 0.0 0.0 0.0 0.0 0.0 0.622060956774908 0.782968815506905 0.0 0.0 0.0 0.0 2 6 3 4 +i1 632.7323943661972 11.1693435521001 423.584390221598 1377.77777224404 526.271112392681 0.671273329014532 1.34254665802906 201.035564934004 0.0 3.34254665802906 3.20892562007801 6.19233497010741 0.0232612587923678 0.101290697337442 0.15 0.0 0.0 0.0 0.0 0.0 0.0 0.897030951664042 0.441967727053348 0.0 0.0 0.0 2 6 3 4 +i1 633.6338028169014 12.2071818019463 395.130395234815 1617.479107552 617.830064 0.632117384839913 1.26423476967983 236.011084448 0.0 3.26423476967983 3.96924179077221 6.38918056842846 0.0213425161948275 0.0875436327263116 0.15 0.0 0.0 0.0 0.0 0.0 0.0 0.431629952553665 0.902050765787891 0.0 0.0 0.0 2 6 3 4 +i1 635.0985915492958 12.4929570346837 309.286710447877 2617.08119601914 999.649043552 0.5116193564112 1.0232387128224 381.865934636864 0.0 3.0232387128224 4.96726830381399 5.9549045184734 0.0156958451825096 0.0773868434546829 0.15 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.729197945703131 0.684302824765713 0.0 0.0 2 6 3 4 +i1 635.4366197183099 13.5633802816901 479.616751118097 999.678064 381.848 0.747369097655792 1.49473819531158 145.865936 0.0 3.49473819531158 5.64911432343633 6.32708404748206 0.0271003668083671 0.0695462271867977 0.15 0.0 0.0 0.0 0.0 0.0 0.398865782592277 0.0 0.0 0.917009317006676 0.0 0.0 2 6 3 4 +i1 636.0 6.8 442.340174010594 1238.54658485581 473.08884066303 0.696889286081252 1.3937785721625 180.719937133278 0.0 3.3937785721625 1.02 5.1 0.024537668936714 0.480449773592572 0.15 0.0 0.0 0.0 0.0 0.0 0.347658981189873 0.0 0.0 0.937621049677331 0.0 0.0 2 6 3 4 +i1 639.38 12.248 395.05953692041 1618.122968 618.076 0.632019417607193 1.26403883521439 236.105032 0.0 3.26403883521439 2.44460087556343 8.04351296513682 0.0213377654816299 0.275945932292243 0.15 0.0 0.0 0.0 0.0 0.0 0.986858625445379 0.161586055660928 0.0 0.0 0.0 0.0 2 6 3 4 +i1 640.16 17.904 470.307091552473 1055.00092491813 402.979726859483 0.734813919901555 1.46962783980311 153.938255660322 0.0 3.46962783980311 3.81698215669039 11.4030159737606 0.0264572285387776 0.199503715965179 0.15 0.0 0.0 0.0 0.0 0.0 0.0 0.981142813358199 0.193284194375944 0.0 0.0 0.0 2 6 3 4 +i1 641.46 22.832 375.988766225546 1800.74075135626 687.83069188551 0.605567019325829 1.21113403865166 262.751324300265 0.0 3.21113403865166 5.43283032745067 13.8174768083917 0.0200642937742821 0.158489319246111 0.15 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.917009317006648 0.398865782592341 0.0 0.0 2 6 3 4 +i1 646.92 23.08 318.710934485571 2481.81956785709 947.983028211263 0.525035615783064 1.05007123156613 362.129516776702 0.0 3.05007123156613 8.71182047893266 11.2705242607332 0.0163045032258519 0.132578160693599 0.15 0.0 0.0 0.0 0.0 0.0 0.62596000526975 0.0 0.0 0.779855160784806 0.0 0.0 2 6 3 4 +i1 649.0 6.71487603305785 328.253054101597 2352.32304946891 898.519117444198 0.538570145538911 1.07714029107782 343.234302863684 0.0 3.07714029107782 1.00723140495868 5.03615702479339 0.0169237493829048 0.574349177498518 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.45740785963838 0.889257021305447 0.0 0.0 2 6 3 4 +i1 654.3719008264463 5.25087419794245 347.343076706898 2113.76787671108 807.397966658166 0.565502128707892 1.13100425741578 308.42602326342 0.0 3.13100425741578 0.88630629471652 3.72784534918098 0.0181713337835612 0.329876977693224 0.05 0.0 0.0 0.0 0.0 0.0 0.267015069694941 0.0 0.0 0.963692353687527 0.0 0.0 2 6 3 4 +i1 655.6115702479339 8.32827413370918 337.791951621765 2229.85759581513 851.740869295313 0.552051372063029 1.10410274412606 325.36501207081 0.0 3.10410274412606 1.44456365836301 5.83822601133459 0.017545710419483 0.238494846850876 0.05 0.0 0.0 0.0 0.0 0.0 0.594641726484373 0.0 0.0 0.803990806616397 0.0 0.0 2 6 3 4 +i1 657.6776859504132 11.2597879940768 309.237947911611 2617.801032 999.924 0.51154980993464 1.02309961986928 381.970968 0.0 3.02309961986928 2.04374939136473 7.72838593180046 0.0156927035906633 0.1894645708138 0.05 0.0 0.0 0.0 0.0 0.0 0.802753076738805 0.0 0.0 0.596311577773216 0.0 0.0 2 6 3 4 +i1 666.355371900826 11.9601050277024 366.458025508551 1899.40520185968 725.517647769166 0.592282069263508 1.18456413852702 277.147741447821 0.0 3.18456413852702 2.62687004911846 7.51261106721877 0.0194317796704722 0.158489319246111 0.05 0.0 0.0 0.0 0.0 0.0 0.972556783944559 0.0 0.0 0.232665644226682 0.0 0.0 2 6 3 4 +i1 669.661157024793 13.5779790889887 356.900346837754 2003.72196188715 765.363621805636 0.578914733657398 1.1578294673148 292.368903529753 0.0 3.1578294673148 3.20688907283563 8.24562086240085 0.0188001680062192 0.136979319126435 0.05 0.0 0.0 0.0 0.0 0.0 0.860905297313014 0.508765239632575 0.0 0.0 0.0 0.0 2 6 3 4 +i1 675.03305785124 13.7812394041158 395.081430905728 1617.924 618.0 0.632049688024089 1.26409937604818 236.076 0.0 3.26409937604818 3.66267210453402 7.92212177653411 0.0213392333544138 0.121087014505174 0.05 0.0 0.0 0.0 0.0 0.0 0.645173504823748 0.764036091211299 0.0 0.0 0.0 0.0 2 6 3 4 +i1 676.272727272727 15.4839983301374 309.237947911611 2617.801032 999.924 0.51154980993464 1.02309961986928 381.970968 0.0 3.02309961986928 4.22885049920802 8.78892928767216 0.0156927035906633 0.108818820412016 0.05 0.0 0.0 0.0 0.0 0.0 0.281426250440919 0.959582860186011 0.0 0.0 0.0 0.0 2 6 3 4 +i1 678.338842975207 16.5057484744096 347.343076706898 2113.76787671108 807.397966658166 0.565502128707892 1.13100425741578 308.42602326342 0.0 3.13100425741578 4.71726412161003 9.17319812401979 0.0181713337835612 0.0990334698870002 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.8543472388497 0.519702602908522 0.0 0.0 0.0 2 6 3 4 +i1 687.01652892562 12.3963672251272 337.791951621765 2229.85759581513 851.740869295313 0.552051372063029 1.10410274412606 325.36501207081 0.0 3.10410274412606 4.28702061398075 6.30488701583471 0.017545710419483 0.091028210151304 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.606895264258263 0.794781817998432 0.0 0.0 0.0 2 6 3 4 +i1 690.322314049587 11.1931372014056 395.081430905728 1617.924 618.0 0.632049688024089 1.26409937604818 236.076 0.0 3.26409937604818 4.1625376318664 5.50385541478638 0.0213392333544138 0.0843454880117311 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.997202943377681 0.0747414859290971 0.0 0.0 2 6 3 4 +i1 695.694214876033 7.54512021897668 366.458025508551 1899.40520185968 725.517647769166 0.592282069263508 1.18456413852702 277.147741447821 0.0 3.18456413852702 3.15742810773312 3.51193414590182 0.0194317796704722 0.0786739592745751 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.779855160784786 0.625960005269774 0.0 0.0 2 6 3 4 +i1 696.933884297521 7.06611570247935 356.900346837754 2003.72196188715 765.363621805636 0.578914733657398 1.1578294673148 292.368903529753 0.0 3.1578294673148 3.03862777926233 3.24758526231399 0.0188001680062192 0.0737940458317425 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.457820181232977 0.889044814199939 0.0 0.0 2 6 3 4 + + + ; HERE BEGINS T754G + +i99 703 112.5 2.5 1.25 -1 1 + + +i1 703.0 6.825 395.081430905728 618.0 1617.924 0.316024844012045 1.26409937604818 999.924 0.0 3.26409937604818 2.0475 4.43625 0.0213392333544138 0.574349177498518 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.0824589821479948 0.996594459277753 0.0 0.0 0.0 2 6 3 4 +i1 708.46 3.77228064495938 356.900346837754 765.363621805636 2003.72196188715 0.289457366828699 1.1578294673148 1238.35834008152 0.0 3.1578294673148 1.15459143818038 2.33752488159789 0.0188001680062192 0.329876977693224 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.795675476248549 0.605723151692789 0.0 0.0 2 6 3 4 +i1 709.72 7.03333444104067 366.458025508551 725.517647769166 1899.40520185968 0.296141034631754 1.18456413852702 1173.88755409051 0.0 3.18456413852702 2.16268869485647 4.31044879901042 0.0194317796704722 0.238494846850876 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.497406700782887 0.867517477643121 0.0 0.0 2 6 3 4 +i1 711.82 10.6598210647672 309.237947911611 999.924 2617.801032 0.25577490496732 1.02309961986928 1617.877032 0.0 3.02309961986928 3.30316292435052 6.41395774302652 0.0156927035906633 0.1894645708138 0.05 0.0 0.0 0.0 0.0 0.0 0.396307079845943 0.0 0.0 0.918118019899393 0.0 0.0 2 6 3 4 +i1 711.82 0.823706896551724 366.458025508551 725.517647769166 1899.40520185968 0.296141034631754 1.18456413852702 1173.88755409051 0.0 3.18456413852702 0.247112068965517 0.53540948275862 0.0194317796704722 0.574349177498518 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.979862881115132 0.19967156585942 0.0 0.0 2 6 3 4 +i1 712.4789655172414 0.981587707502171 356.900346837754 765.363621805636 2003.72196188715 0.289457366828699 1.1578294673148 1238.35834008152 0.0 3.1578294673148 0.297887402423391 0.62074152027081 0.0188001680062192 0.329876977693224 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.733639656317064 0.679538707270587 0.0 0.0 2 6 3 4 +i1 712.8844827586207 1.80798928013863 376.010727604031 687.746114693411 1800.51932826735 0.302798790277036 1.21119516110814 1112.77321357394 0.0 3.21119516110814 0.552582199595858 1.12417770535151 0.0200657543073603 0.238494846850876 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.313189040592021 0.949690804869169 0.0 0.0 2 6 3 4 +i1 713.9489655172414 2.57398827582041 385.553421899788 651.941024081572 1706.78160104555 0.309427634935857 1.23771053974343 1054.84057696398 0.0 3.23771053974343 0.801470218182062 1.53098678404231 0.0207016970926654 0.1894645708138 0.06 0.0 0.0 0.0 0.0 0.0 0.605818570911339 0.0 0.0 0.795602827508137 0.0 0.0 2 6 3 4 +i1 714.1010344827586 3.61905562531709 328.253054101597 898.519117444198 2352.32304946891 0.269285072769456 1.07714029107782 1453.80393202471 0.0 3.07714029107782 1.12987484010518 2.13897974887187 0.0169237493829048 0.158489319246111 0.06 0.0 0.0 0.0 0.0 0.0 0.926781393106151 0.0 0.0 0.375601183960091 0.0 0.0 2 6 3 4 +i1 714.3544827586207 4.71242697990921 318.73280422363 947.866462109127 2481.51439780169 0.262533346189114 1.05013338475646 1533.64793569257 0.0 3.05013338475646 1.47775851923924 2.75592213904216 0.0163059190908507 0.136979319126435 0.06 0.0 0.0 0.0 0.0 0.0 0.788501827979772 0.615032411562642 0.0 0.0 0.0 0.0 2 6 3 4 +i1 715.0134482758621 5.58979594860281 318.73280422363 947.866462109127 2481.51439780169 0.262533346189114 1.05013338475646 1533.64793569257 0.0 3.05013338475646 1.77319527005132 3.18043549885219 0.0163059190908507 0.121087014505174 0.06 0.0 0.0 0.0 0.0 0.0 0.27337650457633 0.961907109208383 0.0 0.0 0.0 0.0 2 6 3 4 +i1 715.4189655172414 6.58536120751369 328.253054101597 898.519117444198 2352.32304946891 0.269285072769456 1.07714029107782 1453.80393202471 0.0 3.07714029107782 2.10386672071083 3.68406828395976 0.0169237493829048 0.108818820412016 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.707106781186548 0.707106781186548 0.0 0.0 0.0 2 6 3 4 +i1 716.4834482758621 6.88655172413793 385.553421899788 651.941024081572 1706.78160104555 0.309427634935857 1.23771053974343 1054.84057696398 0.0 3.23771053974343 2.24140440767836 3.68532373583618 0.0207016970926654 0.0990334698870002 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.947371065153513 0.320137571849819 0.0 0.0 2 6 3 4 +i1 720.64 12.3242038866188 328.253054101597 898.519117444198 2352.32304946891 0.269285072769456 1.07714029107782 1453.80393202471 0.0 3.07714029107782 3.9445528649899 6.86432562582079 0.0169237493829048 0.158489319246111 0.05 0.0 0.0 0.0 0.0 0.0 0.429847493202951 0.0 0.0 0.902901507689038 0.0 0.0 2 6 3 4 +i1 724.0 15.0148472254838 347.343076706898 807.397966658166 2113.76787671108 0.282751064353946 1.13100425741578 1306.36991005291 0.0 3.13100425741578 4.86536657472846 8.12052023471101 0.0181713337835612 0.136979319126435 0.05 0.0 0.0 0.0 0.0 0.0 0.794645456965135 0.0 0.0 0.60707379924081 0.0 0.0 2 6 3 4 +i1 729.46 16.1291259326861 337.791951621765 851.740869295313 2229.85759581513 0.276025686031514 1.10410274412606 1378.11672651982 0.0 3.10410274412606 5.33222620634296 8.31596510763032 0.017545710419483 0.121087014505174 0.05 0.0 0.0 0.0 0.0 0.0 0.948728514406457 0.316092084608454 0.0 0.0 0.0 0.0 2 6 3 4 +i1 730.72 19.0892271213905 309.237947911611 999.924 2617.801032 0.25577490496732 1.02309961986928 1617.877032 0.0 3.02309961986928 6.34007625026557 9.7341749068151 0.0156927035906633 0.108818820412016 0.05 0.0 0.0 0.0 0.0 0.0 0.64012300357469 0.768272438848692 0.0 0.0 0.0 0.0 2 6 3 4 +i1 732.82 21.2737347943146 366.458025508551 725.517647769166 1899.40520185968 0.296141034631754 1.18456413852702 1173.88755409051 0.0 3.18456413852702 7.12028235981609 10.6504877963664 0.0194317796704722 0.0990334698870002 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.947371065153513 0.320137571849819 0.0 0.0 0.0 2 6 3 4 +i1 741.64 16.36 356.900346837754 765.363621805636 2003.72196188715 0.289457366828699 1.1578294673148 1238.35834008152 0.0 3.1578294673148 5.65582027607708 7.58179225811375 0.0188001680062192 0.091028210151304 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.602774947395155 0.797911249947491 0.0 0.0 0.0 2 6 3 4 +i1 745.0 4.88938053097345 309.237947911611 999.924 2617.801032 0.25577490496732 1.02309961986928 2617.801032 0.0 3.02309961986928 1.95575221238938 1.95575221238938 0.0156927035906633 0.415243646538506 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.952702220018468 0.303905379965348 0.0 0.0 0.0 2 6 3 4 +i1 748.9115044247788 4.18986252876466 385.553421899788 651.941024081572 1706.78160104555 0.309427634935857 1.23771053974343 1706.78160104555 0.0 3.23771053974343 1.64096920181155 1.64096920181155 0.0207016970926654 0.238494846850876 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.756123978744478 0.65442839850332 0.0 0.0 0.0 2 6 3 4 +i1 749.8141592920354 7.90288167551043 290.352934708156 1112.77321357394 2913.24027313657 0.242256819420665 0.96902727768266 2913.24027313657 0.0 2.96902727768266 3.08015408922961 3.08015408922961 0.0144821218757436 0.172427285990596 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.477783202594493 0.87847778077681 0.0 0.0 0.0 2 6 3 4 +i1 751.3185840707965 12.2242444082742 235.09505718845 1533.64793569257 4015.09029564314 0.202077642759497 0.808310571037988 4015.09029564314 0.0 2.80831057103799 4.72591783842763 4.72591783842763 0.0110149414471278 0.136979319126435 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.933000809321676 0.359874269440173 0.0 0.0 2 6 3 4 +i1 751.3185840707965 0.522210309991058 299.775541820801 1054.84057696398 2761.57263049171 0.249014418737944 0.996057674951777 2761.57263049171 0.0 2.99605767495178 0.208884123996423 0.208884123996423 0.0150846010245668 0.415243646538506 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.907451873651976 0.420156038877842 0.0 0.0 0.0 2 6 3 4 +i1 751.7363523187893 1.10131069253332 280.977745218576 1173.88755409051 3073.23761660896 0.235507289870998 0.942029159483991 3073.23761660896 0.0 2.94202915948399 0.435217010520854 0.435217010520854 0.0138857869982667 0.238494846850876 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.633691393762179 0.773585947049031 0.0 0.0 0.0 2 6 3 4 +i1 751.9934404714003 2.06262894767218 290.352934708156 1112.77321357394 2913.24027313657 0.242256819420665 0.96902727768266 2913.24027313657 0.0 2.96902727768266 0.809054426702819 0.809054426702819 0.0144821218757436 0.172427285990596 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.980522826024047 0.196405161963264 0.0 0.0 2 6 3 4 +i1 752.6682968720041 3.08392647996027 318.73280422363 947.866462109126 2481.51439780169 0.262533346189114 1.05013338475646 2481.51439780169 0.0 3.05013338475646 1.18619826534535 1.18619826534535 0.0163059190908508 0.136979319126435 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.704500884560251 0.709703109513988 0.0 0.0 2 6 3 4 +i1 752.7647049292332 4.36952997051926 262.401284639812 1306.36991005291 3420.07642451853 0.222054338759956 0.888217355039825 3420.07642451853 0.0 2.88821735503983 1.67599695466909 1.67599695466909 0.012713672044777 0.114584795172499 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0664370875299003 0.997790616011468 0.0 0.0 2 6 3 4 +i1 752.9253850246151 5.76559264901591 271.657836065845 1238.35834008152 3242.02213433342 0.228771249776561 0.915084999106242 3242.02213433341 0.0 2.91508499910624 2.20119160669144 2.20119160669144 0.0132961254366895 0.0990334698870002 0.06 0.0 0.0 0.0 0.0 0.0 0.717584301713272 0.0 0.0 0.696471657667903 0.0 0.0 2 6 3 4 +i1 753.343153272608 7.09889252362122 235.09505718845 1533.64793569257 4015.09029564314 0.202077642759497 0.808310571037988 4015.09029564314 0.0 2.80831057103799 2.67756799497534 2.67756799497534 0.0110149414471278 0.0875436327263116 0.06 0.0 0.0 0.0 0.0 0.0 0.968541351962634 0.248852666327674 0.0 0.0 0.0 0.0 2 6 3 4 +i1 753.6002414252189 8.57684357547417 318.73280422363 947.866462109126 2481.51439780169 0.262533346189114 1.05013338475646 2481.51439780169 0.0 3.05013338475646 3.21098310823184 3.21098310823184 0.0163059190908508 0.0786739592745751 0.06 0.0 0.0 0.0 0.0 0.0 0.602774947395156 0.79791124994749 0.0 0.0 0.0 0.0 2 6 3 4 +i1 754.2750978258228 9.68065438656661 280.977745218576 1173.88755409051 3073.23761660896 0.235507289870998 0.942029159483991 3073.23761660896 0.0 2.94202915948399 3.55395468099363 3.55395468099363 0.0138857869982667 0.0715993349974727 0.06 0.0 0.0 0.0 0.0 0.0 0.0 0.872266915741584 0.489030088749828 0.0 0.0 0.0 2 6 3 4 +i1 757.6371681415929 15.6798537377631 337.791951621765 851.740869295313 2229.85759581513 0.276025686031514 1.10410274412606 2229.85759581513 0.0 3.10410274412606 5.85882196368395 5.85882196368395 0.017545710419483 0.114584795172499 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.94542764473876 0.32583211714581 0.0 0.0 2 6 3 4 +i1 760.0442477876106 20.0782956900828 309.237947911611 999.924 2617.801032 0.25577490496732 1.02309961986928 2617.801032 0.0 3.02309961986928 7.40557228906117 7.40557228906117 0.0156927035906633 0.0990334698870002 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.708865452779279 0.705343724616607 0.0 0.0 2 6 3 4 +i1 763.9557522123894 23.7966950769393 366.458025508551 725.517647769166 1899.40520185968 0.296141034631754 1.18456413852702 1899.40520185968 0.0 3.18456413852702 8.59387615145561 8.59387615145561 0.0194317796704722 0.0875436327263116 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.305994433668514 0.952033301184305 0.0 0.0 2 6 3 4 +i1 764.858407079646 28.9225206051797 356.900346837754 765.363621805636 2003.72196188715 0.289457366828699 1.1578294673148 2003.72196188715 0.0 3.1578294673148 10.394291482742 10.394291482742 0.0188001680062192 0.0786739592745751 0.05 0.0 0.0 0.0 0.0 0.0 0.576966357442 0.0 0.0 0.816767912188102 0.0 0.0 2 6 3 4 +i1 766.3628318584071 33.8292126934162 290.352934708156 1112.77321357394 2913.24027313657 0.242256819420665 0.96902727768266 2913.24027313657 0.0 2.96902727768266 12.0594588985974 12.0594588985974 0.0144821218757436 0.0715993349974727 0.05 0.0 0.0 0.0 0.0 0.0 0.881557057610253 0.0 0.0 0.472077487471658 0.0 0.0 2 6 3 4 +i1 772.6814159292035 34.6160074509296 385.553421899788 651.941024081572 1706.78160104555 0.309427634935857 1.23771053974343 1706.78160104555 0.0 3.23771053974343 11.926611096112 11.926611096112 0.0207016970926654 0.0658116828611607 0.05 0.0 0.0 0.0 0.0 0.0 0.872266915741584 0.489030088749828 0.0 0.0 0.0 0.0 2 6 3 4 +i1 775.0884955752212 37.9115044247788 328.253054101597 898.519117444198 2352.32304946891 0.269285072769456 1.07714029107782 2352.32304946891 0.0 3.07714029107782 12.8936117047168 12.8936117047168 0.0169237493829048 0.0609802005177442 0.05 0.0 0.0 0.0 0.0 0.0 0.530169379081395 0.847891755759217 0.0 0.0 0.0 0.0 2 6 3 4 +i1 779.0 6.40845070422536 269.236240663787 1255.7543481994 3287.56488358602 0.227016642559474 0.908066570237894 3287.56488358602 0.0 2.90806657023789 2.11478873239437 1.92253521126761 0.0131434389924313 0.25 0.05 0.0 0.0 0.0 0.0 0.0 0.825455587704661 0.564467069656993 0.0 0.0 0.0 0.0 2 6 3 4 +i1 784.1267605633803 3.93761603654939 269.236240663787 1255.7543481994 3287.56488358602 0.227016642559474 0.908066570237894 3287.56488358602 0.0 2.90806657023789 1.2994132920613 1.18128481096482 0.0131434389924313 0.25 0.05 0.0 0.0 0.0 0.0 0.0 0.442587731374017 0.896725208766432 0.0 0.0 0.0 0.0 2 6 3 4 +i1 785.3098591549296 6.33983331580109 278.540405746341 1190.37790002631 3116.40934226889 0.233748243877657 0.934992975510626 3116.40934226889 0.0 2.93499297551063 2.09214499421436 1.90194999474033 0.0137312715966323 0.25 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.826466174644009 0.56298637831594 0.0 0.0 0.0 2 6 3 4 +i1 787.2816901408451 8.41424841577481 335.301695822939 863.705815625479 2261.1818253075 0.274268279122607 1.09707311649043 2261.1818253075 0.0 3.09707311649043 2.77670197720569 2.52427452473244 0.017383060878728 0.25 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.369201517388004 0.929349363564852 0.0 0.0 0.0 2 6 3 4 +i1 795.5633802816901 6.75066221192774 325.767031261819 911.141187611786 2385.36762916766 0.267524357538657 1.07009743015463 2385.36762916766 0.0 3.07009743015463 2.22771852993615 2.02519866357832 0.016762131784634 0.25 0.05 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.744321472712687 0.667821492061177 0.0 0.0 2 6 3 4 +i1 798.7183098591549 6.38567348566207 306.765661361455 1013.9705691216 2654.57494996034 0.25401100796421 1.01604403185684 2654.57494996034 0.0 3.01604403185684 2.10727225026848 1.91570204569862 0.015533528248513 0.25 0.05 0.0 0.0 0.0 0.0 0.0 0.253664458607493 0.0 0.0 0.96729227353441 0.0 0.0 2 6 3 4 +i1 803.845070422535 3.49280336033048 316.252743576057 961.181745848749 2516.37381063202 0.260770443798132 1.04308177519253 2516.37381063202 0.0 3.04308177519253 1.15262510890906 1.04784100809914 0.0161454582806326 0.25 0.05 0.0 0.0 0.0 0.0 0.0 0.847891755759216 0.0 0.0 0.530169379081397 0.0 0.0 2 6 3 4 +i1 805.028169014085 2.97183098591549 344.850230899782 818.74 2143.46132 0.280998014192219 1.12399205676888 2143.46132 0.0 3.12399205676888 0.980704225352111 0.891549295774647 0.018007772931901 0.25 0.05 0.0 0.0 0.0 0.0 0.0 0.768281207615373 0.640112479198042 0.0 0.0 0.0 0.0 2 6 3 4 + + + ; HERE BEGINS END + +i99 805 146.5 1.25 1 -1 1 + +i1 805.0 9.69651898734177 395.081430905728 618.0 1617.877032 0.1 0.849505677872391 236.06491250319 0.0 1.34950567787239 3.23217299578059 1.93930379746835 0.02 0.415243646538506 0.1 0.0 0.0 0.0 0.0 0.0 0.767484305656071 0.0 0.0 0.641067734776613 0.0 0.0 2 6 5 4 +i1 812.75721518987342 4.94899162983368 280.977745218576 1173.88755409051 3073.14840115485 0.1 0.582651964827666 448.403985024206 0.0 1.08265196482767 1.64966387661123 0.989798325966736 0.02 0.238494846850876 0.1 0.0 0.0 0.0 0.0 0.0 0.843100534146369 0.0 0.0 0.537755975626592 0.0 0.0 2 6 5 4 +i1 814.5473417721519 8.74736815441072 309.237947911611 999.924 2617.725037776 0.1 0.648092494733902 381.953028430161 0.0 1.1480924947339 2.91578938480357 1.74947363088214 0.02 0.172427285990596 0.1 0.0 0.0 0.0 0.0 0.0 0.953140140100478 0.0 0.0 0.302529128067433 0.0 0.0 2 6 5 4 +i1 817.5308860759494 12.5834411626817 151.658478997159 2617.725037776 6853.0052017947 0.1 0.290142197361565 999.924 0.0 0.790142197361565 4.19448038756056 2.51668823253633 0.02 0.136979319126435 0.1 0.0 0.0 0.0 0.0 0.0 0.886901749280453 0.46195810104735 0.0 0.0 0.0 0.0 2 6 5 4 +i1 822.3045569620253 15.6091801990523 226.175784861801 1617.877032 4235.47911112157 0.1 0.457164599802126 618.0 0.0 0.957164599802126 5.20306006635078 3.12183603981047 0.02 0.114584795172499 0.1 0.0 0.0 0.0 0.0 0.0 0.577942399110452 0.81607755961701 0.0 0.0 0.0 0.0 2 6 5 4 +i1 834.8354430379747 13.6978498133698 253.216350128539 1378.11672651982 3607.80485315766 0.1 0.518836519605723 526.415864830231 0.0 1.01883651960572 4.56594993778993 2.73956996267396 0.02 0.0990334698870002 0.1 0.0 0.0 0.0 0.0 0.0 0.0 0.82586708367664 0.563864842049442 0.0 0.0 0.0 2 6 5 4 +i1 842.5926582278481 11.9403141189164 200.086373453748 1899.35006251845 4972.35411306854 0.1 0.398161580787621 725.517647769166 0.0 0.898161580787621 3.98010470630546 2.38806282378328 0.02 0.0875436327263116 0.1 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.874634887042333 0.48478223396536 0.0 0.0 2 6 5 4 +i1 844.3827848101266 13.0880459425292 175.176041266161 2229.79286350906 5837.4282524091 0.1 0.342334022188705 851.740869295313 0.0 0.842334022188705 4.36268198084308 2.61760918850585 0.02 0.0786739592745751 0.1 0.0 0.0 0.0 0.0 0.0 0.707106781186548 0.0 0.0 0.707106781186548 0.0 0.0 2 6 5 4 +i1 847.366329113924 12.633670886076 337.791951621765 851.740869295313 2229.79286350906 0.1 0.71466844651859 325.349731044642 0.0 1.21466844651859 4.21122362869199 2.52673417721519 0.02 0.0715993349974727 0.1 0.0 0.0 0.0 0.0 0.0 0.0 0.885188571198883 0.465232407962817 0.0 0.0 0.0 2 6 5 4 +i1 852.14 13.612625 366.458025508551 725.517647769166 1899.35006251845 0.1 0.781935526393559 277.134724984058 0.0 1.28193552639356 4.53754166666667 2.722525 0.02 0.415243646538506 0.1 0.0 0.0 0.0 0.0 0.0 0.760948141093145 0.0 0.0 0.648812705306306 0.0 0.0 2 6 5 4 +i1 863.0301 7.68938161675437 395.081430905728 618.0 1617.877032 0.1 0.849505677872391 236.06491250319 0.0 1.34950567787239 2.56312720558479 1.53787632335087 0.02 0.238494846850876 0.1 0.0 0.0 0.0 0.0 0.0 0.823504666134479 0.0 0.0 0.567309496531425 0.0 0.0 2 6 5 4 +i1 865.5432 13.7133515811591 280.977745218576 1173.88755409051 3073.14840115485 0.1 0.582651964827666 448.403985024206 0.0 1.08265196482767 4.57111719371971 2.74267031623183 0.02 0.172427285990596 0.1 0.0 0.0 0.0 0.0 0.0 0.9123505234866 0.0 0.0 0.409409968483582 0.0 0.0 2 6 5 4 +i1 869.7317 20.053469939962 309.237947911611 999.924 2617.725037776 0.1 0.648092494733902 381.953028430161 0.0 1.1480924947339 6.68448997998734 4.0106939879924 0.02 0.136979319126435 0.1 0.0 0.0 0.0 0.0 0.0 0.96835507767838 0.249576528412628 0.0 0.0 0.0 0.0 2 6 5 4 +i1 876.4333 25.6562028291649 151.658478997159 2617.725037776 6853.0052017947 0.1 0.290142197361565 999.924 0.0 0.790142197361565 8.55206760972164 5.13124056583298 0.02 0.114584795172499 0.1 0.0 0.0 0.0 0.0 0.0 0.778756897678438 0.627325827874362 0.0 0.0 0.0 0.0 2 6 5 4 +i1 876.4333 2.65392025862068 200.086373453748 1899.35006251845 4972.35411306854 0.1 0.398161580787621 725.517647769166 0.0 0.898161580787621 0.884640086206894 0.530784051724137 0.02 0.415243646538506 0.1 0.0 0.0 0.0 0.0 0.0 0.767484305656071 0.0 0.0 0.641067734776613 0.0 0.0 2 6 5 4 +i1 878.5564362068965 1.90839884209242 191.640958927981 2003.6637942519 5245.4395349031 0.1 0.379175619550752 765.363621805636 0.0 0.879175619550752 0.636132947364141 0.381679768418485 0.02 0.238494846850876 0.1 0.0 0.0 0.0 0.0 0.0 0.843100534146369 0.0 0.0 0.537755975626592 0.0 0.0 2 6 5 4 +i1 879.36525 3.35029625457599 208.662913934677 1800.46705956263 4713.48592643845 0.1 0.417500753025065 687.746114693411 0.0 0.917500753025065 1.116765418192 0.670059250915198 0.02 0.172427285990596 0.1 0.0 0.0 0.0 0.0 0.0 0.953140140100478 0.0 0.0 0.302529128067433 0.0 0.0 2 6 5 4 +i1 879.6685551724138 5.0682503192848 217.362214773843 1706.73205352772 4468.09480449951 0.1 0.437174718117283 651.941024081571 0.0 0.937174718117283 1.68941677309493 1.01365006385696 0.02 0.136979319126435 0.1 0.0 0.0 0.0 0.0 0.0 0.886901749280453 0.46195810104735 0.0 0.0 0.0 0.0 2 6 5 4 +i1 880.1740637931034 6.87377077295981 167.172190347767 2352.25476201598 6158.02419559593 0.1 0.324511903280457 898.519117444198 0.0 0.824511903280457 2.29125692431994 1.37475415459196 0.02 0.114584795172499 0.1 0.0 0.0 0.0 0.0 0.0 0.577942399110452 0.81607755961701 0.0 0.0 0.0 0.0 2 6 5 4 +i1 881.4883862068965 8.32037983319504 159.330671729858 2481.44235995057 6496.22750873125 0.1 0.307109812090359 947.866462109126 0.0 0.807109812090359 2.77345994439835 1.66407596663901 0.02 0.0990334698870002 0.1 0.0 0.0 0.0 0.0 0.0 0.0 0.82586708367664 0.563864842049442 0.0 0.0 0.0 2 6 5 4 +i1 883.6115224137931 9.02854238103847 151.658478997159 2617.725037776 6853.0052017947 0.1 0.290142197361565 999.924 0.0 0.790142197361565 3.00951412701282 1.80570847620769 0.02 0.0875436327263116 0.1 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.874634887042333 0.48478223396536 0.0 0.0 2 6 5 4 +i1 884.4203362068966 10.3529347910211 183.334860228201 2113.70651446561 5533.52301317588 0.1 0.360560714127464 807.397966658166 0.0 0.860560714127464 3.4509782636737 2.07058695820422 0.02 0.0786739592745751 0.1 0.0 0.0 0.0 0.0 0.0 0.707106781186548 0.0 0.0 0.707106781186548 0.0 0.0 2 6 5 4 +i1 884.7236413793103 12.0502586206897 175.176041266161 2229.79286350906 5837.4282524091 0.1 0.342334022188705 851.740869295313 0.0 0.842334022188705 4.01675287356322 2.41005172413793 0.02 0.0715993349974727 0.1 0.0 0.0 0.0 0.0 0.0 0.0 0.885188571198883 0.465232407962817 0.0 0.0 0.0 2 6 5 4 +i1 894.025 25.5500711349303 151.658478997159 2617.725037776 6853.0052017947 0.1 0.290142197361565 999.924 0.0 0.790142197361565 8.51669037831011 5.11001422698606 0.02 0.0990334698870002 0.1 0.0 0.0 0.0 0.0 0.0 0.0 0.652180950197413 0.758063327301618 0.0 0.0 0.0 2 6 5 4 +i1 904.9151 25.8188515226264 226.175784861801 1617.877032 4235.47911112157 0.1 0.457164599802126 618.0 0.0 0.957164599802126 8.60628384087548 5.16377030452529 0.02 0.0875436327263116 0.1 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.887331537747867 0.461132022438266 0.0 0.0 2 6 5 4 +i1 911.6167 31.9184211024106 200.086373453748 1899.35006251845 4972.35411306854 0.1 0.398161580787621 725.517647769166 0.0 0.898161580787621 10.6394737008035 6.38368422048212 0.02 0.0715993349974727 0.1 0.0 0.0 0.0 0.0 0.0 0.885188571198883 0.465232407962817 0.0 0.0 0.0 0.0 2 6 5 4 +i1 918.3183 30.6817 175.176041266161 2229.79286350906 5837.4282524091 0.1 0.342334022188705 851.740869295313 0.0 0.842334022188705 10.2272333333333 6.13634 0.02 0.0658116828611607 0.1 0.0 0.0 0.0 0.0 0.0 0.0 0.532808724475686 0.84623570187188 0.0 0.0 0.0 2 6 5 4 + +e + + + + + + diff -Nru csound-6.01~dfsg/nacl/csound/stria.html csound-6.02~dfsg/nacl/csound/stria.html --- csound-6.01~dfsg/nacl/csound/stria.html 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/nacl/csound/stria.html 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,36 @@ + + + + + Stria Example + + + + +
+

+

+
+
+ +
+ + + diff -Nru csound-6.01~dfsg/nacl/csound/test.csd csound-6.02~dfsg/nacl/csound/test.csd --- csound-6.01~dfsg/nacl/csound/test.csd 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/nacl/csound/test.csd 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,29 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +; This is a simple csound file to test your audio output ; +; from WinXound. In order to work correctly with WinXound ; +; it's very important that you fill all the required ; +; compiler paths fields into the WinXound Settings ; +; window with correct values (check Menu File > Settings). ; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + + + +-o test.wav -d + + +sr = 44100 +kr = 4410 +ksmps = 10 +nchnls = 2 + +instr 1 ;Simple sine at 440Hz +a1 oscili 10000,440, 1 +outs a1, a1 +endin + + + +f1 0 4096 10 1 +i1 0 30 + + \ No newline at end of file diff -Nru csound-6.01~dfsg/nacl/csound/trapped.csd csound-6.02~dfsg/nacl/csound/trapped.csd --- csound-6.01~dfsg/nacl/csound/trapped.csd 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/nacl/csound/trapped.csd 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,743 @@ + + +-odac -W -d + + +;============================================================================; +;============================================================================; +;============================================================================; +; == TRAPPED IN CONVERT == ; +; Richard Boulanger ; +;============================================================================; +;============================================================================; +; ORCHESTRA ; +;============================================================================; +;============================================================================; +;============================================================================; +; written July 1979 in music11 ; +; M.I.T. Experimental Music Studio ; +; revised June 1986 in Csound ; +; M.I.T. Media Lab ; +; revised July 1996 in SHARCsound ; +; Analog Devices Inc. ; +;============================================================================; +;============================================================================; +;=================================== HEADER =================================; +;============================================================================; +sr = 44100 +ksmps = 100 +nchnls = 2 +;============================================================================; +;=============================== INITIALIZATION =============================; +;============================================================================; +garvb init 0 +gadel init 0 +;============================================================================; +;================================== INSTRUMENTS =============================; +;============================================================================; +;==================================== IVORY =================================; +;============================================================================; + instr 1 ; p6 = amp +ifreq = cpspch(p5) ; p7 = vib rate + ; p8 = glis. del time (default < 1) +aglis expseg 1, p8, 1, p3 - p8, p9 ; p9 = freq drop factor + +k1 line 0, p3, 5 +k2 oscil k1, p7, 1 +k3 linseg 0, p3 * .7, p6, p3 * .3, 0 +a1 oscil k3, (ifreq + k2) * aglis, 1 + +k4 linseg 0, p3 * .6, 6, p3 * .4, 0 +k5 oscil k4, p7 * .9, 1, 1.4 +k6 linseg 0, p3 * .9, p6, p3 * .1, 0 +a3 oscil k6, ((ifreq + .009) + k5) * aglis, 9, .2 + +k7 linseg 9, p3 * .7, 1, p3 * .3, 1 +k8 oscil k7, p7 * 1.2, 1, .7 +k9 linen p6, p3 * .5, p3, p3 * .333 +a5 oscil k9, ((ifreq + .007) + k8) * aglis, 10, .3 + +k10 expseg 1, p3 * .99, 3.1, p3 * .01, 3.1 +k11 oscil k10, p7 * .97, 1, .6 +k12 expseg .001, p3 * .8, p6, p3 * .2, .001 +a7 oscil k12,((ifreq + .005) + k11) * aglis, 11, .5 + +k13 expseg 1, p3 * .4, 3, p3 * .6, .02 +k14 oscil k13, p7 * .99, 1, .4 +k15 expseg .001, p3 *.5, p6, p3 *.1, p6 *.6, p3 *.2, p6 *.97, p3 *.2, .001 +a9 oscil k15, ((ifreq + .003) + k14) * aglis, 12, .8 + +k16 expseg 4, p3 * .91, 1, p3 * .09, 1 +k17 oscil k16, p7 * 1.4, 1, .2 +k18 expseg .001, p3 *.6, p6, p3 *.2, p6 *.8, p3 *.1, p6 *.98, p3 *.1, .001 +a11 oscil k18, ((ifreq + .001) + k17) * aglis, 13, 1.3 + + outs a1 + a3 + a5, a7 + a9 + a11 + endin +;============================================================================; +;==================================== BLUE ==================================; +;============================================================================; + instr 2 ; p6 = amp +ifreq = cpspch(p5) ; p7 = reverb send factor + ; p8 = lfo freq +k1 randi 1, 30 ; p9 = number of harmonic +k2 linseg 0, p3 * .5, 1, p3 * .5, 0 ; p10 = sweep rate +k3 linseg .005, p3 * .71, .015, p3 * .29, .01 +k4 oscil k2, p8, 1,.2 +k5 = k4 + 2 + +ksweep linseg p9, p3 * p10, 1, p3 * (p3 - (p3 * p10)), 1 + +kenv expseg .001, p3 * .01, p6, p3 * .99, .001 +asig gbuzz kenv, ifreq + k3, k5, ksweep, k1, 15 + + outs asig, asig +garvb += (asig * p7) + endin +;============================================================================; +;================================== VIOLET ==================================; +;============================================================================; + instr 3 ; p6 = amp +ifreq = cpspch(p5) ; p7 = reverb send factor + ; p8 = rand freq +k3 expseg 1, p3 * .5, 30 ,p3 * .5, 2 +k4 expseg 10, p3 *.7, p8, p3 *.3, 6 +k8 linen p6, p3 * .333, p3, p3 * .333 +k13 line 0, p3, -1 + +k14 randh k3, k4, .5 +a1 oscil k8, ifreq + (p5 * .05) + k14 + k13, 1, .1 + +k1 expseg 1, p3 * .8, 6, p3 *.2, 1 +k6 linseg .4, p3 * .9, p8 * .96, p3 * .1, 0 +k7 linseg 8, p3 * .2, 10, p3 * .76, 2 + +kenv2 expseg .001, p3 * .4, p6 * .99, p3 * .6, .0001 +k15 randh k6, k7 +a2 buzz kenv2, ifreq + (p5 * .009) + k15 + k13, k1, 1, .2 + +kenv1 linen p6, p3 * .25, p3, p3 * .4 +k16 randh k4 * 1.4, k7 * 2.1, .2 +a3 oscil kenv1, ifreq + (p5 * .1) + k16 + k13, 16, .3 + +amix = a1 + a2 + a3 + outs a1 + a3, a2 + a3 +garvb += (amix * p7) + endin +;============================================================================; +;==================================== BLACK =================================; +;============================================================================; + instr 4 ; p6 = amp +ifreq = cpspch(p5) ; p7 = filtersweep strtfreq + ; p8 = filtersweep endfreq +k1 expon p7, p3, p8 ; p9 = bandwidth +anoise rand 8000 ; p10 = reverb send factor +a1 reson anoise, k1, k1 / p9, 1 +k2 oscil .6, 11.3, 1, .1 +k3 expseg .001,p3 * .001, p6, p3 * .999, .001 +a2 oscil k3, ifreq + k2, 15 + + outs (a1 * .8) + a2, (a1 * .6) + (a2 * .7) +garvb += (a2 * p10) + endin +;============================================================================; +;==================================== GREEN =================================; +;============================================================================; + instr 5 ; p6 = amp +ifreq = cpspch(p5) ; p7 = reverb send factor + ; p8 = pan direction +k1 line p9, p3, 1 ; ... (1.0 = L -> R, 0.1 = R -> L) +k2 line 1, p3, p10 ; p9 = carrier freq +k4 expon 2, p3, p12 ; p10 = modulator freq +k5 linseg 0, p3 * .8, 8, p3 * .2, 8 ; p11 = modulation index +k7 randh p11, k4 ; p12 = rand freq +k6 oscil k4, k5, 1, .3 + +kenv1 linen p6, .03, p3, .2 +a1 foscil kenv1, ifreq + k6, k1, k2, k7, 1 + +kenv2 linen p6, .1, p3, .1 +a2 oscil kenv2, ifreq * 1.001, 1 + +amix = a1 + a2 +kpan linseg int(p8), p3 * .7, frac(p8), p3 * .3, int(p8) + outs amix * kpan, amix * (1 - kpan) +garvb += (amix * p7) + endin +;============================================================================; +;================================== COPPER ==================================; +;============================================================================; + instr 6 ; p5 = FilterSweep StartFreq +ifuncl = 8 ; p6 = FilterSweep EndFreq + ; p7 = bandwidth +k1 phasor p4 ; p8 = reverb send factor +k2 table k1 * ifuncl, 19 ; p9 = amp +anoise rand 8000 +k3 expon p5, p3, p6 +a1 reson anoise, k3 * k2, k3 / p7, 1 + +kenv linen p9, .01, p3, .05 +asig = a1 * kenv + + outs asig, asig +garvb += (asig * p8) + endin +;============================================================================; +;==================================== PEWTER ================================; +;============================================================================; + instr 7 ; p4 = amp +ifuncl = 512 ; p5 = freq +ifreq = cpspch(p5) ; p6 = begin phase point + ; p7 = end phase point +a1 oscil 1, ifreq, p10 ; p8 = ctrl osc amp (.1 -> 1) +k1 linseg p6, p3 * .5, p7, p3 * .5, p6 ; p9 = ctrl osc func +a3 oscili p8, ifreq + k1, p9 ; p10 = main osc func (f2 or f3) +a4 phasor ifreq ; ...(function length must be 512!) +a5 table (a4 + a3) * ifuncl, p10 ; p11 = reverb send factor + +kenv linen p4, p3 * .4, p3, p3 * .5 +asig = kenv * ((a1 + a5) * .2) + + outs asig, asig +garvb += (asig * p11) + endin +;============================================================================; +;==================================== RED ===================================; +;============================================================================; + instr 8 ; p4 = amp +ifuncl = 16 ; p5 = FilterSweep StartFreq + ; p6 = FilterSweep EndFreq +k1 expon p5, p3, p6 ; p7 = bandwidth +k2 line p8, p3, p8 * .93 ; p8 = cps of rand1 +k3 phasor k2 ; p9 = cps of rand2 +k4 table k3 * ifuncl, 20 ; p10 = reverb send factor +anoise rand 8000 +aflt1 reson anoise, k1, 20 + (k4 * k1 / p7), 1 + +k5 linseg p6 * .9, p3 * .8, p5 * 1.4, p3 * .2, p5 * 1.4 +k6 expon p9 * .97, p3, p9 +k7 phasor k6 +k8 tablei k7 * ifuncl, 21 +aflt2 reson anoise, k5, 30 + (k8 * k5 / p7 * .9), 1 + +abal oscil 1000, 1000, 1 +a3 balance aflt1, abal +a5 balance aflt2, abal + +k11 linen p4, .15, p3, .5 +a3 = a3 * k11 +a5 = a5 * k11 + +k9 randh 1, k2 +aleft = ((a3 * k9) * .7) + ((a5 * k9) * .3) +k10 randh 1, k6 +aright = ((a3 * k10) * .3)+((a5 * k10) * .7) + outs aleft, aright +garvb += (a3 * p10) +endin +;============================================================================; +;==================================== SAND ==================================; +;============================================================================; + instr 9 ; p4 = delay send factor +ifreq = cpspch(p5) ; p5 = freq + ; p6 = amp +k2 randh p8, p9, .1 ; p7 = reverb send factor +k3 randh p8 * .98, p9 * .91, .2 ; p8 = rand amp +k4 randh p8 * 1.2, p9 * .96, .3 ; p9 = rand freq +k5 randh p8 * .9, p9 * 1.3 + +kenv linen p6, p3 *.1, p3, p3 * .8 + +a1 oscil kenv, ifreq + k2, 1, .2 +a2 oscil kenv * .91, (ifreq + .004) + k3, 2, .3 +a3 oscil kenv * .85, (ifreq + .006) + k4, 3, .5 +a4 oscil kenv * .95, (ifreq + .009) + k5, 4, .8 + +amix = a1 + a2 + a3 + a4 + + outs a1 + a3, a2 + a4 +garvb += (amix * p7) +gadel += (amix * p4) + endin +;============================================================================; +;==================================== TAUPE =================================; +;============================================================================; + instr 10 +ifreq = cpspch(p5) ; p5 = freq + ; p6 = amp +k2 randh p8, p9, .1 ; p7 = reverb send factor +k3 randh p8 * .98, p9 * .91, .2 ; p8 = rand amp +k4 randh p8 * 1.2, p9 * .96, .3 ; p9 = rand freq +k5 randh p8 * .9, p9 * 1.3 + +kenv linen p6, p3 *.1, p3, p3 * .8 + +a1 oscil kenv, ifreq + k2, 1, .2 +a2 oscil kenv * .91, (ifreq + .004) + k3, 2, .3 +a3 oscil kenv * .85, (ifreq + .006) + k4, 3, .5 +a4 oscil kenv * .95, (ifreq + .009) + k5, 4, .8 + +amix = a1 + a2 + a3 + a4 + + outs a1 + a3, a2 + a4 +garvb += (amix * p7) + endin +;============================================================================; +;==================================== RUST ==================================; +;============================================================================; + instr 11 ; p4 = delay send factor +ifreq = cpspch(p5) ; p5 = freq + ; p6 = amp +k1 expseg 1, p3 * .5, 40, p3 * .5, 2 ; p7 = reverb send factor +k2 expseg 10, p3 * .72, 35, p3 * .28, 6 +k3 linen p6, p3* .333, p3, p3 * .333 +k4 randh k1, k2, .5 +a4 oscil k3, ifreq + (p5 * .05) + k4, 1, .1 + +k5 linseg .4, p3 * .9, 26, p3 * .1, 0 +k6 linseg 8, p3 * .24, 20, p3 * .76, 2 +k7 linen p6, p3 * .5, p3, p3 * .46 +k8 randh k5, k6, .4 +a3 oscil k7, ifreq + (p5 * .03) + k8, 14, .3 + +k9 expseg 1, p3 * .7, 50, p3 * .3, 2 +k10 expseg 10, p3 * .3, 45, p3 * .7, 6 +k11 linen p6, p3 * .25, p3, p3 * .25 +k12 randh k9, k10, .5 +a2 oscil k11, ifreq + (p5 * .02) + k12, 1, .1 + +k13 linseg .4, p3 * .6, 46, p3 * .4, 0 +k14 linseg 18, p3 * .1, 50, p3 * .9, 2 +k15 linen p6, p3 * .2, p3, p3 * .3 +k16 randh k13, k14, .8 +a1 oscil k15, ifreq + (p5 * .01) + k16, 14, .3 + +amix = a1 + a2 + a3 + a4 + outs a1 + a3, a2 + a4 +garvb += (amix * p7) +gadel += (amix * p4) + endin +;============================================================================; +;==================================== TEAL ==================================; +;============================================================================; + instr 12 ; p6 = amp +ifreq = octpch(p5) ; p7 = FilterSweep StartFreq +ifuncl = 8 ; p8 = FilterSweep PeakFreq + ; p9 = bandwdth +k1 linseg 0, p3 * .8, 9, p3 * .2, 1 ; p10 = reverb send factor +k2 phasor k1 +k3 table k2 * ifuncl, 22 +k4 expseg p7, p3 * .7, p8, p3 * .3, p7 * .9 + +anoise rand 8000 + +aflt reson anoise, k4, k4 / p9, 1 +kenv1 expseg .001, p3 *.1, p6, p3 *.1, p6 *.5, p3 *.3, p6 *.8, p3 *.5,.001 +a3 oscil kenv1, cpsoct(ifreq + k3) + aflt * .8, 1 + + outs a3,(a3 * .98) + (aflt * .3) +garvb += (anoise * p10) + endin +;============================================================================; +;==================================== FOAM ==================================; +;============================================================================; + instr 13 ; p6 = amp +ifreq = octpch(p5) ; p7 = vibrato rate + ; p8 = glis. factor +k1 line 0, p3, p8 +k2 oscil k1, p7, 1 +k3 linseg 0, p3 * .7, p6, p3 * .3, 1 +a1 oscil k3, cpsoct(ifreq + k2), 1 + +k4 linseg 0, p3 * .6, p8 * .995, p3 * .4, 0 +k5 oscil k4, p7 * .9, 1, .1 +k6 linseg 0, p3 * .9, p6, p3 * .1, 3 +a2 oscil k6, cpsoct((ifreq + .009) + k5), 4, .2 + +k7 linseg p8 * .985, p3 * .7, 0, p3 * .3, 0 +k8 oscil k7, p7 * 1.2, 1, .7 +k9 linen p6, p3 * .5, p3, p3 * .333 +a3 oscil k6, cpsoct((ifreq + .007) + k8), 5, .5 + +k10 expseg 1, p3 * .8, p8, p3 * .2, 4 +k11 oscil k10, p7 * .97, 1, .6 +k12 expseg .001, p3 * .99, p6 * .97, p3 * .01, p6 * .97 +a4 oscil k12, cpsoct((ifreq + .005) + k11), 6, .8 + +k13 expseg .002, p3 * .91, p8 * .99, p3 * .09, p8 * .99 +k14 oscil k13, p7 * .99, 1, .4 +k15 expseg .001, p3 *.5, p6, p3 *.1, p6 *.6, p3 *.2, p6 *.97, p3 *.2, .001 +a5 oscil k15, cpsoct((ifreq + .003) + k14), 7, .9 + +k16 expseg p8 * .98, p3 * .81, .003, p3 * .19, .003 +k17 oscil k16, p7 * 1.4, 1, .2 +k18 expseg .001, p3 *.6, p6, p3 *.2, p6 *.8, p3 *.1, p6 *.98, p3 *.1, .001 +a6 oscil k18, cpsoct((ifreq + .001) + k17), 8, .1 + + outs a1 + a3 + a5, a2 + a4 + a6 + endin +;============================================================================; +;==================================== SMEAR =================================; +;============================================================================; + instr 98 +asig delay gadel, .08 + outs asig, asig +gadel = 0 + endin +;============================================================================; +;==================================== SWIRL =================================; +;============================================================================; + instr 99 ; p4 = panrate +k1 oscil .5, p4, 1 +k2 = .5 + k1 +k3 = 1 - k2 +asig reverb garvb, 2.1 + outs asig * k2, (asig * k3) * (-1) +garvb = 0 + endin +;============================================================================; +;============================================================================; +;============================================================================; +;============================================================================; +instr 100 + ;k0,1,k2 cpumeter 0.3 + ; printk2 k0 + ; printk2 k1, 10 + ; printk2 k2, 20 +endin + + + +;============================================================================; +;============================================================================; +; == TRAPPED IN CONVERT == ; +; Richard Boulanger ; +;============================================================================; +;============================================================================; +; SCORE ; +;============================================================================; +;================================= PARAMETERS ===============================; +;============================================================================; +; i1: p6=amp,p7=vibrat,p8=glisdeltime (default < 1),p9=frqdrop ; +; i2: p6=amp,p7=rvbsnd,p8=lfofrq,p9=num of harmonics,p10=sweeprate ; +; i3: p6=amp,p7=rvbsnd,p8=rndfrq ; +; i4: p6=amp,p7=fltrswp:strtval,p8=fltrswp:endval,p9=bdwth,p10=rvbsnd ; +; i5: p6=amp,p7=rvbatn,p8=pan:1.0,p9=carfrq,p10=modfrq,p11=modndx,p12=rndfrq; +; i6: p5=swpfrq:strt,p6=swpfrq:end,p7=bndwth,p8=rvbsnd,p9=amp ; +; i7: p4=amp,p5=frq,p6=strtphse,p7=endphse,p8=ctrlamp(.1-1),p9=ctrlfnc ; +; p10=audfnc(f2,f3,f14,p11=rvbsnd ; +; i8: p4=amp,p5=swpstrt,p6=swpend,p7=bndwt,p8=rnd1:cps,p9=rnd2:cps,p10=rvbsnd; +; i9: p4=delsnd,p5=frq,p6=amp,p7=rvbsnd,p8=rndamp,p9=rndfrq ; +; i10: p4=0,p5=frq,p6=amp,p7=rvbsnd,p8=rndamp,p9=rndfrq ; +; i11: p4=delsnd,p5=frq,p6=amp,p7=rvbsnd ; +; i12: p6=amp,p7=swpstrt,p8=swppeak,p9=bndwth,p10=rvbsnd ; +; i13: p6=amp,p7=vibrat,p8=dropfrq ; +; i98: p2=strt,p3=dur ; +; i99: p4=pancps ; +;============================================================================; +;========================= FUNCTIONS ========================================; +;============================================================================; +f1 0 8192 10 1 +f2 0 512 10 10 8 0 6 0 4 0 1 +f3 0 512 10 10 0 5 5 0 4 3 0 1 +f4 0 2048 10 10 0 9 0 0 8 0 7 0 4 0 2 0 1 +f5 0 2048 10 5 3 2 1 0 +f6 0 2048 10 8 10 7 4 3 1 +f7 0 2048 10 7 9 11 4 2 0 1 1 +f8 0 2048 10 0 0 0 0 7 0 0 0 0 2 0 0 0 1 1 +f9 0 2048 10 10 9 8 7 6 5 4 3 2 1 +f10 0 2048 10 10 0 9 0 8 0 7 0 6 0 5 +f11 0 2048 10 10 10 9 0 0 0 3 2 0 0 1 +f12 0 2048 10 10 0 0 0 5 0 0 0 0 0 3 +f13 0 2048 10 10 0 0 0 0 3 1 +f14 0 512 9 1 3 0 3 1 0 9 .333 180 +f15 0 8192 9 1 1 90 +f16 0 2048 9 1 3 0 3 1 0 6 1 0 +f17 0 9 5 .1 8 1 +f18 0 17 5 .1 10 1 6 .4 +f19 0 16 2 1 7 10 7 6 5 4 2 1 1 1 1 1 1 1 1 +f20 0 16 -2 0 30 40 45 50 40 30 20 10 5 4 3 2 1 0 0 0 +f21 0 16 -2 0 20 15 10 9 8 7 6 5 4 3 2 1 0 0 +f22 0 9 -2 .001 .004 .007 .003 .002 .005 .009 .006 +;============================================================================; +;========================= SECTION I: 78 SECONDS ===========================; +;============================================================================; +i1 0.0 24.12 0 11.057 200 0.001 17.8 0.99 +i1 1.0 21.76 0 11.049 240 0.001 10.2 0.99 +i1 3.6 17.13 0 11.082 390 0.001 11.3 0.99 +i1 6.2 15.02 0 11.075 460 0.001 10.5 0.99 +i1 8.4 13.85 0 11.069 680 0.001 13.8 0.99 +i99 22.0 7.5 5 +i2 22.0 4 0 9.029 600 0.6 23 10 0.52 +i2 22.13 4 0 9.01 600 0.5 20 6 0.66 +i1 26.5 5.6 0 12.019 500 4.0 5.8 0.98 +i1 26.51 6.1 0 12.004 550 5.0 5.5 0.98 +i1 26.52 5.4 0 12.026 600 5.2 5.6 0.98 +i1 26.55 5 0 12.031 660 4.5 5.7 0.98 +i99 31.3 0.7 22 +i4 31.3 1 0 13.045 2200 6000 7000 30 0.5 +i99 32.0 4 11 +i2 32.0 4 0 14.107 900 0.4 19 13 0.21 +i2 32.14 4 0 11.023 750 0.7 21 9 0.19 +i2 32.19 4 0 11.029 589 0.97 20 10 0.22 +i4 35.0 1 0 12.029 1000 4600 6500 33 0.6 +i99 36.0 10 7 +i3 36.0 7.6 0 13.087 800 0.8 57 +i1 39.31 8.1 0 10.024 519 3.0 3.1 0.002 +i1 39.32 8 0 10.031 520 5.1 3.7 0.001 +i1 39.35 7.9 0 10.042 557 3.4 3.5 0.003 +i1 39.37 7.86 0 10.050 547 4.2 3.3 0.004 +i99 46.0 7.3 2 +i5 46.0 0.9 0 4.09 3500 0.2 0.1 3 10 12 27 +i5 49.2 1.1 0 3.07 4500 0.1 1.0 5 3 16 30 +i99 53.3 9.6 5 +i6 53.3 8.5 0.81 3000 17 10 0.6 1.6 +i98 62.9 15.1 +i99 62.9 15.1 3 +i9 62.9 2.9 0.4 4.113 600 0.2 6.2 320 +i9 62.93 2.85 0.43 4.115 640 0.23 6.1 300 +i9 67.1 7.9 0.2 5.004 700 0.4 4.5 289 +i9 67.14 7.78 0.17 5.007 700 0.43 4.4 280 +;s 80 +i100 0 78 +s +;============================================================================; +;========================= SECTION II: 49 SECONDS ===========================; +;============================================================================; +i98 0 48.5 +i99 0 4.5 1 +i9 0 5 0.4 10.01 1200 0.2 28 39 +i9 0 5 0.3 9.119 1200 0.4 29 37 +i3 0.5 6.5 0 12.067 600 0.6 47 +i99 4.5 2 7 +i6 4.5 4.3 17 6000 9000 100 0.4 0.9 +i99 6.5 9.9 0.7 +i7 6.5 3.2 9999 5.023 0.2 0.7 0.6 2 3 0.12 +i7 8 1.9 9800 5.039 0.01 0.9 1 3 2 0.23 +i7 9 3.8 9900 10.001 0.99 0.1 0.3 3 2 0.12 +i3 9.1 5.5 0 10.017 900 0.5 67 +i7 9.2 2.5 9890 5.052 0.1 1.0 0.7 2 3 0.23 +i8 11 4.6 4 20 8000 590 2 9.9 0.6 +i8 15.5 3.1 3 50 4000 129 8 2.6 0.3 +i8 16.2 4.3 2 10000 9000 200 12 17.9 1 +i99 16.4 10.3 0.3 +i7 16.4 3.5 8000 5.019 0.2 0.7 0.5 2 3 0.1 +i7 19.3 6.4 8000 5.041 0.01 0.9 1 3 2 0.1 +i9 20.2 4 0.4 9.021 1000 0.2 4 100 +i9 21 4.2 0.4 9.099 1100 0.4 4 167 +i9 21.1 8 0.4 9.043 1000 0.6 4 210 +i9 21.25 5 0.4 9.062 1200 0.9 5 200 +i99 26.7 5.3 11 +i9 26.7 1.9 0.5 4.114 3100 0.1 5.9 300 +i9 29.1 2.1 0.1 5.013 2900 0.2 4.2 390 +i99 32 6.2 0.28 +i9 32 9.1 0.34 5.051 2300 0.5 3.8 420 +i9 32.1 9.0 0.4 5.0517 2500 0.4 4 430 +i2 34.2 5 0 9.029 1900 0.3 23 10 0.42 +i2 34.23 5 0 9.01 2100 0.2 20 6 0.29 +i2 36 5 0 13.027 3500 0.5 27 9 0.38 +i2 36.05 5 0 12.119 3399 0.1 21 3 0.30 +i2 36.12 5 0 13.018 3709 0.4 17 12 0.33 +i99 38.2 10.8 2 +i2 38.2 7.3 0 8.062 5900 0.4 19 13 0.26 +i2 38.4 7 0 7.077 4730 0.6 26 21 0.23 +i4 38.9 3.1 0 10.001 2600 2000 3000 46 0.3 +i4 39.7 2.3 0 9.0119 1200 1000 2000 50 0.2 +i100 0 49 +s +;============================================================================; +;========================= SECTION III: 56 SECONDS ==========================; +;============================================================================; +i98 0 42 +i99 0 42 0.0618 +i9 0 7 0.6 11.031 1100 0.2 30 40 +i9 0.1 7 0.2 11.042 1100 0.9 26 37 +i9 0.3 6.2 0.9 11.049 1105 0.1 32 29 +i9 0.6 5.8 0.4 11.021 1110 0.6 41 34 +i11 3.7 8 0.2 5.02 2200 0.2 +i13 7.0 4.5 0.4 11.064 1500 40.0 7 +i9 9.3 9 0.8 7.098 1300 0.3 33 27 +i9 9.8 7 0.2 7.087 1400 0.7 39 31 +i2 10.9 4 0.2 8.113 5000 0.9 45 20 1 +i11 12 5 0.2 4.101 3300 0.3 +i2 12.9 5 0.2 9.108 5900 0.4 59 14 0.6 +i8 15 4.7 2.5 8600 8900 900 13 11.1 0.7 +i11 17.9 7 0.4 4.091 3000 0.1 +i9 22 7 0.6 10.031 1000 0.2 30 40 +i9 22.1 7 0.2 10.042 1000 0.9 26 37 +i9 22.3 6.2 0.9 10.049 1005 0.1 32 29 +i9 22.6 5.8 0.4 10.021 1010 0.6 41 34 +i11 25.2 5.3 0.3 5.111 2500 0.2 +i11 26.9 5.1 0.2 4.093 2330 0.1 +i13 27.1 4 0.4 12.064 2000 40 7 +i13 28.9 4 0.4 11.117 2000 30.0 5 +i9 29.3 9 0.8 8.098 1000 0.3 33 27 +i9 30.8 7 0.2 8.087 1200 0.7 39 31 +i9 31.2 7.2 0.9 8.071 1400 0.9 29 40 +i2 32.9 5 0.9 8.113 5000 0.8 45 20 1 +i8 33.1 7 2 5000 6000 1000 17 15 0.3 +i2 33.3 6 0.9 7.097 5100 0.5 51 18 0.3 +i11 34 5 0.3 4.111 2000 0.5 +i8 34.5 6 2 3000 100 500 8.3 9.8 0.1 +i2 34.9 6 0.9 9.108 2900 0.4 59 14 0.4 +i2 35 5 0.9 8.042 2800 0.6 39 20 0.3 +i11 36.1 5 0.5 3.119 1200 0.4 +i11 36.8 7 0.2 5.118 1800 0.4 +i11 38 6 0.2 4.031 2000 0.2 +i11 39 4 0.3 6.003 1300 0.1 +i99 42 3.6 8.3 +i4 42 1 9.6 13.061 3000 8000 20 10 0.9 +i4 42 0.99 9.6 13.013 3110 6000 30 6 0.3 +i4 42 1.01 9.6 12.119 2999 10000 25 15 0.7 +i5 43 1.1 9.6 3.106 2500 0.4 1.0 8 3 17 34 +i5 43.1 1 9.6 4.034 2500 0.2 0.1 2 7 19 29 +i99 45.6 4.9 3.2 +i5 45.6 3 3.2 4.022 2300 0.3 1.0 11 4 20 37 +i5 46.1 2.4 3.2 3.049 2400 0.2 0.1 5 8 19 27 +i99 50.5 5.5 8.3 +i4 50.5 0.7 11 11.059 3000 7000 40 9 0.9 +i4 50.5 0.7 11 10.038 3000 10000 20 20 0.7 +i4 50.5 0.71 11 13.077 3000 9500 25 5 0.8 +i4 50.52 0.64 11 12.016 3000 8500 18 14 0.5 +i5 51 1.5 11 4.011 2000 0.1 1.0 3 11 13 28 +i5 51 1.5 11 3.106 2000 0.4 0.1 7 5 15 34 +i100 0 56 +s +;============================================================================; +;========================= SECTION IV: 100 SECONDS =========================; +;============================================================================; +;========================= VARIABLE TEMPO ===================================; +t 0 60 40 60 45 30 49 40 52 90 55 100 58 160 59 200 61 230 65 270 78 40 +;============================================================================; +i99 0 1 2.8 +i4 0 1 6.8 12.013 3700 9000 40 17 0.5 +i4 0.01 1 6.8 12.061 3501 8500 30 20 0.3 +i4 0.02 1 6.8 11.119 3399 7780 32 22 0.8 +i4 0.03 1 6.8 12.042 3010 8600 41 27 0.45 +i99 1 3.4 9.8 +i12 1 3 6.8 5.06 1000 100 7000 16 0.2 +i12 1.03 2.9 6.8 5.02 1000 60 6000 30 0.2 +i99 4.4 3.6 4.8 +i12 4.4 2.6 6.8 11.09 2000 1000 200 5 0.1 +i99 8 2.1 7 +i4 8 0.9 11 10.013 3000 9000 40 17 0.9 +i4 8.1 0.9 11 10.061 3001 8500 30 20 0.8 +i4 8.2 0.9 11 10.119 2999 7780 32 22 0.7 +i99 10.1 1.1 21 +i12 10.1 0.6 11 11.02 1000 1500 300 4 0.2 +i99 11.2 6.8 2 +i10 11.2 6 0 4.092 3000 0.3 6.9 200 +i10 11.2 10 0 4.113 3000 0.1 7.2 278 +i12 13 1.6 0.3 10.01 3000 2000 500 5.2 0.2 +i10 13 1.6 0.4 9.012 3000 0.3 21 31 +i4 15 0.7 0.4 13.023 5000 9000 40 17 0.9 +i4 15 0.7 0.4 13.081 5001 8500 30 20 0.3 +i4 15 0.7 0.4 13.019 4999 7780 32 22 0.7 +i4 15 0.7 0.4 13.079 4550 9699 50 30 0.5 +i4 15.7 1 0.4 9.013 1101 9000 40 17 0.9 +i4 15.7 1 0.4 10.051 1051 8500 30 20 0.6 +i4 15.7 1 0.4 7.119 1111 7780 32 22 0.2 +i4 15.7 1 0.4 8.099 1100 10000 100 27 0.8 +i12 17 2 0.4 9.02 3000 3000 1000 4 0.3 +i99 18 3 9.3 +i10 18 5 0 11.09 900 0.4 23 33 +i10 18.1 5 0 11.08 900 0.4 20 40 +i10 18.3 5 0 11.073 900 0.4 30 27 +i10 18.6 5 0 11.068 900 0.4 33 33 +i10 19 10 0 11.001 500 0.8 8 200 +i10 20 9 0 11.022 500 0.8 9 300 +i10 20.4 8.6 0 11.091 500 0.8 5 223 +i99 21 56 0.15 +i10 21 18 0 11.115 500 0.8 6.4 311 +i10 21.6 17.4 0 12.041 500 0.8 7 276 +i10 21.9 2.9 0 5.002 2000 0.3 4.1 200 +i10 25.3 3.5 0 5.031 2300 0.5 3.6 160 +i10 30.9 3.9 0 5.017 2500 0.7 3 100 +i10 36.3 6.1 0 4.097 1770 0.8 4 200 +i10 42 34.09 0 4.0017 6000 0.19 4.1 310 +i8 45 26.9 0.79 190 500 11 1.9 2.7 0.1 +i8 49 22.9 0.80 10000 8000 300 11 12.6 0.2 +i8 52 19.1 0.85 7000 10000 16 4.1 4.8 0.3 +i8 55 16.9 0.91 500 190 10 2.9 1.3 0.2 +i8 58 13.9 0.98 40 9000 379 33 19 0.1 +i8 60 12.9 0.99 3600 11000 19 17 22 0.3 +i8 61 11.9 1.01 2000 3000 30 4 18.8 0.2 +i99 77 23 0.09 +i4 77 1.7 0.3 13.079 850 9699 50 30 0.8 +i10 77.1 2.14 0 13.03 600 0.5 60 26 +i10 77.6 2.3 0 13.02 800 0.6 62 24 +i10 78.3 9.9 0 5.004 900 0.2 4.1 160 +i10 78.7 9.8 0 5.001 800 0.3 1.4 220 +i2 80.4 9 0 7.077 930 0.8 26 21 0.23 +i2 80.7 8 0 8.077 830 0.7 24 19 0.13 +i4 81.9 1.9 0.7 11.079 950 7699 40 20 0.7 +i4 82 2.8 0.5 10.079 850 5699 60 40 0.5 +i10 82.11 5.3 0 3.053 1800 0.1 4.0 210 +i10 82.14 3.8 0 4.048 1100 0.2 71 33 +i10 82.32 3.1 0 5.049 1000 0.2 68 27 +i10 82.06 2.9 0 5.051 900 0.2 72 31 +i10 84.04 9.9 0 4.003 1800 0.1 4.1 160 +i10 84.06 9.8 0 4.002 1900 0.3 1.4 220 +i10 84.618 9.8 0 5.005 900 0.4 4.1 180 +i100 0 100 +e +;============================================================================; +;======================= TOTAL TIME: 283 SECONDS ============================; +;============================================================================; + + + + + + + + + + + 966 + 366 + 400 + 201 + true + + + 231 + 46 + 255 + + + slider1 + 5 + 5 + 20 + 100 + {86b9ad70-540b-4d5b-b0b9-07fa3da7466b} + true + 0 + -3 + 0.00000000 + 1.00000000 + 0.00000000 + lin + continuous + -1.00000000 + false + + + + + +Version: 3 +Render: Real +Ask: Yes +Functions: ioObject +Listing: Window +WindowBounds: 966 366 400 201 +CurrentView: io +IOViewEdit: On +Options: + + +ioView nobackground {59367, 11822, 65535} +ioSlider {5, 5} {20, 100} 0.000000 1.000000 0.000000 slider1 + diff -Nru csound-6.01~dfsg/nacl/csound/trapped.html csound-6.02~dfsg/nacl/csound/trapped.html --- csound-6.01~dfsg/nacl/csound/trapped.html 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/nacl/csound/trapped.html 2014-01-07 16:54:20.000000000 +0000 @@ -0,0 +1,34 @@ + + + + + Trapped Example + + + + +
+

+
+
+ +
+ + + diff -Nru csound-6.01~dfsg/po/american.po csound-6.02~dfsg/po/american.po --- csound-6.01~dfsg/po/american.po 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/po/american.po 2014-01-07 16:54:21.000000000 +0000 @@ -191,157 +191,157 @@ msgid "Not a proper list of ints" msgstr "" -#: Engine/csound_orc_compile.c:276 +#: Engine/csound_orc_compile.c:274 msgid "missing or extra arg" msgstr "" -#: Engine/csound_orc_compile.c:281 +#: Engine/csound_orc_compile.c:279 msgid "too many input args\n" msgstr "" -#: Engine/csound_orc_compile.c:464 +#: Engine/csound_orc_compile.c:462 #, c-format msgid "create_opcode: No rule to handle statement of type %d\n" msgstr "" -#: Engine/csound_orc_compile.c:633 Engine/csound_orc_compile.c:691 +#: Engine/csound_orc_compile.c:631 Engine/csound_orc_compile.c:690 #, c-format msgid "%s invalid sample rate" msgstr "" -#: Engine/csound_orc_compile.c:635 Engine/csound_orc_compile.c:693 +#: Engine/csound_orc_compile.c:633 Engine/csound_orc_compile.c:692 #, c-format msgid "%s invalid control rate" msgstr "" -#: Engine/csound_orc_compile.c:639 Engine/csound_orc_compile.c:689 +#: Engine/csound_orc_compile.c:637 Engine/csound_orc_compile.c:688 #, c-format msgid "%s invalid ksmps value" msgstr "" -#: Engine/csound_orc_compile.c:641 Engine/csound_orc_compile.c:695 +#: Engine/csound_orc_compile.c:639 Engine/csound_orc_compile.c:694 #, c-format msgid "%s inconsistent sr, kr, ksmps" msgstr "" -#: Engine/csound_orc_compile.c:643 +#: Engine/csound_orc_compile.c:641 #, c-format msgid "%s inconsistent sr, kr, ksmps \n" msgstr "" -#: Engine/csound_orc_compile.c:659 +#: Engine/csound_orc_compile.c:657 msgid "bad value for 0dbfs: must be positive. Setting default value." msgstr "" -#: Engine/csound_orc_compile.c:680 +#: Engine/csound_orc_compile.c:679 #, c-format msgid "sample rate overrides: esr = %7.4f, ekr = %7.4f, ksmps = %d\n" msgstr "" -#: Engine/csound_orc_compile.c:686 +#: Engine/csound_orc_compile.c:685 #, c-format msgid "" "sr = %.7g, kr = %.7g, ksmps = %.7g\n" "error:" msgstr "" -#: Engine/csound_orc_compile.c:832 +#: Engine/csound_orc_compile.c:842 #, c-format msgid "create_instrument: instr num %ld\n" msgstr "" -#: Engine/csound_orc_compile.c:921 +#: Engine/csound_orc_compile.c:934 msgid "-- deleted instr from deadpool \n" msgstr "" -#: Engine/csound_orc_compile.c:949 +#: Engine/csound_orc_compile.c:962 #, c-format msgid " -- free instr def %p \n" msgstr "" -#: Engine/csound_orc_compile.c:962 Engine/csound_orc_compile.c:973 +#: Engine/csound_orc_compile.c:975 Engine/csound_orc_compile.c:986 #, c-format msgid " -- added to deadpool slot %d \n" msgstr "" -#: Engine/csound_orc_compile.c:998 Engine/csound_orc_compile.c:1144 +#: Engine/csound_orc_compile.c:1011 Engine/csound_orc_compile.c:1158 #, c-format msgid "instr %ld redefined, replacing previous definition" msgstr "" -#: Engine/csound_orc_compile.c:1096 +#: Engine/csound_orc_compile.c:1109 #, c-format msgid "instr %s uses instrument number %d\n" msgstr "" -#: Engine/csound_orc_compile.c:1168 +#: Engine/csound_orc_compile.c:1183 #, c-format msgid "no active instances of instr %d \n" msgstr "" -#: Engine/csound_orc_compile.c:1213 +#: Engine/csound_orc_compile.c:1228 msgid "!!! csound->opcodeInfo is NULL !!!\n" msgstr "" -#: Engine/csound_orc_compile.c:1249 +#: Engine/csound_orc_compile.c:1264 #, c-format msgid " merging constants %d) %f\n" msgstr "" -#: Engine/csound_orc_compile.c:1258 +#: Engine/csound_orc_compile.c:1273 #, c-format msgid " merging %d) %s:%s\n" msgstr "" -#: Engine/csound_orc_compile.c:1281 +#: Engine/csound_orc_compile.c:1299 #, c-format msgid "merging instr %d \n" msgstr "" -#: Engine/csound_orc_compile.c:1289 +#: Engine/csound_orc_compile.c:1307 #, c-format msgid "merging instr %s \n" msgstr "" -#: Engine/csound_orc_compile.c:1452 Engine/csound_orc_compile.c:1480 -#: Engine/csound_orc_compile.c:1503 +#: Engine/csound_orc_compile.c:1471 Engine/csound_orc_compile.c:1499 +#: Engine/csound_orc_compile.c:1522 msgid "invalid name for instrument" msgstr "" -#: Engine/csound_orc_compile.c:1485 Engine/csound_orc_compile.c:1508 +#: Engine/csound_orc_compile.c:1504 Engine/csound_orc_compile.c:1527 #, c-format msgid "instr %s redefined" msgstr "instr %s redefined" -#: Engine/csound_orc_compile.c:1530 +#: Engine/csound_orc_compile.c:1549 #, c-format msgid "ERROR: Could not find OPCODINFO for opname: %s\n" msgstr "ERROR: Couldn't find OPCODINFO for opname: %s\n" -#: Engine/csound_orc_compile.c:1551 +#: Engine/csound_orc_compile.c:1570 #, c-format msgid "Unknown TREE node of type %d found in root.\n" msgstr "" -#: Engine/csound_orc_compile.c:1560 +#: Engine/csound_orc_compile.c:1579 #, c-format msgid "%d syntax errors in orchestra. compilation invalid\n" msgstr "" -#: Engine/csound_orc_compile.c:1600 +#: Engine/csound_orc_compile.c:1620 msgid "perf-pass statements illegal in header blk\n" msgstr "" -#: Engine/csound_orc_compile.c:1772 +#: Engine/csound_orc_compile.c:1792 msgid "i[fixme] pset args != pmax" msgstr "" -#: Engine/csound_orc_compile.c:1894 +#: Engine/csound_orc_compile.c:1922 #, c-format msgid "Missing local arg: %s\n" msgstr "" -#: Engine/csound_orc_compile.c:2025 +#: Engine/csound_orc_compile.c:2054 #, c-format msgid "Opcode \"%s\" is deprecated\n" msgstr "" @@ -418,46 +418,46 @@ msgid "Variable type for %s could not be determined.\n" msgstr "" -#: Engine/csound_orc_semantics.c:1300 +#: Engine/csound_orc_semantics.c:1301 #, c-format msgid "Unable to find opcode with name: %s\n" msgstr "" -#: Engine/csound_orc_semantics.c:1315 +#: Engine/csound_orc_semantics.c:1316 #, c-format msgid "Unable to find opcode entry for '%s' with matching argument types:\n" msgstr "" -#: Engine/csound_orc_semantics.c:1318 +#: Engine/csound_orc_semantics.c:1319 #, c-format msgid "Found: %s %s %s\n" msgstr "" -#: Engine/csound_orc_semantics.c:1320 +#: Engine/csound_orc_semantics.c:1321 #, c-format msgid "Line: %d Loc: %d\n" msgstr "" -#: Engine/csound_orc_semantics.c:1454 +#: Engine/csound_orc_semantics.c:1455 #, c-format msgid "expression for until statement not a boolean expression, line %d\n" msgstr "" -#: Engine/csound_orc_semantics.c:1607 +#: Engine/csound_orc_semantics.c:1608 #, c-format msgid "" "\n" "error: %s (token \"%s\")" msgstr "" -#: Engine/csound_orc_semantics.c:1609 +#: Engine/csound_orc_semantics.c:1610 #, c-format msgid "" " line %d:\n" ">>>" msgstr "" -#: Engine/csound_orc_semantics.c:2141 +#: Engine/csound_orc_semantics.c:2142 #, c-format msgid "insufficient required arguments for opcode %s on line %d:%d\n" msgstr "" @@ -472,239 +472,239 @@ msgid "Creating search path cache for '%s':" msgstr "" -#: Engine/envvar.c:729 +#: Engine/envvar.c:731 msgid "Current directory path name too long\n" msgstr "" -#: Engine/envvar.c:1003 +#: Engine/envvar.c:1005 #, c-format msgid "internal error: csoundFileOpen(): invalid type: %d" msgstr "" -#: Engine/envvar.c:1193 +#: Engine/envvar.c:1195 #, c-format msgid "internal error: csoundCreateFileHandle(): invalid type: %d" msgstr "" -#: Engine/fgens.c:91 +#: Engine/fgens.c:99 msgid "unknown GEN number" msgstr "" -#: Engine/fgens.c:133 +#: Engine/fgens.c:141 msgid "ftable does not exist" msgstr "ftable doesn't exist" -#: Engine/fgens.c:138 +#: Engine/fgens.c:146 #, c-format msgid "ftable %d now deleted\n" msgstr "" -#: Engine/fgens.c:153 Engine/fgens.c:1612 Engine/fgens.c:1698 -#: Engine/fgens.c:1777 Engine/fgens.c:1893 Engine/fgens.c:1974 -#: Engine/fgens.c:3023 +#: Engine/fgens.c:161 Engine/fgens.c:1630 Engine/fgens.c:1716 +#: Engine/fgens.c:1795 Engine/fgens.c:1911 Engine/fgens.c:1992 +#: Engine/fgens.c:3043 msgid "insufficient gen arguments" msgstr "" -#: Engine/fgens.c:179 Opcodes/ftgen.c:117 +#: Engine/fgens.c:187 Opcodes/ftgen.c:117 #, c-format msgid "Named gen \"%s\" not defined" msgstr "" -#: Engine/fgens.c:187 +#: Engine/fgens.c:195 msgid "illegal gen number" msgstr "" -#: Engine/fgens.c:195 +#: Engine/fgens.c:203 msgid "deferred size for GENs 1, 23, 28 or 49 only" msgstr "" -#: Engine/fgens.c:198 Engine/fgens.c:250 +#: Engine/fgens.c:206 Engine/fgens.c:258 #, c-format msgid "ftable %d:\n" msgstr "" -#: Engine/fgens.c:223 Engine/fgens.c:2301 Engine/fgens.c:2880 +#: Engine/fgens.c:231 Engine/fgens.c:2320 Engine/fgens.c:2899 msgid "illegal table length" msgstr "" -#: Engine/fgens.c:293 Engine/fgens.c:2262 +#: Engine/fgens.c:304 Engine/fgens.c:2281 #, c-format msgid "" "ftable %d relocating due to size change\n" " currently active instruments may find this disturbing" msgstr "" -#: Engine/fgens.c:351 Engine/fgens.c:472 Engine/fgens.c:556 Engine/fgens.c:637 -#: Engine/fgens.c:712 Engine/fgens.c:761 Engine/fgens.c:882 Engine/fgens.c:959 -#: Engine/fgens.c:1060 Engine/fgens.c:1104 Engine/fgens.c:1151 -#: Engine/fgens.c:1405 Engine/fgens.c:1467 Engine/fgens.c:1696 -#: Engine/fgens.c:1774 Engine/fgens.c:2129 Engine/fgens.c:2977 -#: Engine/fgens.c:3020 +#: Engine/fgens.c:362 Engine/fgens.c:483 Engine/fgens.c:567 Engine/fgens.c:648 +#: Engine/fgens.c:723 Engine/fgens.c:772 Engine/fgens.c:893 Engine/fgens.c:970 +#: Engine/fgens.c:1071 Engine/fgens.c:1115 Engine/fgens.c:1165 +#: Engine/fgens.c:1423 Engine/fgens.c:1485 Engine/fgens.c:1714 +#: Engine/fgens.c:1792 Engine/fgens.c:2147 Engine/fgens.c:2997 +#: Engine/fgens.c:3040 msgid "using extended arguments\n" msgstr "" -#: Engine/fgens.c:375 +#: Engine/fgens.c:386 msgid "no coefs present" msgstr "" -#: Engine/fgens.c:380 Engine/fgens.c:646 Engine/fgens.c:654 +#: Engine/fgens.c:391 Engine/fgens.c:657 Engine/fgens.c:665 msgid "illegal x interval" msgstr "" -#: Engine/fgens.c:409 Engine/fgens.c:558 Engine/fgens.c:639 Engine/fgens.c:884 -#: Engine/fgens.c:1362 Engine/fgens.c:2473 Engine/fgens.c:2781 -#: Engine/fgens.c:2922 Opcodes/ftest.c:128 Top/main.c:118 util/cvanal.c:67 +#: Engine/fgens.c:420 Engine/fgens.c:569 Engine/fgens.c:650 Engine/fgens.c:895 +#: Engine/fgens.c:1380 Engine/fgens.c:2492 Engine/fgens.c:2800 +#: Engine/fgens.c:2941 Opcodes/ftest.c:128 Top/main.c:119 util/cvanal.c:67 #: util/lpanal.c:401 util/pvanal.c:170 msgid "insufficient arguments" msgstr "" -#: Engine/fgens.c:413 Engine/fgens.c:1367 +#: Engine/fgens.c:424 Engine/fgens.c:1385 msgid "unknown srctable number" msgstr "" -#: Engine/fgens.c:426 +#: Engine/fgens.c:437 msgid "table size too large" msgstr "" -#: Engine/fgens.c:511 Engine/fgens.c:544 +#: Engine/fgens.c:522 Engine/fgens.c:555 msgid "gen call has negative segment size:" msgstr "" -#: Engine/fgens.c:513 +#: Engine/fgens.c:524 msgid "illegal input vals for gen call, beginning:" msgstr "" -#: Engine/fgens.c:579 +#: Engine/fgens.c:590 msgid "negative segsiz" msgstr "" -#: Engine/fgens.c:788 +#: Engine/fgens.c:799 msgid "nh partials < 1" msgstr "" -#: Engine/fgens.c:887 +#: Engine/fgens.c:898 msgid "illegal xint value" msgstr "" -#: Engine/fgens.c:890 +#: Engine/fgens.c:901 msgid "illegal xamp value" msgstr "" -#: Engine/fgens.c:963 +#: Engine/fgens.c:974 msgid "uneven number of args" msgstr "" -#: Engine/fgens.c:1088 +#: Engine/fgens.c:1099 msgid "gen call has illegal x-ordinate values:" msgstr "" -#: Engine/fgens.c:1106 +#: Engine/fgens.c:1117 msgid "wrong number of args" msgstr "" -#: Engine/fgens.c:1120 +#: Engine/fgens.c:1131 msgid "a range given exceeds table length" msgstr "" -#: Engine/fgens.c:1127 +#: Engine/fgens.c:1138 msgid "an input function does not exist" msgstr "an input function doesn't exist" -#: Engine/fgens.c:1260 +#: Engine/fgens.c:1274 msgid "No such window!" msgstr "" -#: Engine/fgens.c:1278 +#: Engine/fgens.c:1292 msgid "Wrong number of input arguments" msgstr "" -#: Engine/fgens.c:1279 +#: Engine/fgens.c:1293 msgid "unknown distribution" msgstr "" -#: Engine/fgens.c:1328 +#: Engine/fgens.c:1342 msgid "error opening ASCII file" msgstr "" -#: Engine/fgens.c:1334 +#: Engine/fgens.c:1352 #, c-format msgid "%ld elements in %s\n" msgstr "" -#: Engine/fgens.c:1346 +#: Engine/fgens.c:1364 msgid "Numbers after table full in GEN23" msgstr "" -#: Engine/fgens.c:1375 +#: Engine/fgens.c:1393 msgid "table size must be the same of source table" msgstr "" -#: Engine/fgens.c:1447 Engine/fgens.c:1507 +#: Engine/fgens.c:1465 Engine/fgens.c:1525 msgid "x coordinates must all be in increasing order:" msgstr "" -#: Engine/fgens.c:1450 Engine/fgens.c:1509 +#: Engine/fgens.c:1468 Engine/fgens.c:1527 msgid "x coordinate greater than function size:" msgstr "" -#: Engine/fgens.c:1454 +#: Engine/fgens.c:1472 msgid "illegal input val (y <= 0) for gen call, beginning:" msgstr "" -#: Engine/fgens.c:1527 +#: Engine/fgens.c:1545 msgid "GEN28 requires zero table length" msgstr "" -#: Engine/fgens.c:1596 +#: Engine/fgens.c:1614 msgid "could not open space file" msgstr "couldn't open space file" -#: Engine/fgens.c:1598 +#: Engine/fgens.c:1616 msgid "Time values must be in increasing order" msgstr "" -#: Engine/fgens.c:1619 +#: Engine/fgens.c:1637 msgid "GEN30: source ftable not found" msgstr "" -#: Engine/fgens.c:1702 +#: Engine/fgens.c:1720 msgid "GEN31: source ftable not found" msgstr "" -#: Engine/fgens.c:1810 +#: Engine/fgens.c:1828 #, c-format msgid "GEN32: source ftable %d not found" msgstr "" -#: Engine/fgens.c:1904 +#: Engine/fgens.c:1922 msgid "GEN33: source ftable not found" msgstr "" -#: Engine/fgens.c:2072 +#: Engine/fgens.c:2090 msgid "unknown source table number" msgstr "" -#: Engine/fgens.c:2104 +#: Engine/fgens.c:2122 msgid "Gen41: negative probability not allowed" msgstr "" -#: Engine/fgens.c:2170 Opcodes/fareygen.c:70 +#: Engine/fgens.c:2188 Opcodes/fareygen.c:70 #, c-format msgid "ftable %d: " msgstr "" -#: Engine/fgens.c:2214 +#: Engine/fgens.c:2232 #, c-format msgid "ftable %d:" msgstr "" -#: Engine/fgens.c:2257 +#: Engine/fgens.c:2275 #, c-format msgid "replacing previous ftable %d" msgstr "" -#: Engine/fgens.c:2297 Engine/fgens.c:2423 Engine/fgens.c:2451 -#: Engine/fgens.c:2458 Opcodes/gab/gab.c:590 Opcodes/gab/gab.c:645 +#: Engine/fgens.c:2316 Engine/fgens.c:2442 Engine/fgens.c:2470 +#: Engine/fgens.c:2477 Opcodes/gab/gab.c:592 Opcodes/gab/gab.c:647 #: Opcodes/midiops2.c:233 Opcodes/midiops2.c:388 Opcodes/midiops2.c:470 #: Opcodes/uggab.c:1625 Opcodes/uggab.c:1661 Opcodes/uggab.c:1683 #: Opcodes/uggab.c:1736 @@ -712,122 +712,122 @@ msgid "Invalid ftable no. %f" msgstr "" -#: Engine/fgens.c:2306 +#: Engine/fgens.c:2325 #, c-format msgid "deferred-size ftable %f illegal here" msgstr "" -#: Engine/fgens.c:2362 Engine/fgens.c:2961 +#: Engine/fgens.c:2381 Engine/fgens.c:2981 #, c-format msgid "Deferred load of '%s' failed" msgstr "" -#: Engine/fgens.c:2429 +#: Engine/fgens.c:2448 #, c-format msgid "Deferred-size ftable %f load not available at perf time." msgstr "" -#: Engine/fgens.c:2497 +#: Engine/fgens.c:2516 #, c-format msgid "non-deferred ftable %d needs size %d\n" msgstr "" -#: Engine/fgens.c:2544 Opcodes/loscilx.c:69 +#: Engine/fgens.c:2563 Opcodes/loscilx.c:69 #, c-format msgid "invalid sample format: %d" msgstr "" -#: Engine/fgens.c:2552 Engine/fgens.c:2805 +#: Engine/fgens.c:2571 Engine/fgens.c:2824 #, c-format msgid "channel %d illegal" msgstr "" -#: Engine/fgens.c:2558 +#: Engine/fgens.c:2577 msgid "deferred alloc\n" msgstr "" -#: Engine/fgens.c:2566 Engine/fgens.c:2878 +#: Engine/fgens.c:2585 Engine/fgens.c:2897 msgid "deferred size, but filesize unknown" msgstr "" -#: Engine/fgens.c:2569 Engine/fgens.c:2882 +#: Engine/fgens.c:2588 Engine/fgens.c:2901 #, c-format msgid " defer length %d\n" msgstr "" -#: Engine/fgens.c:2637 +#: Engine/fgens.c:2656 msgid "GEN1: input file truncated by ftable size" msgstr "" -#: Engine/fgens.c:2641 +#: Engine/fgens.c:2660 #, c-format msgid "\tlooping endpoint %d exceeds ftsize %d\n" msgstr "" -#: Engine/fgens.c:2657 +#: Engine/fgens.c:2676 msgid "GEN1 read error" msgstr "" -#: Engine/fgens.c:2662 +#: Engine/fgens.c:2681 msgid "GEN1: aiff file truncated by ftable size" msgstr "" -#: Engine/fgens.c:2663 +#: Engine/fgens.c:2682 #, c-format msgid "\taudio samps %d exceeds ftsize %d" msgstr "" -#: Engine/fgens.c:2707 +#: Engine/fgens.c:2726 msgid "wrong number of ftable arguments" msgstr "" -#: Engine/fgens.c:2717 OOps/pstream.c:379 +#: Engine/fgens.c:2736 OOps/pstream.c:379 msgid "Failed to load PVOC-EX file" msgstr "" -#: Engine/fgens.c:2728 InOut/midirecv.c:417 OOps/midiops.c:402 +#: Engine/fgens.c:2747 InOut/midirecv.c:419 OOps/midiops.c:402 #: OOps/midiops.c:452 OOps/midiops.c:464 msgid "illegal channel number" msgstr "" -#: Engine/fgens.c:2746 +#: Engine/fgens.c:2765 msgid "ftable size too small" msgstr "" -#: Engine/fgens.c:2821 Opcodes/mp3in.c:87 Opcodes/mp3in.c:255 +#: Engine/fgens.c:2840 Opcodes/mp3in.c:87 Opcodes/mp3in.c:255 #: Top/cscorfns.c:176 Top/cscorfns.c:207 msgid "Not enough memory\n" msgstr "" -#: Engine/fgens.c:2987 +#: Engine/fgens.c:3007 msgid "gen51: invalid number of p-fields (too few grades)" msgstr "" -#: Engine/fgens.c:3027 +#: Engine/fgens.c:3047 msgid "number of channels inconsistent with number of args" msgstr "" -#: Engine/fgens.c:3186 +#: Engine/fgens.c:3206 msgid "GEN53: invalid number of gen arguments" msgstr "" -#: Engine/fgens.c:3196 +#: Engine/fgens.c:3216 msgid "GEN53: invalid table length" msgstr "" -#: Engine/fgens.c:3200 +#: Engine/fgens.c:3220 msgid "GEN53: invalid source table number" msgstr "" -#: Engine/fgens.c:3203 +#: Engine/fgens.c:3223 msgid "GEN53: mode must be in the range 0 to 15" msgstr "" -#: Engine/fgens.c:3207 +#: Engine/fgens.c:3227 msgid "GEN53: invalid source table length" msgstr "" -#: Engine/fgens.c:3212 +#: Engine/fgens.c:3232 msgid "GEN53: invalid window table" msgstr "" @@ -851,21 +851,21 @@ msgid "Instrument %d muted\n" msgstr "" -#: Engine/insert.c:144 Engine/insert.c:374 +#: Engine/insert.c:144 Engine/insert.c:376 #, c-format msgid "cannot allocate last note because it exceeds 100%% of cpu time" msgstr "can't allocate last note because it exceeds 100%% of cpu time" -#: Engine/insert.c:150 Engine/insert.c:380 +#: Engine/insert.c:150 Engine/insert.c:382 msgid "cannot allocate last note because it exceeds instr maxalloc" msgstr "can't allocate last note because it exceeds instr maxalloc" -#: Engine/insert.c:168 Engine/insert.c:400 +#: Engine/insert.c:168 #, c-format msgid "new alloc for instr %s:\n" msgstr "" -#: Engine/insert.c:170 Engine/insert.c:402 +#: Engine/insert.c:170 #, c-format msgid "new alloc for instr %d:\n" msgstr "" @@ -880,147 +880,157 @@ msgid "instr %d uses %d p-fields but is given %d" msgstr "" -#: Engine/insert.c:345 Engine/insert.c:573 +#: Engine/insert.c:345 Engine/insert.c:575 #, c-format msgid "instr %s now active:\n" msgstr "" -#: Engine/insert.c:347 Engine/insert.c:575 +#: Engine/insert.c:347 Engine/insert.c:577 #, c-format msgid "instr %d now active:\n" msgstr "" -#: Engine/insert.c:389 +#: Engine/insert.c:391 #, c-format -msgid "activating instr %s\n" +msgid "MIDI activating instr %s\n" msgstr "" -#: Engine/insert.c:391 +#: Engine/insert.c:393 +#, c-format +msgid "MIDI activating instr %d\n" +msgstr "" + +#: Engine/insert.c:402 +#, c-format +msgid "new MIDI alloc for instr %s:\n" +msgstr "" + +#: Engine/insert.c:404 #, c-format -msgid "activating instr %d\n" +msgid "new MIDI alloc for instr %d:\n" msgstr "" -#: Engine/insert.c:416 +#: Engine/insert.c:418 #, c-format msgid "MIDI note overlaps with key %d on same channel" msgstr "" -#: Engine/insert.c:683 +#: Engine/insert.c:685 #, c-format msgid "removed instance of instr %s\n" msgstr "" -#: Engine/insert.c:685 +#: Engine/insert.c:687 #, c-format msgid "removed instance of instr %d\n" msgstr "" -#: Engine/insert.c:843 +#: Engine/insert.c:851 msgid "inactive allocs returned to freespace\n" msgstr "" -#: Engine/insert.c:869 +#: Engine/insert.c:877 #, c-format msgid "could not find playing instr %f\n" msgstr "couldn't find playing instr %f\n" -#: Engine/insert.c:882 +#: Engine/insert.c:890 msgid "" "\n" "INIT ERROR: " msgstr "" -#: Engine/insert.c:895 +#: Engine/insert.c:903 #, c-format msgid "INIT ERROR in instr %d (opcode %s): " msgstr "" -#: Engine/insert.c:898 +#: Engine/insert.c:906 #, c-format msgid "INIT ERROR in instr %d (subinstr %d): " msgstr "" -#: Engine/insert.c:902 +#: Engine/insert.c:910 #, c-format msgid "INIT ERROR in instr %d: " msgstr "" -#: Engine/insert.c:923 +#: Engine/insert.c:931 #, c-format msgid "PERF ERROR in instr %d (opcode %s): " msgstr "" -#: Engine/insert.c:926 +#: Engine/insert.c:934 #, c-format msgid "PERF ERROR in instr %d (subinstr %d): " msgstr "" -#: Engine/insert.c:930 +#: Engine/insert.c:938 #, c-format msgid "PERF ERROR in instr %d: " msgstr "" -#: Engine/insert.c:935 +#: Engine/insert.c:943 msgid " note aborted\n" msgstr "" -#: Engine/insert.c:954 +#: Engine/insert.c:962 msgid "subinstr: number of output args greater than nchnls" msgstr "" -#: Engine/insert.c:1022 +#: Engine/insert.c:1030 msgid "subinstr: too many p-fields" msgstr "" -#: Engine/insert.c:1127 +#: Engine/insert.c:1135 #, c-format msgid "%s: invalid local ksmps value: %d" msgstr "" -#: Engine/insert.c:1259 OOps/bus.c:611 Opcodes/stackops.c:293 +#: Engine/insert.c:1278 OOps/bus.c:614 Opcodes/stackops.c:293 #, c-format msgid "%s: not initialised" msgstr "%s: not initialized" -#: Engine/insert.c:1442 +#: Engine/insert.c:1458 #, c-format msgid "setksmps: invalid ksmps value: %d, original: %d" msgstr "" -#: Engine/insert.c:1564 +#: Engine/insert.c:1595 msgid "subinstr: not initialised" msgstr "subinstr: not initialized" -#: Engine/insert.c:2005 +#: Engine/insert.c:2046 #, c-format msgid "" "instr %d allocated at %p\n" "\tlclbas %p, opds %p\n" msgstr "" -#: Engine/insert.c:2023 +#: Engine/insert.c:2064 #, c-format msgid "op (%s) allocated at %p\n" msgstr "" -#: Engine/insert.c:2048 +#: Engine/insert.c:2089 msgid "null iopadr" msgstr "" -#: Engine/insert.c:2059 +#: Engine/insert.c:2100 msgid "null opadr" msgstr "" -#: Engine/insert.c:2131 +#: Engine/insert.c:2182 msgid "inconsistent opds total" msgstr "" -#: Engine/insert.c:2192 +#: Engine/insert.c:2243 #, c-format msgid "Instrument %s is still active" msgstr "" -#: Engine/insert.c:2195 +#: Engine/insert.c:2246 #, c-format msgid "Instrument %d is still active" msgstr "" @@ -1044,40 +1054,40 @@ msgid "stdmode = %.8x Linefd = %d\n" msgstr "" -#: Engine/linevent.c:186 +#: Engine/linevent.c:184 msgid "LineBuffer Overflow - Input Data has been Lost" msgstr "" -#: Engine/linevent.c:239 +#: Engine/linevent.c:238 #, c-format msgid "unknown opcode %c" msgstr "" -#: Engine/linevent.c:259 +#: Engine/linevent.c:258 msgid "unmatched quotes" msgstr "" -#: Engine/linevent.c:286 +#: Engine/linevent.c:285 msgid "dot carry has no reference" msgstr "" -#: Engine/linevent.c:291 +#: Engine/linevent.c:290 msgid "cannot carry string p-field" msgstr "can't carry string p-field" -#: Engine/linevent.c:302 +#: Engine/linevent.c:301 msgid "too few pfields" msgstr "" -#: Engine/linevent.c:306 +#: Engine/linevent.c:305 msgid "-L with negative p2 illegal" msgstr "" -#: Engine/linevent.c:317 +#: Engine/linevent.c:316 msgid "too many pfields" msgstr "" -#: Engine/linevent.c:329 +#: Engine/linevent.c:328 #, c-format msgid "" "illegal RT scoreline:\n" @@ -1085,24 +1095,28 @@ "%*s" msgstr "" -#: Engine/linevent.c:351 +#: Engine/linevent.c:350 msgid "event: param 1 must be \"a\", \"i\", \"q\", \"f\", or \"e\"" msgstr "" -#: Engine/linevent.c:353 +#: Engine/linevent.c:352 msgid "event: string name is allowed only for \"i\" and \"q\" events" msgstr "" -#: Engine/linevent.c:394 +#: Engine/linevent.c:395 #, c-format msgid "event: error creating '%c' event" msgstr "" -#: Engine/linevent.c:457 +#: Engine/linevent.c:459 #, c-format msgid "event_i: error creating '%c' event" msgstr "" +#: Engine/linevent.c:505 +msgid "instance: error creating event" +msgstr "" + #: Engine/memalloc.c:58 #, c-format msgid "memory allocate failure for %lu" @@ -1169,7 +1183,7 @@ msgstr "" #: Engine/memfiles.c:511 Opcodes/pvinterp.c:77 Opcodes/pvinterp.c:193 -#: Opcodes/pvinterp.c:383 Opcodes/ugens9.c:104 Opcodes/vpvoc.c:210 +#: Opcodes/pvinterp.c:383 Opcodes/ugens9.c:104 Opcodes/vpvoc.c:212 #, c-format msgid "%s's srate = %8.0f, orch's srate = %8.0f" msgstr "" @@ -1203,22 +1217,22 @@ msgid "Beat mode not in force" msgstr "" -#: Engine/musmon.c:173 Top/csound.c:2854 +#: Engine/musmon.c:173 Top/csound.c:2859 #, c-format msgid "Csound version %s beta (double samples) %s\n" msgstr "" -#: Engine/musmon.c:176 Top/csound.c:2857 +#: Engine/musmon.c:176 Top/csound.c:2862 #, c-format msgid "Csound version %s (double samples) %s\n" msgstr "" -#: Engine/musmon.c:181 Top/csound.c:2846 +#: Engine/musmon.c:181 Top/csound.c:2851 #, c-format msgid "Csound version %s beta (float samples) %s\n" msgstr "" -#: Engine/musmon.c:184 Top/csound.c:2849 +#: Engine/musmon.c:184 Top/csound.c:2854 #, c-format msgid "Csound version %s (float samples) %s\n" msgstr "" @@ -1260,7 +1274,7 @@ msgid "sorting cscore.out ..\n" msgstr "" -#: Engine/musmon.c:340 Top/main.c:329 +#: Engine/musmon.c:340 Top/main.c:297 msgid "\t... done\n" msgstr "" @@ -1268,8 +1282,8 @@ msgid "playing from cscore.srt\n" msgstr "" -#: Engine/musmon.c:345 Engine/musmon.c:497 Engine/musmon.c:1119 -#: Engine/musmon.c:1329 +#: Engine/musmon.c:345 Engine/musmon.c:501 Engine/musmon.c:1124 +#: Engine/musmon.c:1335 #, c-format msgid "SECTION %d:\n" msgstr "" @@ -1279,125 +1293,125 @@ msgid "%c\tbeep!\n" msgstr "" -#: Engine/musmon.c:450 +#: Engine/musmon.c:454 msgid "end of score.\t\t overall amps:" msgstr "" -#: Engine/musmon.c:461 +#: Engine/musmon.c:465 msgid "" "\n" "\t overall samples out of range:" msgstr "" -#: Engine/musmon.c:465 +#: Engine/musmon.c:469 #, c-format msgid "" "\n" "%d errors in performance\n" msgstr "" -#: Engine/musmon.c:467 +#: Engine/musmon.c:471 msgid "end of performance" msgstr "" -#: Engine/musmon.c:480 +#: Engine/musmon.c:484 msgid "no sound written to disk\n" msgstr "" -#: Engine/musmon.c:572 Engine/musmon.c:618 +#: Engine/musmon.c:577 Engine/musmon.c:623 msgid "\t number of samples out of range:" msgstr "" -#: Engine/musmon.c:611 +#: Engine/musmon.c:616 #, c-format msgid "end of section %d\t sect peak amps:" msgstr "" -#: Engine/musmon.c:613 +#: Engine/musmon.c:618 msgid "end of lplay event list\t peak amps:" msgstr "" -#: Engine/musmon.c:678 Engine/musmon.c:705 +#: Engine/musmon.c:683 Engine/musmon.c:710 #, c-format msgid " - note deleted. instr %s undefined" msgstr "" -#: Engine/musmon.c:682 +#: Engine/musmon.c:687 #, c-format msgid "Setting instrument %s %s\n" msgstr "" -#: Engine/musmon.c:683 Engine/musmon.c:697 +#: Engine/musmon.c:688 Engine/musmon.c:702 msgid "off" msgstr "" -#: Engine/musmon.c:683 Engine/musmon.c:697 +#: Engine/musmon.c:688 Engine/musmon.c:702 msgid "on" msgstr "" -#: Engine/musmon.c:692 Engine/musmon.c:734 +#: Engine/musmon.c:697 Engine/musmon.c:739 #, c-format msgid " - note deleted. instr %d(%d) undefined" msgstr "" -#: Engine/musmon.c:696 +#: Engine/musmon.c:701 #, c-format msgid "Setting instrument %d %s\n" msgstr "" -#: Engine/musmon.c:724 +#: Engine/musmon.c:729 #, c-format msgid " - note deleted. i%d (%s) had %d init errors" msgstr "" -#: Engine/musmon.c:755 +#: Engine/musmon.c:760 #, c-format msgid " - note deleted. i%d had %d init errors" msgstr "" -#: Engine/musmon.c:776 +#: Engine/musmon.c:781 #, c-format msgid "time advanced %5.3f beats by score request\n" msgstr "" -#: Engine/musmon.c:794 +#: Engine/musmon.c:799 #, c-format msgid "\t\t T%7.3f - note deleted. " msgstr "" -#: Engine/musmon.c:798 +#: Engine/musmon.c:803 #, c-format msgid "instr %s had %d init errors\n" msgstr "" -#: Engine/musmon.c:801 +#: Engine/musmon.c:806 #, c-format msgid "instr %d had %d init errors\n" msgstr "" -#: Engine/musmon.c:893 +#: Engine/musmon.c:898 msgid "terminating.\n" msgstr "" -#: Engine/musmon.c:980 +#: Engine/musmon.c:985 #, c-format msgid "error in score. illegal opcode %c (ASCII %d)\n" msgstr "" -#: Engine/musmon.c:1241 +#: Engine/musmon.c:1247 msgid "insert_score_event(): invalid instrument number or name\n" msgstr "" -#: Engine/musmon.c:1261 +#: Engine/musmon.c:1267 #, c-format msgid "insert_score_event(): unknown opcode: %c\n" msgstr "" -#: Engine/musmon.c:1284 +#: Engine/musmon.c:1290 msgid "insert_score_event(): insufficient p-fields\n" msgstr "" -#: Engine/musmon.c:1338 +#: Engine/musmon.c:1344 msgid "cannot rewind score: no score in memory \n" msgstr "can't rewind score: no score in memory \n" @@ -1415,29 +1429,29 @@ msgid "cannot find the specified instrument or opcode" msgstr "can't find the specified instrument or opcode" -#: Engine/new_orc_parser.c:92 Top/main.c:264 +#: Engine/new_orc_parser.c:144 #, c-format msgid "Failed to open input file %s\n" msgstr "Can't open input file %s\n" -#: Engine/new_orc_parser.c:122 +#: Engine/new_orc_parser.c:177 msgid "Unmatched #ifdef\n" msgstr "" -#: Engine/new_orc_parser.c:156 +#: Engine/new_orc_parser.c:212 msgid "Parsing failed due to invalid input!\n" msgstr "" -#: Engine/new_orc_parser.c:160 +#: Engine/new_orc_parser.c:216 msgid "Parsing failed due to memory exhaustion!\n" msgstr "" -#: Engine/new_orc_parser.c:163 +#: Engine/new_orc_parser.c:219 #, c-format msgid "Parsing failed due to %d syntax error%s!\n" msgstr "" -#: Engine/new_orc_parser.c:208 +#: Engine/new_orc_parser.c:264 msgid "Stopping on parser failure\n" msgstr "" @@ -1452,7 +1466,7 @@ "\tremainder of line flushed\n" msgstr "" -#: Engine/rdscor.c:159 +#: Engine/rdscor.c:160 msgid "ERROR: too many pfields: " msgstr "" @@ -1679,8 +1693,8 @@ msgid "! invalid in p1, p2, or p3" msgstr "" -#: Engine/sread.c:1266 Engine/sread.c:1271 Engine/sread.c:1749 -#: Engine/sread.c:1772 Engine/sread.c:1786 +#: Engine/sread.c:1266 Engine/sread.c:1271 Engine/sread.c:1754 +#: Engine/sread.c:1777 Engine/sread.c:1791 msgid " remainder of line flushed\n" msgstr "" @@ -1728,47 +1742,47 @@ msgid "Not #include" msgstr "" -#: Engine/sread.c:1674 +#: Engine/sread.c:1679 #, c-format msgid "Cannot open #include'd file %s" msgstr "Can't open #include'd file %s" -#: Engine/sread.c:1684 +#: Engine/sread.c:1689 msgid "Not #undef" msgstr "" -#: Engine/sread.c:1705 +#: Engine/sread.c:1710 #, c-format msgid "macro %s undefined\n" msgstr "" -#: Engine/sread.c:1711 +#: Engine/sread.c:1716 msgid "unknown # option" msgstr "" -#: Engine/sread.c:1748 +#: Engine/sread.c:1753 #, c-format msgid "illegal opcode %c" msgstr "" -#: Engine/sread.c:1771 +#: Engine/sread.c:1776 #, c-format msgid "unexpected char %c" msgstr "" -#: Engine/sread.c:1785 +#: Engine/sread.c:1790 msgid "illegally placed string" msgstr "" -#: Engine/sread.c:1792 +#: Engine/sread.c:1797 msgid "unmatched quote" msgstr "" -#: Engine/sread.c:1836 +#: Engine/sread.c:1841 msgid "sread: illegal number format: " msgstr "" -#: Engine/sread.c:1842 +#: Engine/sread.c:1847 msgid " zero substituted.\n" msgstr "" @@ -2393,56 +2407,56 @@ msgid "unrecognised message type %d" msgstr "unrecognized message type %d" -#: InOut/midirecv.c:400 +#: InOut/midirecv.c:402 #, c-format msgid "midi channel %d using instr %d\n" msgstr "" -#: InOut/midirecv.c:403 +#: InOut/midirecv.c:405 #, c-format msgid "midi channel %d is muted\n" msgstr "" -#: InOut/midirecv.c:421 +#: InOut/midirecv.c:423 #, c-format msgid "MIDI channel %d muted\n" msgstr "" -#: InOut/midirecv.c:426 +#: InOut/midirecv.c:428 #, c-format msgid "Insno = %d\n" msgstr "" -#: InOut/midirecv.c:427 +#: InOut/midirecv.c:429 msgid "unknown instr" msgstr "" -#: InOut/midirecv.c:430 +#: InOut/midirecv.c:432 #, c-format msgid "chnl %d using instr %d\n" msgstr "" -#: InOut/midirecv.c:490 +#: InOut/midirecv.c:492 #, c-format msgid " *** error reading MIDI device: %d (%s)" msgstr "" -#: InOut/midirecv.c:519 +#: InOut/midirecv.c:521 #, c-format msgid "undefined sys-realtime msg %x\n" msgstr "" -#: InOut/midirecv.c:537 +#: InOut/midirecv.c:539 #, c-format msgid "undefined sys_common msg %x\n" msgstr "" -#: InOut/midirecv.c:599 +#: InOut/midirecv.c:601 #, c-format msgid "Error closing MIDI in device: %d (%s)" msgstr "" -#: InOut/midirecv.c:606 +#: InOut/midirecv.c:608 #, c-format msgid "Error closing MIDI out device: %d (%s)" msgstr "" @@ -3682,77 +3696,77 @@ msgid "non-looping sample" msgstr "" -#: OOps/aops.c:1041 OOps/aops.c:1069 +#: OOps/aops.c:1037 OOps/aops.c:1065 #, c-format msgid "No tuning table %d" msgstr "" -#: OOps/aops.c:1114 OOps/aops.c:1152 +#: OOps/aops.c:1110 OOps/aops.c:1148 msgid "cpstun: invalid table" msgstr "" -#: OOps/aops.c:1544 OOps/aops.c:1580 +#: OOps/aops.c:1540 OOps/aops.c:1576 #, c-format msgid "Input channel %d too large; ignored" msgstr "" -#: OOps/aops.c:1576 +#: OOps/aops.c:1572 msgid "Input and output argument count differs in inch" msgstr "" -#: OOps/aops.c:2014 +#: OOps/aops.c:2010 msgid "Unknown function called" msgstr "" -#: OOps/aops.c:2050 +#: OOps/aops.c:2046 msgid "number of arguments != nchnls" msgstr "" -#: OOps/aops.c:2080 +#: OOps/aops.c:2076 msgid "outrg: channel number cannot be < 1 (1 is the first channel)" msgstr "outrg: channel number can't be < 1 (1 is the first channel)" -#: OOps/bus.c:80 OOps/bus.c:102 OOps/bus.c:127 OOps/bus.c:155 +#: OOps/bus.c:83 OOps/bus.c:105 OOps/bus.c:130 OOps/bus.c:158 msgid "chani: invalid index" msgstr "" -#: OOps/bus.c:88 OOps/bus.c:134 +#: OOps/bus.c:91 OOps/bus.c:137 #, c-format msgid "chani error %d:channel not found or not right type" msgstr "" -#: OOps/bus.c:110 OOps/bus.c:162 +#: OOps/bus.c:113 OOps/bus.c:165 #, c-format msgid "chano error %d:channel not found or not right type" msgstr "" -#: OOps/bus.c:216 +#: OOps/bus.c:219 msgid "pvsin: invalid index" msgstr "" -#: OOps/bus.c:224 +#: OOps/bus.c:227 #, c-format msgid "pvsin error %d:channel not found or not right type" msgstr "" -#: OOps/bus.c:279 +#: OOps/bus.c:282 msgid "pvsout: invalid index" msgstr "" -#: OOps/bus.c:287 +#: OOps/bus.c:290 #, c-format msgid "pvsout error %d:channel not found or not right type" msgstr "" -#: OOps/bus.c:1026 OOps/bus.c:1075 OOps/bus.c:1096 OOps/bus.c:1143 +#: OOps/bus.c:1029 OOps/bus.c:1078 OOps/bus.c:1099 OOps/bus.c:1146 msgid "invalid mode parameter" msgstr "" -#: OOps/bus.c:1063 OOps/bus.c:1187 +#: OOps/bus.c:1066 OOps/bus.c:1187 msgid "invalid channel parameters" msgstr "" -#: OOps/bus.c:1151 +#: OOps/bus.c:1154 msgid "channel already exists" msgstr "" @@ -3800,11 +3814,11 @@ msgid "diskin2: invalid number of channels" msgstr "" -#: OOps/diskin2.c:289 OOps/diskin2.c:1741 +#: OOps/diskin2.c:289 OOps/diskin2.c:1745 msgid "diskin2: unknown sample format" msgstr "" -#: OOps/diskin2.c:304 OOps/diskin2.c:1756 +#: OOps/diskin2.c:304 OOps/diskin2.c:1760 #, c-format msgid "diskin2: %s: failed to open file" msgstr "" @@ -3814,19 +3828,19 @@ "diskin2: number of output args inconsistent with number of file channels" msgstr "" -#: OOps/diskin2.c:346 OOps/diskin2.c:1813 +#: OOps/diskin2.c:346 OOps/diskin2.c:1817 #, c-format msgid "diskin2: warning: file sample rate (%d) != orchestra sr (%d)\n" msgstr "" -#: OOps/diskin2.c:427 OOps/diskin2.c:1894 +#: OOps/diskin2.c:427 OOps/diskin2.c:1905 #, c-format msgid "" "diskin2: opened (asynchronously) '%s':\n" " %d Hz, %d channel(s), %ld sample frames\n" msgstr "" -#: OOps/diskin2.c:441 OOps/diskin2.c:1908 +#: OOps/diskin2.c:441 OOps/diskin2.c:1919 #, c-format msgid "" "diskin2: opened '%s':\n" @@ -3834,12 +3848,12 @@ msgstr "" #: OOps/diskin2.c:520 OOps/diskin2.c:706 OOps/diskin2.c:902 -#: OOps/diskin2.c:1526 OOps/diskin2.c:1940 OOps/diskin2.c:2133 +#: OOps/diskin2.c:1529 OOps/diskin2.c:1951 OOps/diskin2.c:2144 msgid "diskin2: not initialised" msgstr "diskin2: not initialized" -#: OOps/diskin2.c:686 OOps/diskin2.c:877 OOps/diskin2.c:1697 -#: OOps/diskin2.c:2106 +#: OOps/diskin2.c:686 OOps/diskin2.c:877 OOps/diskin2.c:1700 +#: OOps/diskin2.c:2117 msgid "diskin2: file descriptor closed or invalid\n" msgstr "" @@ -3905,7 +3919,7 @@ msgid "soundouts: not initialised" msgstr "soundouts: not initialized" -#: OOps/diskin2.c:1782 +#: OOps/diskin2.c:1786 msgid "diskin2: output array too small" msgstr "" @@ -4683,12 +4697,12 @@ msgid "channel already specific remote" msgstr "" -#: OOps/remote.c:589 OOps/remote.c:614 OOps/remote.c:639 +#: OOps/remote.c:590 OOps/remote.c:615 OOps/remote.c:640 msgid "CLsend failed" msgstr "" -#: OOps/remote.c:706 OOps/remote.c:714 OOps/remote.c:722 OOps/remote.c:730 -#: OOps/remote.c:738 +#: OOps/remote.c:707 OOps/remote.c:715 OOps/remote.c:723 OOps/remote.c:731 +#: OOps/remote.c:739 msgid "" "*** This version of Csound was not compiled with remote event support ***\n" msgstr "" @@ -4704,11 +4718,11 @@ msgid "schedkwhen ignored. Instrument %d undefined\n" msgstr "" -#: OOps/schedule.c:429 +#: OOps/schedule.c:430 msgid "schedkwhen warning: negative kwhen reset to zero" msgstr "" -#: OOps/schedule.c:454 OOps/schedule.c:477 +#: OOps/schedule.c:455 OOps/schedule.c:478 msgid "trigseq: incorrect table number" msgstr "" @@ -4734,25 +4748,25 @@ msgid "filepeak: error getting peak value" msgstr "" -#: OOps/str_ops.c:60 +#: OOps/str_ops.c:64 msgid "illegal strset index" msgstr "" -#: OOps/str_ops.c:68 +#: OOps/str_ops.c:72 #, c-format msgid "strset index conflict at %d" msgstr "" -#: OOps/str_ops.c:69 +#: OOps/str_ops.c:73 #, c-format msgid "previous value: '%s', replaced with '%s'" msgstr "" -#: OOps/str_ops.c:93 OOps/str_ops.c:100 +#: OOps/str_ops.c:97 OOps/str_ops.c:104 msgid "--strset: invalid format" msgstr "" -#: OOps/str_ops.c:921 +#: OOps/str_ops.c:925 #, c-format msgid "invalid option code: %g" msgstr "" @@ -4899,27 +4913,27 @@ msgid "osciln: not initialised" msgstr "osciln: not initialized" -#: OOps/ugens2.c:1168 +#: OOps/ugens2.c:1210 msgid "oscil(krate): not initialised" msgstr "oscil(krate): not initialized" -#: OOps/ugens2.c:1203 OOps/ugens2.c:1239 OOps/ugens2.c:1272 OOps/ugens2.c:1307 +#: OOps/ugens2.c:1245 OOps/ugens2.c:1281 OOps/ugens2.c:1314 OOps/ugens2.c:1349 msgid "oscil: not initialised" msgstr "oscil: not initialized" -#: OOps/ugens2.c:1330 +#: OOps/ugens2.c:1372 msgid "oscili(krate): not initialised" msgstr "oscili(krate): not initialized" -#: OOps/ugens2.c:1365 OOps/ugens2.c:1405 OOps/ugens2.c:1441 OOps/ugens2.c:1480 +#: OOps/ugens2.c:1407 OOps/ugens2.c:1447 OOps/ugens2.c:1483 OOps/ugens2.c:1522 msgid "oscili: not initialised" msgstr "oscili: not initialized" -#: OOps/ugens2.c:1521 +#: OOps/ugens2.c:1563 msgid "oscil3(krate): not initialised" msgstr "oscil3(krate): not initialized" -#: OOps/ugens2.c:1580 OOps/ugens2.c:1636 OOps/ugens2.c:1689 OOps/ugens2.c:1744 +#: OOps/ugens2.c:1622 OOps/ugens2.c:1678 OOps/ugens2.c:1731 OOps/ugens2.c:1786 msgid "oscil3: not initialised" msgstr "oscil3: not initialized" @@ -5043,120 +5057,124 @@ msgid "pluck: kcps more than sample rate" msgstr "" -#: OOps/ugens4.c:472 OOps/ugens4.c:580 OOps/ugens4.c:685 +#: OOps/ugens4.c:472 OOps/ugens4.c:580 OOps/ugens4.c:686 #, c-format msgid "Seeding from current time %lu\n" msgstr "" -#: OOps/ugens5.c:287 OOps/ugens5.c:396 Opcodes/gab/gab.c:48 Opcodes/ugsc.c:209 +#: OOps/ugens5.c:287 OOps/ugens5.c:400 Opcodes/gab/gab.c:50 Opcodes/ugsc.c:211 #, c-format msgid "illegal reson iscl value, %f" msgstr "" -#: OOps/ugens5.c:616 +#: OOps/ugens5.c:623 #, c-format msgid "LPREAD cannot load %s" msgstr "LPREAD can't load %s" -#: OOps/ugens5.c:627 +#: OOps/ugens5.c:634 #, c-format msgid "Using %s type of file.\n" msgstr "" -#: OOps/ugens5.c:628 +#: OOps/ugens5.c:635 msgid "pole" msgstr "" -#: OOps/ugens5.c:628 +#: OOps/ugens5.c:635 msgid "filter coefficient" msgstr "" -#: OOps/ugens5.c:633 +#: OOps/ugens5.c:640 msgid "lpheader overriding inputs" msgstr "" -#: OOps/ugens5.c:637 +#: OOps/ugens5.c:644 msgid "lpfile srate != orch sr" msgstr "" -#: OOps/ugens5.c:645 +#: OOps/ugens5.c:652 #, c-format msgid "file %s bytes are in wrong order" msgstr "" -#: OOps/ugens5.c:655 +#: OOps/ugens5.c:662 msgid "insufficient args and no file header" msgstr "" -#: OOps/ugens5.c:660 +#: OOps/ugens5.c:667 msgid "npoles > MAXPOLES" msgstr "" -#: OOps/ugens5.c:668 +#: OOps/ugens5.c:675 #, c-format msgid "npoles %ld, nvals %ld, totvals %ld, lastfram16 = %lx\n" msgstr "" -#: OOps/ugens5.c:692 util/lpanal.c:324 +#: OOps/ugens5.c:700 util/lpanal.c:324 #, c-format msgid "magnitude: %f Phase: %f\n" msgstr "" -#: OOps/ugens5.c:695 util/lpanal.c:327 +#: OOps/ugens5.c:703 util/lpanal.c:327 #, c-format msgid "Real: %f Imag: %f\n" msgstr "" -#: OOps/ugens5.c:863 +#: OOps/ugens5.c:758 +msgid "Cannot handle uneven pole count yet \n" +msgstr "" + +#: OOps/ugens5.c:871 msgid "lpread: not initialised" msgstr "lpread: not initialized" -#: OOps/ugens5.c:869 +#: OOps/ugens5.c:877 msgid "lpread timpnt < 0" msgstr "" -#: OOps/ugens5.c:875 +#: OOps/ugens5.c:883 msgid "lpread ktimpnt truncated to last frame" msgstr "" -#: OOps/ugens5.c:906 OOps/ugens5.c:1409 +#: OOps/ugens5.c:914 OOps/ugens5.c:1417 msgid "Interpolation failed" msgstr "" -#: OOps/ugens5.c:964 +#: OOps/ugens5.c:972 msgid "this opcode only works with LPC pole analysis type (-a)\n" msgstr "" -#: OOps/ugens5.c:1098 +#: OOps/ugens5.c:1106 msgid "Pole file not supported for this opcode !" msgstr "" -#: OOps/ugens5.c:1125 +#: OOps/ugens5.c:1133 #, c-format msgid "illegal frqratio, %5.2f" msgstr "" -#: OOps/ugens5.c:1335 +#: OOps/ugens5.c:1343 msgid "lpslot number should be positive" msgstr "" -#: OOps/ugens5.c:1355 +#: OOps/ugens5.c:1363 msgid "LPC slot is not allocated" msgstr "LPC slot isn't allocated" -#: OOps/ugens5.c:1363 +#: OOps/ugens5.c:1371 msgid "lpinterpol works only with poles files.." msgstr "" -#: OOps/ugens5.c:1367 +#: OOps/ugens5.c:1375 msgid "The poles files have different pole count" msgstr "" -#: OOps/ugens5.c:1373 +#: OOps/ugens5.c:1381 msgid "padding error" msgstr "" -#: OOps/ugens5.c:1393 +#: OOps/ugens5.c:1401 msgid "lpinterpol: not initialised" msgstr "lpinterpol: not initialized" @@ -5194,49 +5212,53 @@ msgid "delayw: not initialised" msgstr "delayw: not initialized" -#: OOps/ugens6.c:475 OOps/ugens6.c:774 OOps/ugens6.c:859 +#: OOps/ugens6.c:475 OOps/ugens6.c:785 OOps/ugens6.c:870 msgid "deltap: not initialised" msgstr "deltap: not initialized" -#: OOps/ugens6.c:530 +#: OOps/ugens6.c:532 msgid "deltapi: not initialised" msgstr "deltapi: not initialized" -#: OOps/ugens6.c:583 +#: OOps/ugens6.c:535 OOps/ugens6.c:677 +msgid "deltapi: INF delaytime" +msgstr "" + +#: OOps/ugens6.c:588 msgid "deltapn: not initialised" msgstr "deltapn: not initialized" -#: OOps/ugens6.c:667 +#: OOps/ugens6.c:674 msgid "deltap3: not initialised" msgstr "deltap3: not initialized" -#: OOps/ugens6.c:896 OOps/ugens6.c:900 Opcodes/ugmoss.c:483 +#: OOps/ugens6.c:907 OOps/ugens6.c:911 Opcodes/ugmoss.c:483 #: Opcodes/ugmoss.c:487 msgid "illegal loop time" msgstr "" -#: OOps/ugens6.c:963 +#: OOps/ugens6.c:974 msgid "comb: not initialised" msgstr "comb: not initialized" -#: OOps/ugens6.c:1002 +#: OOps/ugens6.c:1013 #, fuzzy msgid "combinv: not initialised" msgstr "comb: not initialized" -#: OOps/ugens6.c:1039 +#: OOps/ugens6.c:1050 msgid "alpass: not initialised" msgstr "alpass: not initialized" -#: OOps/ugens6.c:1072 +#: OOps/ugens6.c:1083 msgid "revlpsiz inconsistent\n" msgstr "" -#: OOps/ugens6.c:1163 +#: OOps/ugens6.c:1174 msgid "reverb: not intialised" msgstr "reverb: not intialized" -#: OOps/ugens6.c:1237 +#: OOps/ugens6.c:1248 msgid "pan: not initialised" msgstr "pan: not initialized" @@ -5399,10 +5421,10 @@ msgstr "" #: OOps/ugtabs.c:38 OOps/ugtabs.c:74 OOps/ugtabs.c:154 OOps/ugtabs.c:266 -#: OOps/ugtabs.c:428 OOps/ugtabs.c:445 OOps/ugtabs.c:461 OOps/ugtabs.c:477 -#: OOps/ugtabs.c:493 OOps/ugtabs.c:508 OOps/ugtabs.c:528 OOps/ugtabs.c:615 -#: OOps/ugtabs.c:632 OOps/ugtabs.c:646 OOps/ugtabs.c:659 OOps/ugtabs.c:695 -#: OOps/ugtabs.c:702 OOps/ugtabs.c:709 OOps/ugtabs.c:793 OOps/ugtabs.c:839 +#: OOps/ugtabs.c:428 OOps/ugtabs.c:445 OOps/ugtabs.c:461 OOps/ugtabs.c:478 +#: OOps/ugtabs.c:493 OOps/ugtabs.c:508 OOps/ugtabs.c:528 OOps/ugtabs.c:616 +#: OOps/ugtabs.c:633 OOps/ugtabs.c:647 OOps/ugtabs.c:660 OOps/ugtabs.c:696 +#: OOps/ugtabs.c:703 OOps/ugtabs.c:710 OOps/ugtabs.c:794 OOps/ugtabs.c:840 #, c-format msgid "table: could not find ftable %d" msgstr "table: couldn't find ftable %d" @@ -5415,12 +5437,12 @@ msgid "tablekt: index type inconsistent with output" msgstr "" -#: OOps/ugtabs.c:673 +#: OOps/ugtabs.c:674 #, c-format msgid "table: could not find ftables %d and/or %d" msgstr "table: couldn't find ftables %d and/or %d" -#: OOps/ugtabs.c:802 OOps/ugtabs.c:848 +#: OOps/ugtabs.c:803 OOps/ugtabs.c:849 #, c-format msgid "table: could not read negative pos %d" msgstr "table: couldn't read negative pos %d" @@ -5815,19 +5837,19 @@ msgid "crossfm: ftable not found" msgstr "" -#: Opcodes/date.c:96 +#: Opcodes/date.c:97 msgid "cannot determine current directory" msgstr "can't determine current directory" -#: Opcodes/date.c:133 +#: Opcodes/date.c:134 msgid "readf: failed to open file" msgstr "" -#: Opcodes/date.c:159 +#: Opcodes/date.c:161 msgid "readf: read failure" msgstr "" -#: Opcodes/date.c:169 Opcodes/date.c:177 +#: Opcodes/date.c:171 Opcodes/date.c:179 msgid "readi failed to initialise" msgstr "readi failed to initialize" @@ -6077,12 +6099,12 @@ msgid "ftconv: not initialised" msgstr "ftconv: not initialized" -#: Opcodes/ftgen.c:69 Opcodes/ftgen.c:212 +#: Opcodes/ftgen.c:69 Opcodes/ftgen.c:213 #, c-format msgid "Error deleting ftable %d" msgstr "" -#: Opcodes/ftgen.c:137 Opcodes/signalflowgraph.cpp:1175 +#: Opcodes/ftgen.c:137 Opcodes/signalflowgraph.cpp:1383 msgid "ftgen string arg not allowed" msgstr "" @@ -6090,105 +6112,105 @@ msgid "ftgen error" msgstr "" -#: Opcodes/ftgen.c:209 +#: Opcodes/ftgen.c:210 #, c-format msgid "Invalid table number: %d" msgstr "" -#: Opcodes/ftgen.c:392 +#: Opcodes/ftgen.c:393 msgid "ftload: error allocating ftable" msgstr "" -#: Opcodes/ftgen.c:394 +#: Opcodes/ftgen.c:395 msgid "ftload: no table numbers" msgstr "" -#: Opcodes/ftgen.c:396 +#: Opcodes/ftgen.c:397 msgid "ftload: unable to open file" msgstr "" -#: Opcodes/ftgen.c:399 +#: Opcodes/ftgen.c:400 msgid "ftload: incorrect file" msgstr "" -#: Opcodes/ftgen.c:539 +#: Opcodes/ftgen.c:540 msgid "ftsave: Bad table number. Saving is possible only for existing tables." msgstr "" -#: Opcodes/ftgen.c:542 +#: Opcodes/ftgen.c:543 msgid "ftsave: no table numbers" msgstr "" -#: Opcodes/ftgen.c:544 +#: Opcodes/ftgen.c:545 msgid "ftsave: unable to open file" msgstr "" -#: Opcodes/ftgen.c:546 +#: Opcodes/ftgen.c:547 msgid "ftsave: failed to write file" msgstr "ftsave: failed to write file" -#: Opcodes/gab/gab.c:112 +#: Opcodes/gab/gab.c:114 msgid "fastab: incorrect table number" msgstr "" -#: Opcodes/gab/gab.c:139 Opcodes/gab/gab.c:148 Opcodes/gab/gab.c:178 +#: Opcodes/gab/gab.c:141 Opcodes/gab/gab.c:150 Opcodes/gab/gab.c:180 msgid "tabw off end" msgstr "" -#: Opcodes/gab/gab.c:164 Opcodes/gab/gab.c:241 Opcodes/gab/gab.c:250 +#: Opcodes/gab/gab.c:166 Opcodes/gab/gab.c:243 Opcodes/gab/gab.c:252 msgid "tab off end" msgstr "" -#: Opcodes/gab/gab.c:190 +#: Opcodes/gab/gab.c:192 msgid "tab_i: incorrect table number" msgstr "" -#: Opcodes/gab/gab.c:198 +#: Opcodes/gab/gab.c:200 #, c-format msgid "tab_i off end: table number: %d\n" msgstr "" -#: Opcodes/gab/gab.c:211 +#: Opcodes/gab/gab.c:213 msgid "tabw_i: incorrect table number" msgstr "" -#: Opcodes/gab/gab.c:218 +#: Opcodes/gab/gab.c:220 msgid "tabw_i off end" msgstr "" -#: Opcodes/gab/gab.c:263 +#: Opcodes/gab/gab.c:265 msgid "tab_init: incorrect table number" msgstr "" -#: Opcodes/gab/gab.c:332 +#: Opcodes/gab/gab.c:334 msgid "printi parameter was not a \"quoted string\"" msgstr "" -#: Opcodes/gab/gab.c:446 +#: Opcodes/gab/gab.c:448 msgid "adsynt2: wavetable not found!" msgstr "" -#: Opcodes/gab/gab.c:458 +#: Opcodes/gab/gab.c:460 msgid "adsynt2: freqtable not found!" msgstr "" -#: Opcodes/gab/gab.c:463 +#: Opcodes/gab/gab.c:465 msgid "adsynt2: partial count is greater than freqtable size!" msgstr "" -#: Opcodes/gab/gab.c:472 +#: Opcodes/gab/gab.c:474 msgid "adsynt2: amptable not found!" msgstr "" -#: Opcodes/gab/gab.c:477 +#: Opcodes/gab/gab.c:479 msgid "adsynt2: partial count is greater than amptable size!" msgstr "" -#: Opcodes/gab/gab.c:525 +#: Opcodes/gab/gab.c:527 msgid "adsynt2: not initialised" msgstr "adsynt2: not initialized" -#: Opcodes/gab/gab.c:759 +#: Opcodes/gab/gab.c:771 msgid "max_k: invalid imaxflag value" msgstr "" @@ -6706,11 +6728,11 @@ msgid "vlinseg/vexpseg: invalid num. of elements" msgstr "" -#: Opcodes/gab/vectorial.c:2255 Opcodes/vpvoc.c:119 +#: Opcodes/gab/vectorial.c:2255 Opcodes/vpvoc.c:121 msgid "tableseg: not initialised" msgstr "tableseg: not initialized" -#: Opcodes/gab/vectorial.c:2285 Opcodes/vpvoc.c:148 +#: Opcodes/gab/vectorial.c:2285 Opcodes/vpvoc.c:150 msgid "tablexseg: not initialised" msgstr "tablexseg: not initialized" @@ -7119,8 +7141,8 @@ msgid "loscilx: invalid number of output arguments" msgstr "" -#: Opcodes/loscilx.c:209 Opcodes/loscilx.c:238 Opcodes/pvlock.c:152 -#: Opcodes/pvlock.c:375 Opcodes/pvsbasic.c:566 +#: Opcodes/loscilx.c:209 Opcodes/loscilx.c:238 Opcodes/pvlock.c:160 +#: Opcodes/pvlock.c:383 Opcodes/pvlock.c:657 Opcodes/pvsbasic.c:566 msgid "" "number of output arguments inconsistent with number of sound file channels" msgstr "" @@ -7129,7 +7151,12 @@ msgid "loscilx: not initialised" msgstr "loscilx: not initialized" -#: Opcodes/lowpassr.c:85 Opcodes/lowpassr.c:140 +#: Opcodes/lowpassr.c:55 Opcodes/lowpassr.c:99 Opcodes/lowpassr.c:121 +#: Opcodes/lowpassr.c:155 Opcodes/lowpassr.c:176 Opcodes/lowpassr.c:210 +msgid "Cutoff parameter must be positive" +msgstr "" + +#: Opcodes/lowpassr.c:252 Opcodes/lowpassr.c:312 msgid "illegal order num. (min 1, max 10)" msgstr "" @@ -7344,20 +7371,20 @@ msgid "partikkel: " msgstr "" -#: Opcodes/partikkel.c:841 +#: Opcodes/partikkel.c:839 msgid "partikkelsync: opcode id needs to be a non-zero integer" msgstr "" -#: Opcodes/partikkel.c:845 Opcodes/partikkel.c:851 +#: Opcodes/partikkel.c:843 Opcodes/partikkel.c:849 msgid "partikkelsync: could not find opcode id" msgstr "partikkelsync: couldn't find opcode id" -#: Opcodes/partikkel.c:881 +#: Opcodes/partikkel.c:879 #, c-format msgid "%s: partikkel not initialized" msgstr "" -#: Opcodes/partikkel.c:889 +#: Opcodes/partikkel.c:887 #, c-format msgid "%s: could not find opcode id" msgstr "" @@ -7476,71 +7503,71 @@ msgid "adsynt: partial count is greater than amptable size!" msgstr "" -#: Opcodes/pitch.c:690 +#: Opcodes/pitch.c:691 msgid "adsynt: not initialised" msgstr "adsynt: not initialized" -#: Opcodes/pitch.c:770 +#: Opcodes/pitch.c:771 msgid "hsboscil: not initialised" msgstr "hsboscil: not initialized" -#: Opcodes/pitch.c:856 +#: Opcodes/pitch.c:857 msgid "pitchamdf: maxcps must be > mincps !" msgstr "" -#: Opcodes/pitch.c:1003 +#: Opcodes/pitch.c:1004 msgid "pitchamdf: not initialised" msgstr "pitchamdf: not initialized" -#: Opcodes/pitch.c:1184 Opcodes/pitch.c:1214 +#: Opcodes/pitch.c:1185 Opcodes/pitch.c:1215 msgid "phasorbnk: not initialised" msgstr "phasorbnk: not initialized" -#: Opcodes/pitch.c:1281 +#: Opcodes/pitch.c:1282 msgid "pinkish: Invalid method code" msgstr "" -#: Opcodes/pitch.c:1292 +#: Opcodes/pitch.c:1293 msgid "pinkish: Filter method requires a-rate (noise) input" msgstr "" -#: Opcodes/pitch.c:1421 +#: Opcodes/pitch.c:1422 #, c-format msgid "" "pinkish: Gardner method requires 4-%d bands. Default %ld substituted for " "%d.\n" msgstr "" -#: Opcodes/pitch.c:1684 +#: Opcodes/pitch.c:1685 msgid "Incorrect argument count in transeg" msgstr "" -#: Opcodes/pitch.c:1735 +#: Opcodes/pitch.c:1736 msgid "Incorrect argument count in transegb" msgstr "" -#: Opcodes/pitch.c:1786 Opcodes/pitch.c:1947 +#: Opcodes/pitch.c:1787 Opcodes/pitch.c:1948 msgid "Error: transeg not initialised (krate)\n" msgstr "Error: transeg not initialized (krate)\n" -#: Opcodes/pitch.c:1824 Opcodes/pitch.c:2007 +#: Opcodes/pitch.c:1825 Opcodes/pitch.c:2008 msgid "transeg: not initialised (arate)\n" msgstr "transeg: not initialized (arate)\n" -#: Opcodes/pitch.c:1884 +#: Opcodes/pitch.c:1885 msgid "Incorrect argument count in transegr" msgstr "" -#: Opcodes/pitch.c:2303 +#: Opcodes/pitch.c:2321 msgid "median: not initialised (arate)\n" msgstr "median: not initialized (arate)\n" -#: Opcodes/pitch.c:2307 Opcodes/pitch.c:2360 +#: Opcodes/pitch.c:2325 Opcodes/pitch.c:2378 #, c-format msgid "median: window (%d)larger than maximum(%d); truncated" msgstr "" -#: Opcodes/pitch.c:2356 +#: Opcodes/pitch.c:2374 msgid "median: not initialised (krate)\n" msgstr "median: not initialized (krate)\n" @@ -7658,30 +7685,30 @@ msgid "PVBUFREAD cannot load %s" msgstr "PVBUFREAD can't load %s" -#: Opcodes/pvinterp.c:82 Opcodes/vpvoc.c:215 +#: Opcodes/pvinterp.c:82 Opcodes/vpvoc.c:217 #, c-format msgid "PVOC frame %ld bigger than %ld in %s" msgstr "" -#: Opcodes/pvinterp.c:87 Opcodes/vpvoc.c:220 +#: Opcodes/pvinterp.c:87 Opcodes/vpvoc.c:222 #, c-format msgid "PVOC frame %ld seems too small in %s" msgstr "" #: Opcodes/pvinterp.c:91 Opcodes/pvinterp.c:203 Opcodes/pvinterp.c:393 -#: Opcodes/vpvoc.c:224 +#: Opcodes/vpvoc.c:226 #, c-format msgid "%d chans (not 1) in PVOC file %s" msgstr "" #: Opcodes/pvinterp.c:106 Opcodes/pvinterp.c:230 Opcodes/pvinterp.c:418 -#: Opcodes/ugens8.c:101 Opcodes/vpvoc.c:252 +#: Opcodes/ugens8.c:101 Opcodes/vpvoc.c:254 #, c-format msgid "ksmps of %d needs wdw of %d, max is %d for pv %s" msgstr "" #: Opcodes/pvinterp.c:135 Opcodes/pvinterp.c:284 Opcodes/pvinterp.c:475 -#: Opcodes/pvread.c:109 Opcodes/ugens8.c:174 Opcodes/vpvoc.c:314 +#: Opcodes/pvread.c:109 Opcodes/ugens8.c:174 Opcodes/vpvoc.c:316 msgid "PVOC ktimpnt truncated to last frame" msgstr "" @@ -7690,7 +7717,7 @@ msgstr "pvbufread: not initialized" #: Opcodes/pvinterp.c:146 Opcodes/pvinterp.c:337 Opcodes/pvinterp.c:540 -#: Opcodes/pvread.c:117 Opcodes/ugens8.c:232 Opcodes/vpvoc.c:382 +#: Opcodes/pvread.c:117 Opcodes/ugens8.c:232 Opcodes/vpvoc.c:384 msgid "PVOC timpnt < 0" msgstr "" @@ -7713,12 +7740,12 @@ msgstr "pvinterp: not initialized" #: Opcodes/pvinterp.c:332 Opcodes/pvinterp.c:534 Opcodes/ugens8.c:226 -#: Opcodes/vpvoc.c:376 +#: Opcodes/vpvoc.c:378 msgid "PVOC transpose too low" msgstr "" #: Opcodes/pvinterp.c:335 Opcodes/pvinterp.c:537 Opcodes/ugens8.c:229 -#: Opcodes/vpvoc.c:379 +#: Opcodes/vpvoc.c:381 msgid "PVOC transpose too high" msgstr "" @@ -7736,7 +7763,7 @@ msgid "pvcross: %s: frame size %d does not match pvbufread frame size %d\n" msgstr "pvcross: %s: frame size %d doesn't match pvbufread frame size %d\n" -#: Opcodes/pvinterp.c:498 Opcodes/vpvoc.c:339 +#: Opcodes/pvinterp.c:498 Opcodes/vpvoc.c:341 msgid "PVOC debug: one frame gets through\n" msgstr "" @@ -7744,18 +7771,18 @@ msgid "pvcross: not initialised" msgstr "pvcross: not initialized" -#: Opcodes/pvlock.c:67 Opcodes/pvsbasic.c:480 +#: Opcodes/pvlock.c:71 Opcodes/pvsbasic.c:480 msgid "invalid number of output arguments" msgstr "" -#: Opcodes/pvlock.c:536 Opcodes/pvsband.c:46 Opcodes/pvsbasic.c:684 +#: Opcodes/pvlock.c:826 Opcodes/pvsband.c:46 Opcodes/pvsbasic.c:684 #: Opcodes/pvsbasic.c:1007 Opcodes/pvsbasic.c:1220 Opcodes/pvsbasic.c:1326 #: Opcodes/pvsbasic.c:1555 Opcodes/pvsbasic.c:1768 Opcodes/pvsbasic.c:1942 -#: Opcodes/pvsgendy.c:43 Opcodes/signalflowgraph.cpp:627 +#: Opcodes/pvsgendy.c:43 Opcodes/signalflowgraph.cpp:665 msgid "Unsafe to have same fsig as in and out" msgstr "" -#: Opcodes/pvlock.c:548 +#: Opcodes/pvlock.c:838 msgid "pvsfreeze: signal format must be amp-freq." msgstr "" @@ -8111,48 +8138,48 @@ msgid "Nothing to close" msgstr "" -#: Opcodes/sfont.c:111 +#: Opcodes/sfont.c:114 #, c-format msgid "sfload: cannot open SoundFont file \"%s\" (error %s)" msgstr "sfload: can't open SoundFont file \"%s\" (error %s)" -#: Opcodes/sfont.c:117 +#: Opcodes/sfont.c:120 msgid "Sfload: cannot use globals" msgstr "Sfload: can't use globals" -#: Opcodes/sfont.c:150 +#: Opcodes/sfont.c:153 msgid "sfload: could not open globals\n" msgstr "Sfload: can't open globals\n" -#: Opcodes/sfont.c:172 +#: Opcodes/sfont.c:175 msgid "Extending soundfonts" msgstr "" -#: Opcodes/sfont.c:211 +#: Opcodes/sfont.c:214 #, c-format msgid "" "\n" "Preset list of \"%s\"\n" msgstr "" -#: Opcodes/sfont.c:214 +#: Opcodes/sfont.c:217 #, c-format msgid "%3d) %-20s\tprog:%-3d bank:%d\n" msgstr "" -#: Opcodes/sfont.c:236 +#: Opcodes/sfont.c:239 #, c-format msgid "" "\n" "Assigning all Presets of \"%s\" starting from %d (preset handle number)\n" msgstr "" -#: Opcodes/sfont.c:241 +#: Opcodes/sfont.c:244 #, c-format msgid "%3d<--%-20s\t(prog:%-3d bank:%d)\n" msgstr "" -#: Opcodes/sfont.c:248 +#: Opcodes/sfont.c:251 #, c-format msgid "" "\n" @@ -8160,19 +8187,19 @@ "\n" msgstr "" -#: Opcodes/sfont.c:261 +#: Opcodes/sfont.c:264 #, c-format msgid "" "\n" "Instrument list of \"%s\"\n" msgstr "" -#: Opcodes/sfont.c:279 +#: Opcodes/sfont.c:282 #, c-format msgid "sfpreset: preset handle too big (%d), max: %d" msgstr "" -#: Opcodes/sfont.c:296 +#: Opcodes/sfont.c:299 #, c-format msgid "" "sfpreset: cannot find any preset having prog number %d and bank number %d in " @@ -8181,19 +8208,19 @@ "sfpreset: can't find any preset having prog number %d and bank number %d in " "SoundFont file \"%s\"" -#: Opcodes/sfont.c:318 Opcodes/sfont.c:2248 +#: Opcodes/sfont.c:321 Opcodes/sfont.c:2251 msgid "sfplay: invalid or out-of-range preset number" msgstr "" -#: Opcodes/sfont.c:655 +#: Opcodes/sfont.c:658 msgid "sfplaym: invalid or out-of-range preset number" msgstr "" -#: Opcodes/sfont.c:919 Opcodes/sfont.c:1191 +#: Opcodes/sfont.c:922 Opcodes/sfont.c:1194 msgid "sfinstr: instrument out of range" msgstr "" -#: Opcodes/sfont.c:1648 Opcodes/sfont.c:1886 +#: Opcodes/sfont.c:1651 Opcodes/sfont.c:1889 #, c-format msgid "" "SoundFont file \"%s\" contains ROM samples !\n" @@ -8201,15 +8228,15 @@ "Session aborted !" msgstr "" -#: Opcodes/sfont.c:2041 Opcodes/sfont.c:2049 +#: Opcodes/sfont.c:2044 Opcodes/sfont.c:2052 msgid "Sfont: cannot use globals/" msgstr "Sfont: can't use globals/" -#: Opcodes/sfont.c:2054 +#: Opcodes/sfont.c:2057 msgid "Sfont format not compatible" msgstr "" -#: Opcodes/sfont.c:2598 +#: Opcodes/sfont.c:2601 msgid "error... could not create sfont globals\n" msgstr "error... couldn't create sfont globals\n" @@ -8217,31 +8244,36 @@ msgid "powershape: ifullscale must be strictly positive" msgstr "" -#: Opcodes/signalflowgraph.cpp:332 Opcodes/signalflowgraph.cpp:593 +#: Opcodes/signalflowgraph.cpp:360 Opcodes/signalflowgraph.cpp:629 #, c-format msgid "Connected instances of outlet %s to instance 0x%x of inlet %s.\n" msgstr "" -#: Opcodes/signalflowgraph.cpp:408 +#: Opcodes/signalflowgraph.cpp:438 #, c-format msgid "Created instance 0x%x of %d instances of outlet %s\n" msgstr "" -#: Opcodes/signalflowgraph.cpp:468 +#: Opcodes/signalflowgraph.cpp:500 #, c-format msgid "Connected instances of outlet %s to instance 0x%xof inlet %s.\n" msgstr "" -#: Opcodes/signalflowgraph.cpp:655 +#: Opcodes/signalflowgraph.cpp:693 msgid "inletf: signal format must be amp-phase or amp-freq." msgstr "" -#: Opcodes/signalflowgraph.cpp:948 Opcodes/signalflowgraph.cpp:989 +#: Opcodes/signalflowgraph.cpp:837 +#, c-format +msgid "Connected instances of outlet %s to instance 0x%x of inlet %s\n" +msgstr "" + +#: Opcodes/signalflowgraph.cpp:1150 Opcodes/signalflowgraph.cpp:1193 #, c-format msgid "Connected outlet %s to inlet %s.\n" msgstr "" -#: Opcodes/signalflowgraph.cpp:1116 Opcodes/signalflowgraph.cpp:1200 +#: Opcodes/signalflowgraph.cpp:1322 Opcodes/signalflowgraph.cpp:1408 msgid "ftgenonce error" msgstr "" @@ -8553,7 +8585,7 @@ msgid "Error allocating argument stack" msgstr "" -#: Opcodes/stackops.c:206 Top/argdecode.c:1245 util/envext.c:99 +#: Opcodes/stackops.c:206 Top/argdecode.c:1263 util/envext.c:99 #: util/scale.c:248 msgid "too many arguments" msgstr "" @@ -8984,7 +9016,7 @@ msgid "ATSCROSS: you must have an atsbufread before an atsinterpread" msgstr "" -#: Opcodes/ugsc.c:434 +#: Opcodes/ugsc.c:439 msgid "Phaser mode must be either 1 or 2" msgstr "" @@ -9114,21 +9146,21 @@ msgid "Have to have at least %d directions in vbapzmove" msgstr "" -#: Opcodes/vpvoc.c:175 +#: Opcodes/vpvoc.c:177 #, c-format msgid "vpvoc: Could not find ifnmagctrl table %f" msgstr "vpvoc: Couldn't find ifnmagctrl table %f" -#: Opcodes/vpvoc.c:181 +#: Opcodes/vpvoc.c:183 msgid "vpvoc: associated tableseg not found" msgstr "" -#: Opcodes/vpvoc.c:203 +#: Opcodes/vpvoc.c:205 #, c-format msgid "VPVOC cannot load %s" msgstr "VPVOC can't load %s" -#: Opcodes/vpvoc.c:373 +#: Opcodes/vpvoc.c:375 msgid "vpvoc: not initialised" msgstr "vpvoc: not initialized" @@ -9200,746 +9232,758 @@ msgid "No wii range" msgstr "" -#: Top/argdecode.c:63 +#: Top/argdecode.c:64 msgid "--help\tprint long usage options" msgstr "" -#: Top/argdecode.c:64 +#: Top/argdecode.c:65 msgid "-U unam\trun utility program unam" msgstr "" -#: Top/argdecode.c:65 +#: Top/argdecode.c:66 msgid "-C\tuse Cscore processing of scorefile" msgstr "" -#: Top/argdecode.c:66 +#: Top/argdecode.c:67 msgid "-j N\tuse N threads in performance" msgstr "" -#: Top/argdecode.c:67 +#: Top/argdecode.c:68 msgid "-I\tI-time only orch run" msgstr "" -#: Top/argdecode.c:68 +#: Top/argdecode.c:69 msgid "-n\tno sound onto disk" msgstr "" -#: Top/argdecode.c:69 +#: Top/argdecode.c:70 msgid "-i fnam\tsound input filename" msgstr "" -#: Top/argdecode.c:70 util/mixer.c:94 util/scale.c:45 +#: Top/argdecode.c:71 util/mixer.c:94 util/scale.c:45 msgid "-o fnam\tsound output filename" msgstr "" -#: Top/argdecode.c:71 +#: Top/argdecode.c:72 msgid "-b N\tsample frames (or -kprds) per software sound I/O buffer" msgstr "" -#: Top/argdecode.c:72 +#: Top/argdecode.c:73 msgid "-B N\tsamples per hardware sound I/O buffer" msgstr "" -#: Top/argdecode.c:73 util/mixer.c:95 util/scale.c:46 util/srconv.c:752 +#: Top/argdecode.c:74 util/mixer.c:95 util/scale.c:46 util/srconv.c:752 msgid "-A\tcreate an AIFF format output soundfile" msgstr "" -#: Top/argdecode.c:74 util/mixer.c:96 util/scale.c:47 util/srconv.c:754 +#: Top/argdecode.c:75 util/mixer.c:96 util/scale.c:47 util/srconv.c:754 msgid "-W\tcreate a WAV format output soundfile" msgstr "" -#: Top/argdecode.c:75 util/srconv.c:753 +#: Top/argdecode.c:76 util/srconv.c:753 msgid "-J\tcreate an IRCAM format output soundfile" msgstr "" -#: Top/argdecode.c:76 util/mixer.c:97 util/scale.c:48 util/srconv.c:755 +#: Top/argdecode.c:77 util/mixer.c:97 util/scale.c:48 util/srconv.c:755 msgid "-h\tno header on output soundfile" msgstr "" -#: Top/argdecode.c:77 util/mixer.c:99 util/scale.c:49 util/srconv.c:756 +#: Top/argdecode.c:78 util/mixer.c:99 util/scale.c:49 util/srconv.c:756 msgid "-c\t8-bit signed_char sound samples" msgstr "" -#: Top/argdecode.c:79 util/mixer.c:101 util/scale.c:50 util/srconv.c:757 +#: Top/argdecode.c:80 util/mixer.c:101 util/scale.c:50 util/srconv.c:757 msgid "-a\talaw sound samples" msgstr "" -#: Top/argdecode.c:81 util/mixer.c:98 util/mixer.c:100 util/srconv.c:758 +#: Top/argdecode.c:82 util/mixer.c:98 util/mixer.c:100 util/srconv.c:758 msgid "-8\t8-bit unsigned_char sound samples" msgstr "" -#: Top/argdecode.c:82 util/mixer.c:102 util/scale.c:51 util/srconv.c:759 +#: Top/argdecode.c:83 util/mixer.c:102 util/scale.c:51 util/srconv.c:759 msgid "-u\tulaw sound samples" msgstr "" -#: Top/argdecode.c:83 util/mixer.c:103 util/scale.c:52 util/srconv.c:760 +#: Top/argdecode.c:84 util/mixer.c:103 util/scale.c:52 util/srconv.c:760 msgid "-s\tshort_int sound samples" msgstr "" -#: Top/argdecode.c:84 util/mixer.c:104 util/scale.c:53 util/srconv.c:761 +#: Top/argdecode.c:85 util/mixer.c:104 util/scale.c:53 util/srconv.c:761 msgid "-l\tlong_int sound samples" msgstr "" -#: Top/argdecode.c:85 util/mixer.c:105 util/scale.c:54 util/srconv.c:762 +#: Top/argdecode.c:86 util/mixer.c:105 util/scale.c:54 util/srconv.c:762 msgid "-f\tfloat sound samples" msgstr "" -#: Top/argdecode.c:86 +#: Top/argdecode.c:87 msgid "-3\t24bit sound samples" msgstr "" -#: Top/argdecode.c:87 util/srconv.c:763 +#: Top/argdecode.c:88 util/srconv.c:763 msgid "-r N\torchestra srate override" msgstr "" -#: Top/argdecode.c:88 +#: Top/argdecode.c:89 msgid "-k N\torchestra krate override" msgstr "" -#: Top/argdecode.c:89 util/srconv.c:764 +#: Top/argdecode.c:90 util/srconv.c:764 msgid "-K\tDo not generate PEAK chunks" msgstr "-K\tDon't generate PEAK chunks" -#: Top/argdecode.c:90 +#: Top/argdecode.c:91 msgid "-v\tverbose orch translation" msgstr "" -#: Top/argdecode.c:91 +#: Top/argdecode.c:92 msgid "-m N\ttty message level. Sum of:" msgstr "" -#: Top/argdecode.c:92 +#: Top/argdecode.c:93 msgid "\t\t1=note amps, 2=out-of-range msg, 4=warnings" msgstr "" -#: Top/argdecode.c:93 +#: Top/argdecode.c:94 msgid "\t\t0/32/64/96=note amp format (raw,dB,colors)" msgstr "" -#: Top/argdecode.c:94 +#: Top/argdecode.c:95 msgid "\t\t128=print benchmark information" msgstr "" -#: Top/argdecode.c:95 +#: Top/argdecode.c:96 msgid "-d\tsuppress all displays" msgstr "" -#: Top/argdecode.c:96 +#: Top/argdecode.c:97 msgid "-g\tsuppress graphics, use ascii displays" msgstr "" -#: Top/argdecode.c:97 +#: Top/argdecode.c:98 msgid "-G\tsuppress graphics, use Postscript displays" msgstr "" -#: Top/argdecode.c:98 +#: Top/argdecode.c:99 msgid "-x fnam\textract from score.srt using extract file 'fnam'" msgstr "" -#: Top/argdecode.c:99 +#: Top/argdecode.c:100 msgid "-t N\tuse uninterpreted beats of the score, initially at tempo N" msgstr "" -#: Top/argdecode.c:100 +#: Top/argdecode.c:101 msgid "-t 0\tuse score.srt for sorted score rather than a temporary" msgstr "" -#: Top/argdecode.c:101 +#: Top/argdecode.c:102 msgid "-L dnam\tread Line-oriented realtime score events from device 'dnam'" msgstr "" -#: Top/argdecode.c:102 +#: Top/argdecode.c:103 msgid "-M dnam\tread MIDI realtime events from device 'dnam'" msgstr "" -#: Top/argdecode.c:103 +#: Top/argdecode.c:104 msgid "-F fnam\tread MIDIfile event stream from file 'fnam'" msgstr "" -#: Top/argdecode.c:105 util/mixer.c:106 util/scale.c:59 util/srconv.c:765 +#: Top/argdecode.c:106 util/mixer.c:106 util/scale.c:59 util/srconv.c:765 msgid "-R\tcontinually rewrite header while writing soundfile (WAV/AIFF)" msgstr "" -#: Top/argdecode.c:106 +#: Top/argdecode.c:107 msgid "-H#\tprint heartbeat style 1, 2 or 3 at each soundfile write" msgstr "" -#: Top/argdecode.c:107 util/mixer.c:108 util/scale.c:61 util/srconv.c:767 +#: Top/argdecode.c:108 util/mixer.c:108 util/scale.c:61 util/srconv.c:767 msgid "-N\tnotify (ring the bell) when score or miditrack is done" msgstr "" -#: Top/argdecode.c:108 +#: Top/argdecode.c:109 msgid "-T\tterminate the performance when miditrack is done" msgstr "" -#: Top/argdecode.c:109 +#: Top/argdecode.c:110 msgid "-D\tdefer GEN01 soundfile loads until performance time" msgstr "" -#: Top/argdecode.c:110 +#: Top/argdecode.c:111 msgid "-Q dnam\tselect MIDI output device" msgstr "" -#: Top/argdecode.c:111 +#: Top/argdecode.c:112 msgid "-z\tList opcodes in this version" msgstr "" -#: Top/argdecode.c:112 +#: Top/argdecode.c:113 msgid "-Z\tDither output" msgstr "" -#: Top/argdecode.c:114 +#: Top/argdecode.c:115 msgid "--sched set real-time priority and lock memory" msgstr "" -#: Top/argdecode.c:115 Top/argdecode.c:117 +#: Top/argdecode.c:116 Top/argdecode.c:118 msgid " (requires -d and real time audio (-iadc/-odac))" msgstr "" -#: Top/argdecode.c:116 +#: Top/argdecode.c:117 msgid "--sched=N set specified scheduling priority, and lock memory" msgstr "" -#: Top/argdecode.c:126 +#: Top/argdecode.c:127 msgid "\t\t\tSet output file format" msgstr "" -#: Top/argdecode.c:127 +#: Top/argdecode.c:128 msgid "--aiff\t\t\tSet AIFF format" msgstr "" -#: Top/argdecode.c:128 +#: Top/argdecode.c:129 msgid "--au\t\t\tSet AU format" msgstr "" -#: Top/argdecode.c:129 +#: Top/argdecode.c:130 msgid "--wave\t\t\tSet WAV format" msgstr "" -#: Top/argdecode.c:130 +#: Top/argdecode.c:131 msgid "--ircam\t\t\tSet IRCAM format" msgstr "" -#: Top/argdecode.c:131 +#: Top/argdecode.c:132 msgid "--ogg\t\t\tSet OGG/VORBIS format" msgstr "" -#: Top/argdecode.c:132 +#: Top/argdecode.c:133 msgid "--noheader\t\tRaw format" msgstr "" -#: Top/argdecode.c:133 +#: Top/argdecode.c:134 msgid "--nopeaks\t\tDo not write peak information" msgstr "--nopeaks\t\tDon't write peak information" -#: Top/argdecode.c:135 +#: Top/argdecode.c:136 msgid "--nodisplays\t\tSuppress all displays" msgstr "" -#: Top/argdecode.c:136 +#: Top/argdecode.c:137 msgid "--asciidisplay\t\tSuppress graphics, use ascii displays" msgstr "" -#: Top/argdecode.c:137 +#: Top/argdecode.c:138 msgid "--postscriptdisplay\tSuppress graphics, use Postscript displays" msgstr "" -#: Top/argdecode.c:139 +#: Top/argdecode.c:140 msgid "--defer-gen1\t\tDefer GEN01 soundfile loads until performance time" msgstr "" -#: Top/argdecode.c:140 +#: Top/argdecode.c:141 msgid "" "--iobufsamps=N\t\tSample frames (or -kprds) per software sound I/O buffer" msgstr "" -#: Top/argdecode.c:142 +#: Top/argdecode.c:143 msgid "--hardwarebufsamps=N\tSamples per hardware sound I/O buffer" msgstr "" -#: Top/argdecode.c:143 +#: Top/argdecode.c:144 msgid "--cscore\t\tUse Cscore processing of scorefile" msgstr "" -#: Top/argdecode.c:144 +#: Top/argdecode.c:145 msgid "--orc\t\t\tUse orchfile without scorefile" msgstr "" -#: Top/argdecode.c:146 +#: Top/argdecode.c:147 msgid "--midifile=FNAME\tRead MIDIfile event stream from file" msgstr "" -#: Top/argdecode.c:147 +#: Top/argdecode.c:148 msgid "--midioutfile=FNAME\tWrite MIDI output to file FNAME" msgstr "" -#: Top/argdecode.c:148 +#: Top/argdecode.c:149 msgid "--midi-device=FNAME\tRead MIDI realtime events from device" msgstr "" -#: Top/argdecode.c:149 +#: Top/argdecode.c:150 msgid "--terminate-on-midi\tTerminate the performance when miditrack is done" msgstr "" -#: Top/argdecode.c:151 +#: Top/argdecode.c:152 msgid "" "--heartbeat=N\t\tPrint a heartbeat style 1, 2 or 3 at each soundfile write" msgstr "" -#: Top/argdecode.c:153 +#: Top/argdecode.c:154 msgid "--notify\t\tNotify (ring the bell) when score or miditrack is done" msgstr "" -#: Top/argdecode.c:154 +#: Top/argdecode.c:155 msgid "" "--rewrite\t\tContinually rewrite header while writing soundfile (WAV/AIFF)" msgstr "" -#: Top/argdecode.c:157 +#: Top/argdecode.c:158 msgid "--input=FNAME\t\tSound input filename" msgstr "" -#: Top/argdecode.c:158 +#: Top/argdecode.c:159 msgid "--output=FNAME\t\tSound output filename" msgstr "" -#: Top/argdecode.c:159 +#: Top/argdecode.c:160 msgid "--logfile=FNAME\t\tLog output to file" msgstr "" -#: Top/argdecode.c:161 +#: Top/argdecode.c:162 msgid "--nosound\t\tNo sound onto disk or device" msgstr "" -#: Top/argdecode.c:162 +#: Top/argdecode.c:163 msgid "--tempo=N\t\tUse uninterpreted beats of the score, initially at tempo N" msgstr "" -#: Top/argdecode.c:164 +#: Top/argdecode.c:165 msgid "--i-only\t\tI-time only orch run" msgstr "" -#: Top/argdecode.c:165 +#: Top/argdecode.c:166 msgid "--syntax-check-only\tStop after checking orchestra and score syntax" msgstr "" -#: Top/argdecode.c:166 +#: Top/argdecode.c:167 msgid "--control-rate=N\tOrchestra krate override" msgstr "" -#: Top/argdecode.c:167 +#: Top/argdecode.c:168 msgid "--sample-rate=N\t\tOrchestra srate override" msgstr "" -#: Top/argdecode.c:168 +#: Top/argdecode.c:169 msgid "--score-in=FNAME\tRead Line-oriented realtime score events from device" msgstr "" -#: Top/argdecode.c:170 +#: Top/argdecode.c:171 msgid "--messagelevel=N\ttty message level, sum of:" msgstr "" -#: Top/argdecode.c:171 +#: Top/argdecode.c:172 msgid "--messageolevel=O\ttty message level in octal, of:" msgstr "" -#: Top/argdecode.c:172 +#: Top/argdecode.c:173 msgid "\t\t\t\t1=note amps, 2=out-of-range msg, 4=warnings," msgstr "" -#: Top/argdecode.c:173 +#: Top/argdecode.c:174 msgid "\t\t\t\t0/32/64/96=note amp format (raw,dB,colors)," msgstr "" -#: Top/argdecode.c:174 +#: Top/argdecode.c:175 msgid "\t\t\t\t128=print benchmark information" msgstr "" -#: Top/argdecode.c:176 +#: Top/argdecode.c:177 msgid "--m-amps=[01]\tmessages on note amps" msgstr "" -#: Top/argdecode.c:177 +#: Top/argdecode.c:178 msgid "--m-range=[01]\tMessages on range errors" msgstr "" -#: Top/argdecode.c:178 +#: Top/argdecode.c:179 msgid "--m-warnings=[01]\tMesage on warnings" msgstr "" -#: Top/argdecode.c:179 +#: Top/argdecode.c:180 msgid "--m-raw=[01]\tRaw amp messages" msgstr "" -#: Top/argdecode.c:180 +#: Top/argdecode.c:181 msgid "--m-dB=[01]\tAmp messages in dB" msgstr "" -#: Top/argdecode.c:181 +#: Top/argdecode.c:182 msgid "--m-colours=[01]\tColour amp messages" msgstr "" -#: Top/argdecode.c:182 +#: Top/argdecode.c:183 msgid "--m-benchmarks=[01]\tPrint benchmark information" msgstr "" -#: Top/argdecode.c:183 +#: Top/argdecode.c:184 msgid "--csd-line-nums=[01]\tControls how error line numbers are printed:" msgstr "" -#: Top/argdecode.c:184 +#: Top/argdecode.c:185 msgid "\t\t\t1=use CSD line #s (default), 0=use ORC/SCO-relative line #s" msgstr "" -#: Top/argdecode.c:185 +#: Top/argdecode.c:186 msgid "--extract-score=FNAME\tExtract from score.srt using extract file" msgstr "" -#: Top/argdecode.c:186 +#: Top/argdecode.c:187 msgid "--keep-sorted-score" msgstr "" -#: Top/argdecode.c:187 +#: Top/argdecode.c:188 msgid "--env:NAME=VALUE\tSet environment variable NAME to VALUE" msgstr "" -#: Top/argdecode.c:188 +#: Top/argdecode.c:189 msgid "--env:NAME+=VALUE\tAppend VALUE to environment variable NAME" msgstr "" -#: Top/argdecode.c:189 +#: Top/argdecode.c:190 msgid "--strsetN=VALUE\t\tSet strset table at index N to VALUE" msgstr "" -#: Top/argdecode.c:190 +#: Top/argdecode.c:191 msgid "--utility=NAME\t\tRun utility program" msgstr "" -#: Top/argdecode.c:191 +#: Top/argdecode.c:192 msgid "--verbose\t\tVerbose orch translation" msgstr "" -#: Top/argdecode.c:192 +#: Top/argdecode.c:193 msgid "--list-opcodes\t\tList opcodes in this version" msgstr "" -#: Top/argdecode.c:193 +#: Top/argdecode.c:194 msgid "--list-opcodesN\t\tList opcodes in style N in this version" msgstr "" -#: Top/argdecode.c:194 +#: Top/argdecode.c:195 msgid "--dither\t\tDither output" msgstr "" -#: Top/argdecode.c:195 +#: Top/argdecode.c:196 msgid "--dither-triangular\t\tDither output with triangular distribution" msgstr "" -#: Top/argdecode.c:196 +#: Top/argdecode.c:197 msgid "--dither-uniform\t\tDither output with rectanular distribution" msgstr "" -#: Top/argdecode.c:197 +#: Top/argdecode.c:198 msgid "--sched\t\t\tSet real-time scheduling priority and lock memory" msgstr "" -#: Top/argdecode.c:198 +#: Top/argdecode.c:199 msgid "--sched=N\t\tSet priority to N and lock memory" msgstr "" -#: Top/argdecode.c:199 +#: Top/argdecode.c:200 msgid "--opcode-lib=NAMES\tDynamic libraries to load" msgstr "" -#: Top/argdecode.c:200 +#: Top/argdecode.c:201 msgid "--opcode-omit=NAMES\tDynamic libraries not to load" msgstr "" -#: Top/argdecode.c:201 +#: Top/argdecode.c:202 msgid "--omacro:XXX=YYY\tSet orchestra macro XXX to value YYY" msgstr "" -#: Top/argdecode.c:202 +#: Top/argdecode.c:203 msgid "--smacro:XXX=YYY\tSet score macro XXX to value YYY" msgstr "" -#: Top/argdecode.c:203 +#: Top/argdecode.c:204 msgid "--midi-key=N\t\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:204 +#: Top/argdecode.c:205 msgid "\t\t\tkey number to pfield N as MIDI value [0-127]" msgstr "" -#: Top/argdecode.c:205 +#: Top/argdecode.c:206 msgid "--midi-key-cps=N\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:206 +#: Top/argdecode.c:207 msgid "\t\t\tkey number to pfield N as cycles per second" msgstr "" -#: Top/argdecode.c:207 +#: Top/argdecode.c:208 msgid "--midi-key-oct=N\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:208 +#: Top/argdecode.c:209 msgid "\t\t\tkey number to pfield N as linear octave" msgstr "" -#: Top/argdecode.c:209 +#: Top/argdecode.c:210 msgid "--midi-key-pch=N\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:210 +#: Top/argdecode.c:211 msgid "\t\t\tkey number to pfield N as oct.pch" msgstr "" -#: Top/argdecode.c:211 +#: Top/argdecode.c:212 msgid "--midi-velocity=N\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:212 +#: Top/argdecode.c:213 msgid "\t\t\tvelocity number to pfield N as MIDI value [0-127]" msgstr "" -#: Top/argdecode.c:213 +#: Top/argdecode.c:214 msgid "--midi-velocity-amp=N\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:214 +#: Top/argdecode.c:215 msgid "\t\t\tvelocity number to pfield N as amplitude" msgstr "" -#: Top/argdecode.c:215 +#: Top/argdecode.c:216 msgid "--no-default-paths\tTurn off relative paths from CSD/ORC/SCO" msgstr "" -#: Top/argdecode.c:216 +#: Top/argdecode.c:217 msgid "--sample-accurate\t\tUse sample-accurate timing of score events" msgstr "" -#: Top/argdecode.c:217 +#: Top/argdecode.c:218 msgid "--realtime\t\trealtime priority mode" msgstr "" -#: Top/argdecode.c:218 +#: Top/argdecode.c:219 msgid "--nchnls=N\t\t override number of audio channels" msgstr "" -#: Top/argdecode.c:219 +#: Top/argdecode.c:220 msgid "--nchnls_i=N\t\t override number of input audio channels" msgstr "" -#: Top/argdecode.c:220 +#: Top/argdecode.c:221 msgid "--0dbfs=N\t\t override 0dbfs (max positive signal amplitude)" msgstr "" -#: Top/argdecode.c:221 +#: Top/argdecode.c:222 msgid "--sinesize\t\tlength of internal sine table" msgstr "" #: Top/argdecode.c:223 +msgid "" +"--daemon\t\t daemon mode: do not exit if CSD/orchestra is not given, is " +"empty or does not compile" +msgstr "" + +#: Top/argdecode.c:225 +msgid "" +"--port=N\t\t listen to UDP port N for instruments/orchestra code (implies --" +"daemon)" +msgstr "" + +#: Top/argdecode.c:228 msgid "--help\t\t\tLong help" msgstr "" -#: Top/argdecode.c:239 +#: Top/argdecode.c:244 #, c-format msgid "flag defaults: csound -s -otest -b%d -B%d -m%d\n" msgstr "" -#: Top/argdecode.c:246 Top/argdecode.c:262 +#: Top/argdecode.c:251 Top/argdecode.c:267 msgid "Usage:\tcsound [-flags] orchfile scorefile\n" msgstr "" -#: Top/argdecode.c:247 Top/argdecode.c:263 util/envext.c:53 util/xtrct.c:67 +#: Top/argdecode.c:252 Top/argdecode.c:268 util/envext.c:53 util/xtrct.c:67 msgid "Legal flags are:\n" msgstr "" -#: Top/argdecode.c:248 +#: Top/argdecode.c:253 msgid "" "Long format:\n" "\n" msgstr "" -#: Top/argdecode.c:253 +#: Top/argdecode.c:258 msgid "" "\n" "Short form:\n" msgstr "" -#: Top/argdecode.c:266 +#: Top/argdecode.c:271 msgid "Csound Command ERROR:\t" msgstr "" -#: Top/argdecode.c:401 +#: Top/argdecode.c:406 #, c-format msgid "unknown output format: '%s'" msgstr "" -#: Top/argdecode.c:419 Top/argdecode.c:1008 +#: Top/argdecode.c:424 Top/argdecode.c:1024 msgid "no iobufsamps" msgstr "" -#: Top/argdecode.c:426 Top/argdecode.c:1015 +#: Top/argdecode.c:431 Top/argdecode.c:1031 msgid "no hardware bufsamps" msgstr "" -#: Top/argdecode.c:452 Top/argdecode.c:1115 +#: Top/argdecode.c:457 Top/argdecode.c:1132 msgid "no midifile name" msgstr "" -#: Top/argdecode.c:457 Top/argdecode.c:1121 +#: Top/argdecode.c:461 Top/argdecode.c:1137 msgid "-F: stdin not supported on this platform" msgstr "" -#: Top/argdecode.c:467 +#: Top/argdecode.c:473 msgid "no midi output file name" msgstr "" -#: Top/argdecode.c:496 +#: Top/argdecode.c:502 msgid "invalid python variable definition syntax" msgstr "" -#: Top/argdecode.c:502 Top/argdecode.c:976 +#: Top/argdecode.c:508 Top/argdecode.c:992 msgid "no infilename" msgstr "" -#: Top/argdecode.c:505 Top/argdecode.c:980 +#: Top/argdecode.c:511 Top/argdecode.c:996 msgid "input cannot be stdout" msgstr "input can't be stdout" -#: Top/argdecode.c:509 Top/argdecode.c:984 +#: Top/argdecode.c:515 Top/argdecode.c:1000 msgid "stdin audio not supported" msgstr "" -#: Top/argdecode.c:544 Top/argdecode.c:1048 +#: Top/argdecode.c:550 Top/argdecode.c:1064 msgid "no control rate" msgstr "" -#: Top/argdecode.c:558 Top/argdecode.c:1090 +#: Top/argdecode.c:564 Top/argdecode.c:1106 msgid "no Linein score device_name" msgstr "" -#: Top/argdecode.c:574 Top/argdecode.c:580 Top/argdecode.c:1056 +#: Top/argdecode.c:580 Top/argdecode.c:586 Top/argdecode.c:1072 msgid "no message level" msgstr "" -#: Top/argdecode.c:587 +#: Top/argdecode.c:593 msgid "no message amps" msgstr "" -#: Top/argdecode.c:596 +#: Top/argdecode.c:602 msgid "no message range" msgstr "" -#: Top/argdecode.c:605 +#: Top/argdecode.c:611 msgid "no message warnings" msgstr "" -#: Top/argdecode.c:614 +#: Top/argdecode.c:620 msgid "no message raw" msgstr "" -#: Top/argdecode.c:623 +#: Top/argdecode.c:629 msgid "no message dB" msgstr "" -#: Top/argdecode.c:632 +#: Top/argdecode.c:638 msgid "no message colours" msgstr "no message colors" -#: Top/argdecode.c:641 +#: Top/argdecode.c:647 msgid "no benchmark level" msgstr "" -#: Top/argdecode.c:649 +#: Top/argdecode.c:655 msgid "no value for --csd-line-nums" msgstr "" -#: Top/argdecode.c:658 Top/argdecode.c:1101 +#: Top/argdecode.c:664 Top/argdecode.c:1117 msgid "no midi device_name" msgstr "" -#: Top/argdecode.c:663 Top/argdecode.c:1107 +#: Top/argdecode.c:669 Top/argdecode.c:1122 msgid "-M: stdin not supported on this platform" msgstr "" -#: Top/argdecode.c:683 Top/argdecode.c:992 util/envext.c:84 util/mixer.c:206 +#: Top/argdecode.c:689 Top/argdecode.c:1008 util/envext.c:84 util/mixer.c:206 #: util/scale.c:173 util/srconv.c:247 util/xtrct.c:120 msgid "no outfilename" msgstr "" -#: Top/argdecode.c:686 Top/argdecode.c:996 util/scale.c:177 util/srconv.c:251 +#: Top/argdecode.c:692 Top/argdecode.c:1012 util/scale.c:177 util/srconv.c:251 #: util/xtrct.c:124 msgid "-o cannot be stdin" msgstr "-o can't be stdin" -#: Top/argdecode.c:690 Top/argdecode.c:1000 util/scale.c:180 util/srconv.c:256 +#: Top/argdecode.c:696 Top/argdecode.c:1016 util/scale.c:180 util/srconv.c:256 msgid "stdout audio not supported" msgstr "" -#: Top/argdecode.c:700 Top/argdecode.c:1198 util/hetro.c:232 +#: Top/argdecode.c:706 Top/argdecode.c:1216 util/hetro.c:232 msgid "no log file" msgstr "" -#: Top/argdecode.c:755 Top/argdecode.c:955 +#: Top/argdecode.c:761 Top/argdecode.c:971 msgid "no utility name" msgstr "" -#: Top/argdecode.c:774 Top/argdecode.c:1070 +#: Top/argdecode.c:780 Top/argdecode.c:1086 msgid "no xfilename" msgstr "" -#: Top/argdecode.c:920 +#: Top/argdecode.c:936 #, c-format msgid "unknown long option: '--%s'" msgstr "" -#: Top/argdecode.c:1043 +#: Top/argdecode.c:1059 msgid "no sample rate" msgstr "" -#: Top/argdecode.c:1075 +#: Top/argdecode.c:1091 msgid "no tempo value" msgstr "" -#: Top/argdecode.c:1080 +#: Top/argdecode.c:1096 msgid "illegal tempo" msgstr "" -#: Top/argdecode.c:1129 +#: Top/argdecode.c:1147 msgid "no MIDI output device" msgstr "" -#: Top/argdecode.c:1181 +#: Top/argdecode.c:1199 msgid "No indirection file" msgstr "" -#: Top/argdecode.c:1188 +#: Top/argdecode.c:1206 #, c-format msgid "Cannot open indirection file %s\n" msgstr "Can't indirection file %s\n" -#: Top/argdecode.c:1217 +#: Top/argdecode.c:1235 msgid "no number of threads" msgstr "" -#: Top/argdecode.c:1228 util/envext.c:94 util/mixer.c:316 util/scale.c:241 +#: Top/argdecode.c:1246 util/envext.c:94 util/mixer.c:316 util/scale.c:241 #: util/xtrct.c:239 #, c-format msgid "unknown flag -%c" msgstr "" -#: Top/argdecode.c:1235 +#: Top/argdecode.c:1253 msgid "error: orchestra and score name not allowed in .csound6rc" msgstr "" -#: Top/argdecode.c:1381 +#: Top/argdecode.c:1401 msgid "stdout not supported on this platform" msgstr "" -#: Top/argdecode.c:1421 Top/argdecode.c:1441 Top/argdecode.c:1461 +#: Top/argdecode.c:1441 Top/argdecode.c:1461 Top/argdecode.c:1481 msgid "stdin not supported on this platform" msgstr "" @@ -9989,76 +10033,76 @@ msgid "cscoreFileGetCurrent: no fp current" msgstr "" -#: Top/csmodule.c:195 +#: Top/csmodule.c:199 #, c-format msgid "not loading '%s' (uses incompatible floating point type)" msgstr "" -#: Top/csmodule.c:204 +#: Top/csmodule.c:208 #, c-format msgid "" "not loading '%s' (incompatible with this version of Csound (%d.%d/%d.%d)" msgstr "" -#: Top/csmodule.c:247 +#: Top/csmodule.c:251 #, c-format msgid "could not open library '%s' (%s)" msgstr "couldn't open library '%s' (%s)" -#: Top/csmodule.c:250 +#: Top/csmodule.c:254 #, c-format msgid "could not open library '%s' (%d)" msgstr "couldn't open library '%s' (%d)" -#: Top/csmodule.c:311 +#: Top/csmodule.c:315 #, c-format msgid "'%s' is not a Csound plugin library" msgstr "'%s' isn't a Csound plugin library" -#: Top/csmodule.c:322 +#: Top/csmodule.c:326 msgid "csoundLoadExternal(): memory allocation failure" msgstr "" -#: Top/csmodule.c:336 Top/csmodule.c:344 +#: Top/csmodule.c:340 Top/csmodule.c:348 #, c-format msgid "Error in pre-initialisation function of module '%s'" msgstr "" -#: Top/csmodule.c:417 +#: Top/csmodule.c:426 #, c-format msgid "Error opening plugin directory '%s': %s" msgstr "" -#: Top/csmodule.c:420 +#: Top/csmodule.c:429 #, c-format msgid "Error opening plugin directory: %s" msgstr "" -#: Top/csmodule.c:455 +#: Top/csmodule.c:464 #, c-format msgid "path name too long, skipping '%s'" msgstr "" -#: Top/csmodule.c:461 +#: Top/csmodule.c:470 #, c-format msgid "Library %s omitted\n" msgstr "" -#: Top/csmodule.c:494 +#: Top/csmodule.c:503 msgid "Loading command-line libraries:\n" msgstr "" -#: Top/csmodule.c:517 +#: Top/csmodule.c:526 #, c-format msgid " *** error loading '%s'" msgstr "" -#: Top/csmodule.c:540 +#: Top/csmodule.c:549 #, c-format msgid "Error starting module '%s'" msgstr "" -#: Top/csmodule.c:639 +#: Top/csmodule.c:648 #, c-format msgid "Error de-initialising module '%s'" msgstr "" @@ -10067,273 +10111,287 @@ msgid "Error allocating opcode list" msgstr "" -#: Top/csound.c:1409 +#: Top/csound.c:1410 #, c-format msgid "Multithread performance: insno: %3d thread %d of %d starting.\n" msgstr "" -#: Top/csound.c:1415 +#: Top/csound.c:1416 msgid "Bad ThreadId" msgstr "" -#: Top/csound.c:1603 Top/csound.c:1635 Top/csound.c:1663 Top/csound.c:1699 -#: Top/csound.c:3879 +#: Top/csound.c:1604 Top/csound.c:1636 Top/csound.c:1664 Top/csound.c:1700 +#: Top/csound.c:3884 msgid "Csound not ready for performance: csoundStart() has not been called \n" msgstr "Csound not ready for performance: csoundStart() hasn't been called \n" -#: Top/csound.c:1619 Top/csound.c:1648 +#: Top/csound.c:1620 Top/csound.c:1649 msgid "Score finished in csoundPerformKsmps().\n" msgstr "" -#: Top/csound.c:1642 Top/csound.c:3886 +#: Top/csound.c:1643 Top/csound.c:3891 msgid "Early return from csoundPerformKsmps().\n" msgstr "" -#: Top/csound.c:1670 +#: Top/csound.c:1671 msgid "Early return from csoundPerformBuffer().\n" msgstr "" -#: Top/csound.c:1708 +#: Top/csound.c:1709 msgid "Early return from csoundPerform().\n" msgstr "" -#: Top/csound.c:1716 +#: Top/csound.c:1717 msgid "Score finished in csoundPerform().\n" msgstr "" -#: Top/csound.c:1727 +#: Top/csound.c:1728 msgid "csoundPerform(): stopped.\n" msgstr "" -#: Top/csound.c:2010 +#: Top/csound.c:2012 msgid "WARNING: " msgstr "" -#: Top/csound.c:2150 +#: Top/csound.c:2154 msgid "rtdummy: failed to allocate globals" msgstr "" -#: Top/csound.c:2151 +#: Top/csound.c:2155 msgid "rtaudio: dummy module enabled\n" msgstr "" -#: Top/csound.c:2180 Top/csound.c:2217 +#: Top/csound.c:2184 Top/csound.c:2221 msgid " *** error: rtaudio module set to empty string" msgstr "" -#: Top/csound.c:2184 Top/csound.c:2221 +#: Top/csound.c:2188 Top/csound.c:2225 #, c-format msgid " unknown rtaudio module: '%s', using dummy module" msgstr "" -#: Top/csound.c:2338 +#: Top/csound.c:2342 msgid "WARNING: real time midi input disabled, using dummy functions\n" msgstr "" -#: Top/csound.c:2343 Top/csound.c:2377 +#: Top/csound.c:2347 Top/csound.c:2381 msgid "error: -+rtmidi set to empty string" msgstr "" -#: Top/csound.c:2346 Top/csound.c:2380 +#: Top/csound.c:2350 Top/csound.c:2384 #, c-format msgid "error: -+rtmidi='%s': unknown module" msgstr "" -#: Top/csound.c:2372 +#: Top/csound.c:2376 msgid "WARNING: real time midi output disabled, using dummy functions\n" msgstr "" -#: Top/csound.c:2394 +#: Top/csound.c:2398 msgid "Unknown MIDI error" msgstr "" -#: Top/csound.c:2555 +#: Top/csound.c:2559 msgid "Failed to allocate new opcode entry." msgstr "" -#: Top/csound.c:2577 +#: Top/csound.c:2581 #, c-format msgid "Failed to allocate opcode entry for %s." msgstr "" -#: Top/csound.c:2717 Top/main.c:390 +#: Top/csound.c:2721 Top/main.c:358 msgid "setting dummy interface\n" msgstr "" -#: Top/csound.c:2793 +#: Top/csound.c:2798 msgid "Failed during csoundInitEnv" msgstr "" -#: Top/csound.c:2815 +#: Top/csound.c:2820 msgid "Failed during csoundInitStaticModules" msgstr "" -#: Top/csound.c:2831 +#: Top/csound.c:2836 msgid "Failed during csoundLoadModules" msgstr "" -#: Top/csound.c:2888 +#: Top/csound.c:2893 msgid "Real time audio module name" msgstr "" -#: Top/csound.c:2913 +#: Top/csound.c:2918 msgid "Real time MIDI module name" msgstr "" -#: Top/csound.c:2918 +#: Top/csound.c:2923 msgid "Ignore events (other than tempo changes) in tracks defined by pattern" msgstr "" -#: Top/csound.c:2924 +#: Top/csound.c:2929 msgid "Do not handle special MIDI controllers (sustain pedal etc.)" msgstr "" -#: Top/csound.c:2932 +#: Top/csound.c:2937 msgid "Title tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2938 +#: Top/csound.c:2943 msgid "Copyright tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2944 +#: Top/csound.c:2949 msgid "Software tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2949 +#: Top/csound.c:2954 msgid "Artist tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2956 +#: Top/csound.c:2961 msgid "Comment tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2961 +#: Top/csound.c:2966 msgid "Date tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2971 +#: Top/csound.c:2976 msgid "Enable message attributes (colors etc.)" msgstr "" -#: Top/csound.c:2977 +#: Top/csound.c:2982 msgid "Start score playback at the specified time, skipping earlier events" msgstr "" -#: Top/csound.c:2984 +#: Top/csound.c:2989 msgid "Ignore in CSD files (default: no)" msgstr "" -#: Top/csound.c:3194 +#: Top/csound.c:3199 msgid "Cannot open /proc/cpuinfo. Support for RDTSC is not available.\n" msgstr "Can't open /proc/cpuinfo. Support for RDTSC isn't available.\n" -#: Top/csound.c:3224 +#: Top/csound.c:3229 msgid "No valid CPU frequency entry was found in /proc/cpuinfo.\n" msgstr "" -#: Top/csound.c:3778 +#: Top/csound.c:3783 msgid "csoundDestroyMessageBuffer: Message buffer not allocated." msgstr "" -#: Top/csound.c:3809 +#: Top/csound.c:3814 msgid "csound: internal error: message buffer overflow\n" msgstr "" -#: Top/main.c:64 +#: Top/main.c:65 #, c-format msgid "WARNING: cannot open csound6rc file %s\n" msgstr "WARNING: can't open csound6rc file %s\n" -#: Top/main.c:67 +#: Top/main.c:68 #, c-format msgid "Reading options from $CSOUND6RC: %s \n" msgstr "" -#: Top/main.c:76 +#: Top/main.c:77 msgid "Reading options from $HOME/.csound6rc\n" msgstr "" -#: Top/main.c:91 +#: Top/main.c:92 msgid "Reading options from local directory .csound6rc \n" msgstr "" -#: Top/main.c:112 +#: Top/main.c:113 msgid "" "Csound is already started, call csoundReset()\n" "before starting again \n" msgstr "" -#: Top/main.c:186 +#: Top/main.c:141 msgid "no orchestra name" msgstr "" -#: Top/main.c:210 +#: Top/main.c:166 msgid "Reading CSD failed ... stopping" msgstr "" -#: Top/main.c:224 +#: Top/main.c:180 msgid "error: multiple uses of stdin" msgstr "" -#: Top/main.c:228 +#: Top/main.c:184 msgid "error: multiple uses of stdout" msgstr "" -#: Top/main.c:237 +#: Top/main.c:193 msgid "realtime performance using dummy numeric scorefile\n" msgstr "" -#: Top/main.c:260 +#: Top/main.c:216 #, c-format msgid "orchname: %s\n" msgstr "" -#: Top/main.c:278 +#: Top/main.c:220 +#, fuzzy, c-format +msgid "Failed to open input file - %s\n" +msgstr "Can't open input file %s\n" + +#: Top/main.c:235 msgid "cannot compile orchestra \n" msgstr "can't compile orchestra\n" -#: Top/main.c:291 +#: Top/main.c:240 +#, fuzzy +msgid "cannot compile orchestra." +msgstr "can't compile orchestra\n" + +#: Top/main.c:241 +msgid "Csound will start with no instruments" +msgstr "" + +#: Top/main.c:259 msgid "end of orchestra compile" msgstr "" -#: Top/main.c:299 +#: Top/main.c:267 #, c-format msgid "using previous %s\n" msgstr "" -#: Top/main.c:309 +#: Top/main.c:277 #, c-format msgid "cannot open scorefile %s" msgstr "can't open scorefile %s" -#: Top/main.c:311 +#: Top/main.c:279 msgid "sorting score ...\n" msgstr "" -#: Top/main.c:321 +#: Top/main.c:289 #, c-format msgid "cannot open extract file %s" msgstr "can't open extract file %s" -#: Top/main.c:324 +#: Top/main.c:292 msgid " ... extracting ...\n" msgstr "" -#: Top/main.c:333 +#: Top/main.c:301 msgid "end of score sort" msgstr "" -#: Top/main.c:335 +#: Top/main.c:303 msgid "Syntax check completed.\n" msgstr "" -#: Top/main.c:456 util/dnoise.c:266 +#: Top/main.c:424 util/dnoise.c:266 #, c-format msgid "%s not a recognised SFOUTYP env setting" msgstr "" -#: Top/main.c:475 +#: Top/main.c:443 msgid "srate and krate overrides must occur jointly" msgstr "" @@ -10402,158 +10460,158 @@ msgid " *** Type 'csound --help' for the list of available options." msgstr "" -#: Top/one_file.c:105 Top/one_file.c:115 +#: Top/one_file.c:96 Top/one_file.c:106 msgid " *** cannot create temporary file" msgstr " *** can't create temporary file" -#: Top/one_file.c:199 +#: Top/one_file.c:182 #, c-format msgid "Removing temporary file %s ...\n" msgstr "" -#: Top/one_file.c:203 +#: Top/one_file.c:186 #, c-format msgid "WARNING: could not remove %s\n" msgstr "WARNING: couldn't remove %s\n" -#: Top/one_file.c:270 Top/one_file.c:304 +#: Top/one_file.c:253 Top/one_file.c:287 #, c-format msgid "More than %d arguments in " msgstr "" -#: Top/one_file.c:342 +#: Top/one_file.c:325 #, c-format msgid "Invalid arguments in : %s" msgstr "" -#: Top/one_file.c:345 +#: Top/one_file.c:328 #, c-format msgid "Invalid arguments in .csoundrc or -@ file: %s" msgstr "" -#: Top/one_file.c:351 Top/one_file.c:784 +#: Top/one_file.c:334 Top/one_file.c:767 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:380 +#: Top/one_file.c:361 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:400 Top/one_file.c:467 +#: Top/one_file.c:381 Top/one_file.c:449 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:415 Top/one_file.c:420 +#: Top/one_file.c:396 Top/one_file.c:401 msgid "Missing program in tag " msgstr "" -#: Top/one_file.c:432 +#: Top/one_file.c:414 #, c-format msgid "Creating %s (%p)\n" msgstr "" -#: Top/one_file.c:445 +#: Top/one_file.c:427 msgid "External generation failed" msgstr "" -#: Top/one_file.c:505 +#: Top/one_file.c:487 #, c-format msgid "Non base64 character %c(%2x)" msgstr "" -#: Top/one_file.c:524 +#: Top/one_file.c:506 msgid "Truncated byte at end of base64 stream" msgstr "" -#: Top/one_file.c:540 +#: Top/one_file.c:523 #, c-format msgid "Cannot open temporary file (%s) for MIDI subfile" msgstr "Can't open temporary file (%s) for MIDI subfile" -#: Top/one_file.c:557 +#: Top/one_file.c:540 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:573 Top/one_file.c:622 +#: Top/one_file.c:556 Top/one_file.c:605 #, c-format msgid "File %s already exists" msgstr "" -#: Top/one_file.c:578 +#: Top/one_file.c:561 #, c-format msgid "Cannot open sample file (%s) subfile" msgstr "Can't open sample file (%s) subfile" -#: Top/one_file.c:592 +#: Top/one_file.c:575 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:627 +#: Top/one_file.c:610 #, c-format msgid "Cannot open file (%s) subfile" msgstr "Can't open file (%s) subfile" -#: Top/one_file.c:642 +#: Top/one_file.c:625 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:662 +#: Top/one_file.c:645 #, c-format msgid "This CSD file requires a version of Csound before %d.%02d" msgstr "" -#: Top/one_file.c:670 Top/one_file.c:677 +#: Top/one_file.c:653 Top/one_file.c:660 #, c-format msgid "This CSD file requires a version of Csound after %d.%02d" msgstr "" -#: Top/one_file.c:683 +#: Top/one_file.c:666 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:693 +#: Top/one_file.c:676 msgid "**** Licence Information ****\n" msgstr "**** License Information ****\n" -#: Top/one_file.c:699 +#: Top/one_file.c:682 msgid "**** End of Licence Information ****\n" msgstr "**** End of License Information ****\n" -#: Top/one_file.c:710 +#: Top/one_file.c:693 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:741 +#: Top/one_file.c:724 #, c-format msgid "Failed to open csd file: %s" msgstr "" -#: Top/one_file.c:756 +#: Top/one_file.c:739 msgid "STARTING FILE\n" msgstr "" -#: Top/one_file.c:774 +#: Top/one_file.c:757 msgid "Creating options\n" msgstr "" -#: Top/one_file.c:780 +#: Top/one_file.c:763 msgid "Skipping \n" msgstr "" -#: Top/one_file.c:794 +#: Top/one_file.c:777 msgid "Creating orchestra\n" msgstr "" -#: Top/one_file.c:799 +#: Top/one_file.c:782 msgid "Creating score\n" msgstr "" -#: Top/one_file.c:833 +#: Top/one_file.c:812 #, c-format msgid "unknown CSD tag: %s\n" msgstr "" -#: Top/one_file.c:838 +#: Top/one_file.c:817 msgid "Could not find tag in CSD file.\n" msgstr "Couldn't find tag in CSD file.\n" diff -Nru csound-6.01~dfsg/po/csound.po csound-6.02~dfsg/po/csound.po --- csound-6.01~dfsg/po/csound.po 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/po/csound.po 2014-01-07 16:54:21.000000000 +0000 @@ -192,157 +192,157 @@ msgid "Not a proper list of ints" msgstr "" -#: Engine/csound_orc_compile.c:276 +#: Engine/csound_orc_compile.c:274 msgid "missing or extra arg" msgstr "" -#: Engine/csound_orc_compile.c:281 +#: Engine/csound_orc_compile.c:279 msgid "too many input args\n" msgstr "" -#: Engine/csound_orc_compile.c:464 +#: Engine/csound_orc_compile.c:462 #, c-format msgid "create_opcode: No rule to handle statement of type %d\n" msgstr "" -#: Engine/csound_orc_compile.c:633 Engine/csound_orc_compile.c:691 +#: Engine/csound_orc_compile.c:631 Engine/csound_orc_compile.c:690 #, c-format msgid "%s invalid sample rate" msgstr "" -#: Engine/csound_orc_compile.c:635 Engine/csound_orc_compile.c:693 +#: Engine/csound_orc_compile.c:633 Engine/csound_orc_compile.c:692 #, c-format msgid "%s invalid control rate" msgstr "" -#: Engine/csound_orc_compile.c:639 Engine/csound_orc_compile.c:689 +#: Engine/csound_orc_compile.c:637 Engine/csound_orc_compile.c:688 #, c-format msgid "%s invalid ksmps value" msgstr "" -#: Engine/csound_orc_compile.c:641 Engine/csound_orc_compile.c:695 +#: Engine/csound_orc_compile.c:639 Engine/csound_orc_compile.c:694 #, c-format msgid "%s inconsistent sr, kr, ksmps" msgstr "" -#: Engine/csound_orc_compile.c:643 +#: Engine/csound_orc_compile.c:641 #, c-format msgid "%s inconsistent sr, kr, ksmps \n" msgstr "" -#: Engine/csound_orc_compile.c:659 +#: Engine/csound_orc_compile.c:657 msgid "bad value for 0dbfs: must be positive. Setting default value." msgstr "" -#: Engine/csound_orc_compile.c:680 +#: Engine/csound_orc_compile.c:679 #, c-format msgid "sample rate overrides: esr = %7.4f, ekr = %7.4f, ksmps = %d\n" msgstr "" -#: Engine/csound_orc_compile.c:686 +#: Engine/csound_orc_compile.c:685 #, c-format msgid "" "sr = %.7g, kr = %.7g, ksmps = %.7g\n" "error:" msgstr "" -#: Engine/csound_orc_compile.c:832 +#: Engine/csound_orc_compile.c:842 #, c-format msgid "create_instrument: instr num %ld\n" msgstr "" -#: Engine/csound_orc_compile.c:921 +#: Engine/csound_orc_compile.c:934 msgid "-- deleted instr from deadpool \n" msgstr "" -#: Engine/csound_orc_compile.c:949 +#: Engine/csound_orc_compile.c:962 #, c-format msgid " -- free instr def %p \n" msgstr "" -#: Engine/csound_orc_compile.c:962 Engine/csound_orc_compile.c:973 +#: Engine/csound_orc_compile.c:975 Engine/csound_orc_compile.c:986 #, c-format msgid " -- added to deadpool slot %d \n" msgstr "" -#: Engine/csound_orc_compile.c:998 Engine/csound_orc_compile.c:1144 +#: Engine/csound_orc_compile.c:1011 Engine/csound_orc_compile.c:1158 #, c-format msgid "instr %ld redefined, replacing previous definition" msgstr "" -#: Engine/csound_orc_compile.c:1096 +#: Engine/csound_orc_compile.c:1109 #, c-format msgid "instr %s uses instrument number %d\n" msgstr "" -#: Engine/csound_orc_compile.c:1168 +#: Engine/csound_orc_compile.c:1183 #, c-format msgid "no active instances of instr %d \n" msgstr "" -#: Engine/csound_orc_compile.c:1213 +#: Engine/csound_orc_compile.c:1228 msgid "!!! csound->opcodeInfo is NULL !!!\n" msgstr "" -#: Engine/csound_orc_compile.c:1249 +#: Engine/csound_orc_compile.c:1264 #, c-format msgid " merging constants %d) %f\n" msgstr "" -#: Engine/csound_orc_compile.c:1258 +#: Engine/csound_orc_compile.c:1273 #, c-format msgid " merging %d) %s:%s\n" msgstr "" -#: Engine/csound_orc_compile.c:1281 +#: Engine/csound_orc_compile.c:1299 #, c-format msgid "merging instr %d \n" msgstr "" -#: Engine/csound_orc_compile.c:1289 +#: Engine/csound_orc_compile.c:1307 #, c-format msgid "merging instr %s \n" msgstr "" -#: Engine/csound_orc_compile.c:1452 Engine/csound_orc_compile.c:1480 -#: Engine/csound_orc_compile.c:1503 +#: Engine/csound_orc_compile.c:1471 Engine/csound_orc_compile.c:1499 +#: Engine/csound_orc_compile.c:1522 msgid "invalid name for instrument" msgstr "" -#: Engine/csound_orc_compile.c:1485 Engine/csound_orc_compile.c:1508 +#: Engine/csound_orc_compile.c:1504 Engine/csound_orc_compile.c:1527 #, c-format msgid "instr %s redefined" msgstr "" -#: Engine/csound_orc_compile.c:1530 +#: Engine/csound_orc_compile.c:1549 #, c-format msgid "ERROR: Could not find OPCODINFO for opname: %s\n" msgstr "" -#: Engine/csound_orc_compile.c:1551 +#: Engine/csound_orc_compile.c:1570 #, c-format msgid "Unknown TREE node of type %d found in root.\n" msgstr "" -#: Engine/csound_orc_compile.c:1560 +#: Engine/csound_orc_compile.c:1579 #, c-format msgid "%d syntax errors in orchestra. compilation invalid\n" msgstr "" -#: Engine/csound_orc_compile.c:1600 +#: Engine/csound_orc_compile.c:1620 msgid "perf-pass statements illegal in header blk\n" msgstr "" -#: Engine/csound_orc_compile.c:1772 +#: Engine/csound_orc_compile.c:1792 msgid "i[fixme] pset args != pmax" msgstr "" -#: Engine/csound_orc_compile.c:1894 +#: Engine/csound_orc_compile.c:1922 #, c-format msgid "Missing local arg: %s\n" msgstr "" -#: Engine/csound_orc_compile.c:2025 +#: Engine/csound_orc_compile.c:2054 #, c-format msgid "Opcode \"%s\" is deprecated\n" msgstr "" @@ -419,46 +419,46 @@ msgid "Variable type for %s could not be determined.\n" msgstr "" -#: Engine/csound_orc_semantics.c:1300 +#: Engine/csound_orc_semantics.c:1301 #, c-format msgid "Unable to find opcode with name: %s\n" msgstr "" -#: Engine/csound_orc_semantics.c:1315 +#: Engine/csound_orc_semantics.c:1316 #, c-format msgid "Unable to find opcode entry for '%s' with matching argument types:\n" msgstr "" -#: Engine/csound_orc_semantics.c:1318 +#: Engine/csound_orc_semantics.c:1319 #, c-format msgid "Found: %s %s %s\n" msgstr "" -#: Engine/csound_orc_semantics.c:1320 +#: Engine/csound_orc_semantics.c:1321 #, c-format msgid "Line: %d Loc: %d\n" msgstr "" -#: Engine/csound_orc_semantics.c:1454 +#: Engine/csound_orc_semantics.c:1455 #, c-format msgid "expression for until statement not a boolean expression, line %d\n" msgstr "" -#: Engine/csound_orc_semantics.c:1607 +#: Engine/csound_orc_semantics.c:1608 #, c-format msgid "" "\n" "error: %s (token \"%s\")" msgstr "" -#: Engine/csound_orc_semantics.c:1609 +#: Engine/csound_orc_semantics.c:1610 #, c-format msgid "" " line %d:\n" ">>>" msgstr "" -#: Engine/csound_orc_semantics.c:2141 +#: Engine/csound_orc_semantics.c:2142 #, c-format msgid "insufficient required arguments for opcode %s on line %d:%d\n" msgstr "" @@ -473,239 +473,239 @@ msgid "Creating search path cache for '%s':" msgstr "" -#: Engine/envvar.c:729 +#: Engine/envvar.c:731 msgid "Current directory path name too long\n" msgstr "" -#: Engine/envvar.c:1003 +#: Engine/envvar.c:1005 #, c-format msgid "internal error: csoundFileOpen(): invalid type: %d" msgstr "" -#: Engine/envvar.c:1193 +#: Engine/envvar.c:1195 #, c-format msgid "internal error: csoundCreateFileHandle(): invalid type: %d" msgstr "" -#: Engine/fgens.c:91 +#: Engine/fgens.c:99 msgid "unknown GEN number" msgstr "" -#: Engine/fgens.c:133 +#: Engine/fgens.c:141 msgid "ftable does not exist" msgstr "" -#: Engine/fgens.c:138 +#: Engine/fgens.c:146 #, c-format msgid "ftable %d now deleted\n" msgstr "" -#: Engine/fgens.c:153 Engine/fgens.c:1612 Engine/fgens.c:1698 -#: Engine/fgens.c:1777 Engine/fgens.c:1893 Engine/fgens.c:1974 -#: Engine/fgens.c:3023 +#: Engine/fgens.c:161 Engine/fgens.c:1630 Engine/fgens.c:1716 +#: Engine/fgens.c:1795 Engine/fgens.c:1911 Engine/fgens.c:1992 +#: Engine/fgens.c:3043 msgid "insufficient gen arguments" msgstr "" -#: Engine/fgens.c:179 Opcodes/ftgen.c:117 +#: Engine/fgens.c:187 Opcodes/ftgen.c:117 #, c-format msgid "Named gen \"%s\" not defined" msgstr "" -#: Engine/fgens.c:187 +#: Engine/fgens.c:195 msgid "illegal gen number" msgstr "" -#: Engine/fgens.c:195 +#: Engine/fgens.c:203 msgid "deferred size for GENs 1, 23, 28 or 49 only" msgstr "" -#: Engine/fgens.c:198 Engine/fgens.c:250 +#: Engine/fgens.c:206 Engine/fgens.c:258 #, c-format msgid "ftable %d:\n" msgstr "" -#: Engine/fgens.c:223 Engine/fgens.c:2301 Engine/fgens.c:2880 +#: Engine/fgens.c:231 Engine/fgens.c:2320 Engine/fgens.c:2899 msgid "illegal table length" msgstr "" -#: Engine/fgens.c:293 Engine/fgens.c:2262 +#: Engine/fgens.c:304 Engine/fgens.c:2281 #, c-format msgid "" "ftable %d relocating due to size change\n" " currently active instruments may find this disturbing" msgstr "" -#: Engine/fgens.c:351 Engine/fgens.c:472 Engine/fgens.c:556 Engine/fgens.c:637 -#: Engine/fgens.c:712 Engine/fgens.c:761 Engine/fgens.c:882 Engine/fgens.c:959 -#: Engine/fgens.c:1060 Engine/fgens.c:1104 Engine/fgens.c:1151 -#: Engine/fgens.c:1405 Engine/fgens.c:1467 Engine/fgens.c:1696 -#: Engine/fgens.c:1774 Engine/fgens.c:2129 Engine/fgens.c:2977 -#: Engine/fgens.c:3020 +#: Engine/fgens.c:362 Engine/fgens.c:483 Engine/fgens.c:567 Engine/fgens.c:648 +#: Engine/fgens.c:723 Engine/fgens.c:772 Engine/fgens.c:893 Engine/fgens.c:970 +#: Engine/fgens.c:1071 Engine/fgens.c:1115 Engine/fgens.c:1165 +#: Engine/fgens.c:1423 Engine/fgens.c:1485 Engine/fgens.c:1714 +#: Engine/fgens.c:1792 Engine/fgens.c:2147 Engine/fgens.c:2997 +#: Engine/fgens.c:3040 msgid "using extended arguments\n" msgstr "" -#: Engine/fgens.c:375 +#: Engine/fgens.c:386 msgid "no coefs present" msgstr "" -#: Engine/fgens.c:380 Engine/fgens.c:646 Engine/fgens.c:654 +#: Engine/fgens.c:391 Engine/fgens.c:657 Engine/fgens.c:665 msgid "illegal x interval" msgstr "" -#: Engine/fgens.c:409 Engine/fgens.c:558 Engine/fgens.c:639 Engine/fgens.c:884 -#: Engine/fgens.c:1362 Engine/fgens.c:2473 Engine/fgens.c:2781 -#: Engine/fgens.c:2922 Opcodes/ftest.c:128 Top/main.c:118 util/cvanal.c:67 +#: Engine/fgens.c:420 Engine/fgens.c:569 Engine/fgens.c:650 Engine/fgens.c:895 +#: Engine/fgens.c:1380 Engine/fgens.c:2492 Engine/fgens.c:2800 +#: Engine/fgens.c:2941 Opcodes/ftest.c:128 Top/main.c:119 util/cvanal.c:67 #: util/lpanal.c:401 util/pvanal.c:170 msgid "insufficient arguments" msgstr "" -#: Engine/fgens.c:413 Engine/fgens.c:1367 +#: Engine/fgens.c:424 Engine/fgens.c:1385 msgid "unknown srctable number" msgstr "" -#: Engine/fgens.c:426 +#: Engine/fgens.c:437 msgid "table size too large" msgstr "" -#: Engine/fgens.c:511 Engine/fgens.c:544 +#: Engine/fgens.c:522 Engine/fgens.c:555 msgid "gen call has negative segment size:" msgstr "" -#: Engine/fgens.c:513 +#: Engine/fgens.c:524 msgid "illegal input vals for gen call, beginning:" msgstr "" -#: Engine/fgens.c:579 +#: Engine/fgens.c:590 msgid "negative segsiz" msgstr "" -#: Engine/fgens.c:788 +#: Engine/fgens.c:799 msgid "nh partials < 1" msgstr "" -#: Engine/fgens.c:887 +#: Engine/fgens.c:898 msgid "illegal xint value" msgstr "" -#: Engine/fgens.c:890 +#: Engine/fgens.c:901 msgid "illegal xamp value" msgstr "" -#: Engine/fgens.c:963 +#: Engine/fgens.c:974 msgid "uneven number of args" msgstr "" -#: Engine/fgens.c:1088 +#: Engine/fgens.c:1099 msgid "gen call has illegal x-ordinate values:" msgstr "" -#: Engine/fgens.c:1106 +#: Engine/fgens.c:1117 msgid "wrong number of args" msgstr "" -#: Engine/fgens.c:1120 +#: Engine/fgens.c:1131 msgid "a range given exceeds table length" msgstr "" -#: Engine/fgens.c:1127 +#: Engine/fgens.c:1138 msgid "an input function does not exist" msgstr "" -#: Engine/fgens.c:1260 +#: Engine/fgens.c:1274 msgid "No such window!" msgstr "" -#: Engine/fgens.c:1278 +#: Engine/fgens.c:1292 msgid "Wrong number of input arguments" msgstr "" -#: Engine/fgens.c:1279 +#: Engine/fgens.c:1293 msgid "unknown distribution" msgstr "" -#: Engine/fgens.c:1328 +#: Engine/fgens.c:1342 msgid "error opening ASCII file" msgstr "" -#: Engine/fgens.c:1334 +#: Engine/fgens.c:1352 #, c-format msgid "%ld elements in %s\n" msgstr "" -#: Engine/fgens.c:1346 +#: Engine/fgens.c:1364 msgid "Numbers after table full in GEN23" msgstr "" -#: Engine/fgens.c:1375 +#: Engine/fgens.c:1393 msgid "table size must be the same of source table" msgstr "" -#: Engine/fgens.c:1447 Engine/fgens.c:1507 +#: Engine/fgens.c:1465 Engine/fgens.c:1525 msgid "x coordinates must all be in increasing order:" msgstr "" -#: Engine/fgens.c:1450 Engine/fgens.c:1509 +#: Engine/fgens.c:1468 Engine/fgens.c:1527 msgid "x coordinate greater than function size:" msgstr "" -#: Engine/fgens.c:1454 +#: Engine/fgens.c:1472 msgid "illegal input val (y <= 0) for gen call, beginning:" msgstr "" -#: Engine/fgens.c:1527 +#: Engine/fgens.c:1545 msgid "GEN28 requires zero table length" msgstr "" -#: Engine/fgens.c:1596 +#: Engine/fgens.c:1614 msgid "could not open space file" msgstr "" -#: Engine/fgens.c:1598 +#: Engine/fgens.c:1616 msgid "Time values must be in increasing order" msgstr "" -#: Engine/fgens.c:1619 +#: Engine/fgens.c:1637 msgid "GEN30: source ftable not found" msgstr "" -#: Engine/fgens.c:1702 +#: Engine/fgens.c:1720 msgid "GEN31: source ftable not found" msgstr "" -#: Engine/fgens.c:1810 +#: Engine/fgens.c:1828 #, c-format msgid "GEN32: source ftable %d not found" msgstr "" -#: Engine/fgens.c:1904 +#: Engine/fgens.c:1922 msgid "GEN33: source ftable not found" msgstr "" -#: Engine/fgens.c:2072 +#: Engine/fgens.c:2090 msgid "unknown source table number" msgstr "" -#: Engine/fgens.c:2104 +#: Engine/fgens.c:2122 msgid "Gen41: negative probability not allowed" msgstr "" -#: Engine/fgens.c:2170 Opcodes/fareygen.c:70 +#: Engine/fgens.c:2188 Opcodes/fareygen.c:70 #, c-format msgid "ftable %d: " msgstr "" -#: Engine/fgens.c:2214 +#: Engine/fgens.c:2232 #, c-format msgid "ftable %d:" msgstr "" -#: Engine/fgens.c:2257 +#: Engine/fgens.c:2275 #, c-format msgid "replacing previous ftable %d" msgstr "" -#: Engine/fgens.c:2297 Engine/fgens.c:2423 Engine/fgens.c:2451 -#: Engine/fgens.c:2458 Opcodes/gab/gab.c:590 Opcodes/gab/gab.c:645 +#: Engine/fgens.c:2316 Engine/fgens.c:2442 Engine/fgens.c:2470 +#: Engine/fgens.c:2477 Opcodes/gab/gab.c:592 Opcodes/gab/gab.c:647 #: Opcodes/midiops2.c:233 Opcodes/midiops2.c:388 Opcodes/midiops2.c:470 #: Opcodes/uggab.c:1625 Opcodes/uggab.c:1661 Opcodes/uggab.c:1683 #: Opcodes/uggab.c:1736 @@ -713,122 +713,122 @@ msgid "Invalid ftable no. %f" msgstr "" -#: Engine/fgens.c:2306 +#: Engine/fgens.c:2325 #, c-format msgid "deferred-size ftable %f illegal here" msgstr "" -#: Engine/fgens.c:2362 Engine/fgens.c:2961 +#: Engine/fgens.c:2381 Engine/fgens.c:2981 #, c-format msgid "Deferred load of '%s' failed" msgstr "" -#: Engine/fgens.c:2429 +#: Engine/fgens.c:2448 #, c-format msgid "Deferred-size ftable %f load not available at perf time." msgstr "" -#: Engine/fgens.c:2497 +#: Engine/fgens.c:2516 #, c-format msgid "non-deferred ftable %d needs size %d\n" msgstr "" -#: Engine/fgens.c:2544 Opcodes/loscilx.c:69 +#: Engine/fgens.c:2563 Opcodes/loscilx.c:69 #, c-format msgid "invalid sample format: %d" msgstr "" -#: Engine/fgens.c:2552 Engine/fgens.c:2805 +#: Engine/fgens.c:2571 Engine/fgens.c:2824 #, c-format msgid "channel %d illegal" msgstr "" -#: Engine/fgens.c:2558 +#: Engine/fgens.c:2577 msgid "deferred alloc\n" msgstr "" -#: Engine/fgens.c:2566 Engine/fgens.c:2878 +#: Engine/fgens.c:2585 Engine/fgens.c:2897 msgid "deferred size, but filesize unknown" msgstr "" -#: Engine/fgens.c:2569 Engine/fgens.c:2882 +#: Engine/fgens.c:2588 Engine/fgens.c:2901 #, c-format msgid " defer length %d\n" msgstr "" -#: Engine/fgens.c:2637 +#: Engine/fgens.c:2656 msgid "GEN1: input file truncated by ftable size" msgstr "" -#: Engine/fgens.c:2641 +#: Engine/fgens.c:2660 #, c-format msgid "\tlooping endpoint %d exceeds ftsize %d\n" msgstr "" -#: Engine/fgens.c:2657 +#: Engine/fgens.c:2676 msgid "GEN1 read error" msgstr "" -#: Engine/fgens.c:2662 +#: Engine/fgens.c:2681 msgid "GEN1: aiff file truncated by ftable size" msgstr "" -#: Engine/fgens.c:2663 +#: Engine/fgens.c:2682 #, c-format msgid "\taudio samps %d exceeds ftsize %d" msgstr "" -#: Engine/fgens.c:2707 +#: Engine/fgens.c:2726 msgid "wrong number of ftable arguments" msgstr "" -#: Engine/fgens.c:2717 OOps/pstream.c:379 +#: Engine/fgens.c:2736 OOps/pstream.c:379 msgid "Failed to load PVOC-EX file" msgstr "" -#: Engine/fgens.c:2728 InOut/midirecv.c:417 OOps/midiops.c:402 +#: Engine/fgens.c:2747 InOut/midirecv.c:419 OOps/midiops.c:402 #: OOps/midiops.c:452 OOps/midiops.c:464 msgid "illegal channel number" msgstr "" -#: Engine/fgens.c:2746 +#: Engine/fgens.c:2765 msgid "ftable size too small" msgstr "" -#: Engine/fgens.c:2821 Opcodes/mp3in.c:87 Opcodes/mp3in.c:255 +#: Engine/fgens.c:2840 Opcodes/mp3in.c:87 Opcodes/mp3in.c:255 #: Top/cscorfns.c:176 Top/cscorfns.c:207 msgid "Not enough memory\n" msgstr "" -#: Engine/fgens.c:2987 +#: Engine/fgens.c:3007 msgid "gen51: invalid number of p-fields (too few grades)" msgstr "" -#: Engine/fgens.c:3027 +#: Engine/fgens.c:3047 msgid "number of channels inconsistent with number of args" msgstr "" -#: Engine/fgens.c:3186 +#: Engine/fgens.c:3206 msgid "GEN53: invalid number of gen arguments" msgstr "" -#: Engine/fgens.c:3196 +#: Engine/fgens.c:3216 msgid "GEN53: invalid table length" msgstr "" -#: Engine/fgens.c:3200 +#: Engine/fgens.c:3220 msgid "GEN53: invalid source table number" msgstr "" -#: Engine/fgens.c:3203 +#: Engine/fgens.c:3223 msgid "GEN53: mode must be in the range 0 to 15" msgstr "" -#: Engine/fgens.c:3207 +#: Engine/fgens.c:3227 msgid "GEN53: invalid source table length" msgstr "" -#: Engine/fgens.c:3212 +#: Engine/fgens.c:3232 msgid "GEN53: invalid window table" msgstr "" @@ -852,21 +852,21 @@ msgid "Instrument %d muted\n" msgstr "" -#: Engine/insert.c:144 Engine/insert.c:374 +#: Engine/insert.c:144 Engine/insert.c:376 #, c-format msgid "cannot allocate last note because it exceeds 100%% of cpu time" msgstr "" -#: Engine/insert.c:150 Engine/insert.c:380 +#: Engine/insert.c:150 Engine/insert.c:382 msgid "cannot allocate last note because it exceeds instr maxalloc" msgstr "" -#: Engine/insert.c:168 Engine/insert.c:400 +#: Engine/insert.c:168 #, c-format msgid "new alloc for instr %s:\n" msgstr "" -#: Engine/insert.c:170 Engine/insert.c:402 +#: Engine/insert.c:170 #, c-format msgid "new alloc for instr %d:\n" msgstr "" @@ -881,147 +881,157 @@ msgid "instr %d uses %d p-fields but is given %d" msgstr "" -#: Engine/insert.c:345 Engine/insert.c:573 +#: Engine/insert.c:345 Engine/insert.c:575 #, c-format msgid "instr %s now active:\n" msgstr "" -#: Engine/insert.c:347 Engine/insert.c:575 +#: Engine/insert.c:347 Engine/insert.c:577 #, c-format msgid "instr %d now active:\n" msgstr "" -#: Engine/insert.c:389 +#: Engine/insert.c:391 #, c-format -msgid "activating instr %s\n" +msgid "MIDI activating instr %s\n" msgstr "" -#: Engine/insert.c:391 +#: Engine/insert.c:393 +#, c-format +msgid "MIDI activating instr %d\n" +msgstr "" + +#: Engine/insert.c:402 +#, c-format +msgid "new MIDI alloc for instr %s:\n" +msgstr "" + +#: Engine/insert.c:404 #, c-format -msgid "activating instr %d\n" +msgid "new MIDI alloc for instr %d:\n" msgstr "" -#: Engine/insert.c:416 +#: Engine/insert.c:418 #, c-format msgid "MIDI note overlaps with key %d on same channel" msgstr "" -#: Engine/insert.c:683 +#: Engine/insert.c:685 #, c-format msgid "removed instance of instr %s\n" msgstr "" -#: Engine/insert.c:685 +#: Engine/insert.c:687 #, c-format msgid "removed instance of instr %d\n" msgstr "" -#: Engine/insert.c:843 +#: Engine/insert.c:851 msgid "inactive allocs returned to freespace\n" msgstr "" -#: Engine/insert.c:869 +#: Engine/insert.c:877 #, c-format msgid "could not find playing instr %f\n" msgstr "" -#: Engine/insert.c:882 +#: Engine/insert.c:890 msgid "" "\n" "INIT ERROR: " msgstr "" -#: Engine/insert.c:895 +#: Engine/insert.c:903 #, c-format msgid "INIT ERROR in instr %d (opcode %s): " msgstr "" -#: Engine/insert.c:898 +#: Engine/insert.c:906 #, c-format msgid "INIT ERROR in instr %d (subinstr %d): " msgstr "" -#: Engine/insert.c:902 +#: Engine/insert.c:910 #, c-format msgid "INIT ERROR in instr %d: " msgstr "" -#: Engine/insert.c:923 +#: Engine/insert.c:931 #, c-format msgid "PERF ERROR in instr %d (opcode %s): " msgstr "" -#: Engine/insert.c:926 +#: Engine/insert.c:934 #, c-format msgid "PERF ERROR in instr %d (subinstr %d): " msgstr "" -#: Engine/insert.c:930 +#: Engine/insert.c:938 #, c-format msgid "PERF ERROR in instr %d: " msgstr "" -#: Engine/insert.c:935 +#: Engine/insert.c:943 msgid " note aborted\n" msgstr "" -#: Engine/insert.c:954 +#: Engine/insert.c:962 msgid "subinstr: number of output args greater than nchnls" msgstr "" -#: Engine/insert.c:1022 +#: Engine/insert.c:1030 msgid "subinstr: too many p-fields" msgstr "" -#: Engine/insert.c:1127 +#: Engine/insert.c:1135 #, c-format msgid "%s: invalid local ksmps value: %d" msgstr "" -#: Engine/insert.c:1259 OOps/bus.c:611 Opcodes/stackops.c:293 +#: Engine/insert.c:1278 OOps/bus.c:614 Opcodes/stackops.c:293 #, c-format msgid "%s: not initialised" msgstr "" -#: Engine/insert.c:1442 +#: Engine/insert.c:1458 #, c-format msgid "setksmps: invalid ksmps value: %d, original: %d" msgstr "" -#: Engine/insert.c:1564 +#: Engine/insert.c:1595 msgid "subinstr: not initialised" msgstr "" -#: Engine/insert.c:2005 +#: Engine/insert.c:2046 #, c-format msgid "" "instr %d allocated at %p\n" "\tlclbas %p, opds %p\n" msgstr "" -#: Engine/insert.c:2023 +#: Engine/insert.c:2064 #, c-format msgid "op (%s) allocated at %p\n" msgstr "" -#: Engine/insert.c:2048 +#: Engine/insert.c:2089 msgid "null iopadr" msgstr "" -#: Engine/insert.c:2059 +#: Engine/insert.c:2100 msgid "null opadr" msgstr "" -#: Engine/insert.c:2131 +#: Engine/insert.c:2182 msgid "inconsistent opds total" msgstr "" -#: Engine/insert.c:2192 +#: Engine/insert.c:2243 #, c-format msgid "Instrument %s is still active" msgstr "" -#: Engine/insert.c:2195 +#: Engine/insert.c:2246 #, c-format msgid "Instrument %d is still active" msgstr "" @@ -1045,40 +1055,40 @@ msgid "stdmode = %.8x Linefd = %d\n" msgstr "" -#: Engine/linevent.c:186 +#: Engine/linevent.c:184 msgid "LineBuffer Overflow - Input Data has been Lost" msgstr "" -#: Engine/linevent.c:239 +#: Engine/linevent.c:238 #, c-format msgid "unknown opcode %c" msgstr "" -#: Engine/linevent.c:259 +#: Engine/linevent.c:258 msgid "unmatched quotes" msgstr "" -#: Engine/linevent.c:286 +#: Engine/linevent.c:285 msgid "dot carry has no reference" msgstr "" -#: Engine/linevent.c:291 +#: Engine/linevent.c:290 msgid "cannot carry string p-field" msgstr "" -#: Engine/linevent.c:302 +#: Engine/linevent.c:301 msgid "too few pfields" msgstr "" -#: Engine/linevent.c:306 +#: Engine/linevent.c:305 msgid "-L with negative p2 illegal" msgstr "" -#: Engine/linevent.c:317 +#: Engine/linevent.c:316 msgid "too many pfields" msgstr "" -#: Engine/linevent.c:329 +#: Engine/linevent.c:328 #, c-format msgid "" "illegal RT scoreline:\n" @@ -1086,24 +1096,28 @@ "%*s" msgstr "" -#: Engine/linevent.c:351 +#: Engine/linevent.c:350 msgid "event: param 1 must be \"a\", \"i\", \"q\", \"f\", or \"e\"" msgstr "" -#: Engine/linevent.c:353 +#: Engine/linevent.c:352 msgid "event: string name is allowed only for \"i\" and \"q\" events" msgstr "" -#: Engine/linevent.c:394 +#: Engine/linevent.c:395 #, c-format msgid "event: error creating '%c' event" msgstr "" -#: Engine/linevent.c:457 +#: Engine/linevent.c:459 #, c-format msgid "event_i: error creating '%c' event" msgstr "" +#: Engine/linevent.c:505 +msgid "instance: error creating event" +msgstr "" + #: Engine/memalloc.c:58 #, c-format msgid "memory allocate failure for %lu" @@ -1170,7 +1184,7 @@ msgstr "" #: Engine/memfiles.c:511 Opcodes/pvinterp.c:77 Opcodes/pvinterp.c:193 -#: Opcodes/pvinterp.c:383 Opcodes/ugens9.c:104 Opcodes/vpvoc.c:210 +#: Opcodes/pvinterp.c:383 Opcodes/ugens9.c:104 Opcodes/vpvoc.c:212 #, c-format msgid "%s's srate = %8.0f, orch's srate = %8.0f" msgstr "" @@ -1204,22 +1218,22 @@ msgid "Beat mode not in force" msgstr "" -#: Engine/musmon.c:173 Top/csound.c:2854 +#: Engine/musmon.c:173 Top/csound.c:2859 #, c-format msgid "Csound version %s beta (double samples) %s\n" msgstr "" -#: Engine/musmon.c:176 Top/csound.c:2857 +#: Engine/musmon.c:176 Top/csound.c:2862 #, c-format msgid "Csound version %s (double samples) %s\n" msgstr "" -#: Engine/musmon.c:181 Top/csound.c:2846 +#: Engine/musmon.c:181 Top/csound.c:2851 #, c-format msgid "Csound version %s beta (float samples) %s\n" msgstr "" -#: Engine/musmon.c:184 Top/csound.c:2849 +#: Engine/musmon.c:184 Top/csound.c:2854 #, c-format msgid "Csound version %s (float samples) %s\n" msgstr "" @@ -1261,7 +1275,7 @@ msgid "sorting cscore.out ..\n" msgstr "" -#: Engine/musmon.c:340 Top/main.c:329 +#: Engine/musmon.c:340 Top/main.c:297 msgid "\t... done\n" msgstr "" @@ -1269,8 +1283,8 @@ msgid "playing from cscore.srt\n" msgstr "" -#: Engine/musmon.c:345 Engine/musmon.c:497 Engine/musmon.c:1119 -#: Engine/musmon.c:1329 +#: Engine/musmon.c:345 Engine/musmon.c:501 Engine/musmon.c:1124 +#: Engine/musmon.c:1335 #, c-format msgid "SECTION %d:\n" msgstr "" @@ -1280,125 +1294,125 @@ msgid "%c\tbeep!\n" msgstr "" -#: Engine/musmon.c:450 +#: Engine/musmon.c:454 msgid "end of score.\t\t overall amps:" msgstr "" -#: Engine/musmon.c:461 +#: Engine/musmon.c:465 msgid "" "\n" "\t overall samples out of range:" msgstr "" -#: Engine/musmon.c:465 +#: Engine/musmon.c:469 #, c-format msgid "" "\n" "%d errors in performance\n" msgstr "" -#: Engine/musmon.c:467 +#: Engine/musmon.c:471 msgid "end of performance" msgstr "" -#: Engine/musmon.c:480 +#: Engine/musmon.c:484 msgid "no sound written to disk\n" msgstr "" -#: Engine/musmon.c:572 Engine/musmon.c:618 +#: Engine/musmon.c:577 Engine/musmon.c:623 msgid "\t number of samples out of range:" msgstr "" -#: Engine/musmon.c:611 +#: Engine/musmon.c:616 #, c-format msgid "end of section %d\t sect peak amps:" msgstr "" -#: Engine/musmon.c:613 +#: Engine/musmon.c:618 msgid "end of lplay event list\t peak amps:" msgstr "" -#: Engine/musmon.c:678 Engine/musmon.c:705 +#: Engine/musmon.c:683 Engine/musmon.c:710 #, c-format msgid " - note deleted. instr %s undefined" msgstr "" -#: Engine/musmon.c:682 +#: Engine/musmon.c:687 #, c-format msgid "Setting instrument %s %s\n" msgstr "" -#: Engine/musmon.c:683 Engine/musmon.c:697 +#: Engine/musmon.c:688 Engine/musmon.c:702 msgid "off" msgstr "" -#: Engine/musmon.c:683 Engine/musmon.c:697 +#: Engine/musmon.c:688 Engine/musmon.c:702 msgid "on" msgstr "" -#: Engine/musmon.c:692 Engine/musmon.c:734 +#: Engine/musmon.c:697 Engine/musmon.c:739 #, c-format msgid " - note deleted. instr %d(%d) undefined" msgstr "" -#: Engine/musmon.c:696 +#: Engine/musmon.c:701 #, c-format msgid "Setting instrument %d %s\n" msgstr "" -#: Engine/musmon.c:724 +#: Engine/musmon.c:729 #, c-format msgid " - note deleted. i%d (%s) had %d init errors" msgstr "" -#: Engine/musmon.c:755 +#: Engine/musmon.c:760 #, c-format msgid " - note deleted. i%d had %d init errors" msgstr "" -#: Engine/musmon.c:776 +#: Engine/musmon.c:781 #, c-format msgid "time advanced %5.3f beats by score request\n" msgstr "" -#: Engine/musmon.c:794 +#: Engine/musmon.c:799 #, c-format msgid "\t\t T%7.3f - note deleted. " msgstr "" -#: Engine/musmon.c:798 +#: Engine/musmon.c:803 #, c-format msgid "instr %s had %d init errors\n" msgstr "" -#: Engine/musmon.c:801 +#: Engine/musmon.c:806 #, c-format msgid "instr %d had %d init errors\n" msgstr "" -#: Engine/musmon.c:893 +#: Engine/musmon.c:898 msgid "terminating.\n" msgstr "" -#: Engine/musmon.c:980 +#: Engine/musmon.c:985 #, c-format msgid "error in score. illegal opcode %c (ASCII %d)\n" msgstr "" -#: Engine/musmon.c:1241 +#: Engine/musmon.c:1247 msgid "insert_score_event(): invalid instrument number or name\n" msgstr "" -#: Engine/musmon.c:1261 +#: Engine/musmon.c:1267 #, c-format msgid "insert_score_event(): unknown opcode: %c\n" msgstr "" -#: Engine/musmon.c:1284 +#: Engine/musmon.c:1290 msgid "insert_score_event(): insufficient p-fields\n" msgstr "" -#: Engine/musmon.c:1338 +#: Engine/musmon.c:1344 msgid "cannot rewind score: no score in memory \n" msgstr "" @@ -1416,29 +1430,29 @@ msgid "cannot find the specified instrument or opcode" msgstr "" -#: Engine/new_orc_parser.c:92 Top/main.c:264 +#: Engine/new_orc_parser.c:144 #, c-format msgid "Failed to open input file %s\n" msgstr "" -#: Engine/new_orc_parser.c:122 +#: Engine/new_orc_parser.c:177 msgid "Unmatched #ifdef\n" msgstr "" -#: Engine/new_orc_parser.c:156 +#: Engine/new_orc_parser.c:212 msgid "Parsing failed due to invalid input!\n" msgstr "" -#: Engine/new_orc_parser.c:160 +#: Engine/new_orc_parser.c:216 msgid "Parsing failed due to memory exhaustion!\n" msgstr "" -#: Engine/new_orc_parser.c:163 +#: Engine/new_orc_parser.c:219 #, c-format msgid "Parsing failed due to %d syntax error%s!\n" msgstr "" -#: Engine/new_orc_parser.c:208 +#: Engine/new_orc_parser.c:264 msgid "Stopping on parser failure\n" msgstr "" @@ -1453,7 +1467,7 @@ "\tremainder of line flushed\n" msgstr "" -#: Engine/rdscor.c:159 +#: Engine/rdscor.c:160 msgid "ERROR: too many pfields: " msgstr "" @@ -1680,8 +1694,8 @@ msgid "! invalid in p1, p2, or p3" msgstr "" -#: Engine/sread.c:1266 Engine/sread.c:1271 Engine/sread.c:1749 -#: Engine/sread.c:1772 Engine/sread.c:1786 +#: Engine/sread.c:1266 Engine/sread.c:1271 Engine/sread.c:1754 +#: Engine/sread.c:1777 Engine/sread.c:1791 msgid " remainder of line flushed\n" msgstr "" @@ -1729,47 +1743,47 @@ msgid "Not #include" msgstr "" -#: Engine/sread.c:1674 +#: Engine/sread.c:1679 #, c-format msgid "Cannot open #include'd file %s" msgstr "" -#: Engine/sread.c:1684 +#: Engine/sread.c:1689 msgid "Not #undef" msgstr "" -#: Engine/sread.c:1705 +#: Engine/sread.c:1710 #, c-format msgid "macro %s undefined\n" msgstr "" -#: Engine/sread.c:1711 +#: Engine/sread.c:1716 msgid "unknown # option" msgstr "" -#: Engine/sread.c:1748 +#: Engine/sread.c:1753 #, c-format msgid "illegal opcode %c" msgstr "" -#: Engine/sread.c:1771 +#: Engine/sread.c:1776 #, c-format msgid "unexpected char %c" msgstr "" -#: Engine/sread.c:1785 +#: Engine/sread.c:1790 msgid "illegally placed string" msgstr "" -#: Engine/sread.c:1792 +#: Engine/sread.c:1797 msgid "unmatched quote" msgstr "" -#: Engine/sread.c:1836 +#: Engine/sread.c:1841 msgid "sread: illegal number format: " msgstr "" -#: Engine/sread.c:1842 +#: Engine/sread.c:1847 msgid " zero substituted.\n" msgstr "" @@ -2392,56 +2406,56 @@ msgid "unrecognised message type %d" msgstr "" -#: InOut/midirecv.c:400 +#: InOut/midirecv.c:402 #, c-format msgid "midi channel %d using instr %d\n" msgstr "" -#: InOut/midirecv.c:403 +#: InOut/midirecv.c:405 #, c-format msgid "midi channel %d is muted\n" msgstr "" -#: InOut/midirecv.c:421 +#: InOut/midirecv.c:423 #, c-format msgid "MIDI channel %d muted\n" msgstr "" -#: InOut/midirecv.c:426 +#: InOut/midirecv.c:428 #, c-format msgid "Insno = %d\n" msgstr "" -#: InOut/midirecv.c:427 +#: InOut/midirecv.c:429 msgid "unknown instr" msgstr "" -#: InOut/midirecv.c:430 +#: InOut/midirecv.c:432 #, c-format msgid "chnl %d using instr %d\n" msgstr "" -#: InOut/midirecv.c:490 +#: InOut/midirecv.c:492 #, c-format msgid " *** error reading MIDI device: %d (%s)" msgstr "" -#: InOut/midirecv.c:519 +#: InOut/midirecv.c:521 #, c-format msgid "undefined sys-realtime msg %x\n" msgstr "" -#: InOut/midirecv.c:537 +#: InOut/midirecv.c:539 #, c-format msgid "undefined sys_common msg %x\n" msgstr "" -#: InOut/midirecv.c:599 +#: InOut/midirecv.c:601 #, c-format msgid "Error closing MIDI in device: %d (%s)" msgstr "" -#: InOut/midirecv.c:606 +#: InOut/midirecv.c:608 #, c-format msgid "Error closing MIDI out device: %d (%s)" msgstr "" @@ -3681,77 +3695,77 @@ msgid "non-looping sample" msgstr "" -#: OOps/aops.c:1041 OOps/aops.c:1069 +#: OOps/aops.c:1037 OOps/aops.c:1065 #, c-format msgid "No tuning table %d" msgstr "" -#: OOps/aops.c:1114 OOps/aops.c:1152 +#: OOps/aops.c:1110 OOps/aops.c:1148 msgid "cpstun: invalid table" msgstr "" -#: OOps/aops.c:1544 OOps/aops.c:1580 +#: OOps/aops.c:1540 OOps/aops.c:1576 #, c-format msgid "Input channel %d too large; ignored" msgstr "" -#: OOps/aops.c:1576 +#: OOps/aops.c:1572 msgid "Input and output argument count differs in inch" msgstr "" -#: OOps/aops.c:2014 +#: OOps/aops.c:2010 msgid "Unknown function called" msgstr "" -#: OOps/aops.c:2050 +#: OOps/aops.c:2046 msgid "number of arguments != nchnls" msgstr "" -#: OOps/aops.c:2080 +#: OOps/aops.c:2076 msgid "outrg: channel number cannot be < 1 (1 is the first channel)" msgstr "" -#: OOps/bus.c:80 OOps/bus.c:102 OOps/bus.c:127 OOps/bus.c:155 +#: OOps/bus.c:83 OOps/bus.c:105 OOps/bus.c:130 OOps/bus.c:158 msgid "chani: invalid index" msgstr "" -#: OOps/bus.c:88 OOps/bus.c:134 +#: OOps/bus.c:91 OOps/bus.c:137 #, c-format msgid "chani error %d:channel not found or not right type" msgstr "" -#: OOps/bus.c:110 OOps/bus.c:162 +#: OOps/bus.c:113 OOps/bus.c:165 #, c-format msgid "chano error %d:channel not found or not right type" msgstr "" -#: OOps/bus.c:216 +#: OOps/bus.c:219 msgid "pvsin: invalid index" msgstr "" -#: OOps/bus.c:224 +#: OOps/bus.c:227 #, c-format msgid "pvsin error %d:channel not found or not right type" msgstr "" -#: OOps/bus.c:279 +#: OOps/bus.c:282 msgid "pvsout: invalid index" msgstr "" -#: OOps/bus.c:287 +#: OOps/bus.c:290 #, c-format msgid "pvsout error %d:channel not found or not right type" msgstr "" -#: OOps/bus.c:1026 OOps/bus.c:1075 OOps/bus.c:1096 OOps/bus.c:1143 +#: OOps/bus.c:1029 OOps/bus.c:1078 OOps/bus.c:1099 OOps/bus.c:1146 msgid "invalid mode parameter" msgstr "" -#: OOps/bus.c:1063 OOps/bus.c:1187 +#: OOps/bus.c:1066 OOps/bus.c:1187 msgid "invalid channel parameters" msgstr "" -#: OOps/bus.c:1151 +#: OOps/bus.c:1154 msgid "channel already exists" msgstr "" @@ -3799,11 +3813,11 @@ msgid "diskin2: invalid number of channels" msgstr "" -#: OOps/diskin2.c:289 OOps/diskin2.c:1741 +#: OOps/diskin2.c:289 OOps/diskin2.c:1745 msgid "diskin2: unknown sample format" msgstr "" -#: OOps/diskin2.c:304 OOps/diskin2.c:1756 +#: OOps/diskin2.c:304 OOps/diskin2.c:1760 #, c-format msgid "diskin2: %s: failed to open file" msgstr "" @@ -3813,19 +3827,19 @@ "diskin2: number of output args inconsistent with number of file channels" msgstr "" -#: OOps/diskin2.c:346 OOps/diskin2.c:1813 +#: OOps/diskin2.c:346 OOps/diskin2.c:1817 #, c-format msgid "diskin2: warning: file sample rate (%d) != orchestra sr (%d)\n" msgstr "" -#: OOps/diskin2.c:427 OOps/diskin2.c:1894 +#: OOps/diskin2.c:427 OOps/diskin2.c:1905 #, c-format msgid "" "diskin2: opened (asynchronously) '%s':\n" " %d Hz, %d channel(s), %ld sample frames\n" msgstr "" -#: OOps/diskin2.c:441 OOps/diskin2.c:1908 +#: OOps/diskin2.c:441 OOps/diskin2.c:1919 #, c-format msgid "" "diskin2: opened '%s':\n" @@ -3833,12 +3847,12 @@ msgstr "" #: OOps/diskin2.c:520 OOps/diskin2.c:706 OOps/diskin2.c:902 -#: OOps/diskin2.c:1526 OOps/diskin2.c:1940 OOps/diskin2.c:2133 +#: OOps/diskin2.c:1529 OOps/diskin2.c:1951 OOps/diskin2.c:2144 msgid "diskin2: not initialised" msgstr "" -#: OOps/diskin2.c:686 OOps/diskin2.c:877 OOps/diskin2.c:1697 -#: OOps/diskin2.c:2106 +#: OOps/diskin2.c:686 OOps/diskin2.c:877 OOps/diskin2.c:1700 +#: OOps/diskin2.c:2117 msgid "diskin2: file descriptor closed or invalid\n" msgstr "" @@ -3904,7 +3918,7 @@ msgid "soundouts: not initialised" msgstr "" -#: OOps/diskin2.c:1782 +#: OOps/diskin2.c:1786 msgid "diskin2: output array too small" msgstr "" @@ -4678,12 +4692,12 @@ msgid "channel already specific remote" msgstr "" -#: OOps/remote.c:589 OOps/remote.c:614 OOps/remote.c:639 +#: OOps/remote.c:590 OOps/remote.c:615 OOps/remote.c:640 msgid "CLsend failed" msgstr "" -#: OOps/remote.c:706 OOps/remote.c:714 OOps/remote.c:722 OOps/remote.c:730 -#: OOps/remote.c:738 +#: OOps/remote.c:707 OOps/remote.c:715 OOps/remote.c:723 OOps/remote.c:731 +#: OOps/remote.c:739 msgid "" "*** This version of Csound was not compiled with remote event support ***\n" msgstr "" @@ -4698,11 +4712,11 @@ msgid "schedkwhen ignored. Instrument %d undefined\n" msgstr "" -#: OOps/schedule.c:429 +#: OOps/schedule.c:430 msgid "schedkwhen warning: negative kwhen reset to zero" msgstr "" -#: OOps/schedule.c:454 OOps/schedule.c:477 +#: OOps/schedule.c:455 OOps/schedule.c:478 msgid "trigseq: incorrect table number" msgstr "" @@ -4728,25 +4742,25 @@ msgid "filepeak: error getting peak value" msgstr "" -#: OOps/str_ops.c:60 +#: OOps/str_ops.c:64 msgid "illegal strset index" msgstr "" -#: OOps/str_ops.c:68 +#: OOps/str_ops.c:72 #, c-format msgid "strset index conflict at %d" msgstr "" -#: OOps/str_ops.c:69 +#: OOps/str_ops.c:73 #, c-format msgid "previous value: '%s', replaced with '%s'" msgstr "" -#: OOps/str_ops.c:93 OOps/str_ops.c:100 +#: OOps/str_ops.c:97 OOps/str_ops.c:104 msgid "--strset: invalid format" msgstr "" -#: OOps/str_ops.c:921 +#: OOps/str_ops.c:925 #, c-format msgid "invalid option code: %g" msgstr "" @@ -4893,27 +4907,27 @@ msgid "osciln: not initialised" msgstr "" -#: OOps/ugens2.c:1168 +#: OOps/ugens2.c:1210 msgid "oscil(krate): not initialised" msgstr "" -#: OOps/ugens2.c:1203 OOps/ugens2.c:1239 OOps/ugens2.c:1272 OOps/ugens2.c:1307 +#: OOps/ugens2.c:1245 OOps/ugens2.c:1281 OOps/ugens2.c:1314 OOps/ugens2.c:1349 msgid "oscil: not initialised" msgstr "" -#: OOps/ugens2.c:1330 +#: OOps/ugens2.c:1372 msgid "oscili(krate): not initialised" msgstr "" -#: OOps/ugens2.c:1365 OOps/ugens2.c:1405 OOps/ugens2.c:1441 OOps/ugens2.c:1480 +#: OOps/ugens2.c:1407 OOps/ugens2.c:1447 OOps/ugens2.c:1483 OOps/ugens2.c:1522 msgid "oscili: not initialised" msgstr "" -#: OOps/ugens2.c:1521 +#: OOps/ugens2.c:1563 msgid "oscil3(krate): not initialised" msgstr "" -#: OOps/ugens2.c:1580 OOps/ugens2.c:1636 OOps/ugens2.c:1689 OOps/ugens2.c:1744 +#: OOps/ugens2.c:1622 OOps/ugens2.c:1678 OOps/ugens2.c:1731 OOps/ugens2.c:1786 msgid "oscil3: not initialised" msgstr "" @@ -5037,120 +5051,124 @@ msgid "pluck: kcps more than sample rate" msgstr "" -#: OOps/ugens4.c:472 OOps/ugens4.c:580 OOps/ugens4.c:685 +#: OOps/ugens4.c:472 OOps/ugens4.c:580 OOps/ugens4.c:686 #, c-format msgid "Seeding from current time %lu\n" msgstr "" -#: OOps/ugens5.c:287 OOps/ugens5.c:396 Opcodes/gab/gab.c:48 Opcodes/ugsc.c:209 +#: OOps/ugens5.c:287 OOps/ugens5.c:400 Opcodes/gab/gab.c:50 Opcodes/ugsc.c:211 #, c-format msgid "illegal reson iscl value, %f" msgstr "" -#: OOps/ugens5.c:616 +#: OOps/ugens5.c:623 #, c-format msgid "LPREAD cannot load %s" msgstr "" -#: OOps/ugens5.c:627 +#: OOps/ugens5.c:634 #, c-format msgid "Using %s type of file.\n" msgstr "" -#: OOps/ugens5.c:628 +#: OOps/ugens5.c:635 msgid "pole" msgstr "" -#: OOps/ugens5.c:628 +#: OOps/ugens5.c:635 msgid "filter coefficient" msgstr "" -#: OOps/ugens5.c:633 +#: OOps/ugens5.c:640 msgid "lpheader overriding inputs" msgstr "" -#: OOps/ugens5.c:637 +#: OOps/ugens5.c:644 msgid "lpfile srate != orch sr" msgstr "" -#: OOps/ugens5.c:645 +#: OOps/ugens5.c:652 #, c-format msgid "file %s bytes are in wrong order" msgstr "" -#: OOps/ugens5.c:655 +#: OOps/ugens5.c:662 msgid "insufficient args and no file header" msgstr "" -#: OOps/ugens5.c:660 +#: OOps/ugens5.c:667 msgid "npoles > MAXPOLES" msgstr "" -#: OOps/ugens5.c:668 +#: OOps/ugens5.c:675 #, c-format msgid "npoles %ld, nvals %ld, totvals %ld, lastfram16 = %lx\n" msgstr "" -#: OOps/ugens5.c:692 util/lpanal.c:324 +#: OOps/ugens5.c:700 util/lpanal.c:324 #, c-format msgid "magnitude: %f Phase: %f\n" msgstr "" -#: OOps/ugens5.c:695 util/lpanal.c:327 +#: OOps/ugens5.c:703 util/lpanal.c:327 #, c-format msgid "Real: %f Imag: %f\n" msgstr "" -#: OOps/ugens5.c:863 +#: OOps/ugens5.c:758 +msgid "Cannot handle uneven pole count yet \n" +msgstr "" + +#: OOps/ugens5.c:871 msgid "lpread: not initialised" msgstr "" -#: OOps/ugens5.c:869 +#: OOps/ugens5.c:877 msgid "lpread timpnt < 0" msgstr "" -#: OOps/ugens5.c:875 +#: OOps/ugens5.c:883 msgid "lpread ktimpnt truncated to last frame" msgstr "" -#: OOps/ugens5.c:906 OOps/ugens5.c:1409 +#: OOps/ugens5.c:914 OOps/ugens5.c:1417 msgid "Interpolation failed" msgstr "" -#: OOps/ugens5.c:964 +#: OOps/ugens5.c:972 msgid "this opcode only works with LPC pole analysis type (-a)\n" msgstr "" -#: OOps/ugens5.c:1098 +#: OOps/ugens5.c:1106 msgid "Pole file not supported for this opcode !" msgstr "" -#: OOps/ugens5.c:1125 +#: OOps/ugens5.c:1133 #, c-format msgid "illegal frqratio, %5.2f" msgstr "" -#: OOps/ugens5.c:1335 +#: OOps/ugens5.c:1343 msgid "lpslot number should be positive" msgstr "" -#: OOps/ugens5.c:1355 +#: OOps/ugens5.c:1363 msgid "LPC slot is not allocated" msgstr "" -#: OOps/ugens5.c:1363 +#: OOps/ugens5.c:1371 msgid "lpinterpol works only with poles files.." msgstr "" -#: OOps/ugens5.c:1367 +#: OOps/ugens5.c:1375 msgid "The poles files have different pole count" msgstr "" -#: OOps/ugens5.c:1373 +#: OOps/ugens5.c:1381 msgid "padding error" msgstr "" -#: OOps/ugens5.c:1393 +#: OOps/ugens5.c:1401 msgid "lpinterpol: not initialised" msgstr "" @@ -5188,48 +5206,52 @@ msgid "delayw: not initialised" msgstr "" -#: OOps/ugens6.c:475 OOps/ugens6.c:774 OOps/ugens6.c:859 +#: OOps/ugens6.c:475 OOps/ugens6.c:785 OOps/ugens6.c:870 msgid "deltap: not initialised" msgstr "" -#: OOps/ugens6.c:530 +#: OOps/ugens6.c:532 msgid "deltapi: not initialised" msgstr "" -#: OOps/ugens6.c:583 +#: OOps/ugens6.c:535 OOps/ugens6.c:677 +msgid "deltapi: INF delaytime" +msgstr "" + +#: OOps/ugens6.c:588 msgid "deltapn: not initialised" msgstr "" -#: OOps/ugens6.c:667 +#: OOps/ugens6.c:674 msgid "deltap3: not initialised" msgstr "" -#: OOps/ugens6.c:896 OOps/ugens6.c:900 Opcodes/ugmoss.c:483 +#: OOps/ugens6.c:907 OOps/ugens6.c:911 Opcodes/ugmoss.c:483 #: Opcodes/ugmoss.c:487 msgid "illegal loop time" msgstr "" -#: OOps/ugens6.c:963 +#: OOps/ugens6.c:974 msgid "comb: not initialised" msgstr "" -#: OOps/ugens6.c:1002 +#: OOps/ugens6.c:1013 msgid "combinv: not initialised" msgstr "" -#: OOps/ugens6.c:1039 +#: OOps/ugens6.c:1050 msgid "alpass: not initialised" msgstr "" -#: OOps/ugens6.c:1072 +#: OOps/ugens6.c:1083 msgid "revlpsiz inconsistent\n" msgstr "" -#: OOps/ugens6.c:1163 +#: OOps/ugens6.c:1174 msgid "reverb: not intialised" msgstr "" -#: OOps/ugens6.c:1237 +#: OOps/ugens6.c:1248 msgid "pan: not initialised" msgstr "" @@ -5392,10 +5414,10 @@ msgstr "" #: OOps/ugtabs.c:38 OOps/ugtabs.c:74 OOps/ugtabs.c:154 OOps/ugtabs.c:266 -#: OOps/ugtabs.c:428 OOps/ugtabs.c:445 OOps/ugtabs.c:461 OOps/ugtabs.c:477 -#: OOps/ugtabs.c:493 OOps/ugtabs.c:508 OOps/ugtabs.c:528 OOps/ugtabs.c:615 -#: OOps/ugtabs.c:632 OOps/ugtabs.c:646 OOps/ugtabs.c:659 OOps/ugtabs.c:695 -#: OOps/ugtabs.c:702 OOps/ugtabs.c:709 OOps/ugtabs.c:793 OOps/ugtabs.c:839 +#: OOps/ugtabs.c:428 OOps/ugtabs.c:445 OOps/ugtabs.c:461 OOps/ugtabs.c:478 +#: OOps/ugtabs.c:493 OOps/ugtabs.c:508 OOps/ugtabs.c:528 OOps/ugtabs.c:616 +#: OOps/ugtabs.c:633 OOps/ugtabs.c:647 OOps/ugtabs.c:660 OOps/ugtabs.c:696 +#: OOps/ugtabs.c:703 OOps/ugtabs.c:710 OOps/ugtabs.c:794 OOps/ugtabs.c:840 #, c-format msgid "table: could not find ftable %d" msgstr "" @@ -5408,12 +5430,12 @@ msgid "tablekt: index type inconsistent with output" msgstr "" -#: OOps/ugtabs.c:673 +#: OOps/ugtabs.c:674 #, c-format msgid "table: could not find ftables %d and/or %d" msgstr "" -#: OOps/ugtabs.c:802 OOps/ugtabs.c:848 +#: OOps/ugtabs.c:803 OOps/ugtabs.c:849 #, c-format msgid "table: could not read negative pos %d" msgstr "" @@ -5806,19 +5828,19 @@ msgid "crossfm: ftable not found" msgstr "" -#: Opcodes/date.c:96 +#: Opcodes/date.c:97 msgid "cannot determine current directory" msgstr "" -#: Opcodes/date.c:133 +#: Opcodes/date.c:134 msgid "readf: failed to open file" msgstr "" -#: Opcodes/date.c:159 +#: Opcodes/date.c:161 msgid "readf: read failure" msgstr "" -#: Opcodes/date.c:169 Opcodes/date.c:177 +#: Opcodes/date.c:171 Opcodes/date.c:179 msgid "readi failed to initialise" msgstr "" @@ -6068,12 +6090,12 @@ msgid "ftconv: not initialised" msgstr "" -#: Opcodes/ftgen.c:69 Opcodes/ftgen.c:212 +#: Opcodes/ftgen.c:69 Opcodes/ftgen.c:213 #, c-format msgid "Error deleting ftable %d" msgstr "" -#: Opcodes/ftgen.c:137 Opcodes/signalflowgraph.cpp:1175 +#: Opcodes/ftgen.c:137 Opcodes/signalflowgraph.cpp:1383 msgid "ftgen string arg not allowed" msgstr "" @@ -6081,105 +6103,105 @@ msgid "ftgen error" msgstr "" -#: Opcodes/ftgen.c:209 +#: Opcodes/ftgen.c:210 #, c-format msgid "Invalid table number: %d" msgstr "" -#: Opcodes/ftgen.c:392 +#: Opcodes/ftgen.c:393 msgid "ftload: error allocating ftable" msgstr "" -#: Opcodes/ftgen.c:394 +#: Opcodes/ftgen.c:395 msgid "ftload: no table numbers" msgstr "" -#: Opcodes/ftgen.c:396 +#: Opcodes/ftgen.c:397 msgid "ftload: unable to open file" msgstr "" -#: Opcodes/ftgen.c:399 +#: Opcodes/ftgen.c:400 msgid "ftload: incorrect file" msgstr "" -#: Opcodes/ftgen.c:539 +#: Opcodes/ftgen.c:540 msgid "ftsave: Bad table number. Saving is possible only for existing tables." msgstr "" -#: Opcodes/ftgen.c:542 +#: Opcodes/ftgen.c:543 msgid "ftsave: no table numbers" msgstr "" -#: Opcodes/ftgen.c:544 +#: Opcodes/ftgen.c:545 msgid "ftsave: unable to open file" msgstr "" -#: Opcodes/ftgen.c:546 +#: Opcodes/ftgen.c:547 msgid "ftsave: failed to write file" msgstr "" -#: Opcodes/gab/gab.c:112 +#: Opcodes/gab/gab.c:114 msgid "fastab: incorrect table number" msgstr "" -#: Opcodes/gab/gab.c:139 Opcodes/gab/gab.c:148 Opcodes/gab/gab.c:178 +#: Opcodes/gab/gab.c:141 Opcodes/gab/gab.c:150 Opcodes/gab/gab.c:180 msgid "tabw off end" msgstr "" -#: Opcodes/gab/gab.c:164 Opcodes/gab/gab.c:241 Opcodes/gab/gab.c:250 +#: Opcodes/gab/gab.c:166 Opcodes/gab/gab.c:243 Opcodes/gab/gab.c:252 msgid "tab off end" msgstr "" -#: Opcodes/gab/gab.c:190 +#: Opcodes/gab/gab.c:192 msgid "tab_i: incorrect table number" msgstr "" -#: Opcodes/gab/gab.c:198 +#: Opcodes/gab/gab.c:200 #, c-format msgid "tab_i off end: table number: %d\n" msgstr "" -#: Opcodes/gab/gab.c:211 +#: Opcodes/gab/gab.c:213 msgid "tabw_i: incorrect table number" msgstr "" -#: Opcodes/gab/gab.c:218 +#: Opcodes/gab/gab.c:220 msgid "tabw_i off end" msgstr "" -#: Opcodes/gab/gab.c:263 +#: Opcodes/gab/gab.c:265 msgid "tab_init: incorrect table number" msgstr "" -#: Opcodes/gab/gab.c:332 +#: Opcodes/gab/gab.c:334 msgid "printi parameter was not a \"quoted string\"" msgstr "" -#: Opcodes/gab/gab.c:446 +#: Opcodes/gab/gab.c:448 msgid "adsynt2: wavetable not found!" msgstr "" -#: Opcodes/gab/gab.c:458 +#: Opcodes/gab/gab.c:460 msgid "adsynt2: freqtable not found!" msgstr "" -#: Opcodes/gab/gab.c:463 +#: Opcodes/gab/gab.c:465 msgid "adsynt2: partial count is greater than freqtable size!" msgstr "" -#: Opcodes/gab/gab.c:472 +#: Opcodes/gab/gab.c:474 msgid "adsynt2: amptable not found!" msgstr "" -#: Opcodes/gab/gab.c:477 +#: Opcodes/gab/gab.c:479 msgid "adsynt2: partial count is greater than amptable size!" msgstr "" -#: Opcodes/gab/gab.c:525 +#: Opcodes/gab/gab.c:527 msgid "adsynt2: not initialised" msgstr "" -#: Opcodes/gab/gab.c:759 +#: Opcodes/gab/gab.c:771 msgid "max_k: invalid imaxflag value" msgstr "" @@ -6697,11 +6719,11 @@ msgid "vlinseg/vexpseg: invalid num. of elements" msgstr "" -#: Opcodes/gab/vectorial.c:2255 Opcodes/vpvoc.c:119 +#: Opcodes/gab/vectorial.c:2255 Opcodes/vpvoc.c:121 msgid "tableseg: not initialised" msgstr "" -#: Opcodes/gab/vectorial.c:2285 Opcodes/vpvoc.c:148 +#: Opcodes/gab/vectorial.c:2285 Opcodes/vpvoc.c:150 msgid "tablexseg: not initialised" msgstr "" @@ -7099,8 +7121,8 @@ msgid "loscilx: invalid number of output arguments" msgstr "" -#: Opcodes/loscilx.c:209 Opcodes/loscilx.c:238 Opcodes/pvlock.c:152 -#: Opcodes/pvlock.c:375 Opcodes/pvsbasic.c:566 +#: Opcodes/loscilx.c:209 Opcodes/loscilx.c:238 Opcodes/pvlock.c:160 +#: Opcodes/pvlock.c:383 Opcodes/pvlock.c:657 Opcodes/pvsbasic.c:566 msgid "" "number of output arguments inconsistent with number of sound file channels" msgstr "" @@ -7109,7 +7131,12 @@ msgid "loscilx: not initialised" msgstr "" -#: Opcodes/lowpassr.c:85 Opcodes/lowpassr.c:140 +#: Opcodes/lowpassr.c:55 Opcodes/lowpassr.c:99 Opcodes/lowpassr.c:121 +#: Opcodes/lowpassr.c:155 Opcodes/lowpassr.c:176 Opcodes/lowpassr.c:210 +msgid "Cutoff parameter must be positive" +msgstr "" + +#: Opcodes/lowpassr.c:252 Opcodes/lowpassr.c:312 msgid "illegal order num. (min 1, max 10)" msgstr "" @@ -7324,20 +7351,20 @@ msgid "partikkel: " msgstr "" -#: Opcodes/partikkel.c:841 +#: Opcodes/partikkel.c:839 msgid "partikkelsync: opcode id needs to be a non-zero integer" msgstr "" -#: Opcodes/partikkel.c:845 Opcodes/partikkel.c:851 +#: Opcodes/partikkel.c:843 Opcodes/partikkel.c:849 msgid "partikkelsync: could not find opcode id" msgstr "" -#: Opcodes/partikkel.c:881 +#: Opcodes/partikkel.c:879 #, c-format msgid "%s: partikkel not initialized" msgstr "" -#: Opcodes/partikkel.c:889 +#: Opcodes/partikkel.c:887 #, c-format msgid "%s: could not find opcode id" msgstr "" @@ -7456,71 +7483,71 @@ msgid "adsynt: partial count is greater than amptable size!" msgstr "" -#: Opcodes/pitch.c:690 +#: Opcodes/pitch.c:691 msgid "adsynt: not initialised" msgstr "" -#: Opcodes/pitch.c:770 +#: Opcodes/pitch.c:771 msgid "hsboscil: not initialised" msgstr "" -#: Opcodes/pitch.c:856 +#: Opcodes/pitch.c:857 msgid "pitchamdf: maxcps must be > mincps !" msgstr "" -#: Opcodes/pitch.c:1003 +#: Opcodes/pitch.c:1004 msgid "pitchamdf: not initialised" msgstr "" -#: Opcodes/pitch.c:1184 Opcodes/pitch.c:1214 +#: Opcodes/pitch.c:1185 Opcodes/pitch.c:1215 msgid "phasorbnk: not initialised" msgstr "" -#: Opcodes/pitch.c:1281 +#: Opcodes/pitch.c:1282 msgid "pinkish: Invalid method code" msgstr "" -#: Opcodes/pitch.c:1292 +#: Opcodes/pitch.c:1293 msgid "pinkish: Filter method requires a-rate (noise) input" msgstr "" -#: Opcodes/pitch.c:1421 +#: Opcodes/pitch.c:1422 #, c-format msgid "" "pinkish: Gardner method requires 4-%d bands. Default %ld substituted for " "%d.\n" msgstr "" -#: Opcodes/pitch.c:1684 +#: Opcodes/pitch.c:1685 msgid "Incorrect argument count in transeg" msgstr "" -#: Opcodes/pitch.c:1735 +#: Opcodes/pitch.c:1736 msgid "Incorrect argument count in transegb" msgstr "" -#: Opcodes/pitch.c:1786 Opcodes/pitch.c:1947 +#: Opcodes/pitch.c:1787 Opcodes/pitch.c:1948 msgid "Error: transeg not initialised (krate)\n" msgstr "" -#: Opcodes/pitch.c:1824 Opcodes/pitch.c:2007 +#: Opcodes/pitch.c:1825 Opcodes/pitch.c:2008 msgid "transeg: not initialised (arate)\n" msgstr "" -#: Opcodes/pitch.c:1884 +#: Opcodes/pitch.c:1885 msgid "Incorrect argument count in transegr" msgstr "" -#: Opcodes/pitch.c:2303 +#: Opcodes/pitch.c:2321 msgid "median: not initialised (arate)\n" msgstr "" -#: Opcodes/pitch.c:2307 Opcodes/pitch.c:2360 +#: Opcodes/pitch.c:2325 Opcodes/pitch.c:2378 #, c-format msgid "median: window (%d)larger than maximum(%d); truncated" msgstr "" -#: Opcodes/pitch.c:2356 +#: Opcodes/pitch.c:2374 msgid "median: not initialised (krate)\n" msgstr "" @@ -7638,30 +7665,30 @@ msgid "PVBUFREAD cannot load %s" msgstr "" -#: Opcodes/pvinterp.c:82 Opcodes/vpvoc.c:215 +#: Opcodes/pvinterp.c:82 Opcodes/vpvoc.c:217 #, c-format msgid "PVOC frame %ld bigger than %ld in %s" msgstr "" -#: Opcodes/pvinterp.c:87 Opcodes/vpvoc.c:220 +#: Opcodes/pvinterp.c:87 Opcodes/vpvoc.c:222 #, c-format msgid "PVOC frame %ld seems too small in %s" msgstr "" #: Opcodes/pvinterp.c:91 Opcodes/pvinterp.c:203 Opcodes/pvinterp.c:393 -#: Opcodes/vpvoc.c:224 +#: Opcodes/vpvoc.c:226 #, c-format msgid "%d chans (not 1) in PVOC file %s" msgstr "" #: Opcodes/pvinterp.c:106 Opcodes/pvinterp.c:230 Opcodes/pvinterp.c:418 -#: Opcodes/ugens8.c:101 Opcodes/vpvoc.c:252 +#: Opcodes/ugens8.c:101 Opcodes/vpvoc.c:254 #, c-format msgid "ksmps of %d needs wdw of %d, max is %d for pv %s" msgstr "" #: Opcodes/pvinterp.c:135 Opcodes/pvinterp.c:284 Opcodes/pvinterp.c:475 -#: Opcodes/pvread.c:109 Opcodes/ugens8.c:174 Opcodes/vpvoc.c:314 +#: Opcodes/pvread.c:109 Opcodes/ugens8.c:174 Opcodes/vpvoc.c:316 msgid "PVOC ktimpnt truncated to last frame" msgstr "" @@ -7670,7 +7697,7 @@ msgstr "" #: Opcodes/pvinterp.c:146 Opcodes/pvinterp.c:337 Opcodes/pvinterp.c:540 -#: Opcodes/pvread.c:117 Opcodes/ugens8.c:232 Opcodes/vpvoc.c:382 +#: Opcodes/pvread.c:117 Opcodes/ugens8.c:232 Opcodes/vpvoc.c:384 msgid "PVOC timpnt < 0" msgstr "" @@ -7693,12 +7720,12 @@ msgstr "" #: Opcodes/pvinterp.c:332 Opcodes/pvinterp.c:534 Opcodes/ugens8.c:226 -#: Opcodes/vpvoc.c:376 +#: Opcodes/vpvoc.c:378 msgid "PVOC transpose too low" msgstr "" #: Opcodes/pvinterp.c:335 Opcodes/pvinterp.c:537 Opcodes/ugens8.c:229 -#: Opcodes/vpvoc.c:379 +#: Opcodes/vpvoc.c:381 msgid "PVOC transpose too high" msgstr "" @@ -7716,7 +7743,7 @@ msgid "pvcross: %s: frame size %d does not match pvbufread frame size %d\n" msgstr "" -#: Opcodes/pvinterp.c:498 Opcodes/vpvoc.c:339 +#: Opcodes/pvinterp.c:498 Opcodes/vpvoc.c:341 msgid "PVOC debug: one frame gets through\n" msgstr "" @@ -7724,18 +7751,18 @@ msgid "pvcross: not initialised" msgstr "" -#: Opcodes/pvlock.c:67 Opcodes/pvsbasic.c:480 +#: Opcodes/pvlock.c:71 Opcodes/pvsbasic.c:480 msgid "invalid number of output arguments" msgstr "" -#: Opcodes/pvlock.c:536 Opcodes/pvsband.c:46 Opcodes/pvsbasic.c:684 +#: Opcodes/pvlock.c:826 Opcodes/pvsband.c:46 Opcodes/pvsbasic.c:684 #: Opcodes/pvsbasic.c:1007 Opcodes/pvsbasic.c:1220 Opcodes/pvsbasic.c:1326 #: Opcodes/pvsbasic.c:1555 Opcodes/pvsbasic.c:1768 Opcodes/pvsbasic.c:1942 -#: Opcodes/pvsgendy.c:43 Opcodes/signalflowgraph.cpp:627 +#: Opcodes/pvsgendy.c:43 Opcodes/signalflowgraph.cpp:665 msgid "Unsafe to have same fsig as in and out" msgstr "" -#: Opcodes/pvlock.c:548 +#: Opcodes/pvlock.c:838 msgid "pvsfreeze: signal format must be amp-freq." msgstr "" @@ -8091,48 +8118,48 @@ msgid "Nothing to close" msgstr "" -#: Opcodes/sfont.c:111 +#: Opcodes/sfont.c:114 #, c-format msgid "sfload: cannot open SoundFont file \"%s\" (error %s)" msgstr "" -#: Opcodes/sfont.c:117 +#: Opcodes/sfont.c:120 msgid "Sfload: cannot use globals" msgstr "" -#: Opcodes/sfont.c:150 +#: Opcodes/sfont.c:153 msgid "sfload: could not open globals\n" msgstr "" -#: Opcodes/sfont.c:172 +#: Opcodes/sfont.c:175 msgid "Extending soundfonts" msgstr "" -#: Opcodes/sfont.c:211 +#: Opcodes/sfont.c:214 #, c-format msgid "" "\n" "Preset list of \"%s\"\n" msgstr "" -#: Opcodes/sfont.c:214 +#: Opcodes/sfont.c:217 #, c-format msgid "%3d) %-20s\tprog:%-3d bank:%d\n" msgstr "" -#: Opcodes/sfont.c:236 +#: Opcodes/sfont.c:239 #, c-format msgid "" "\n" "Assigning all Presets of \"%s\" starting from %d (preset handle number)\n" msgstr "" -#: Opcodes/sfont.c:241 +#: Opcodes/sfont.c:244 #, c-format msgid "%3d<--%-20s\t(prog:%-3d bank:%d)\n" msgstr "" -#: Opcodes/sfont.c:248 +#: Opcodes/sfont.c:251 #, c-format msgid "" "\n" @@ -8140,38 +8167,38 @@ "\n" msgstr "" -#: Opcodes/sfont.c:261 +#: Opcodes/sfont.c:264 #, c-format msgid "" "\n" "Instrument list of \"%s\"\n" msgstr "" -#: Opcodes/sfont.c:279 +#: Opcodes/sfont.c:282 #, c-format msgid "sfpreset: preset handle too big (%d), max: %d" msgstr "" -#: Opcodes/sfont.c:296 +#: Opcodes/sfont.c:299 #, c-format msgid "" "sfpreset: cannot find any preset having prog number %d and bank number %d in " "SoundFont file \"%s\"" msgstr "" -#: Opcodes/sfont.c:318 Opcodes/sfont.c:2248 +#: Opcodes/sfont.c:321 Opcodes/sfont.c:2251 msgid "sfplay: invalid or out-of-range preset number" msgstr "" -#: Opcodes/sfont.c:655 +#: Opcodes/sfont.c:658 msgid "sfplaym: invalid or out-of-range preset number" msgstr "" -#: Opcodes/sfont.c:919 Opcodes/sfont.c:1191 +#: Opcodes/sfont.c:922 Opcodes/sfont.c:1194 msgid "sfinstr: instrument out of range" msgstr "" -#: Opcodes/sfont.c:1648 Opcodes/sfont.c:1886 +#: Opcodes/sfont.c:1651 Opcodes/sfont.c:1889 #, c-format msgid "" "SoundFont file \"%s\" contains ROM samples !\n" @@ -8179,15 +8206,15 @@ "Session aborted !" msgstr "" -#: Opcodes/sfont.c:2041 Opcodes/sfont.c:2049 +#: Opcodes/sfont.c:2044 Opcodes/sfont.c:2052 msgid "Sfont: cannot use globals/" msgstr "" -#: Opcodes/sfont.c:2054 +#: Opcodes/sfont.c:2057 msgid "Sfont format not compatible" msgstr "" -#: Opcodes/sfont.c:2598 +#: Opcodes/sfont.c:2601 msgid "error... could not create sfont globals\n" msgstr "" @@ -8195,31 +8222,36 @@ msgid "powershape: ifullscale must be strictly positive" msgstr "" -#: Opcodes/signalflowgraph.cpp:332 Opcodes/signalflowgraph.cpp:593 +#: Opcodes/signalflowgraph.cpp:360 Opcodes/signalflowgraph.cpp:629 #, c-format msgid "Connected instances of outlet %s to instance 0x%x of inlet %s.\n" msgstr "" -#: Opcodes/signalflowgraph.cpp:408 +#: Opcodes/signalflowgraph.cpp:438 #, c-format msgid "Created instance 0x%x of %d instances of outlet %s\n" msgstr "" -#: Opcodes/signalflowgraph.cpp:468 +#: Opcodes/signalflowgraph.cpp:500 #, c-format msgid "Connected instances of outlet %s to instance 0x%xof inlet %s.\n" msgstr "" -#: Opcodes/signalflowgraph.cpp:655 +#: Opcodes/signalflowgraph.cpp:693 msgid "inletf: signal format must be amp-phase or amp-freq." msgstr "" -#: Opcodes/signalflowgraph.cpp:948 Opcodes/signalflowgraph.cpp:989 +#: Opcodes/signalflowgraph.cpp:837 +#, c-format +msgid "Connected instances of outlet %s to instance 0x%x of inlet %s\n" +msgstr "" + +#: Opcodes/signalflowgraph.cpp:1150 Opcodes/signalflowgraph.cpp:1193 #, c-format msgid "Connected outlet %s to inlet %s.\n" msgstr "" -#: Opcodes/signalflowgraph.cpp:1116 Opcodes/signalflowgraph.cpp:1200 +#: Opcodes/signalflowgraph.cpp:1322 Opcodes/signalflowgraph.cpp:1408 msgid "ftgenonce error" msgstr "" @@ -8531,7 +8563,7 @@ msgid "Error allocating argument stack" msgstr "" -#: Opcodes/stackops.c:206 Top/argdecode.c:1245 util/envext.c:99 +#: Opcodes/stackops.c:206 Top/argdecode.c:1263 util/envext.c:99 #: util/scale.c:248 msgid "too many arguments" msgstr "" @@ -8961,7 +8993,7 @@ msgid "ATSCROSS: you must have an atsbufread before an atsinterpread" msgstr "" -#: Opcodes/ugsc.c:434 +#: Opcodes/ugsc.c:439 msgid "Phaser mode must be either 1 or 2" msgstr "" @@ -9089,21 +9121,21 @@ msgid "Have to have at least %d directions in vbapzmove" msgstr "" -#: Opcodes/vpvoc.c:175 +#: Opcodes/vpvoc.c:177 #, c-format msgid "vpvoc: Could not find ifnmagctrl table %f" msgstr "" -#: Opcodes/vpvoc.c:181 +#: Opcodes/vpvoc.c:183 msgid "vpvoc: associated tableseg not found" msgstr "" -#: Opcodes/vpvoc.c:203 +#: Opcodes/vpvoc.c:205 #, c-format msgid "VPVOC cannot load %s" msgstr "" -#: Opcodes/vpvoc.c:373 +#: Opcodes/vpvoc.c:375 msgid "vpvoc: not initialised" msgstr "" @@ -9175,746 +9207,758 @@ msgid "No wii range" msgstr "" -#: Top/argdecode.c:63 +#: Top/argdecode.c:64 msgid "--help\tprint long usage options" msgstr "" -#: Top/argdecode.c:64 +#: Top/argdecode.c:65 msgid "-U unam\trun utility program unam" msgstr "" -#: Top/argdecode.c:65 +#: Top/argdecode.c:66 msgid "-C\tuse Cscore processing of scorefile" msgstr "" -#: Top/argdecode.c:66 +#: Top/argdecode.c:67 msgid "-j N\tuse N threads in performance" msgstr "" -#: Top/argdecode.c:67 +#: Top/argdecode.c:68 msgid "-I\tI-time only orch run" msgstr "" -#: Top/argdecode.c:68 +#: Top/argdecode.c:69 msgid "-n\tno sound onto disk" msgstr "" -#: Top/argdecode.c:69 +#: Top/argdecode.c:70 msgid "-i fnam\tsound input filename" msgstr "" -#: Top/argdecode.c:70 util/mixer.c:94 util/scale.c:45 +#: Top/argdecode.c:71 util/mixer.c:94 util/scale.c:45 msgid "-o fnam\tsound output filename" msgstr "" -#: Top/argdecode.c:71 +#: Top/argdecode.c:72 msgid "-b N\tsample frames (or -kprds) per software sound I/O buffer" msgstr "" -#: Top/argdecode.c:72 +#: Top/argdecode.c:73 msgid "-B N\tsamples per hardware sound I/O buffer" msgstr "" -#: Top/argdecode.c:73 util/mixer.c:95 util/scale.c:46 util/srconv.c:752 +#: Top/argdecode.c:74 util/mixer.c:95 util/scale.c:46 util/srconv.c:752 msgid "-A\tcreate an AIFF format output soundfile" msgstr "" -#: Top/argdecode.c:74 util/mixer.c:96 util/scale.c:47 util/srconv.c:754 +#: Top/argdecode.c:75 util/mixer.c:96 util/scale.c:47 util/srconv.c:754 msgid "-W\tcreate a WAV format output soundfile" msgstr "" -#: Top/argdecode.c:75 util/srconv.c:753 +#: Top/argdecode.c:76 util/srconv.c:753 msgid "-J\tcreate an IRCAM format output soundfile" msgstr "" -#: Top/argdecode.c:76 util/mixer.c:97 util/scale.c:48 util/srconv.c:755 +#: Top/argdecode.c:77 util/mixer.c:97 util/scale.c:48 util/srconv.c:755 msgid "-h\tno header on output soundfile" msgstr "" -#: Top/argdecode.c:77 util/mixer.c:99 util/scale.c:49 util/srconv.c:756 +#: Top/argdecode.c:78 util/mixer.c:99 util/scale.c:49 util/srconv.c:756 msgid "-c\t8-bit signed_char sound samples" msgstr "" -#: Top/argdecode.c:79 util/mixer.c:101 util/scale.c:50 util/srconv.c:757 +#: Top/argdecode.c:80 util/mixer.c:101 util/scale.c:50 util/srconv.c:757 msgid "-a\talaw sound samples" msgstr "" -#: Top/argdecode.c:81 util/mixer.c:98 util/mixer.c:100 util/srconv.c:758 +#: Top/argdecode.c:82 util/mixer.c:98 util/mixer.c:100 util/srconv.c:758 msgid "-8\t8-bit unsigned_char sound samples" msgstr "" -#: Top/argdecode.c:82 util/mixer.c:102 util/scale.c:51 util/srconv.c:759 +#: Top/argdecode.c:83 util/mixer.c:102 util/scale.c:51 util/srconv.c:759 msgid "-u\tulaw sound samples" msgstr "" -#: Top/argdecode.c:83 util/mixer.c:103 util/scale.c:52 util/srconv.c:760 +#: Top/argdecode.c:84 util/mixer.c:103 util/scale.c:52 util/srconv.c:760 msgid "-s\tshort_int sound samples" msgstr "" -#: Top/argdecode.c:84 util/mixer.c:104 util/scale.c:53 util/srconv.c:761 +#: Top/argdecode.c:85 util/mixer.c:104 util/scale.c:53 util/srconv.c:761 msgid "-l\tlong_int sound samples" msgstr "" -#: Top/argdecode.c:85 util/mixer.c:105 util/scale.c:54 util/srconv.c:762 +#: Top/argdecode.c:86 util/mixer.c:105 util/scale.c:54 util/srconv.c:762 msgid "-f\tfloat sound samples" msgstr "" -#: Top/argdecode.c:86 +#: Top/argdecode.c:87 msgid "-3\t24bit sound samples" msgstr "" -#: Top/argdecode.c:87 util/srconv.c:763 +#: Top/argdecode.c:88 util/srconv.c:763 msgid "-r N\torchestra srate override" msgstr "" -#: Top/argdecode.c:88 +#: Top/argdecode.c:89 msgid "-k N\torchestra krate override" msgstr "" -#: Top/argdecode.c:89 util/srconv.c:764 +#: Top/argdecode.c:90 util/srconv.c:764 msgid "-K\tDo not generate PEAK chunks" msgstr "" -#: Top/argdecode.c:90 +#: Top/argdecode.c:91 msgid "-v\tverbose orch translation" msgstr "" -#: Top/argdecode.c:91 +#: Top/argdecode.c:92 msgid "-m N\ttty message level. Sum of:" msgstr "" -#: Top/argdecode.c:92 +#: Top/argdecode.c:93 msgid "\t\t1=note amps, 2=out-of-range msg, 4=warnings" msgstr "" -#: Top/argdecode.c:93 +#: Top/argdecode.c:94 msgid "\t\t0/32/64/96=note amp format (raw,dB,colors)" msgstr "" -#: Top/argdecode.c:94 +#: Top/argdecode.c:95 msgid "\t\t128=print benchmark information" msgstr "" -#: Top/argdecode.c:95 +#: Top/argdecode.c:96 msgid "-d\tsuppress all displays" msgstr "" -#: Top/argdecode.c:96 +#: Top/argdecode.c:97 msgid "-g\tsuppress graphics, use ascii displays" msgstr "" -#: Top/argdecode.c:97 +#: Top/argdecode.c:98 msgid "-G\tsuppress graphics, use Postscript displays" msgstr "" -#: Top/argdecode.c:98 +#: Top/argdecode.c:99 msgid "-x fnam\textract from score.srt using extract file 'fnam'" msgstr "" -#: Top/argdecode.c:99 +#: Top/argdecode.c:100 msgid "-t N\tuse uninterpreted beats of the score, initially at tempo N" msgstr "" -#: Top/argdecode.c:100 +#: Top/argdecode.c:101 msgid "-t 0\tuse score.srt for sorted score rather than a temporary" msgstr "" -#: Top/argdecode.c:101 +#: Top/argdecode.c:102 msgid "-L dnam\tread Line-oriented realtime score events from device 'dnam'" msgstr "" -#: Top/argdecode.c:102 +#: Top/argdecode.c:103 msgid "-M dnam\tread MIDI realtime events from device 'dnam'" msgstr "" -#: Top/argdecode.c:103 +#: Top/argdecode.c:104 msgid "-F fnam\tread MIDIfile event stream from file 'fnam'" msgstr "" -#: Top/argdecode.c:105 util/mixer.c:106 util/scale.c:59 util/srconv.c:765 +#: Top/argdecode.c:106 util/mixer.c:106 util/scale.c:59 util/srconv.c:765 msgid "-R\tcontinually rewrite header while writing soundfile (WAV/AIFF)" msgstr "" -#: Top/argdecode.c:106 +#: Top/argdecode.c:107 msgid "-H#\tprint heartbeat style 1, 2 or 3 at each soundfile write" msgstr "" -#: Top/argdecode.c:107 util/mixer.c:108 util/scale.c:61 util/srconv.c:767 +#: Top/argdecode.c:108 util/mixer.c:108 util/scale.c:61 util/srconv.c:767 msgid "-N\tnotify (ring the bell) when score or miditrack is done" msgstr "" -#: Top/argdecode.c:108 +#: Top/argdecode.c:109 msgid "-T\tterminate the performance when miditrack is done" msgstr "" -#: Top/argdecode.c:109 +#: Top/argdecode.c:110 msgid "-D\tdefer GEN01 soundfile loads until performance time" msgstr "" -#: Top/argdecode.c:110 +#: Top/argdecode.c:111 msgid "-Q dnam\tselect MIDI output device" msgstr "" -#: Top/argdecode.c:111 +#: Top/argdecode.c:112 msgid "-z\tList opcodes in this version" msgstr "" -#: Top/argdecode.c:112 +#: Top/argdecode.c:113 msgid "-Z\tDither output" msgstr "" -#: Top/argdecode.c:114 +#: Top/argdecode.c:115 msgid "--sched set real-time priority and lock memory" msgstr "" -#: Top/argdecode.c:115 Top/argdecode.c:117 +#: Top/argdecode.c:116 Top/argdecode.c:118 msgid " (requires -d and real time audio (-iadc/-odac))" msgstr "" -#: Top/argdecode.c:116 +#: Top/argdecode.c:117 msgid "--sched=N set specified scheduling priority, and lock memory" msgstr "" -#: Top/argdecode.c:126 +#: Top/argdecode.c:127 msgid "\t\t\tSet output file format" msgstr "" -#: Top/argdecode.c:127 +#: Top/argdecode.c:128 msgid "--aiff\t\t\tSet AIFF format" msgstr "" -#: Top/argdecode.c:128 +#: Top/argdecode.c:129 msgid "--au\t\t\tSet AU format" msgstr "" -#: Top/argdecode.c:129 +#: Top/argdecode.c:130 msgid "--wave\t\t\tSet WAV format" msgstr "" -#: Top/argdecode.c:130 +#: Top/argdecode.c:131 msgid "--ircam\t\t\tSet IRCAM format" msgstr "" -#: Top/argdecode.c:131 +#: Top/argdecode.c:132 msgid "--ogg\t\t\tSet OGG/VORBIS format" msgstr "" -#: Top/argdecode.c:132 +#: Top/argdecode.c:133 msgid "--noheader\t\tRaw format" msgstr "" -#: Top/argdecode.c:133 +#: Top/argdecode.c:134 msgid "--nopeaks\t\tDo not write peak information" msgstr "" -#: Top/argdecode.c:135 +#: Top/argdecode.c:136 msgid "--nodisplays\t\tSuppress all displays" msgstr "" -#: Top/argdecode.c:136 +#: Top/argdecode.c:137 msgid "--asciidisplay\t\tSuppress graphics, use ascii displays" msgstr "" -#: Top/argdecode.c:137 +#: Top/argdecode.c:138 msgid "--postscriptdisplay\tSuppress graphics, use Postscript displays" msgstr "" -#: Top/argdecode.c:139 +#: Top/argdecode.c:140 msgid "--defer-gen1\t\tDefer GEN01 soundfile loads until performance time" msgstr "" -#: Top/argdecode.c:140 +#: Top/argdecode.c:141 msgid "" "--iobufsamps=N\t\tSample frames (or -kprds) per software sound I/O buffer" msgstr "" -#: Top/argdecode.c:142 +#: Top/argdecode.c:143 msgid "--hardwarebufsamps=N\tSamples per hardware sound I/O buffer" msgstr "" -#: Top/argdecode.c:143 +#: Top/argdecode.c:144 msgid "--cscore\t\tUse Cscore processing of scorefile" msgstr "" -#: Top/argdecode.c:144 +#: Top/argdecode.c:145 msgid "--orc\t\t\tUse orchfile without scorefile" msgstr "" -#: Top/argdecode.c:146 +#: Top/argdecode.c:147 msgid "--midifile=FNAME\tRead MIDIfile event stream from file" msgstr "" -#: Top/argdecode.c:147 +#: Top/argdecode.c:148 msgid "--midioutfile=FNAME\tWrite MIDI output to file FNAME" msgstr "" -#: Top/argdecode.c:148 +#: Top/argdecode.c:149 msgid "--midi-device=FNAME\tRead MIDI realtime events from device" msgstr "" -#: Top/argdecode.c:149 +#: Top/argdecode.c:150 msgid "--terminate-on-midi\tTerminate the performance when miditrack is done" msgstr "" -#: Top/argdecode.c:151 +#: Top/argdecode.c:152 msgid "" "--heartbeat=N\t\tPrint a heartbeat style 1, 2 or 3 at each soundfile write" msgstr "" -#: Top/argdecode.c:153 +#: Top/argdecode.c:154 msgid "--notify\t\tNotify (ring the bell) when score or miditrack is done" msgstr "" -#: Top/argdecode.c:154 +#: Top/argdecode.c:155 msgid "" "--rewrite\t\tContinually rewrite header while writing soundfile (WAV/AIFF)" msgstr "" -#: Top/argdecode.c:157 +#: Top/argdecode.c:158 msgid "--input=FNAME\t\tSound input filename" msgstr "" -#: Top/argdecode.c:158 +#: Top/argdecode.c:159 msgid "--output=FNAME\t\tSound output filename" msgstr "" -#: Top/argdecode.c:159 +#: Top/argdecode.c:160 msgid "--logfile=FNAME\t\tLog output to file" msgstr "" -#: Top/argdecode.c:161 +#: Top/argdecode.c:162 msgid "--nosound\t\tNo sound onto disk or device" msgstr "" -#: Top/argdecode.c:162 +#: Top/argdecode.c:163 msgid "--tempo=N\t\tUse uninterpreted beats of the score, initially at tempo N" msgstr "" -#: Top/argdecode.c:164 +#: Top/argdecode.c:165 msgid "--i-only\t\tI-time only orch run" msgstr "" -#: Top/argdecode.c:165 +#: Top/argdecode.c:166 msgid "--syntax-check-only\tStop after checking orchestra and score syntax" msgstr "" -#: Top/argdecode.c:166 +#: Top/argdecode.c:167 msgid "--control-rate=N\tOrchestra krate override" msgstr "" -#: Top/argdecode.c:167 +#: Top/argdecode.c:168 msgid "--sample-rate=N\t\tOrchestra srate override" msgstr "" -#: Top/argdecode.c:168 +#: Top/argdecode.c:169 msgid "--score-in=FNAME\tRead Line-oriented realtime score events from device" msgstr "" -#: Top/argdecode.c:170 +#: Top/argdecode.c:171 msgid "--messagelevel=N\ttty message level, sum of:" msgstr "" -#: Top/argdecode.c:171 +#: Top/argdecode.c:172 msgid "--messageolevel=O\ttty message level in octal, of:" msgstr "" -#: Top/argdecode.c:172 +#: Top/argdecode.c:173 msgid "\t\t\t\t1=note amps, 2=out-of-range msg, 4=warnings," msgstr "" -#: Top/argdecode.c:173 +#: Top/argdecode.c:174 msgid "\t\t\t\t0/32/64/96=note amp format (raw,dB,colors)," msgstr "" -#: Top/argdecode.c:174 +#: Top/argdecode.c:175 msgid "\t\t\t\t128=print benchmark information" msgstr "" -#: Top/argdecode.c:176 +#: Top/argdecode.c:177 msgid "--m-amps=[01]\tmessages on note amps" msgstr "" -#: Top/argdecode.c:177 +#: Top/argdecode.c:178 msgid "--m-range=[01]\tMessages on range errors" msgstr "" -#: Top/argdecode.c:178 +#: Top/argdecode.c:179 msgid "--m-warnings=[01]\tMesage on warnings" msgstr "" -#: Top/argdecode.c:179 +#: Top/argdecode.c:180 msgid "--m-raw=[01]\tRaw amp messages" msgstr "" -#: Top/argdecode.c:180 +#: Top/argdecode.c:181 msgid "--m-dB=[01]\tAmp messages in dB" msgstr "" -#: Top/argdecode.c:181 +#: Top/argdecode.c:182 msgid "--m-colours=[01]\tColour amp messages" msgstr "" -#: Top/argdecode.c:182 +#: Top/argdecode.c:183 msgid "--m-benchmarks=[01]\tPrint benchmark information" msgstr "" -#: Top/argdecode.c:183 +#: Top/argdecode.c:184 msgid "--csd-line-nums=[01]\tControls how error line numbers are printed:" msgstr "" -#: Top/argdecode.c:184 +#: Top/argdecode.c:185 msgid "\t\t\t1=use CSD line #s (default), 0=use ORC/SCO-relative line #s" msgstr "" -#: Top/argdecode.c:185 +#: Top/argdecode.c:186 msgid "--extract-score=FNAME\tExtract from score.srt using extract file" msgstr "" -#: Top/argdecode.c:186 +#: Top/argdecode.c:187 msgid "--keep-sorted-score" msgstr "" -#: Top/argdecode.c:187 +#: Top/argdecode.c:188 msgid "--env:NAME=VALUE\tSet environment variable NAME to VALUE" msgstr "" -#: Top/argdecode.c:188 +#: Top/argdecode.c:189 msgid "--env:NAME+=VALUE\tAppend VALUE to environment variable NAME" msgstr "" -#: Top/argdecode.c:189 +#: Top/argdecode.c:190 msgid "--strsetN=VALUE\t\tSet strset table at index N to VALUE" msgstr "" -#: Top/argdecode.c:190 +#: Top/argdecode.c:191 msgid "--utility=NAME\t\tRun utility program" msgstr "" -#: Top/argdecode.c:191 +#: Top/argdecode.c:192 msgid "--verbose\t\tVerbose orch translation" msgstr "" -#: Top/argdecode.c:192 +#: Top/argdecode.c:193 msgid "--list-opcodes\t\tList opcodes in this version" msgstr "" -#: Top/argdecode.c:193 +#: Top/argdecode.c:194 msgid "--list-opcodesN\t\tList opcodes in style N in this version" msgstr "" -#: Top/argdecode.c:194 +#: Top/argdecode.c:195 msgid "--dither\t\tDither output" msgstr "" -#: Top/argdecode.c:195 +#: Top/argdecode.c:196 msgid "--dither-triangular\t\tDither output with triangular distribution" msgstr "" -#: Top/argdecode.c:196 +#: Top/argdecode.c:197 msgid "--dither-uniform\t\tDither output with rectanular distribution" msgstr "" -#: Top/argdecode.c:197 +#: Top/argdecode.c:198 msgid "--sched\t\t\tSet real-time scheduling priority and lock memory" msgstr "" -#: Top/argdecode.c:198 +#: Top/argdecode.c:199 msgid "--sched=N\t\tSet priority to N and lock memory" msgstr "" -#: Top/argdecode.c:199 +#: Top/argdecode.c:200 msgid "--opcode-lib=NAMES\tDynamic libraries to load" msgstr "" -#: Top/argdecode.c:200 +#: Top/argdecode.c:201 msgid "--opcode-omit=NAMES\tDynamic libraries not to load" msgstr "" -#: Top/argdecode.c:201 +#: Top/argdecode.c:202 msgid "--omacro:XXX=YYY\tSet orchestra macro XXX to value YYY" msgstr "" -#: Top/argdecode.c:202 +#: Top/argdecode.c:203 msgid "--smacro:XXX=YYY\tSet score macro XXX to value YYY" msgstr "" -#: Top/argdecode.c:203 +#: Top/argdecode.c:204 msgid "--midi-key=N\t\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:204 +#: Top/argdecode.c:205 msgid "\t\t\tkey number to pfield N as MIDI value [0-127]" msgstr "" -#: Top/argdecode.c:205 +#: Top/argdecode.c:206 msgid "--midi-key-cps=N\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:206 +#: Top/argdecode.c:207 msgid "\t\t\tkey number to pfield N as cycles per second" msgstr "" -#: Top/argdecode.c:207 +#: Top/argdecode.c:208 msgid "--midi-key-oct=N\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:208 +#: Top/argdecode.c:209 msgid "\t\t\tkey number to pfield N as linear octave" msgstr "" -#: Top/argdecode.c:209 +#: Top/argdecode.c:210 msgid "--midi-key-pch=N\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:210 +#: Top/argdecode.c:211 msgid "\t\t\tkey number to pfield N as oct.pch" msgstr "" -#: Top/argdecode.c:211 +#: Top/argdecode.c:212 msgid "--midi-velocity=N\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:212 +#: Top/argdecode.c:213 msgid "\t\t\tvelocity number to pfield N as MIDI value [0-127]" msgstr "" -#: Top/argdecode.c:213 +#: Top/argdecode.c:214 msgid "--midi-velocity-amp=N\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:214 +#: Top/argdecode.c:215 msgid "\t\t\tvelocity number to pfield N as amplitude" msgstr "" -#: Top/argdecode.c:215 +#: Top/argdecode.c:216 msgid "--no-default-paths\tTurn off relative paths from CSD/ORC/SCO" msgstr "" -#: Top/argdecode.c:216 +#: Top/argdecode.c:217 msgid "--sample-accurate\t\tUse sample-accurate timing of score events" msgstr "" -#: Top/argdecode.c:217 +#: Top/argdecode.c:218 msgid "--realtime\t\trealtime priority mode" msgstr "" -#: Top/argdecode.c:218 +#: Top/argdecode.c:219 msgid "--nchnls=N\t\t override number of audio channels" msgstr "" -#: Top/argdecode.c:219 +#: Top/argdecode.c:220 msgid "--nchnls_i=N\t\t override number of input audio channels" msgstr "" -#: Top/argdecode.c:220 +#: Top/argdecode.c:221 msgid "--0dbfs=N\t\t override 0dbfs (max positive signal amplitude)" msgstr "" -#: Top/argdecode.c:221 +#: Top/argdecode.c:222 msgid "--sinesize\t\tlength of internal sine table" msgstr "" #: Top/argdecode.c:223 +msgid "" +"--daemon\t\t daemon mode: do not exit if CSD/orchestra is not given, is " +"empty or does not compile" +msgstr "" + +#: Top/argdecode.c:225 +msgid "" +"--port=N\t\t listen to UDP port N for instruments/orchestra code (implies --" +"daemon)" +msgstr "" + +#: Top/argdecode.c:228 msgid "--help\t\t\tLong help" msgstr "" -#: Top/argdecode.c:239 +#: Top/argdecode.c:244 #, c-format msgid "flag defaults: csound -s -otest -b%d -B%d -m%d\n" msgstr "" -#: Top/argdecode.c:246 Top/argdecode.c:262 +#: Top/argdecode.c:251 Top/argdecode.c:267 msgid "Usage:\tcsound [-flags] orchfile scorefile\n" msgstr "" -#: Top/argdecode.c:247 Top/argdecode.c:263 util/envext.c:53 util/xtrct.c:67 +#: Top/argdecode.c:252 Top/argdecode.c:268 util/envext.c:53 util/xtrct.c:67 msgid "Legal flags are:\n" msgstr "" -#: Top/argdecode.c:248 +#: Top/argdecode.c:253 msgid "" "Long format:\n" "\n" msgstr "" -#: Top/argdecode.c:253 +#: Top/argdecode.c:258 msgid "" "\n" "Short form:\n" msgstr "" -#: Top/argdecode.c:266 +#: Top/argdecode.c:271 msgid "Csound Command ERROR:\t" msgstr "" -#: Top/argdecode.c:401 +#: Top/argdecode.c:406 #, c-format msgid "unknown output format: '%s'" msgstr "" -#: Top/argdecode.c:419 Top/argdecode.c:1008 +#: Top/argdecode.c:424 Top/argdecode.c:1024 msgid "no iobufsamps" msgstr "" -#: Top/argdecode.c:426 Top/argdecode.c:1015 +#: Top/argdecode.c:431 Top/argdecode.c:1031 msgid "no hardware bufsamps" msgstr "" -#: Top/argdecode.c:452 Top/argdecode.c:1115 +#: Top/argdecode.c:457 Top/argdecode.c:1132 msgid "no midifile name" msgstr "" -#: Top/argdecode.c:457 Top/argdecode.c:1121 +#: Top/argdecode.c:461 Top/argdecode.c:1137 msgid "-F: stdin not supported on this platform" msgstr "" -#: Top/argdecode.c:467 +#: Top/argdecode.c:473 msgid "no midi output file name" msgstr "" -#: Top/argdecode.c:496 +#: Top/argdecode.c:502 msgid "invalid python variable definition syntax" msgstr "" -#: Top/argdecode.c:502 Top/argdecode.c:976 +#: Top/argdecode.c:508 Top/argdecode.c:992 msgid "no infilename" msgstr "" -#: Top/argdecode.c:505 Top/argdecode.c:980 +#: Top/argdecode.c:511 Top/argdecode.c:996 msgid "input cannot be stdout" msgstr "" -#: Top/argdecode.c:509 Top/argdecode.c:984 +#: Top/argdecode.c:515 Top/argdecode.c:1000 msgid "stdin audio not supported" msgstr "" -#: Top/argdecode.c:544 Top/argdecode.c:1048 +#: Top/argdecode.c:550 Top/argdecode.c:1064 msgid "no control rate" msgstr "" -#: Top/argdecode.c:558 Top/argdecode.c:1090 +#: Top/argdecode.c:564 Top/argdecode.c:1106 msgid "no Linein score device_name" msgstr "" -#: Top/argdecode.c:574 Top/argdecode.c:580 Top/argdecode.c:1056 +#: Top/argdecode.c:580 Top/argdecode.c:586 Top/argdecode.c:1072 msgid "no message level" msgstr "" -#: Top/argdecode.c:587 +#: Top/argdecode.c:593 msgid "no message amps" msgstr "" -#: Top/argdecode.c:596 +#: Top/argdecode.c:602 msgid "no message range" msgstr "" -#: Top/argdecode.c:605 +#: Top/argdecode.c:611 msgid "no message warnings" msgstr "" -#: Top/argdecode.c:614 +#: Top/argdecode.c:620 msgid "no message raw" msgstr "" -#: Top/argdecode.c:623 +#: Top/argdecode.c:629 msgid "no message dB" msgstr "" -#: Top/argdecode.c:632 +#: Top/argdecode.c:638 msgid "no message colours" msgstr "" -#: Top/argdecode.c:641 +#: Top/argdecode.c:647 msgid "no benchmark level" msgstr "" -#: Top/argdecode.c:649 +#: Top/argdecode.c:655 msgid "no value for --csd-line-nums" msgstr "" -#: Top/argdecode.c:658 Top/argdecode.c:1101 +#: Top/argdecode.c:664 Top/argdecode.c:1117 msgid "no midi device_name" msgstr "" -#: Top/argdecode.c:663 Top/argdecode.c:1107 +#: Top/argdecode.c:669 Top/argdecode.c:1122 msgid "-M: stdin not supported on this platform" msgstr "" -#: Top/argdecode.c:683 Top/argdecode.c:992 util/envext.c:84 util/mixer.c:206 +#: Top/argdecode.c:689 Top/argdecode.c:1008 util/envext.c:84 util/mixer.c:206 #: util/scale.c:173 util/srconv.c:247 util/xtrct.c:120 msgid "no outfilename" msgstr "" -#: Top/argdecode.c:686 Top/argdecode.c:996 util/scale.c:177 util/srconv.c:251 +#: Top/argdecode.c:692 Top/argdecode.c:1012 util/scale.c:177 util/srconv.c:251 #: util/xtrct.c:124 msgid "-o cannot be stdin" msgstr "" -#: Top/argdecode.c:690 Top/argdecode.c:1000 util/scale.c:180 util/srconv.c:256 +#: Top/argdecode.c:696 Top/argdecode.c:1016 util/scale.c:180 util/srconv.c:256 msgid "stdout audio not supported" msgstr "" -#: Top/argdecode.c:700 Top/argdecode.c:1198 util/hetro.c:232 +#: Top/argdecode.c:706 Top/argdecode.c:1216 util/hetro.c:232 msgid "no log file" msgstr "" -#: Top/argdecode.c:755 Top/argdecode.c:955 +#: Top/argdecode.c:761 Top/argdecode.c:971 msgid "no utility name" msgstr "" -#: Top/argdecode.c:774 Top/argdecode.c:1070 +#: Top/argdecode.c:780 Top/argdecode.c:1086 msgid "no xfilename" msgstr "" -#: Top/argdecode.c:920 +#: Top/argdecode.c:936 #, c-format msgid "unknown long option: '--%s'" msgstr "" -#: Top/argdecode.c:1043 +#: Top/argdecode.c:1059 msgid "no sample rate" msgstr "" -#: Top/argdecode.c:1075 +#: Top/argdecode.c:1091 msgid "no tempo value" msgstr "" -#: Top/argdecode.c:1080 +#: Top/argdecode.c:1096 msgid "illegal tempo" msgstr "" -#: Top/argdecode.c:1129 +#: Top/argdecode.c:1147 msgid "no MIDI output device" msgstr "" -#: Top/argdecode.c:1181 +#: Top/argdecode.c:1199 msgid "No indirection file" msgstr "" -#: Top/argdecode.c:1188 +#: Top/argdecode.c:1206 #, c-format msgid "Cannot open indirection file %s\n" msgstr "" -#: Top/argdecode.c:1217 +#: Top/argdecode.c:1235 msgid "no number of threads" msgstr "" -#: Top/argdecode.c:1228 util/envext.c:94 util/mixer.c:316 util/scale.c:241 +#: Top/argdecode.c:1246 util/envext.c:94 util/mixer.c:316 util/scale.c:241 #: util/xtrct.c:239 #, c-format msgid "unknown flag -%c" msgstr "" -#: Top/argdecode.c:1235 +#: Top/argdecode.c:1253 msgid "error: orchestra and score name not allowed in .csound6rc" msgstr "" -#: Top/argdecode.c:1381 +#: Top/argdecode.c:1401 msgid "stdout not supported on this platform" msgstr "" -#: Top/argdecode.c:1421 Top/argdecode.c:1441 Top/argdecode.c:1461 +#: Top/argdecode.c:1441 Top/argdecode.c:1461 Top/argdecode.c:1481 msgid "stdin not supported on this platform" msgstr "" @@ -9964,76 +10008,76 @@ msgid "cscoreFileGetCurrent: no fp current" msgstr "" -#: Top/csmodule.c:195 +#: Top/csmodule.c:199 #, c-format msgid "not loading '%s' (uses incompatible floating point type)" msgstr "" -#: Top/csmodule.c:204 +#: Top/csmodule.c:208 #, c-format msgid "" "not loading '%s' (incompatible with this version of Csound (%d.%d/%d.%d)" msgstr "" -#: Top/csmodule.c:247 +#: Top/csmodule.c:251 #, c-format msgid "could not open library '%s' (%s)" msgstr "" -#: Top/csmodule.c:250 +#: Top/csmodule.c:254 #, c-format msgid "could not open library '%s' (%d)" msgstr "" -#: Top/csmodule.c:311 +#: Top/csmodule.c:315 #, c-format msgid "'%s' is not a Csound plugin library" msgstr "" -#: Top/csmodule.c:322 +#: Top/csmodule.c:326 msgid "csoundLoadExternal(): memory allocation failure" msgstr "" -#: Top/csmodule.c:336 Top/csmodule.c:344 +#: Top/csmodule.c:340 Top/csmodule.c:348 #, c-format msgid "Error in pre-initialisation function of module '%s'" msgstr "" -#: Top/csmodule.c:417 +#: Top/csmodule.c:426 #, c-format msgid "Error opening plugin directory '%s': %s" msgstr "" -#: Top/csmodule.c:420 +#: Top/csmodule.c:429 #, c-format msgid "Error opening plugin directory: %s" msgstr "" -#: Top/csmodule.c:455 +#: Top/csmodule.c:464 #, c-format msgid "path name too long, skipping '%s'" msgstr "" -#: Top/csmodule.c:461 +#: Top/csmodule.c:470 #, c-format msgid "Library %s omitted\n" msgstr "" -#: Top/csmodule.c:494 +#: Top/csmodule.c:503 msgid "Loading command-line libraries:\n" msgstr "" -#: Top/csmodule.c:517 +#: Top/csmodule.c:526 #, c-format msgid " *** error loading '%s'" msgstr "" -#: Top/csmodule.c:540 +#: Top/csmodule.c:549 #, c-format msgid "Error starting module '%s'" msgstr "" -#: Top/csmodule.c:639 +#: Top/csmodule.c:648 #, c-format msgid "Error de-initialising module '%s'" msgstr "" @@ -10042,273 +10086,286 @@ msgid "Error allocating opcode list" msgstr "" -#: Top/csound.c:1409 +#: Top/csound.c:1410 #, c-format msgid "Multithread performance: insno: %3d thread %d of %d starting.\n" msgstr "" -#: Top/csound.c:1415 +#: Top/csound.c:1416 msgid "Bad ThreadId" msgstr "" -#: Top/csound.c:1603 Top/csound.c:1635 Top/csound.c:1663 Top/csound.c:1699 -#: Top/csound.c:3879 +#: Top/csound.c:1604 Top/csound.c:1636 Top/csound.c:1664 Top/csound.c:1700 +#: Top/csound.c:3884 msgid "Csound not ready for performance: csoundStart() has not been called \n" msgstr "" -#: Top/csound.c:1619 Top/csound.c:1648 +#: Top/csound.c:1620 Top/csound.c:1649 msgid "Score finished in csoundPerformKsmps().\n" msgstr "" -#: Top/csound.c:1642 Top/csound.c:3886 +#: Top/csound.c:1643 Top/csound.c:3891 msgid "Early return from csoundPerformKsmps().\n" msgstr "" -#: Top/csound.c:1670 +#: Top/csound.c:1671 msgid "Early return from csoundPerformBuffer().\n" msgstr "" -#: Top/csound.c:1708 +#: Top/csound.c:1709 msgid "Early return from csoundPerform().\n" msgstr "" -#: Top/csound.c:1716 +#: Top/csound.c:1717 msgid "Score finished in csoundPerform().\n" msgstr "" -#: Top/csound.c:1727 +#: Top/csound.c:1728 msgid "csoundPerform(): stopped.\n" msgstr "" -#: Top/csound.c:2010 +#: Top/csound.c:2012 msgid "WARNING: " msgstr "" -#: Top/csound.c:2150 +#: Top/csound.c:2154 msgid "rtdummy: failed to allocate globals" msgstr "" -#: Top/csound.c:2151 +#: Top/csound.c:2155 msgid "rtaudio: dummy module enabled\n" msgstr "" -#: Top/csound.c:2180 Top/csound.c:2217 +#: Top/csound.c:2184 Top/csound.c:2221 msgid " *** error: rtaudio module set to empty string" msgstr "" -#: Top/csound.c:2184 Top/csound.c:2221 +#: Top/csound.c:2188 Top/csound.c:2225 #, c-format msgid " unknown rtaudio module: '%s', using dummy module" msgstr "" -#: Top/csound.c:2338 +#: Top/csound.c:2342 msgid "WARNING: real time midi input disabled, using dummy functions\n" msgstr "" -#: Top/csound.c:2343 Top/csound.c:2377 +#: Top/csound.c:2347 Top/csound.c:2381 msgid "error: -+rtmidi set to empty string" msgstr "" -#: Top/csound.c:2346 Top/csound.c:2380 +#: Top/csound.c:2350 Top/csound.c:2384 #, c-format msgid "error: -+rtmidi='%s': unknown module" msgstr "" -#: Top/csound.c:2372 +#: Top/csound.c:2376 msgid "WARNING: real time midi output disabled, using dummy functions\n" msgstr "" -#: Top/csound.c:2394 +#: Top/csound.c:2398 msgid "Unknown MIDI error" msgstr "" -#: Top/csound.c:2555 +#: Top/csound.c:2559 msgid "Failed to allocate new opcode entry." msgstr "" -#: Top/csound.c:2577 +#: Top/csound.c:2581 #, c-format msgid "Failed to allocate opcode entry for %s." msgstr "" -#: Top/csound.c:2717 Top/main.c:390 +#: Top/csound.c:2721 Top/main.c:358 msgid "setting dummy interface\n" msgstr "" -#: Top/csound.c:2793 +#: Top/csound.c:2798 msgid "Failed during csoundInitEnv" msgstr "" -#: Top/csound.c:2815 +#: Top/csound.c:2820 msgid "Failed during csoundInitStaticModules" msgstr "" -#: Top/csound.c:2831 +#: Top/csound.c:2836 msgid "Failed during csoundLoadModules" msgstr "" -#: Top/csound.c:2888 +#: Top/csound.c:2893 msgid "Real time audio module name" msgstr "" -#: Top/csound.c:2913 +#: Top/csound.c:2918 msgid "Real time MIDI module name" msgstr "" -#: Top/csound.c:2918 +#: Top/csound.c:2923 msgid "Ignore events (other than tempo changes) in tracks defined by pattern" msgstr "" -#: Top/csound.c:2924 +#: Top/csound.c:2929 msgid "Do not handle special MIDI controllers (sustain pedal etc.)" msgstr "" -#: Top/csound.c:2932 +#: Top/csound.c:2937 msgid "Title tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2938 +#: Top/csound.c:2943 msgid "Copyright tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2944 +#: Top/csound.c:2949 msgid "Software tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2949 +#: Top/csound.c:2954 msgid "Artist tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2956 +#: Top/csound.c:2961 msgid "Comment tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2961 +#: Top/csound.c:2966 msgid "Date tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2971 +#: Top/csound.c:2976 msgid "Enable message attributes (colors etc.)" msgstr "" -#: Top/csound.c:2977 +#: Top/csound.c:2982 msgid "Start score playback at the specified time, skipping earlier events" msgstr "" -#: Top/csound.c:2984 +#: Top/csound.c:2989 msgid "Ignore in CSD files (default: no)" msgstr "" -#: Top/csound.c:3194 +#: Top/csound.c:3199 msgid "Cannot open /proc/cpuinfo. Support for RDTSC is not available.\n" msgstr "" -#: Top/csound.c:3224 +#: Top/csound.c:3229 msgid "No valid CPU frequency entry was found in /proc/cpuinfo.\n" msgstr "" -#: Top/csound.c:3778 +#: Top/csound.c:3783 msgid "csoundDestroyMessageBuffer: Message buffer not allocated." msgstr "" -#: Top/csound.c:3809 +#: Top/csound.c:3814 msgid "csound: internal error: message buffer overflow\n" msgstr "" -#: Top/main.c:64 +#: Top/main.c:65 #, c-format msgid "WARNING: cannot open csound6rc file %s\n" msgstr "" -#: Top/main.c:67 +#: Top/main.c:68 #, c-format msgid "Reading options from $CSOUND6RC: %s \n" msgstr "" -#: Top/main.c:76 +#: Top/main.c:77 msgid "Reading options from $HOME/.csound6rc\n" msgstr "" -#: Top/main.c:91 +#: Top/main.c:92 msgid "Reading options from local directory .csound6rc \n" msgstr "" -#: Top/main.c:112 +#: Top/main.c:113 msgid "" "Csound is already started, call csoundReset()\n" "before starting again \n" msgstr "" -#: Top/main.c:186 +#: Top/main.c:141 msgid "no orchestra name" msgstr "" -#: Top/main.c:210 +#: Top/main.c:166 msgid "Reading CSD failed ... stopping" msgstr "" -#: Top/main.c:224 +#: Top/main.c:180 msgid "error: multiple uses of stdin" msgstr "" -#: Top/main.c:228 +#: Top/main.c:184 msgid "error: multiple uses of stdout" msgstr "" -#: Top/main.c:237 +#: Top/main.c:193 msgid "realtime performance using dummy numeric scorefile\n" msgstr "" -#: Top/main.c:260 +#: Top/main.c:216 #, c-format msgid "orchname: %s\n" msgstr "" -#: Top/main.c:278 +#: Top/main.c:220 +#, c-format +msgid "Failed to open input file - %s\n" +msgstr "" + +#: Top/main.c:235 msgid "cannot compile orchestra \n" msgstr "" -#: Top/main.c:291 +#: Top/main.c:240 +msgid "cannot compile orchestra." +msgstr "" + +#: Top/main.c:241 +msgid "Csound will start with no instruments" +msgstr "" + +#: Top/main.c:259 msgid "end of orchestra compile" msgstr "" -#: Top/main.c:299 +#: Top/main.c:267 #, c-format msgid "using previous %s\n" msgstr "" -#: Top/main.c:309 +#: Top/main.c:277 #, c-format msgid "cannot open scorefile %s" msgstr "" -#: Top/main.c:311 +#: Top/main.c:279 msgid "sorting score ...\n" msgstr "" -#: Top/main.c:321 +#: Top/main.c:289 #, c-format msgid "cannot open extract file %s" msgstr "" -#: Top/main.c:324 +#: Top/main.c:292 msgid " ... extracting ...\n" msgstr "" -#: Top/main.c:333 +#: Top/main.c:301 msgid "end of score sort" msgstr "" -#: Top/main.c:335 +#: Top/main.c:303 msgid "Syntax check completed.\n" msgstr "" -#: Top/main.c:456 util/dnoise.c:266 +#: Top/main.c:424 util/dnoise.c:266 #, c-format msgid "%s not a recognised SFOUTYP env setting" msgstr "" -#: Top/main.c:475 +#: Top/main.c:443 msgid "srate and krate overrides must occur jointly" msgstr "" @@ -10377,158 +10434,158 @@ msgid " *** Type 'csound --help' for the list of available options." msgstr "" -#: Top/one_file.c:105 Top/one_file.c:115 +#: Top/one_file.c:96 Top/one_file.c:106 msgid " *** cannot create temporary file" msgstr "" -#: Top/one_file.c:199 +#: Top/one_file.c:182 #, c-format msgid "Removing temporary file %s ...\n" msgstr "" -#: Top/one_file.c:203 +#: Top/one_file.c:186 #, c-format msgid "WARNING: could not remove %s\n" msgstr "" -#: Top/one_file.c:270 Top/one_file.c:304 +#: Top/one_file.c:253 Top/one_file.c:287 #, c-format msgid "More than %d arguments in " msgstr "" -#: Top/one_file.c:342 +#: Top/one_file.c:325 #, c-format msgid "Invalid arguments in : %s" msgstr "" -#: Top/one_file.c:345 +#: Top/one_file.c:328 #, c-format msgid "Invalid arguments in .csoundrc or -@ file: %s" msgstr "" -#: Top/one_file.c:351 Top/one_file.c:784 +#: Top/one_file.c:334 Top/one_file.c:767 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:380 +#: Top/one_file.c:361 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:400 Top/one_file.c:467 +#: Top/one_file.c:381 Top/one_file.c:449 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:415 Top/one_file.c:420 +#: Top/one_file.c:396 Top/one_file.c:401 msgid "Missing program in tag " msgstr "" -#: Top/one_file.c:432 +#: Top/one_file.c:414 #, c-format msgid "Creating %s (%p)\n" msgstr "" -#: Top/one_file.c:445 +#: Top/one_file.c:427 msgid "External generation failed" msgstr "" -#: Top/one_file.c:505 +#: Top/one_file.c:487 #, c-format msgid "Non base64 character %c(%2x)" msgstr "" -#: Top/one_file.c:524 +#: Top/one_file.c:506 msgid "Truncated byte at end of base64 stream" msgstr "" -#: Top/one_file.c:540 +#: Top/one_file.c:523 #, c-format msgid "Cannot open temporary file (%s) for MIDI subfile" msgstr "" -#: Top/one_file.c:557 +#: Top/one_file.c:540 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:573 Top/one_file.c:622 +#: Top/one_file.c:556 Top/one_file.c:605 #, c-format msgid "File %s already exists" msgstr "" -#: Top/one_file.c:578 +#: Top/one_file.c:561 #, c-format msgid "Cannot open sample file (%s) subfile" msgstr "" -#: Top/one_file.c:592 +#: Top/one_file.c:575 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:627 +#: Top/one_file.c:610 #, c-format msgid "Cannot open file (%s) subfile" msgstr "" -#: Top/one_file.c:642 +#: Top/one_file.c:625 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:662 +#: Top/one_file.c:645 #, c-format msgid "This CSD file requires a version of Csound before %d.%02d" msgstr "" -#: Top/one_file.c:670 Top/one_file.c:677 +#: Top/one_file.c:653 Top/one_file.c:660 #, c-format msgid "This CSD file requires a version of Csound after %d.%02d" msgstr "" -#: Top/one_file.c:683 +#: Top/one_file.c:666 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:693 +#: Top/one_file.c:676 msgid "**** Licence Information ****\n" msgstr "" -#: Top/one_file.c:699 +#: Top/one_file.c:682 msgid "**** End of Licence Information ****\n" msgstr "" -#: Top/one_file.c:710 +#: Top/one_file.c:693 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:741 +#: Top/one_file.c:724 #, c-format msgid "Failed to open csd file: %s" msgstr "" -#: Top/one_file.c:756 +#: Top/one_file.c:739 msgid "STARTING FILE\n" msgstr "" -#: Top/one_file.c:774 +#: Top/one_file.c:757 msgid "Creating options\n" msgstr "" -#: Top/one_file.c:780 +#: Top/one_file.c:763 msgid "Skipping \n" msgstr "" -#: Top/one_file.c:794 +#: Top/one_file.c:777 msgid "Creating orchestra\n" msgstr "" -#: Top/one_file.c:799 +#: Top/one_file.c:782 msgid "Creating score\n" msgstr "" -#: Top/one_file.c:833 +#: Top/one_file.c:812 #, c-format msgid "unknown CSD tag: %s\n" msgstr "" -#: Top/one_file.c:838 +#: Top/one_file.c:817 msgid "Could not find tag in CSD file.\n" msgstr "" diff -Nru csound-6.01~dfsg/po/es_CO.po csound-6.02~dfsg/po/es_CO.po --- csound-6.01~dfsg/po/es_CO.po 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/po/es_CO.po 2014-01-07 16:54:21.000000000 +0000 @@ -203,160 +203,160 @@ msgid "Not a proper list of ints" msgstr "" -#: Engine/csound_orc_compile.c:276 +#: Engine/csound_orc_compile.c:274 msgid "missing or extra arg" msgstr "argumento sobrante o faltante" -#: Engine/csound_orc_compile.c:281 +#: Engine/csound_orc_compile.c:279 #, fuzzy msgid "too many input args\n" msgstr "demasiados argumentos de entrada\n" -#: Engine/csound_orc_compile.c:464 +#: Engine/csound_orc_compile.c:462 #, c-format msgid "create_opcode: No rule to handle statement of type %d\n" msgstr "" -#: Engine/csound_orc_compile.c:633 Engine/csound_orc_compile.c:691 +#: Engine/csound_orc_compile.c:631 Engine/csound_orc_compile.c:690 #, c-format msgid "%s invalid sample rate" msgstr "%s tasa de muestreo inválida" -#: Engine/csound_orc_compile.c:635 Engine/csound_orc_compile.c:693 +#: Engine/csound_orc_compile.c:633 Engine/csound_orc_compile.c:692 #, c-format msgid "%s invalid control rate" msgstr "%s frecuencia de control inválida" -#: Engine/csound_orc_compile.c:639 Engine/csound_orc_compile.c:689 +#: Engine/csound_orc_compile.c:637 Engine/csound_orc_compile.c:688 #, c-format msgid "%s invalid ksmps value" msgstr "%s valor de ksmps inválido" -#: Engine/csound_orc_compile.c:641 Engine/csound_orc_compile.c:695 +#: Engine/csound_orc_compile.c:639 Engine/csound_orc_compile.c:694 #, c-format msgid "%s inconsistent sr, kr, ksmps" msgstr "%s sr, kr, ksmps inconsistentes" -#: Engine/csound_orc_compile.c:643 +#: Engine/csound_orc_compile.c:641 #, fuzzy, c-format msgid "%s inconsistent sr, kr, ksmps \n" msgstr "%s sr, kr, ksmps inconsistentes" -#: Engine/csound_orc_compile.c:659 +#: Engine/csound_orc_compile.c:657 #, fuzzy msgid "bad value for 0dbfs: must be positive. Setting default value." msgstr "valor incorrecto para 0dbfs: debe ser positivo." -#: Engine/csound_orc_compile.c:680 +#: Engine/csound_orc_compile.c:679 #, c-format msgid "sample rate overrides: esr = %7.4f, ekr = %7.4f, ksmps = %d\n" msgstr "" -#: Engine/csound_orc_compile.c:686 +#: Engine/csound_orc_compile.c:685 #, c-format msgid "" "sr = %.7g, kr = %.7g, ksmps = %.7g\n" "error:" msgstr "" -#: Engine/csound_orc_compile.c:832 +#: Engine/csound_orc_compile.c:842 #, c-format msgid "create_instrument: instr num %ld\n" msgstr "" -#: Engine/csound_orc_compile.c:921 +#: Engine/csound_orc_compile.c:934 msgid "-- deleted instr from deadpool \n" msgstr "" -#: Engine/csound_orc_compile.c:949 +#: Engine/csound_orc_compile.c:962 #, fuzzy, c-format msgid " -- free instr def %p \n" msgstr "auxlist para el instrumento %d (%p):\n" -#: Engine/csound_orc_compile.c:962 Engine/csound_orc_compile.c:973 +#: Engine/csound_orc_compile.c:975 Engine/csound_orc_compile.c:986 #, c-format msgid " -- added to deadpool slot %d \n" msgstr "" -#: Engine/csound_orc_compile.c:998 Engine/csound_orc_compile.c:1144 +#: Engine/csound_orc_compile.c:1011 Engine/csound_orc_compile.c:1158 #, c-format msgid "instr %ld redefined, replacing previous definition" msgstr "" -#: Engine/csound_orc_compile.c:1096 +#: Engine/csound_orc_compile.c:1109 #, c-format msgid "instr %s uses instrument number %d\n" msgstr "instr %s usa el número %d\n" -#: Engine/csound_orc_compile.c:1168 +#: Engine/csound_orc_compile.c:1183 #, fuzzy, c-format msgid "no active instances of instr %d \n" msgstr "retirada instancia del instrumento %d\n" -#: Engine/csound_orc_compile.c:1213 +#: Engine/csound_orc_compile.c:1228 msgid "!!! csound->opcodeInfo is NULL !!!\n" msgstr "" -#: Engine/csound_orc_compile.c:1249 +#: Engine/csound_orc_compile.c:1264 #, c-format msgid " merging constants %d) %f\n" msgstr "" -#: Engine/csound_orc_compile.c:1258 +#: Engine/csound_orc_compile.c:1273 #, c-format msgid " merging %d) %s:%s\n" msgstr "" -#: Engine/csound_orc_compile.c:1281 +#: Engine/csound_orc_compile.c:1299 #, fuzzy, c-format msgid "merging instr %d \n" msgstr "falta el número de instrumento" -#: Engine/csound_orc_compile.c:1289 +#: Engine/csound_orc_compile.c:1307 #, fuzzy, c-format msgid "merging instr %s \n" msgstr "falta el número de instrumento" -#: Engine/csound_orc_compile.c:1452 Engine/csound_orc_compile.c:1480 -#: Engine/csound_orc_compile.c:1503 +#: Engine/csound_orc_compile.c:1471 Engine/csound_orc_compile.c:1499 +#: Engine/csound_orc_compile.c:1522 msgid "invalid name for instrument" msgstr "nombre inválido para el instrumento" -#: Engine/csound_orc_compile.c:1485 Engine/csound_orc_compile.c:1508 +#: Engine/csound_orc_compile.c:1504 Engine/csound_orc_compile.c:1527 #, c-format msgid "instr %s redefined" msgstr "instr %s redefinido" -#: Engine/csound_orc_compile.c:1530 +#: Engine/csound_orc_compile.c:1549 #, c-format msgid "ERROR: Could not find OPCODINFO for opname: %s\n" msgstr "" -#: Engine/csound_orc_compile.c:1551 +#: Engine/csound_orc_compile.c:1570 #, c-format msgid "Unknown TREE node of type %d found in root.\n" msgstr "" -#: Engine/csound_orc_compile.c:1560 +#: Engine/csound_orc_compile.c:1579 #, c-format msgid "%d syntax errors in orchestra. compilation invalid\n" msgstr "%d errores de sintaxis en la orquesta. compilación inváilda\n" -#: Engine/csound_orc_compile.c:1600 +#: Engine/csound_orc_compile.c:1620 msgid "perf-pass statements illegal in header blk\n" msgstr "" "enunciados de ejecución (perf-pass) son ilegales en el bloque de encabezado\n" -#: Engine/csound_orc_compile.c:1772 +#: Engine/csound_orc_compile.c:1792 msgid "i[fixme] pset args != pmax" msgstr "" -#: Engine/csound_orc_compile.c:1894 +#: Engine/csound_orc_compile.c:1922 #, fuzzy, c-format msgid "Missing local arg: %s\n" msgstr "argumento sobrante o faltante" -#: Engine/csound_orc_compile.c:2025 +#: Engine/csound_orc_compile.c:2054 #, c-format msgid "Opcode \"%s\" is deprecated\n" msgstr "" @@ -433,46 +433,46 @@ msgid "Variable type for %s could not be determined.\n" msgstr "argumento de entrada '%s' usado antes de ser definido\n" -#: Engine/csound_orc_semantics.c:1300 +#: Engine/csound_orc_semantics.c:1301 #, fuzzy, c-format msgid "Unable to find opcode with name: %s\n" msgstr "No es posible abrir el archivo PVOC-EX %s: %s" -#: Engine/csound_orc_semantics.c:1315 +#: Engine/csound_orc_semantics.c:1316 #, c-format msgid "Unable to find opcode entry for '%s' with matching argument types:\n" msgstr "" -#: Engine/csound_orc_semantics.c:1318 +#: Engine/csound_orc_semantics.c:1319 #, c-format msgid "Found: %s %s %s\n" msgstr "" -#: Engine/csound_orc_semantics.c:1320 +#: Engine/csound_orc_semantics.c:1321 #, c-format msgid "Line: %d Loc: %d\n" msgstr "" -#: Engine/csound_orc_semantics.c:1454 +#: Engine/csound_orc_semantics.c:1455 #, c-format msgid "expression for until statement not a boolean expression, line %d\n" msgstr "" -#: Engine/csound_orc_semantics.c:1607 +#: Engine/csound_orc_semantics.c:1608 #, c-format msgid "" "\n" "error: %s (token \"%s\")" msgstr "" -#: Engine/csound_orc_semantics.c:1609 +#: Engine/csound_orc_semantics.c:1610 #, fuzzy, c-format msgid "" " line %d:\n" ">>>" msgstr " línea %d:\n" -#: Engine/csound_orc_semantics.c:2141 +#: Engine/csound_orc_semantics.c:2142 #, fuzzy, c-format msgid "insufficient required arguments for opcode %s on line %d:%d\n" msgstr "número insuficiente de argumentos requeridos" @@ -487,239 +487,239 @@ msgid "Creating search path cache for '%s':" msgstr "" -#: Engine/envvar.c:729 +#: Engine/envvar.c:731 msgid "Current directory path name too long\n" msgstr "" -#: Engine/envvar.c:1003 +#: Engine/envvar.c:1005 #, c-format msgid "internal error: csoundFileOpen(): invalid type: %d" msgstr "error interno: csoundFileOpen(): tipo inváido: %d" -#: Engine/envvar.c:1193 +#: Engine/envvar.c:1195 #, c-format msgid "internal error: csoundCreateFileHandle(): invalid type: %d" msgstr "error interno: csoundCreateFileHandle(): tipo inválido: %d" -#: Engine/fgens.c:91 +#: Engine/fgens.c:99 msgid "unknown GEN number" msgstr "número GEN desconocido" -#: Engine/fgens.c:133 +#: Engine/fgens.c:141 msgid "ftable does not exist" msgstr "la tabla-f (ftable) no existe" -#: Engine/fgens.c:138 +#: Engine/fgens.c:146 #, c-format msgid "ftable %d now deleted\n" msgstr "la tabla-f (ftable) %d ha sido borrada\n" -#: Engine/fgens.c:153 Engine/fgens.c:1612 Engine/fgens.c:1698 -#: Engine/fgens.c:1777 Engine/fgens.c:1893 Engine/fgens.c:1974 -#: Engine/fgens.c:3023 +#: Engine/fgens.c:161 Engine/fgens.c:1630 Engine/fgens.c:1716 +#: Engine/fgens.c:1795 Engine/fgens.c:1911 Engine/fgens.c:1992 +#: Engine/fgens.c:3043 msgid "insufficient gen arguments" msgstr "argumentos GEN insuficientes" -#: Engine/fgens.c:179 Opcodes/ftgen.c:117 +#: Engine/fgens.c:187 Opcodes/ftgen.c:117 #, c-format msgid "Named gen \"%s\" not defined" msgstr "GEN de nombre \"%s\" no definida" -#: Engine/fgens.c:187 +#: Engine/fgens.c:195 msgid "illegal gen number" msgstr "número GEN ilegal" -#: Engine/fgens.c:195 +#: Engine/fgens.c:203 msgid "deferred size for GENs 1, 23, 28 or 49 only" msgstr "tamaño diferido sólo permitido para GEN1, GEN23, GEN28, GEN49" -#: Engine/fgens.c:198 Engine/fgens.c:250 +#: Engine/fgens.c:206 Engine/fgens.c:258 #, c-format msgid "ftable %d:\n" msgstr "tabla-f (ftable) %d:\n" -#: Engine/fgens.c:223 Engine/fgens.c:2301 Engine/fgens.c:2880 +#: Engine/fgens.c:231 Engine/fgens.c:2320 Engine/fgens.c:2899 msgid "illegal table length" msgstr "longitud ilegal de tabla" -#: Engine/fgens.c:293 Engine/fgens.c:2262 +#: Engine/fgens.c:304 Engine/fgens.c:2281 #, c-format msgid "" "ftable %d relocating due to size change\n" " currently active instruments may find this disturbing" msgstr "" -#: Engine/fgens.c:351 Engine/fgens.c:472 Engine/fgens.c:556 Engine/fgens.c:637 -#: Engine/fgens.c:712 Engine/fgens.c:761 Engine/fgens.c:882 Engine/fgens.c:959 -#: Engine/fgens.c:1060 Engine/fgens.c:1104 Engine/fgens.c:1151 -#: Engine/fgens.c:1405 Engine/fgens.c:1467 Engine/fgens.c:1696 -#: Engine/fgens.c:1774 Engine/fgens.c:2129 Engine/fgens.c:2977 -#: Engine/fgens.c:3020 +#: Engine/fgens.c:362 Engine/fgens.c:483 Engine/fgens.c:567 Engine/fgens.c:648 +#: Engine/fgens.c:723 Engine/fgens.c:772 Engine/fgens.c:893 Engine/fgens.c:970 +#: Engine/fgens.c:1071 Engine/fgens.c:1115 Engine/fgens.c:1165 +#: Engine/fgens.c:1423 Engine/fgens.c:1485 Engine/fgens.c:1714 +#: Engine/fgens.c:1792 Engine/fgens.c:2147 Engine/fgens.c:2997 +#: Engine/fgens.c:3040 msgid "using extended arguments\n" msgstr "" -#: Engine/fgens.c:375 +#: Engine/fgens.c:386 msgid "no coefs present" msgstr "no hay coeficientes" -#: Engine/fgens.c:380 Engine/fgens.c:646 Engine/fgens.c:654 +#: Engine/fgens.c:391 Engine/fgens.c:657 Engine/fgens.c:665 msgid "illegal x interval" msgstr "intervalo x ilegal" -#: Engine/fgens.c:409 Engine/fgens.c:558 Engine/fgens.c:639 Engine/fgens.c:884 -#: Engine/fgens.c:1362 Engine/fgens.c:2473 Engine/fgens.c:2781 -#: Engine/fgens.c:2922 Opcodes/ftest.c:128 Top/main.c:118 util/cvanal.c:67 +#: Engine/fgens.c:420 Engine/fgens.c:569 Engine/fgens.c:650 Engine/fgens.c:895 +#: Engine/fgens.c:1380 Engine/fgens.c:2492 Engine/fgens.c:2800 +#: Engine/fgens.c:2941 Opcodes/ftest.c:128 Top/main.c:119 util/cvanal.c:67 #: util/lpanal.c:401 util/pvanal.c:170 msgid "insufficient arguments" msgstr "argumentos insuficientes" -#: Engine/fgens.c:413 Engine/fgens.c:1367 +#: Engine/fgens.c:424 Engine/fgens.c:1385 msgid "unknown srctable number" msgstr "número de tabla fuente (srctable) desconocido" -#: Engine/fgens.c:426 +#: Engine/fgens.c:437 msgid "table size too large" msgstr "tamaño de la tabla demasiado grande" -#: Engine/fgens.c:511 Engine/fgens.c:544 +#: Engine/fgens.c:522 Engine/fgens.c:555 msgid "gen call has negative segment size:" msgstr "" -#: Engine/fgens.c:513 +#: Engine/fgens.c:524 msgid "illegal input vals for gen call, beginning:" msgstr "" -#: Engine/fgens.c:579 +#: Engine/fgens.c:590 msgid "negative segsiz" msgstr "segsiz negativo" -#: Engine/fgens.c:788 +#: Engine/fgens.c:799 msgid "nh partials < 1" msgstr "" -#: Engine/fgens.c:887 +#: Engine/fgens.c:898 msgid "illegal xint value" msgstr "valor de xint ilegal" -#: Engine/fgens.c:890 +#: Engine/fgens.c:901 msgid "illegal xamp value" msgstr "valor de xamp ilegal" -#: Engine/fgens.c:963 +#: Engine/fgens.c:974 msgid "uneven number of args" msgstr "numero de argumentos impar" -#: Engine/fgens.c:1088 +#: Engine/fgens.c:1099 msgid "gen call has illegal x-ordinate values:" msgstr "la llamada GEN tiene valores ilegales para el eje x:" -#: Engine/fgens.c:1106 +#: Engine/fgens.c:1117 msgid "wrong number of args" msgstr "número equivocado de argumentos" -#: Engine/fgens.c:1120 +#: Engine/fgens.c:1131 msgid "a range given exceeds table length" msgstr "uno de los rangos dado excede la longitud de la tabla" -#: Engine/fgens.c:1127 +#: Engine/fgens.c:1138 msgid "an input function does not exist" msgstr "no existe función de entrada" -#: Engine/fgens.c:1260 +#: Engine/fgens.c:1274 msgid "No such window!" msgstr "No existe la ventana!" -#: Engine/fgens.c:1278 +#: Engine/fgens.c:1292 msgid "Wrong number of input arguments" msgstr "Número equivocado de argumentos de entrada" -#: Engine/fgens.c:1279 +#: Engine/fgens.c:1293 msgid "unknown distribution" msgstr "distribución desconocida" -#: Engine/fgens.c:1328 +#: Engine/fgens.c:1342 msgid "error opening ASCII file" msgstr "error abriendo archivo ASCII" -#: Engine/fgens.c:1334 +#: Engine/fgens.c:1352 #, c-format msgid "%ld elements in %s\n" msgstr "%ld elementos en %s\n" -#: Engine/fgens.c:1346 +#: Engine/fgens.c:1364 msgid "Numbers after table full in GEN23" msgstr "" -#: Engine/fgens.c:1375 +#: Engine/fgens.c:1393 msgid "table size must be the same of source table" msgstr "el tamaño de la tabla fuente y de la de destino debe ser igual" -#: Engine/fgens.c:1447 Engine/fgens.c:1507 +#: Engine/fgens.c:1465 Engine/fgens.c:1525 msgid "x coordinates must all be in increasing order:" msgstr "las coordenadas x deben estar en orden ascendente:" -#: Engine/fgens.c:1450 Engine/fgens.c:1509 +#: Engine/fgens.c:1468 Engine/fgens.c:1527 msgid "x coordinate greater than function size:" msgstr "coordenada x mayor que el tamaño de la función:" -#: Engine/fgens.c:1454 +#: Engine/fgens.c:1472 msgid "illegal input val (y <= 0) for gen call, beginning:" msgstr "" -#: Engine/fgens.c:1527 +#: Engine/fgens.c:1545 msgid "GEN28 requires zero table length" msgstr "GEN28 requiere tamaño de tabla cero" -#: Engine/fgens.c:1596 +#: Engine/fgens.c:1614 msgid "could not open space file" msgstr "no es posible abrir el archivo de espacio" -#: Engine/fgens.c:1598 +#: Engine/fgens.c:1616 msgid "Time values must be in increasing order" msgstr "Los valores de tiempo deben estar en orden ascendente" -#: Engine/fgens.c:1619 +#: Engine/fgens.c:1637 msgid "GEN30: source ftable not found" msgstr "GEN30: tabla-f (ftable) fuente no encontrada" -#: Engine/fgens.c:1702 +#: Engine/fgens.c:1720 msgid "GEN31: source ftable not found" msgstr "GEN31: tabla-f (ftable) fuente no encontrada" -#: Engine/fgens.c:1810 +#: Engine/fgens.c:1828 #, c-format msgid "GEN32: source ftable %d not found" msgstr "GEN32: tabla-f (ftable) fuente %d no encontrada" -#: Engine/fgens.c:1904 +#: Engine/fgens.c:1922 msgid "GEN33: source ftable not found" msgstr "GEN33: tabla-f (ftable) fuente no encontrada" -#: Engine/fgens.c:2072 +#: Engine/fgens.c:2090 msgid "unknown source table number" msgstr "número de tabla fuente desconocida" -#: Engine/fgens.c:2104 +#: Engine/fgens.c:2122 msgid "Gen41: negative probability not allowed" msgstr "" -#: Engine/fgens.c:2170 Opcodes/fareygen.c:70 +#: Engine/fgens.c:2188 Opcodes/fareygen.c:70 #, c-format msgid "ftable %d: " msgstr "tabla-f (ftable) %d: " -#: Engine/fgens.c:2214 +#: Engine/fgens.c:2232 #, c-format msgid "ftable %d:" msgstr "tabla-f (ftable) %d:" -#: Engine/fgens.c:2257 +#: Engine/fgens.c:2275 #, c-format msgid "replacing previous ftable %d" msgstr "reemplazando tabla-f (ftable) %d anterior" -#: Engine/fgens.c:2297 Engine/fgens.c:2423 Engine/fgens.c:2451 -#: Engine/fgens.c:2458 Opcodes/gab/gab.c:590 Opcodes/gab/gab.c:645 +#: Engine/fgens.c:2316 Engine/fgens.c:2442 Engine/fgens.c:2470 +#: Engine/fgens.c:2477 Opcodes/gab/gab.c:592 Opcodes/gab/gab.c:647 #: Opcodes/midiops2.c:233 Opcodes/midiops2.c:388 Opcodes/midiops2.c:470 #: Opcodes/uggab.c:1625 Opcodes/uggab.c:1661 Opcodes/uggab.c:1683 #: Opcodes/uggab.c:1736 @@ -727,124 +727,124 @@ msgid "Invalid ftable no. %f" msgstr "Tabla-f (ftable) no. %f inválida" -#: Engine/fgens.c:2306 +#: Engine/fgens.c:2325 #, c-format msgid "deferred-size ftable %f illegal here" msgstr "tabla-f (ftable) %f de tamaño diferido es ilegal aquí" -#: Engine/fgens.c:2362 Engine/fgens.c:2961 +#: Engine/fgens.c:2381 Engine/fgens.c:2981 #, c-format msgid "Deferred load of '%s' failed" msgstr "Falló la carga diferida de '%s'" -#: Engine/fgens.c:2429 +#: Engine/fgens.c:2448 #, c-format msgid "Deferred-size ftable %f load not available at perf time." msgstr "" "Carga de la tabla-f (ftable) %f de tamaño diferido no disponible en tiempo " "perf." -#: Engine/fgens.c:2497 +#: Engine/fgens.c:2516 #, c-format msgid "non-deferred ftable %d needs size %d\n" msgstr "" -#: Engine/fgens.c:2544 Opcodes/loscilx.c:69 +#: Engine/fgens.c:2563 Opcodes/loscilx.c:69 #, c-format msgid "invalid sample format: %d" msgstr "formato de muestra inválido: %d" -#: Engine/fgens.c:2552 Engine/fgens.c:2805 +#: Engine/fgens.c:2571 Engine/fgens.c:2824 #, c-format msgid "channel %d illegal" msgstr "canal %d ilegal" -#: Engine/fgens.c:2558 +#: Engine/fgens.c:2577 msgid "deferred alloc\n" msgstr "" -#: Engine/fgens.c:2566 Engine/fgens.c:2878 +#: Engine/fgens.c:2585 Engine/fgens.c:2897 msgid "deferred size, but filesize unknown" msgstr "tamaño diferido, pero tamaño del archivo desconocido" -#: Engine/fgens.c:2569 Engine/fgens.c:2882 +#: Engine/fgens.c:2588 Engine/fgens.c:2901 #, c-format msgid " defer length %d\n" msgstr "" -#: Engine/fgens.c:2637 +#: Engine/fgens.c:2656 msgid "GEN1: input file truncated by ftable size" msgstr "GEN1: archivo de entrada truncado por el tamaño de la tabla-f (ftable)" -#: Engine/fgens.c:2641 +#: Engine/fgens.c:2660 #, c-format msgid "\tlooping endpoint %d exceeds ftsize %d\n" msgstr "\tpunto final de bucle %ld excede el tamaño de la tabla %ld\n" -#: Engine/fgens.c:2657 +#: Engine/fgens.c:2676 msgid "GEN1 read error" msgstr "GEN1 error de lectura" -#: Engine/fgens.c:2662 +#: Engine/fgens.c:2681 msgid "GEN1: aiff file truncated by ftable size" msgstr "GEN1: archivo aiff truncado por el tamaño de la tabla-f (ftable)" -#: Engine/fgens.c:2663 +#: Engine/fgens.c:2682 #, c-format msgid "\taudio samps %d exceeds ftsize %d" msgstr "\tmuestras de audio %ld excedene el tamaño de la tabla %ld" -#: Engine/fgens.c:2707 +#: Engine/fgens.c:2726 msgid "wrong number of ftable arguments" msgstr "número equivocado de argumentos para la tabla-f (ftable)" -#: Engine/fgens.c:2717 OOps/pstream.c:379 +#: Engine/fgens.c:2736 OOps/pstream.c:379 msgid "Failed to load PVOC-EX file" msgstr "No fue posible cargar el archivo PVOC-EX" -#: Engine/fgens.c:2728 InOut/midirecv.c:417 OOps/midiops.c:402 +#: Engine/fgens.c:2747 InOut/midirecv.c:419 OOps/midiops.c:402 #: OOps/midiops.c:452 OOps/midiops.c:464 msgid "illegal channel number" msgstr "número de canal ilegal" -#: Engine/fgens.c:2746 +#: Engine/fgens.c:2765 msgid "ftable size too small" msgstr "la tabla-f (ftable) es demasiado pequeña" -#: Engine/fgens.c:2821 Opcodes/mp3in.c:87 Opcodes/mp3in.c:255 +#: Engine/fgens.c:2840 Opcodes/mp3in.c:87 Opcodes/mp3in.c:255 #: Top/cscorfns.c:176 Top/cscorfns.c:207 msgid "Not enough memory\n" msgstr "" -#: Engine/fgens.c:2987 +#: Engine/fgens.c:3007 msgid "gen51: invalid number of p-fields (too few grades)" msgstr "GEN51: número inválido de campos-p (p-fields) (faltan grados)" -#: Engine/fgens.c:3027 +#: Engine/fgens.c:3047 msgid "number of channels inconsistent with number of args" msgstr "número de canales inconsistente con el número de argumentos" -#: Engine/fgens.c:3186 +#: Engine/fgens.c:3206 msgid "GEN53: invalid number of gen arguments" msgstr "GEN53: número inválido de argumentos" -#: Engine/fgens.c:3196 +#: Engine/fgens.c:3216 msgid "GEN53: invalid table length" msgstr "GEN53: tamaño inválido de tabla" -#: Engine/fgens.c:3200 +#: Engine/fgens.c:3220 msgid "GEN53: invalid source table number" msgstr "GEN53: número inválido de tabla fuente" -#: Engine/fgens.c:3203 +#: Engine/fgens.c:3223 msgid "GEN53: mode must be in the range 0 to 15" msgstr "GEN53: el modo debe estar entre 0 y 15" -#: Engine/fgens.c:3207 +#: Engine/fgens.c:3227 msgid "GEN53: invalid source table length" msgstr "GEN53: tamaño inválido de la tabla fuente" -#: Engine/fgens.c:3212 +#: Engine/fgens.c:3232 msgid "GEN53: invalid window table" msgstr "GEN53: tabla de ventana inválida" @@ -868,24 +868,24 @@ msgid "Instrument %d muted\n" msgstr "Intrumento %d desactivado\n" -#: Engine/insert.c:144 Engine/insert.c:374 +#: Engine/insert.c:144 Engine/insert.c:376 #, c-format msgid "cannot allocate last note because it exceeds 100%% of cpu time" msgstr "" "no es posible colocar la última nota porque escede el 100%% de tiempo de CPU" -#: Engine/insert.c:150 Engine/insert.c:380 +#: Engine/insert.c:150 Engine/insert.c:382 msgid "cannot allocate last note because it exceeds instr maxalloc" msgstr "" "no es posible colocar la última nota porque escede el valor de maxalloc del " "instrumento" -#: Engine/insert.c:168 Engine/insert.c:400 +#: Engine/insert.c:168 #, c-format msgid "new alloc for instr %s:\n" msgstr "Nueva colocación para el instrumento %s:\n" -#: Engine/insert.c:170 Engine/insert.c:402 +#: Engine/insert.c:170 #, c-format msgid "new alloc for instr %d:\n" msgstr "Nueva colocación para el instrumento %d:\n" @@ -900,118 +900,128 @@ msgid "instr %d uses %d p-fields but is given %d" msgstr "instr %d usa %d campos-p (pfields) pero se han dado %d" -#: Engine/insert.c:345 Engine/insert.c:573 +#: Engine/insert.c:345 Engine/insert.c:575 #, c-format msgid "instr %s now active:\n" msgstr "" -#: Engine/insert.c:347 Engine/insert.c:575 +#: Engine/insert.c:347 Engine/insert.c:577 #, c-format msgid "instr %d now active:\n" msgstr "" -#: Engine/insert.c:389 -#, c-format -msgid "activating instr %s\n" -msgstr "" - #: Engine/insert.c:391 -#, c-format -msgid "activating instr %d\n" -msgstr "" +#, fuzzy, c-format +msgid "MIDI activating instr %s\n" +msgstr "falta el número de instrumento" -#: Engine/insert.c:416 +#: Engine/insert.c:393 +#, fuzzy, c-format +msgid "MIDI activating instr %d\n" +msgstr "retirada instancia del instrumento %d\n" + +#: Engine/insert.c:402 +#, fuzzy, c-format +msgid "new MIDI alloc for instr %s:\n" +msgstr "Nueva colocación para el instrumento %s:\n" + +#: Engine/insert.c:404 +#, fuzzy, c-format +msgid "new MIDI alloc for instr %d:\n" +msgstr "Nueva colocación para el instrumento %d:\n" + +#: Engine/insert.c:418 #, c-format msgid "MIDI note overlaps with key %d on same channel" msgstr "Nota MIDI se sobrepone a la tecla %d en el mismo canal" -#: Engine/insert.c:683 +#: Engine/insert.c:685 #, c-format msgid "removed instance of instr %s\n" msgstr "retirada instancia del instrumento %s\n" -#: Engine/insert.c:685 +#: Engine/insert.c:687 #, c-format msgid "removed instance of instr %d\n" msgstr "retirada instancia del instrumento %d\n" -#: Engine/insert.c:843 +#: Engine/insert.c:851 msgid "inactive allocs returned to freespace\n" msgstr "" -#: Engine/insert.c:869 +#: Engine/insert.c:877 #, c-format msgid "could not find playing instr %f\n" msgstr "" -#: Engine/insert.c:882 +#: Engine/insert.c:890 msgid "" "\n" "INIT ERROR: " msgstr "" -#: Engine/insert.c:895 +#: Engine/insert.c:903 #, c-format msgid "INIT ERROR in instr %d (opcode %s): " msgstr "INIT ERROR en instrumento %d (opcode %s): " -#: Engine/insert.c:898 +#: Engine/insert.c:906 #, c-format msgid "INIT ERROR in instr %d (subinstr %d): " msgstr "INIT ERROR en instrumento %d (subinstr %d): " -#: Engine/insert.c:902 +#: Engine/insert.c:910 #, c-format msgid "INIT ERROR in instr %d: " msgstr "INIT ERROR en instrumento %d: " -#: Engine/insert.c:923 +#: Engine/insert.c:931 #, c-format msgid "PERF ERROR in instr %d (opcode %s): " msgstr "PERF ERROR en instrumento %d (opcode %s): " -#: Engine/insert.c:926 +#: Engine/insert.c:934 #, c-format msgid "PERF ERROR in instr %d (subinstr %d): " msgstr "PERF ERROR en instrumento %d (subinstr %d): " -#: Engine/insert.c:930 +#: Engine/insert.c:938 #, c-format msgid "PERF ERROR in instr %d: " msgstr "PERF ERROR en instrumento %d: " -#: Engine/insert.c:935 +#: Engine/insert.c:943 msgid " note aborted\n" msgstr " nota abortada\n" -#: Engine/insert.c:954 +#: Engine/insert.c:962 msgid "subinstr: number of output args greater than nchnls" msgstr "subinstr: número de argumentos de salida es mayor que nchnls" -#: Engine/insert.c:1022 +#: Engine/insert.c:1030 msgid "subinstr: too many p-fields" msgstr "subinstr: demasiados campos-p (pfields)" -#: Engine/insert.c:1127 +#: Engine/insert.c:1135 #, c-format msgid "%s: invalid local ksmps value: %d" msgstr "%s: valor inválido de ksmps local: %d" -#: Engine/insert.c:1259 OOps/bus.c:611 Opcodes/stackops.c:293 +#: Engine/insert.c:1278 OOps/bus.c:614 Opcodes/stackops.c:293 #, c-format msgid "%s: not initialised" msgstr "%s: no ha sido inicializado" -#: Engine/insert.c:1442 +#: Engine/insert.c:1458 #, fuzzy, c-format msgid "setksmps: invalid ksmps value: %d, original: %d" msgstr "setksmps: valor inválido de ksmps: %d" -#: Engine/insert.c:1564 +#: Engine/insert.c:1595 msgid "subinstr: not initialised" msgstr "subinstr: no ha sido inicializado" -#: Engine/insert.c:2005 +#: Engine/insert.c:2046 #, c-format msgid "" "instr %d allocated at %p\n" @@ -1020,29 +1030,29 @@ "instr %d colocado en %p\n" "\tlclbas %p, opds %p\n" -#: Engine/insert.c:2023 +#: Engine/insert.c:2064 #, fuzzy, c-format msgid "op (%s) allocated at %p\n" msgstr "op %d (%s) colocado en %p\n" -#: Engine/insert.c:2048 +#: Engine/insert.c:2089 msgid "null iopadr" msgstr "" -#: Engine/insert.c:2059 +#: Engine/insert.c:2100 msgid "null opadr" msgstr "" -#: Engine/insert.c:2131 +#: Engine/insert.c:2182 msgid "inconsistent opds total" msgstr "" -#: Engine/insert.c:2192 +#: Engine/insert.c:2243 #, fuzzy, c-format msgid "Instrument %s is still active" msgstr "Intrumento %s desactivado" -#: Engine/insert.c:2195 +#: Engine/insert.c:2246 #, c-format msgid "Instrument %d is still active" msgstr "Intrumento %d desactivado" @@ -1066,40 +1076,40 @@ msgid "stdmode = %.8x Linefd = %d\n" msgstr "" -#: Engine/linevent.c:186 +#: Engine/linevent.c:184 msgid "LineBuffer Overflow - Input Data has been Lost" msgstr "LineBuffer Overflow - se han perdido datos de entrada" -#: Engine/linevent.c:239 +#: Engine/linevent.c:238 #, c-format msgid "unknown opcode %c" msgstr "opcode desconocido '%c'" -#: Engine/linevent.c:259 +#: Engine/linevent.c:258 msgid "unmatched quotes" msgstr "comillas sin cerrar" -#: Engine/linevent.c:286 +#: Engine/linevent.c:285 msgid "dot carry has no reference" msgstr "" -#: Engine/linevent.c:291 +#: Engine/linevent.c:290 msgid "cannot carry string p-field" msgstr "" -#: Engine/linevent.c:302 +#: Engine/linevent.c:301 msgid "too few pfields" msgstr "faltan campos-p (pfields)" -#: Engine/linevent.c:306 +#: Engine/linevent.c:305 msgid "-L with negative p2 illegal" msgstr "-L con p2 negativo es ilegal" -#: Engine/linevent.c:317 +#: Engine/linevent.c:316 msgid "too many pfields" msgstr "demasiados campos-p (pfields)" -#: Engine/linevent.c:329 +#: Engine/linevent.c:328 #, c-format msgid "" "illegal RT scoreline:\n" @@ -1110,24 +1120,29 @@ "%s\n" "%*s" -#: Engine/linevent.c:351 +#: Engine/linevent.c:350 msgid "event: param 1 must be \"a\", \"i\", \"q\", \"f\", or \"e\"" msgstr "" -#: Engine/linevent.c:353 +#: Engine/linevent.c:352 msgid "event: string name is allowed only for \"i\" and \"q\" events" msgstr "" -#: Engine/linevent.c:394 +#: Engine/linevent.c:395 #, c-format msgid "event: error creating '%c' event" msgstr "event: error creando el evento '%c'" -#: Engine/linevent.c:457 +#: Engine/linevent.c:459 #, c-format msgid "event_i: error creating '%c' event" msgstr "event_i: error creando el evento '%c'" +#: Engine/linevent.c:505 +#, fuzzy +msgid "instance: error creating event" +msgstr "event: error creando el evento '%c'" + #: Engine/memalloc.c:58 #, c-format msgid "memory allocate failure for %lu" @@ -1194,7 +1209,7 @@ msgstr "Error leyendo el archivo PVOC-EX %s después de %d cuadros" #: Engine/memfiles.c:511 Opcodes/pvinterp.c:77 Opcodes/pvinterp.c:193 -#: Opcodes/pvinterp.c:383 Opcodes/ugens9.c:104 Opcodes/vpvoc.c:210 +#: Opcodes/pvinterp.c:383 Opcodes/ugens9.c:104 Opcodes/vpvoc.c:212 #, c-format msgid "%s's srate = %8.0f, orch's srate = %8.0f" msgstr "" @@ -1231,22 +1246,22 @@ msgid "Beat mode not in force" msgstr "" -#: Engine/musmon.c:173 Top/csound.c:2854 +#: Engine/musmon.c:173 Top/csound.c:2859 #, c-format msgid "Csound version %s beta (double samples) %s\n" msgstr "Csound version %s beta (64-bit) %s\n" -#: Engine/musmon.c:176 Top/csound.c:2857 +#: Engine/musmon.c:176 Top/csound.c:2862 #, c-format msgid "Csound version %s (double samples) %s\n" msgstr "Csound version %s (64-bit) %s\n" -#: Engine/musmon.c:181 Top/csound.c:2846 +#: Engine/musmon.c:181 Top/csound.c:2851 #, c-format msgid "Csound version %s beta (float samples) %s\n" msgstr "Csound version %s beta (32-bit) %s\n" -#: Engine/musmon.c:184 Top/csound.c:2849 +#: Engine/musmon.c:184 Top/csound.c:2854 #, c-format msgid "Csound version %s (float samples) %s\n" msgstr "Csound version %s (32-bit) %s\n" @@ -1288,7 +1303,7 @@ msgid "sorting cscore.out ..\n" msgstr "ordenando cscore.out ...\n" -#: Engine/musmon.c:340 Top/main.c:329 +#: Engine/musmon.c:340 Top/main.c:297 msgid "\t... done\n" msgstr "\t... listo\n" @@ -1296,8 +1311,8 @@ msgid "playing from cscore.srt\n" msgstr "" -#: Engine/musmon.c:345 Engine/musmon.c:497 Engine/musmon.c:1119 -#: Engine/musmon.c:1329 +#: Engine/musmon.c:345 Engine/musmon.c:501 Engine/musmon.c:1124 +#: Engine/musmon.c:1335 #, c-format msgid "SECTION %d:\n" msgstr "SECCION %d:\n" @@ -1307,11 +1322,11 @@ msgid "%c\tbeep!\n" msgstr "" -#: Engine/musmon.c:450 +#: Engine/musmon.c:454 msgid "end of score.\t\t overall amps:" msgstr "fin del score.\t\t amplitud global:" -#: Engine/musmon.c:461 +#: Engine/musmon.c:465 msgid "" "\n" "\t overall samples out of range:" @@ -1319,7 +1334,7 @@ "\n" "\t número global de muestras fuera de rango:" -#: Engine/musmon.c:465 +#: Engine/musmon.c:469 #, c-format msgid "" "\n" @@ -1328,109 +1343,109 @@ "\n" "%d errores en la ejecución\n" -#: Engine/musmon.c:467 +#: Engine/musmon.c:471 msgid "end of performance" msgstr "fin de la ejecución" -#: Engine/musmon.c:480 +#: Engine/musmon.c:484 msgid "no sound written to disk\n" msgstr "no se ecribió sonido en el disco\n" -#: Engine/musmon.c:572 Engine/musmon.c:618 +#: Engine/musmon.c:577 Engine/musmon.c:623 msgid "\t number of samples out of range:" msgstr "\t número de muestras fuera de rango:" -#: Engine/musmon.c:611 +#: Engine/musmon.c:616 #, c-format msgid "end of section %d\t sect peak amps:" msgstr "fin de la sección %d\t amplitud máxima de sección:" -#: Engine/musmon.c:613 +#: Engine/musmon.c:618 msgid "end of lplay event list\t peak amps:" msgstr "" -#: Engine/musmon.c:678 Engine/musmon.c:705 +#: Engine/musmon.c:683 Engine/musmon.c:710 #, c-format msgid " - note deleted. instr %s undefined" msgstr " - nota descartada. Instrumento %s indefinido" -#: Engine/musmon.c:682 +#: Engine/musmon.c:687 #, c-format msgid "Setting instrument %s %s\n" msgstr "" -#: Engine/musmon.c:683 Engine/musmon.c:697 +#: Engine/musmon.c:688 Engine/musmon.c:702 msgid "off" msgstr "apagado" -#: Engine/musmon.c:683 Engine/musmon.c:697 +#: Engine/musmon.c:688 Engine/musmon.c:702 msgid "on" msgstr "prendido" -#: Engine/musmon.c:692 Engine/musmon.c:734 +#: Engine/musmon.c:697 Engine/musmon.c:739 #, c-format msgid " - note deleted. instr %d(%d) undefined" msgstr " - nota descartada. Instrumento %d(%d) indefinido" -#: Engine/musmon.c:696 +#: Engine/musmon.c:701 #, c-format msgid "Setting instrument %d %s\n" msgstr "" -#: Engine/musmon.c:724 +#: Engine/musmon.c:729 #, c-format msgid " - note deleted. i%d (%s) had %d init errors" msgstr " - nota descartada. i%d (%s) tuvo %d errores de inicialización" -#: Engine/musmon.c:755 +#: Engine/musmon.c:760 #, c-format msgid " - note deleted. i%d had %d init errors" msgstr " - nota descartada. i%d tuvo %d errores de inicialización" -#: Engine/musmon.c:776 +#: Engine/musmon.c:781 #, c-format msgid "time advanced %5.3f beats by score request\n" msgstr "avance de %5.3f tiempos por petición del score\n" -#: Engine/musmon.c:794 +#: Engine/musmon.c:799 #, c-format msgid "\t\t T%7.3f - note deleted. " msgstr "\t\t T%7.3f - nota descartada. " -#: Engine/musmon.c:798 +#: Engine/musmon.c:803 #, c-format msgid "instr %s had %d init errors\n" msgstr "el instrumento %s tuvo %d errores de inicialización\n" -#: Engine/musmon.c:801 +#: Engine/musmon.c:806 #, c-format msgid "instr %d had %d init errors\n" msgstr "el instrumento %d tuvo %d errores de inicialización\n" -#: Engine/musmon.c:893 +#: Engine/musmon.c:898 msgid "terminating.\n" msgstr "terminando.\n" -#: Engine/musmon.c:980 +#: Engine/musmon.c:985 #, c-format msgid "error in score. illegal opcode %c (ASCII %d)\n" msgstr "error en el score. opcode ilegal %c (ASCII %d)\n" -#: Engine/musmon.c:1241 +#: Engine/musmon.c:1247 #, fuzzy msgid "insert_score_event(): invalid instrument number or name\n" msgstr "insert_score_event(): número o nombre de instrumento inválido\n" -#: Engine/musmon.c:1261 +#: Engine/musmon.c:1267 #, c-format msgid "insert_score_event(): unknown opcode: %c\n" msgstr "insert_score_event(): opcode desconocido: %c\n" -#: Engine/musmon.c:1284 +#: Engine/musmon.c:1290 msgid "insert_score_event(): insufficient p-fields\n" msgstr "insert_score_event(): faltan campos-p (p-fields)\n" -#: Engine/musmon.c:1338 +#: Engine/musmon.c:1344 msgid "cannot rewind score: no score in memory \n" msgstr "" @@ -1448,29 +1463,29 @@ msgid "cannot find the specified instrument or opcode" msgstr "No se puede encontrar el instrumento o opcode especificado" -#: Engine/new_orc_parser.c:92 Top/main.c:264 +#: Engine/new_orc_parser.c:144 #, fuzzy, c-format msgid "Failed to open input file %s\n" msgstr "No fue posible abrir el archivo de salida %s" -#: Engine/new_orc_parser.c:122 +#: Engine/new_orc_parser.c:177 msgid "Unmatched #ifdef\n" msgstr "" -#: Engine/new_orc_parser.c:156 +#: Engine/new_orc_parser.c:212 msgid "Parsing failed due to invalid input!\n" msgstr "" -#: Engine/new_orc_parser.c:160 +#: Engine/new_orc_parser.c:216 msgid "Parsing failed due to memory exhaustion!\n" msgstr "" -#: Engine/new_orc_parser.c:163 +#: Engine/new_orc_parser.c:219 #, c-format msgid "Parsing failed due to %d syntax error%s!\n" msgstr "" -#: Engine/new_orc_parser.c:208 +#: Engine/new_orc_parser.c:264 msgid "Stopping on parser failure\n" msgstr "" @@ -1487,7 +1502,7 @@ "\n" "\tel resto de la línea descartada\n" -#: Engine/rdscor.c:159 +#: Engine/rdscor.c:160 msgid "ERROR: too many pfields: " msgstr "ERROR: demasidados campos-p (pfields): " @@ -1714,8 +1729,8 @@ msgid "! invalid in p1, p2, or p3" msgstr "" -#: Engine/sread.c:1266 Engine/sread.c:1271 Engine/sread.c:1749 -#: Engine/sread.c:1772 Engine/sread.c:1786 +#: Engine/sread.c:1266 Engine/sread.c:1271 Engine/sread.c:1754 +#: Engine/sread.c:1777 Engine/sread.c:1791 msgid " remainder of line flushed\n" msgstr " el resto de la línea descartado\n" @@ -1764,47 +1779,47 @@ msgid "Not #include" msgstr "" -#: Engine/sread.c:1674 +#: Engine/sread.c:1679 #, c-format msgid "Cannot open #include'd file %s" msgstr "" -#: Engine/sread.c:1684 +#: Engine/sread.c:1689 msgid "Not #undef" msgstr "" -#: Engine/sread.c:1705 +#: Engine/sread.c:1710 #, c-format msgid "macro %s undefined\n" msgstr "el macro %s no está definido\n" -#: Engine/sread.c:1711 +#: Engine/sread.c:1716 msgid "unknown # option" msgstr "Opción # desconocida" -#: Engine/sread.c:1748 +#: Engine/sread.c:1753 #, c-format msgid "illegal opcode %c" msgstr "no es un opcode legal" -#: Engine/sread.c:1771 +#: Engine/sread.c:1776 #, c-format msgid "unexpected char %c" msgstr "" -#: Engine/sread.c:1785 +#: Engine/sread.c:1790 msgid "illegally placed string" msgstr "" -#: Engine/sread.c:1792 +#: Engine/sread.c:1797 msgid "unmatched quote" msgstr "comillas sin cerrar" -#: Engine/sread.c:1836 +#: Engine/sread.c:1841 msgid "sread: illegal number format: " msgstr "" -#: Engine/sread.c:1842 +#: Engine/sread.c:1847 msgid " zero substituted.\n" msgstr " sustituído por cero.\n" @@ -2431,56 +2446,56 @@ msgid "unrecognised message type %d" msgstr "mensaje de tipo %d no reconocido" -#: InOut/midirecv.c:400 +#: InOut/midirecv.c:402 #, c-format msgid "midi channel %d using instr %d\n" msgstr "canal MIDI %d usa instrumento %d\n" -#: InOut/midirecv.c:403 +#: InOut/midirecv.c:405 #, c-format msgid "midi channel %d is muted\n" msgstr "" -#: InOut/midirecv.c:421 +#: InOut/midirecv.c:423 #, c-format msgid "MIDI channel %d muted\n" msgstr "" -#: InOut/midirecv.c:426 +#: InOut/midirecv.c:428 #, c-format msgid "Insno = %d\n" msgstr "" -#: InOut/midirecv.c:427 +#: InOut/midirecv.c:429 msgid "unknown instr" msgstr "instrumento desconocido" -#: InOut/midirecv.c:430 +#: InOut/midirecv.c:432 #, c-format msgid "chnl %d using instr %d\n" msgstr "" -#: InOut/midirecv.c:490 +#: InOut/midirecv.c:492 #, c-format msgid " *** error reading MIDI device: %d (%s)" msgstr "" -#: InOut/midirecv.c:519 +#: InOut/midirecv.c:521 #, c-format msgid "undefined sys-realtime msg %x\n" msgstr "" -#: InOut/midirecv.c:537 +#: InOut/midirecv.c:539 #, c-format msgid "undefined sys_common msg %x\n" msgstr "" -#: InOut/midirecv.c:599 +#: InOut/midirecv.c:601 #, c-format msgid "Error closing MIDI in device: %d (%s)" msgstr "Error cerrando el dispositivo de entrada MIDI: %d (%s)" -#: InOut/midirecv.c:606 +#: InOut/midirecv.c:608 #, c-format msgid "Error closing MIDI out device: %d (%s)" msgstr "Error cerrando el dispositivo de salida MIDI: %d (%s)" @@ -3745,77 +3760,77 @@ msgid "non-looping sample" msgstr "" -#: OOps/aops.c:1041 OOps/aops.c:1069 +#: OOps/aops.c:1037 OOps/aops.c:1065 #, c-format msgid "No tuning table %d" msgstr "" -#: OOps/aops.c:1114 OOps/aops.c:1152 +#: OOps/aops.c:1110 OOps/aops.c:1148 msgid "cpstun: invalid table" msgstr "cpstun: tabla inválida" -#: OOps/aops.c:1544 OOps/aops.c:1580 +#: OOps/aops.c:1540 OOps/aops.c:1576 #, c-format msgid "Input channel %d too large; ignored" msgstr "" -#: OOps/aops.c:1576 +#: OOps/aops.c:1572 msgid "Input and output argument count differs in inch" msgstr "" -#: OOps/aops.c:2014 +#: OOps/aops.c:2010 msgid "Unknown function called" msgstr "" -#: OOps/aops.c:2050 +#: OOps/aops.c:2046 msgid "number of arguments != nchnls" msgstr "" -#: OOps/aops.c:2080 +#: OOps/aops.c:2076 msgid "outrg: channel number cannot be < 1 (1 is the first channel)" msgstr "" -#: OOps/bus.c:80 OOps/bus.c:102 OOps/bus.c:127 OOps/bus.c:155 +#: OOps/bus.c:83 OOps/bus.c:105 OOps/bus.c:130 OOps/bus.c:158 msgid "chani: invalid index" msgstr "chani: índice inválido" -#: OOps/bus.c:88 OOps/bus.c:134 +#: OOps/bus.c:91 OOps/bus.c:137 #, c-format msgid "chani error %d:channel not found or not right type" msgstr "" -#: OOps/bus.c:110 OOps/bus.c:162 +#: OOps/bus.c:113 OOps/bus.c:165 #, c-format msgid "chano error %d:channel not found or not right type" msgstr "" -#: OOps/bus.c:216 +#: OOps/bus.c:219 msgid "pvsin: invalid index" msgstr "pvsin: índice inválido" -#: OOps/bus.c:224 +#: OOps/bus.c:227 #, c-format msgid "pvsin error %d:channel not found or not right type" msgstr "" -#: OOps/bus.c:279 +#: OOps/bus.c:282 msgid "pvsout: invalid index" msgstr "pvsin: índice inválido" -#: OOps/bus.c:287 +#: OOps/bus.c:290 #, c-format msgid "pvsout error %d:channel not found or not right type" msgstr "" -#: OOps/bus.c:1026 OOps/bus.c:1075 OOps/bus.c:1096 OOps/bus.c:1143 +#: OOps/bus.c:1029 OOps/bus.c:1078 OOps/bus.c:1099 OOps/bus.c:1146 msgid "invalid mode parameter" msgstr "parámetros de modo inválidos" -#: OOps/bus.c:1063 OOps/bus.c:1187 +#: OOps/bus.c:1066 OOps/bus.c:1187 msgid "invalid channel parameters" msgstr "parámetros de canal inválidos" -#: OOps/bus.c:1151 +#: OOps/bus.c:1154 msgid "channel already exists" msgstr "el canal ya existe" @@ -3864,11 +3879,11 @@ msgid "diskin2: invalid number of channels" msgstr "diskin2: número inválido de canales" -#: OOps/diskin2.c:289 OOps/diskin2.c:1741 +#: OOps/diskin2.c:289 OOps/diskin2.c:1745 msgid "diskin2: unknown sample format" msgstr "diskin2: formato de muestras desconocido" -#: OOps/diskin2.c:304 OOps/diskin2.c:1756 +#: OOps/diskin2.c:304 OOps/diskin2.c:1760 #, c-format msgid "diskin2: %s: failed to open file" msgstr "" @@ -3880,21 +3895,21 @@ "diskin2: número de argumentos de salida no coincide con el número de canales " "del archivo" -#: OOps/diskin2.c:346 OOps/diskin2.c:1813 +#: OOps/diskin2.c:346 OOps/diskin2.c:1817 #, c-format msgid "diskin2: warning: file sample rate (%d) != orchestra sr (%d)\n" msgstr "" "diskin2: warning: tasa de muestreo del archivo (%d) != de tasa de muestreo " "de la orquesta (%d)\n" -#: OOps/diskin2.c:427 OOps/diskin2.c:1894 +#: OOps/diskin2.c:427 OOps/diskin2.c:1905 #, c-format msgid "" "diskin2: opened (asynchronously) '%s':\n" " %d Hz, %d channel(s), %ld sample frames\n" msgstr "" -#: OOps/diskin2.c:441 OOps/diskin2.c:1908 +#: OOps/diskin2.c:441 OOps/diskin2.c:1919 #, c-format msgid "" "diskin2: opened '%s':\n" @@ -3902,12 +3917,12 @@ msgstr "" #: OOps/diskin2.c:520 OOps/diskin2.c:706 OOps/diskin2.c:902 -#: OOps/diskin2.c:1526 OOps/diskin2.c:1940 OOps/diskin2.c:2133 +#: OOps/diskin2.c:1529 OOps/diskin2.c:1951 OOps/diskin2.c:2144 msgid "diskin2: not initialised" msgstr "diskin2: no ha sido inicializado" -#: OOps/diskin2.c:686 OOps/diskin2.c:877 OOps/diskin2.c:1697 -#: OOps/diskin2.c:2106 +#: OOps/diskin2.c:686 OOps/diskin2.c:877 OOps/diskin2.c:1700 +#: OOps/diskin2.c:2117 msgid "diskin2: file descriptor closed or invalid\n" msgstr "" @@ -3977,7 +3992,7 @@ msgid "soundouts: not initialised" msgstr "soundouts: no ha sido inicializado" -#: OOps/diskin2.c:1782 +#: OOps/diskin2.c:1786 msgid "diskin2: output array too small" msgstr "" @@ -4752,12 +4767,12 @@ msgid "channel already specific remote" msgstr "" -#: OOps/remote.c:589 OOps/remote.c:614 OOps/remote.c:639 +#: OOps/remote.c:590 OOps/remote.c:615 OOps/remote.c:640 msgid "CLsend failed" msgstr "" -#: OOps/remote.c:706 OOps/remote.c:714 OOps/remote.c:722 OOps/remote.c:730 -#: OOps/remote.c:738 +#: OOps/remote.c:707 OOps/remote.c:715 OOps/remote.c:723 OOps/remote.c:731 +#: OOps/remote.c:739 msgid "" "*** This version of Csound was not compiled with remote event support ***\n" msgstr "" @@ -4774,11 +4789,11 @@ msgid "schedkwhen ignored. Instrument %d undefined\n" msgstr "" -#: OOps/schedule.c:429 +#: OOps/schedule.c:430 msgid "schedkwhen warning: negative kwhen reset to zero" msgstr "" -#: OOps/schedule.c:454 OOps/schedule.c:477 +#: OOps/schedule.c:455 OOps/schedule.c:478 msgid "trigseq: incorrect table number" msgstr "" @@ -4804,25 +4819,25 @@ msgid "filepeak: error getting peak value" msgstr "" -#: OOps/str_ops.c:60 +#: OOps/str_ops.c:64 msgid "illegal strset index" msgstr "" -#: OOps/str_ops.c:68 +#: OOps/str_ops.c:72 #, c-format msgid "strset index conflict at %d" msgstr "" -#: OOps/str_ops.c:69 +#: OOps/str_ops.c:73 #, c-format msgid "previous value: '%s', replaced with '%s'" msgstr "" -#: OOps/str_ops.c:93 OOps/str_ops.c:100 +#: OOps/str_ops.c:97 OOps/str_ops.c:104 msgid "--strset: invalid format" msgstr "" -#: OOps/str_ops.c:921 +#: OOps/str_ops.c:925 #, c-format msgid "invalid option code: %g" msgstr "" @@ -4972,27 +4987,27 @@ msgid "osciln: not initialised" msgstr "osciln: no ha sido inicializado" -#: OOps/ugens2.c:1168 +#: OOps/ugens2.c:1210 msgid "oscil(krate): not initialised" msgstr "oscil(krate): no ha sido inicializado" -#: OOps/ugens2.c:1203 OOps/ugens2.c:1239 OOps/ugens2.c:1272 OOps/ugens2.c:1307 +#: OOps/ugens2.c:1245 OOps/ugens2.c:1281 OOps/ugens2.c:1314 OOps/ugens2.c:1349 msgid "oscil: not initialised" msgstr "oscil: no ha sido inicializado" -#: OOps/ugens2.c:1330 +#: OOps/ugens2.c:1372 msgid "oscili(krate): not initialised" msgstr "oscili(krate): no ha sido inicializado" -#: OOps/ugens2.c:1365 OOps/ugens2.c:1405 OOps/ugens2.c:1441 OOps/ugens2.c:1480 +#: OOps/ugens2.c:1407 OOps/ugens2.c:1447 OOps/ugens2.c:1483 OOps/ugens2.c:1522 msgid "oscili: not initialised" msgstr "oscili: no ha sido inicializado" -#: OOps/ugens2.c:1521 +#: OOps/ugens2.c:1563 msgid "oscil3(krate): not initialised" msgstr "oscil3(krate): no ha sido inicializado" -#: OOps/ugens2.c:1580 OOps/ugens2.c:1636 OOps/ugens2.c:1689 OOps/ugens2.c:1744 +#: OOps/ugens2.c:1622 OOps/ugens2.c:1678 OOps/ugens2.c:1731 OOps/ugens2.c:1786 msgid "oscil3: not initialised" msgstr "oscil3: no ha sido inicializado" @@ -5122,120 +5137,124 @@ msgid "pluck: kcps more than sample rate" msgstr "" -#: OOps/ugens4.c:472 OOps/ugens4.c:580 OOps/ugens4.c:685 +#: OOps/ugens4.c:472 OOps/ugens4.c:580 OOps/ugens4.c:686 #, c-format msgid "Seeding from current time %lu\n" msgstr "" -#: OOps/ugens5.c:287 OOps/ugens5.c:396 Opcodes/gab/gab.c:48 Opcodes/ugsc.c:209 +#: OOps/ugens5.c:287 OOps/ugens5.c:400 Opcodes/gab/gab.c:50 Opcodes/ugsc.c:211 #, c-format msgid "illegal reson iscl value, %f" msgstr "" -#: OOps/ugens5.c:616 +#: OOps/ugens5.c:623 #, c-format msgid "LPREAD cannot load %s" msgstr "" -#: OOps/ugens5.c:627 +#: OOps/ugens5.c:634 #, c-format msgid "Using %s type of file.\n" msgstr "" -#: OOps/ugens5.c:628 +#: OOps/ugens5.c:635 msgid "pole" msgstr "" -#: OOps/ugens5.c:628 +#: OOps/ugens5.c:635 msgid "filter coefficient" msgstr "" -#: OOps/ugens5.c:633 +#: OOps/ugens5.c:640 msgid "lpheader overriding inputs" msgstr "" -#: OOps/ugens5.c:637 +#: OOps/ugens5.c:644 msgid "lpfile srate != orch sr" msgstr "" -#: OOps/ugens5.c:645 +#: OOps/ugens5.c:652 #, c-format msgid "file %s bytes are in wrong order" msgstr "" -#: OOps/ugens5.c:655 +#: OOps/ugens5.c:662 msgid "insufficient args and no file header" msgstr "" -#: OOps/ugens5.c:660 +#: OOps/ugens5.c:667 msgid "npoles > MAXPOLES" msgstr "" -#: OOps/ugens5.c:668 +#: OOps/ugens5.c:675 #, c-format msgid "npoles %ld, nvals %ld, totvals %ld, lastfram16 = %lx\n" msgstr "" -#: OOps/ugens5.c:692 util/lpanal.c:324 +#: OOps/ugens5.c:700 util/lpanal.c:324 #, c-format msgid "magnitude: %f Phase: %f\n" msgstr "" -#: OOps/ugens5.c:695 util/lpanal.c:327 +#: OOps/ugens5.c:703 util/lpanal.c:327 #, c-format msgid "Real: %f Imag: %f\n" msgstr "" -#: OOps/ugens5.c:863 +#: OOps/ugens5.c:758 +msgid "Cannot handle uneven pole count yet \n" +msgstr "" + +#: OOps/ugens5.c:871 msgid "lpread: not initialised" msgstr "lpread: no ha sido inicializado" -#: OOps/ugens5.c:869 +#: OOps/ugens5.c:877 msgid "lpread timpnt < 0" msgstr "" -#: OOps/ugens5.c:875 +#: OOps/ugens5.c:883 msgid "lpread ktimpnt truncated to last frame" msgstr "" -#: OOps/ugens5.c:906 OOps/ugens5.c:1409 +#: OOps/ugens5.c:914 OOps/ugens5.c:1417 msgid "Interpolation failed" msgstr "" -#: OOps/ugens5.c:964 +#: OOps/ugens5.c:972 msgid "this opcode only works with LPC pole analysis type (-a)\n" msgstr "" -#: OOps/ugens5.c:1098 +#: OOps/ugens5.c:1106 msgid "Pole file not supported for this opcode !" msgstr "" -#: OOps/ugens5.c:1125 +#: OOps/ugens5.c:1133 #, c-format msgid "illegal frqratio, %5.2f" msgstr "" -#: OOps/ugens5.c:1335 +#: OOps/ugens5.c:1343 msgid "lpslot number should be positive" msgstr "" -#: OOps/ugens5.c:1355 +#: OOps/ugens5.c:1363 msgid "LPC slot is not allocated" msgstr "" -#: OOps/ugens5.c:1363 +#: OOps/ugens5.c:1371 msgid "lpinterpol works only with poles files.." msgstr "" -#: OOps/ugens5.c:1367 +#: OOps/ugens5.c:1375 msgid "The poles files have different pole count" msgstr "" -#: OOps/ugens5.c:1373 +#: OOps/ugens5.c:1381 msgid "padding error" msgstr "" -#: OOps/ugens5.c:1393 +#: OOps/ugens5.c:1401 msgid "lpinterpol: not initialised" msgstr "lpinterpol: no ha sido inicializado" @@ -5273,49 +5292,53 @@ msgid "delayw: not initialised" msgstr "delayw: no ha sido inicializado" -#: OOps/ugens6.c:475 OOps/ugens6.c:774 OOps/ugens6.c:859 +#: OOps/ugens6.c:475 OOps/ugens6.c:785 OOps/ugens6.c:870 msgid "deltap: not initialised" msgstr "deltap: no ha sido inicializado" -#: OOps/ugens6.c:530 +#: OOps/ugens6.c:532 msgid "deltapi: not initialised" msgstr "deltapi: no ha sido inicializado" -#: OOps/ugens6.c:583 +#: OOps/ugens6.c:535 OOps/ugens6.c:677 +msgid "deltapi: INF delaytime" +msgstr "" + +#: OOps/ugens6.c:588 msgid "deltapn: not initialised" msgstr "deltapn: no ha sido inicializado" -#: OOps/ugens6.c:667 +#: OOps/ugens6.c:674 msgid "deltap3: not initialised" msgstr "deltap3: no ha sido inicializado" -#: OOps/ugens6.c:896 OOps/ugens6.c:900 Opcodes/ugmoss.c:483 +#: OOps/ugens6.c:907 OOps/ugens6.c:911 Opcodes/ugmoss.c:483 #: Opcodes/ugmoss.c:487 msgid "illegal loop time" msgstr "tiempo de bucle ilegal" -#: OOps/ugens6.c:963 +#: OOps/ugens6.c:974 msgid "comb: not initialised" msgstr "comb: no ha sido inicializado" -#: OOps/ugens6.c:1002 +#: OOps/ugens6.c:1013 #, fuzzy msgid "combinv: not initialised" msgstr "comb: no ha sido inicializado" -#: OOps/ugens6.c:1039 +#: OOps/ugens6.c:1050 msgid "alpass: not initialised" msgstr "alpass: no ha sido inicializado" -#: OOps/ugens6.c:1072 +#: OOps/ugens6.c:1083 msgid "revlpsiz inconsistent\n" msgstr "revlpsiz inconsistente\n" -#: OOps/ugens6.c:1163 +#: OOps/ugens6.c:1174 msgid "reverb: not intialised" msgstr "reverb: no ha sido inicializado" -#: OOps/ugens6.c:1237 +#: OOps/ugens6.c:1248 msgid "pan: not initialised" msgstr "pan: no ha sido inicializado" @@ -5478,10 +5501,10 @@ msgstr "" #: OOps/ugtabs.c:38 OOps/ugtabs.c:74 OOps/ugtabs.c:154 OOps/ugtabs.c:266 -#: OOps/ugtabs.c:428 OOps/ugtabs.c:445 OOps/ugtabs.c:461 OOps/ugtabs.c:477 -#: OOps/ugtabs.c:493 OOps/ugtabs.c:508 OOps/ugtabs.c:528 OOps/ugtabs.c:615 -#: OOps/ugtabs.c:632 OOps/ugtabs.c:646 OOps/ugtabs.c:659 OOps/ugtabs.c:695 -#: OOps/ugtabs.c:702 OOps/ugtabs.c:709 OOps/ugtabs.c:793 OOps/ugtabs.c:839 +#: OOps/ugtabs.c:428 OOps/ugtabs.c:445 OOps/ugtabs.c:461 OOps/ugtabs.c:478 +#: OOps/ugtabs.c:493 OOps/ugtabs.c:508 OOps/ugtabs.c:528 OOps/ugtabs.c:616 +#: OOps/ugtabs.c:633 OOps/ugtabs.c:647 OOps/ugtabs.c:660 OOps/ugtabs.c:696 +#: OOps/ugtabs.c:703 OOps/ugtabs.c:710 OOps/ugtabs.c:794 OOps/ugtabs.c:840 #, fuzzy, c-format msgid "table: could not find ftable %d" msgstr "número de tabla fuente (srctable) desconocido" @@ -5494,12 +5517,12 @@ msgid "tablekt: index type inconsistent with output" msgstr "" -#: OOps/ugtabs.c:673 +#: OOps/ugtabs.c:674 #, fuzzy, c-format msgid "table: could not find ftables %d and/or %d" msgstr "número de tabla fuente (srctable) desconocido" -#: OOps/ugtabs.c:802 OOps/ugtabs.c:848 +#: OOps/ugtabs.c:803 OOps/ugtabs.c:849 #, c-format msgid "table: could not read negative pos %d" msgstr "" @@ -5902,20 +5925,20 @@ msgid "crossfm: ftable not found" msgstr "" -#: Opcodes/date.c:96 +#: Opcodes/date.c:97 msgid "cannot determine current directory" msgstr "" -#: Opcodes/date.c:133 +#: Opcodes/date.c:134 #, fuzzy msgid "readf: failed to open file" msgstr "diskin: %s: no se puede abrir el archivo" -#: Opcodes/date.c:159 +#: Opcodes/date.c:161 msgid "readf: read failure" msgstr "" -#: Opcodes/date.c:169 Opcodes/date.c:177 +#: Opcodes/date.c:171 Opcodes/date.c:179 #, fuzzy msgid "readi failed to initialise" msgstr "lpread: no ha sido inicializado" @@ -6176,12 +6199,12 @@ msgid "ftconv: not initialised" msgstr "ftconv: no ha sido inicializado" -#: Opcodes/ftgen.c:69 Opcodes/ftgen.c:212 +#: Opcodes/ftgen.c:69 Opcodes/ftgen.c:213 #, fuzzy, c-format msgid "Error deleting ftable %d" msgstr "reemplazando tabla-f (ftable) %d anterior" -#: Opcodes/ftgen.c:137 Opcodes/signalflowgraph.cpp:1175 +#: Opcodes/ftgen.c:137 Opcodes/signalflowgraph.cpp:1383 msgid "ftgen string arg not allowed" msgstr "" @@ -6189,119 +6212,119 @@ msgid "ftgen error" msgstr "" -#: Opcodes/ftgen.c:209 +#: Opcodes/ftgen.c:210 #, fuzzy, c-format msgid "Invalid table number: %d" msgstr "Tabla-f (ftable) no. %f inválida" -#: Opcodes/ftgen.c:392 +#: Opcodes/ftgen.c:393 #, fuzzy msgid "ftload: error allocating ftable" msgstr "pvsout: falla en asignación de memoria" -#: Opcodes/ftgen.c:394 +#: Opcodes/ftgen.c:395 #, fuzzy msgid "ftload: no table numbers" msgstr "número de tabla fuente (srctable) desconocido" -#: Opcodes/ftgen.c:396 +#: Opcodes/ftgen.c:397 #, fuzzy msgid "ftload: unable to open file" msgstr "soundin: %s: no se puede abrir el archivo" -#: Opcodes/ftgen.c:399 +#: Opcodes/ftgen.c:400 msgid "ftload: incorrect file" msgstr "" -#: Opcodes/ftgen.c:539 +#: Opcodes/ftgen.c:540 msgid "ftsave: Bad table number. Saving is possible only for existing tables." msgstr "" -#: Opcodes/ftgen.c:542 +#: Opcodes/ftgen.c:543 #, fuzzy msgid "ftsave: no table numbers" msgstr "número de tabla fuente (srctable) desconocido" -#: Opcodes/ftgen.c:544 +#: Opcodes/ftgen.c:545 #, fuzzy msgid "ftsave: unable to open file" msgstr "mp3in: %s: no se puede abrir el archivo" -#: Opcodes/ftgen.c:546 +#: Opcodes/ftgen.c:547 #, fuzzy msgid "ftsave: failed to write file" msgstr "mp3in: %s: no se puede abrir el archivo" -#: Opcodes/gab/gab.c:112 +#: Opcodes/gab/gab.c:114 #, fuzzy msgid "fastab: incorrect table number" msgstr "copyTabElems: número inválido de tabla fuente" -#: Opcodes/gab/gab.c:139 Opcodes/gab/gab.c:148 Opcodes/gab/gab.c:178 +#: Opcodes/gab/gab.c:141 Opcodes/gab/gab.c:150 Opcodes/gab/gab.c:180 msgid "tabw off end" msgstr "" -#: Opcodes/gab/gab.c:164 Opcodes/gab/gab.c:241 Opcodes/gab/gab.c:250 +#: Opcodes/gab/gab.c:166 Opcodes/gab/gab.c:243 Opcodes/gab/gab.c:252 msgid "tab off end" msgstr "" -#: Opcodes/gab/gab.c:190 +#: Opcodes/gab/gab.c:192 #, fuzzy msgid "tab_i: incorrect table number" msgstr "copyTabElems: número inválido de tabla fuente" -#: Opcodes/gab/gab.c:198 +#: Opcodes/gab/gab.c:200 #, fuzzy, c-format msgid "tab_i off end: table number: %d\n" msgstr "número de tabla fuente (srctable) desconocido" -#: Opcodes/gab/gab.c:211 +#: Opcodes/gab/gab.c:213 #, fuzzy msgid "tabw_i: incorrect table number" msgstr "copyTabElems: número inválido de tabla fuente" -#: Opcodes/gab/gab.c:218 +#: Opcodes/gab/gab.c:220 msgid "tabw_i off end" msgstr "" -#: Opcodes/gab/gab.c:263 +#: Opcodes/gab/gab.c:265 #, fuzzy msgid "tab_init: incorrect table number" msgstr "copyTabElems: número inválido de tabla fuente" -#: Opcodes/gab/gab.c:332 +#: Opcodes/gab/gab.c:334 msgid "printi parameter was not a \"quoted string\"" msgstr "" -#: Opcodes/gab/gab.c:446 +#: Opcodes/gab/gab.c:448 #, fuzzy msgid "adsynt2: wavetable not found!" msgstr "GEN32: tabla-f (ftable) fuente %d no encontrada" -#: Opcodes/gab/gab.c:458 +#: Opcodes/gab/gab.c:460 #, fuzzy msgid "adsynt2: freqtable not found!" msgstr "GEN32: tabla-f (ftable) fuente %d no encontrada" -#: Opcodes/gab/gab.c:463 +#: Opcodes/gab/gab.c:465 msgid "adsynt2: partial count is greater than freqtable size!" msgstr "" -#: Opcodes/gab/gab.c:472 +#: Opcodes/gab/gab.c:474 #, fuzzy msgid "adsynt2: amptable not found!" msgstr "Tabla %f no encontrada" -#: Opcodes/gab/gab.c:477 +#: Opcodes/gab/gab.c:479 msgid "adsynt2: partial count is greater than amptable size!" msgstr "" -#: Opcodes/gab/gab.c:525 +#: Opcodes/gab/gab.c:527 #, fuzzy msgid "adsynt2: not initialised" msgstr "adsynt: no ha sido inicializado" -#: Opcodes/gab/gab.c:759 +#: Opcodes/gab/gab.c:771 #, fuzzy msgid "max_k: invalid imaxflag value" msgstr "%s valor de ksmps inválido" @@ -6852,11 +6875,11 @@ msgid "vlinseg/vexpseg: invalid num. of elements" msgstr "vectorop : número inválido de argumentos" -#: Opcodes/gab/vectorial.c:2255 Opcodes/vpvoc.c:119 +#: Opcodes/gab/vectorial.c:2255 Opcodes/vpvoc.c:121 msgid "tableseg: not initialised" msgstr "tableseg: no ha sido inicializado" -#: Opcodes/gab/vectorial.c:2285 Opcodes/vpvoc.c:148 +#: Opcodes/gab/vectorial.c:2285 Opcodes/vpvoc.c:150 msgid "tablexseg: not initialised" msgstr "tablexseg: no ha sido inicializado" @@ -7259,8 +7282,8 @@ msgid "loscilx: invalid number of output arguments" msgstr "" -#: Opcodes/loscilx.c:209 Opcodes/loscilx.c:238 Opcodes/pvlock.c:152 -#: Opcodes/pvlock.c:375 Opcodes/pvsbasic.c:566 +#: Opcodes/loscilx.c:209 Opcodes/loscilx.c:238 Opcodes/pvlock.c:160 +#: Opcodes/pvlock.c:383 Opcodes/pvlock.c:657 Opcodes/pvsbasic.c:566 msgid "" "number of output arguments inconsistent with number of sound file channels" msgstr "" @@ -7269,7 +7292,12 @@ msgid "loscilx: not initialised" msgstr "loscilx: no ha sido inicializado" -#: Opcodes/lowpassr.c:85 Opcodes/lowpassr.c:140 +#: Opcodes/lowpassr.c:55 Opcodes/lowpassr.c:99 Opcodes/lowpassr.c:121 +#: Opcodes/lowpassr.c:155 Opcodes/lowpassr.c:176 Opcodes/lowpassr.c:210 +msgid "Cutoff parameter must be positive" +msgstr "" + +#: Opcodes/lowpassr.c:252 Opcodes/lowpassr.c:312 msgid "illegal order num. (min 1, max 10)" msgstr "" @@ -7487,20 +7515,20 @@ msgid "partikkel: " msgstr "" -#: Opcodes/partikkel.c:841 +#: Opcodes/partikkel.c:839 msgid "partikkelsync: opcode id needs to be a non-zero integer" msgstr "" -#: Opcodes/partikkel.c:845 Opcodes/partikkel.c:851 +#: Opcodes/partikkel.c:843 Opcodes/partikkel.c:849 msgid "partikkelsync: could not find opcode id" msgstr "" -#: Opcodes/partikkel.c:881 +#: Opcodes/partikkel.c:879 #, fuzzy, c-format msgid "%s: partikkel not initialized" msgstr "spat3di: no ha sido inicializado" -#: Opcodes/partikkel.c:889 +#: Opcodes/partikkel.c:887 #, fuzzy, c-format msgid "%s: could not find opcode id" msgstr "Tabla %f no encontrada" @@ -7619,71 +7647,71 @@ msgid "adsynt: partial count is greater than amptable size!" msgstr "" -#: Opcodes/pitch.c:690 +#: Opcodes/pitch.c:691 msgid "adsynt: not initialised" msgstr "adsynt: no ha sido inicializado" -#: Opcodes/pitch.c:770 +#: Opcodes/pitch.c:771 msgid "hsboscil: not initialised" msgstr "hsboscil: no ha sido inicializado" -#: Opcodes/pitch.c:856 +#: Opcodes/pitch.c:857 msgid "pitchamdf: maxcps must be > mincps !" msgstr "" -#: Opcodes/pitch.c:1003 +#: Opcodes/pitch.c:1004 msgid "pitchamdf: not initialised" msgstr "pitchamdf: no ha sido inicializado" -#: Opcodes/pitch.c:1184 Opcodes/pitch.c:1214 +#: Opcodes/pitch.c:1185 Opcodes/pitch.c:1215 msgid "phasorbnk: not initialised" msgstr "phasorbnk: no ha sido inicializado" -#: Opcodes/pitch.c:1281 +#: Opcodes/pitch.c:1282 msgid "pinkish: Invalid method code" msgstr "" -#: Opcodes/pitch.c:1292 +#: Opcodes/pitch.c:1293 msgid "pinkish: Filter method requires a-rate (noise) input" msgstr "" -#: Opcodes/pitch.c:1421 +#: Opcodes/pitch.c:1422 #, c-format msgid "" "pinkish: Gardner method requires 4-%d bands. Default %ld substituted for " "%d.\n" msgstr "" -#: Opcodes/pitch.c:1684 +#: Opcodes/pitch.c:1685 msgid "Incorrect argument count in transeg" msgstr "" -#: Opcodes/pitch.c:1735 +#: Opcodes/pitch.c:1736 msgid "Incorrect argument count in transegb" msgstr "" -#: Opcodes/pitch.c:1786 Opcodes/pitch.c:1947 +#: Opcodes/pitch.c:1787 Opcodes/pitch.c:1948 msgid "Error: transeg not initialised (krate)\n" msgstr "Error: transeg no ha sido inicializado (krate)\n" -#: Opcodes/pitch.c:1824 Opcodes/pitch.c:2007 +#: Opcodes/pitch.c:1825 Opcodes/pitch.c:2008 msgid "transeg: not initialised (arate)\n" msgstr "transeg: no ha sido inicializado (arate)\n" -#: Opcodes/pitch.c:1884 +#: Opcodes/pitch.c:1885 msgid "Incorrect argument count in transegr" msgstr "" -#: Opcodes/pitch.c:2303 +#: Opcodes/pitch.c:2321 msgid "median: not initialised (arate)\n" msgstr "median: no ha sido inicializado (arate)\n" -#: Opcodes/pitch.c:2307 Opcodes/pitch.c:2360 +#: Opcodes/pitch.c:2325 Opcodes/pitch.c:2378 #, c-format msgid "median: window (%d)larger than maximum(%d); truncated" msgstr "" -#: Opcodes/pitch.c:2356 +#: Opcodes/pitch.c:2374 msgid "median: not initialised (krate)\n" msgstr "median no ha sido inicializado (krate)\n" @@ -7801,30 +7829,30 @@ msgid "PVBUFREAD cannot load %s" msgstr "" -#: Opcodes/pvinterp.c:82 Opcodes/vpvoc.c:215 +#: Opcodes/pvinterp.c:82 Opcodes/vpvoc.c:217 #, c-format msgid "PVOC frame %ld bigger than %ld in %s" msgstr "" -#: Opcodes/pvinterp.c:87 Opcodes/vpvoc.c:220 +#: Opcodes/pvinterp.c:87 Opcodes/vpvoc.c:222 #, c-format msgid "PVOC frame %ld seems too small in %s" msgstr "" #: Opcodes/pvinterp.c:91 Opcodes/pvinterp.c:203 Opcodes/pvinterp.c:393 -#: Opcodes/vpvoc.c:224 +#: Opcodes/vpvoc.c:226 #, c-format msgid "%d chans (not 1) in PVOC file %s" msgstr "" #: Opcodes/pvinterp.c:106 Opcodes/pvinterp.c:230 Opcodes/pvinterp.c:418 -#: Opcodes/ugens8.c:101 Opcodes/vpvoc.c:252 +#: Opcodes/ugens8.c:101 Opcodes/vpvoc.c:254 #, c-format msgid "ksmps of %d needs wdw of %d, max is %d for pv %s" msgstr "" #: Opcodes/pvinterp.c:135 Opcodes/pvinterp.c:284 Opcodes/pvinterp.c:475 -#: Opcodes/pvread.c:109 Opcodes/ugens8.c:174 Opcodes/vpvoc.c:314 +#: Opcodes/pvread.c:109 Opcodes/ugens8.c:174 Opcodes/vpvoc.c:316 msgid "PVOC ktimpnt truncated to last frame" msgstr "" @@ -7833,7 +7861,7 @@ msgstr "pvbufread: no ha sido inicializado" #: Opcodes/pvinterp.c:146 Opcodes/pvinterp.c:337 Opcodes/pvinterp.c:540 -#: Opcodes/pvread.c:117 Opcodes/ugens8.c:232 Opcodes/vpvoc.c:382 +#: Opcodes/pvread.c:117 Opcodes/ugens8.c:232 Opcodes/vpvoc.c:384 msgid "PVOC timpnt < 0" msgstr "" @@ -7856,12 +7884,12 @@ msgstr "pvinterp: no ha sido inicializado" #: Opcodes/pvinterp.c:332 Opcodes/pvinterp.c:534 Opcodes/ugens8.c:226 -#: Opcodes/vpvoc.c:376 +#: Opcodes/vpvoc.c:378 msgid "PVOC transpose too low" msgstr "" #: Opcodes/pvinterp.c:335 Opcodes/pvinterp.c:537 Opcodes/ugens8.c:229 -#: Opcodes/vpvoc.c:379 +#: Opcodes/vpvoc.c:381 msgid "PVOC transpose too high" msgstr "" @@ -7879,7 +7907,7 @@ msgid "pvcross: %s: frame size %d does not match pvbufread frame size %d\n" msgstr "" -#: Opcodes/pvinterp.c:498 Opcodes/vpvoc.c:339 +#: Opcodes/pvinterp.c:498 Opcodes/vpvoc.c:341 msgid "PVOC debug: one frame gets through\n" msgstr "" @@ -7887,19 +7915,19 @@ msgid "pvcross: not initialised" msgstr "pvcross: no ha sido inicializado" -#: Opcodes/pvlock.c:67 Opcodes/pvsbasic.c:480 +#: Opcodes/pvlock.c:71 Opcodes/pvsbasic.c:480 #, fuzzy msgid "invalid number of output arguments" msgstr "número inválido de argumentos" -#: Opcodes/pvlock.c:536 Opcodes/pvsband.c:46 Opcodes/pvsbasic.c:684 +#: Opcodes/pvlock.c:826 Opcodes/pvsband.c:46 Opcodes/pvsbasic.c:684 #: Opcodes/pvsbasic.c:1007 Opcodes/pvsbasic.c:1220 Opcodes/pvsbasic.c:1326 #: Opcodes/pvsbasic.c:1555 Opcodes/pvsbasic.c:1768 Opcodes/pvsbasic.c:1942 -#: Opcodes/pvsgendy.c:43 Opcodes/signalflowgraph.cpp:627 +#: Opcodes/pvsgendy.c:43 Opcodes/signalflowgraph.cpp:665 msgid "Unsafe to have same fsig as in and out" msgstr "" -#: Opcodes/pvlock.c:548 +#: Opcodes/pvlock.c:838 msgid "pvsfreeze: signal format must be amp-freq." msgstr "" @@ -8258,48 +8286,48 @@ msgid "Nothing to close" msgstr "" -#: Opcodes/sfont.c:111 +#: Opcodes/sfont.c:114 #, c-format msgid "sfload: cannot open SoundFont file \"%s\" (error %s)" msgstr "" -#: Opcodes/sfont.c:117 +#: Opcodes/sfont.c:120 msgid "Sfload: cannot use globals" msgstr "" -#: Opcodes/sfont.c:150 +#: Opcodes/sfont.c:153 msgid "sfload: could not open globals\n" msgstr "" -#: Opcodes/sfont.c:172 +#: Opcodes/sfont.c:175 msgid "Extending soundfonts" msgstr "" -#: Opcodes/sfont.c:211 +#: Opcodes/sfont.c:214 #, c-format msgid "" "\n" "Preset list of \"%s\"\n" msgstr "" -#: Opcodes/sfont.c:214 +#: Opcodes/sfont.c:217 #, c-format msgid "%3d) %-20s\tprog:%-3d bank:%d\n" msgstr "" -#: Opcodes/sfont.c:236 +#: Opcodes/sfont.c:239 #, c-format msgid "" "\n" "Assigning all Presets of \"%s\" starting from %d (preset handle number)\n" msgstr "" -#: Opcodes/sfont.c:241 +#: Opcodes/sfont.c:244 #, c-format msgid "%3d<--%-20s\t(prog:%-3d bank:%d)\n" msgstr "" -#: Opcodes/sfont.c:248 +#: Opcodes/sfont.c:251 #, c-format msgid "" "\n" @@ -8307,38 +8335,38 @@ "\n" msgstr "" -#: Opcodes/sfont.c:261 +#: Opcodes/sfont.c:264 #, c-format msgid "" "\n" "Instrument list of \"%s\"\n" msgstr "" -#: Opcodes/sfont.c:279 +#: Opcodes/sfont.c:282 #, c-format msgid "sfpreset: preset handle too big (%d), max: %d" msgstr "" -#: Opcodes/sfont.c:296 +#: Opcodes/sfont.c:299 #, c-format msgid "" "sfpreset: cannot find any preset having prog number %d and bank number %d in " "SoundFont file \"%s\"" msgstr "" -#: Opcodes/sfont.c:318 Opcodes/sfont.c:2248 +#: Opcodes/sfont.c:321 Opcodes/sfont.c:2251 msgid "sfplay: invalid or out-of-range preset number" msgstr "" -#: Opcodes/sfont.c:655 +#: Opcodes/sfont.c:658 msgid "sfplaym: invalid or out-of-range preset number" msgstr "" -#: Opcodes/sfont.c:919 Opcodes/sfont.c:1191 +#: Opcodes/sfont.c:922 Opcodes/sfont.c:1194 msgid "sfinstr: instrument out of range" msgstr "" -#: Opcodes/sfont.c:1648 Opcodes/sfont.c:1886 +#: Opcodes/sfont.c:1651 Opcodes/sfont.c:1889 #, c-format msgid "" "SoundFont file \"%s\" contains ROM samples !\n" @@ -8346,15 +8374,15 @@ "Session aborted !" msgstr "" -#: Opcodes/sfont.c:2041 Opcodes/sfont.c:2049 +#: Opcodes/sfont.c:2044 Opcodes/sfont.c:2052 msgid "Sfont: cannot use globals/" msgstr "" -#: Opcodes/sfont.c:2054 +#: Opcodes/sfont.c:2057 msgid "Sfont format not compatible" msgstr "" -#: Opcodes/sfont.c:2598 +#: Opcodes/sfont.c:2601 msgid "error... could not create sfont globals\n" msgstr "" @@ -8362,31 +8390,36 @@ msgid "powershape: ifullscale must be strictly positive" msgstr "" -#: Opcodes/signalflowgraph.cpp:332 Opcodes/signalflowgraph.cpp:593 +#: Opcodes/signalflowgraph.cpp:360 Opcodes/signalflowgraph.cpp:629 #, c-format msgid "Connected instances of outlet %s to instance 0x%x of inlet %s.\n" msgstr "" -#: Opcodes/signalflowgraph.cpp:408 +#: Opcodes/signalflowgraph.cpp:438 #, fuzzy, c-format msgid "Created instance 0x%x of %d instances of outlet %s\n" msgstr "retirada instancia del instrumento %s\n" -#: Opcodes/signalflowgraph.cpp:468 +#: Opcodes/signalflowgraph.cpp:500 #, c-format msgid "Connected instances of outlet %s to instance 0x%xof inlet %s.\n" msgstr "" -#: Opcodes/signalflowgraph.cpp:655 +#: Opcodes/signalflowgraph.cpp:693 msgid "inletf: signal format must be amp-phase or amp-freq." msgstr "" -#: Opcodes/signalflowgraph.cpp:948 Opcodes/signalflowgraph.cpp:989 +#: Opcodes/signalflowgraph.cpp:837 +#, fuzzy, c-format +msgid "Connected instances of outlet %s to instance 0x%x of inlet %s\n" +msgstr "retirada instancia del instrumento %s\n" + +#: Opcodes/signalflowgraph.cpp:1150 Opcodes/signalflowgraph.cpp:1193 #, fuzzy, c-format msgid "Connected outlet %s to inlet %s.\n" msgstr "No se puede abrir el archivo de salida %s\n" -#: Opcodes/signalflowgraph.cpp:1116 Opcodes/signalflowgraph.cpp:1200 +#: Opcodes/signalflowgraph.cpp:1322 Opcodes/signalflowgraph.cpp:1408 msgid "ftgenonce error" msgstr "" @@ -8699,7 +8732,7 @@ msgid "Error allocating argument stack" msgstr "" -#: Opcodes/stackops.c:206 Top/argdecode.c:1245 util/envext.c:99 +#: Opcodes/stackops.c:206 Top/argdecode.c:1263 util/envext.c:99 #: util/scale.c:248 msgid "too many arguments" msgstr "" @@ -9134,7 +9167,7 @@ msgid "ATSCROSS: you must have an atsbufread before an atsinterpread" msgstr "" -#: Opcodes/ugsc.c:434 +#: Opcodes/ugsc.c:439 msgid "Phaser mode must be either 1 or 2" msgstr "" @@ -9267,21 +9300,21 @@ msgid "Have to have at least %d directions in vbapzmove" msgstr "" -#: Opcodes/vpvoc.c:175 +#: Opcodes/vpvoc.c:177 #, c-format msgid "vpvoc: Could not find ifnmagctrl table %f" msgstr "" -#: Opcodes/vpvoc.c:181 +#: Opcodes/vpvoc.c:183 msgid "vpvoc: associated tableseg not found" msgstr "" -#: Opcodes/vpvoc.c:203 +#: Opcodes/vpvoc.c:205 #, c-format msgid "VPVOC cannot load %s" msgstr "" -#: Opcodes/vpvoc.c:373 +#: Opcodes/vpvoc.c:375 msgid "vpvoc: not initialised" msgstr "vpvoc: no ha sido inicializado" @@ -9353,751 +9386,763 @@ msgid "No wii range" msgstr "" -#: Top/argdecode.c:63 +#: Top/argdecode.c:64 msgid "--help\tprint long usage options" msgstr "" -#: Top/argdecode.c:64 +#: Top/argdecode.c:65 msgid "-U unam\trun utility program unam" msgstr "" -#: Top/argdecode.c:65 +#: Top/argdecode.c:66 msgid "-C\tuse Cscore processing of scorefile" msgstr "" -#: Top/argdecode.c:66 +#: Top/argdecode.c:67 #, fuzzy msgid "-j N\tuse N threads in performance" msgstr "" "\n" "%d errores en la ejecución\n" -#: Top/argdecode.c:67 +#: Top/argdecode.c:68 msgid "-I\tI-time only orch run" msgstr "" -#: Top/argdecode.c:68 +#: Top/argdecode.c:69 msgid "-n\tno sound onto disk" msgstr "" -#: Top/argdecode.c:69 +#: Top/argdecode.c:70 msgid "-i fnam\tsound input filename" msgstr "" -#: Top/argdecode.c:70 util/mixer.c:94 util/scale.c:45 +#: Top/argdecode.c:71 util/mixer.c:94 util/scale.c:45 msgid "-o fnam\tsound output filename" msgstr "" -#: Top/argdecode.c:71 +#: Top/argdecode.c:72 msgid "-b N\tsample frames (or -kprds) per software sound I/O buffer" msgstr "" -#: Top/argdecode.c:72 +#: Top/argdecode.c:73 msgid "-B N\tsamples per hardware sound I/O buffer" msgstr "" -#: Top/argdecode.c:73 util/mixer.c:95 util/scale.c:46 util/srconv.c:752 +#: Top/argdecode.c:74 util/mixer.c:95 util/scale.c:46 util/srconv.c:752 msgid "-A\tcreate an AIFF format output soundfile" msgstr "" -#: Top/argdecode.c:74 util/mixer.c:96 util/scale.c:47 util/srconv.c:754 +#: Top/argdecode.c:75 util/mixer.c:96 util/scale.c:47 util/srconv.c:754 msgid "-W\tcreate a WAV format output soundfile" msgstr "" -#: Top/argdecode.c:75 util/srconv.c:753 +#: Top/argdecode.c:76 util/srconv.c:753 msgid "-J\tcreate an IRCAM format output soundfile" msgstr "" -#: Top/argdecode.c:76 util/mixer.c:97 util/scale.c:48 util/srconv.c:755 +#: Top/argdecode.c:77 util/mixer.c:97 util/scale.c:48 util/srconv.c:755 msgid "-h\tno header on output soundfile" msgstr "" -#: Top/argdecode.c:77 util/mixer.c:99 util/scale.c:49 util/srconv.c:756 +#: Top/argdecode.c:78 util/mixer.c:99 util/scale.c:49 util/srconv.c:756 msgid "-c\t8-bit signed_char sound samples" msgstr "" -#: Top/argdecode.c:79 util/mixer.c:101 util/scale.c:50 util/srconv.c:757 +#: Top/argdecode.c:80 util/mixer.c:101 util/scale.c:50 util/srconv.c:757 msgid "-a\talaw sound samples" msgstr "" -#: Top/argdecode.c:81 util/mixer.c:98 util/mixer.c:100 util/srconv.c:758 +#: Top/argdecode.c:82 util/mixer.c:98 util/mixer.c:100 util/srconv.c:758 msgid "-8\t8-bit unsigned_char sound samples" msgstr "" -#: Top/argdecode.c:82 util/mixer.c:102 util/scale.c:51 util/srconv.c:759 +#: Top/argdecode.c:83 util/mixer.c:102 util/scale.c:51 util/srconv.c:759 msgid "-u\tulaw sound samples" msgstr "" -#: Top/argdecode.c:83 util/mixer.c:103 util/scale.c:52 util/srconv.c:760 +#: Top/argdecode.c:84 util/mixer.c:103 util/scale.c:52 util/srconv.c:760 msgid "-s\tshort_int sound samples" msgstr "" -#: Top/argdecode.c:84 util/mixer.c:104 util/scale.c:53 util/srconv.c:761 +#: Top/argdecode.c:85 util/mixer.c:104 util/scale.c:53 util/srconv.c:761 msgid "-l\tlong_int sound samples" msgstr "" -#: Top/argdecode.c:85 util/mixer.c:105 util/scale.c:54 util/srconv.c:762 +#: Top/argdecode.c:86 util/mixer.c:105 util/scale.c:54 util/srconv.c:762 msgid "-f\tfloat sound samples" msgstr "" -#: Top/argdecode.c:86 +#: Top/argdecode.c:87 msgid "-3\t24bit sound samples" msgstr "" -#: Top/argdecode.c:87 util/srconv.c:763 +#: Top/argdecode.c:88 util/srconv.c:763 msgid "-r N\torchestra srate override" msgstr "" -#: Top/argdecode.c:88 +#: Top/argdecode.c:89 msgid "-k N\torchestra krate override" msgstr "" -#: Top/argdecode.c:89 util/srconv.c:764 +#: Top/argdecode.c:90 util/srconv.c:764 msgid "-K\tDo not generate PEAK chunks" msgstr "" -#: Top/argdecode.c:90 +#: Top/argdecode.c:91 msgid "-v\tverbose orch translation" msgstr "" -#: Top/argdecode.c:91 +#: Top/argdecode.c:92 msgid "-m N\ttty message level. Sum of:" msgstr "" -#: Top/argdecode.c:92 +#: Top/argdecode.c:93 msgid "\t\t1=note amps, 2=out-of-range msg, 4=warnings" msgstr "" -#: Top/argdecode.c:93 +#: Top/argdecode.c:94 msgid "\t\t0/32/64/96=note amp format (raw,dB,colors)" msgstr "" -#: Top/argdecode.c:94 +#: Top/argdecode.c:95 msgid "\t\t128=print benchmark information" msgstr "" -#: Top/argdecode.c:95 +#: Top/argdecode.c:96 msgid "-d\tsuppress all displays" msgstr "" -#: Top/argdecode.c:96 +#: Top/argdecode.c:97 msgid "-g\tsuppress graphics, use ascii displays" msgstr "" -#: Top/argdecode.c:97 +#: Top/argdecode.c:98 msgid "-G\tsuppress graphics, use Postscript displays" msgstr "" -#: Top/argdecode.c:98 +#: Top/argdecode.c:99 msgid "-x fnam\textract from score.srt using extract file 'fnam'" msgstr "" -#: Top/argdecode.c:99 +#: Top/argdecode.c:100 msgid "-t N\tuse uninterpreted beats of the score, initially at tempo N" msgstr "" -#: Top/argdecode.c:100 +#: Top/argdecode.c:101 msgid "-t 0\tuse score.srt for sorted score rather than a temporary" msgstr "" -#: Top/argdecode.c:101 +#: Top/argdecode.c:102 msgid "-L dnam\tread Line-oriented realtime score events from device 'dnam'" msgstr "" -#: Top/argdecode.c:102 +#: Top/argdecode.c:103 msgid "-M dnam\tread MIDI realtime events from device 'dnam'" msgstr "" -#: Top/argdecode.c:103 +#: Top/argdecode.c:104 msgid "-F fnam\tread MIDIfile event stream from file 'fnam'" msgstr "" -#: Top/argdecode.c:105 util/mixer.c:106 util/scale.c:59 util/srconv.c:765 +#: Top/argdecode.c:106 util/mixer.c:106 util/scale.c:59 util/srconv.c:765 msgid "-R\tcontinually rewrite header while writing soundfile (WAV/AIFF)" msgstr "" -#: Top/argdecode.c:106 +#: Top/argdecode.c:107 msgid "-H#\tprint heartbeat style 1, 2 or 3 at each soundfile write" msgstr "" -#: Top/argdecode.c:107 util/mixer.c:108 util/scale.c:61 util/srconv.c:767 +#: Top/argdecode.c:108 util/mixer.c:108 util/scale.c:61 util/srconv.c:767 msgid "-N\tnotify (ring the bell) when score or miditrack is done" msgstr "" -#: Top/argdecode.c:108 +#: Top/argdecode.c:109 msgid "-T\tterminate the performance when miditrack is done" msgstr "" -#: Top/argdecode.c:109 +#: Top/argdecode.c:110 msgid "-D\tdefer GEN01 soundfile loads until performance time" msgstr "" -#: Top/argdecode.c:110 +#: Top/argdecode.c:111 msgid "-Q dnam\tselect MIDI output device" msgstr "" -#: Top/argdecode.c:111 +#: Top/argdecode.c:112 msgid "-z\tList opcodes in this version" msgstr "" -#: Top/argdecode.c:112 +#: Top/argdecode.c:113 msgid "-Z\tDither output" msgstr "" -#: Top/argdecode.c:114 +#: Top/argdecode.c:115 msgid "--sched set real-time priority and lock memory" msgstr "" -#: Top/argdecode.c:115 Top/argdecode.c:117 +#: Top/argdecode.c:116 Top/argdecode.c:118 msgid " (requires -d and real time audio (-iadc/-odac))" msgstr "" -#: Top/argdecode.c:116 +#: Top/argdecode.c:117 msgid "--sched=N set specified scheduling priority, and lock memory" msgstr "" -#: Top/argdecode.c:126 +#: Top/argdecode.c:127 msgid "\t\t\tSet output file format" msgstr "" -#: Top/argdecode.c:127 +#: Top/argdecode.c:128 msgid "--aiff\t\t\tSet AIFF format" msgstr "" -#: Top/argdecode.c:128 +#: Top/argdecode.c:129 msgid "--au\t\t\tSet AU format" msgstr "" -#: Top/argdecode.c:129 +#: Top/argdecode.c:130 msgid "--wave\t\t\tSet WAV format" msgstr "" -#: Top/argdecode.c:130 +#: Top/argdecode.c:131 msgid "--ircam\t\t\tSet IRCAM format" msgstr "" -#: Top/argdecode.c:131 +#: Top/argdecode.c:132 msgid "--ogg\t\t\tSet OGG/VORBIS format" msgstr "" -#: Top/argdecode.c:132 +#: Top/argdecode.c:133 msgid "--noheader\t\tRaw format" msgstr "" -#: Top/argdecode.c:133 +#: Top/argdecode.c:134 msgid "--nopeaks\t\tDo not write peak information" msgstr "" -#: Top/argdecode.c:135 +#: Top/argdecode.c:136 msgid "--nodisplays\t\tSuppress all displays" msgstr "" -#: Top/argdecode.c:136 +#: Top/argdecode.c:137 msgid "--asciidisplay\t\tSuppress graphics, use ascii displays" msgstr "" -#: Top/argdecode.c:137 +#: Top/argdecode.c:138 msgid "--postscriptdisplay\tSuppress graphics, use Postscript displays" msgstr "" -#: Top/argdecode.c:139 +#: Top/argdecode.c:140 msgid "--defer-gen1\t\tDefer GEN01 soundfile loads until performance time" msgstr "" -#: Top/argdecode.c:140 +#: Top/argdecode.c:141 msgid "" "--iobufsamps=N\t\tSample frames (or -kprds) per software sound I/O buffer" msgstr "" -#: Top/argdecode.c:142 +#: Top/argdecode.c:143 msgid "--hardwarebufsamps=N\tSamples per hardware sound I/O buffer" msgstr "" -#: Top/argdecode.c:143 +#: Top/argdecode.c:144 msgid "--cscore\t\tUse Cscore processing of scorefile" msgstr "" -#: Top/argdecode.c:144 +#: Top/argdecode.c:145 msgid "--orc\t\t\tUse orchfile without scorefile" msgstr "" -#: Top/argdecode.c:146 +#: Top/argdecode.c:147 msgid "--midifile=FNAME\tRead MIDIfile event stream from file" msgstr "" -#: Top/argdecode.c:147 +#: Top/argdecode.c:148 msgid "--midioutfile=FNAME\tWrite MIDI output to file FNAME" msgstr "" -#: Top/argdecode.c:148 +#: Top/argdecode.c:149 msgid "--midi-device=FNAME\tRead MIDI realtime events from device" msgstr "" -#: Top/argdecode.c:149 +#: Top/argdecode.c:150 msgid "--terminate-on-midi\tTerminate the performance when miditrack is done" msgstr "" -#: Top/argdecode.c:151 +#: Top/argdecode.c:152 msgid "" "--heartbeat=N\t\tPrint a heartbeat style 1, 2 or 3 at each soundfile write" msgstr "" -#: Top/argdecode.c:153 +#: Top/argdecode.c:154 msgid "--notify\t\tNotify (ring the bell) when score or miditrack is done" msgstr "" -#: Top/argdecode.c:154 +#: Top/argdecode.c:155 msgid "" "--rewrite\t\tContinually rewrite header while writing soundfile (WAV/AIFF)" msgstr "" -#: Top/argdecode.c:157 +#: Top/argdecode.c:158 msgid "--input=FNAME\t\tSound input filename" msgstr "" -#: Top/argdecode.c:158 +#: Top/argdecode.c:159 msgid "--output=FNAME\t\tSound output filename" msgstr "" -#: Top/argdecode.c:159 +#: Top/argdecode.c:160 msgid "--logfile=FNAME\t\tLog output to file" msgstr "" -#: Top/argdecode.c:161 +#: Top/argdecode.c:162 msgid "--nosound\t\tNo sound onto disk or device" msgstr "" -#: Top/argdecode.c:162 +#: Top/argdecode.c:163 msgid "--tempo=N\t\tUse uninterpreted beats of the score, initially at tempo N" msgstr "" -#: Top/argdecode.c:164 +#: Top/argdecode.c:165 msgid "--i-only\t\tI-time only orch run" msgstr "" -#: Top/argdecode.c:165 +#: Top/argdecode.c:166 msgid "--syntax-check-only\tStop after checking orchestra and score syntax" msgstr "" -#: Top/argdecode.c:166 +#: Top/argdecode.c:167 msgid "--control-rate=N\tOrchestra krate override" msgstr "" -#: Top/argdecode.c:167 +#: Top/argdecode.c:168 msgid "--sample-rate=N\t\tOrchestra srate override" msgstr "" -#: Top/argdecode.c:168 +#: Top/argdecode.c:169 msgid "--score-in=FNAME\tRead Line-oriented realtime score events from device" msgstr "" -#: Top/argdecode.c:170 +#: Top/argdecode.c:171 msgid "--messagelevel=N\ttty message level, sum of:" msgstr "" -#: Top/argdecode.c:171 +#: Top/argdecode.c:172 msgid "--messageolevel=O\ttty message level in octal, of:" msgstr "" -#: Top/argdecode.c:172 +#: Top/argdecode.c:173 msgid "\t\t\t\t1=note amps, 2=out-of-range msg, 4=warnings," msgstr "" -#: Top/argdecode.c:173 +#: Top/argdecode.c:174 msgid "\t\t\t\t0/32/64/96=note amp format (raw,dB,colors)," msgstr "" -#: Top/argdecode.c:174 +#: Top/argdecode.c:175 msgid "\t\t\t\t128=print benchmark information" msgstr "" -#: Top/argdecode.c:176 +#: Top/argdecode.c:177 msgid "--m-amps=[01]\tmessages on note amps" msgstr "" -#: Top/argdecode.c:177 +#: Top/argdecode.c:178 msgid "--m-range=[01]\tMessages on range errors" msgstr "" -#: Top/argdecode.c:178 +#: Top/argdecode.c:179 msgid "--m-warnings=[01]\tMesage on warnings" msgstr "" -#: Top/argdecode.c:179 +#: Top/argdecode.c:180 msgid "--m-raw=[01]\tRaw amp messages" msgstr "" -#: Top/argdecode.c:180 +#: Top/argdecode.c:181 msgid "--m-dB=[01]\tAmp messages in dB" msgstr "" -#: Top/argdecode.c:181 +#: Top/argdecode.c:182 msgid "--m-colours=[01]\tColour amp messages" msgstr "" -#: Top/argdecode.c:182 +#: Top/argdecode.c:183 msgid "--m-benchmarks=[01]\tPrint benchmark information" msgstr "" -#: Top/argdecode.c:183 +#: Top/argdecode.c:184 msgid "--csd-line-nums=[01]\tControls how error line numbers are printed:" msgstr "" -#: Top/argdecode.c:184 +#: Top/argdecode.c:185 msgid "\t\t\t1=use CSD line #s (default), 0=use ORC/SCO-relative line #s" msgstr "" -#: Top/argdecode.c:185 +#: Top/argdecode.c:186 msgid "--extract-score=FNAME\tExtract from score.srt using extract file" msgstr "" -#: Top/argdecode.c:186 +#: Top/argdecode.c:187 msgid "--keep-sorted-score" msgstr "" -#: Top/argdecode.c:187 +#: Top/argdecode.c:188 msgid "--env:NAME=VALUE\tSet environment variable NAME to VALUE" msgstr "" -#: Top/argdecode.c:188 +#: Top/argdecode.c:189 msgid "--env:NAME+=VALUE\tAppend VALUE to environment variable NAME" msgstr "" -#: Top/argdecode.c:189 +#: Top/argdecode.c:190 msgid "--strsetN=VALUE\t\tSet strset table at index N to VALUE" msgstr "" -#: Top/argdecode.c:190 +#: Top/argdecode.c:191 msgid "--utility=NAME\t\tRun utility program" msgstr "" -#: Top/argdecode.c:191 +#: Top/argdecode.c:192 msgid "--verbose\t\tVerbose orch translation" msgstr "" -#: Top/argdecode.c:192 +#: Top/argdecode.c:193 msgid "--list-opcodes\t\tList opcodes in this version" msgstr "" -#: Top/argdecode.c:193 +#: Top/argdecode.c:194 msgid "--list-opcodesN\t\tList opcodes in style N in this version" msgstr "" -#: Top/argdecode.c:194 +#: Top/argdecode.c:195 msgid "--dither\t\tDither output" msgstr "" -#: Top/argdecode.c:195 +#: Top/argdecode.c:196 msgid "--dither-triangular\t\tDither output with triangular distribution" msgstr "" -#: Top/argdecode.c:196 +#: Top/argdecode.c:197 msgid "--dither-uniform\t\tDither output with rectanular distribution" msgstr "" -#: Top/argdecode.c:197 +#: Top/argdecode.c:198 msgid "--sched\t\t\tSet real-time scheduling priority and lock memory" msgstr "" -#: Top/argdecode.c:198 +#: Top/argdecode.c:199 msgid "--sched=N\t\tSet priority to N and lock memory" msgstr "" -#: Top/argdecode.c:199 +#: Top/argdecode.c:200 msgid "--opcode-lib=NAMES\tDynamic libraries to load" msgstr "" -#: Top/argdecode.c:200 +#: Top/argdecode.c:201 msgid "--opcode-omit=NAMES\tDynamic libraries not to load" msgstr "" -#: Top/argdecode.c:201 +#: Top/argdecode.c:202 msgid "--omacro:XXX=YYY\tSet orchestra macro XXX to value YYY" msgstr "" -#: Top/argdecode.c:202 +#: Top/argdecode.c:203 msgid "--smacro:XXX=YYY\tSet score macro XXX to value YYY" msgstr "" -#: Top/argdecode.c:203 +#: Top/argdecode.c:204 msgid "--midi-key=N\t\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:204 +#: Top/argdecode.c:205 msgid "\t\t\tkey number to pfield N as MIDI value [0-127]" msgstr "" -#: Top/argdecode.c:205 +#: Top/argdecode.c:206 msgid "--midi-key-cps=N\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:206 +#: Top/argdecode.c:207 msgid "\t\t\tkey number to pfield N as cycles per second" msgstr "" -#: Top/argdecode.c:207 +#: Top/argdecode.c:208 msgid "--midi-key-oct=N\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:208 +#: Top/argdecode.c:209 msgid "\t\t\tkey number to pfield N as linear octave" msgstr "" -#: Top/argdecode.c:209 +#: Top/argdecode.c:210 msgid "--midi-key-pch=N\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:210 +#: Top/argdecode.c:211 msgid "\t\t\tkey number to pfield N as oct.pch" msgstr "" -#: Top/argdecode.c:211 +#: Top/argdecode.c:212 msgid "--midi-velocity=N\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:212 +#: Top/argdecode.c:213 msgid "\t\t\tvelocity number to pfield N as MIDI value [0-127]" msgstr "" -#: Top/argdecode.c:213 +#: Top/argdecode.c:214 msgid "--midi-velocity-amp=N\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:214 +#: Top/argdecode.c:215 msgid "\t\t\tvelocity number to pfield N as amplitude" msgstr "" -#: Top/argdecode.c:215 +#: Top/argdecode.c:216 msgid "--no-default-paths\tTurn off relative paths from CSD/ORC/SCO" msgstr "" -#: Top/argdecode.c:216 +#: Top/argdecode.c:217 msgid "--sample-accurate\t\tUse sample-accurate timing of score events" msgstr "" -#: Top/argdecode.c:217 +#: Top/argdecode.c:218 msgid "--realtime\t\trealtime priority mode" msgstr "" -#: Top/argdecode.c:218 +#: Top/argdecode.c:219 #, fuzzy msgid "--nchnls=N\t\t override number of audio channels" msgstr "número de canales inválido" -#: Top/argdecode.c:219 +#: Top/argdecode.c:220 msgid "--nchnls_i=N\t\t override number of input audio channels" msgstr "" -#: Top/argdecode.c:220 +#: Top/argdecode.c:221 msgid "--0dbfs=N\t\t override 0dbfs (max positive signal amplitude)" msgstr "" -#: Top/argdecode.c:221 +#: Top/argdecode.c:222 msgid "--sinesize\t\tlength of internal sine table" msgstr "" #: Top/argdecode.c:223 +msgid "" +"--daemon\t\t daemon mode: do not exit if CSD/orchestra is not given, is " +"empty or does not compile" +msgstr "" + +#: Top/argdecode.c:225 +msgid "" +"--port=N\t\t listen to UDP port N for instruments/orchestra code (implies --" +"daemon)" +msgstr "" + +#: Top/argdecode.c:228 msgid "--help\t\t\tLong help" msgstr "" -#: Top/argdecode.c:239 +#: Top/argdecode.c:244 #, c-format msgid "flag defaults: csound -s -otest -b%d -B%d -m%d\n" msgstr "" -#: Top/argdecode.c:246 Top/argdecode.c:262 +#: Top/argdecode.c:251 Top/argdecode.c:267 msgid "Usage:\tcsound [-flags] orchfile scorefile\n" msgstr "" -#: Top/argdecode.c:247 Top/argdecode.c:263 util/envext.c:53 util/xtrct.c:67 +#: Top/argdecode.c:252 Top/argdecode.c:268 util/envext.c:53 util/xtrct.c:67 msgid "Legal flags are:\n" msgstr "" -#: Top/argdecode.c:248 +#: Top/argdecode.c:253 msgid "" "Long format:\n" "\n" msgstr "" -#: Top/argdecode.c:253 +#: Top/argdecode.c:258 msgid "" "\n" "Short form:\n" msgstr "" -#: Top/argdecode.c:266 +#: Top/argdecode.c:271 msgid "Csound Command ERROR:\t" msgstr "" -#: Top/argdecode.c:401 +#: Top/argdecode.c:406 #, c-format msgid "unknown output format: '%s'" msgstr "" -#: Top/argdecode.c:419 Top/argdecode.c:1008 +#: Top/argdecode.c:424 Top/argdecode.c:1024 msgid "no iobufsamps" msgstr "" -#: Top/argdecode.c:426 Top/argdecode.c:1015 +#: Top/argdecode.c:431 Top/argdecode.c:1031 msgid "no hardware bufsamps" msgstr "" -#: Top/argdecode.c:452 Top/argdecode.c:1115 +#: Top/argdecode.c:457 Top/argdecode.c:1132 msgid "no midifile name" msgstr "" -#: Top/argdecode.c:457 Top/argdecode.c:1121 +#: Top/argdecode.c:461 Top/argdecode.c:1137 msgid "-F: stdin not supported on this platform" msgstr "" -#: Top/argdecode.c:467 +#: Top/argdecode.c:473 msgid "no midi output file name" msgstr "" -#: Top/argdecode.c:496 +#: Top/argdecode.c:502 msgid "invalid python variable definition syntax" msgstr "" -#: Top/argdecode.c:502 Top/argdecode.c:976 +#: Top/argdecode.c:508 Top/argdecode.c:992 msgid "no infilename" msgstr "" -#: Top/argdecode.c:505 Top/argdecode.c:980 +#: Top/argdecode.c:511 Top/argdecode.c:996 msgid "input cannot be stdout" msgstr "" -#: Top/argdecode.c:509 Top/argdecode.c:984 +#: Top/argdecode.c:515 Top/argdecode.c:1000 msgid "stdin audio not supported" msgstr "" -#: Top/argdecode.c:544 Top/argdecode.c:1048 +#: Top/argdecode.c:550 Top/argdecode.c:1064 msgid "no control rate" msgstr "" -#: Top/argdecode.c:558 Top/argdecode.c:1090 +#: Top/argdecode.c:564 Top/argdecode.c:1106 msgid "no Linein score device_name" msgstr "" -#: Top/argdecode.c:574 Top/argdecode.c:580 Top/argdecode.c:1056 +#: Top/argdecode.c:580 Top/argdecode.c:586 Top/argdecode.c:1072 msgid "no message level" msgstr "" -#: Top/argdecode.c:587 +#: Top/argdecode.c:593 msgid "no message amps" msgstr "" -#: Top/argdecode.c:596 +#: Top/argdecode.c:602 msgid "no message range" msgstr "" -#: Top/argdecode.c:605 +#: Top/argdecode.c:611 msgid "no message warnings" msgstr "" -#: Top/argdecode.c:614 +#: Top/argdecode.c:620 msgid "no message raw" msgstr "" -#: Top/argdecode.c:623 +#: Top/argdecode.c:629 msgid "no message dB" msgstr "" -#: Top/argdecode.c:632 +#: Top/argdecode.c:638 msgid "no message colours" msgstr "" -#: Top/argdecode.c:641 +#: Top/argdecode.c:647 msgid "no benchmark level" msgstr "" -#: Top/argdecode.c:649 +#: Top/argdecode.c:655 msgid "no value for --csd-line-nums" msgstr "" -#: Top/argdecode.c:658 Top/argdecode.c:1101 +#: Top/argdecode.c:664 Top/argdecode.c:1117 msgid "no midi device_name" msgstr "" -#: Top/argdecode.c:663 Top/argdecode.c:1107 +#: Top/argdecode.c:669 Top/argdecode.c:1122 msgid "-M: stdin not supported on this platform" msgstr "" -#: Top/argdecode.c:683 Top/argdecode.c:992 util/envext.c:84 util/mixer.c:206 +#: Top/argdecode.c:689 Top/argdecode.c:1008 util/envext.c:84 util/mixer.c:206 #: util/scale.c:173 util/srconv.c:247 util/xtrct.c:120 msgid "no outfilename" msgstr "" -#: Top/argdecode.c:686 Top/argdecode.c:996 util/scale.c:177 util/srconv.c:251 +#: Top/argdecode.c:692 Top/argdecode.c:1012 util/scale.c:177 util/srconv.c:251 #: util/xtrct.c:124 msgid "-o cannot be stdin" msgstr "" -#: Top/argdecode.c:690 Top/argdecode.c:1000 util/scale.c:180 util/srconv.c:256 +#: Top/argdecode.c:696 Top/argdecode.c:1016 util/scale.c:180 util/srconv.c:256 msgid "stdout audio not supported" msgstr "" -#: Top/argdecode.c:700 Top/argdecode.c:1198 util/hetro.c:232 +#: Top/argdecode.c:706 Top/argdecode.c:1216 util/hetro.c:232 msgid "no log file" msgstr "" -#: Top/argdecode.c:755 Top/argdecode.c:955 +#: Top/argdecode.c:761 Top/argdecode.c:971 msgid "no utility name" msgstr "" -#: Top/argdecode.c:774 Top/argdecode.c:1070 +#: Top/argdecode.c:780 Top/argdecode.c:1086 msgid "no xfilename" msgstr "" -#: Top/argdecode.c:920 +#: Top/argdecode.c:936 #, c-format msgid "unknown long option: '--%s'" msgstr "" -#: Top/argdecode.c:1043 +#: Top/argdecode.c:1059 msgid "no sample rate" msgstr "" -#: Top/argdecode.c:1075 +#: Top/argdecode.c:1091 msgid "no tempo value" msgstr "" -#: Top/argdecode.c:1080 +#: Top/argdecode.c:1096 msgid "illegal tempo" msgstr "" -#: Top/argdecode.c:1129 +#: Top/argdecode.c:1147 msgid "no MIDI output device" msgstr "" -#: Top/argdecode.c:1181 +#: Top/argdecode.c:1199 msgid "No indirection file" msgstr "" -#: Top/argdecode.c:1188 +#: Top/argdecode.c:1206 #, c-format msgid "Cannot open indirection file %s\n" msgstr "" -#: Top/argdecode.c:1217 +#: Top/argdecode.c:1235 msgid "no number of threads" msgstr "" -#: Top/argdecode.c:1228 util/envext.c:94 util/mixer.c:316 util/scale.c:241 +#: Top/argdecode.c:1246 util/envext.c:94 util/mixer.c:316 util/scale.c:241 #: util/xtrct.c:239 #, c-format msgid "unknown flag -%c" msgstr "" -#: Top/argdecode.c:1235 +#: Top/argdecode.c:1253 msgid "error: orchestra and score name not allowed in .csound6rc" msgstr "" -#: Top/argdecode.c:1381 +#: Top/argdecode.c:1401 #, fuzzy msgid "stdout not supported on this platform" msgstr "no está soportado en esta terminal" -#: Top/argdecode.c:1421 Top/argdecode.c:1441 Top/argdecode.c:1461 +#: Top/argdecode.c:1441 Top/argdecode.c:1461 Top/argdecode.c:1481 #, fuzzy msgid "stdin not supported on this platform" msgstr "no está soportado en esta terminal" @@ -10148,76 +10193,76 @@ msgid "cscoreFileGetCurrent: no fp current" msgstr "" -#: Top/csmodule.c:195 +#: Top/csmodule.c:199 #, c-format msgid "not loading '%s' (uses incompatible floating point type)" msgstr "" -#: Top/csmodule.c:204 +#: Top/csmodule.c:208 #, c-format msgid "" "not loading '%s' (incompatible with this version of Csound (%d.%d/%d.%d)" msgstr "" -#: Top/csmodule.c:247 +#: Top/csmodule.c:251 #, c-format msgid "could not open library '%s' (%s)" msgstr "" -#: Top/csmodule.c:250 +#: Top/csmodule.c:254 #, c-format msgid "could not open library '%s' (%d)" msgstr "" -#: Top/csmodule.c:311 +#: Top/csmodule.c:315 #, c-format msgid "'%s' is not a Csound plugin library" msgstr "" -#: Top/csmodule.c:322 +#: Top/csmodule.c:326 msgid "csoundLoadExternal(): memory allocation failure" msgstr "" -#: Top/csmodule.c:336 Top/csmodule.c:344 +#: Top/csmodule.c:340 Top/csmodule.c:348 #, c-format msgid "Error in pre-initialisation function of module '%s'" msgstr "" -#: Top/csmodule.c:417 +#: Top/csmodule.c:426 #, c-format msgid "Error opening plugin directory '%s': %s" msgstr "" -#: Top/csmodule.c:420 +#: Top/csmodule.c:429 #, fuzzy, c-format msgid "Error opening plugin directory: %s" msgstr "error abriendo el dispositivo de salida %d: %s" -#: Top/csmodule.c:455 +#: Top/csmodule.c:464 #, c-format msgid "path name too long, skipping '%s'" msgstr "" -#: Top/csmodule.c:461 +#: Top/csmodule.c:470 #, c-format msgid "Library %s omitted\n" msgstr "" -#: Top/csmodule.c:494 +#: Top/csmodule.c:503 msgid "Loading command-line libraries:\n" msgstr "" -#: Top/csmodule.c:517 +#: Top/csmodule.c:526 #, c-format msgid " *** error loading '%s'" msgstr "" -#: Top/csmodule.c:540 +#: Top/csmodule.c:549 #, c-format msgid "Error starting module '%s'" msgstr "" -#: Top/csmodule.c:639 +#: Top/csmodule.c:648 #, c-format msgid "Error de-initialising module '%s'" msgstr "" @@ -10226,275 +10271,289 @@ msgid "Error allocating opcode list" msgstr "" -#: Top/csound.c:1409 +#: Top/csound.c:1410 #, c-format msgid "Multithread performance: insno: %3d thread %d of %d starting.\n" msgstr "" -#: Top/csound.c:1415 +#: Top/csound.c:1416 msgid "Bad ThreadId" msgstr "" -#: Top/csound.c:1603 Top/csound.c:1635 Top/csound.c:1663 Top/csound.c:1699 -#: Top/csound.c:3879 +#: Top/csound.c:1604 Top/csound.c:1636 Top/csound.c:1664 Top/csound.c:1700 +#: Top/csound.c:3884 msgid "Csound not ready for performance: csoundStart() has not been called \n" msgstr "" -#: Top/csound.c:1619 Top/csound.c:1648 +#: Top/csound.c:1620 Top/csound.c:1649 msgid "Score finished in csoundPerformKsmps().\n" msgstr "" -#: Top/csound.c:1642 Top/csound.c:3886 +#: Top/csound.c:1643 Top/csound.c:3891 msgid "Early return from csoundPerformKsmps().\n" msgstr "" -#: Top/csound.c:1670 +#: Top/csound.c:1671 msgid "Early return from csoundPerformBuffer().\n" msgstr "" -#: Top/csound.c:1708 +#: Top/csound.c:1709 msgid "Early return from csoundPerform().\n" msgstr "" -#: Top/csound.c:1716 +#: Top/csound.c:1717 msgid "Score finished in csoundPerform().\n" msgstr "" -#: Top/csound.c:1727 +#: Top/csound.c:1728 msgid "csoundPerform(): stopped.\n" msgstr "" -#: Top/csound.c:2010 +#: Top/csound.c:2012 msgid "WARNING: " msgstr "ATENCION: " -#: Top/csound.c:2150 +#: Top/csound.c:2154 msgid "rtdummy: failed to allocate globals" msgstr "" -#: Top/csound.c:2151 +#: Top/csound.c:2155 msgid "rtaudio: dummy module enabled\n" msgstr "" -#: Top/csound.c:2180 Top/csound.c:2217 +#: Top/csound.c:2184 Top/csound.c:2221 msgid " *** error: rtaudio module set to empty string" msgstr "" -#: Top/csound.c:2184 Top/csound.c:2221 +#: Top/csound.c:2188 Top/csound.c:2225 #, c-format msgid " unknown rtaudio module: '%s', using dummy module" msgstr "" -#: Top/csound.c:2338 +#: Top/csound.c:2342 msgid "WARNING: real time midi input disabled, using dummy functions\n" msgstr "" -#: Top/csound.c:2343 Top/csound.c:2377 +#: Top/csound.c:2347 Top/csound.c:2381 msgid "error: -+rtmidi set to empty string" msgstr "" -#: Top/csound.c:2346 Top/csound.c:2380 +#: Top/csound.c:2350 Top/csound.c:2384 #, c-format msgid "error: -+rtmidi='%s': unknown module" msgstr "" -#: Top/csound.c:2372 +#: Top/csound.c:2376 msgid "WARNING: real time midi output disabled, using dummy functions\n" msgstr "" -#: Top/csound.c:2394 +#: Top/csound.c:2398 msgid "Unknown MIDI error" msgstr "" -#: Top/csound.c:2555 +#: Top/csound.c:2559 msgid "Failed to allocate new opcode entry." msgstr "" -#: Top/csound.c:2577 +#: Top/csound.c:2581 #, c-format msgid "Failed to allocate opcode entry for %s." msgstr "" -#: Top/csound.c:2717 Top/main.c:390 +#: Top/csound.c:2721 Top/main.c:358 msgid "setting dummy interface\n" msgstr "" -#: Top/csound.c:2793 +#: Top/csound.c:2798 msgid "Failed during csoundInitEnv" msgstr "" -#: Top/csound.c:2815 +#: Top/csound.c:2820 msgid "Failed during csoundInitStaticModules" msgstr "" -#: Top/csound.c:2831 +#: Top/csound.c:2836 msgid "Failed during csoundLoadModules" msgstr "" -#: Top/csound.c:2888 +#: Top/csound.c:2893 msgid "Real time audio module name" msgstr "" -#: Top/csound.c:2913 +#: Top/csound.c:2918 msgid "Real time MIDI module name" msgstr "" -#: Top/csound.c:2918 +#: Top/csound.c:2923 msgid "Ignore events (other than tempo changes) in tracks defined by pattern" msgstr "" -#: Top/csound.c:2924 +#: Top/csound.c:2929 msgid "Do not handle special MIDI controllers (sustain pedal etc.)" msgstr "" -#: Top/csound.c:2932 +#: Top/csound.c:2937 #, fuzzy msgid "Title tag in output soundfile (no spaces)" msgstr "No fue posible abrir el archivo de salida %s" -#: Top/csound.c:2938 +#: Top/csound.c:2943 msgid "Copyright tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2944 +#: Top/csound.c:2949 msgid "Software tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2949 +#: Top/csound.c:2954 msgid "Artist tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2956 +#: Top/csound.c:2961 msgid "Comment tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2961 +#: Top/csound.c:2966 msgid "Date tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2971 +#: Top/csound.c:2976 msgid "Enable message attributes (colors etc.)" msgstr "" -#: Top/csound.c:2977 +#: Top/csound.c:2982 msgid "Start score playback at the specified time, skipping earlier events" msgstr "" -#: Top/csound.c:2984 +#: Top/csound.c:2989 msgid "Ignore in CSD files (default: no)" msgstr "" -#: Top/csound.c:3194 +#: Top/csound.c:3199 msgid "Cannot open /proc/cpuinfo. Support for RDTSC is not available.\n" msgstr "" -#: Top/csound.c:3224 +#: Top/csound.c:3229 msgid "No valid CPU frequency entry was found in /proc/cpuinfo.\n" msgstr "" -#: Top/csound.c:3778 +#: Top/csound.c:3783 msgid "csoundDestroyMessageBuffer: Message buffer not allocated." msgstr "" -#: Top/csound.c:3809 +#: Top/csound.c:3814 msgid "csound: internal error: message buffer overflow\n" msgstr "" -#: Top/main.c:64 +#: Top/main.c:65 #, fuzzy, c-format msgid "WARNING: cannot open csound6rc file %s\n" msgstr "ATENCION: no se puede abrir el archivo csoundrc %s\n" -#: Top/main.c:67 +#: Top/main.c:68 #, c-format msgid "Reading options from $CSOUND6RC: %s \n" msgstr "" -#: Top/main.c:76 +#: Top/main.c:77 msgid "Reading options from $HOME/.csound6rc\n" msgstr "" -#: Top/main.c:91 +#: Top/main.c:92 msgid "Reading options from local directory .csound6rc \n" msgstr "" -#: Top/main.c:112 +#: Top/main.c:113 msgid "" "Csound is already started, call csoundReset()\n" "before starting again \n" msgstr "" -#: Top/main.c:186 +#: Top/main.c:141 msgid "no orchestra name" msgstr "" -#: Top/main.c:210 +#: Top/main.c:166 msgid "Reading CSD failed ... stopping" msgstr "Falla de lectura del archivo csd... deteniendo" -#: Top/main.c:224 +#: Top/main.c:180 msgid "error: multiple uses of stdin" msgstr "" -#: Top/main.c:228 +#: Top/main.c:184 msgid "error: multiple uses of stdout" msgstr "" -#: Top/main.c:237 +#: Top/main.c:193 msgid "realtime performance using dummy numeric scorefile\n" msgstr "" -#: Top/main.c:260 +#: Top/main.c:216 #, c-format msgid "orchname: %s\n" msgstr "nombre de la orquesta: %s\n" -#: Top/main.c:278 +#: Top/main.c:220 +#, fuzzy, c-format +msgid "Failed to open input file - %s\n" +msgstr "No fue posible abrir el archivo de salida %s" + +#: Top/main.c:235 #, fuzzy msgid "cannot compile orchestra \n" msgstr "No es posible abrir el archivo de orquesta %s" -#: Top/main.c:291 +#: Top/main.c:240 +#, fuzzy +msgid "cannot compile orchestra." +msgstr "No es posible abrir el archivo de orquesta %s" + +#: Top/main.c:241 +msgid "Csound will start with no instruments" +msgstr "" + +#: Top/main.c:259 msgid "end of orchestra compile" msgstr "fin de compilación de la orquesta" -#: Top/main.c:299 +#: Top/main.c:267 #, c-format msgid "using previous %s\n" msgstr "" -#: Top/main.c:309 +#: Top/main.c:277 #, c-format msgid "cannot open scorefile %s" msgstr "no es posible abrir el archivo de score %s" -#: Top/main.c:311 +#: Top/main.c:279 msgid "sorting score ...\n" msgstr "" -#: Top/main.c:321 +#: Top/main.c:289 #, c-format msgid "cannot open extract file %s" msgstr "" -#: Top/main.c:324 +#: Top/main.c:292 msgid " ... extracting ...\n" msgstr " ... extrayendo ...\n" -#: Top/main.c:333 +#: Top/main.c:301 msgid "end of score sort" msgstr "" -#: Top/main.c:335 +#: Top/main.c:303 msgid "Syntax check completed.\n" msgstr "Revisión de sintaxis completa.\n" -#: Top/main.c:456 util/dnoise.c:266 +#: Top/main.c:424 util/dnoise.c:266 #, c-format msgid "%s not a recognised SFOUTYP env setting" msgstr "" -#: Top/main.c:475 +#: Top/main.c:443 msgid "srate and krate overrides must occur jointly" msgstr "" @@ -10564,158 +10623,158 @@ msgid " *** Type 'csound --help' for the list of available options." msgstr "" -#: Top/one_file.c:105 Top/one_file.c:115 +#: Top/one_file.c:96 Top/one_file.c:106 msgid " *** cannot create temporary file" msgstr " *** no es posible crear el archivo temporal" -#: Top/one_file.c:199 +#: Top/one_file.c:182 #, c-format msgid "Removing temporary file %s ...\n" msgstr "Reitrando el archivo temporal %s ...\n" -#: Top/one_file.c:203 +#: Top/one_file.c:186 #, c-format msgid "WARNING: could not remove %s\n" msgstr "ATENCION: no fue posible retirar %s\n" -#: Top/one_file.c:270 Top/one_file.c:304 +#: Top/one_file.c:253 Top/one_file.c:287 #, c-format msgid "More than %d arguments in " msgstr "" -#: Top/one_file.c:342 +#: Top/one_file.c:325 #, c-format msgid "Invalid arguments in : %s" msgstr "" -#: Top/one_file.c:345 +#: Top/one_file.c:328 #, c-format msgid "Invalid arguments in .csoundrc or -@ file: %s" msgstr "" -#: Top/one_file.c:351 Top/one_file.c:784 +#: Top/one_file.c:334 Top/one_file.c:767 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:380 +#: Top/one_file.c:361 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:400 Top/one_file.c:467 +#: Top/one_file.c:381 Top/one_file.c:449 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:415 Top/one_file.c:420 +#: Top/one_file.c:396 Top/one_file.c:401 msgid "Missing program in tag " msgstr "" -#: Top/one_file.c:432 +#: Top/one_file.c:414 #, c-format msgid "Creating %s (%p)\n" msgstr "Creando %s (%p)\n" -#: Top/one_file.c:445 +#: Top/one_file.c:427 msgid "External generation failed" msgstr "" -#: Top/one_file.c:505 +#: Top/one_file.c:487 #, c-format msgid "Non base64 character %c(%2x)" msgstr "" -#: Top/one_file.c:524 +#: Top/one_file.c:506 msgid "Truncated byte at end of base64 stream" msgstr "" -#: Top/one_file.c:540 +#: Top/one_file.c:523 #, c-format msgid "Cannot open temporary file (%s) for MIDI subfile" msgstr "" -#: Top/one_file.c:557 +#: Top/one_file.c:540 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:573 Top/one_file.c:622 +#: Top/one_file.c:556 Top/one_file.c:605 #, c-format msgid "File %s already exists" msgstr "El archivo %s ya existe" -#: Top/one_file.c:578 +#: Top/one_file.c:561 #, c-format msgid "Cannot open sample file (%s) subfile" msgstr "" -#: Top/one_file.c:592 +#: Top/one_file.c:575 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:627 +#: Top/one_file.c:610 #, c-format msgid "Cannot open file (%s) subfile" msgstr "" -#: Top/one_file.c:642 +#: Top/one_file.c:625 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:662 +#: Top/one_file.c:645 #, c-format msgid "This CSD file requires a version of Csound before %d.%02d" msgstr "" -#: Top/one_file.c:670 Top/one_file.c:677 +#: Top/one_file.c:653 Top/one_file.c:660 #, c-format msgid "This CSD file requires a version of Csound after %d.%02d" msgstr "" -#: Top/one_file.c:683 +#: Top/one_file.c:666 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:693 +#: Top/one_file.c:676 msgid "**** Licence Information ****\n" msgstr "**** Información de licencia ****\n" -#: Top/one_file.c:699 +#: Top/one_file.c:682 msgid "**** End of Licence Information ****\n" msgstr "**** Fin de información de licencia ****\n" -#: Top/one_file.c:710 +#: Top/one_file.c:693 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:741 +#: Top/one_file.c:724 #, c-format msgid "Failed to open csd file: %s" msgstr "No fue posible abrir el archivo csd: %s" -#: Top/one_file.c:756 +#: Top/one_file.c:739 msgid "STARTING FILE\n" msgstr "INCIANDO ARCHIVO\n" -#: Top/one_file.c:774 +#: Top/one_file.c:757 msgid "Creating options\n" msgstr "Creando opciones\n" -#: Top/one_file.c:780 +#: Top/one_file.c:763 msgid "Skipping \n" msgstr "Saltando \n" -#: Top/one_file.c:794 +#: Top/one_file.c:777 msgid "Creating orchestra\n" msgstr "Creando orquesta\n" -#: Top/one_file.c:799 +#: Top/one_file.c:782 msgid "Creating score\n" msgstr "Creando score\n" -#: Top/one_file.c:833 +#: Top/one_file.c:812 #, c-format msgid "unknown CSD tag: %s\n" msgstr "Etiqueta CSD desconocida: %s\n" -#: Top/one_file.c:838 +#: Top/one_file.c:817 msgid "Could not find tag in CSD file.\n" msgstr "No se encontró la etiqueta en el archivo CSD.\n" diff -Nru csound-6.01~dfsg/po/french.po csound-6.02~dfsg/po/french.po --- csound-6.01~dfsg/po/french.po 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/po/french.po 2014-01-07 16:54:21.000000000 +0000 @@ -197,57 +197,57 @@ msgid "Not a proper list of ints" msgstr "N'est pas une liste d'ints correcte" -#: Engine/csound_orc_compile.c:276 +#: Engine/csound_orc_compile.c:274 msgid "missing or extra arg" msgstr "argument manquant ou en trop" -#: Engine/csound_orc_compile.c:281 +#: Engine/csound_orc_compile.c:279 msgid "too many input args\n" msgstr "trop d'arguments en entrée\n" -#: Engine/csound_orc_compile.c:464 +#: Engine/csound_orc_compile.c:462 #, c-format msgid "create_opcode: No rule to handle statement of type %d\n" msgstr "create_opcode : aucune règle pour traiter une instruction de type %d\n" -#: Engine/csound_orc_compile.c:633 Engine/csound_orc_compile.c:691 +#: Engine/csound_orc_compile.c:631 Engine/csound_orc_compile.c:690 #, c-format msgid "%s invalid sample rate" msgstr "%s taux d'échantillonnage non valide" -#: Engine/csound_orc_compile.c:635 Engine/csound_orc_compile.c:693 +#: Engine/csound_orc_compile.c:633 Engine/csound_orc_compile.c:692 #, c-format msgid "%s invalid control rate" msgstr "%s taux de contrôle non valide" -#: Engine/csound_orc_compile.c:639 Engine/csound_orc_compile.c:689 +#: Engine/csound_orc_compile.c:637 Engine/csound_orc_compile.c:688 #, c-format msgid "%s invalid ksmps value" msgstr "%s valeur de ksmps non valide" -#: Engine/csound_orc_compile.c:641 Engine/csound_orc_compile.c:695 +#: Engine/csound_orc_compile.c:639 Engine/csound_orc_compile.c:694 #, c-format msgid "%s inconsistent sr, kr, ksmps" msgstr "%s sr, kr, ksmps contradictoires" -#: Engine/csound_orc_compile.c:643 +#: Engine/csound_orc_compile.c:641 #, c-format msgid "%s inconsistent sr, kr, ksmps \n" msgstr "%s sr, kr, ksmps contradictoires\n" -#: Engine/csound_orc_compile.c:659 +#: Engine/csound_orc_compile.c:657 msgid "bad value for 0dbfs: must be positive. Setting default value." msgstr "" "mauvaise valeur pour 0dbfs : elle doit être positive. Valeur par défaut." -#: Engine/csound_orc_compile.c:680 +#: Engine/csound_orc_compile.c:679 #, c-format msgid "sample rate overrides: esr = %7.4f, ekr = %7.4f, ksmps = %d\n" msgstr "" "redéfinition des taux d'échantillonnage : esr = %7.4f, ekr = %7.4f, ksmps = " "%d\n" -#: Engine/csound_orc_compile.c:686 +#: Engine/csound_orc_compile.c:685 #, c-format msgid "" "sr = %.7g, kr = %.7g, ksmps = %.7g\n" @@ -256,103 +256,103 @@ "sr = %.7g, kr = %.7g, ksmps = %.7g\n" "erreur :" -#: Engine/csound_orc_compile.c:832 +#: Engine/csound_orc_compile.c:842 #, c-format msgid "create_instrument: instr num %ld\n" msgstr "create_instrument : numéro d'instrument %ld\n" -#: Engine/csound_orc_compile.c:921 +#: Engine/csound_orc_compile.c:934 msgid "-- deleted instr from deadpool \n" msgstr "-- instr supprimé de deadpool \n" -#: Engine/csound_orc_compile.c:949 +#: Engine/csound_orc_compile.c:962 #, c-format msgid " -- free instr def %p \n" msgstr " -- déf libre d'instr %p \n" -#: Engine/csound_orc_compile.c:962 Engine/csound_orc_compile.c:973 +#: Engine/csound_orc_compile.c:975 Engine/csound_orc_compile.c:986 #, c-format msgid " -- added to deadpool slot %d \n" msgstr " -- ajout du slot %d au deadpool \n" -#: Engine/csound_orc_compile.c:998 Engine/csound_orc_compile.c:1144 +#: Engine/csound_orc_compile.c:1011 Engine/csound_orc_compile.c:1158 #, c-format msgid "instr %ld redefined, replacing previous definition" msgstr "instr %ld redéfini, précédente définition remplacée" -#: Engine/csound_orc_compile.c:1096 +#: Engine/csound_orc_compile.c:1109 #, c-format msgid "instr %s uses instrument number %d\n" msgstr "l'instr %s utilise le numéro d'instrument %d\n" -#: Engine/csound_orc_compile.c:1168 +#: Engine/csound_orc_compile.c:1183 #, c-format msgid "no active instances of instr %d \n" msgstr "aucune instance active de l'instr %d \n" -#: Engine/csound_orc_compile.c:1213 +#: Engine/csound_orc_compile.c:1228 msgid "!!! csound->opcodeInfo is NULL !!!\n" msgstr "!!! csound->opcodeInfo est NULL !!!\n" -#: Engine/csound_orc_compile.c:1249 +#: Engine/csound_orc_compile.c:1264 #, c-format msgid " merging constants %d) %f\n" msgstr " fusion des constantes %d) %f\n" -#: Engine/csound_orc_compile.c:1258 +#: Engine/csound_orc_compile.c:1273 #, c-format msgid " merging %d) %s:%s\n" msgstr " fusion %d) %s:%s\n" -#: Engine/csound_orc_compile.c:1281 +#: Engine/csound_orc_compile.c:1299 #, c-format msgid "merging instr %d \n" msgstr "fusion de l'instr %d \n" -#: Engine/csound_orc_compile.c:1289 +#: Engine/csound_orc_compile.c:1307 #, c-format msgid "merging instr %s \n" msgstr "fusion de l'instr %s \n" -#: Engine/csound_orc_compile.c:1452 Engine/csound_orc_compile.c:1480 -#: Engine/csound_orc_compile.c:1503 +#: Engine/csound_orc_compile.c:1471 Engine/csound_orc_compile.c:1499 +#: Engine/csound_orc_compile.c:1522 msgid "invalid name for instrument" msgstr "nom d'instrument non valide" -#: Engine/csound_orc_compile.c:1485 Engine/csound_orc_compile.c:1508 +#: Engine/csound_orc_compile.c:1504 Engine/csound_orc_compile.c:1527 #, c-format msgid "instr %s redefined" msgstr "instr %s redéfini" -#: Engine/csound_orc_compile.c:1530 +#: Engine/csound_orc_compile.c:1549 #, c-format msgid "ERROR: Could not find OPCODINFO for opname: %s\n" msgstr "ERREUR : impossible de trouver l'OPCODINFO pour : %s\n" -#: Engine/csound_orc_compile.c:1551 +#: Engine/csound_orc_compile.c:1570 #, c-format msgid "Unknown TREE node of type %d found in root.\n" msgstr "Noeud inconnu de type %d trouvé à la racine.\n" -#: Engine/csound_orc_compile.c:1560 +#: Engine/csound_orc_compile.c:1579 #, c-format msgid "%d syntax errors in orchestra. compilation invalid\n" msgstr "%d erreurs de syntaxe dans l'orchestre. Compilation non valide\n" -#: Engine/csound_orc_compile.c:1600 +#: Engine/csound_orc_compile.c:1620 msgid "perf-pass statements illegal in header blk\n" msgstr "les instructions d'exécution sont interdites dans le bloc d'en-tête\n" -#: Engine/csound_orc_compile.c:1772 +#: Engine/csound_orc_compile.c:1792 msgid "i[fixme] pset args != pmax" msgstr "i[fixme] pset args != pmax" -#: Engine/csound_orc_compile.c:1894 +#: Engine/csound_orc_compile.c:1922 #, c-format msgid "Missing local arg: %s\n" msgstr "Argument local manquant : %s\n" -#: Engine/csound_orc_compile.c:2025 +#: Engine/csound_orc_compile.c:2054 #, c-format msgid "Opcode \"%s\" is deprecated\n" msgstr "L'opcode \"%s\" est obsolète\n" @@ -438,33 +438,33 @@ msgid "Variable type for %s could not be determined.\n" msgstr "Impossible de déterminer le type de la variable %s.\n" -#: Engine/csound_orc_semantics.c:1300 +#: Engine/csound_orc_semantics.c:1301 #, c-format msgid "Unable to find opcode with name: %s\n" msgstr "Opcode nommé %s introuvable\n" -#: Engine/csound_orc_semantics.c:1315 +#: Engine/csound_orc_semantics.c:1316 #, c-format msgid "Unable to find opcode entry for '%s' with matching argument types:\n" msgstr "" "Aucune entrée pour l'opcode '%s' avec les types d'argument correspondants :\n" -#: Engine/csound_orc_semantics.c:1318 +#: Engine/csound_orc_semantics.c:1319 #, c-format msgid "Found: %s %s %s\n" msgstr "Trouvé : %s %s %s\n" -#: Engine/csound_orc_semantics.c:1320 +#: Engine/csound_orc_semantics.c:1321 #, c-format msgid "Line: %d Loc: %d\n" msgstr "Ligne : %d Pos : %d\n" -#: Engine/csound_orc_semantics.c:1454 +#: Engine/csound_orc_semantics.c:1455 #, c-format msgid "expression for until statement not a boolean expression, line %d\n" msgstr "l'expression de l'instruction until n'est pas booléenne, ligne %d\n" -#: Engine/csound_orc_semantics.c:1607 +#: Engine/csound_orc_semantics.c:1608 #, c-format msgid "" "\n" @@ -473,7 +473,7 @@ "\n" "erreur : %s (symbole \"%s\")" -#: Engine/csound_orc_semantics.c:1609 +#: Engine/csound_orc_semantics.c:1610 #, c-format msgid "" " line %d:\n" @@ -482,7 +482,7 @@ " ligne %d :\n" ">>>" -#: Engine/csound_orc_semantics.c:2141 +#: Engine/csound_orc_semantics.c:2142 #, c-format msgid "insufficient required arguments for opcode %s on line %d:%d\n" msgstr "arguments requis manquants pour l'opcode %s ligne %d:%d\n" @@ -497,62 +497,62 @@ msgid "Creating search path cache for '%s':" msgstr "Création du cache de chemin de recherche pour '%s' :" -#: Engine/envvar.c:729 +#: Engine/envvar.c:731 msgid "Current directory path name too long\n" msgstr "Le nom du chemin du répertoire courant est trop long\n" -#: Engine/envvar.c:1003 +#: Engine/envvar.c:1005 #, c-format msgid "internal error: csoundFileOpen(): invalid type: %d" msgstr "erreur interne : csoundFileOpen() : type non valide : %d" -#: Engine/envvar.c:1193 +#: Engine/envvar.c:1195 #, c-format msgid "internal error: csoundCreateFileHandle(): invalid type: %d" msgstr "erreur interne : csoundCreateFileHandle() : type non valide : %d" -#: Engine/fgens.c:91 +#: Engine/fgens.c:99 msgid "unknown GEN number" msgstr "numéro de GEN inconnu" -#: Engine/fgens.c:133 +#: Engine/fgens.c:141 msgid "ftable does not exist" msgstr "la ftable n'existe pas" -#: Engine/fgens.c:138 +#: Engine/fgens.c:146 #, c-format msgid "ftable %d now deleted\n" msgstr "la ftable %d est maintenant supprimée\n" -#: Engine/fgens.c:153 Engine/fgens.c:1612 Engine/fgens.c:1698 -#: Engine/fgens.c:1777 Engine/fgens.c:1893 Engine/fgens.c:1974 -#: Engine/fgens.c:3023 +#: Engine/fgens.c:161 Engine/fgens.c:1630 Engine/fgens.c:1716 +#: Engine/fgens.c:1795 Engine/fgens.c:1911 Engine/fgens.c:1992 +#: Engine/fgens.c:3043 msgid "insufficient gen arguments" msgstr "nombre d'arguments de GEN insuffisant" -#: Engine/fgens.c:179 Opcodes/ftgen.c:117 +#: Engine/fgens.c:187 Opcodes/ftgen.c:117 #, c-format msgid "Named gen \"%s\" not defined" msgstr "Le GEN nommé \"%s\" n'est pas défini" -#: Engine/fgens.c:187 +#: Engine/fgens.c:195 msgid "illegal gen number" msgstr "numéro de GEN interdit" -#: Engine/fgens.c:195 +#: Engine/fgens.c:203 msgid "deferred size for GENs 1, 23, 28 or 49 only" msgstr "taille différée seulement pour GEN1, GEN23, GEN28 et GEN49" -#: Engine/fgens.c:198 Engine/fgens.c:250 +#: Engine/fgens.c:206 Engine/fgens.c:258 #, c-format msgid "ftable %d:\n" msgstr "ftable %d :\n" -#: Engine/fgens.c:223 Engine/fgens.c:2301 Engine/fgens.c:2880 +#: Engine/fgens.c:231 Engine/fgens.c:2320 Engine/fgens.c:2899 msgid "illegal table length" msgstr "longueur de table illégale" -#: Engine/fgens.c:293 Engine/fgens.c:2262 +#: Engine/fgens.c:304 Engine/fgens.c:2281 #, c-format msgid "" "ftable %d relocating due to size change\n" @@ -561,177 +561,177 @@ "ftable %d réallouée à cause du changement de taille.\n" " les instruments actifs peuvent en être perturbés" -#: Engine/fgens.c:351 Engine/fgens.c:472 Engine/fgens.c:556 Engine/fgens.c:637 -#: Engine/fgens.c:712 Engine/fgens.c:761 Engine/fgens.c:882 Engine/fgens.c:959 -#: Engine/fgens.c:1060 Engine/fgens.c:1104 Engine/fgens.c:1151 -#: Engine/fgens.c:1405 Engine/fgens.c:1467 Engine/fgens.c:1696 -#: Engine/fgens.c:1774 Engine/fgens.c:2129 Engine/fgens.c:2977 -#: Engine/fgens.c:3020 +#: Engine/fgens.c:362 Engine/fgens.c:483 Engine/fgens.c:567 Engine/fgens.c:648 +#: Engine/fgens.c:723 Engine/fgens.c:772 Engine/fgens.c:893 Engine/fgens.c:970 +#: Engine/fgens.c:1071 Engine/fgens.c:1115 Engine/fgens.c:1165 +#: Engine/fgens.c:1423 Engine/fgens.c:1485 Engine/fgens.c:1714 +#: Engine/fgens.c:1792 Engine/fgens.c:2147 Engine/fgens.c:2997 +#: Engine/fgens.c:3040 msgid "using extended arguments\n" msgstr "utilisation d'arguments étendus\n" -#: Engine/fgens.c:375 +#: Engine/fgens.c:386 msgid "no coefs present" msgstr "aucun coefficient n'est présent" -#: Engine/fgens.c:380 Engine/fgens.c:646 Engine/fgens.c:654 +#: Engine/fgens.c:391 Engine/fgens.c:657 Engine/fgens.c:665 msgid "illegal x interval" msgstr "intervalle x interdit" -#: Engine/fgens.c:409 Engine/fgens.c:558 Engine/fgens.c:639 Engine/fgens.c:884 -#: Engine/fgens.c:1362 Engine/fgens.c:2473 Engine/fgens.c:2781 -#: Engine/fgens.c:2922 Opcodes/ftest.c:128 Top/main.c:118 util/cvanal.c:67 +#: Engine/fgens.c:420 Engine/fgens.c:569 Engine/fgens.c:650 Engine/fgens.c:895 +#: Engine/fgens.c:1380 Engine/fgens.c:2492 Engine/fgens.c:2800 +#: Engine/fgens.c:2941 Opcodes/ftest.c:128 Top/main.c:119 util/cvanal.c:67 #: util/lpanal.c:401 util/pvanal.c:170 msgid "insufficient arguments" msgstr "pas assez d'arguments" -#: Engine/fgens.c:413 Engine/fgens.c:1367 +#: Engine/fgens.c:424 Engine/fgens.c:1385 msgid "unknown srctable number" msgstr "numéro de srctable inconnu" -#: Engine/fgens.c:426 +#: Engine/fgens.c:437 msgid "table size too large" msgstr "taille de table trop grande" -#: Engine/fgens.c:511 Engine/fgens.c:544 +#: Engine/fgens.c:522 Engine/fgens.c:555 msgid "gen call has negative segment size:" msgstr "l'appel de GEN a une taille de segment négative :" -#: Engine/fgens.c:513 +#: Engine/fgens.c:524 msgid "illegal input vals for gen call, beginning:" msgstr "appel de GEN avec des valeurs illégales en entrée, début :" -#: Engine/fgens.c:579 +#: Engine/fgens.c:590 msgid "negative segsiz" msgstr "segsiz négatif" -#: Engine/fgens.c:788 +#: Engine/fgens.c:799 msgid "nh partials < 1" msgstr "nombre d'harmoniques nh < 1" -#: Engine/fgens.c:887 +#: Engine/fgens.c:898 msgid "illegal xint value" msgstr "valeur xint illégale" -#: Engine/fgens.c:890 +#: Engine/fgens.c:901 msgid "illegal xamp value" msgstr "valeur xamp illégale" -#: Engine/fgens.c:963 +#: Engine/fgens.c:974 msgid "uneven number of args" msgstr "nombre impair d'arguments" -#: Engine/fgens.c:1088 +#: Engine/fgens.c:1099 msgid "gen call has illegal x-ordinate values:" msgstr "l'appel gen a des valeurs d'abscisse x illégales" -#: Engine/fgens.c:1106 +#: Engine/fgens.c:1117 msgid "wrong number of args" msgstr "nombre d'arguments incorrect" -#: Engine/fgens.c:1120 +#: Engine/fgens.c:1131 msgid "a range given exceeds table length" msgstr "un intervalle donné excède la longueur de la table" -#: Engine/fgens.c:1127 +#: Engine/fgens.c:1138 msgid "an input function does not exist" msgstr "une fonction d'entrée n'existe pas" -#: Engine/fgens.c:1260 +#: Engine/fgens.c:1274 msgid "No such window!" msgstr "Pas de fenêtre de cette sorte !" -#: Engine/fgens.c:1278 +#: Engine/fgens.c:1292 msgid "Wrong number of input arguments" msgstr "Nombre incorrect d'arguments en entrée" -#: Engine/fgens.c:1279 +#: Engine/fgens.c:1293 msgid "unknown distribution" msgstr "distribution inconnue" -#: Engine/fgens.c:1328 +#: Engine/fgens.c:1342 msgid "error opening ASCII file" msgstr "erreur à l'ouverture du fichier ASCII" -#: Engine/fgens.c:1334 +#: Engine/fgens.c:1352 #, c-format msgid "%ld elements in %s\n" msgstr "%ld éléments dans %s\n" -#: Engine/fgens.c:1346 +#: Engine/fgens.c:1364 msgid "Numbers after table full in GEN23" msgstr "Encore des nombres à lire alors que la table est pleine dans GEN23" -#: Engine/fgens.c:1375 +#: Engine/fgens.c:1393 msgid "table size must be the same of source table" msgstr "la taille de la table doit être la même que celle de la table source" -#: Engine/fgens.c:1447 Engine/fgens.c:1507 +#: Engine/fgens.c:1465 Engine/fgens.c:1525 msgid "x coordinates must all be in increasing order:" msgstr "les coordonnées x doivent être toutes en ordre croissant" -#: Engine/fgens.c:1450 Engine/fgens.c:1509 +#: Engine/fgens.c:1468 Engine/fgens.c:1527 msgid "x coordinate greater than function size:" msgstr "coordonnée x supérieure à la taille de la fonction" -#: Engine/fgens.c:1454 +#: Engine/fgens.c:1472 msgid "illegal input val (y <= 0) for gen call, beginning:" msgstr "valeur d'entrée interdite (y <= 0) dans l'appel GEN, début :" -#: Engine/fgens.c:1527 +#: Engine/fgens.c:1545 msgid "GEN28 requires zero table length" msgstr "GEN28 nécessite une longueur de table nulle" -#: Engine/fgens.c:1596 +#: Engine/fgens.c:1614 msgid "could not open space file" msgstr "impossible d'ouvrir le fichier de spatialisation" -#: Engine/fgens.c:1598 +#: Engine/fgens.c:1616 msgid "Time values must be in increasing order" msgstr "Les valeurs de temps doivent être en ordre croissant" -#: Engine/fgens.c:1619 +#: Engine/fgens.c:1637 msgid "GEN30: source ftable not found" msgstr "GEN30 : la ftable source n'a pas été trouvée" -#: Engine/fgens.c:1702 +#: Engine/fgens.c:1720 msgid "GEN31: source ftable not found" msgstr "GEN31 : la ftable source n'a pas été trouvée" -#: Engine/fgens.c:1810 +#: Engine/fgens.c:1828 #, c-format msgid "GEN32: source ftable %d not found" msgstr "GEN32 : la ftable source %d n'a pas été trouvée" -#: Engine/fgens.c:1904 +#: Engine/fgens.c:1922 msgid "GEN33: source ftable not found" msgstr "GEN33 : la ftable source n'a pas été trouvée" -#: Engine/fgens.c:2072 +#: Engine/fgens.c:2090 msgid "unknown source table number" msgstr "numéro de table source inconnu" -#: Engine/fgens.c:2104 +#: Engine/fgens.c:2122 msgid "Gen41: negative probability not allowed" msgstr "Gen41 : probabilité négative interdite" -#: Engine/fgens.c:2170 Opcodes/fareygen.c:70 +#: Engine/fgens.c:2188 Opcodes/fareygen.c:70 #, c-format msgid "ftable %d: " msgstr "ftable %d : " -#: Engine/fgens.c:2214 +#: Engine/fgens.c:2232 #, c-format msgid "ftable %d:" msgstr "ftable %d :" -#: Engine/fgens.c:2257 +#: Engine/fgens.c:2275 #, c-format msgid "replacing previous ftable %d" msgstr "remplacement de la ftable précédente %d" -#: Engine/fgens.c:2297 Engine/fgens.c:2423 Engine/fgens.c:2451 -#: Engine/fgens.c:2458 Opcodes/gab/gab.c:590 Opcodes/gab/gab.c:645 +#: Engine/fgens.c:2316 Engine/fgens.c:2442 Engine/fgens.c:2470 +#: Engine/fgens.c:2477 Opcodes/gab/gab.c:592 Opcodes/gab/gab.c:647 #: Opcodes/midiops2.c:233 Opcodes/midiops2.c:388 Opcodes/midiops2.c:470 #: Opcodes/uggab.c:1625 Opcodes/uggab.c:1661 Opcodes/uggab.c:1683 #: Opcodes/uggab.c:1736 @@ -739,124 +739,124 @@ msgid "Invalid ftable no. %f" msgstr "Numéro de ftable non valide. %f" -#: Engine/fgens.c:2306 +#: Engine/fgens.c:2325 #, c-format msgid "deferred-size ftable %f illegal here" msgstr "taille différée de la ftable %f interdite ici" -#: Engine/fgens.c:2362 Engine/fgens.c:2961 +#: Engine/fgens.c:2381 Engine/fgens.c:2981 #, c-format msgid "Deferred load of '%s' failed" msgstr "Le chargement différé de '%s' a échoué" -#: Engine/fgens.c:2429 +#: Engine/fgens.c:2448 #, c-format msgid "Deferred-size ftable %f load not available at perf time." msgstr "" "La taille différée au chargement de la ftable %f n'est pas disponible à " "l'exécution." -#: Engine/fgens.c:2497 +#: Engine/fgens.c:2516 #, c-format msgid "non-deferred ftable %d needs size %d\n" msgstr "la table non différée %d nécessite une taille %d\n" -#: Engine/fgens.c:2544 Opcodes/loscilx.c:69 +#: Engine/fgens.c:2563 Opcodes/loscilx.c:69 #, c-format msgid "invalid sample format: %d" msgstr "format d'échantillon non valide : %d" -#: Engine/fgens.c:2552 Engine/fgens.c:2805 +#: Engine/fgens.c:2571 Engine/fgens.c:2824 #, c-format msgid "channel %d illegal" msgstr "le canal %d est illégal" -#: Engine/fgens.c:2558 +#: Engine/fgens.c:2577 msgid "deferred alloc\n" msgstr "allocation différée\n" -#: Engine/fgens.c:2566 Engine/fgens.c:2878 +#: Engine/fgens.c:2585 Engine/fgens.c:2897 msgid "deferred size, but filesize unknown" msgstr "taille différée, mais taille de fichier inconnu" -#: Engine/fgens.c:2569 Engine/fgens.c:2882 +#: Engine/fgens.c:2588 Engine/fgens.c:2901 #, c-format msgid " defer length %d\n" msgstr " longueur différée %d\n" -#: Engine/fgens.c:2637 +#: Engine/fgens.c:2656 msgid "GEN1: input file truncated by ftable size" msgstr "GEN1 : le fichier en entrée a été tronqué à la taille de la ftable" -#: Engine/fgens.c:2641 +#: Engine/fgens.c:2660 #, c-format msgid "\tlooping endpoint %d exceeds ftsize %d\n" msgstr "\tla fin de boucle (%d) dépasse la taille de la table (%d)\n" -#: Engine/fgens.c:2657 +#: Engine/fgens.c:2676 msgid "GEN1 read error" msgstr "GEN1 erreur de lecture" -#: Engine/fgens.c:2662 +#: Engine/fgens.c:2681 msgid "GEN1: aiff file truncated by ftable size" msgstr "GEN1 : le fichier aiff a été tronqué à la taille de la table" -#: Engine/fgens.c:2663 +#: Engine/fgens.c:2682 #, c-format msgid "\taudio samps %d exceeds ftsize %d" msgstr "\tles échantillons audio %d dépassent la taille de la table (%d)" -#: Engine/fgens.c:2707 +#: Engine/fgens.c:2726 msgid "wrong number of ftable arguments" msgstr "nombre d'arguments incorrect pour la ftable" -#: Engine/fgens.c:2717 OOps/pstream.c:379 +#: Engine/fgens.c:2736 OOps/pstream.c:379 msgid "Failed to load PVOC-EX file" msgstr "Le chargement du fichier PVOC-EX a échoué" -#: Engine/fgens.c:2728 InOut/midirecv.c:417 OOps/midiops.c:402 +#: Engine/fgens.c:2747 InOut/midirecv.c:419 OOps/midiops.c:402 #: OOps/midiops.c:452 OOps/midiops.c:464 msgid "illegal channel number" msgstr "numéro de canal illégal" -#: Engine/fgens.c:2746 +#: Engine/fgens.c:2765 msgid "ftable size too small" msgstr "taille de ftable trop petite" -#: Engine/fgens.c:2821 Opcodes/mp3in.c:87 Opcodes/mp3in.c:255 +#: Engine/fgens.c:2840 Opcodes/mp3in.c:87 Opcodes/mp3in.c:255 #: Top/cscorfns.c:176 Top/cscorfns.c:207 msgid "Not enough memory\n" msgstr "Pas assez de mémoire\n" -#: Engine/fgens.c:2987 +#: Engine/fgens.c:3007 msgid "gen51: invalid number of p-fields (too few grades)" msgstr "gen51 : nombre de p-champs non valide (pas assez de degrés)" -#: Engine/fgens.c:3027 +#: Engine/fgens.c:3047 msgid "number of channels inconsistent with number of args" msgstr "nombre de canaux en contradiction avec le nombre d'arguments" -#: Engine/fgens.c:3186 +#: Engine/fgens.c:3206 msgid "GEN53: invalid number of gen arguments" msgstr "GEN53 : nombre d'arguments de GEN non valide" -#: Engine/fgens.c:3196 +#: Engine/fgens.c:3216 msgid "GEN53: invalid table length" msgstr "GEN53 : longueur de table non valide" -#: Engine/fgens.c:3200 +#: Engine/fgens.c:3220 msgid "GEN53: invalid source table number" msgstr "GEN53 : numéro de la table source non valide" -#: Engine/fgens.c:3203 +#: Engine/fgens.c:3223 msgid "GEN53: mode must be in the range 0 to 15" msgstr "GEN53 : le mode doit être compris entre 0 et 15" -#: Engine/fgens.c:3207 +#: Engine/fgens.c:3227 msgid "GEN53: invalid source table length" msgstr "GEN53 : longueur de la table source non valide" -#: Engine/fgens.c:3212 +#: Engine/fgens.c:3232 msgid "GEN53: invalid window table" msgstr "GEN53 : table de fenêtre non valide" @@ -880,24 +880,24 @@ msgid "Instrument %d muted\n" msgstr "Instrument %d muet\n" -#: Engine/insert.c:144 Engine/insert.c:374 +#: Engine/insert.c:144 Engine/insert.c:376 #, c-format msgid "cannot allocate last note because it exceeds 100%% of cpu time" msgstr "" "impossible d'allouer la dernière note car elle dépasse 100%% du temps cpu" -#: Engine/insert.c:150 Engine/insert.c:380 +#: Engine/insert.c:150 Engine/insert.c:382 msgid "cannot allocate last note because it exceeds instr maxalloc" msgstr "" "impossible d'allouer la dernière note car le nombre maximum d'allocations " "d'instr est atteint" -#: Engine/insert.c:168 Engine/insert.c:400 +#: Engine/insert.c:168 #, c-format msgid "new alloc for instr %s:\n" msgstr "nouvelle allocation de l'instr %s :\n" -#: Engine/insert.c:170 Engine/insert.c:402 +#: Engine/insert.c:170 #, c-format msgid "new alloc for instr %d:\n" msgstr "nouvelle allocation de l'instr %d :\n" @@ -912,51 +912,61 @@ msgid "instr %d uses %d p-fields but is given %d" msgstr "l'instr %d utilise %d p-champs alors qu'il n'en a reçu que %d" -#: Engine/insert.c:345 Engine/insert.c:573 +#: Engine/insert.c:345 Engine/insert.c:575 #, c-format msgid "instr %s now active:\n" msgstr "instr %s activé : \n" -#: Engine/insert.c:347 Engine/insert.c:575 +#: Engine/insert.c:347 Engine/insert.c:577 #, c-format msgid "instr %d now active:\n" msgstr "instr %d activé : \n" -#: Engine/insert.c:389 -#, c-format -msgid "activating instr %s\n" +#: Engine/insert.c:391 +#, fuzzy, c-format +msgid "MIDI activating instr %s\n" msgstr "activation de l'instrument %s\n" -#: Engine/insert.c:391 -#, c-format -msgid "activating instr %d\n" +#: Engine/insert.c:393 +#, fuzzy, c-format +msgid "MIDI activating instr %d\n" msgstr "activation de l'instrument %d\n" -#: Engine/insert.c:416 +#: Engine/insert.c:402 +#, fuzzy, c-format +msgid "new MIDI alloc for instr %s:\n" +msgstr "nouvelle allocation de l'instr %s :\n" + +#: Engine/insert.c:404 +#, fuzzy, c-format +msgid "new MIDI alloc for instr %d:\n" +msgstr "nouvelle allocation de l'instr %d :\n" + +#: Engine/insert.c:418 #, c-format msgid "MIDI note overlaps with key %d on same channel" msgstr "la note MIDI chevauche la touche %d sur le même canal" -#: Engine/insert.c:683 +#: Engine/insert.c:685 #, c-format msgid "removed instance of instr %s\n" msgstr "une instance de l'instrument %s a été enlevée\n" -#: Engine/insert.c:685 +#: Engine/insert.c:687 #, c-format msgid "removed instance of instr %d\n" msgstr "une instance de l'instrument %d a été enlevée\n" -#: Engine/insert.c:843 +#: Engine/insert.c:851 msgid "inactive allocs returned to freespace\n" msgstr "les allocation inactives ont été rendues à l'espace libre\n" -#: Engine/insert.c:869 +#: Engine/insert.c:877 #, c-format msgid "could not find playing instr %f\n" msgstr "impossible de trouver l'instr actif %f\n" -#: Engine/insert.c:882 +#: Engine/insert.c:890 msgid "" "\n" "INIT ERROR: " @@ -964,68 +974,68 @@ "\n" "ERREUR D'INITIALISATION : " -#: Engine/insert.c:895 +#: Engine/insert.c:903 #, c-format msgid "INIT ERROR in instr %d (opcode %s): " msgstr "ERREUR D'INITIALISATION dans l'instr %d (opcode %s) : " -#: Engine/insert.c:898 +#: Engine/insert.c:906 #, c-format msgid "INIT ERROR in instr %d (subinstr %d): " msgstr "ERREUR D'INITIALISATION dans l'instr %d (subinstr %d) : " -#: Engine/insert.c:902 +#: Engine/insert.c:910 #, c-format msgid "INIT ERROR in instr %d: " msgstr "ERREUR D'INITIALISATION dans l'instr %d : " -#: Engine/insert.c:923 +#: Engine/insert.c:931 #, c-format msgid "PERF ERROR in instr %d (opcode %s): " msgstr "ERREUR D'EXECUTION dans l'instr %d (opcode %s) : " -#: Engine/insert.c:926 +#: Engine/insert.c:934 #, c-format msgid "PERF ERROR in instr %d (subinstr %d): " msgstr "ERREUR D'EXECUTION dans l'instr %d (subinstr %d) : " -#: Engine/insert.c:930 +#: Engine/insert.c:938 #, c-format msgid "PERF ERROR in instr %d: " msgstr "ERREUR D'EXECUTION dans l'instr %d :" -#: Engine/insert.c:935 +#: Engine/insert.c:943 msgid " note aborted\n" msgstr " note interrompue\n" -#: Engine/insert.c:954 +#: Engine/insert.c:962 msgid "subinstr: number of output args greater than nchnls" msgstr "subinstr : nombre d'arguments de sortie supérieur à nchnls" -#: Engine/insert.c:1022 +#: Engine/insert.c:1030 msgid "subinstr: too many p-fields" msgstr "subinstr : trop de p-champs" -#: Engine/insert.c:1127 +#: Engine/insert.c:1135 #, c-format msgid "%s: invalid local ksmps value: %d" msgstr "%s : valeur locale de ksmps non valide : %d" -#: Engine/insert.c:1259 OOps/bus.c:611 Opcodes/stackops.c:293 +#: Engine/insert.c:1278 OOps/bus.c:614 Opcodes/stackops.c:293 #, c-format msgid "%s: not initialised" msgstr "%s : non initialisé" -#: Engine/insert.c:1442 +#: Engine/insert.c:1458 #, c-format msgid "setksmps: invalid ksmps value: %d, original: %d" msgstr "setksmps : valeur de ksmps non valide : %d, valeur originale : %d" -#: Engine/insert.c:1564 +#: Engine/insert.c:1595 msgid "subinstr: not initialised" msgstr "subinstr : non initialisé" -#: Engine/insert.c:2005 +#: Engine/insert.c:2046 #, c-format msgid "" "instr %d allocated at %p\n" @@ -1034,29 +1044,29 @@ "instr %d alloué à %p\n" "\tlclbas %p, opds %p\n" -#: Engine/insert.c:2023 +#: Engine/insert.c:2064 #, c-format msgid "op (%s) allocated at %p\n" msgstr "op (%s) alloué à %p\n" -#: Engine/insert.c:2048 +#: Engine/insert.c:2089 msgid "null iopadr" msgstr "iopadr null" -#: Engine/insert.c:2059 +#: Engine/insert.c:2100 msgid "null opadr" msgstr "opadr null" -#: Engine/insert.c:2131 +#: Engine/insert.c:2182 msgid "inconsistent opds total" msgstr "total d'opds non cohérent" -#: Engine/insert.c:2192 +#: Engine/insert.c:2243 #, c-format msgid "Instrument %s is still active" msgstr "L'instrument %s est toujours actif" -#: Engine/insert.c:2195 +#: Engine/insert.c:2246 #, c-format msgid "Instrument %d is still active" msgstr "L'instrument %d est toujours actif" @@ -1080,40 +1090,40 @@ msgid "stdmode = %.8x Linefd = %d\n" msgstr "stdmode = %.8x Linefd = %d\n" -#: Engine/linevent.c:186 +#: Engine/linevent.c:184 msgid "LineBuffer Overflow - Input Data has been Lost" msgstr "Dépassement du Tampon de Ligne - Les données en entrée sont perdues" -#: Engine/linevent.c:239 +#: Engine/linevent.c:238 #, c-format msgid "unknown opcode %c" msgstr "opcode %c inconnu" -#: Engine/linevent.c:259 +#: Engine/linevent.c:258 msgid "unmatched quotes" msgstr "guillemets non appariés" -#: Engine/linevent.c:286 +#: Engine/linevent.c:285 msgid "dot carry has no reference" msgstr "le point de report de valeur (carry) n'a pas de référence" -#: Engine/linevent.c:291 +#: Engine/linevent.c:290 msgid "cannot carry string p-field" msgstr "impossible de reporter un p-champ chaîne de caractères" -#: Engine/linevent.c:302 +#: Engine/linevent.c:301 msgid "too few pfields" msgstr "pas assez de p-champs" -#: Engine/linevent.c:306 +#: Engine/linevent.c:305 msgid "-L with negative p2 illegal" msgstr "-L avec un p2 négatif est illégal" -#: Engine/linevent.c:317 +#: Engine/linevent.c:316 msgid "too many pfields" msgstr "trop de p-champs" -#: Engine/linevent.c:329 +#: Engine/linevent.c:328 #, c-format msgid "" "illegal RT scoreline:\n" @@ -1124,26 +1134,31 @@ "%s\n" "%*s" -#: Engine/linevent.c:351 +#: Engine/linevent.c:350 msgid "event: param 1 must be \"a\", \"i\", \"q\", \"f\", or \"e\"" msgstr "event : le paramètre 1 doit être \"a\", \"i\", \"q\", \"f\", ou \"e\"" -#: Engine/linevent.c:353 +#: Engine/linevent.c:352 msgid "event: string name is allowed only for \"i\" and \"q\" events" msgstr "" "event : un identifiant sous forme de chaîne n'est permis qu'avec les " "évènements \"i\" et \"q\"" -#: Engine/linevent.c:394 +#: Engine/linevent.c:395 #, c-format msgid "event: error creating '%c' event" msgstr "event : erreur en créant l'évènement '%c'" -#: Engine/linevent.c:457 +#: Engine/linevent.c:459 #, c-format msgid "event_i: error creating '%c' event" msgstr "event_i: erreur en créant l'évènement '%c'" +#: Engine/linevent.c:505 +#, fuzzy +msgid "instance: error creating event" +msgstr "event : erreur en créant l'évènement '%c'" + #: Engine/memalloc.c:58 #, c-format msgid "memory allocate failure for %lu" @@ -1212,7 +1227,7 @@ msgstr "erreur de lecture sur le fichier pvoc-ex %s après %d trames" #: Engine/memfiles.c:511 Opcodes/pvinterp.c:77 Opcodes/pvinterp.c:193 -#: Opcodes/pvinterp.c:383 Opcodes/ugens9.c:104 Opcodes/vpvoc.c:210 +#: Opcodes/pvinterp.c:383 Opcodes/ugens9.c:104 Opcodes/vpvoc.c:212 #, c-format msgid "%s's srate = %8.0f, orch's srate = %8.0f" msgstr "srate de %s = %8.0f, srate de l'orchestre = %8.0f" @@ -1248,22 +1263,22 @@ msgid "Beat mode not in force" msgstr "Le mode beat n'est pas en vigueur" -#: Engine/musmon.c:173 Top/csound.c:2854 +#: Engine/musmon.c:173 Top/csound.c:2859 #, c-format msgid "Csound version %s beta (double samples) %s\n" msgstr "Csound version %s beta (échantillons en format double) %s\n" -#: Engine/musmon.c:176 Top/csound.c:2857 +#: Engine/musmon.c:176 Top/csound.c:2862 #, c-format msgid "Csound version %s (double samples) %s\n" msgstr "Csound version %s (échantillons en format double) %s\n" -#: Engine/musmon.c:181 Top/csound.c:2846 +#: Engine/musmon.c:181 Top/csound.c:2851 #, c-format msgid "Csound version %s beta (float samples) %s\n" msgstr "Csound version %s beta (échantillons en format float) %s\n" -#: Engine/musmon.c:184 Top/csound.c:2849 +#: Engine/musmon.c:184 Top/csound.c:2854 #, c-format msgid "Csound version %s (float samples) %s\n" msgstr "Csound version %s (échantillons en format float) %s\n" @@ -1305,7 +1320,7 @@ msgid "sorting cscore.out ..\n" msgstr "tri de cscore.out ..\n" -#: Engine/musmon.c:340 Top/main.c:329 +#: Engine/musmon.c:340 Top/main.c:297 msgid "\t... done\n" msgstr "\t... fait\n" @@ -1313,8 +1328,8 @@ msgid "playing from cscore.srt\n" msgstr "exécution à partir de cscore.srt\n" -#: Engine/musmon.c:345 Engine/musmon.c:497 Engine/musmon.c:1119 -#: Engine/musmon.c:1329 +#: Engine/musmon.c:345 Engine/musmon.c:501 Engine/musmon.c:1124 +#: Engine/musmon.c:1335 #, c-format msgid "SECTION %d:\n" msgstr "SECTION %d :\n" @@ -1324,11 +1339,11 @@ msgid "%c\tbeep!\n" msgstr "%c\tsignal sonore !\n" -#: Engine/musmon.c:450 +#: Engine/musmon.c:454 msgid "end of score.\t\t overall amps:" msgstr "fin de la partition.\t\t amplitudes maximales :" -#: Engine/musmon.c:461 +#: Engine/musmon.c:465 msgid "" "\n" "\t overall samples out of range:" @@ -1336,7 +1351,7 @@ "\n" "\t Nombre d'échantillons hors limites :" -#: Engine/musmon.c:465 +#: Engine/musmon.c:469 #, c-format msgid "" "\n" @@ -1345,108 +1360,108 @@ "\n" "%d erreurs dans l'exécution\n" -#: Engine/musmon.c:467 +#: Engine/musmon.c:471 msgid "end of performance" msgstr "fin de l'exécution" -#: Engine/musmon.c:480 +#: Engine/musmon.c:484 msgid "no sound written to disk\n" msgstr "aucun son n'a été écrit sur le disque\n" -#: Engine/musmon.c:572 Engine/musmon.c:618 +#: Engine/musmon.c:577 Engine/musmon.c:623 msgid "\t number of samples out of range:" msgstr "\t nombre d'échantillons hors limites :" -#: Engine/musmon.c:611 +#: Engine/musmon.c:616 #, c-format msgid "end of section %d\t sect peak amps:" msgstr "fin de la section %d\tamplitudes maximales de la section :" -#: Engine/musmon.c:613 +#: Engine/musmon.c:618 msgid "end of lplay event list\t peak amps:" msgstr "fin de la liste d'évènements lplay\t amplitudes maximales :" -#: Engine/musmon.c:678 Engine/musmon.c:705 +#: Engine/musmon.c:683 Engine/musmon.c:710 #, c-format msgid " - note deleted. instr %s undefined" msgstr " - note affacée. instr %s non défini" -#: Engine/musmon.c:682 +#: Engine/musmon.c:687 #, c-format msgid "Setting instrument %s %s\n" msgstr "Lancement de l'instrument %s %s\n" -#: Engine/musmon.c:683 Engine/musmon.c:697 +#: Engine/musmon.c:688 Engine/musmon.c:702 msgid "off" msgstr "arrêt" -#: Engine/musmon.c:683 Engine/musmon.c:697 +#: Engine/musmon.c:688 Engine/musmon.c:702 msgid "on" msgstr "marche" -#: Engine/musmon.c:692 Engine/musmon.c:734 +#: Engine/musmon.c:697 Engine/musmon.c:739 #, c-format msgid " - note deleted. instr %d(%d) undefined" msgstr " - note affacée. instr %d(%d) non défini" -#: Engine/musmon.c:696 +#: Engine/musmon.c:701 #, c-format msgid "Setting instrument %d %s\n" msgstr "Lancement de l'instrument %d %s\n" -#: Engine/musmon.c:724 +#: Engine/musmon.c:729 #, c-format msgid " - note deleted. i%d (%s) had %d init errors" msgstr " - note affacée. i%d (%s) a eu %d erreurs d'initialisation" -#: Engine/musmon.c:755 +#: Engine/musmon.c:760 #, c-format msgid " - note deleted. i%d had %d init errors" msgstr " - note affacée. i%d a eu %d erreurs d'initialisation" -#: Engine/musmon.c:776 +#: Engine/musmon.c:781 #, c-format msgid "time advanced %5.3f beats by score request\n" msgstr "le temps a avancé de %5.3f pulsations à la demande de la partition\n" -#: Engine/musmon.c:794 +#: Engine/musmon.c:799 #, c-format msgid "\t\t T%7.3f - note deleted. " msgstr "\t\t T%7.3f - note affacée. " -#: Engine/musmon.c:798 +#: Engine/musmon.c:803 #, c-format msgid "instr %s had %d init errors\n" msgstr "l'instr %s a eu %d erreurs d'initialisation\n" -#: Engine/musmon.c:801 +#: Engine/musmon.c:806 #, c-format msgid "instr %d had %d init errors\n" msgstr "l'instr %d a eu %d erreurs d'initialisation\n" -#: Engine/musmon.c:893 +#: Engine/musmon.c:898 msgid "terminating.\n" msgstr "terminaison.\n" -#: Engine/musmon.c:980 +#: Engine/musmon.c:985 #, c-format msgid "error in score. illegal opcode %c (ASCII %d)\n" msgstr "erreur dans la partition. L'opcode %c (ASCII %d) est illégal\n" -#: Engine/musmon.c:1241 +#: Engine/musmon.c:1247 msgid "insert_score_event(): invalid instrument number or name\n" msgstr "insert_score_event() : numéro ou nom d'instrument non valide\n" -#: Engine/musmon.c:1261 +#: Engine/musmon.c:1267 #, c-format msgid "insert_score_event(): unknown opcode: %c\n" msgstr "insert_score_event() : opcode inconnu : %c\n" -#: Engine/musmon.c:1284 +#: Engine/musmon.c:1290 msgid "insert_score_event(): insufficient p-fields\n" msgstr "insert_score_event() : pas assez de p-champs\n" -#: Engine/musmon.c:1338 +#: Engine/musmon.c:1344 msgid "cannot rewind score: no score in memory \n" msgstr "impossible de reprendre la partition : pas de partition en mémoire\n" @@ -1464,29 +1479,29 @@ msgid "cannot find the specified instrument or opcode" msgstr "impossible de trouver l'instrument ou l'opcode spécifié" -#: Engine/new_orc_parser.c:92 Top/main.c:264 +#: Engine/new_orc_parser.c:144 #, c-format msgid "Failed to open input file %s\n" msgstr "L'ouverture du fichier de sortie %s a échoué\n" -#: Engine/new_orc_parser.c:122 +#: Engine/new_orc_parser.c:177 msgid "Unmatched #ifdef\n" msgstr "#ifdef non apparié\n" -#: Engine/new_orc_parser.c:156 +#: Engine/new_orc_parser.c:212 msgid "Parsing failed due to invalid input!\n" msgstr "Echec de l'analyse à cause d'une entrée non valide !\n" -#: Engine/new_orc_parser.c:160 +#: Engine/new_orc_parser.c:216 msgid "Parsing failed due to memory exhaustion!\n" msgstr "Echec de l'analyse par manque de méloire !\n" -#: Engine/new_orc_parser.c:163 +#: Engine/new_orc_parser.c:219 #, c-format msgid "Parsing failed due to %d syntax error%s!\n" msgstr "Echec de l'analyse, %d erreur de syntaxe %s !\n" -#: Engine/new_orc_parser.c:208 +#: Engine/new_orc_parser.c:264 msgid "Stopping on parser failure\n" msgstr "Arrêt sur échec du parseur\n" @@ -1503,7 +1518,7 @@ "\n" "\tle reste de la ligne a été ignoré\n" -#: Engine/rdscor.c:159 +#: Engine/rdscor.c:160 msgid "ERROR: too many pfields: " msgstr "ERREUR : trop de p-champs" @@ -1730,8 +1745,8 @@ msgid "! invalid in p1, p2, or p3" msgstr "! non valide dans p1, p2 ou p3" -#: Engine/sread.c:1266 Engine/sread.c:1271 Engine/sread.c:1749 -#: Engine/sread.c:1772 Engine/sread.c:1786 +#: Engine/sread.c:1266 Engine/sread.c:1271 Engine/sread.c:1754 +#: Engine/sread.c:1777 Engine/sread.c:1791 msgid " remainder of line flushed\n" msgstr " le reste de la ligne a été ignoré\n" @@ -1779,47 +1794,47 @@ msgid "Not #include" msgstr "Pas #include" -#: Engine/sread.c:1674 +#: Engine/sread.c:1679 #, c-format msgid "Cannot open #include'd file %s" msgstr "Impossible d'ouvrir le fichier inclus (#include) %s" -#: Engine/sread.c:1684 +#: Engine/sread.c:1689 msgid "Not #undef" msgstr "Pas #undef" -#: Engine/sread.c:1705 +#: Engine/sread.c:1710 #, c-format msgid "macro %s undefined\n" msgstr "la macro %s n'est pas définie\n" -#: Engine/sread.c:1711 +#: Engine/sread.c:1716 msgid "unknown # option" msgstr "option # inconnue" -#: Engine/sread.c:1748 +#: Engine/sread.c:1753 #, c-format msgid "illegal opcode %c" msgstr "opcode %c illégal" -#: Engine/sread.c:1771 +#: Engine/sread.c:1776 #, c-format msgid "unexpected char %c" msgstr "caractère %c inattendu" -#: Engine/sread.c:1785 +#: Engine/sread.c:1790 msgid "illegally placed string" msgstr "sread : chaîne placée illégalement" -#: Engine/sread.c:1792 +#: Engine/sread.c:1797 msgid "unmatched quote" msgstr "guillemet non apparié" -#: Engine/sread.c:1836 +#: Engine/sread.c:1841 msgid "sread: illegal number format: " msgstr "sread : format de nombre illégal :" -#: Engine/sread.c:1842 +#: Engine/sread.c:1847 msgid " zero substituted.\n" msgstr " remplacé par zéro.\n" @@ -2458,56 +2473,56 @@ msgid "unrecognised message type %d" msgstr "type de message %d non reconnu" -#: InOut/midirecv.c:400 +#: InOut/midirecv.c:402 #, c-format msgid "midi channel %d using instr %d\n" msgstr "le canal midi %d utilise l'instr %d\n" -#: InOut/midirecv.c:403 +#: InOut/midirecv.c:405 #, c-format msgid "midi channel %d is muted\n" msgstr "le canal midi %d est muet\n" -#: InOut/midirecv.c:421 +#: InOut/midirecv.c:423 #, c-format msgid "MIDI channel %d muted\n" msgstr "le canal MIDI %d est muet\n" -#: InOut/midirecv.c:426 +#: InOut/midirecv.c:428 #, c-format msgid "Insno = %d\n" msgstr "Insno = %d\n" -#: InOut/midirecv.c:427 +#: InOut/midirecv.c:429 msgid "unknown instr" msgstr "instr inconnu" -#: InOut/midirecv.c:430 +#: InOut/midirecv.c:432 #, c-format msgid "chnl %d using instr %d\n" msgstr "chnl %d utilisant l'instr %d\n" -#: InOut/midirecv.c:490 +#: InOut/midirecv.c:492 #, c-format msgid " *** error reading MIDI device: %d (%s)" msgstr " *** erreur de lecture MIDI sur le périphérique : %d (%s)" -#: InOut/midirecv.c:519 +#: InOut/midirecv.c:521 #, c-format msgid "undefined sys-realtime msg %x\n" msgstr "msg sys temps réel %x non défini\n" -#: InOut/midirecv.c:537 +#: InOut/midirecv.c:539 #, c-format msgid "undefined sys_common msg %x\n" msgstr "msg sys_common %x non défini\n" -#: InOut/midirecv.c:599 +#: InOut/midirecv.c:601 #, c-format msgid "Error closing MIDI in device: %d (%s)" msgstr "Erreur en fermant le périphérique d'entrée MIDI : %d (%s)" -#: InOut/midirecv.c:606 +#: InOut/midirecv.c:608 #, c-format msgid "Error closing MIDI out device: %d (%s)" msgstr "Erreur en fermant le périphérique de sortie MIDI : %d (%s)" @@ -2692,8 +2707,7 @@ #: InOut/rtalsa.c:383 msgid "Unable to set requested sample format on soundcard" -msgstr "" -"Impossible de fixer le format d'échantillon demandé sur la carte son" +msgstr "Impossible de fixer le format d'échantillon demandé sur la carte son" #: InOut/rtalsa.c:389 msgid "Unable to set number of channels on soundcard" @@ -3791,78 +3805,78 @@ msgid "non-looping sample" msgstr "son échantillonné sans boucle" -#: OOps/aops.c:1041 OOps/aops.c:1069 +#: OOps/aops.c:1037 OOps/aops.c:1065 #, c-format msgid "No tuning table %d" msgstr "Pas de table d'accordage %d" -#: OOps/aops.c:1114 OOps/aops.c:1152 +#: OOps/aops.c:1110 OOps/aops.c:1148 msgid "cpstun: invalid table" msgstr "cpstun : table non valide" -#: OOps/aops.c:1544 OOps/aops.c:1580 +#: OOps/aops.c:1540 OOps/aops.c:1576 #, c-format msgid "Input channel %d too large; ignored" msgstr "Canal d'entrée %d trop grand ; ignoré" -#: OOps/aops.c:1576 +#: OOps/aops.c:1572 msgid "Input and output argument count differs in inch" msgstr "Les nombres d'arguments d'entrée et de sortie différent dans inch" -#: OOps/aops.c:2014 +#: OOps/aops.c:2010 msgid "Unknown function called" msgstr "Appel de fonction inconnue" -#: OOps/aops.c:2050 +#: OOps/aops.c:2046 msgid "number of arguments != nchnls" msgstr "nombre d'arguments != nchnls" -#: OOps/aops.c:2080 +#: OOps/aops.c:2076 msgid "outrg: channel number cannot be < 1 (1 is the first channel)" msgstr "" "outrg : le numéro de canal ne peut pas être < 1 (1 est le premier canal)" -#: OOps/bus.c:80 OOps/bus.c:102 OOps/bus.c:127 OOps/bus.c:155 +#: OOps/bus.c:83 OOps/bus.c:105 OOps/bus.c:130 OOps/bus.c:158 msgid "chani: invalid index" msgstr "chani : index non valide" -#: OOps/bus.c:88 OOps/bus.c:134 +#: OOps/bus.c:91 OOps/bus.c:137 #, c-format msgid "chani error %d:channel not found or not right type" msgstr "chani erreur %d : canal introuvable ou type non conforme" -#: OOps/bus.c:110 OOps/bus.c:162 +#: OOps/bus.c:113 OOps/bus.c:165 #, c-format msgid "chano error %d:channel not found or not right type" msgstr "chano erreur %d : canal introuvable ou type non conforme" -#: OOps/bus.c:216 +#: OOps/bus.c:219 msgid "pvsin: invalid index" msgstr "pvsin : index non valide" -#: OOps/bus.c:224 +#: OOps/bus.c:227 #, c-format msgid "pvsin error %d:channel not found or not right type" msgstr "pvsin erreur %d : canal introuvable ou type non conforme" -#: OOps/bus.c:279 +#: OOps/bus.c:282 msgid "pvsout: invalid index" msgstr "pvsout : index non valide" -#: OOps/bus.c:287 +#: OOps/bus.c:290 #, c-format msgid "pvsout error %d:channel not found or not right type" msgstr "pvsout erreur %d : canal intouvable ou type non conforme" -#: OOps/bus.c:1026 OOps/bus.c:1075 OOps/bus.c:1096 OOps/bus.c:1143 +#: OOps/bus.c:1029 OOps/bus.c:1078 OOps/bus.c:1099 OOps/bus.c:1146 msgid "invalid mode parameter" msgstr "paramètre de mode non valide" -#: OOps/bus.c:1063 OOps/bus.c:1187 +#: OOps/bus.c:1066 OOps/bus.c:1187 msgid "invalid channel parameters" msgstr "paramètres de canal non valides" -#: OOps/bus.c:1151 +#: OOps/bus.c:1154 msgid "channel already exists" msgstr "le canal existe déjà" @@ -3910,11 +3924,11 @@ msgid "diskin2: invalid number of channels" msgstr "diskin2 : nombre de canaux non valide" -#: OOps/diskin2.c:289 OOps/diskin2.c:1741 +#: OOps/diskin2.c:289 OOps/diskin2.c:1745 msgid "diskin2: unknown sample format" msgstr "diskin2 : format d'échantillon inconnu" -#: OOps/diskin2.c:304 OOps/diskin2.c:1756 +#: OOps/diskin2.c:304 OOps/diskin2.c:1760 #, c-format msgid "diskin2: %s: failed to open file" msgstr "diskin2 : %s: l'ouverture du fichier a échoué" @@ -3926,14 +3940,14 @@ "diskin2 : le nombre d'arguments en sortie est en contradiction avec le " "nombre de canaux du fichier" -#: OOps/diskin2.c:346 OOps/diskin2.c:1813 +#: OOps/diskin2.c:346 OOps/diskin2.c:1817 #, c-format msgid "diskin2: warning: file sample rate (%d) != orchestra sr (%d)\n" msgstr "" "diskin2 : avertissement: taux d'échantillonnage (%d) du fichier != sr (%d) " "de l'orchestre\n" -#: OOps/diskin2.c:427 OOps/diskin2.c:1894 +#: OOps/diskin2.c:427 OOps/diskin2.c:1905 #, c-format msgid "" "diskin2: opened (asynchronously) '%s':\n" @@ -3942,7 +3956,7 @@ "diskin2 : '%s' ouvert (asynchrone) :\n" " %d Hz, %d voix, %ld trames d'échantillons\n" -#: OOps/diskin2.c:441 OOps/diskin2.c:1908 +#: OOps/diskin2.c:441 OOps/diskin2.c:1919 #, c-format msgid "" "diskin2: opened '%s':\n" @@ -3952,12 +3966,12 @@ " %d Hz, %d voix, %ld trames d'échantillons\n" #: OOps/diskin2.c:520 OOps/diskin2.c:706 OOps/diskin2.c:902 -#: OOps/diskin2.c:1526 OOps/diskin2.c:1940 OOps/diskin2.c:2133 +#: OOps/diskin2.c:1529 OOps/diskin2.c:1951 OOps/diskin2.c:2144 msgid "diskin2: not initialised" msgstr "diskin2 : non initialisé" -#: OOps/diskin2.c:686 OOps/diskin2.c:877 OOps/diskin2.c:1697 -#: OOps/diskin2.c:2106 +#: OOps/diskin2.c:686 OOps/diskin2.c:877 OOps/diskin2.c:1700 +#: OOps/diskin2.c:2117 msgid "diskin2: file descriptor closed or invalid\n" msgstr "diskin2 : descripteur de fichier fermé ou non valide\n" @@ -4027,7 +4041,7 @@ msgid "soundouts: not initialised" msgstr "soundouts : non initialisé" -#: OOps/diskin2.c:1782 +#: OOps/diskin2.c:1786 msgid "diskin2: output array too small" msgstr "diskin2 : tableau de sortie trop petit" @@ -4891,12 +4905,12 @@ msgid "channel already specific remote" msgstr "canal déjà distant spécifique" -#: OOps/remote.c:589 OOps/remote.c:614 OOps/remote.c:639 +#: OOps/remote.c:590 OOps/remote.c:615 OOps/remote.c:640 msgid "CLsend failed" msgstr "CLsend a échoué" -#: OOps/remote.c:706 OOps/remote.c:714 OOps/remote.c:722 OOps/remote.c:730 -#: OOps/remote.c:738 +#: OOps/remote.c:707 OOps/remote.c:715 OOps/remote.c:723 OOps/remote.c:731 +#: OOps/remote.c:739 msgid "" "*** This version of Csound was not compiled with remote event support ***\n" msgstr "" @@ -4913,11 +4927,11 @@ msgid "schedkwhen ignored. Instrument %d undefined\n" msgstr "schedkwhen ignoré. L'instrument %d n'est pas défini\n" -#: OOps/schedule.c:429 +#: OOps/schedule.c:430 msgid "schedkwhen warning: negative kwhen reset to zero" msgstr "schedkwhen avertissement : kwhen négatif ramené à zéro" -#: OOps/schedule.c:454 OOps/schedule.c:477 +#: OOps/schedule.c:455 OOps/schedule.c:478 msgid "trigseq: incorrect table number" msgstr "trigseq : numéro de table incorrect" @@ -4946,25 +4960,25 @@ msgid "filepeak: error getting peak value" msgstr "filepeak: erreur lors de l'obtention de la valeur de pic" -#: OOps/str_ops.c:60 +#: OOps/str_ops.c:64 msgid "illegal strset index" msgstr "index de strset illégal" -#: OOps/str_ops.c:68 +#: OOps/str_ops.c:72 #, c-format msgid "strset index conflict at %d" msgstr "index de strset en conflit à %d" -#: OOps/str_ops.c:69 +#: OOps/str_ops.c:73 #, c-format msgid "previous value: '%s', replaced with '%s'" msgstr "valeur précédente : '%s', remplacée par '%s'" -#: OOps/str_ops.c:93 OOps/str_ops.c:100 +#: OOps/str_ops.c:97 OOps/str_ops.c:104 msgid "--strset: invalid format" msgstr "--strset : format non valide" -#: OOps/str_ops.c:921 +#: OOps/str_ops.c:925 #, c-format msgid "invalid option code: %g" msgstr "code d'option non valide : %g" @@ -5111,27 +5125,27 @@ msgid "osciln: not initialised" msgstr "osciln : non initialisé" -#: OOps/ugens2.c:1168 +#: OOps/ugens2.c:1210 msgid "oscil(krate): not initialised" msgstr "oscil(taux-k) : non initialisé" -#: OOps/ugens2.c:1203 OOps/ugens2.c:1239 OOps/ugens2.c:1272 OOps/ugens2.c:1307 +#: OOps/ugens2.c:1245 OOps/ugens2.c:1281 OOps/ugens2.c:1314 OOps/ugens2.c:1349 msgid "oscil: not initialised" msgstr "oscil : non initialisé" -#: OOps/ugens2.c:1330 +#: OOps/ugens2.c:1372 msgid "oscili(krate): not initialised" msgstr "oscili(taux-k) : non initialisé" -#: OOps/ugens2.c:1365 OOps/ugens2.c:1405 OOps/ugens2.c:1441 OOps/ugens2.c:1480 +#: OOps/ugens2.c:1407 OOps/ugens2.c:1447 OOps/ugens2.c:1483 OOps/ugens2.c:1522 msgid "oscili: not initialised" msgstr "oscili : non initialisé" -#: OOps/ugens2.c:1521 +#: OOps/ugens2.c:1563 msgid "oscil3(krate): not initialised" msgstr "oscil3(taux-k) : non initialisé" -#: OOps/ugens2.c:1580 OOps/ugens2.c:1636 OOps/ugens2.c:1689 OOps/ugens2.c:1744 +#: OOps/ugens2.c:1622 OOps/ugens2.c:1678 OOps/ugens2.c:1731 OOps/ugens2.c:1786 msgid "oscil3: not initialised" msgstr "oscil3 : non initialisé" @@ -5255,121 +5269,125 @@ msgid "pluck: kcps more than sample rate" msgstr "pluck : kcps supérieur au taux d'échantillonnage" -#: OOps/ugens4.c:472 OOps/ugens4.c:580 OOps/ugens4.c:685 +#: OOps/ugens4.c:472 OOps/ugens4.c:580 OOps/ugens4.c:686 #, c-format msgid "Seeding from current time %lu\n" msgstr "Graine à partir de l'horloge %lu\n" -#: OOps/ugens5.c:287 OOps/ugens5.c:396 Opcodes/gab/gab.c:48 Opcodes/ugsc.c:209 +#: OOps/ugens5.c:287 OOps/ugens5.c:400 Opcodes/gab/gab.c:50 Opcodes/ugsc.c:211 #, c-format msgid "illegal reson iscl value, %f" msgstr "valeur illégale de iscl dans reson, %f" -#: OOps/ugens5.c:616 +#: OOps/ugens5.c:623 #, c-format msgid "LPREAD cannot load %s" msgstr "LPREAD ne peut pas charger %s" -#: OOps/ugens5.c:627 +#: OOps/ugens5.c:634 #, c-format msgid "Using %s type of file.\n" msgstr "Utilisation du type de fichier %s.\n" -#: OOps/ugens5.c:628 +#: OOps/ugens5.c:635 msgid "pole" msgstr "pôle" -#: OOps/ugens5.c:628 +#: OOps/ugens5.c:635 msgid "filter coefficient" msgstr "coefficient du filtre" -#: OOps/ugens5.c:633 +#: OOps/ugens5.c:640 msgid "lpheader overriding inputs" msgstr "l'en-tête du fichier prend le pas sur les paramètres" -#: OOps/ugens5.c:637 +#: OOps/ugens5.c:644 msgid "lpfile srate != orch sr" msgstr "taux d'échantillonnage du fichier != sr de l'orch" -#: OOps/ugens5.c:645 +#: OOps/ugens5.c:652 #, c-format msgid "file %s bytes are in wrong order" msgstr "dans le fichier %s les octets ne sont pas dans le bon ordre" -#: OOps/ugens5.c:655 +#: OOps/ugens5.c:662 msgid "insufficient args and no file header" msgstr "nombre d'arguments insuffisant et pas d'en-tête de fichier" -#: OOps/ugens5.c:660 +#: OOps/ugens5.c:667 msgid "npoles > MAXPOLES" msgstr "npoles > MAXPOLES" -#: OOps/ugens5.c:668 +#: OOps/ugens5.c:675 #, c-format msgid "npoles %ld, nvals %ld, totvals %ld, lastfram16 = %lx\n" msgstr "npoles %ld, nvals %ld, totvals %ld, lastfram16 = %lx\n" -#: OOps/ugens5.c:692 util/lpanal.c:324 +#: OOps/ugens5.c:700 util/lpanal.c:324 #, c-format msgid "magnitude: %f Phase: %f\n" msgstr "magnitude : %f Phase : %f\n" -#: OOps/ugens5.c:695 util/lpanal.c:327 +#: OOps/ugens5.c:703 util/lpanal.c:327 #, c-format msgid "Real: %f Imag: %f\n" msgstr "Partie réelle : %f Partie imaginaire : %f\n" -#: OOps/ugens5.c:863 +#: OOps/ugens5.c:758 +msgid "Cannot handle uneven pole count yet \n" +msgstr "" + +#: OOps/ugens5.c:871 msgid "lpread: not initialised" msgstr "lpread : non initialisé" -#: OOps/ugens5.c:869 +#: OOps/ugens5.c:877 msgid "lpread timpnt < 0" msgstr "lpread : timpnt < 0" -#: OOps/ugens5.c:875 +#: OOps/ugens5.c:883 msgid "lpread ktimpnt truncated to last frame" msgstr "lpread : ktimpnt tronqué à la dernière trame" -#: OOps/ugens5.c:906 OOps/ugens5.c:1409 +#: OOps/ugens5.c:914 OOps/ugens5.c:1417 msgid "Interpolation failed" msgstr "L'interpolation a échoué" -#: OOps/ugens5.c:964 +#: OOps/ugens5.c:972 msgid "this opcode only works with LPC pole analysis type (-a)\n" msgstr "" "cet opcode ne fonctionne qu'avec le type d'analyse de pôle par CPL (-a)\n" -#: OOps/ugens5.c:1098 +#: OOps/ugens5.c:1106 msgid "Pole file not supported for this opcode !" msgstr "Fichier de pôles non supporté par cet opcode !" -#: OOps/ugens5.c:1125 +#: OOps/ugens5.c:1133 #, c-format msgid "illegal frqratio, %5.2f" msgstr "frqratio illégal, %5.2f" -#: OOps/ugens5.c:1335 +#: OOps/ugens5.c:1343 msgid "lpslot number should be positive" msgstr "le numéro de lpslot doit être positif" -#: OOps/ugens5.c:1355 +#: OOps/ugens5.c:1363 msgid "LPC slot is not allocated" msgstr "le slot LPC n'est pas alloué" -#: OOps/ugens5.c:1363 +#: OOps/ugens5.c:1371 msgid "lpinterpol works only with poles files.." msgstr "lpinterpol ne travaille qu'avec des fichiers de pôles.." -#: OOps/ugens5.c:1367 +#: OOps/ugens5.c:1375 msgid "The poles files have different pole count" msgstr "Les fichiers de pôles ont un nombre de pôles différent" -#: OOps/ugens5.c:1373 +#: OOps/ugens5.c:1381 msgid "padding error" msgstr "erreur de padding" -#: OOps/ugens5.c:1393 +#: OOps/ugens5.c:1401 msgid "lpinterpol: not initialised" msgstr "lpinterpol : non initialisé" @@ -5407,48 +5425,53 @@ msgid "delayw: not initialised" msgstr "delayw : non initialisé" -#: OOps/ugens6.c:475 OOps/ugens6.c:774 OOps/ugens6.c:859 +#: OOps/ugens6.c:475 OOps/ugens6.c:785 OOps/ugens6.c:870 msgid "deltap: not initialised" msgstr "deltap : non initialisé" -#: OOps/ugens6.c:530 +#: OOps/ugens6.c:532 msgid "deltapi: not initialised" msgstr "deltapi : non initialisé" -#: OOps/ugens6.c:583 +#: OOps/ugens6.c:535 OOps/ugens6.c:677 +#, fuzzy +msgid "deltapi: INF delaytime" +msgstr "durée de délai illégale" + +#: OOps/ugens6.c:588 msgid "deltapn: not initialised" msgstr "deltapn : non initialisé" -#: OOps/ugens6.c:667 +#: OOps/ugens6.c:674 msgid "deltap3: not initialised" msgstr "deltap3 : non initialisé" -#: OOps/ugens6.c:896 OOps/ugens6.c:900 Opcodes/ugmoss.c:483 +#: OOps/ugens6.c:907 OOps/ugens6.c:911 Opcodes/ugmoss.c:483 #: Opcodes/ugmoss.c:487 msgid "illegal loop time" msgstr "durée de boucle illégale" -#: OOps/ugens6.c:963 +#: OOps/ugens6.c:974 msgid "comb: not initialised" msgstr "comb : non initialisé" -#: OOps/ugens6.c:1002 +#: OOps/ugens6.c:1013 msgid "combinv: not initialised" msgstr "combinv : non initialisé" -#: OOps/ugens6.c:1039 +#: OOps/ugens6.c:1050 msgid "alpass: not initialised" msgstr "alpass : non initialisé" -#: OOps/ugens6.c:1072 +#: OOps/ugens6.c:1083 msgid "revlpsiz inconsistent\n" msgstr "revlpsiz incohérent\n" -#: OOps/ugens6.c:1163 +#: OOps/ugens6.c:1174 msgid "reverb: not intialised" msgstr "reverb : non initialisé" -#: OOps/ugens6.c:1237 +#: OOps/ugens6.c:1248 msgid "pan: not initialised" msgstr "pan : non initialisé" @@ -5611,10 +5634,10 @@ msgstr "La valeur iscl de resonk est illégale, %f" #: OOps/ugtabs.c:38 OOps/ugtabs.c:74 OOps/ugtabs.c:154 OOps/ugtabs.c:266 -#: OOps/ugtabs.c:428 OOps/ugtabs.c:445 OOps/ugtabs.c:461 OOps/ugtabs.c:477 -#: OOps/ugtabs.c:493 OOps/ugtabs.c:508 OOps/ugtabs.c:528 OOps/ugtabs.c:615 -#: OOps/ugtabs.c:632 OOps/ugtabs.c:646 OOps/ugtabs.c:659 OOps/ugtabs.c:695 -#: OOps/ugtabs.c:702 OOps/ugtabs.c:709 OOps/ugtabs.c:793 OOps/ugtabs.c:839 +#: OOps/ugtabs.c:428 OOps/ugtabs.c:445 OOps/ugtabs.c:461 OOps/ugtabs.c:478 +#: OOps/ugtabs.c:493 OOps/ugtabs.c:508 OOps/ugtabs.c:528 OOps/ugtabs.c:616 +#: OOps/ugtabs.c:633 OOps/ugtabs.c:647 OOps/ugtabs.c:660 OOps/ugtabs.c:696 +#: OOps/ugtabs.c:703 OOps/ugtabs.c:710 OOps/ugtabs.c:794 OOps/ugtabs.c:840 #, c-format msgid "table: could not find ftable %d" msgstr "table : ftable %d introuvable" @@ -5627,12 +5650,12 @@ msgid "tablekt: index type inconsistent with output" msgstr "tablekt : type de l'indice en contradiction avec la sortie" -#: OOps/ugtabs.c:673 +#: OOps/ugtabs.c:674 #, c-format msgid "table: could not find ftables %d and/or %d" msgstr "table : ftables %d et/ou %d introuvables" -#: OOps/ugtabs.c:802 OOps/ugtabs.c:848 +#: OOps/ugtabs.c:803 OOps/ugtabs.c:849 #, c-format msgid "table: could not read negative pos %d" msgstr "table : impossible de lire à la position négative %d" @@ -6038,19 +6061,19 @@ msgid "crossfm: ftable not found" msgstr "crossfm : table non trouvée" -#: Opcodes/date.c:96 +#: Opcodes/date.c:97 msgid "cannot determine current directory" msgstr "impossible de déterminer le répertoire courant" -#: Opcodes/date.c:133 +#: Opcodes/date.c:134 msgid "readf: failed to open file" msgstr "readf : l'ouverture du fichier a échoué" -#: Opcodes/date.c:159 +#: Opcodes/date.c:161 msgid "readf: read failure" msgstr "readf : la lecture a échoué" -#: Opcodes/date.c:169 Opcodes/date.c:177 +#: Opcodes/date.c:171 Opcodes/date.c:179 msgid "readi failed to initialise" msgstr "readi, l'initialisation a échoué" @@ -6324,12 +6347,12 @@ msgid "ftconv: not initialised" msgstr "ftconv : non initialisé" -#: Opcodes/ftgen.c:69 Opcodes/ftgen.c:212 +#: Opcodes/ftgen.c:69 Opcodes/ftgen.c:213 #, c-format msgid "Error deleting ftable %d" msgstr "Erreur en supprimant la ftable %d" -#: Opcodes/ftgen.c:137 Opcodes/signalflowgraph.cpp:1175 +#: Opcodes/ftgen.c:137 Opcodes/signalflowgraph.cpp:1383 msgid "ftgen string arg not allowed" msgstr "ftgen : argument chaîne interdit" @@ -6337,110 +6360,110 @@ msgid "ftgen error" msgstr "erreur de ftgen" -#: Opcodes/ftgen.c:209 +#: Opcodes/ftgen.c:210 #, c-format msgid "Invalid table number: %d" msgstr "Numéro de table non valide : %d" -#: Opcodes/ftgen.c:392 +#: Opcodes/ftgen.c:393 msgid "ftload: error allocating ftable" msgstr "ftload : erreur d'allocation de la ftable" -#: Opcodes/ftgen.c:394 +#: Opcodes/ftgen.c:395 msgid "ftload: no table numbers" msgstr "ftload : pas de numéro de table" -#: Opcodes/ftgen.c:396 +#: Opcodes/ftgen.c:397 msgid "ftload: unable to open file" msgstr "ftload : impossible d'ouvrir le fichier" -#: Opcodes/ftgen.c:399 +#: Opcodes/ftgen.c:400 msgid "ftload: incorrect file" msgstr "ftload : fichier incorrect" -#: Opcodes/ftgen.c:539 +#: Opcodes/ftgen.c:540 msgid "ftsave: Bad table number. Saving is possible only for existing tables." msgstr "" "ftsave : mauvais numéro de table. La sauvegarde n'est possible que pour des " "tables existantes." -#: Opcodes/ftgen.c:542 +#: Opcodes/ftgen.c:543 msgid "ftsave: no table numbers" msgstr "ftsave : pas de numéros de table" -#: Opcodes/ftgen.c:544 +#: Opcodes/ftgen.c:545 msgid "ftsave: unable to open file" msgstr "ftsave : impossible d'ouvrir le fichier" -#: Opcodes/ftgen.c:546 +#: Opcodes/ftgen.c:547 msgid "ftsave: failed to write file" msgstr "ftsave : impossible d'ouvrir le fichier" -#: Opcodes/gab/gab.c:112 +#: Opcodes/gab/gab.c:114 msgid "fastab: incorrect table number" msgstr "fastab : numéro de table incorrect" -#: Opcodes/gab/gab.c:139 Opcodes/gab/gab.c:148 Opcodes/gab/gab.c:178 +#: Opcodes/gab/gab.c:141 Opcodes/gab/gab.c:150 Opcodes/gab/gab.c:180 msgid "tabw off end" msgstr "tabw hors-limite" -#: Opcodes/gab/gab.c:164 Opcodes/gab/gab.c:241 Opcodes/gab/gab.c:250 +#: Opcodes/gab/gab.c:166 Opcodes/gab/gab.c:243 Opcodes/gab/gab.c:252 msgid "tab off end" msgstr "tab hors-limite" -#: Opcodes/gab/gab.c:190 +#: Opcodes/gab/gab.c:192 msgid "tab_i: incorrect table number" msgstr "tab_i : numéro de table incorrect" -#: Opcodes/gab/gab.c:198 +#: Opcodes/gab/gab.c:200 #, c-format msgid "tab_i off end: table number: %d\n" msgstr "tab_i hors-limite : numéro de table : %d\n" -#: Opcodes/gab/gab.c:211 +#: Opcodes/gab/gab.c:213 msgid "tabw_i: incorrect table number" msgstr "tabw_i : numéro de table incorrect" -#: Opcodes/gab/gab.c:218 +#: Opcodes/gab/gab.c:220 msgid "tabw_i off end" msgstr "tabw_i hors-limite" -#: Opcodes/gab/gab.c:263 +#: Opcodes/gab/gab.c:265 msgid "tab_init: incorrect table number" msgstr "tab_init : numéro de table incorrect" -#: Opcodes/gab/gab.c:332 +#: Opcodes/gab/gab.c:334 msgid "printi parameter was not a \"quoted string\"" msgstr "printi : le paramètre n'était pas une \"chaîne entre guillemets\"" -#: Opcodes/gab/gab.c:446 +#: Opcodes/gab/gab.c:448 msgid "adsynt2: wavetable not found!" msgstr "adsynt2 : la table d'onde n'a pas été trouvée !" -#: Opcodes/gab/gab.c:458 +#: Opcodes/gab/gab.c:460 msgid "adsynt2: freqtable not found!" msgstr "adsynt2 : la table de fréq n'a pas été trouvée !" -#: Opcodes/gab/gab.c:463 +#: Opcodes/gab/gab.c:465 msgid "adsynt2: partial count is greater than freqtable size!" msgstr "" "adsynt2 : le nombre de partiels est supérieur à la taille de la table de " "fréq !" -#: Opcodes/gab/gab.c:472 +#: Opcodes/gab/gab.c:474 msgid "adsynt2: amptable not found!" msgstr "adsynt2 : la table d'amp n'a pas été trouvée !" -#: Opcodes/gab/gab.c:477 +#: Opcodes/gab/gab.c:479 msgid "adsynt2: partial count is greater than amptable size!" msgstr "" "adsynt2 : le nombre de partiels est supérieur à la taille de la table d'amp !" -#: Opcodes/gab/gab.c:525 +#: Opcodes/gab/gab.c:527 msgid "adsynt2: not initialised" msgstr "adsynt2 : non initialisé" -#: Opcodes/gab/gab.c:759 +#: Opcodes/gab/gab.c:771 msgid "max_k: invalid imaxflag value" msgstr "max_k : valeur de imaxflag non valide" @@ -6971,11 +6994,11 @@ msgid "vlinseg/vexpseg: invalid num. of elements" msgstr "vlinseg/vexpseg : nombre d'éléments non valide" -#: Opcodes/gab/vectorial.c:2255 Opcodes/vpvoc.c:119 +#: Opcodes/gab/vectorial.c:2255 Opcodes/vpvoc.c:121 msgid "tableseg: not initialised" msgstr "tableseg : non initialisé" -#: Opcodes/gab/vectorial.c:2285 Opcodes/vpvoc.c:148 +#: Opcodes/gab/vectorial.c:2285 Opcodes/vpvoc.c:150 msgid "tablexseg: not initialised" msgstr "tablexseg : non initialisé" @@ -7423,8 +7446,8 @@ msgid "loscilx: invalid number of output arguments" msgstr "loscilx : nombre d'arguments de sortie non valide" -#: Opcodes/loscilx.c:209 Opcodes/loscilx.c:238 Opcodes/pvlock.c:152 -#: Opcodes/pvlock.c:375 Opcodes/pvsbasic.c:566 +#: Opcodes/loscilx.c:209 Opcodes/loscilx.c:238 Opcodes/pvlock.c:160 +#: Opcodes/pvlock.c:383 Opcodes/pvlock.c:657 Opcodes/pvsbasic.c:566 msgid "" "number of output arguments inconsistent with number of sound file channels" msgstr "" @@ -7435,7 +7458,13 @@ msgid "loscilx: not initialised" msgstr "loscilx : non initialisé" -#: Opcodes/lowpassr.c:85 Opcodes/lowpassr.c:140 +#: Opcodes/lowpassr.c:55 Opcodes/lowpassr.c:99 Opcodes/lowpassr.c:121 +#: Opcodes/lowpassr.c:155 Opcodes/lowpassr.c:176 Opcodes/lowpassr.c:210 +#, fuzzy +msgid "Cutoff parameter must be positive" +msgstr "la ftable htim doit être entirèrement positive" + +#: Opcodes/lowpassr.c:252 Opcodes/lowpassr.c:312 msgid "illegal order num. (min 1, max 10)" msgstr "numéro d'ordre illégal (min 1, max 10)" @@ -7654,20 +7683,20 @@ msgid "partikkel: " msgstr "partikkel :" -#: Opcodes/partikkel.c:841 +#: Opcodes/partikkel.c:839 msgid "partikkelsync: opcode id needs to be a non-zero integer" msgstr "partikkelsync : l'id de l'opcode doit être un entier non nul" -#: Opcodes/partikkel.c:845 Opcodes/partikkel.c:851 +#: Opcodes/partikkel.c:843 Opcodes/partikkel.c:849 msgid "partikkelsync: could not find opcode id" msgstr "partikkelsync : impossible de trouver l'id de l'opcode" -#: Opcodes/partikkel.c:881 +#: Opcodes/partikkel.c:879 #, c-format msgid "%s: partikkel not initialized" msgstr "%s : partikkel non initialisé" -#: Opcodes/partikkel.c:889 +#: Opcodes/partikkel.c:887 #, c-format msgid "%s: could not find opcode id" msgstr "%s : impossible de trouver l'id de l'opcode" @@ -7794,36 +7823,36 @@ msgstr "" "adsynt : le nombre de partiels est supérieur à la taille de la table d'amp !" -#: Opcodes/pitch.c:690 +#: Opcodes/pitch.c:691 msgid "adsynt: not initialised" msgstr "adsynt : non initialisé" -#: Opcodes/pitch.c:770 +#: Opcodes/pitch.c:771 msgid "hsboscil: not initialised" msgstr "hsboscil : non initialisé" -#: Opcodes/pitch.c:856 +#: Opcodes/pitch.c:857 msgid "pitchamdf: maxcps must be > mincps !" msgstr "pitchamdf : maxcps doit être > mincps !" -#: Opcodes/pitch.c:1003 +#: Opcodes/pitch.c:1004 msgid "pitchamdf: not initialised" msgstr "pitchamdf : non initialisé" -#: Opcodes/pitch.c:1184 Opcodes/pitch.c:1214 +#: Opcodes/pitch.c:1185 Opcodes/pitch.c:1215 msgid "phasorbnk: not initialised" msgstr "phasorbnk : non initialisé" -#: Opcodes/pitch.c:1281 +#: Opcodes/pitch.c:1282 msgid "pinkish: Invalid method code" msgstr "pinkish : code de méthode non valide" -#: Opcodes/pitch.c:1292 +#: Opcodes/pitch.c:1293 msgid "pinkish: Filter method requires a-rate (noise) input" msgstr "" "pinkish : la méthode de filtrage nécessite une entrée (bruit) de taux-a" -#: Opcodes/pitch.c:1421 +#: Opcodes/pitch.c:1422 #, c-format msgid "" "pinkish: Gardner method requires 4-%d bands. Default %ld substituted for " @@ -7832,36 +7861,36 @@ "pinkish : la méthode de Gardner nécessitre 4-%d bandes. La valeur par défaut " "%ld a été substituée à %d.\n" -#: Opcodes/pitch.c:1684 +#: Opcodes/pitch.c:1685 msgid "Incorrect argument count in transeg" msgstr "Nombre d'arguments incorrect dans transeg" -#: Opcodes/pitch.c:1735 +#: Opcodes/pitch.c:1736 msgid "Incorrect argument count in transegb" msgstr "Nombre d'arguments incorrect dans transegb" -#: Opcodes/pitch.c:1786 Opcodes/pitch.c:1947 +#: Opcodes/pitch.c:1787 Opcodes/pitch.c:1948 msgid "Error: transeg not initialised (krate)\n" msgstr "Erreur : transeg non initialisé (taux-k)\n" -#: Opcodes/pitch.c:1824 Opcodes/pitch.c:2007 +#: Opcodes/pitch.c:1825 Opcodes/pitch.c:2008 msgid "transeg: not initialised (arate)\n" msgstr "transeg : non initialisé (taux-a)\n" -#: Opcodes/pitch.c:1884 +#: Opcodes/pitch.c:1885 msgid "Incorrect argument count in transegr" msgstr "Nombre d'arguments incorrect dans transegr" -#: Opcodes/pitch.c:2303 +#: Opcodes/pitch.c:2321 msgid "median: not initialised (arate)\n" msgstr "median : non initialisé (taux-a)\n" -#: Opcodes/pitch.c:2307 Opcodes/pitch.c:2360 +#: Opcodes/pitch.c:2325 Opcodes/pitch.c:2378 #, c-format msgid "median: window (%d)larger than maximum(%d); truncated" msgstr "median : fenêtre (%d) plus grande que le maximum (%d) ; tronquée" -#: Opcodes/pitch.c:2356 +#: Opcodes/pitch.c:2374 msgid "median: not initialised (krate)\n" msgstr "median non initialisé (taux-k)\n" @@ -7980,30 +8009,30 @@ msgid "PVBUFREAD cannot load %s" msgstr "PVBUFREAD ne peut pas charger %s" -#: Opcodes/pvinterp.c:82 Opcodes/vpvoc.c:215 +#: Opcodes/pvinterp.c:82 Opcodes/vpvoc.c:217 #, c-format msgid "PVOC frame %ld bigger than %ld in %s" msgstr "La trame PVOC %ld est plus grande que %ld dans %s" -#: Opcodes/pvinterp.c:87 Opcodes/vpvoc.c:220 +#: Opcodes/pvinterp.c:87 Opcodes/vpvoc.c:222 #, c-format msgid "PVOC frame %ld seems too small in %s" msgstr "La trame PVOC %ld semble trop petite dans %s" #: Opcodes/pvinterp.c:91 Opcodes/pvinterp.c:203 Opcodes/pvinterp.c:393 -#: Opcodes/vpvoc.c:224 +#: Opcodes/vpvoc.c:226 #, c-format msgid "%d chans (not 1) in PVOC file %s" msgstr "%d canaux (pas 1) dans le fichier PVOC %s" #: Opcodes/pvinterp.c:106 Opcodes/pvinterp.c:230 Opcodes/pvinterp.c:418 -#: Opcodes/ugens8.c:101 Opcodes/vpvoc.c:252 +#: Opcodes/ugens8.c:101 Opcodes/vpvoc.c:254 #, c-format msgid "ksmps of %d needs wdw of %d, max is %d for pv %s" msgstr "Un ksmps de %d necécessite une fenêtre de %d, max vaut %d pour pv %s" #: Opcodes/pvinterp.c:135 Opcodes/pvinterp.c:284 Opcodes/pvinterp.c:475 -#: Opcodes/pvread.c:109 Opcodes/ugens8.c:174 Opcodes/vpvoc.c:314 +#: Opcodes/pvread.c:109 Opcodes/ugens8.c:174 Opcodes/vpvoc.c:316 msgid "PVOC ktimpnt truncated to last frame" msgstr "PVOC ktimpnt a été tronqué à la dernière trame" @@ -8012,7 +8041,7 @@ msgstr "pvbufread : non initialisé" #: Opcodes/pvinterp.c:146 Opcodes/pvinterp.c:337 Opcodes/pvinterp.c:540 -#: Opcodes/pvread.c:117 Opcodes/ugens8.c:232 Opcodes/vpvoc.c:382 +#: Opcodes/pvread.c:117 Opcodes/ugens8.c:232 Opcodes/vpvoc.c:384 msgid "PVOC timpnt < 0" msgstr "PVOC timpnt < 0" @@ -8037,12 +8066,12 @@ msgstr "pvinterp : non initialisé" #: Opcodes/pvinterp.c:332 Opcodes/pvinterp.c:534 Opcodes/ugens8.c:226 -#: Opcodes/vpvoc.c:376 +#: Opcodes/vpvoc.c:378 msgid "PVOC transpose too low" msgstr "PVOC transpose trop bas" #: Opcodes/pvinterp.c:335 Opcodes/pvinterp.c:537 Opcodes/ugens8.c:229 -#: Opcodes/vpvoc.c:379 +#: Opcodes/vpvoc.c:381 msgid "PVOC transpose too high" msgstr "PVOC transpose trop haut" @@ -8062,7 +8091,7 @@ "pvcross : %s : la taille de trame %d ne correspond à la taille de trame %d " "de pvbufread\n" -#: Opcodes/pvinterp.c:498 Opcodes/vpvoc.c:339 +#: Opcodes/pvinterp.c:498 Opcodes/vpvoc.c:341 msgid "PVOC debug: one frame gets through\n" msgstr "PVOC debuf : une trame est passée\n" @@ -8070,18 +8099,18 @@ msgid "pvcross: not initialised" msgstr "pvcross : non initialisé" -#: Opcodes/pvlock.c:67 Opcodes/pvsbasic.c:480 +#: Opcodes/pvlock.c:71 Opcodes/pvsbasic.c:480 msgid "invalid number of output arguments" msgstr "nombre d'arguments de sortie non valide" -#: Opcodes/pvlock.c:536 Opcodes/pvsband.c:46 Opcodes/pvsbasic.c:684 +#: Opcodes/pvlock.c:826 Opcodes/pvsband.c:46 Opcodes/pvsbasic.c:684 #: Opcodes/pvsbasic.c:1007 Opcodes/pvsbasic.c:1220 Opcodes/pvsbasic.c:1326 #: Opcodes/pvsbasic.c:1555 Opcodes/pvsbasic.c:1768 Opcodes/pvsbasic.c:1942 -#: Opcodes/pvsgendy.c:43 Opcodes/signalflowgraph.cpp:627 +#: Opcodes/pvsgendy.c:43 Opcodes/signalflowgraph.cpp:665 msgid "Unsafe to have same fsig as in and out" msgstr "Il est risqué d'avoir le même fsig en entrée et en sortie" -#: Opcodes/pvlock.c:548 +#: Opcodes/pvlock.c:838 msgid "pvsfreeze: signal format must be amp-freq." msgstr "pvsfreeze : le format de signal doit être amp-fréq." @@ -8439,24 +8468,24 @@ msgid "Nothing to close" msgstr "Rien à fermer" -#: Opcodes/sfont.c:111 +#: Opcodes/sfont.c:114 #, c-format msgid "sfload: cannot open SoundFont file \"%s\" (error %s)" msgstr "sfload : impossible d'ouvrir le fichier SoundFont \"%s\" (erreur %s)" -#: Opcodes/sfont.c:117 +#: Opcodes/sfont.c:120 msgid "Sfload: cannot use globals" msgstr "sfload : impossible d'utiliser des variables globales" -#: Opcodes/sfont.c:150 +#: Opcodes/sfont.c:153 msgid "sfload: could not open globals\n" msgstr "sfload : impossible d'utiliser des variables globales\n" -#: Opcodes/sfont.c:172 +#: Opcodes/sfont.c:175 msgid "Extending soundfonts" msgstr "Extension de soundfonts" -#: Opcodes/sfont.c:211 +#: Opcodes/sfont.c:214 #, c-format msgid "" "\n" @@ -8465,12 +8494,12 @@ "\n" "List de Preset de \"%s\"\n" -#: Opcodes/sfont.c:214 +#: Opcodes/sfont.c:217 #, c-format msgid "%3d) %-20s\tprog:%-3d bank:%d\n" msgstr "%3d) %-20s\tprog : %-3d bank : %d\n" -#: Opcodes/sfont.c:236 +#: Opcodes/sfont.c:239 #, c-format msgid "" "\n" @@ -8480,12 +8509,12 @@ "Assignation de tous les Presets de \"%s\" à partir de %d (numéro du " "descripteur de preset)\n" -#: Opcodes/sfont.c:241 +#: Opcodes/sfont.c:244 #, c-format msgid "%3d<--%-20s\t(prog:%-3d bank:%d)\n" msgstr "%3d<--%-20s\t(prog : %-3d bank : %d)\n" -#: Opcodes/sfont.c:248 +#: Opcodes/sfont.c:251 #, c-format msgid "" "\n" @@ -8497,7 +8526,7 @@ "%d \n" "\n" -#: Opcodes/sfont.c:261 +#: Opcodes/sfont.c:264 #, c-format msgid "" "\n" @@ -8506,12 +8535,12 @@ "\n" "Liste d'instruments de \"%s\"\n" -#: Opcodes/sfont.c:279 +#: Opcodes/sfont.c:282 #, c-format msgid "sfpreset: preset handle too big (%d), max: %d" msgstr "sfpreset : descripteur de preset trop grand (%d), max : %d" -#: Opcodes/sfont.c:296 +#: Opcodes/sfont.c:299 #, c-format msgid "" "sfpreset: cannot find any preset having prog number %d and bank number %d in " @@ -8520,19 +8549,19 @@ "sfpreset : impossible de trouver un preset ayant le numéro de prog %d et le " "numéro de banque %d dans le fichier SoundFont \"%s\"" -#: Opcodes/sfont.c:318 Opcodes/sfont.c:2248 +#: Opcodes/sfont.c:321 Opcodes/sfont.c:2251 msgid "sfplay: invalid or out-of-range preset number" msgstr "sfplay : numéro de preset non valide ou hors limites" -#: Opcodes/sfont.c:655 +#: Opcodes/sfont.c:658 msgid "sfplaym: invalid or out-of-range preset number" msgstr "sfplaym : numéro de preset non valide ou hors limites" -#: Opcodes/sfont.c:919 Opcodes/sfont.c:1191 +#: Opcodes/sfont.c:922 Opcodes/sfont.c:1194 msgid "sfinstr: instrument out of range" msgstr "sfinstr : instrument hors limites" -#: Opcodes/sfont.c:1648 Opcodes/sfont.c:1886 +#: Opcodes/sfont.c:1651 Opcodes/sfont.c:1889 #, c-format msgid "" "SoundFont file \"%s\" contains ROM samples !\n" @@ -8543,15 +8572,15 @@ "Actuellement sfload n'autorise que les échantillons en RAM.\n" "Session annulée !" -#: Opcodes/sfont.c:2041 Opcodes/sfont.c:2049 +#: Opcodes/sfont.c:2044 Opcodes/sfont.c:2052 msgid "Sfont: cannot use globals/" msgstr "Sfont : impossible d'utiliser des variables globales/" -#: Opcodes/sfont.c:2054 +#: Opcodes/sfont.c:2057 msgid "Sfont format not compatible" msgstr "Sfont : format non compatible" -#: Opcodes/sfont.c:2598 +#: Opcodes/sfont.c:2601 msgid "error... could not create sfont globals\n" msgstr "erreur... impossible de créer les globales de sfont\n" @@ -8559,31 +8588,36 @@ msgid "powershape: ifullscale must be strictly positive" msgstr "powershape : la ftable ifullscale doit être entirèrement positive" -#: Opcodes/signalflowgraph.cpp:332 Opcodes/signalflowgraph.cpp:593 +#: Opcodes/signalflowgraph.cpp:360 Opcodes/signalflowgraph.cpp:629 #, c-format msgid "Connected instances of outlet %s to instance 0x%x of inlet %s.\n" msgstr "Instances de l'outlet %s connectées à l'instance 0x%x de l'inlet %s.\n" -#: Opcodes/signalflowgraph.cpp:408 +#: Opcodes/signalflowgraph.cpp:438 #, c-format msgid "Created instance 0x%x of %d instances of outlet %s\n" msgstr "Création de l'instance 0x%x des %d instances de l'outlet %s\n" -#: Opcodes/signalflowgraph.cpp:468 +#: Opcodes/signalflowgraph.cpp:500 #, c-format msgid "Connected instances of outlet %s to instance 0x%xof inlet %s.\n" msgstr "Instances de l'outlet %s connectées à l'instance 0x%x de l'inlet %s.\n" -#: Opcodes/signalflowgraph.cpp:655 +#: Opcodes/signalflowgraph.cpp:693 msgid "inletf: signal format must be amp-phase or amp-freq." msgstr "inletf : le format de signal doit être amp-phase ou amp-fréq." -#: Opcodes/signalflowgraph.cpp:948 Opcodes/signalflowgraph.cpp:989 +#: Opcodes/signalflowgraph.cpp:837 +#, fuzzy, c-format +msgid "Connected instances of outlet %s to instance 0x%x of inlet %s\n" +msgstr "Instances de l'outlet %s connectées à l'instance 0x%x de l'inlet %s.\n" + +#: Opcodes/signalflowgraph.cpp:1150 Opcodes/signalflowgraph.cpp:1193 #, c-format msgid "Connected outlet %s to inlet %s.\n" msgstr "Outlet %s connectée à l'inlet %s.\n" -#: Opcodes/signalflowgraph.cpp:1116 Opcodes/signalflowgraph.cpp:1200 +#: Opcodes/signalflowgraph.cpp:1322 Opcodes/signalflowgraph.cpp:1408 msgid "ftgenonce error" msgstr "erreur ftgenonce" @@ -8905,7 +8939,7 @@ msgid "Error allocating argument stack" msgstr "Erreur lors de l'allocation de la pile d'arguments" -#: Opcodes/stackops.c:206 Top/argdecode.c:1245 util/envext.c:99 +#: Opcodes/stackops.c:206 Top/argdecode.c:1263 util/envext.c:99 #: util/scale.c:248 msgid "too many arguments" msgstr "trop d'arguments" @@ -9383,7 +9417,7 @@ msgid "ATSCROSS: you must have an atsbufread before an atsinterpread" msgstr "ATSCROSS : il faut avoir un atsbufread avant un atsinterpread" -#: Opcodes/ugsc.c:434 +#: Opcodes/ugsc.c:439 msgid "Phaser mode must be either 1 or 2" msgstr "Le mode du phaser doit valoir 1 ou 2" @@ -9519,21 +9553,21 @@ msgid "Have to have at least %d directions in vbapzmove" msgstr "Il faut au moins %d directions dans vbapzmove" -#: Opcodes/vpvoc.c:175 +#: Opcodes/vpvoc.c:177 #, c-format msgid "vpvoc: Could not find ifnmagctrl table %f" msgstr "vpvoc : la table ifnmagctrl %f n'a pas été trouvée" -#: Opcodes/vpvoc.c:181 +#: Opcodes/vpvoc.c:183 msgid "vpvoc: associated tableseg not found" msgstr "vpvoc : tableseg associé non trouvé" -#: Opcodes/vpvoc.c:203 +#: Opcodes/vpvoc.c:205 #, c-format msgid "VPVOC cannot load %s" msgstr "VPVOC ne peut pas charger %s" -#: Opcodes/vpvoc.c:373 +#: Opcodes/vpvoc.c:375 msgid "vpvoc: not initialised" msgstr "vpvoc : non initialisé" @@ -9607,611 +9641,623 @@ msgid "No wii range" msgstr "Pas d'intervalle wii" -#: Top/argdecode.c:63 +#: Top/argdecode.c:64 msgid "--help\tprint long usage options" msgstr "--help\taffiche les noms d'option longs " -#: Top/argdecode.c:64 +#: Top/argdecode.c:65 msgid "-U unam\trun utility program unam" msgstr "-U unam\tlance l'utilitaire unam" -#: Top/argdecode.c:65 +#: Top/argdecode.c:66 msgid "-C\tuse Cscore processing of scorefile" msgstr "-C\tutilisation du traitement de partition Cscore" -#: Top/argdecode.c:66 +#: Top/argdecode.c:67 msgid "-j N\tuse N threads in performance" msgstr "-j N\tutiliser N threads pendant l'exécution" -#: Top/argdecode.c:67 +#: Top/argdecode.c:68 msgid "-I\tI-time only orch run" msgstr "-I\tn'exécuter que la passe de temps-I de l'orchestre" -#: Top/argdecode.c:68 +#: Top/argdecode.c:69 msgid "-n\tno sound onto disk" msgstr "-n\tpas de son vers le disque" -#: Top/argdecode.c:69 +#: Top/argdecode.c:70 msgid "-i fnam\tsound input filename" msgstr "-i fnam\tnom du fichier son en entrée" -#: Top/argdecode.c:70 util/mixer.c:94 util/scale.c:45 +#: Top/argdecode.c:71 util/mixer.c:94 util/scale.c:45 msgid "-o fnam\tsound output filename" msgstr "-o fnam\tnom du fichier son en sortie" -#: Top/argdecode.c:71 +#: Top/argdecode.c:72 msgid "-b N\tsample frames (or -kprds) per software sound I/O buffer" msgstr "" "-b N\tnombre de trames d'échantillonnage (ou -kprds) par tampon logiciel d'E/" "S" -#: Top/argdecode.c:72 +#: Top/argdecode.c:73 msgid "-B N\tsamples per hardware sound I/O buffer" msgstr "-B N\tnombre d'échantillons par tampon physique d'E/S" -#: Top/argdecode.c:73 util/mixer.c:95 util/scale.c:46 util/srconv.c:752 +#: Top/argdecode.c:74 util/mixer.c:95 util/scale.c:46 util/srconv.c:752 msgid "-A\tcreate an AIFF format output soundfile" msgstr "-A\tcréation d'un fichier de sortie au format AIFF" -#: Top/argdecode.c:74 util/mixer.c:96 util/scale.c:47 util/srconv.c:754 +#: Top/argdecode.c:75 util/mixer.c:96 util/scale.c:47 util/srconv.c:754 msgid "-W\tcreate a WAV format output soundfile" msgstr "-W\tcréation d'un fichier de sortie au format WAV" -#: Top/argdecode.c:75 util/srconv.c:753 +#: Top/argdecode.c:76 util/srconv.c:753 msgid "-J\tcreate an IRCAM format output soundfile" msgstr "-J\tcréation d'un fichier de sortie au format IRCAM" -#: Top/argdecode.c:76 util/mixer.c:97 util/scale.c:48 util/srconv.c:755 +#: Top/argdecode.c:77 util/mixer.c:97 util/scale.c:48 util/srconv.c:755 msgid "-h\tno header on output soundfile" msgstr "-h\tpas d'en-tête dans le fichier de sortie" -#: Top/argdecode.c:77 util/mixer.c:99 util/scale.c:49 util/srconv.c:756 +#: Top/argdecode.c:78 util/mixer.c:99 util/scale.c:49 util/srconv.c:756 msgid "-c\t8-bit signed_char sound samples" msgstr "-c\téchantillons en caractères signés sur 8 bit" -#: Top/argdecode.c:79 util/mixer.c:101 util/scale.c:50 util/srconv.c:757 +#: Top/argdecode.c:80 util/mixer.c:101 util/scale.c:50 util/srconv.c:757 msgid "-a\talaw sound samples" msgstr "-a\téchantillons alaw" -#: Top/argdecode.c:81 util/mixer.c:98 util/mixer.c:100 util/srconv.c:758 +#: Top/argdecode.c:82 util/mixer.c:98 util/mixer.c:100 util/srconv.c:758 msgid "-8\t8-bit unsigned_char sound samples" msgstr "-8\téchantillons en caractères non signés sur 8 bit" -#: Top/argdecode.c:82 util/mixer.c:102 util/scale.c:51 util/srconv.c:759 +#: Top/argdecode.c:83 util/mixer.c:102 util/scale.c:51 util/srconv.c:759 msgid "-u\tulaw sound samples" msgstr "-u\téchantillons ulaw" -#: Top/argdecode.c:83 util/mixer.c:103 util/scale.c:52 util/srconv.c:760 +#: Top/argdecode.c:84 util/mixer.c:103 util/scale.c:52 util/srconv.c:760 msgid "-s\tshort_int sound samples" msgstr "-s\téchantillons en entiers courts" -#: Top/argdecode.c:84 util/mixer.c:104 util/scale.c:53 util/srconv.c:761 +#: Top/argdecode.c:85 util/mixer.c:104 util/scale.c:53 util/srconv.c:761 msgid "-l\tlong_int sound samples" msgstr "-l\téchantillons en entiers longs" -#: Top/argdecode.c:85 util/mixer.c:105 util/scale.c:54 util/srconv.c:762 +#: Top/argdecode.c:86 util/mixer.c:105 util/scale.c:54 util/srconv.c:762 msgid "-f\tfloat sound samples" msgstr "-f\téchantillons en nombres flottants" -#: Top/argdecode.c:86 +#: Top/argdecode.c:87 msgid "-3\t24bit sound samples" msgstr "-3\téchantillons sur 24 bit" -#: Top/argdecode.c:87 util/srconv.c:763 +#: Top/argdecode.c:88 util/srconv.c:763 msgid "-r N\torchestra srate override" msgstr "-r N\tredéfinition du srate de l'orchestre" -#: Top/argdecode.c:88 +#: Top/argdecode.c:89 msgid "-k N\torchestra krate override" msgstr "-k N\tredéfinition du krate de l'orchestre" -#: Top/argdecode.c:89 util/srconv.c:764 +#: Top/argdecode.c:90 util/srconv.c:764 msgid "-K\tDo not generate PEAK chunks" msgstr "-K\tNe générer aucun bloc PEAK" -#: Top/argdecode.c:90 +#: Top/argdecode.c:91 msgid "-v\tverbose orch translation" msgstr "-v\ttraduction détaillée de l'orchestre" -#: Top/argdecode.c:91 +#: Top/argdecode.c:92 msgid "-m N\ttty message level. Sum of:" msgstr "-m N\tniveau de message du tty. Somme de :" -#: Top/argdecode.c:92 +#: Top/argdecode.c:93 msgid "\t\t1=note amps, 2=out-of-range msg, 4=warnings" msgstr "\t\t1=amp des notes, 2=msg dépassement limites, 4=avertissements" -#: Top/argdecode.c:93 +#: Top/argdecode.c:94 msgid "\t\t0/32/64/96=note amp format (raw,dB,colors)" msgstr "\t\t0/32/64/96=format d'amp de note (brut, dB, couleurs)" -#: Top/argdecode.c:94 +#: Top/argdecode.c:95 msgid "\t\t128=print benchmark information" msgstr "\t\t128=affichage de tests de performance" -#: Top/argdecode.c:95 +#: Top/argdecode.c:96 msgid "-d\tsuppress all displays" msgstr "-d\taucun affichage" -#: Top/argdecode.c:96 +#: Top/argdecode.c:97 msgid "-g\tsuppress graphics, use ascii displays" msgstr "-g\tpas de graphiques, affichage ascii" -#: Top/argdecode.c:97 +#: Top/argdecode.c:98 msgid "-G\tsuppress graphics, use Postscript displays" msgstr "-G\tpas de graphiques, affichage PostScript" -#: Top/argdecode.c:98 +#: Top/argdecode.c:99 msgid "-x fnam\textract from score.srt using extract file 'fnam'" msgstr "-x nomfic\textraire les données de score.srt dans le fichier 'nomfic'" -#: Top/argdecode.c:99 +#: Top/argdecode.c:100 msgid "-t N\tuse uninterpreted beats of the score, initially at tempo N" msgstr "" "-t N\tutiliser les pulsations non interprétées de la partition, au tempo " "initial N" -#: Top/argdecode.c:100 +#: Top/argdecode.c:101 msgid "-t 0\tuse score.srt for sorted score rather than a temporary" msgstr "" "-t 0\tutiliser score.srt pour la partition triée au lieu d'un fichier " "temporaire" -#: Top/argdecode.c:101 +#: Top/argdecode.c:102 msgid "-L dnam\tread Line-oriented realtime score events from device 'dnam'" msgstr "" "-L dnam\tLire des évènements de partition en temps-réel à partir du " "périphérique d'entrée en ligne 'dnam'" -#: Top/argdecode.c:102 +#: Top/argdecode.c:103 msgid "-M dnam\tread MIDI realtime events from device 'dnam'" msgstr "" "-M dnam\tlire des évènements MIDI en temps-réel à partir du périphérique " "'dnam'" -#: Top/argdecode.c:103 +#: Top/argdecode.c:104 msgid "-F fnam\tread MIDIfile event stream from file 'fnam'" msgstr "-F nomfic\tlire un flux d'évènements MIDI à partir du fichier 'nomfic'" -#: Top/argdecode.c:105 util/mixer.c:106 util/scale.c:59 util/srconv.c:765 +#: Top/argdecode.c:106 util/mixer.c:106 util/scale.c:59 util/srconv.c:765 msgid "-R\tcontinually rewrite header while writing soundfile (WAV/AIFF)" msgstr "" "-R\tréécrire l'en-tête continuellement lors de l'écriture d'un fichier son " "(WAV/AIFF)" -#: Top/argdecode.c:106 +#: Top/argdecode.c:107 msgid "-H#\tprint heartbeat style 1, 2 or 3 at each soundfile write" msgstr "" "-H#\taffiche une pulsation de style 1, 2 ou 3 à chaque écriture dans le " "fichier son" -#: Top/argdecode.c:107 util/mixer.c:108 util/scale.c:61 util/srconv.c:767 +#: Top/argdecode.c:108 util/mixer.c:108 util/scale.c:61 util/srconv.c:767 msgid "-N\tnotify (ring the bell) when score or miditrack is done" msgstr "" "-N\tavertir (par un beep) quand la partition ou la piste MIDI est terminée" -#: Top/argdecode.c:108 +#: Top/argdecode.c:109 msgid "-T\tterminate the performance when miditrack is done" msgstr "-T\tterminer l'exécution quand la fin du fichier MIDI est atteinte" -#: Top/argdecode.c:109 +#: Top/argdecode.c:110 msgid "-D\tdefer GEN01 soundfile loads until performance time" msgstr "" "-D\tdifférer le chargement de fichier son par GEN01 jusqu'au moment de " "l'exécution" -#: Top/argdecode.c:110 +#: Top/argdecode.c:111 msgid "-Q dnam\tselect MIDI output device" msgstr "-Q dnam\tsélectionner le périphérique de sortie MIDI" -#: Top/argdecode.c:111 +#: Top/argdecode.c:112 msgid "-z\tList opcodes in this version" msgstr "-z\tLister les opcodes de cette version" -#: Top/argdecode.c:112 +#: Top/argdecode.c:113 msgid "-Z\tDither output" msgstr "-Z\tSortie avec dithering" -#: Top/argdecode.c:114 +#: Top/argdecode.c:115 msgid "--sched set real-time priority and lock memory" msgstr "--sched fixer la priorité au temps-réel et verrouiller la mémoire" -#: Top/argdecode.c:115 Top/argdecode.c:117 +#: Top/argdecode.c:116 Top/argdecode.c:118 msgid " (requires -d and real time audio (-iadc/-odac))" msgstr " (nécessite -d et l'audio en temps-réel (-iadc/-odac))" -#: Top/argdecode.c:116 +#: Top/argdecode.c:117 msgid "--sched=N set specified scheduling priority, and lock memory" msgstr "--sched=N fixer une priorité spécifique, et verrouiller la mémoire" -#: Top/argdecode.c:126 +#: Top/argdecode.c:127 msgid "\t\t\tSet output file format" msgstr "\t\t\tFixer le format du fichier de sortie" -#: Top/argdecode.c:127 +#: Top/argdecode.c:128 msgid "--aiff\t\t\tSet AIFF format" msgstr "--aiff\t\t\tFixer le format AIFF" -#: Top/argdecode.c:128 +#: Top/argdecode.c:129 msgid "--au\t\t\tSet AU format" msgstr "--au\t\t\tFixer le format AU" -#: Top/argdecode.c:129 +#: Top/argdecode.c:130 msgid "--wave\t\t\tSet WAV format" msgstr "--wave\t\t\tFixer le format WAV" -#: Top/argdecode.c:130 +#: Top/argdecode.c:131 msgid "--ircam\t\t\tSet IRCAM format" msgstr "--ircam\t\t\tFixer le format IRCAM" -#: Top/argdecode.c:131 +#: Top/argdecode.c:132 msgid "--ogg\t\t\tSet OGG/VORBIS format" msgstr "--ogg Fixer le format OGG/VORBIS" -#: Top/argdecode.c:132 +#: Top/argdecode.c:133 msgid "--noheader\t\tRaw format" msgstr "--noheader\t\tFormat brut" -#: Top/argdecode.c:133 +#: Top/argdecode.c:134 msgid "--nopeaks\t\tDo not write peak information" msgstr "--nopeaks\t\tNe pas écrire d'information de crête" -#: Top/argdecode.c:135 +#: Top/argdecode.c:136 msgid "--nodisplays\t\tSuppress all displays" msgstr "--nodisplays\t\tsuppression de tout affichage" -#: Top/argdecode.c:136 +#: Top/argdecode.c:137 msgid "--asciidisplay\t\tSuppress graphics, use ascii displays" msgstr "--asciidisplay\t\tpas de graphiques, affichage ascii" -#: Top/argdecode.c:137 +#: Top/argdecode.c:138 msgid "--postscriptdisplay\tSuppress graphics, use Postscript displays" msgstr "--postscriptdisplay\tpas de graphiques, affichage PostScript" -#: Top/argdecode.c:139 +#: Top/argdecode.c:140 msgid "--defer-gen1\t\tDefer GEN01 soundfile loads until performance time" msgstr "" "--defer-gen1\t\tdifférer le chargement de fichier son par GEN01 jusqu'au " "moment de l'exécution" -#: Top/argdecode.c:140 +#: Top/argdecode.c:141 msgid "" "--iobufsamps=N\t\tSample frames (or -kprds) per software sound I/O buffer" msgstr "" "--iobufsamps=N\t\tnombre de trames d'échantillon (ou -kprds) par tampon " "logiciel d'E/S" -#: Top/argdecode.c:142 +#: Top/argdecode.c:143 msgid "--hardwarebufsamps=N\tSamples per hardware sound I/O buffer" msgstr "--hardwarebufsamps=N\tnombre d'échantillons par tampon physique d'E/S" -#: Top/argdecode.c:143 +#: Top/argdecode.c:144 msgid "--cscore\t\tUse Cscore processing of scorefile" msgstr "--cscore\t\ttraitement du fichier de partition par Cscore" -#: Top/argdecode.c:144 +#: Top/argdecode.c:145 msgid "--orc\t\t\tUse orchfile without scorefile" msgstr "" "--orc Utilisation d'un fichier orchestre sans partition" -#: Top/argdecode.c:146 +#: Top/argdecode.c:147 msgid "--midifile=FNAME\tRead MIDIfile event stream from file" msgstr "--midifile=FNAME\tlire un flot d'évènements MIDI depuis un fichier" -#: Top/argdecode.c:147 +#: Top/argdecode.c:148 msgid "--midioutfile=FNAME\tWrite MIDI output to file FNAME" msgstr "--midioutfile=NOMFIC\técrire la sortie MIDI dans le fichier NOMFIC" -#: Top/argdecode.c:148 +#: Top/argdecode.c:149 msgid "--midi-device=FNAME\tRead MIDI realtime events from device" msgstr "" "--midi-device=DNAME\tlire les évènements MIDI temps-réel depuis le " "périphérique" -#: Top/argdecode.c:149 +#: Top/argdecode.c:150 msgid "--terminate-on-midi\tTerminate the performance when miditrack is done" msgstr "" "--terminate-on-midi\tterminer l'exécution lorsque la fin de la piste MIDI " "est atteinte" -#: Top/argdecode.c:151 +#: Top/argdecode.c:152 msgid "" "--heartbeat=N\t\tPrint a heartbeat style 1, 2 or 3 at each soundfile write" msgstr "" "--heartbeat=N\t\taffiche un battement de coeur de style 1, 2 ou 3 à chaque " "écriture dans le fichier son" -#: Top/argdecode.c:153 +#: Top/argdecode.c:154 msgid "--notify\t\tNotify (ring the bell) when score or miditrack is done" msgstr "" "--notify\t\tavertir (par un beep) quand la partition ou la piste MIDI est " "terminée" -#: Top/argdecode.c:154 +#: Top/argdecode.c:155 msgid "" "--rewrite\t\tContinually rewrite header while writing soundfile (WAV/AIFF)" msgstr "" "--rewrite\t\tréécrire l'en-tête continuellement lors de l'écriture d'un " "fichier son (WAV/AIFF)" -#: Top/argdecode.c:157 +#: Top/argdecode.c:158 msgid "--input=FNAME\t\tSound input filename" msgstr "--input=FNAME\t\tnom du fichier son en entrée" -#: Top/argdecode.c:158 +#: Top/argdecode.c:159 msgid "--output=FNAME\t\tSound output filename" msgstr "--output=FNAME\t\tnom du fichier son en sortie" -#: Top/argdecode.c:159 +#: Top/argdecode.c:160 msgid "--logfile=FNAME\t\tLog output to file" msgstr "--logfile=FNAME\t\tcompte-rendu en sortie dans un fichier" -#: Top/argdecode.c:161 +#: Top/argdecode.c:162 msgid "--nosound\t\tNo sound onto disk or device" msgstr "--nosound\t\tpas de son en sortie disque ou périphérique" -#: Top/argdecode.c:162 +#: Top/argdecode.c:163 msgid "--tempo=N\t\tUse uninterpreted beats of the score, initially at tempo N" msgstr "" "--tempo=N\t\tutiliser les pulsations non interprétées de la partition, au " "tempo initial N" -#: Top/argdecode.c:164 +#: Top/argdecode.c:165 msgid "--i-only\t\tI-time only orch run" msgstr "--i-only\t\tn'exécute que la passe de temps-I de l'orchestre" -#: Top/argdecode.c:165 +#: Top/argdecode.c:166 msgid "--syntax-check-only\tStop after checking orchestra and score syntax" msgstr "" "--syntax-check-only\tarrêt après vérification de la syntaxe de l'orchestre " "et de la partition" -#: Top/argdecode.c:166 +#: Top/argdecode.c:167 msgid "--control-rate=N\tOrchestra krate override" msgstr "--control-rate=N\tredéfinition du krate de l'orchestre" -#: Top/argdecode.c:167 +#: Top/argdecode.c:168 msgid "--sample-rate=N\t\tOrchestra srate override" msgstr "--sample-rate=N\t\tredéfinition du srate de l'orchestre" -#: Top/argdecode.c:168 +#: Top/argdecode.c:169 msgid "--score-in=FNAME\tRead Line-oriented realtime score events from device" msgstr "" "--score-in=DNAME\tLire des évènements de partition en temps-réel à partir du " "périphérique d'entrée en ligne" -#: Top/argdecode.c:170 +#: Top/argdecode.c:171 msgid "--messagelevel=N\ttty message level, sum of:" msgstr "--messagelevel=N\tniveau de message tty, somme de :" -#: Top/argdecode.c:171 +#: Top/argdecode.c:172 msgid "--messageolevel=O\ttty message level in octal, of:" msgstr "--messageolevel=O\tniveau de message tty en octal, de :" -#: Top/argdecode.c:172 +#: Top/argdecode.c:173 msgid "\t\t\t\t1=note amps, 2=out-of-range msg, 4=warnings," msgstr "\t\t\t\t1=amp des notes, 2=msg dépassement limites, 4=avertissements" -#: Top/argdecode.c:173 +#: Top/argdecode.c:174 msgid "\t\t\t\t0/32/64/96=note amp format (raw,dB,colors)," msgstr "\t\t\t\t0/32/64/96=format d'amp de note (brut, dB, couleurs)" -#: Top/argdecode.c:174 +#: Top/argdecode.c:175 msgid "\t\t\t\t128=print benchmark information" msgstr "\t\t\t\t128=affichage de tests de performance" -#: Top/argdecode.c:176 +#: Top/argdecode.c:177 msgid "--m-amps=[01]\tmessages on note amps" msgstr "--m-amps=[01]\tmessages sur les amps de note" -#: Top/argdecode.c:177 +#: Top/argdecode.c:178 msgid "--m-range=[01]\tMessages on range errors" msgstr "--m-range=[01]\tmessages sur les erreurs de dépassement" -#: Top/argdecode.c:178 +#: Top/argdecode.c:179 msgid "--m-warnings=[01]\tMesage on warnings" msgstr "--m-warnings=[01]\tmessages d'avertissement" -#: Top/argdecode.c:179 +#: Top/argdecode.c:180 msgid "--m-raw=[01]\tRaw amp messages" msgstr "--m-raw=[01]\tmessages d'amp brute" -#: Top/argdecode.c:180 +#: Top/argdecode.c:181 msgid "--m-dB=[01]\tAmp messages in dB" msgstr "--m-dB=[01]\tmessages d'amp en dB" -#: Top/argdecode.c:181 +#: Top/argdecode.c:182 msgid "--m-colours=[01]\tColour amp messages" msgstr "--m-colours=[01]\tmessages d'amp en couleur" -#: Top/argdecode.c:182 +#: Top/argdecode.c:183 msgid "--m-benchmarks=[01]\tPrint benchmark information" msgstr "--m-benchmarks=[01]\taffichage de tests de performance" -#: Top/argdecode.c:183 +#: Top/argdecode.c:184 msgid "--csd-line-nums=[01]\tControls how error line numbers are printed:" msgstr "" "--csd-line-nums=[01]\tcontrôle comment les numéros de ligne des erreurs sont " "affichés" -#: Top/argdecode.c:184 +#: Top/argdecode.c:185 msgid "\t\t\t1=use CSD line #s (default), 0=use ORC/SCO-relative line #s" msgstr "" "\t\t\t1=numéros de ligne CSD (par défaut), 0=numéros de ligne relatifs ORC/" "SCO" -#: Top/argdecode.c:185 +#: Top/argdecode.c:186 msgid "--extract-score=FNAME\tExtract from score.srt using extract file" msgstr "--extract-score=NOMFIC\textraire à partir de score.srt vers le fichier" -#: Top/argdecode.c:186 +#: Top/argdecode.c:187 msgid "--keep-sorted-score" msgstr "--keep-sorted-score" -#: Top/argdecode.c:187 +#: Top/argdecode.c:188 msgid "--env:NAME=VALUE\tSet environment variable NAME to VALUE" msgstr "--env:NOM=VALEUR\técrire VALEUR dans la variable d'environnement NOM" -#: Top/argdecode.c:188 +#: Top/argdecode.c:189 msgid "--env:NAME+=VALUE\tAppend VALUE to environment variable NAME" msgstr "--env:NOM+=VALEUR\tajouter VALEUR à la variable d'environnement NAME" -#: Top/argdecode.c:189 +#: Top/argdecode.c:190 msgid "--strsetN=VALUE\t\tSet strset table at index N to VALUE" msgstr "--strsetN=VALEUR\t\técrire VALEUR à la position N de la table strset" -#: Top/argdecode.c:190 +#: Top/argdecode.c:191 msgid "--utility=NAME\t\tRun utility program" msgstr "--utility=NOM\t\texécuter un programme utilitaire" -#: Top/argdecode.c:191 +#: Top/argdecode.c:192 msgid "--verbose\t\tVerbose orch translation" msgstr "--verbose\t\ttraduction détaillée de l'orchestre" -#: Top/argdecode.c:192 +#: Top/argdecode.c:193 msgid "--list-opcodes\t\tList opcodes in this version" msgstr "--list-opcodes\t\tLister les opcodes de cette version" -#: Top/argdecode.c:193 +#: Top/argdecode.c:194 msgid "--list-opcodesN\t\tList opcodes in style N in this version" msgstr "--list-opcodesN\t\tListe au format N des opcodes de cette version" -#: Top/argdecode.c:194 +#: Top/argdecode.c:195 msgid "--dither\t\tDither output" msgstr "--dither\t\tSortie avec dithering" -#: Top/argdecode.c:195 +#: Top/argdecode.c:196 msgid "--dither-triangular\t\tDither output with triangular distribution" msgstr "" "--dither-triangular\t\tDithering en sortie avec une distribution triangulaire" -#: Top/argdecode.c:196 +#: Top/argdecode.c:197 msgid "--dither-uniform\t\tDither output with rectanular distribution" msgstr "" "--dither-uniform\t\tDithering en sortie avec une distribution rectangulaire" -#: Top/argdecode.c:197 +#: Top/argdecode.c:198 msgid "--sched\t\t\tSet real-time scheduling priority and lock memory" msgstr "" "--sched\t\t\tfixer la priorité du partage temps-réel et verrouiller la " "mémoire" -#: Top/argdecode.c:198 +#: Top/argdecode.c:199 msgid "--sched=N\t\tSet priority to N and lock memory" msgstr "--sched=N\t\tfixer la priorité N et verrouiller la mémoire" -#: Top/argdecode.c:199 +#: Top/argdecode.c:200 msgid "--opcode-lib=NAMES\tDynamic libraries to load" msgstr "--opcode-lib=NOMS\tBibliothèques dynamiques à charger" -#: Top/argdecode.c:200 +#: Top/argdecode.c:201 msgid "--opcode-omit=NAMES\tDynamic libraries not to load" msgstr "--opcode-omit=NOMS\tBibliothèques dynamiques à ne pas charger" -#: Top/argdecode.c:201 +#: Top/argdecode.c:202 msgid "--omacro:XXX=YYY\tSet orchestra macro XXX to value YYY" msgstr "--omacro:XXX=YYY\tFixer la macro de l'orchestre XXX à la valeur YYY" -#: Top/argdecode.c:202 +#: Top/argdecode.c:203 msgid "--smacro:XXX=YYY\tSet score macro XXX to value YYY" msgstr "--smacro:XXX=YYY\tFixer la macro de la partition XXX à la valeur YYY" -#: Top/argdecode.c:203 +#: Top/argdecode.c:204 msgid "--midi-key=N\t\tRoute MIDI note on message" msgstr "--midi-key=N\t\tLire un message MIDI note on" -#: Top/argdecode.c:204 +#: Top/argdecode.c:205 msgid "\t\t\tkey number to pfield N as MIDI value [0-127]" msgstr "\t\t\tnuméro de touche vers le p-champ N comme valeur MIDI [0-127]" -#: Top/argdecode.c:205 +#: Top/argdecode.c:206 msgid "--midi-key-cps=N\tRoute MIDI note on message" msgstr "--midi-key-cps=N\tLire un message MIDI note on" -#: Top/argdecode.c:206 +#: Top/argdecode.c:207 msgid "\t\t\tkey number to pfield N as cycles per second" msgstr "\t\t\tnuméro de touche vers le p-champ N en cycles par seconde" -#: Top/argdecode.c:207 +#: Top/argdecode.c:208 msgid "--midi-key-oct=N\tRoute MIDI note on message" msgstr "--midi-key-oct=N\tLire un message MIDI note on" -#: Top/argdecode.c:208 +#: Top/argdecode.c:209 msgid "\t\t\tkey number to pfield N as linear octave" msgstr "\t\t\tnuméro de touche vers le p-champ N en octave linéaire" -#: Top/argdecode.c:209 +#: Top/argdecode.c:210 msgid "--midi-key-pch=N\tRoute MIDI note on message" msgstr "--midi-key-pch=N\tLire un message MIDI note on" -#: Top/argdecode.c:210 +#: Top/argdecode.c:211 msgid "\t\t\tkey number to pfield N as oct.pch" msgstr "\t\t\tnuméro de touche vers le p-champ N en oct.pch" -#: Top/argdecode.c:211 +#: Top/argdecode.c:212 msgid "--midi-velocity=N\tRoute MIDI note on message" msgstr "--midi-velocity=N\tLire un message MIDI note on" -#: Top/argdecode.c:212 +#: Top/argdecode.c:213 msgid "\t\t\tvelocity number to pfield N as MIDI value [0-127]" msgstr "\t\t\t vélocité vers le p-champ N comme valeur MIDI [0-127]" -#: Top/argdecode.c:213 +#: Top/argdecode.c:214 msgid "--midi-velocity-amp=N\tRoute MIDI note on message" msgstr "--midi-velocity-amp=N\tLire un message MIDI note on" -#: Top/argdecode.c:214 +#: Top/argdecode.c:215 msgid "\t\t\tvelocity number to pfield N as amplitude" msgstr "\t\t\t vélocité vers le p-champ N comme amplitude" -#: Top/argdecode.c:215 +#: Top/argdecode.c:216 msgid "--no-default-paths\tTurn off relative paths from CSD/ORC/SCO" msgstr "--no-default-paths\tdésactiver les chemins relatifs depuis CSD/ORC/SCO" -#: Top/argdecode.c:216 +#: Top/argdecode.c:217 msgid "--sample-accurate\t\tUse sample-accurate timing of score events" msgstr "" "--sample-accurate\t\tutiliser une précision de sample-accurate pour les " "évènements de partition" -#: Top/argdecode.c:217 +#: Top/argdecode.c:218 msgid "--realtime\t\trealtime priority mode" msgstr "--realtime \t\tmode temps réel prioriataire" -#: Top/argdecode.c:218 +#: Top/argdecode.c:219 msgid "--nchnls=N\t\t override number of audio channels" msgstr "--nchnls=N\t\t écrase le nombre de canaux audio" -#: Top/argdecode.c:219 +#: Top/argdecode.c:220 msgid "--nchnls_i=N\t\t override number of input audio channels" msgstr "--nchnls_i=N\t\t écrase le nombre de canaux audio en entrée" -#: Top/argdecode.c:220 +#: Top/argdecode.c:221 msgid "--0dbfs=N\t\t override 0dbfs (max positive signal amplitude)" msgstr "--Odbfs=N\t\t écrase 0dbfs (amplitude positive max du signal)" -#: Top/argdecode.c:221 +#: Top/argdecode.c:222 msgid "--sinesize\t\tlength of internal sine table" msgstr "--sinesize\t\tlongueur de la table de sinus interne" #: Top/argdecode.c:223 +msgid "" +"--daemon\t\t daemon mode: do not exit if CSD/orchestra is not given, is " +"empty or does not compile" +msgstr "" + +#: Top/argdecode.c:225 +msgid "" +"--port=N\t\t listen to UDP port N for instruments/orchestra code (implies --" +"daemon)" +msgstr "" + +#: Top/argdecode.c:228 msgid "--help\t\t\tLong help" msgstr "--help\t\t\tAide détaillée" -#: Top/argdecode.c:239 +#: Top/argdecode.c:244 #, c-format msgid "flag defaults: csound -s -otest -b%d -B%d -m%d\n" msgstr "options par défaut : csound -s -otest -b%d -B%d -m%d\n" -#: Top/argdecode.c:246 Top/argdecode.c:262 +#: Top/argdecode.c:251 Top/argdecode.c:267 msgid "Usage:\tcsound [-flags] orchfile scorefile\n" msgstr "Utilisation : \tcsound [-options] fichierorch fichierpartition\n" -#: Top/argdecode.c:247 Top/argdecode.c:263 util/envext.c:53 util/xtrct.c:67 +#: Top/argdecode.c:252 Top/argdecode.c:268 util/envext.c:53 util/xtrct.c:67 msgid "Legal flags are:\n" msgstr "Les options légales sont :\n" -#: Top/argdecode.c:248 +#: Top/argdecode.c:253 msgid "" "Long format:\n" "\n" @@ -10219,7 +10265,7 @@ "Format long :\n" "\n" -#: Top/argdecode.c:253 +#: Top/argdecode.c:258 msgid "" "\n" "Short form:\n" @@ -10227,179 +10273,179 @@ "\n" "Format court :\n" -#: Top/argdecode.c:266 +#: Top/argdecode.c:271 msgid "Csound Command ERROR:\t" msgstr "ERREUR de la commande csound :\t" -#: Top/argdecode.c:401 +#: Top/argdecode.c:406 #, c-format msgid "unknown output format: '%s'" msgstr "format de sortie inconnu : '%s'" -#: Top/argdecode.c:419 Top/argdecode.c:1008 +#: Top/argdecode.c:424 Top/argdecode.c:1024 msgid "no iobufsamps" msgstr "pas de iobufsamps" -#: Top/argdecode.c:426 Top/argdecode.c:1015 +#: Top/argdecode.c:431 Top/argdecode.c:1031 msgid "no hardware bufsamps" msgstr "pas de bufsamps matériels" -#: Top/argdecode.c:452 Top/argdecode.c:1115 +#: Top/argdecode.c:457 Top/argdecode.c:1132 msgid "no midifile name" msgstr "pas de nom de fichier midi" -#: Top/argdecode.c:457 Top/argdecode.c:1121 +#: Top/argdecode.c:461 Top/argdecode.c:1137 msgid "-F: stdin not supported on this platform" msgstr "-F : stdin n'est pas supporté sur cette plateforme" -#: Top/argdecode.c:467 +#: Top/argdecode.c:473 msgid "no midi output file name" msgstr "pas de nom de fichier midi en sortie" -#: Top/argdecode.c:496 +#: Top/argdecode.c:502 msgid "invalid python variable definition syntax" msgstr "syntaxe de définition de variable python non valide" -#: Top/argdecode.c:502 Top/argdecode.c:976 +#: Top/argdecode.c:508 Top/argdecode.c:992 msgid "no infilename" msgstr "pas de nom de fichier en entrée" -#: Top/argdecode.c:505 Top/argdecode.c:980 +#: Top/argdecode.c:511 Top/argdecode.c:996 msgid "input cannot be stdout" msgstr "l'entrée ne peut pas être stdout" -#: Top/argdecode.c:509 Top/argdecode.c:984 +#: Top/argdecode.c:515 Top/argdecode.c:1000 msgid "stdin audio not supported" msgstr "l'audio sur stdin n'est pas supporté" -#: Top/argdecode.c:544 Top/argdecode.c:1048 +#: Top/argdecode.c:550 Top/argdecode.c:1064 msgid "no control rate" msgstr "pas de taux de contrôle" -#: Top/argdecode.c:558 Top/argdecode.c:1090 +#: Top/argdecode.c:564 Top/argdecode.c:1106 msgid "no Linein score device_name" msgstr "pas de nom de périphérique d'entrée pour la partition" -#: Top/argdecode.c:574 Top/argdecode.c:580 Top/argdecode.c:1056 +#: Top/argdecode.c:580 Top/argdecode.c:586 Top/argdecode.c:1072 msgid "no message level" msgstr "pas de niveau de message" -#: Top/argdecode.c:587 +#: Top/argdecode.c:593 msgid "no message amps" msgstr "pas de messages d'amplitude" -#: Top/argdecode.c:596 +#: Top/argdecode.c:602 msgid "no message range" msgstr "pas de messages de dépassement" -#: Top/argdecode.c:605 +#: Top/argdecode.c:611 msgid "no message warnings" msgstr "pas de messages d'avertissement" -#: Top/argdecode.c:614 +#: Top/argdecode.c:620 msgid "no message raw" msgstr "pas de messages d'amplitude brute" -#: Top/argdecode.c:623 +#: Top/argdecode.c:629 msgid "no message dB" msgstr "pas de messages d'amplitude en dB" -#: Top/argdecode.c:632 +#: Top/argdecode.c:638 msgid "no message colours" msgstr "pas de messages d'amplitude colorés" -#: Top/argdecode.c:641 +#: Top/argdecode.c:647 msgid "no benchmark level" msgstr "pas de niveau de test de performance" -#: Top/argdecode.c:649 +#: Top/argdecode.c:655 msgid "no value for --csd-line-nums" msgstr "pas de valeur pour --csd-line-nums" -#: Top/argdecode.c:658 Top/argdecode.c:1101 +#: Top/argdecode.c:664 Top/argdecode.c:1117 msgid "no midi device_name" msgstr "pas de nom de périphérique midi" -#: Top/argdecode.c:663 Top/argdecode.c:1107 +#: Top/argdecode.c:669 Top/argdecode.c:1122 msgid "-M: stdin not supported on this platform" msgstr "-M : stdin n'est pas supporté sur cette plateforme" -#: Top/argdecode.c:683 Top/argdecode.c:992 util/envext.c:84 util/mixer.c:206 +#: Top/argdecode.c:689 Top/argdecode.c:1008 util/envext.c:84 util/mixer.c:206 #: util/scale.c:173 util/srconv.c:247 util/xtrct.c:120 msgid "no outfilename" msgstr "pas de nom de fichier de sortie" -#: Top/argdecode.c:686 Top/argdecode.c:996 util/scale.c:177 util/srconv.c:251 +#: Top/argdecode.c:692 Top/argdecode.c:1012 util/scale.c:177 util/srconv.c:251 #: util/xtrct.c:124 msgid "-o cannot be stdin" msgstr "-o ne peut pas être stdin" -#: Top/argdecode.c:690 Top/argdecode.c:1000 util/scale.c:180 util/srconv.c:256 +#: Top/argdecode.c:696 Top/argdecode.c:1016 util/scale.c:180 util/srconv.c:256 msgid "stdout audio not supported" msgstr "audio sur stdout non supporté" -#: Top/argdecode.c:700 Top/argdecode.c:1198 util/hetro.c:232 +#: Top/argdecode.c:706 Top/argdecode.c:1216 util/hetro.c:232 msgid "no log file" msgstr "pas de fichier journal" -#: Top/argdecode.c:755 Top/argdecode.c:955 +#: Top/argdecode.c:761 Top/argdecode.c:971 msgid "no utility name" msgstr "pas de nom d'utilitaire" -#: Top/argdecode.c:774 Top/argdecode.c:1070 +#: Top/argdecode.c:780 Top/argdecode.c:1086 msgid "no xfilename" msgstr "pas de nom de fichier d'extraction de partition" -#: Top/argdecode.c:920 +#: Top/argdecode.c:936 #, c-format msgid "unknown long option: '--%s'" msgstr "option longue inconnue : '--%s'" -#: Top/argdecode.c:1043 +#: Top/argdecode.c:1059 msgid "no sample rate" msgstr "pas de taux d'échantillonnage" -#: Top/argdecode.c:1075 +#: Top/argdecode.c:1091 msgid "no tempo value" msgstr "pas de valeur de tempo" -#: Top/argdecode.c:1080 +#: Top/argdecode.c:1096 msgid "illegal tempo" msgstr "tempo illégal" -#: Top/argdecode.c:1129 +#: Top/argdecode.c:1147 msgid "no MIDI output device" msgstr "pas de périphérique de sortie MIDI" -#: Top/argdecode.c:1181 +#: Top/argdecode.c:1199 msgid "No indirection file" msgstr "Pas de fichier d'indirection" -#: Top/argdecode.c:1188 +#: Top/argdecode.c:1206 #, c-format msgid "Cannot open indirection file %s\n" msgstr "Impossible d'ouvrir le fichier d'indirection %s\n" -#: Top/argdecode.c:1217 +#: Top/argdecode.c:1235 msgid "no number of threads" msgstr "aucun numéro de thread" -#: Top/argdecode.c:1228 util/envext.c:94 util/mixer.c:316 util/scale.c:241 +#: Top/argdecode.c:1246 util/envext.c:94 util/mixer.c:316 util/scale.c:241 #: util/xtrct.c:239 #, c-format msgid "unknown flag -%c" msgstr "option -%c inconnue" -#: Top/argdecode.c:1235 +#: Top/argdecode.c:1253 msgid "error: orchestra and score name not allowed in .csound6rc" msgstr "" "erreur : les noms d'orchestre et de partition sont interdits dans .csound6rc" -#: Top/argdecode.c:1381 +#: Top/argdecode.c:1401 msgid "stdout not supported on this platform" msgstr "stdout n'est pas supporté sur cette plateforme" -#: Top/argdecode.c:1421 Top/argdecode.c:1441 Top/argdecode.c:1461 +#: Top/argdecode.c:1441 Top/argdecode.c:1461 Top/argdecode.c:1481 msgid "stdin not supported on this platform" msgstr "stdin n'est pas supporté sur cette plateforme" @@ -10451,13 +10497,13 @@ msgid "cscoreFileGetCurrent: no fp current" msgstr "cscoreFileGetCurrent : pas de pointeur de fichier courant" -#: Top/csmodule.c:195 +#: Top/csmodule.c:199 #, c-format msgid "not loading '%s' (uses incompatible floating point type)" msgstr "" "'%s' n'est pas chargé (utilisation de type virgule flottante incompatible)" -#: Top/csmodule.c:204 +#: Top/csmodule.c:208 #, c-format msgid "" "not loading '%s' (incompatible with this version of Csound (%d.%d/%d.%d)" @@ -10465,65 +10511,65 @@ "'%s' n'est pas chargé (incompatible avec cette version de Csound (%d.%d/%d." "%d)" -#: Top/csmodule.c:247 +#: Top/csmodule.c:251 #, c-format msgid "could not open library '%s' (%s)" msgstr "la bibliothèque '%s' (%s) n'a pas pu être ouverte" -#: Top/csmodule.c:250 +#: Top/csmodule.c:254 #, c-format msgid "could not open library '%s' (%d)" msgstr "la bibliothèque '%s' (%d) n'a pas pu être ouverte" -#: Top/csmodule.c:311 +#: Top/csmodule.c:315 #, c-format msgid "'%s' is not a Csound plugin library" msgstr "'%s' n'est pas une bibliothèque de plugin de Csound" -#: Top/csmodule.c:322 +#: Top/csmodule.c:326 msgid "csoundLoadExternal(): memory allocation failure" msgstr "csoundLoadExternal() : échec de l'allocation mémoire" -#: Top/csmodule.c:336 Top/csmodule.c:344 +#: Top/csmodule.c:340 Top/csmodule.c:348 #, c-format msgid "Error in pre-initialisation function of module '%s'" msgstr "Erreur dans le fonction de pré-initialisation du module '%s'" -#: Top/csmodule.c:417 +#: Top/csmodule.c:426 #, c-format msgid "Error opening plugin directory '%s': %s" msgstr "Erreur en ouvrant le répertoire de plugin '%s' : %s" -#: Top/csmodule.c:420 +#: Top/csmodule.c:429 #, c-format msgid "Error opening plugin directory: %s" msgstr "Erreur en ouvrant le répertoire de plugin : %s" -#: Top/csmodule.c:455 +#: Top/csmodule.c:464 #, c-format msgid "path name too long, skipping '%s'" msgstr "nom de chemin trop long, on se passe de '%s'" -#: Top/csmodule.c:461 +#: Top/csmodule.c:470 #, c-format msgid "Library %s omitted\n" msgstr "Bibliothèque %s omise\n" -#: Top/csmodule.c:494 +#: Top/csmodule.c:503 msgid "Loading command-line libraries:\n" msgstr "Chargement des bibliothèques de ligne de commande :\n" -#: Top/csmodule.c:517 +#: Top/csmodule.c:526 #, c-format msgid " *** error loading '%s'" msgstr " *** erreur en chargeant '%s'" -#: Top/csmodule.c:540 +#: Top/csmodule.c:549 #, c-format msgid "Error starting module '%s'" msgstr "Erreur au démarrage du module '%s'" -#: Top/csmodule.c:639 +#: Top/csmodule.c:648 #, c-format msgid "Error de-initialising module '%s'" msgstr "Erreur de dé-initialisation du module '%s'" @@ -10532,207 +10578,207 @@ msgid "Error allocating opcode list" msgstr "Erreur lors de l'allocation de la liste d'opcodes" -#: Top/csound.c:1409 +#: Top/csound.c:1410 #, c-format msgid "Multithread performance: insno: %3d thread %d of %d starting.\n" msgstr "Exécution multithread : insno : %3d démarrage du thread %d sur %d.\n" -#: Top/csound.c:1415 +#: Top/csound.c:1416 msgid "Bad ThreadId" msgstr "Mauvais ThreadId" -#: Top/csound.c:1603 Top/csound.c:1635 Top/csound.c:1663 Top/csound.c:1699 -#: Top/csound.c:3879 +#: Top/csound.c:1604 Top/csound.c:1636 Top/csound.c:1664 Top/csound.c:1700 +#: Top/csound.c:3884 msgid "Csound not ready for performance: csoundStart() has not been called \n" msgstr "" "Csound n'est pas prêt pour l'exécution : csoundStart() n'a pas été appelée\n" -#: Top/csound.c:1619 Top/csound.c:1648 +#: Top/csound.c:1620 Top/csound.c:1649 msgid "Score finished in csoundPerformKsmps().\n" msgstr "La partition est finie dans csoundPerformKsmps().\n" -#: Top/csound.c:1642 Top/csound.c:3886 +#: Top/csound.c:1643 Top/csound.c:3891 msgid "Early return from csoundPerformKsmps().\n" msgstr "Retour prématuré de csoundPerformKsmps().\n" -#: Top/csound.c:1670 +#: Top/csound.c:1671 msgid "Early return from csoundPerformBuffer().\n" msgstr "Retour prématuré de csoundPerformBuffer().\n" -#: Top/csound.c:1708 +#: Top/csound.c:1709 msgid "Early return from csoundPerform().\n" msgstr "Retour prématuré de csoundPerform().\n" -#: Top/csound.c:1716 +#: Top/csound.c:1717 msgid "Score finished in csoundPerform().\n" msgstr "La partition est finie dans csoundPerform().\n" -#: Top/csound.c:1727 +#: Top/csound.c:1728 msgid "csoundPerform(): stopped.\n" msgstr "csoundPerform() : arrêté.\n" -#: Top/csound.c:2010 +#: Top/csound.c:2012 msgid "WARNING: " msgstr "AVERTISSEMENT : " -#: Top/csound.c:2150 +#: Top/csound.c:2154 msgid "rtdummy: failed to allocate globals" msgstr "rtdummy : l'allocation des variables globales a échoué" -#: Top/csound.c:2151 +#: Top/csound.c:2155 msgid "rtaudio: dummy module enabled\n" msgstr "rtaudio : module factice activé\n" -#: Top/csound.c:2180 Top/csound.c:2217 +#: Top/csound.c:2184 Top/csound.c:2221 msgid " *** error: rtaudio module set to empty string" msgstr " *** erreur : le module rtaudio est fixé par une chaîne vide" -#: Top/csound.c:2184 Top/csound.c:2221 +#: Top/csound.c:2188 Top/csound.c:2225 #, c-format msgid " unknown rtaudio module: '%s', using dummy module" msgstr " module rtaudio inconnu : '%s', utilisation d'un module factice" -#: Top/csound.c:2338 +#: Top/csound.c:2342 msgid "WARNING: real time midi input disabled, using dummy functions\n" msgstr "" "AVERTISSEMENT : l'entrée midi en temps réel est désactivée, utilisation de " "fonctions factices\n" -#: Top/csound.c:2343 Top/csound.c:2377 +#: Top/csound.c:2347 Top/csound.c:2381 msgid "error: -+rtmidi set to empty string" msgstr "erreur : -+rtmidi contient une chaîne vide" -#: Top/csound.c:2346 Top/csound.c:2380 +#: Top/csound.c:2350 Top/csound.c:2384 #, c-format msgid "error: -+rtmidi='%s': unknown module" msgstr "erreur : -+rtmidi='%s' : module inconnu" -#: Top/csound.c:2372 +#: Top/csound.c:2376 msgid "WARNING: real time midi output disabled, using dummy functions\n" msgstr "" "AVERTISSEMENT : la sortie midi en temps réel est désactivée, utilisation de " "fonctions factices\n" -#: Top/csound.c:2394 +#: Top/csound.c:2398 msgid "Unknown MIDI error" msgstr "Erreur MIDI inconnue" -#: Top/csound.c:2555 +#: Top/csound.c:2559 msgid "Failed to allocate new opcode entry." msgstr "Echec de l'allocation d'une nouvelle entrée d'opcode." -#: Top/csound.c:2577 +#: Top/csound.c:2581 #, c-format msgid "Failed to allocate opcode entry for %s." msgstr "Echec de l'allocation d'une entrée d'opcode pour %s." -#: Top/csound.c:2717 Top/main.c:390 +#: Top/csound.c:2721 Top/main.c:358 msgid "setting dummy interface\n" msgstr "mise en place d'une interface factice\n" -#: Top/csound.c:2793 +#: Top/csound.c:2798 msgid "Failed during csoundInitEnv" msgstr "Echec dans csoundInitEnv" -#: Top/csound.c:2815 +#: Top/csound.c:2820 msgid "Failed during csoundInitStaticModules" msgstr "Echec dans csoundInitStaticModules" -#: Top/csound.c:2831 +#: Top/csound.c:2836 msgid "Failed during csoundLoadModules" msgstr "Echec dans csoundLoadModules" -#: Top/csound.c:2888 +#: Top/csound.c:2893 msgid "Real time audio module name" msgstr "Nom du module audio en temps réel" -#: Top/csound.c:2913 +#: Top/csound.c:2918 msgid "Real time MIDI module name" msgstr "Nom du module MIDI en temps réel" -#: Top/csound.c:2918 +#: Top/csound.c:2923 msgid "Ignore events (other than tempo changes) in tracks defined by pattern" msgstr "" "Ignorer les évènements (autres que les changements de tempo) dans les pistes " "définies par le modèle" -#: Top/csound.c:2924 +#: Top/csound.c:2929 msgid "Do not handle special MIDI controllers (sustain pedal etc.)" msgstr "Ne pas traiter les contrôleurs MIDI spéciaux (pédale sustain, etc)" -#: Top/csound.c:2932 +#: Top/csound.c:2937 msgid "Title tag in output soundfile (no spaces)" msgstr "Champ titre dans le fichier son de sortie (pas d'espaces)" -#: Top/csound.c:2938 +#: Top/csound.c:2943 msgid "Copyright tag in output soundfile (no spaces)" msgstr "Champ copyright dans le fichier son de sortie (pas d'espaces)" -#: Top/csound.c:2944 +#: Top/csound.c:2949 msgid "Software tag in output soundfile (no spaces)" msgstr "Champ du logiciel dans le fichier son de sortie (pas d'espaces)" -#: Top/csound.c:2949 +#: Top/csound.c:2954 msgid "Artist tag in output soundfile (no spaces)" msgstr "Champ artiste dans le fichier son de sortie (pas d'espaces)" -#: Top/csound.c:2956 +#: Top/csound.c:2961 msgid "Comment tag in output soundfile (no spaces)" msgstr "Champ commentaire dans le fichier son de sortie (pas d'espaces)" -#: Top/csound.c:2961 +#: Top/csound.c:2966 msgid "Date tag in output soundfile (no spaces)" msgstr "Champ date dans le fichier son de sortie (pas d'espaces)" -#: Top/csound.c:2971 +#: Top/csound.c:2976 msgid "Enable message attributes (colors etc.)" msgstr "Activer les attributs de message (couleurs, etc)" -#: Top/csound.c:2977 +#: Top/csound.c:2982 msgid "Start score playback at the specified time, skipping earlier events" msgstr "" "Démarrer la restitution de la partition au temps spécifié, en ignorant les " "évènements antérieurs" -#: Top/csound.c:2984 +#: Top/csound.c:2989 msgid "Ignore in CSD files (default: no)" msgstr "Ignorer dans les fichiers CSD (non par défaut)" -#: Top/csound.c:3194 +#: Top/csound.c:3199 msgid "Cannot open /proc/cpuinfo. Support for RDTSC is not available.\n" msgstr "Impossible d'ouvrir /proc/cpuinfo. RDTSC n'est pas supporté.\n" -#: Top/csound.c:3224 +#: Top/csound.c:3229 msgid "No valid CPU frequency entry was found in /proc/cpuinfo.\n" msgstr "Aucune entrée de fréq CPU valide n'a été trouvée dans /proc/cpuinfo.\n" -#: Top/csound.c:3778 +#: Top/csound.c:3783 msgid "csoundDestroyMessageBuffer: Message buffer not allocated." msgstr "csoundDestroyMessageBuffer : tampon de message non alloué." -#: Top/csound.c:3809 +#: Top/csound.c:3814 msgid "csound: internal error: message buffer overflow\n" msgstr "csound : erreur interne : dépassement du tampon de messages\n" -#: Top/main.c:64 +#: Top/main.c:65 #, c-format msgid "WARNING: cannot open csound6rc file %s\n" msgstr "AVERTISSEMENT : impossible d'ouvrir le fichier csound6rc %s\n" -#: Top/main.c:67 +#: Top/main.c:68 #, c-format msgid "Reading options from $CSOUND6RC: %s \n" msgstr "Lecture des options depuis $CSOUND6RC : %s \n" -#: Top/main.c:76 +#: Top/main.c:77 msgid "Reading options from $HOME/.csound6rc\n" msgstr "Lecture des options depuis $HOME/.csound6rc\n" -#: Top/main.c:91 +#: Top/main.c:92 msgid "Reading options from local directory .csound6rc \n" msgstr "Lecture des options depuis le .csound6rc du répertoire local\n" -#: Top/main.c:112 +#: Top/main.c:113 msgid "" "Csound is already started, call csoundReset()\n" "before starting again \n" @@ -10740,78 +10786,93 @@ "Csound a déjà démarré, appeler csoundReset()\n" "avant de redémarrer\n" -#: Top/main.c:186 +#: Top/main.c:141 msgid "no orchestra name" msgstr "aucun nom d'orchestre" -#: Top/main.c:210 +#: Top/main.c:166 msgid "Reading CSD failed ... stopping" msgstr "La lecture du CSD a échoué ... arrêt" -#: Top/main.c:224 +#: Top/main.c:180 msgid "error: multiple uses of stdin" msgstr "erreur : utilisations multiples de stdin" -#: Top/main.c:228 +#: Top/main.c:184 msgid "error: multiple uses of stdout" msgstr "erreur : utilisations multiples de stdout" -#: Top/main.c:237 +#: Top/main.c:193 msgid "realtime performance using dummy numeric scorefile\n" msgstr "" "exécution en temps réel en utilisant un fichier de partition numérique " "factice\n" -#: Top/main.c:260 +#: Top/main.c:216 #, c-format msgid "orchname: %s\n" msgstr "nom de l'orchestre : %s\n" -#: Top/main.c:278 +#: Top/main.c:220 +#, fuzzy, c-format +msgid "Failed to open input file - %s\n" +msgstr "L'ouverture du fichier de sortie %s a échoué\n" + +#: Top/main.c:235 msgid "cannot compile orchestra \n" msgstr "impossible de compiler l'orchestre\n" -#: Top/main.c:291 +#: Top/main.c:240 +#, fuzzy +msgid "cannot compile orchestra." +msgstr "impossible de compiler l'orchestre\n" + +#: Top/main.c:241 +#, fuzzy +msgid "Csound will start with no instruments" +msgstr "Ajout d'une liste d'écriture globale sans instruments\n" + +#: Top/main.c:259 msgid "end of orchestra compile" msgstr "fin de la compilation de l'orchestre" -#: Top/main.c:299 +#: Top/main.c:267 #, c-format msgid "using previous %s\n" msgstr "utilisation du %s précédent\n" -#: Top/main.c:309 +#: Top/main.c:277 #, c-format msgid "cannot open scorefile %s" msgstr "impossible d'ouvrir le fichier de partition %s" -#: Top/main.c:311 +#: Top/main.c:279 msgid "sorting score ...\n" msgstr "tri de la partition ...\n" -#: Top/main.c:321 +#: Top/main.c:289 #, c-format msgid "cannot open extract file %s" msgstr "impossible d'ouvrir le fichier d'extraction %s" -#: Top/main.c:324 +#: Top/main.c:292 msgid " ... extracting ...\n" msgstr " ... extraction ...\n" -#: Top/main.c:333 +#: Top/main.c:301 msgid "end of score sort" msgstr "fin du tri de la partition" -#: Top/main.c:335 +#: Top/main.c:303 msgid "Syntax check completed.\n" msgstr "Vérification de la syntaxe accomplie.\n" -#: Top/main.c:456 util/dnoise.c:266 +#: Top/main.c:424 util/dnoise.c:266 #, c-format msgid "%s not a recognised SFOUTYP env setting" msgstr "%s n'est pas un réglage d'env SFOUTYP reconnu" -#: Top/main.c:475 +#: Top/main.c:443 msgid "srate and krate overrides must occur jointly" msgstr "" "les redéfinition des taux d'échantillonnage et de contrôle doivent être " @@ -10885,158 +10946,158 @@ msgstr "" " *** Taper 'csound --help' pour obtenir une liste des options disponibles." -#: Top/one_file.c:105 Top/one_file.c:115 +#: Top/one_file.c:96 Top/one_file.c:106 msgid " *** cannot create temporary file" msgstr " *** impossible de créer un fichier temporaire" -#: Top/one_file.c:199 +#: Top/one_file.c:182 #, c-format msgid "Removing temporary file %s ...\n" msgstr "Suppression du fichier temporaire %s ...\n" -#: Top/one_file.c:203 +#: Top/one_file.c:186 #, c-format msgid "WARNING: could not remove %s\n" msgstr "AVERTISSEMENT : impossible de supprimer %s\n" -#: Top/one_file.c:270 Top/one_file.c:304 +#: Top/one_file.c:253 Top/one_file.c:287 #, c-format msgid "More than %d arguments in " msgstr "Plus de %d arguments dans " -#: Top/one_file.c:342 +#: Top/one_file.c:325 #, c-format msgid "Invalid arguments in : %s" msgstr "Arguments non valides dans : %s" -#: Top/one_file.c:345 +#: Top/one_file.c:328 #, c-format msgid "Invalid arguments in .csoundrc or -@ file: %s" msgstr "Arguments non valides dans .csoundrc ou dans le fichier -@ : %s" -#: Top/one_file.c:351 Top/one_file.c:784 +#: Top/one_file.c:334 Top/one_file.c:767 msgid "Missing end tag " msgstr "La balise fermante est absente" -#: Top/one_file.c:380 +#: Top/one_file.c:361 msgid "Missing end tag " msgstr "La balise fermante est absente" -#: Top/one_file.c:400 Top/one_file.c:467 +#: Top/one_file.c:381 Top/one_file.c:449 msgid "Missing end tag " msgstr "La balise fermante est absente" -#: Top/one_file.c:415 Top/one_file.c:420 +#: Top/one_file.c:396 Top/one_file.c:401 msgid "Missing program in tag " msgstr "La balise fermante est absente" -#: Top/one_file.c:432 +#: Top/one_file.c:414 #, c-format msgid "Creating %s (%p)\n" msgstr "Création de %s (%p)\n" -#: Top/one_file.c:445 +#: Top/one_file.c:427 msgid "External generation failed" msgstr "La génération externe a échoué" -#: Top/one_file.c:505 +#: Top/one_file.c:487 #, c-format msgid "Non base64 character %c(%2x)" msgstr "Le caractère %c(%2x) n'est pas en base64" -#: Top/one_file.c:524 +#: Top/one_file.c:506 msgid "Truncated byte at end of base64 stream" msgstr "Octet tronqué à la fin du flux base64" -#: Top/one_file.c:540 +#: Top/one_file.c:523 #, c-format msgid "Cannot open temporary file (%s) for MIDI subfile" msgstr "Impossible d'ouvrir le fichier temporaire (%s) comme sous-fichier MIDI" -#: Top/one_file.c:557 +#: Top/one_file.c:540 msgid "Missing end tag " msgstr "La balise fermante est absente" -#: Top/one_file.c:573 Top/one_file.c:622 +#: Top/one_file.c:556 Top/one_file.c:605 #, c-format msgid "File %s already exists" msgstr "Le fichier %s existe déjà" -#: Top/one_file.c:578 +#: Top/one_file.c:561 #, c-format msgid "Cannot open sample file (%s) subfile" msgstr "Impossible d'ouvrir le sous-fichier du fichier d'échantillons (%s)" -#: Top/one_file.c:592 +#: Top/one_file.c:575 msgid "Missing end tag " msgstr "La balise fermante est absente" -#: Top/one_file.c:627 +#: Top/one_file.c:610 #, c-format msgid "Cannot open file (%s) subfile" msgstr "Impossible d'ouvrir le sous-fichier du fichier (%s)" -#: Top/one_file.c:642 +#: Top/one_file.c:625 msgid "Missing end tag " msgstr "La balise fermante est absente" -#: Top/one_file.c:662 +#: Top/one_file.c:645 #, c-format msgid "This CSD file requires a version of Csound before %d.%02d" msgstr "Ce fichier CSD nécessite une version de Csound antérieure à la %d.%02d" -#: Top/one_file.c:670 Top/one_file.c:677 +#: Top/one_file.c:653 Top/one_file.c:660 #, c-format msgid "This CSD file requires a version of Csound after %d.%02d" msgstr "Ce fichier CSD nécessite une version de Csound ultérieure à la %d.%02d" -#: Top/one_file.c:683 +#: Top/one_file.c:666 msgid "Missing end tag " msgstr "La balise fermante est absente" -#: Top/one_file.c:693 +#: Top/one_file.c:676 msgid "**** Licence Information ****\n" msgstr "**** Information de Licence ****\n" -#: Top/one_file.c:699 +#: Top/one_file.c:682 msgid "**** End of Licence Information ****\n" msgstr "**** Fin de l'Information de Licence ****\n" -#: Top/one_file.c:710 +#: Top/one_file.c:693 msgid "Missing end tag " msgstr "La balise fermante est absente" -#: Top/one_file.c:741 +#: Top/one_file.c:724 #, c-format msgid "Failed to open csd file: %s" msgstr "L'ouverture du fichier csd a échoué : %s" -#: Top/one_file.c:756 +#: Top/one_file.c:739 msgid "STARTING FILE\n" msgstr "DEBUT DU FICHIER\n" -#: Top/one_file.c:774 +#: Top/one_file.c:757 msgid "Creating options\n" msgstr "Création des options\n" -#: Top/one_file.c:780 +#: Top/one_file.c:763 msgid "Skipping \n" msgstr "On ignore \n" -#: Top/one_file.c:794 +#: Top/one_file.c:777 msgid "Creating orchestra\n" msgstr "Création de l'orchestre\n" -#: Top/one_file.c:799 +#: Top/one_file.c:782 msgid "Creating score\n" msgstr "Création de la partition\n" -#: Top/one_file.c:833 +#: Top/one_file.c:812 #, c-format msgid "unknown CSD tag: %s\n" msgstr "balise CSD inconnue : %s\n" -#: Top/one_file.c:838 +#: Top/one_file.c:817 msgid "Could not find tag in CSD file.\n" msgstr "" "La balise n'a pas été trouvée dans le fichier CSD.\n" diff -Nru csound-6.01~dfsg/po/german.po csound-6.02~dfsg/po/german.po --- csound-6.01~dfsg/po/german.po 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/po/german.po 2014-01-07 16:54:21.000000000 +0000 @@ -198,55 +198,55 @@ msgid "Not a proper list of ints" msgstr "" -#: Engine/csound_orc_compile.c:276 +#: Engine/csound_orc_compile.c:274 msgid "missing or extra arg" msgstr "" -#: Engine/csound_orc_compile.c:281 +#: Engine/csound_orc_compile.c:279 #, fuzzy msgid "too many input args\n" msgstr "zu viele Argumente\n" -#: Engine/csound_orc_compile.c:464 +#: Engine/csound_orc_compile.c:462 #, c-format msgid "create_opcode: No rule to handle statement of type %d\n" msgstr "" -#: Engine/csound_orc_compile.c:633 Engine/csound_orc_compile.c:691 +#: Engine/csound_orc_compile.c:631 Engine/csound_orc_compile.c:690 #, c-format msgid "%s invalid sample rate" msgstr "" -#: Engine/csound_orc_compile.c:635 Engine/csound_orc_compile.c:693 +#: Engine/csound_orc_compile.c:633 Engine/csound_orc_compile.c:692 #, c-format msgid "%s invalid control rate" msgstr "" -#: Engine/csound_orc_compile.c:639 Engine/csound_orc_compile.c:689 +#: Engine/csound_orc_compile.c:637 Engine/csound_orc_compile.c:688 #, c-format msgid "%s invalid ksmps value" msgstr "" -#: Engine/csound_orc_compile.c:641 Engine/csound_orc_compile.c:695 +#: Engine/csound_orc_compile.c:639 Engine/csound_orc_compile.c:694 #, c-format msgid "%s inconsistent sr, kr, ksmps" msgstr "" -#: Engine/csound_orc_compile.c:643 +#: Engine/csound_orc_compile.c:641 #, c-format msgid "%s inconsistent sr, kr, ksmps \n" msgstr "" -#: Engine/csound_orc_compile.c:659 +#: Engine/csound_orc_compile.c:657 msgid "bad value for 0dbfs: must be positive. Setting default value." msgstr "" -#: Engine/csound_orc_compile.c:680 +#: Engine/csound_orc_compile.c:679 #, c-format msgid "sample rate overrides: esr = %7.4f, ekr = %7.4f, ksmps = %d\n" msgstr "" -#: Engine/csound_orc_compile.c:686 +#: Engine/csound_orc_compile.c:685 #, c-format msgid "" "sr = %.7g, kr = %.7g, ksmps = %.7g\n" @@ -255,103 +255,103 @@ "sr = %.7g, kr = %.7g, ksmps = %.7g\n" "Störung:" -#: Engine/csound_orc_compile.c:832 +#: Engine/csound_orc_compile.c:842 #, c-format msgid "create_instrument: instr num %ld\n" msgstr "" -#: Engine/csound_orc_compile.c:921 +#: Engine/csound_orc_compile.c:934 msgid "-- deleted instr from deadpool \n" msgstr "" -#: Engine/csound_orc_compile.c:949 +#: Engine/csound_orc_compile.c:962 #, c-format msgid " -- free instr def %p \n" msgstr "" -#: Engine/csound_orc_compile.c:962 Engine/csound_orc_compile.c:973 +#: Engine/csound_orc_compile.c:975 Engine/csound_orc_compile.c:986 #, c-format msgid " -- added to deadpool slot %d \n" msgstr "" -#: Engine/csound_orc_compile.c:998 Engine/csound_orc_compile.c:1144 +#: Engine/csound_orc_compile.c:1011 Engine/csound_orc_compile.c:1158 #, c-format msgid "instr %ld redefined, replacing previous definition" msgstr "" -#: Engine/csound_orc_compile.c:1096 +#: Engine/csound_orc_compile.c:1109 #, c-format msgid "instr %s uses instrument number %d\n" msgstr "" -#: Engine/csound_orc_compile.c:1168 +#: Engine/csound_orc_compile.c:1183 #, c-format msgid "no active instances of instr %d \n" msgstr "" -#: Engine/csound_orc_compile.c:1213 +#: Engine/csound_orc_compile.c:1228 msgid "!!! csound->opcodeInfo is NULL !!!\n" msgstr "" -#: Engine/csound_orc_compile.c:1249 +#: Engine/csound_orc_compile.c:1264 #, c-format msgid " merging constants %d) %f\n" msgstr "" -#: Engine/csound_orc_compile.c:1258 +#: Engine/csound_orc_compile.c:1273 #, c-format msgid " merging %d) %s:%s\n" msgstr "" -#: Engine/csound_orc_compile.c:1281 +#: Engine/csound_orc_compile.c:1299 #, c-format msgid "merging instr %d \n" msgstr "" -#: Engine/csound_orc_compile.c:1289 +#: Engine/csound_orc_compile.c:1307 #, c-format msgid "merging instr %s \n" msgstr "" -#: Engine/csound_orc_compile.c:1452 Engine/csound_orc_compile.c:1480 -#: Engine/csound_orc_compile.c:1503 +#: Engine/csound_orc_compile.c:1471 Engine/csound_orc_compile.c:1499 +#: Engine/csound_orc_compile.c:1522 msgid "invalid name for instrument" msgstr "unzulässiger Name für Instrument" -#: Engine/csound_orc_compile.c:1485 Engine/csound_orc_compile.c:1508 +#: Engine/csound_orc_compile.c:1504 Engine/csound_orc_compile.c:1527 #, c-format msgid "instr %s redefined" msgstr "" -#: Engine/csound_orc_compile.c:1530 +#: Engine/csound_orc_compile.c:1549 #, c-format msgid "ERROR: Could not find OPCODINFO for opname: %s\n" msgstr "" -#: Engine/csound_orc_compile.c:1551 +#: Engine/csound_orc_compile.c:1570 #, c-format msgid "Unknown TREE node of type %d found in root.\n" msgstr "" -#: Engine/csound_orc_compile.c:1560 +#: Engine/csound_orc_compile.c:1579 #, c-format msgid "%d syntax errors in orchestra. compilation invalid\n" msgstr "" -#: Engine/csound_orc_compile.c:1600 +#: Engine/csound_orc_compile.c:1620 msgid "perf-pass statements illegal in header blk\n" msgstr "" -#: Engine/csound_orc_compile.c:1772 +#: Engine/csound_orc_compile.c:1792 msgid "i[fixme] pset args != pmax" msgstr "" -#: Engine/csound_orc_compile.c:1894 +#: Engine/csound_orc_compile.c:1922 #, c-format msgid "Missing local arg: %s\n" msgstr "" -#: Engine/csound_orc_compile.c:2025 +#: Engine/csound_orc_compile.c:2054 #, c-format msgid "Opcode \"%s\" is deprecated\n" msgstr "" @@ -428,46 +428,46 @@ msgid "Variable type for %s could not be determined.\n" msgstr "" -#: Engine/csound_orc_semantics.c:1300 +#: Engine/csound_orc_semantics.c:1301 #, c-format msgid "Unable to find opcode with name: %s\n" msgstr "" -#: Engine/csound_orc_semantics.c:1315 +#: Engine/csound_orc_semantics.c:1316 #, c-format msgid "Unable to find opcode entry for '%s' with matching argument types:\n" msgstr "" -#: Engine/csound_orc_semantics.c:1318 +#: Engine/csound_orc_semantics.c:1319 #, c-format msgid "Found: %s %s %s\n" msgstr "" -#: Engine/csound_orc_semantics.c:1320 +#: Engine/csound_orc_semantics.c:1321 #, c-format msgid "Line: %d Loc: %d\n" msgstr "" -#: Engine/csound_orc_semantics.c:1454 +#: Engine/csound_orc_semantics.c:1455 #, c-format msgid "expression for until statement not a boolean expression, line %d\n" msgstr "" -#: Engine/csound_orc_semantics.c:1607 +#: Engine/csound_orc_semantics.c:1608 #, c-format msgid "" "\n" "error: %s (token \"%s\")" msgstr "" -#: Engine/csound_orc_semantics.c:1609 +#: Engine/csound_orc_semantics.c:1610 #, c-format msgid "" " line %d:\n" ">>>" msgstr "" -#: Engine/csound_orc_semantics.c:2141 +#: Engine/csound_orc_semantics.c:2142 #, fuzzy, c-format msgid "insufficient required arguments for opcode %s on line %d:%d\n" msgstr "unzulängliche Argumente" @@ -482,239 +482,239 @@ msgid "Creating search path cache for '%s':" msgstr "" -#: Engine/envvar.c:729 +#: Engine/envvar.c:731 msgid "Current directory path name too long\n" msgstr "" -#: Engine/envvar.c:1003 +#: Engine/envvar.c:1005 #, c-format msgid "internal error: csoundFileOpen(): invalid type: %d" msgstr "" -#: Engine/envvar.c:1193 +#: Engine/envvar.c:1195 #, c-format msgid "internal error: csoundCreateFileHandle(): invalid type: %d" msgstr "" -#: Engine/fgens.c:91 +#: Engine/fgens.c:99 msgid "unknown GEN number" msgstr "" -#: Engine/fgens.c:133 +#: Engine/fgens.c:141 msgid "ftable does not exist" msgstr "" -#: Engine/fgens.c:138 +#: Engine/fgens.c:146 #, c-format msgid "ftable %d now deleted\n" msgstr "" -#: Engine/fgens.c:153 Engine/fgens.c:1612 Engine/fgens.c:1698 -#: Engine/fgens.c:1777 Engine/fgens.c:1893 Engine/fgens.c:1974 -#: Engine/fgens.c:3023 +#: Engine/fgens.c:161 Engine/fgens.c:1630 Engine/fgens.c:1716 +#: Engine/fgens.c:1795 Engine/fgens.c:1911 Engine/fgens.c:1992 +#: Engine/fgens.c:3043 msgid "insufficient gen arguments" msgstr "" -#: Engine/fgens.c:179 Opcodes/ftgen.c:117 +#: Engine/fgens.c:187 Opcodes/ftgen.c:117 #, c-format msgid "Named gen \"%s\" not defined" msgstr "" -#: Engine/fgens.c:187 +#: Engine/fgens.c:195 msgid "illegal gen number" msgstr "" -#: Engine/fgens.c:195 +#: Engine/fgens.c:203 msgid "deferred size for GENs 1, 23, 28 or 49 only" msgstr "" -#: Engine/fgens.c:198 Engine/fgens.c:250 +#: Engine/fgens.c:206 Engine/fgens.c:258 #, c-format msgid "ftable %d:\n" msgstr "" -#: Engine/fgens.c:223 Engine/fgens.c:2301 Engine/fgens.c:2880 +#: Engine/fgens.c:231 Engine/fgens.c:2320 Engine/fgens.c:2899 msgid "illegal table length" msgstr "ungültige Tabelle Länge" -#: Engine/fgens.c:293 Engine/fgens.c:2262 +#: Engine/fgens.c:304 Engine/fgens.c:2281 #, c-format msgid "" "ftable %d relocating due to size change\n" " currently active instruments may find this disturbing" msgstr "" -#: Engine/fgens.c:351 Engine/fgens.c:472 Engine/fgens.c:556 Engine/fgens.c:637 -#: Engine/fgens.c:712 Engine/fgens.c:761 Engine/fgens.c:882 Engine/fgens.c:959 -#: Engine/fgens.c:1060 Engine/fgens.c:1104 Engine/fgens.c:1151 -#: Engine/fgens.c:1405 Engine/fgens.c:1467 Engine/fgens.c:1696 -#: Engine/fgens.c:1774 Engine/fgens.c:2129 Engine/fgens.c:2977 -#: Engine/fgens.c:3020 +#: Engine/fgens.c:362 Engine/fgens.c:483 Engine/fgens.c:567 Engine/fgens.c:648 +#: Engine/fgens.c:723 Engine/fgens.c:772 Engine/fgens.c:893 Engine/fgens.c:970 +#: Engine/fgens.c:1071 Engine/fgens.c:1115 Engine/fgens.c:1165 +#: Engine/fgens.c:1423 Engine/fgens.c:1485 Engine/fgens.c:1714 +#: Engine/fgens.c:1792 Engine/fgens.c:2147 Engine/fgens.c:2997 +#: Engine/fgens.c:3040 msgid "using extended arguments\n" msgstr "" -#: Engine/fgens.c:375 +#: Engine/fgens.c:386 msgid "no coefs present" msgstr "" -#: Engine/fgens.c:380 Engine/fgens.c:646 Engine/fgens.c:654 +#: Engine/fgens.c:391 Engine/fgens.c:657 Engine/fgens.c:665 msgid "illegal x interval" msgstr "" -#: Engine/fgens.c:409 Engine/fgens.c:558 Engine/fgens.c:639 Engine/fgens.c:884 -#: Engine/fgens.c:1362 Engine/fgens.c:2473 Engine/fgens.c:2781 -#: Engine/fgens.c:2922 Opcodes/ftest.c:128 Top/main.c:118 util/cvanal.c:67 +#: Engine/fgens.c:420 Engine/fgens.c:569 Engine/fgens.c:650 Engine/fgens.c:895 +#: Engine/fgens.c:1380 Engine/fgens.c:2492 Engine/fgens.c:2800 +#: Engine/fgens.c:2941 Opcodes/ftest.c:128 Top/main.c:119 util/cvanal.c:67 #: util/lpanal.c:401 util/pvanal.c:170 msgid "insufficient arguments" msgstr "unzulängliche Argumente" -#: Engine/fgens.c:413 Engine/fgens.c:1367 +#: Engine/fgens.c:424 Engine/fgens.c:1385 msgid "unknown srctable number" msgstr "" -#: Engine/fgens.c:426 +#: Engine/fgens.c:437 msgid "table size too large" msgstr "" -#: Engine/fgens.c:511 Engine/fgens.c:544 +#: Engine/fgens.c:522 Engine/fgens.c:555 msgid "gen call has negative segment size:" msgstr "" -#: Engine/fgens.c:513 +#: Engine/fgens.c:524 msgid "illegal input vals for gen call, beginning:" msgstr "" -#: Engine/fgens.c:579 +#: Engine/fgens.c:590 msgid "negative segsiz" msgstr "" -#: Engine/fgens.c:788 +#: Engine/fgens.c:799 msgid "nh partials < 1" msgstr "" -#: Engine/fgens.c:887 +#: Engine/fgens.c:898 msgid "illegal xint value" msgstr "" -#: Engine/fgens.c:890 +#: Engine/fgens.c:901 msgid "illegal xamp value" msgstr "" -#: Engine/fgens.c:963 +#: Engine/fgens.c:974 msgid "uneven number of args" msgstr "" -#: Engine/fgens.c:1088 +#: Engine/fgens.c:1099 msgid "gen call has illegal x-ordinate values:" msgstr "" -#: Engine/fgens.c:1106 +#: Engine/fgens.c:1117 msgid "wrong number of args" msgstr "" -#: Engine/fgens.c:1120 +#: Engine/fgens.c:1131 msgid "a range given exceeds table length" msgstr "" -#: Engine/fgens.c:1127 +#: Engine/fgens.c:1138 msgid "an input function does not exist" msgstr "" -#: Engine/fgens.c:1260 +#: Engine/fgens.c:1274 msgid "No such window!" msgstr "" -#: Engine/fgens.c:1278 +#: Engine/fgens.c:1292 msgid "Wrong number of input arguments" msgstr "Falsche Zahl der Eingang Argumente" -#: Engine/fgens.c:1279 +#: Engine/fgens.c:1293 msgid "unknown distribution" msgstr "unbekannte Verteilung" -#: Engine/fgens.c:1328 +#: Engine/fgens.c:1342 msgid "error opening ASCII file" msgstr "Störung Öffnung ASCII Akte" -#: Engine/fgens.c:1334 +#: Engine/fgens.c:1352 #, c-format msgid "%ld elements in %s\n" msgstr "" -#: Engine/fgens.c:1346 +#: Engine/fgens.c:1364 msgid "Numbers after table full in GEN23" msgstr "" -#: Engine/fgens.c:1375 +#: Engine/fgens.c:1393 msgid "table size must be the same of source table" msgstr "" -#: Engine/fgens.c:1447 Engine/fgens.c:1507 +#: Engine/fgens.c:1465 Engine/fgens.c:1525 msgid "x coordinates must all be in increasing order:" msgstr "alle Koordinaten x müssen in zunehmendem Auftrag sein" -#: Engine/fgens.c:1450 Engine/fgens.c:1509 +#: Engine/fgens.c:1468 Engine/fgens.c:1527 msgid "x coordinate greater than function size:" msgstr "" -#: Engine/fgens.c:1454 +#: Engine/fgens.c:1472 msgid "illegal input val (y <= 0) for gen call, beginning:" msgstr "" -#: Engine/fgens.c:1527 +#: Engine/fgens.c:1545 msgid "GEN28 requires zero table length" msgstr "" -#: Engine/fgens.c:1596 +#: Engine/fgens.c:1614 msgid "could not open space file" msgstr "" -#: Engine/fgens.c:1598 +#: Engine/fgens.c:1616 msgid "Time values must be in increasing order" msgstr "Zeitwerte müssen in zunehmendem Auftrag sein" -#: Engine/fgens.c:1619 +#: Engine/fgens.c:1637 msgid "GEN30: source ftable not found" msgstr "" -#: Engine/fgens.c:1702 +#: Engine/fgens.c:1720 msgid "GEN31: source ftable not found" msgstr "" -#: Engine/fgens.c:1810 +#: Engine/fgens.c:1828 #, c-format msgid "GEN32: source ftable %d not found" msgstr "" -#: Engine/fgens.c:1904 +#: Engine/fgens.c:1922 msgid "GEN33: source ftable not found" msgstr "" -#: Engine/fgens.c:2072 +#: Engine/fgens.c:2090 msgid "unknown source table number" msgstr "unbekannte Quelltabelle Zahl" -#: Engine/fgens.c:2104 +#: Engine/fgens.c:2122 msgid "Gen41: negative probability not allowed" msgstr "" -#: Engine/fgens.c:2170 Opcodes/fareygen.c:70 +#: Engine/fgens.c:2188 Opcodes/fareygen.c:70 #, c-format msgid "ftable %d: " msgstr "" -#: Engine/fgens.c:2214 +#: Engine/fgens.c:2232 #, c-format msgid "ftable %d:" msgstr "" -#: Engine/fgens.c:2257 +#: Engine/fgens.c:2275 #, c-format msgid "replacing previous ftable %d" msgstr "Ersetzen vorhergehendes ftable %d" -#: Engine/fgens.c:2297 Engine/fgens.c:2423 Engine/fgens.c:2451 -#: Engine/fgens.c:2458 Opcodes/gab/gab.c:590 Opcodes/gab/gab.c:645 +#: Engine/fgens.c:2316 Engine/fgens.c:2442 Engine/fgens.c:2470 +#: Engine/fgens.c:2477 Opcodes/gab/gab.c:592 Opcodes/gab/gab.c:647 #: Opcodes/midiops2.c:233 Opcodes/midiops2.c:388 Opcodes/midiops2.c:470 #: Opcodes/uggab.c:1625 Opcodes/uggab.c:1661 Opcodes/uggab.c:1683 #: Opcodes/uggab.c:1736 @@ -722,122 +722,122 @@ msgid "Invalid ftable no. %f" msgstr "" -#: Engine/fgens.c:2306 +#: Engine/fgens.c:2325 #, c-format msgid "deferred-size ftable %f illegal here" msgstr "" -#: Engine/fgens.c:2362 Engine/fgens.c:2961 +#: Engine/fgens.c:2381 Engine/fgens.c:2981 #, c-format msgid "Deferred load of '%s' failed" msgstr "" -#: Engine/fgens.c:2429 +#: Engine/fgens.c:2448 #, c-format msgid "Deferred-size ftable %f load not available at perf time." msgstr "" -#: Engine/fgens.c:2497 +#: Engine/fgens.c:2516 #, c-format msgid "non-deferred ftable %d needs size %d\n" msgstr "" -#: Engine/fgens.c:2544 Opcodes/loscilx.c:69 +#: Engine/fgens.c:2563 Opcodes/loscilx.c:69 #, c-format msgid "invalid sample format: %d" msgstr "" -#: Engine/fgens.c:2552 Engine/fgens.c:2805 +#: Engine/fgens.c:2571 Engine/fgens.c:2824 #, c-format msgid "channel %d illegal" msgstr "Führung %d ungültig" -#: Engine/fgens.c:2558 +#: Engine/fgens.c:2577 msgid "deferred alloc\n" msgstr "aufgeschobene Verteilung\n" -#: Engine/fgens.c:2566 Engine/fgens.c:2878 +#: Engine/fgens.c:2585 Engine/fgens.c:2897 msgid "deferred size, but filesize unknown" msgstr "aufgeschobene Größe, aber Akte Größe Unbekanntes" -#: Engine/fgens.c:2569 Engine/fgens.c:2882 +#: Engine/fgens.c:2588 Engine/fgens.c:2901 #, c-format msgid " defer length %d\n" msgstr "" -#: Engine/fgens.c:2637 +#: Engine/fgens.c:2656 msgid "GEN1: input file truncated by ftable size" msgstr "" -#: Engine/fgens.c:2641 +#: Engine/fgens.c:2660 #, c-format msgid "\tlooping endpoint %d exceeds ftsize %d\n" msgstr "" -#: Engine/fgens.c:2657 +#: Engine/fgens.c:2676 msgid "GEN1 read error" msgstr "GEN1 Lesefehler" -#: Engine/fgens.c:2662 +#: Engine/fgens.c:2681 msgid "GEN1: aiff file truncated by ftable size" msgstr "" -#: Engine/fgens.c:2663 +#: Engine/fgens.c:2682 #, c-format msgid "\taudio samps %d exceeds ftsize %d" msgstr "" -#: Engine/fgens.c:2707 +#: Engine/fgens.c:2726 msgid "wrong number of ftable arguments" msgstr "falsche Zahl von ftable Argumenten" -#: Engine/fgens.c:2717 OOps/pstream.c:379 +#: Engine/fgens.c:2736 OOps/pstream.c:379 msgid "Failed to load PVOC-EX file" msgstr "" -#: Engine/fgens.c:2728 InOut/midirecv.c:417 OOps/midiops.c:402 +#: Engine/fgens.c:2747 InOut/midirecv.c:419 OOps/midiops.c:402 #: OOps/midiops.c:452 OOps/midiops.c:464 msgid "illegal channel number" msgstr "" -#: Engine/fgens.c:2746 +#: Engine/fgens.c:2765 msgid "ftable size too small" msgstr "" -#: Engine/fgens.c:2821 Opcodes/mp3in.c:87 Opcodes/mp3in.c:255 +#: Engine/fgens.c:2840 Opcodes/mp3in.c:87 Opcodes/mp3in.c:255 #: Top/cscorfns.c:176 Top/cscorfns.c:207 msgid "Not enough memory\n" msgstr "" -#: Engine/fgens.c:2987 +#: Engine/fgens.c:3007 msgid "gen51: invalid number of p-fields (too few grades)" msgstr "" -#: Engine/fgens.c:3027 +#: Engine/fgens.c:3047 msgid "number of channels inconsistent with number of args" msgstr "" -#: Engine/fgens.c:3186 +#: Engine/fgens.c:3206 msgid "GEN53: invalid number of gen arguments" msgstr "" -#: Engine/fgens.c:3196 +#: Engine/fgens.c:3216 msgid "GEN53: invalid table length" msgstr "" -#: Engine/fgens.c:3200 +#: Engine/fgens.c:3220 msgid "GEN53: invalid source table number" msgstr "" -#: Engine/fgens.c:3203 +#: Engine/fgens.c:3223 msgid "GEN53: mode must be in the range 0 to 15" msgstr "" -#: Engine/fgens.c:3207 +#: Engine/fgens.c:3227 msgid "GEN53: invalid source table length" msgstr "" -#: Engine/fgens.c:3212 +#: Engine/fgens.c:3232 msgid "GEN53: invalid window table" msgstr "" @@ -861,21 +861,21 @@ msgid "Instrument %d muted\n" msgstr "" -#: Engine/insert.c:144 Engine/insert.c:374 +#: Engine/insert.c:144 Engine/insert.c:376 #, c-format msgid "cannot allocate last note because it exceeds 100%% of cpu time" msgstr "" -#: Engine/insert.c:150 Engine/insert.c:380 +#: Engine/insert.c:150 Engine/insert.c:382 msgid "cannot allocate last note because it exceeds instr maxalloc" msgstr "" -#: Engine/insert.c:168 Engine/insert.c:400 +#: Engine/insert.c:168 #, c-format msgid "new alloc for instr %s:\n" msgstr "" -#: Engine/insert.c:170 Engine/insert.c:402 +#: Engine/insert.c:170 #, c-format msgid "new alloc for instr %d:\n" msgstr "" @@ -890,51 +890,61 @@ msgid "instr %d uses %d p-fields but is given %d" msgstr "" -#: Engine/insert.c:345 Engine/insert.c:573 +#: Engine/insert.c:345 Engine/insert.c:575 #, c-format msgid "instr %s now active:\n" msgstr "" -#: Engine/insert.c:347 Engine/insert.c:575 +#: Engine/insert.c:347 Engine/insert.c:577 #, c-format msgid "instr %d now active:\n" msgstr "" -#: Engine/insert.c:389 +#: Engine/insert.c:391 #, c-format -msgid "activating instr %s\n" +msgid "MIDI activating instr %s\n" msgstr "" -#: Engine/insert.c:391 +#: Engine/insert.c:393 +#, c-format +msgid "MIDI activating instr %d\n" +msgstr "" + +#: Engine/insert.c:402 +#, c-format +msgid "new MIDI alloc for instr %s:\n" +msgstr "" + +#: Engine/insert.c:404 #, c-format -msgid "activating instr %d\n" +msgid "new MIDI alloc for instr %d:\n" msgstr "" -#: Engine/insert.c:416 +#: Engine/insert.c:418 #, c-format msgid "MIDI note overlaps with key %d on same channel" msgstr "" -#: Engine/insert.c:683 +#: Engine/insert.c:685 #, c-format msgid "removed instance of instr %s\n" msgstr "" -#: Engine/insert.c:685 +#: Engine/insert.c:687 #, c-format msgid "removed instance of instr %d\n" msgstr "" -#: Engine/insert.c:843 +#: Engine/insert.c:851 msgid "inactive allocs returned to freespace\n" msgstr "" -#: Engine/insert.c:869 +#: Engine/insert.c:877 #, c-format msgid "could not find playing instr %f\n" msgstr "" -#: Engine/insert.c:882 +#: Engine/insert.c:890 msgid "" "\n" "INIT ERROR: " @@ -942,97 +952,97 @@ "\n" "INIT STÖRUNG: " -#: Engine/insert.c:895 +#: Engine/insert.c:903 #, c-format msgid "INIT ERROR in instr %d (opcode %s): " msgstr "" -#: Engine/insert.c:898 +#: Engine/insert.c:906 #, c-format msgid "INIT ERROR in instr %d (subinstr %d): " msgstr "" -#: Engine/insert.c:902 +#: Engine/insert.c:910 #, c-format msgid "INIT ERROR in instr %d: " msgstr "" -#: Engine/insert.c:923 +#: Engine/insert.c:931 #, c-format msgid "PERF ERROR in instr %d (opcode %s): " msgstr "" -#: Engine/insert.c:926 +#: Engine/insert.c:934 #, c-format msgid "PERF ERROR in instr %d (subinstr %d): " msgstr "" -#: Engine/insert.c:930 +#: Engine/insert.c:938 #, c-format msgid "PERF ERROR in instr %d: " msgstr "" -#: Engine/insert.c:935 +#: Engine/insert.c:943 msgid " note aborted\n" msgstr "" -#: Engine/insert.c:954 +#: Engine/insert.c:962 msgid "subinstr: number of output args greater than nchnls" msgstr "" -#: Engine/insert.c:1022 +#: Engine/insert.c:1030 msgid "subinstr: too many p-fields" msgstr "" -#: Engine/insert.c:1127 +#: Engine/insert.c:1135 #, c-format msgid "%s: invalid local ksmps value: %d" msgstr "" -#: Engine/insert.c:1259 OOps/bus.c:611 Opcodes/stackops.c:293 +#: Engine/insert.c:1278 OOps/bus.c:614 Opcodes/stackops.c:293 #, c-format msgid "%s: not initialised" msgstr "%s: nicht initialisiert" -#: Engine/insert.c:1442 +#: Engine/insert.c:1458 #, c-format msgid "setksmps: invalid ksmps value: %d, original: %d" msgstr "" -#: Engine/insert.c:1564 +#: Engine/insert.c:1595 msgid "subinstr: not initialised" msgstr "subinstr: nicht initialisiert" -#: Engine/insert.c:2005 +#: Engine/insert.c:2046 #, c-format msgid "" "instr %d allocated at %p\n" "\tlclbas %p, opds %p\n" msgstr "" -#: Engine/insert.c:2023 +#: Engine/insert.c:2064 #, c-format msgid "op (%s) allocated at %p\n" msgstr "" -#: Engine/insert.c:2048 +#: Engine/insert.c:2089 msgid "null iopadr" msgstr "" -#: Engine/insert.c:2059 +#: Engine/insert.c:2100 msgid "null opadr" msgstr "" -#: Engine/insert.c:2131 +#: Engine/insert.c:2182 msgid "inconsistent opds total" msgstr "" -#: Engine/insert.c:2192 +#: Engine/insert.c:2243 #, c-format msgid "Instrument %s is still active" msgstr "" -#: Engine/insert.c:2195 +#: Engine/insert.c:2246 #, c-format msgid "Instrument %d is still active" msgstr "" @@ -1056,40 +1066,40 @@ msgid "stdmode = %.8x Linefd = %d\n" msgstr "" -#: Engine/linevent.c:186 +#: Engine/linevent.c:184 msgid "LineBuffer Overflow - Input Data has been Lost" msgstr "" -#: Engine/linevent.c:239 +#: Engine/linevent.c:238 #, c-format msgid "unknown opcode %c" msgstr "" -#: Engine/linevent.c:259 +#: Engine/linevent.c:258 msgid "unmatched quotes" msgstr "" -#: Engine/linevent.c:286 +#: Engine/linevent.c:285 msgid "dot carry has no reference" msgstr "" -#: Engine/linevent.c:291 +#: Engine/linevent.c:290 msgid "cannot carry string p-field" msgstr "" -#: Engine/linevent.c:302 +#: Engine/linevent.c:301 msgid "too few pfields" msgstr "" -#: Engine/linevent.c:306 +#: Engine/linevent.c:305 msgid "-L with negative p2 illegal" msgstr "" -#: Engine/linevent.c:317 +#: Engine/linevent.c:316 msgid "too many pfields" msgstr "" -#: Engine/linevent.c:329 +#: Engine/linevent.c:328 #, c-format msgid "" "illegal RT scoreline:\n" @@ -1097,24 +1107,29 @@ "%*s" msgstr "" -#: Engine/linevent.c:351 +#: Engine/linevent.c:350 msgid "event: param 1 must be \"a\", \"i\", \"q\", \"f\", or \"e\"" msgstr "" -#: Engine/linevent.c:353 +#: Engine/linevent.c:352 msgid "event: string name is allowed only for \"i\" and \"q\" events" msgstr "" -#: Engine/linevent.c:394 +#: Engine/linevent.c:395 #, c-format msgid "event: error creating '%c' event" msgstr "" -#: Engine/linevent.c:457 +#: Engine/linevent.c:459 #, c-format msgid "event_i: error creating '%c' event" msgstr "" +#: Engine/linevent.c:505 +#, fuzzy +msgid "instance: error creating event" +msgstr "Herstellen des Orchesters\n" + #: Engine/memalloc.c:58 #, c-format msgid "memory allocate failure for %lu" @@ -1183,7 +1198,7 @@ msgstr "" #: Engine/memfiles.c:511 Opcodes/pvinterp.c:77 Opcodes/pvinterp.c:193 -#: Opcodes/pvinterp.c:383 Opcodes/ugens9.c:104 Opcodes/vpvoc.c:210 +#: Opcodes/pvinterp.c:383 Opcodes/ugens9.c:104 Opcodes/vpvoc.c:212 #, c-format msgid "%s's srate = %8.0f, orch's srate = %8.0f" msgstr "" @@ -1217,22 +1232,22 @@ msgid "Beat mode not in force" msgstr "" -#: Engine/musmon.c:173 Top/csound.c:2854 +#: Engine/musmon.c:173 Top/csound.c:2859 #, c-format msgid "Csound version %s beta (double samples) %s\n" msgstr "" -#: Engine/musmon.c:176 Top/csound.c:2857 +#: Engine/musmon.c:176 Top/csound.c:2862 #, c-format msgid "Csound version %s (double samples) %s\n" msgstr "" -#: Engine/musmon.c:181 Top/csound.c:2846 +#: Engine/musmon.c:181 Top/csound.c:2851 #, c-format msgid "Csound version %s beta (float samples) %s\n" msgstr "" -#: Engine/musmon.c:184 Top/csound.c:2849 +#: Engine/musmon.c:184 Top/csound.c:2854 #, c-format msgid "Csound version %s (float samples) %s\n" msgstr "" @@ -1274,7 +1289,7 @@ msgid "sorting cscore.out ..\n" msgstr "" -#: Engine/musmon.c:340 Top/main.c:329 +#: Engine/musmon.c:340 Top/main.c:297 msgid "\t... done\n" msgstr "\t... getan\n" @@ -1282,8 +1297,8 @@ msgid "playing from cscore.srt\n" msgstr "" -#: Engine/musmon.c:345 Engine/musmon.c:497 Engine/musmon.c:1119 -#: Engine/musmon.c:1329 +#: Engine/musmon.c:345 Engine/musmon.c:501 Engine/musmon.c:1124 +#: Engine/musmon.c:1335 #, c-format msgid "SECTION %d:\n" msgstr "" @@ -1293,125 +1308,125 @@ msgid "%c\tbeep!\n" msgstr "" -#: Engine/musmon.c:450 +#: Engine/musmon.c:454 msgid "end of score.\t\t overall amps:" msgstr "" -#: Engine/musmon.c:461 +#: Engine/musmon.c:465 msgid "" "\n" "\t overall samples out of range:" msgstr "" -#: Engine/musmon.c:465 +#: Engine/musmon.c:469 #, c-format msgid "" "\n" "%d errors in performance\n" msgstr "" -#: Engine/musmon.c:467 +#: Engine/musmon.c:471 msgid "end of performance" msgstr "" -#: Engine/musmon.c:480 +#: Engine/musmon.c:484 msgid "no sound written to disk\n" msgstr "" -#: Engine/musmon.c:572 Engine/musmon.c:618 +#: Engine/musmon.c:577 Engine/musmon.c:623 msgid "\t number of samples out of range:" msgstr "" -#: Engine/musmon.c:611 +#: Engine/musmon.c:616 #, c-format msgid "end of section %d\t sect peak amps:" msgstr "" -#: Engine/musmon.c:613 +#: Engine/musmon.c:618 msgid "end of lplay event list\t peak amps:" msgstr "" -#: Engine/musmon.c:678 Engine/musmon.c:705 +#: Engine/musmon.c:683 Engine/musmon.c:710 #, c-format msgid " - note deleted. instr %s undefined" msgstr "" -#: Engine/musmon.c:682 +#: Engine/musmon.c:687 #, c-format msgid "Setting instrument %s %s\n" msgstr "" -#: Engine/musmon.c:683 Engine/musmon.c:697 +#: Engine/musmon.c:688 Engine/musmon.c:702 msgid "off" msgstr "" -#: Engine/musmon.c:683 Engine/musmon.c:697 +#: Engine/musmon.c:688 Engine/musmon.c:702 msgid "on" msgstr "" -#: Engine/musmon.c:692 Engine/musmon.c:734 +#: Engine/musmon.c:697 Engine/musmon.c:739 #, c-format msgid " - note deleted. instr %d(%d) undefined" msgstr "" -#: Engine/musmon.c:696 +#: Engine/musmon.c:701 #, c-format msgid "Setting instrument %d %s\n" msgstr "" -#: Engine/musmon.c:724 +#: Engine/musmon.c:729 #, c-format msgid " - note deleted. i%d (%s) had %d init errors" msgstr "" -#: Engine/musmon.c:755 +#: Engine/musmon.c:760 #, c-format msgid " - note deleted. i%d had %d init errors" msgstr "" -#: Engine/musmon.c:776 +#: Engine/musmon.c:781 #, c-format msgid "time advanced %5.3f beats by score request\n" msgstr "" -#: Engine/musmon.c:794 +#: Engine/musmon.c:799 #, c-format msgid "\t\t T%7.3f - note deleted. " msgstr "" -#: Engine/musmon.c:798 +#: Engine/musmon.c:803 #, c-format msgid "instr %s had %d init errors\n" msgstr "" -#: Engine/musmon.c:801 +#: Engine/musmon.c:806 #, c-format msgid "instr %d had %d init errors\n" msgstr "" -#: Engine/musmon.c:893 +#: Engine/musmon.c:898 msgid "terminating.\n" msgstr "" -#: Engine/musmon.c:980 +#: Engine/musmon.c:985 #, c-format msgid "error in score. illegal opcode %c (ASCII %d)\n" msgstr "" -#: Engine/musmon.c:1241 +#: Engine/musmon.c:1247 msgid "insert_score_event(): invalid instrument number or name\n" msgstr "" -#: Engine/musmon.c:1261 +#: Engine/musmon.c:1267 #, c-format msgid "insert_score_event(): unknown opcode: %c\n" msgstr "" -#: Engine/musmon.c:1284 +#: Engine/musmon.c:1290 msgid "insert_score_event(): insufficient p-fields\n" msgstr "" -#: Engine/musmon.c:1338 +#: Engine/musmon.c:1344 msgid "cannot rewind score: no score in memory \n" msgstr "" @@ -1429,29 +1444,29 @@ msgid "cannot find the specified instrument or opcode" msgstr "" -#: Engine/new_orc_parser.c:92 Top/main.c:264 +#: Engine/new_orc_parser.c:144 #, c-format msgid "Failed to open input file %s\n" msgstr "" -#: Engine/new_orc_parser.c:122 +#: Engine/new_orc_parser.c:177 msgid "Unmatched #ifdef\n" msgstr "" -#: Engine/new_orc_parser.c:156 +#: Engine/new_orc_parser.c:212 msgid "Parsing failed due to invalid input!\n" msgstr "" -#: Engine/new_orc_parser.c:160 +#: Engine/new_orc_parser.c:216 msgid "Parsing failed due to memory exhaustion!\n" msgstr "" -#: Engine/new_orc_parser.c:163 +#: Engine/new_orc_parser.c:219 #, c-format msgid "Parsing failed due to %d syntax error%s!\n" msgstr "" -#: Engine/new_orc_parser.c:208 +#: Engine/new_orc_parser.c:264 msgid "Stopping on parser failure\n" msgstr "" @@ -1466,7 +1481,7 @@ "\tremainder of line flushed\n" msgstr "" -#: Engine/rdscor.c:159 +#: Engine/rdscor.c:160 msgid "ERROR: too many pfields: " msgstr "" @@ -1693,8 +1708,8 @@ msgid "! invalid in p1, p2, or p3" msgstr "" -#: Engine/sread.c:1266 Engine/sread.c:1271 Engine/sread.c:1749 -#: Engine/sread.c:1772 Engine/sread.c:1786 +#: Engine/sread.c:1266 Engine/sread.c:1271 Engine/sread.c:1754 +#: Engine/sread.c:1777 Engine/sread.c:1791 msgid " remainder of line flushed\n" msgstr "" @@ -1743,47 +1758,47 @@ msgid "Not #include" msgstr "" -#: Engine/sread.c:1674 +#: Engine/sread.c:1679 #, c-format msgid "Cannot open #include'd file %s" msgstr "" -#: Engine/sread.c:1684 +#: Engine/sread.c:1689 msgid "Not #undef" msgstr "" -#: Engine/sread.c:1705 +#: Engine/sread.c:1710 #, c-format msgid "macro %s undefined\n" msgstr "" -#: Engine/sread.c:1711 +#: Engine/sread.c:1716 msgid "unknown # option" msgstr "" -#: Engine/sread.c:1748 +#: Engine/sread.c:1753 #, c-format msgid "illegal opcode %c" msgstr "" -#: Engine/sread.c:1771 +#: Engine/sread.c:1776 #, c-format msgid "unexpected char %c" msgstr "" -#: Engine/sread.c:1785 +#: Engine/sread.c:1790 msgid "illegally placed string" msgstr "" -#: Engine/sread.c:1792 +#: Engine/sread.c:1797 msgid "unmatched quote" msgstr "" -#: Engine/sread.c:1836 +#: Engine/sread.c:1841 msgid "sread: illegal number format: " msgstr "" -#: Engine/sread.c:1842 +#: Engine/sread.c:1847 msgid " zero substituted.\n" msgstr "" @@ -2408,56 +2423,56 @@ msgid "unrecognised message type %d" msgstr "" -#: InOut/midirecv.c:400 +#: InOut/midirecv.c:402 #, c-format msgid "midi channel %d using instr %d\n" msgstr "" -#: InOut/midirecv.c:403 +#: InOut/midirecv.c:405 #, c-format msgid "midi channel %d is muted\n" msgstr "" -#: InOut/midirecv.c:421 +#: InOut/midirecv.c:423 #, c-format msgid "MIDI channel %d muted\n" msgstr "" -#: InOut/midirecv.c:426 +#: InOut/midirecv.c:428 #, c-format msgid "Insno = %d\n" msgstr "" -#: InOut/midirecv.c:427 +#: InOut/midirecv.c:429 msgid "unknown instr" msgstr "" -#: InOut/midirecv.c:430 +#: InOut/midirecv.c:432 #, c-format msgid "chnl %d using instr %d\n" msgstr "" -#: InOut/midirecv.c:490 +#: InOut/midirecv.c:492 #, c-format msgid " *** error reading MIDI device: %d (%s)" msgstr "" -#: InOut/midirecv.c:519 +#: InOut/midirecv.c:521 #, c-format msgid "undefined sys-realtime msg %x\n" msgstr "" -#: InOut/midirecv.c:537 +#: InOut/midirecv.c:539 #, c-format msgid "undefined sys_common msg %x\n" msgstr "" -#: InOut/midirecv.c:599 +#: InOut/midirecv.c:601 #, c-format msgid "Error closing MIDI in device: %d (%s)" msgstr "" -#: InOut/midirecv.c:606 +#: InOut/midirecv.c:608 #, c-format msgid "Error closing MIDI out device: %d (%s)" msgstr "" @@ -3711,79 +3726,79 @@ msgid "non-looping sample" msgstr "" -#: OOps/aops.c:1041 OOps/aops.c:1069 +#: OOps/aops.c:1037 OOps/aops.c:1065 #, c-format msgid "No tuning table %d" msgstr "" -#: OOps/aops.c:1114 OOps/aops.c:1152 +#: OOps/aops.c:1110 OOps/aops.c:1148 msgid "cpstun: invalid table" msgstr "" -#: OOps/aops.c:1544 OOps/aops.c:1580 +#: OOps/aops.c:1540 OOps/aops.c:1576 #, c-format msgid "Input channel %d too large; ignored" msgstr "" -#: OOps/aops.c:1576 +#: OOps/aops.c:1572 msgid "Input and output argument count differs in inch" msgstr "" -#: OOps/aops.c:2014 +#: OOps/aops.c:2010 msgid "Unknown function called" msgstr "" -#: OOps/aops.c:2050 +#: OOps/aops.c:2046 msgid "number of arguments != nchnls" msgstr "" -#: OOps/aops.c:2080 +#: OOps/aops.c:2076 msgid "outrg: channel number cannot be < 1 (1 is the first channel)" msgstr "" -#: OOps/bus.c:80 OOps/bus.c:102 OOps/bus.c:127 OOps/bus.c:155 +#: OOps/bus.c:83 OOps/bus.c:105 OOps/bus.c:130 OOps/bus.c:158 msgid "chani: invalid index" msgstr "" -#: OOps/bus.c:88 OOps/bus.c:134 +#: OOps/bus.c:91 OOps/bus.c:137 #, c-format msgid "chani error %d:channel not found or not right type" msgstr "" -#: OOps/bus.c:110 OOps/bus.c:162 +#: OOps/bus.c:113 OOps/bus.c:165 #, c-format msgid "chano error %d:channel not found or not right type" msgstr "" -#: OOps/bus.c:216 +#: OOps/bus.c:219 #, fuzzy msgid "pvsin: invalid index" msgstr "unzulässiger Name für Instrument" -#: OOps/bus.c:224 +#: OOps/bus.c:227 #, c-format msgid "pvsin error %d:channel not found or not right type" msgstr "" -#: OOps/bus.c:279 +#: OOps/bus.c:282 #, fuzzy msgid "pvsout: invalid index" msgstr "unzulässiger Name für Instrument" -#: OOps/bus.c:287 +#: OOps/bus.c:290 #, c-format msgid "pvsout error %d:channel not found or not right type" msgstr "" -#: OOps/bus.c:1026 OOps/bus.c:1075 OOps/bus.c:1096 OOps/bus.c:1143 +#: OOps/bus.c:1029 OOps/bus.c:1078 OOps/bus.c:1099 OOps/bus.c:1146 msgid "invalid mode parameter" msgstr "" -#: OOps/bus.c:1063 OOps/bus.c:1187 +#: OOps/bus.c:1066 OOps/bus.c:1187 msgid "invalid channel parameters" msgstr "" -#: OOps/bus.c:1151 +#: OOps/bus.c:1154 msgid "channel already exists" msgstr "" @@ -3832,11 +3847,11 @@ msgid "diskin2: invalid number of channels" msgstr "" -#: OOps/diskin2.c:289 OOps/diskin2.c:1741 +#: OOps/diskin2.c:289 OOps/diskin2.c:1745 msgid "diskin2: unknown sample format" msgstr "" -#: OOps/diskin2.c:304 OOps/diskin2.c:1756 +#: OOps/diskin2.c:304 OOps/diskin2.c:1760 #, c-format msgid "diskin2: %s: failed to open file" msgstr "" @@ -3846,19 +3861,19 @@ "diskin2: number of output args inconsistent with number of file channels" msgstr "" -#: OOps/diskin2.c:346 OOps/diskin2.c:1813 +#: OOps/diskin2.c:346 OOps/diskin2.c:1817 #, c-format msgid "diskin2: warning: file sample rate (%d) != orchestra sr (%d)\n" msgstr "" -#: OOps/diskin2.c:427 OOps/diskin2.c:1894 +#: OOps/diskin2.c:427 OOps/diskin2.c:1905 #, c-format msgid "" "diskin2: opened (asynchronously) '%s':\n" " %d Hz, %d channel(s), %ld sample frames\n" msgstr "" -#: OOps/diskin2.c:441 OOps/diskin2.c:1908 +#: OOps/diskin2.c:441 OOps/diskin2.c:1919 #, c-format msgid "" "diskin2: opened '%s':\n" @@ -3866,12 +3881,12 @@ msgstr "" #: OOps/diskin2.c:520 OOps/diskin2.c:706 OOps/diskin2.c:902 -#: OOps/diskin2.c:1526 OOps/diskin2.c:1940 OOps/diskin2.c:2133 +#: OOps/diskin2.c:1529 OOps/diskin2.c:1951 OOps/diskin2.c:2144 msgid "diskin2: not initialised" msgstr "diskin2: nicht initialisiert" -#: OOps/diskin2.c:686 OOps/diskin2.c:877 OOps/diskin2.c:1697 -#: OOps/diskin2.c:2106 +#: OOps/diskin2.c:686 OOps/diskin2.c:877 OOps/diskin2.c:1700 +#: OOps/diskin2.c:2117 msgid "diskin2: file descriptor closed or invalid\n" msgstr "" @@ -3937,7 +3952,7 @@ msgid "soundouts: not initialised" msgstr "soundouts: nicht initialisiert" -#: OOps/diskin2.c:1782 +#: OOps/diskin2.c:1786 msgid "diskin2: output array too small" msgstr "" @@ -4712,12 +4727,12 @@ msgid "channel already specific remote" msgstr "" -#: OOps/remote.c:589 OOps/remote.c:614 OOps/remote.c:639 +#: OOps/remote.c:590 OOps/remote.c:615 OOps/remote.c:640 msgid "CLsend failed" msgstr "" -#: OOps/remote.c:706 OOps/remote.c:714 OOps/remote.c:722 OOps/remote.c:730 -#: OOps/remote.c:738 +#: OOps/remote.c:707 OOps/remote.c:715 OOps/remote.c:723 OOps/remote.c:731 +#: OOps/remote.c:739 msgid "" "*** This version of Csound was not compiled with remote event support ***\n" msgstr "" @@ -4732,11 +4747,11 @@ msgid "schedkwhen ignored. Instrument %d undefined\n" msgstr "" -#: OOps/schedule.c:429 +#: OOps/schedule.c:430 msgid "schedkwhen warning: negative kwhen reset to zero" msgstr "" -#: OOps/schedule.c:454 OOps/schedule.c:477 +#: OOps/schedule.c:455 OOps/schedule.c:478 msgid "trigseq: incorrect table number" msgstr "" @@ -4762,25 +4777,25 @@ msgid "filepeak: error getting peak value" msgstr "" -#: OOps/str_ops.c:60 +#: OOps/str_ops.c:64 msgid "illegal strset index" msgstr "" -#: OOps/str_ops.c:68 +#: OOps/str_ops.c:72 #, c-format msgid "strset index conflict at %d" msgstr "" -#: OOps/str_ops.c:69 +#: OOps/str_ops.c:73 #, c-format msgid "previous value: '%s', replaced with '%s'" msgstr "" -#: OOps/str_ops.c:93 OOps/str_ops.c:100 +#: OOps/str_ops.c:97 OOps/str_ops.c:104 msgid "--strset: invalid format" msgstr "" -#: OOps/str_ops.c:921 +#: OOps/str_ops.c:925 #, c-format msgid "invalid option code: %g" msgstr "" @@ -4927,27 +4942,27 @@ msgid "osciln: not initialised" msgstr "osciln: nicht initialisiert" -#: OOps/ugens2.c:1168 +#: OOps/ugens2.c:1210 msgid "oscil(krate): not initialised" msgstr "oscil(krate): nicht initialisiert" -#: OOps/ugens2.c:1203 OOps/ugens2.c:1239 OOps/ugens2.c:1272 OOps/ugens2.c:1307 +#: OOps/ugens2.c:1245 OOps/ugens2.c:1281 OOps/ugens2.c:1314 OOps/ugens2.c:1349 msgid "oscil: not initialised" msgstr "oscil: nicht initialisiert" -#: OOps/ugens2.c:1330 +#: OOps/ugens2.c:1372 msgid "oscili(krate): not initialised" msgstr "oscili(krate): nicht initialisiert" -#: OOps/ugens2.c:1365 OOps/ugens2.c:1405 OOps/ugens2.c:1441 OOps/ugens2.c:1480 +#: OOps/ugens2.c:1407 OOps/ugens2.c:1447 OOps/ugens2.c:1483 OOps/ugens2.c:1522 msgid "oscili: not initialised" msgstr "oscili: nicht initialisiert" -#: OOps/ugens2.c:1521 +#: OOps/ugens2.c:1563 msgid "oscil3(krate): not initialised" msgstr "oscil3(krate): nicht initialisiert" -#: OOps/ugens2.c:1580 OOps/ugens2.c:1636 OOps/ugens2.c:1689 OOps/ugens2.c:1744 +#: OOps/ugens2.c:1622 OOps/ugens2.c:1678 OOps/ugens2.c:1731 OOps/ugens2.c:1786 msgid "oscil3: not initialised" msgstr "oscil3: nicht initialisiert" @@ -5076,120 +5091,124 @@ msgid "pluck: kcps more than sample rate" msgstr "" -#: OOps/ugens4.c:472 OOps/ugens4.c:580 OOps/ugens4.c:685 +#: OOps/ugens4.c:472 OOps/ugens4.c:580 OOps/ugens4.c:686 #, c-format msgid "Seeding from current time %lu\n" msgstr "" -#: OOps/ugens5.c:287 OOps/ugens5.c:396 Opcodes/gab/gab.c:48 Opcodes/ugsc.c:209 +#: OOps/ugens5.c:287 OOps/ugens5.c:400 Opcodes/gab/gab.c:50 Opcodes/ugsc.c:211 #, c-format msgid "illegal reson iscl value, %f" msgstr "" -#: OOps/ugens5.c:616 +#: OOps/ugens5.c:623 #, c-format msgid "LPREAD cannot load %s" msgstr "" -#: OOps/ugens5.c:627 +#: OOps/ugens5.c:634 #, c-format msgid "Using %s type of file.\n" msgstr "" -#: OOps/ugens5.c:628 +#: OOps/ugens5.c:635 msgid "pole" msgstr "" -#: OOps/ugens5.c:628 +#: OOps/ugens5.c:635 msgid "filter coefficient" msgstr "" -#: OOps/ugens5.c:633 +#: OOps/ugens5.c:640 msgid "lpheader overriding inputs" msgstr "" -#: OOps/ugens5.c:637 +#: OOps/ugens5.c:644 msgid "lpfile srate != orch sr" msgstr "" -#: OOps/ugens5.c:645 +#: OOps/ugens5.c:652 #, c-format msgid "file %s bytes are in wrong order" msgstr "Akte %s Bytes sind im falschen Auftrag" -#: OOps/ugens5.c:655 +#: OOps/ugens5.c:662 msgid "insufficient args and no file header" msgstr "" -#: OOps/ugens5.c:660 +#: OOps/ugens5.c:667 msgid "npoles > MAXPOLES" msgstr "" -#: OOps/ugens5.c:668 +#: OOps/ugens5.c:675 #, c-format msgid "npoles %ld, nvals %ld, totvals %ld, lastfram16 = %lx\n" msgstr "" -#: OOps/ugens5.c:692 util/lpanal.c:324 +#: OOps/ugens5.c:700 util/lpanal.c:324 #, c-format msgid "magnitude: %f Phase: %f\n" msgstr "" -#: OOps/ugens5.c:695 util/lpanal.c:327 +#: OOps/ugens5.c:703 util/lpanal.c:327 #, c-format msgid "Real: %f Imag: %f\n" msgstr "" -#: OOps/ugens5.c:863 +#: OOps/ugens5.c:758 +msgid "Cannot handle uneven pole count yet \n" +msgstr "" + +#: OOps/ugens5.c:871 msgid "lpread: not initialised" msgstr "lpread: nicht initialisiert" -#: OOps/ugens5.c:869 +#: OOps/ugens5.c:877 msgid "lpread timpnt < 0" msgstr "" -#: OOps/ugens5.c:875 +#: OOps/ugens5.c:883 msgid "lpread ktimpnt truncated to last frame" msgstr "" -#: OOps/ugens5.c:906 OOps/ugens5.c:1409 +#: OOps/ugens5.c:914 OOps/ugens5.c:1417 msgid "Interpolation failed" msgstr "" -#: OOps/ugens5.c:964 +#: OOps/ugens5.c:972 msgid "this opcode only works with LPC pole analysis type (-a)\n" msgstr "" -#: OOps/ugens5.c:1098 +#: OOps/ugens5.c:1106 msgid "Pole file not supported for this opcode !" msgstr "" -#: OOps/ugens5.c:1125 +#: OOps/ugens5.c:1133 #, c-format msgid "illegal frqratio, %5.2f" msgstr "" -#: OOps/ugens5.c:1335 +#: OOps/ugens5.c:1343 msgid "lpslot number should be positive" msgstr "" -#: OOps/ugens5.c:1355 +#: OOps/ugens5.c:1363 msgid "LPC slot is not allocated" msgstr "" -#: OOps/ugens5.c:1363 +#: OOps/ugens5.c:1371 msgid "lpinterpol works only with poles files.." msgstr "" -#: OOps/ugens5.c:1367 +#: OOps/ugens5.c:1375 msgid "The poles files have different pole count" msgstr "" -#: OOps/ugens5.c:1373 +#: OOps/ugens5.c:1381 msgid "padding error" msgstr "" -#: OOps/ugens5.c:1393 +#: OOps/ugens5.c:1401 msgid "lpinterpol: not initialised" msgstr "lpinterpol: nicht initialisiert" @@ -5227,49 +5246,53 @@ msgid "delayw: not initialised" msgstr "delayw: nicht initialisiert" -#: OOps/ugens6.c:475 OOps/ugens6.c:774 OOps/ugens6.c:859 +#: OOps/ugens6.c:475 OOps/ugens6.c:785 OOps/ugens6.c:870 msgid "deltap: not initialised" msgstr "deltap: nicht initialisiert" -#: OOps/ugens6.c:530 +#: OOps/ugens6.c:532 msgid "deltapi: not initialised" msgstr "deltapi: nicht initialisiert" -#: OOps/ugens6.c:583 +#: OOps/ugens6.c:535 OOps/ugens6.c:677 +msgid "deltapi: INF delaytime" +msgstr "" + +#: OOps/ugens6.c:588 msgid "deltapn: not initialised" msgstr "deltapn: nicht initialisiert" -#: OOps/ugens6.c:667 +#: OOps/ugens6.c:674 msgid "deltap3: not initialised" msgstr "deltap3: nicht initialisiert" -#: OOps/ugens6.c:896 OOps/ugens6.c:900 Opcodes/ugmoss.c:483 +#: OOps/ugens6.c:907 OOps/ugens6.c:911 Opcodes/ugmoss.c:483 #: Opcodes/ugmoss.c:487 msgid "illegal loop time" msgstr "" -#: OOps/ugens6.c:963 +#: OOps/ugens6.c:974 msgid "comb: not initialised" msgstr "comb: nicht initialisiert" -#: OOps/ugens6.c:1002 +#: OOps/ugens6.c:1013 #, fuzzy msgid "combinv: not initialised" msgstr "comb: nicht initialisiert" -#: OOps/ugens6.c:1039 +#: OOps/ugens6.c:1050 msgid "alpass: not initialised" msgstr "alpass: nicht initialisiert" -#: OOps/ugens6.c:1072 +#: OOps/ugens6.c:1083 msgid "revlpsiz inconsistent\n" msgstr "" -#: OOps/ugens6.c:1163 +#: OOps/ugens6.c:1174 msgid "reverb: not intialised" msgstr "" -#: OOps/ugens6.c:1237 +#: OOps/ugens6.c:1248 msgid "pan: not initialised" msgstr "pan: nicht initialisiert" @@ -5432,10 +5455,10 @@ msgstr "" #: OOps/ugtabs.c:38 OOps/ugtabs.c:74 OOps/ugtabs.c:154 OOps/ugtabs.c:266 -#: OOps/ugtabs.c:428 OOps/ugtabs.c:445 OOps/ugtabs.c:461 OOps/ugtabs.c:477 -#: OOps/ugtabs.c:493 OOps/ugtabs.c:508 OOps/ugtabs.c:528 OOps/ugtabs.c:615 -#: OOps/ugtabs.c:632 OOps/ugtabs.c:646 OOps/ugtabs.c:659 OOps/ugtabs.c:695 -#: OOps/ugtabs.c:702 OOps/ugtabs.c:709 OOps/ugtabs.c:793 OOps/ugtabs.c:839 +#: OOps/ugtabs.c:428 OOps/ugtabs.c:445 OOps/ugtabs.c:461 OOps/ugtabs.c:478 +#: OOps/ugtabs.c:493 OOps/ugtabs.c:508 OOps/ugtabs.c:528 OOps/ugtabs.c:616 +#: OOps/ugtabs.c:633 OOps/ugtabs.c:647 OOps/ugtabs.c:660 OOps/ugtabs.c:696 +#: OOps/ugtabs.c:703 OOps/ugtabs.c:710 OOps/ugtabs.c:794 OOps/ugtabs.c:840 #, fuzzy, c-format msgid "table: could not find ftable %d" msgstr "table: nicht initialisiert" @@ -5448,12 +5471,12 @@ msgid "tablekt: index type inconsistent with output" msgstr "" -#: OOps/ugtabs.c:673 +#: OOps/ugtabs.c:674 #, c-format msgid "table: could not find ftables %d and/or %d" msgstr "" -#: OOps/ugtabs.c:802 OOps/ugtabs.c:848 +#: OOps/ugtabs.c:803 OOps/ugtabs.c:849 #, c-format msgid "table: could not read negative pos %d" msgstr "" @@ -5859,20 +5882,20 @@ msgid "crossfm: ftable not found" msgstr "" -#: Opcodes/date.c:96 +#: Opcodes/date.c:97 msgid "cannot determine current directory" msgstr "" -#: Opcodes/date.c:133 +#: Opcodes/date.c:134 msgid "readf: failed to open file" msgstr "" -#: Opcodes/date.c:159 +#: Opcodes/date.c:161 #, fuzzy msgid "readf: read failure" msgstr "*** Speicherallozierungausfall\n" -#: Opcodes/date.c:169 Opcodes/date.c:177 +#: Opcodes/date.c:171 Opcodes/date.c:179 #, fuzzy msgid "readi failed to initialise" msgstr "lpread: nicht initialisiert" @@ -6131,12 +6154,12 @@ msgid "ftconv: not initialised" msgstr "ftconv: nicht initialisiert" -#: Opcodes/ftgen.c:69 Opcodes/ftgen.c:212 +#: Opcodes/ftgen.c:69 Opcodes/ftgen.c:213 #, fuzzy, c-format msgid "Error deleting ftable %d" msgstr "Ersetzen vorhergehendes ftable %d" -#: Opcodes/ftgen.c:137 Opcodes/signalflowgraph.cpp:1175 +#: Opcodes/ftgen.c:137 Opcodes/signalflowgraph.cpp:1383 msgid "ftgen string arg not allowed" msgstr "" @@ -6144,112 +6167,112 @@ msgid "ftgen error" msgstr "" -#: Opcodes/ftgen.c:209 +#: Opcodes/ftgen.c:210 #, c-format msgid "Invalid table number: %d" msgstr "" -#: Opcodes/ftgen.c:392 +#: Opcodes/ftgen.c:393 #, fuzzy msgid "ftload: error allocating ftable" msgstr "*** Speicherallozierungausfall\n" -#: Opcodes/ftgen.c:394 +#: Opcodes/ftgen.c:395 #, fuzzy msgid "ftload: no table numbers" msgstr "unbekannte Quelltabelle Zahl" -#: Opcodes/ftgen.c:396 +#: Opcodes/ftgen.c:397 msgid "ftload: unable to open file" msgstr "" -#: Opcodes/ftgen.c:399 +#: Opcodes/ftgen.c:400 msgid "ftload: incorrect file" msgstr "" -#: Opcodes/ftgen.c:539 +#: Opcodes/ftgen.c:540 msgid "ftsave: Bad table number. Saving is possible only for existing tables." msgstr "" -#: Opcodes/ftgen.c:542 +#: Opcodes/ftgen.c:543 msgid "ftsave: no table numbers" msgstr "" -#: Opcodes/ftgen.c:544 +#: Opcodes/ftgen.c:545 msgid "ftsave: unable to open file" msgstr "" -#: Opcodes/ftgen.c:546 +#: Opcodes/ftgen.c:547 msgid "ftsave: failed to write file" msgstr "" -#: Opcodes/gab/gab.c:112 +#: Opcodes/gab/gab.c:114 #, fuzzy msgid "fastab: incorrect table number" msgstr "unbekannte Quelltabelle Zahl" -#: Opcodes/gab/gab.c:139 Opcodes/gab/gab.c:148 Opcodes/gab/gab.c:178 +#: Opcodes/gab/gab.c:141 Opcodes/gab/gab.c:150 Opcodes/gab/gab.c:180 msgid "tabw off end" msgstr "" -#: Opcodes/gab/gab.c:164 Opcodes/gab/gab.c:241 Opcodes/gab/gab.c:250 +#: Opcodes/gab/gab.c:166 Opcodes/gab/gab.c:243 Opcodes/gab/gab.c:252 msgid "tab off end" msgstr "" -#: Opcodes/gab/gab.c:190 +#: Opcodes/gab/gab.c:192 #, fuzzy msgid "tab_i: incorrect table number" msgstr "unbekannte Quelltabelle Zahl" -#: Opcodes/gab/gab.c:198 +#: Opcodes/gab/gab.c:200 #, c-format msgid "tab_i off end: table number: %d\n" msgstr "" -#: Opcodes/gab/gab.c:211 +#: Opcodes/gab/gab.c:213 #, fuzzy msgid "tabw_i: incorrect table number" msgstr "unbekannte Quelltabelle Zahl" -#: Opcodes/gab/gab.c:218 +#: Opcodes/gab/gab.c:220 msgid "tabw_i off end" msgstr "" -#: Opcodes/gab/gab.c:263 +#: Opcodes/gab/gab.c:265 #, fuzzy msgid "tab_init: incorrect table number" msgstr "unbekannte Quelltabelle Zahl" -#: Opcodes/gab/gab.c:332 +#: Opcodes/gab/gab.c:334 msgid "printi parameter was not a \"quoted string\"" msgstr "" -#: Opcodes/gab/gab.c:446 +#: Opcodes/gab/gab.c:448 msgid "adsynt2: wavetable not found!" msgstr "" -#: Opcodes/gab/gab.c:458 +#: Opcodes/gab/gab.c:460 msgid "adsynt2: freqtable not found!" msgstr "" -#: Opcodes/gab/gab.c:463 +#: Opcodes/gab/gab.c:465 msgid "adsynt2: partial count is greater than freqtable size!" msgstr "" -#: Opcodes/gab/gab.c:472 +#: Opcodes/gab/gab.c:474 msgid "adsynt2: amptable not found!" msgstr "" -#: Opcodes/gab/gab.c:477 +#: Opcodes/gab/gab.c:479 msgid "adsynt2: partial count is greater than amptable size!" msgstr "" -#: Opcodes/gab/gab.c:525 +#: Opcodes/gab/gab.c:527 #, fuzzy msgid "adsynt2: not initialised" msgstr "adsynt: nicht initialisiert" -#: Opcodes/gab/gab.c:759 +#: Opcodes/gab/gab.c:771 msgid "max_k: invalid imaxflag value" msgstr "" @@ -6798,11 +6821,11 @@ msgid "vlinseg/vexpseg: invalid num. of elements" msgstr "unzulässiger Name für Instrument" -#: Opcodes/gab/vectorial.c:2255 Opcodes/vpvoc.c:119 +#: Opcodes/gab/vectorial.c:2255 Opcodes/vpvoc.c:121 msgid "tableseg: not initialised" msgstr "tableseg: nicht initialisiert" -#: Opcodes/gab/vectorial.c:2285 Opcodes/vpvoc.c:148 +#: Opcodes/gab/vectorial.c:2285 Opcodes/vpvoc.c:150 msgid "tablexseg: not initialised" msgstr "tablexseg: nicht initialisiert" @@ -7205,8 +7228,8 @@ msgid "loscilx: invalid number of output arguments" msgstr "" -#: Opcodes/loscilx.c:209 Opcodes/loscilx.c:238 Opcodes/pvlock.c:152 -#: Opcodes/pvlock.c:375 Opcodes/pvsbasic.c:566 +#: Opcodes/loscilx.c:209 Opcodes/loscilx.c:238 Opcodes/pvlock.c:160 +#: Opcodes/pvlock.c:383 Opcodes/pvlock.c:657 Opcodes/pvsbasic.c:566 msgid "" "number of output arguments inconsistent with number of sound file channels" msgstr "" @@ -7215,7 +7238,12 @@ msgid "loscilx: not initialised" msgstr "loscilx: nicht initialisiert" -#: Opcodes/lowpassr.c:85 Opcodes/lowpassr.c:140 +#: Opcodes/lowpassr.c:55 Opcodes/lowpassr.c:99 Opcodes/lowpassr.c:121 +#: Opcodes/lowpassr.c:155 Opcodes/lowpassr.c:176 Opcodes/lowpassr.c:210 +msgid "Cutoff parameter must be positive" +msgstr "" + +#: Opcodes/lowpassr.c:252 Opcodes/lowpassr.c:312 msgid "illegal order num. (min 1, max 10)" msgstr "" @@ -7430,20 +7458,20 @@ msgid "partikkel: " msgstr "" -#: Opcodes/partikkel.c:841 +#: Opcodes/partikkel.c:839 msgid "partikkelsync: opcode id needs to be a non-zero integer" msgstr "" -#: Opcodes/partikkel.c:845 Opcodes/partikkel.c:851 +#: Opcodes/partikkel.c:843 Opcodes/partikkel.c:849 msgid "partikkelsync: could not find opcode id" msgstr "" -#: Opcodes/partikkel.c:881 +#: Opcodes/partikkel.c:879 #, c-format msgid "%s: partikkel not initialized" msgstr "%s: partikkel nicht initialisiert" -#: Opcodes/partikkel.c:889 +#: Opcodes/partikkel.c:887 #, c-format msgid "%s: could not find opcode id" msgstr "" @@ -7562,71 +7590,71 @@ msgid "adsynt: partial count is greater than amptable size!" msgstr "" -#: Opcodes/pitch.c:690 +#: Opcodes/pitch.c:691 msgid "adsynt: not initialised" msgstr "adsynt: nicht initialisiert" -#: Opcodes/pitch.c:770 +#: Opcodes/pitch.c:771 msgid "hsboscil: not initialised" msgstr "hsboscil: nicht initialisiert" -#: Opcodes/pitch.c:856 +#: Opcodes/pitch.c:857 msgid "pitchamdf: maxcps must be > mincps !" msgstr "" -#: Opcodes/pitch.c:1003 +#: Opcodes/pitch.c:1004 msgid "pitchamdf: not initialised" msgstr "pitchamdf: nicht initialisiert" -#: Opcodes/pitch.c:1184 Opcodes/pitch.c:1214 +#: Opcodes/pitch.c:1185 Opcodes/pitch.c:1215 msgid "phasorbnk: not initialised" msgstr "phasorbnk: nicht initialisiert" -#: Opcodes/pitch.c:1281 +#: Opcodes/pitch.c:1282 msgid "pinkish: Invalid method code" msgstr "" -#: Opcodes/pitch.c:1292 +#: Opcodes/pitch.c:1293 msgid "pinkish: Filter method requires a-rate (noise) input" msgstr "" -#: Opcodes/pitch.c:1421 +#: Opcodes/pitch.c:1422 #, c-format msgid "" "pinkish: Gardner method requires 4-%d bands. Default %ld substituted for " "%d.\n" msgstr "" -#: Opcodes/pitch.c:1684 +#: Opcodes/pitch.c:1685 msgid "Incorrect argument count in transeg" msgstr "" -#: Opcodes/pitch.c:1735 +#: Opcodes/pitch.c:1736 msgid "Incorrect argument count in transegb" msgstr "" -#: Opcodes/pitch.c:1786 Opcodes/pitch.c:1947 +#: Opcodes/pitch.c:1787 Opcodes/pitch.c:1948 msgid "Error: transeg not initialised (krate)\n" msgstr "Störung: transeg nicht initialisiert (krate)\n" -#: Opcodes/pitch.c:1824 Opcodes/pitch.c:2007 +#: Opcodes/pitch.c:1825 Opcodes/pitch.c:2008 msgid "transeg: not initialised (arate)\n" msgstr "transeg: nicht initialisiert (arate)\n" -#: Opcodes/pitch.c:1884 +#: Opcodes/pitch.c:1885 msgid "Incorrect argument count in transegr" msgstr "" -#: Opcodes/pitch.c:2303 +#: Opcodes/pitch.c:2321 msgid "median: not initialised (arate)\n" msgstr "median: nicht initialisiert (arate)\n" -#: Opcodes/pitch.c:2307 Opcodes/pitch.c:2360 +#: Opcodes/pitch.c:2325 Opcodes/pitch.c:2378 #, c-format msgid "median: window (%d)larger than maximum(%d); truncated" msgstr "" -#: Opcodes/pitch.c:2356 +#: Opcodes/pitch.c:2374 msgid "median: not initialised (krate)\n" msgstr "median: nicht initialisiert (krate)\n" @@ -7744,30 +7772,30 @@ msgid "PVBUFREAD cannot load %s" msgstr "" -#: Opcodes/pvinterp.c:82 Opcodes/vpvoc.c:215 +#: Opcodes/pvinterp.c:82 Opcodes/vpvoc.c:217 #, c-format msgid "PVOC frame %ld bigger than %ld in %s" msgstr "" -#: Opcodes/pvinterp.c:87 Opcodes/vpvoc.c:220 +#: Opcodes/pvinterp.c:87 Opcodes/vpvoc.c:222 #, c-format msgid "PVOC frame %ld seems too small in %s" msgstr "" #: Opcodes/pvinterp.c:91 Opcodes/pvinterp.c:203 Opcodes/pvinterp.c:393 -#: Opcodes/vpvoc.c:224 +#: Opcodes/vpvoc.c:226 #, c-format msgid "%d chans (not 1) in PVOC file %s" msgstr "" #: Opcodes/pvinterp.c:106 Opcodes/pvinterp.c:230 Opcodes/pvinterp.c:418 -#: Opcodes/ugens8.c:101 Opcodes/vpvoc.c:252 +#: Opcodes/ugens8.c:101 Opcodes/vpvoc.c:254 #, c-format msgid "ksmps of %d needs wdw of %d, max is %d for pv %s" msgstr "" #: Opcodes/pvinterp.c:135 Opcodes/pvinterp.c:284 Opcodes/pvinterp.c:475 -#: Opcodes/pvread.c:109 Opcodes/ugens8.c:174 Opcodes/vpvoc.c:314 +#: Opcodes/pvread.c:109 Opcodes/ugens8.c:174 Opcodes/vpvoc.c:316 msgid "PVOC ktimpnt truncated to last frame" msgstr "" @@ -7776,7 +7804,7 @@ msgstr "pvbufread: nicht initialisiert" #: Opcodes/pvinterp.c:146 Opcodes/pvinterp.c:337 Opcodes/pvinterp.c:540 -#: Opcodes/pvread.c:117 Opcodes/ugens8.c:232 Opcodes/vpvoc.c:382 +#: Opcodes/pvread.c:117 Opcodes/ugens8.c:232 Opcodes/vpvoc.c:384 msgid "PVOC timpnt < 0" msgstr "" @@ -7799,12 +7827,12 @@ msgstr "pvinterp: nicht initialisiert" #: Opcodes/pvinterp.c:332 Opcodes/pvinterp.c:534 Opcodes/ugens8.c:226 -#: Opcodes/vpvoc.c:376 +#: Opcodes/vpvoc.c:378 msgid "PVOC transpose too low" msgstr "" #: Opcodes/pvinterp.c:335 Opcodes/pvinterp.c:537 Opcodes/ugens8.c:229 -#: Opcodes/vpvoc.c:379 +#: Opcodes/vpvoc.c:381 msgid "PVOC transpose too high" msgstr "" @@ -7822,7 +7850,7 @@ msgid "pvcross: %s: frame size %d does not match pvbufread frame size %d\n" msgstr "" -#: Opcodes/pvinterp.c:498 Opcodes/vpvoc.c:339 +#: Opcodes/pvinterp.c:498 Opcodes/vpvoc.c:341 msgid "PVOC debug: one frame gets through\n" msgstr "" @@ -7830,19 +7858,19 @@ msgid "pvcross: not initialised" msgstr "pvcross: nicht initialisiert" -#: Opcodes/pvlock.c:67 Opcodes/pvsbasic.c:480 +#: Opcodes/pvlock.c:71 Opcodes/pvsbasic.c:480 #, fuzzy msgid "invalid number of output arguments" msgstr "unzulässiger Name für Instrument" -#: Opcodes/pvlock.c:536 Opcodes/pvsband.c:46 Opcodes/pvsbasic.c:684 +#: Opcodes/pvlock.c:826 Opcodes/pvsband.c:46 Opcodes/pvsbasic.c:684 #: Opcodes/pvsbasic.c:1007 Opcodes/pvsbasic.c:1220 Opcodes/pvsbasic.c:1326 #: Opcodes/pvsbasic.c:1555 Opcodes/pvsbasic.c:1768 Opcodes/pvsbasic.c:1942 -#: Opcodes/pvsgendy.c:43 Opcodes/signalflowgraph.cpp:627 +#: Opcodes/pvsgendy.c:43 Opcodes/signalflowgraph.cpp:665 msgid "Unsafe to have same fsig as in and out" msgstr "" -#: Opcodes/pvlock.c:548 +#: Opcodes/pvlock.c:838 msgid "pvsfreeze: signal format must be amp-freq." msgstr "" @@ -8198,49 +8226,49 @@ msgid "Nothing to close" msgstr "" -#: Opcodes/sfont.c:111 +#: Opcodes/sfont.c:114 #, c-format msgid "sfload: cannot open SoundFont file \"%s\" (error %s)" msgstr "" -#: Opcodes/sfont.c:117 +#: Opcodes/sfont.c:120 msgid "Sfload: cannot use globals" msgstr "" -#: Opcodes/sfont.c:150 +#: Opcodes/sfont.c:153 msgid "sfload: could not open globals\n" msgstr "" -#: Opcodes/sfont.c:172 +#: Opcodes/sfont.c:175 #, fuzzy msgid "Extending soundfonts" msgstr "zu viele Argumente" -#: Opcodes/sfont.c:211 +#: Opcodes/sfont.c:214 #, c-format msgid "" "\n" "Preset list of \"%s\"\n" msgstr "" -#: Opcodes/sfont.c:214 +#: Opcodes/sfont.c:217 #, c-format msgid "%3d) %-20s\tprog:%-3d bank:%d\n" msgstr "" -#: Opcodes/sfont.c:236 +#: Opcodes/sfont.c:239 #, c-format msgid "" "\n" "Assigning all Presets of \"%s\" starting from %d (preset handle number)\n" msgstr "" -#: Opcodes/sfont.c:241 +#: Opcodes/sfont.c:244 #, c-format msgid "%3d<--%-20s\t(prog:%-3d bank:%d)\n" msgstr "" -#: Opcodes/sfont.c:248 +#: Opcodes/sfont.c:251 #, c-format msgid "" "\n" @@ -8248,38 +8276,38 @@ "\n" msgstr "" -#: Opcodes/sfont.c:261 +#: Opcodes/sfont.c:264 #, c-format msgid "" "\n" "Instrument list of \"%s\"\n" msgstr "" -#: Opcodes/sfont.c:279 +#: Opcodes/sfont.c:282 #, c-format msgid "sfpreset: preset handle too big (%d), max: %d" msgstr "" -#: Opcodes/sfont.c:296 +#: Opcodes/sfont.c:299 #, c-format msgid "" "sfpreset: cannot find any preset having prog number %d and bank number %d in " "SoundFont file \"%s\"" msgstr "" -#: Opcodes/sfont.c:318 Opcodes/sfont.c:2248 +#: Opcodes/sfont.c:321 Opcodes/sfont.c:2251 msgid "sfplay: invalid or out-of-range preset number" msgstr "" -#: Opcodes/sfont.c:655 +#: Opcodes/sfont.c:658 msgid "sfplaym: invalid or out-of-range preset number" msgstr "" -#: Opcodes/sfont.c:919 Opcodes/sfont.c:1191 +#: Opcodes/sfont.c:922 Opcodes/sfont.c:1194 msgid "sfinstr: instrument out of range" msgstr "" -#: Opcodes/sfont.c:1648 Opcodes/sfont.c:1886 +#: Opcodes/sfont.c:1651 Opcodes/sfont.c:1889 #, c-format msgid "" "SoundFont file \"%s\" contains ROM samples !\n" @@ -8287,15 +8315,15 @@ "Session aborted !" msgstr "" -#: Opcodes/sfont.c:2041 Opcodes/sfont.c:2049 +#: Opcodes/sfont.c:2044 Opcodes/sfont.c:2052 msgid "Sfont: cannot use globals/" msgstr "" -#: Opcodes/sfont.c:2054 +#: Opcodes/sfont.c:2057 msgid "Sfont format not compatible" msgstr "" -#: Opcodes/sfont.c:2598 +#: Opcodes/sfont.c:2601 msgid "error... could not create sfont globals\n" msgstr "" @@ -8303,31 +8331,36 @@ msgid "powershape: ifullscale must be strictly positive" msgstr "" -#: Opcodes/signalflowgraph.cpp:332 Opcodes/signalflowgraph.cpp:593 +#: Opcodes/signalflowgraph.cpp:360 Opcodes/signalflowgraph.cpp:629 #, c-format msgid "Connected instances of outlet %s to instance 0x%x of inlet %s.\n" msgstr "" -#: Opcodes/signalflowgraph.cpp:408 +#: Opcodes/signalflowgraph.cpp:438 #, c-format msgid "Created instance 0x%x of %d instances of outlet %s\n" msgstr "" -#: Opcodes/signalflowgraph.cpp:468 +#: Opcodes/signalflowgraph.cpp:500 #, c-format msgid "Connected instances of outlet %s to instance 0x%xof inlet %s.\n" msgstr "" -#: Opcodes/signalflowgraph.cpp:655 +#: Opcodes/signalflowgraph.cpp:693 msgid "inletf: signal format must be amp-phase or amp-freq." msgstr "" -#: Opcodes/signalflowgraph.cpp:948 Opcodes/signalflowgraph.cpp:989 +#: Opcodes/signalflowgraph.cpp:837 +#, c-format +msgid "Connected instances of outlet %s to instance 0x%x of inlet %s\n" +msgstr "" + +#: Opcodes/signalflowgraph.cpp:1150 Opcodes/signalflowgraph.cpp:1193 #, c-format msgid "Connected outlet %s to inlet %s.\n" msgstr "" -#: Opcodes/signalflowgraph.cpp:1116 Opcodes/signalflowgraph.cpp:1200 +#: Opcodes/signalflowgraph.cpp:1322 Opcodes/signalflowgraph.cpp:1408 #, fuzzy msgid "ftgenonce error" msgstr "Schreibfehler" @@ -8642,7 +8675,7 @@ msgid "Error allocating argument stack" msgstr "" -#: Opcodes/stackops.c:206 Top/argdecode.c:1245 util/envext.c:99 +#: Opcodes/stackops.c:206 Top/argdecode.c:1263 util/envext.c:99 #: util/scale.c:248 msgid "too many arguments" msgstr "zu viele Argumente" @@ -9072,7 +9105,7 @@ msgid "ATSCROSS: you must have an atsbufread before an atsinterpread" msgstr "" -#: Opcodes/ugsc.c:434 +#: Opcodes/ugsc.c:439 msgid "Phaser mode must be either 1 or 2" msgstr "" @@ -9204,21 +9237,21 @@ msgid "Have to have at least %d directions in vbapzmove" msgstr "" -#: Opcodes/vpvoc.c:175 +#: Opcodes/vpvoc.c:177 #, c-format msgid "vpvoc: Could not find ifnmagctrl table %f" msgstr "" -#: Opcodes/vpvoc.c:181 +#: Opcodes/vpvoc.c:183 msgid "vpvoc: associated tableseg not found" msgstr "" -#: Opcodes/vpvoc.c:203 +#: Opcodes/vpvoc.c:205 #, c-format msgid "VPVOC cannot load %s" msgstr "" -#: Opcodes/vpvoc.c:373 +#: Opcodes/vpvoc.c:375 msgid "vpvoc: not initialised" msgstr "vpvoc: nicht initialisiert" @@ -9290,748 +9323,760 @@ msgid "No wii range" msgstr "" -#: Top/argdecode.c:63 +#: Top/argdecode.c:64 msgid "--help\tprint long usage options" msgstr "" -#: Top/argdecode.c:64 +#: Top/argdecode.c:65 msgid "-U unam\trun utility program unam" msgstr "" -#: Top/argdecode.c:65 +#: Top/argdecode.c:66 msgid "-C\tuse Cscore processing of scorefile" msgstr "" -#: Top/argdecode.c:66 +#: Top/argdecode.c:67 msgid "-j N\tuse N threads in performance" msgstr "" -#: Top/argdecode.c:67 +#: Top/argdecode.c:68 msgid "-I\tI-time only orch run" msgstr "" -#: Top/argdecode.c:68 +#: Top/argdecode.c:69 msgid "-n\tno sound onto disk" msgstr "" -#: Top/argdecode.c:69 +#: Top/argdecode.c:70 msgid "-i fnam\tsound input filename" msgstr "" -#: Top/argdecode.c:70 util/mixer.c:94 util/scale.c:45 +#: Top/argdecode.c:71 util/mixer.c:94 util/scale.c:45 msgid "-o fnam\tsound output filename" msgstr "" -#: Top/argdecode.c:71 +#: Top/argdecode.c:72 msgid "-b N\tsample frames (or -kprds) per software sound I/O buffer" msgstr "" -#: Top/argdecode.c:72 +#: Top/argdecode.c:73 msgid "-B N\tsamples per hardware sound I/O buffer" msgstr "" -#: Top/argdecode.c:73 util/mixer.c:95 util/scale.c:46 util/srconv.c:752 +#: Top/argdecode.c:74 util/mixer.c:95 util/scale.c:46 util/srconv.c:752 msgid "-A\tcreate an AIFF format output soundfile" msgstr "" -#: Top/argdecode.c:74 util/mixer.c:96 util/scale.c:47 util/srconv.c:754 +#: Top/argdecode.c:75 util/mixer.c:96 util/scale.c:47 util/srconv.c:754 msgid "-W\tcreate a WAV format output soundfile" msgstr "" -#: Top/argdecode.c:75 util/srconv.c:753 +#: Top/argdecode.c:76 util/srconv.c:753 msgid "-J\tcreate an IRCAM format output soundfile" msgstr "" -#: Top/argdecode.c:76 util/mixer.c:97 util/scale.c:48 util/srconv.c:755 +#: Top/argdecode.c:77 util/mixer.c:97 util/scale.c:48 util/srconv.c:755 msgid "-h\tno header on output soundfile" msgstr "" -#: Top/argdecode.c:77 util/mixer.c:99 util/scale.c:49 util/srconv.c:756 +#: Top/argdecode.c:78 util/mixer.c:99 util/scale.c:49 util/srconv.c:756 msgid "-c\t8-bit signed_char sound samples" msgstr "" -#: Top/argdecode.c:79 util/mixer.c:101 util/scale.c:50 util/srconv.c:757 +#: Top/argdecode.c:80 util/mixer.c:101 util/scale.c:50 util/srconv.c:757 msgid "-a\talaw sound samples" msgstr "" -#: Top/argdecode.c:81 util/mixer.c:98 util/mixer.c:100 util/srconv.c:758 +#: Top/argdecode.c:82 util/mixer.c:98 util/mixer.c:100 util/srconv.c:758 msgid "-8\t8-bit unsigned_char sound samples" msgstr "" -#: Top/argdecode.c:82 util/mixer.c:102 util/scale.c:51 util/srconv.c:759 +#: Top/argdecode.c:83 util/mixer.c:102 util/scale.c:51 util/srconv.c:759 msgid "-u\tulaw sound samples" msgstr "" -#: Top/argdecode.c:83 util/mixer.c:103 util/scale.c:52 util/srconv.c:760 +#: Top/argdecode.c:84 util/mixer.c:103 util/scale.c:52 util/srconv.c:760 msgid "-s\tshort_int sound samples" msgstr "" -#: Top/argdecode.c:84 util/mixer.c:104 util/scale.c:53 util/srconv.c:761 +#: Top/argdecode.c:85 util/mixer.c:104 util/scale.c:53 util/srconv.c:761 msgid "-l\tlong_int sound samples" msgstr "" -#: Top/argdecode.c:85 util/mixer.c:105 util/scale.c:54 util/srconv.c:762 +#: Top/argdecode.c:86 util/mixer.c:105 util/scale.c:54 util/srconv.c:762 msgid "-f\tfloat sound samples" msgstr "" -#: Top/argdecode.c:86 +#: Top/argdecode.c:87 msgid "-3\t24bit sound samples" msgstr "" -#: Top/argdecode.c:87 util/srconv.c:763 +#: Top/argdecode.c:88 util/srconv.c:763 msgid "-r N\torchestra srate override" msgstr "" -#: Top/argdecode.c:88 +#: Top/argdecode.c:89 msgid "-k N\torchestra krate override" msgstr "" -#: Top/argdecode.c:89 util/srconv.c:764 +#: Top/argdecode.c:90 util/srconv.c:764 msgid "-K\tDo not generate PEAK chunks" msgstr "" -#: Top/argdecode.c:90 +#: Top/argdecode.c:91 msgid "-v\tverbose orch translation" msgstr "" -#: Top/argdecode.c:91 +#: Top/argdecode.c:92 msgid "-m N\ttty message level. Sum of:" msgstr "" -#: Top/argdecode.c:92 +#: Top/argdecode.c:93 msgid "\t\t1=note amps, 2=out-of-range msg, 4=warnings" msgstr "" -#: Top/argdecode.c:93 +#: Top/argdecode.c:94 msgid "\t\t0/32/64/96=note amp format (raw,dB,colors)" msgstr "" -#: Top/argdecode.c:94 +#: Top/argdecode.c:95 msgid "\t\t128=print benchmark information" msgstr "" -#: Top/argdecode.c:95 +#: Top/argdecode.c:96 msgid "-d\tsuppress all displays" msgstr "" -#: Top/argdecode.c:96 +#: Top/argdecode.c:97 msgid "-g\tsuppress graphics, use ascii displays" msgstr "" -#: Top/argdecode.c:97 +#: Top/argdecode.c:98 msgid "-G\tsuppress graphics, use Postscript displays" msgstr "" -#: Top/argdecode.c:98 +#: Top/argdecode.c:99 msgid "-x fnam\textract from score.srt using extract file 'fnam'" msgstr "" -#: Top/argdecode.c:99 +#: Top/argdecode.c:100 msgid "-t N\tuse uninterpreted beats of the score, initially at tempo N" msgstr "" -#: Top/argdecode.c:100 +#: Top/argdecode.c:101 msgid "-t 0\tuse score.srt for sorted score rather than a temporary" msgstr "" -#: Top/argdecode.c:101 +#: Top/argdecode.c:102 msgid "-L dnam\tread Line-oriented realtime score events from device 'dnam'" msgstr "" -#: Top/argdecode.c:102 +#: Top/argdecode.c:103 msgid "-M dnam\tread MIDI realtime events from device 'dnam'" msgstr "" -#: Top/argdecode.c:103 +#: Top/argdecode.c:104 msgid "-F fnam\tread MIDIfile event stream from file 'fnam'" msgstr "" -#: Top/argdecode.c:105 util/mixer.c:106 util/scale.c:59 util/srconv.c:765 +#: Top/argdecode.c:106 util/mixer.c:106 util/scale.c:59 util/srconv.c:765 msgid "-R\tcontinually rewrite header while writing soundfile (WAV/AIFF)" msgstr "" -#: Top/argdecode.c:106 +#: Top/argdecode.c:107 msgid "-H#\tprint heartbeat style 1, 2 or 3 at each soundfile write" msgstr "" -#: Top/argdecode.c:107 util/mixer.c:108 util/scale.c:61 util/srconv.c:767 +#: Top/argdecode.c:108 util/mixer.c:108 util/scale.c:61 util/srconv.c:767 msgid "-N\tnotify (ring the bell) when score or miditrack is done" msgstr "" -#: Top/argdecode.c:108 +#: Top/argdecode.c:109 msgid "-T\tterminate the performance when miditrack is done" msgstr "" -#: Top/argdecode.c:109 +#: Top/argdecode.c:110 msgid "-D\tdefer GEN01 soundfile loads until performance time" msgstr "" -#: Top/argdecode.c:110 +#: Top/argdecode.c:111 msgid "-Q dnam\tselect MIDI output device" msgstr "" -#: Top/argdecode.c:111 +#: Top/argdecode.c:112 msgid "-z\tList opcodes in this version" msgstr "" -#: Top/argdecode.c:112 +#: Top/argdecode.c:113 msgid "-Z\tDither output" msgstr "" -#: Top/argdecode.c:114 +#: Top/argdecode.c:115 msgid "--sched set real-time priority and lock memory" msgstr "" -#: Top/argdecode.c:115 Top/argdecode.c:117 +#: Top/argdecode.c:116 Top/argdecode.c:118 msgid " (requires -d and real time audio (-iadc/-odac))" msgstr "" -#: Top/argdecode.c:116 +#: Top/argdecode.c:117 msgid "--sched=N set specified scheduling priority, and lock memory" msgstr "" -#: Top/argdecode.c:126 +#: Top/argdecode.c:127 msgid "\t\t\tSet output file format" msgstr "" -#: Top/argdecode.c:127 +#: Top/argdecode.c:128 msgid "--aiff\t\t\tSet AIFF format" msgstr "" -#: Top/argdecode.c:128 +#: Top/argdecode.c:129 msgid "--au\t\t\tSet AU format" msgstr "" -#: Top/argdecode.c:129 +#: Top/argdecode.c:130 msgid "--wave\t\t\tSet WAV format" msgstr "" -#: Top/argdecode.c:130 +#: Top/argdecode.c:131 msgid "--ircam\t\t\tSet IRCAM format" msgstr "" -#: Top/argdecode.c:131 +#: Top/argdecode.c:132 msgid "--ogg\t\t\tSet OGG/VORBIS format" msgstr "" -#: Top/argdecode.c:132 +#: Top/argdecode.c:133 msgid "--noheader\t\tRaw format" msgstr "" -#: Top/argdecode.c:133 +#: Top/argdecode.c:134 msgid "--nopeaks\t\tDo not write peak information" msgstr "" -#: Top/argdecode.c:135 +#: Top/argdecode.c:136 msgid "--nodisplays\t\tSuppress all displays" msgstr "" -#: Top/argdecode.c:136 +#: Top/argdecode.c:137 msgid "--asciidisplay\t\tSuppress graphics, use ascii displays" msgstr "" -#: Top/argdecode.c:137 +#: Top/argdecode.c:138 msgid "--postscriptdisplay\tSuppress graphics, use Postscript displays" msgstr "" -#: Top/argdecode.c:139 +#: Top/argdecode.c:140 msgid "--defer-gen1\t\tDefer GEN01 soundfile loads until performance time" msgstr "" -#: Top/argdecode.c:140 +#: Top/argdecode.c:141 msgid "" "--iobufsamps=N\t\tSample frames (or -kprds) per software sound I/O buffer" msgstr "" -#: Top/argdecode.c:142 +#: Top/argdecode.c:143 msgid "--hardwarebufsamps=N\tSamples per hardware sound I/O buffer" msgstr "" -#: Top/argdecode.c:143 +#: Top/argdecode.c:144 msgid "--cscore\t\tUse Cscore processing of scorefile" msgstr "" -#: Top/argdecode.c:144 +#: Top/argdecode.c:145 msgid "--orc\t\t\tUse orchfile without scorefile" msgstr "" -#: Top/argdecode.c:146 +#: Top/argdecode.c:147 msgid "--midifile=FNAME\tRead MIDIfile event stream from file" msgstr "" -#: Top/argdecode.c:147 +#: Top/argdecode.c:148 msgid "--midioutfile=FNAME\tWrite MIDI output to file FNAME" msgstr "" -#: Top/argdecode.c:148 +#: Top/argdecode.c:149 msgid "--midi-device=FNAME\tRead MIDI realtime events from device" msgstr "" -#: Top/argdecode.c:149 +#: Top/argdecode.c:150 msgid "--terminate-on-midi\tTerminate the performance when miditrack is done" msgstr "" -#: Top/argdecode.c:151 +#: Top/argdecode.c:152 msgid "" "--heartbeat=N\t\tPrint a heartbeat style 1, 2 or 3 at each soundfile write" msgstr "" -#: Top/argdecode.c:153 +#: Top/argdecode.c:154 msgid "--notify\t\tNotify (ring the bell) when score or miditrack is done" msgstr "" -#: Top/argdecode.c:154 +#: Top/argdecode.c:155 msgid "" "--rewrite\t\tContinually rewrite header while writing soundfile (WAV/AIFF)" msgstr "" -#: Top/argdecode.c:157 +#: Top/argdecode.c:158 msgid "--input=FNAME\t\tSound input filename" msgstr "" -#: Top/argdecode.c:158 +#: Top/argdecode.c:159 msgid "--output=FNAME\t\tSound output filename" msgstr "" -#: Top/argdecode.c:159 +#: Top/argdecode.c:160 msgid "--logfile=FNAME\t\tLog output to file" msgstr "" -#: Top/argdecode.c:161 +#: Top/argdecode.c:162 msgid "--nosound\t\tNo sound onto disk or device" msgstr "" -#: Top/argdecode.c:162 +#: Top/argdecode.c:163 msgid "--tempo=N\t\tUse uninterpreted beats of the score, initially at tempo N" msgstr "" -#: Top/argdecode.c:164 +#: Top/argdecode.c:165 msgid "--i-only\t\tI-time only orch run" msgstr "" -#: Top/argdecode.c:165 +#: Top/argdecode.c:166 msgid "--syntax-check-only\tStop after checking orchestra and score syntax" msgstr "" -#: Top/argdecode.c:166 +#: Top/argdecode.c:167 msgid "--control-rate=N\tOrchestra krate override" msgstr "" -#: Top/argdecode.c:167 +#: Top/argdecode.c:168 msgid "--sample-rate=N\t\tOrchestra srate override" msgstr "" -#: Top/argdecode.c:168 +#: Top/argdecode.c:169 msgid "--score-in=FNAME\tRead Line-oriented realtime score events from device" msgstr "" -#: Top/argdecode.c:170 +#: Top/argdecode.c:171 msgid "--messagelevel=N\ttty message level, sum of:" msgstr "" -#: Top/argdecode.c:171 +#: Top/argdecode.c:172 msgid "--messageolevel=O\ttty message level in octal, of:" msgstr "" -#: Top/argdecode.c:172 +#: Top/argdecode.c:173 msgid "\t\t\t\t1=note amps, 2=out-of-range msg, 4=warnings," msgstr "" -#: Top/argdecode.c:173 +#: Top/argdecode.c:174 msgid "\t\t\t\t0/32/64/96=note amp format (raw,dB,colors)," msgstr "" -#: Top/argdecode.c:174 +#: Top/argdecode.c:175 msgid "\t\t\t\t128=print benchmark information" msgstr "" -#: Top/argdecode.c:176 +#: Top/argdecode.c:177 msgid "--m-amps=[01]\tmessages on note amps" msgstr "" -#: Top/argdecode.c:177 +#: Top/argdecode.c:178 msgid "--m-range=[01]\tMessages on range errors" msgstr "" -#: Top/argdecode.c:178 +#: Top/argdecode.c:179 msgid "--m-warnings=[01]\tMesage on warnings" msgstr "" -#: Top/argdecode.c:179 +#: Top/argdecode.c:180 msgid "--m-raw=[01]\tRaw amp messages" msgstr "" -#: Top/argdecode.c:180 +#: Top/argdecode.c:181 msgid "--m-dB=[01]\tAmp messages in dB" msgstr "" -#: Top/argdecode.c:181 +#: Top/argdecode.c:182 msgid "--m-colours=[01]\tColour amp messages" msgstr "" -#: Top/argdecode.c:182 +#: Top/argdecode.c:183 msgid "--m-benchmarks=[01]\tPrint benchmark information" msgstr "" -#: Top/argdecode.c:183 +#: Top/argdecode.c:184 msgid "--csd-line-nums=[01]\tControls how error line numbers are printed:" msgstr "" -#: Top/argdecode.c:184 +#: Top/argdecode.c:185 msgid "\t\t\t1=use CSD line #s (default), 0=use ORC/SCO-relative line #s" msgstr "" -#: Top/argdecode.c:185 +#: Top/argdecode.c:186 msgid "--extract-score=FNAME\tExtract from score.srt using extract file" msgstr "" -#: Top/argdecode.c:186 +#: Top/argdecode.c:187 msgid "--keep-sorted-score" msgstr "" -#: Top/argdecode.c:187 +#: Top/argdecode.c:188 msgid "--env:NAME=VALUE\tSet environment variable NAME to VALUE" msgstr "" -#: Top/argdecode.c:188 +#: Top/argdecode.c:189 msgid "--env:NAME+=VALUE\tAppend VALUE to environment variable NAME" msgstr "" -#: Top/argdecode.c:189 +#: Top/argdecode.c:190 msgid "--strsetN=VALUE\t\tSet strset table at index N to VALUE" msgstr "" -#: Top/argdecode.c:190 +#: Top/argdecode.c:191 msgid "--utility=NAME\t\tRun utility program" msgstr "" -#: Top/argdecode.c:191 +#: Top/argdecode.c:192 msgid "--verbose\t\tVerbose orch translation" msgstr "" -#: Top/argdecode.c:192 +#: Top/argdecode.c:193 msgid "--list-opcodes\t\tList opcodes in this version" msgstr "" -#: Top/argdecode.c:193 +#: Top/argdecode.c:194 msgid "--list-opcodesN\t\tList opcodes in style N in this version" msgstr "" -#: Top/argdecode.c:194 +#: Top/argdecode.c:195 msgid "--dither\t\tDither output" msgstr "" -#: Top/argdecode.c:195 +#: Top/argdecode.c:196 msgid "--dither-triangular\t\tDither output with triangular distribution" msgstr "" -#: Top/argdecode.c:196 +#: Top/argdecode.c:197 msgid "--dither-uniform\t\tDither output with rectanular distribution" msgstr "" -#: Top/argdecode.c:197 +#: Top/argdecode.c:198 msgid "--sched\t\t\tSet real-time scheduling priority and lock memory" msgstr "" -#: Top/argdecode.c:198 +#: Top/argdecode.c:199 msgid "--sched=N\t\tSet priority to N and lock memory" msgstr "" -#: Top/argdecode.c:199 +#: Top/argdecode.c:200 msgid "--opcode-lib=NAMES\tDynamic libraries to load" msgstr "" -#: Top/argdecode.c:200 +#: Top/argdecode.c:201 msgid "--opcode-omit=NAMES\tDynamic libraries not to load" msgstr "" -#: Top/argdecode.c:201 +#: Top/argdecode.c:202 msgid "--omacro:XXX=YYY\tSet orchestra macro XXX to value YYY" msgstr "" -#: Top/argdecode.c:202 +#: Top/argdecode.c:203 msgid "--smacro:XXX=YYY\tSet score macro XXX to value YYY" msgstr "" -#: Top/argdecode.c:203 +#: Top/argdecode.c:204 msgid "--midi-key=N\t\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:204 +#: Top/argdecode.c:205 msgid "\t\t\tkey number to pfield N as MIDI value [0-127]" msgstr "" -#: Top/argdecode.c:205 +#: Top/argdecode.c:206 msgid "--midi-key-cps=N\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:206 +#: Top/argdecode.c:207 msgid "\t\t\tkey number to pfield N as cycles per second" msgstr "" -#: Top/argdecode.c:207 +#: Top/argdecode.c:208 msgid "--midi-key-oct=N\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:208 +#: Top/argdecode.c:209 msgid "\t\t\tkey number to pfield N as linear octave" msgstr "" -#: Top/argdecode.c:209 +#: Top/argdecode.c:210 msgid "--midi-key-pch=N\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:210 +#: Top/argdecode.c:211 msgid "\t\t\tkey number to pfield N as oct.pch" msgstr "" -#: Top/argdecode.c:211 +#: Top/argdecode.c:212 msgid "--midi-velocity=N\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:212 +#: Top/argdecode.c:213 msgid "\t\t\tvelocity number to pfield N as MIDI value [0-127]" msgstr "" -#: Top/argdecode.c:213 +#: Top/argdecode.c:214 msgid "--midi-velocity-amp=N\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:214 +#: Top/argdecode.c:215 msgid "\t\t\tvelocity number to pfield N as amplitude" msgstr "" -#: Top/argdecode.c:215 +#: Top/argdecode.c:216 msgid "--no-default-paths\tTurn off relative paths from CSD/ORC/SCO" msgstr "" -#: Top/argdecode.c:216 +#: Top/argdecode.c:217 msgid "--sample-accurate\t\tUse sample-accurate timing of score events" msgstr "" -#: Top/argdecode.c:217 +#: Top/argdecode.c:218 msgid "--realtime\t\trealtime priority mode" msgstr "" -#: Top/argdecode.c:218 +#: Top/argdecode.c:219 #, fuzzy msgid "--nchnls=N\t\t override number of audio channels" msgstr "unzulässiger Name für Instrument" -#: Top/argdecode.c:219 +#: Top/argdecode.c:220 msgid "--nchnls_i=N\t\t override number of input audio channels" msgstr "" -#: Top/argdecode.c:220 +#: Top/argdecode.c:221 msgid "--0dbfs=N\t\t override 0dbfs (max positive signal amplitude)" msgstr "" -#: Top/argdecode.c:221 +#: Top/argdecode.c:222 msgid "--sinesize\t\tlength of internal sine table" msgstr "" #: Top/argdecode.c:223 +msgid "" +"--daemon\t\t daemon mode: do not exit if CSD/orchestra is not given, is " +"empty or does not compile" +msgstr "" + +#: Top/argdecode.c:225 +msgid "" +"--port=N\t\t listen to UDP port N for instruments/orchestra code (implies --" +"daemon)" +msgstr "" + +#: Top/argdecode.c:228 msgid "--help\t\t\tLong help" msgstr "" -#: Top/argdecode.c:239 +#: Top/argdecode.c:244 #, c-format msgid "flag defaults: csound -s -otest -b%d -B%d -m%d\n" msgstr "" -#: Top/argdecode.c:246 Top/argdecode.c:262 +#: Top/argdecode.c:251 Top/argdecode.c:267 msgid "Usage:\tcsound [-flags] orchfile scorefile\n" msgstr "" -#: Top/argdecode.c:247 Top/argdecode.c:263 util/envext.c:53 util/xtrct.c:67 +#: Top/argdecode.c:252 Top/argdecode.c:268 util/envext.c:53 util/xtrct.c:67 msgid "Legal flags are:\n" msgstr "" -#: Top/argdecode.c:248 +#: Top/argdecode.c:253 msgid "" "Long format:\n" "\n" msgstr "" -#: Top/argdecode.c:253 +#: Top/argdecode.c:258 msgid "" "\n" "Short form:\n" msgstr "" -#: Top/argdecode.c:266 +#: Top/argdecode.c:271 msgid "Csound Command ERROR:\t" msgstr "" -#: Top/argdecode.c:401 +#: Top/argdecode.c:406 #, c-format msgid "unknown output format: '%s'" msgstr "" -#: Top/argdecode.c:419 Top/argdecode.c:1008 +#: Top/argdecode.c:424 Top/argdecode.c:1024 msgid "no iobufsamps" msgstr "" -#: Top/argdecode.c:426 Top/argdecode.c:1015 +#: Top/argdecode.c:431 Top/argdecode.c:1031 msgid "no hardware bufsamps" msgstr "" -#: Top/argdecode.c:452 Top/argdecode.c:1115 +#: Top/argdecode.c:457 Top/argdecode.c:1132 msgid "no midifile name" msgstr "" -#: Top/argdecode.c:457 Top/argdecode.c:1121 +#: Top/argdecode.c:461 Top/argdecode.c:1137 msgid "-F: stdin not supported on this platform" msgstr "" -#: Top/argdecode.c:467 +#: Top/argdecode.c:473 msgid "no midi output file name" msgstr "" -#: Top/argdecode.c:496 +#: Top/argdecode.c:502 msgid "invalid python variable definition syntax" msgstr "" -#: Top/argdecode.c:502 Top/argdecode.c:976 +#: Top/argdecode.c:508 Top/argdecode.c:992 msgid "no infilename" msgstr "" -#: Top/argdecode.c:505 Top/argdecode.c:980 +#: Top/argdecode.c:511 Top/argdecode.c:996 msgid "input cannot be stdout" msgstr "" -#: Top/argdecode.c:509 Top/argdecode.c:984 +#: Top/argdecode.c:515 Top/argdecode.c:1000 msgid "stdin audio not supported" msgstr "" -#: Top/argdecode.c:544 Top/argdecode.c:1048 +#: Top/argdecode.c:550 Top/argdecode.c:1064 msgid "no control rate" msgstr "" -#: Top/argdecode.c:558 Top/argdecode.c:1090 +#: Top/argdecode.c:564 Top/argdecode.c:1106 msgid "no Linein score device_name" msgstr "" -#: Top/argdecode.c:574 Top/argdecode.c:580 Top/argdecode.c:1056 +#: Top/argdecode.c:580 Top/argdecode.c:586 Top/argdecode.c:1072 msgid "no message level" msgstr "" -#: Top/argdecode.c:587 +#: Top/argdecode.c:593 msgid "no message amps" msgstr "" -#: Top/argdecode.c:596 +#: Top/argdecode.c:602 msgid "no message range" msgstr "" -#: Top/argdecode.c:605 +#: Top/argdecode.c:611 msgid "no message warnings" msgstr "" -#: Top/argdecode.c:614 +#: Top/argdecode.c:620 msgid "no message raw" msgstr "" -#: Top/argdecode.c:623 +#: Top/argdecode.c:629 msgid "no message dB" msgstr "" -#: Top/argdecode.c:632 +#: Top/argdecode.c:638 msgid "no message colours" msgstr "" -#: Top/argdecode.c:641 +#: Top/argdecode.c:647 msgid "no benchmark level" msgstr "" -#: Top/argdecode.c:649 +#: Top/argdecode.c:655 msgid "no value for --csd-line-nums" msgstr "" -#: Top/argdecode.c:658 Top/argdecode.c:1101 +#: Top/argdecode.c:664 Top/argdecode.c:1117 msgid "no midi device_name" msgstr "" -#: Top/argdecode.c:663 Top/argdecode.c:1107 +#: Top/argdecode.c:669 Top/argdecode.c:1122 msgid "-M: stdin not supported on this platform" msgstr "" -#: Top/argdecode.c:683 Top/argdecode.c:992 util/envext.c:84 util/mixer.c:206 +#: Top/argdecode.c:689 Top/argdecode.c:1008 util/envext.c:84 util/mixer.c:206 #: util/scale.c:173 util/srconv.c:247 util/xtrct.c:120 msgid "no outfilename" msgstr "" -#: Top/argdecode.c:686 Top/argdecode.c:996 util/scale.c:177 util/srconv.c:251 +#: Top/argdecode.c:692 Top/argdecode.c:1012 util/scale.c:177 util/srconv.c:251 #: util/xtrct.c:124 msgid "-o cannot be stdin" msgstr "" -#: Top/argdecode.c:690 Top/argdecode.c:1000 util/scale.c:180 util/srconv.c:256 +#: Top/argdecode.c:696 Top/argdecode.c:1016 util/scale.c:180 util/srconv.c:256 msgid "stdout audio not supported" msgstr "" -#: Top/argdecode.c:700 Top/argdecode.c:1198 util/hetro.c:232 +#: Top/argdecode.c:706 Top/argdecode.c:1216 util/hetro.c:232 msgid "no log file" msgstr "" -#: Top/argdecode.c:755 Top/argdecode.c:955 +#: Top/argdecode.c:761 Top/argdecode.c:971 msgid "no utility name" msgstr "" -#: Top/argdecode.c:774 Top/argdecode.c:1070 +#: Top/argdecode.c:780 Top/argdecode.c:1086 msgid "no xfilename" msgstr "" -#: Top/argdecode.c:920 +#: Top/argdecode.c:936 #, c-format msgid "unknown long option: '--%s'" msgstr "" -#: Top/argdecode.c:1043 +#: Top/argdecode.c:1059 msgid "no sample rate" msgstr "" -#: Top/argdecode.c:1075 +#: Top/argdecode.c:1091 msgid "no tempo value" msgstr "" -#: Top/argdecode.c:1080 +#: Top/argdecode.c:1096 msgid "illegal tempo" msgstr "" -#: Top/argdecode.c:1129 +#: Top/argdecode.c:1147 msgid "no MIDI output device" msgstr "" -#: Top/argdecode.c:1181 +#: Top/argdecode.c:1199 msgid "No indirection file" msgstr "" -#: Top/argdecode.c:1188 +#: Top/argdecode.c:1206 #, c-format msgid "Cannot open indirection file %s\n" msgstr "" -#: Top/argdecode.c:1217 +#: Top/argdecode.c:1235 #, fuzzy msgid "no number of threads" msgstr "unzulässiger Name für Instrument" -#: Top/argdecode.c:1228 util/envext.c:94 util/mixer.c:316 util/scale.c:241 +#: Top/argdecode.c:1246 util/envext.c:94 util/mixer.c:316 util/scale.c:241 #: util/xtrct.c:239 #, c-format msgid "unknown flag -%c" msgstr "" -#: Top/argdecode.c:1235 +#: Top/argdecode.c:1253 msgid "error: orchestra and score name not allowed in .csound6rc" msgstr "" -#: Top/argdecode.c:1381 +#: Top/argdecode.c:1401 msgid "stdout not supported on this platform" msgstr "" -#: Top/argdecode.c:1421 Top/argdecode.c:1441 Top/argdecode.c:1461 +#: Top/argdecode.c:1441 Top/argdecode.c:1461 Top/argdecode.c:1481 msgid "stdin not supported on this platform" msgstr "" @@ -10081,76 +10126,76 @@ msgid "cscoreFileGetCurrent: no fp current" msgstr "" -#: Top/csmodule.c:195 +#: Top/csmodule.c:199 #, c-format msgid "not loading '%s' (uses incompatible floating point type)" msgstr "" -#: Top/csmodule.c:204 +#: Top/csmodule.c:208 #, c-format msgid "" "not loading '%s' (incompatible with this version of Csound (%d.%d/%d.%d)" msgstr "" -#: Top/csmodule.c:247 +#: Top/csmodule.c:251 #, c-format msgid "could not open library '%s' (%s)" msgstr "" -#: Top/csmodule.c:250 +#: Top/csmodule.c:254 #, c-format msgid "could not open library '%s' (%d)" msgstr "" -#: Top/csmodule.c:311 +#: Top/csmodule.c:315 #, c-format msgid "'%s' is not a Csound plugin library" msgstr "" -#: Top/csmodule.c:322 +#: Top/csmodule.c:326 msgid "csoundLoadExternal(): memory allocation failure" msgstr "" -#: Top/csmodule.c:336 Top/csmodule.c:344 +#: Top/csmodule.c:340 Top/csmodule.c:348 #, c-format msgid "Error in pre-initialisation function of module '%s'" msgstr "" -#: Top/csmodule.c:417 +#: Top/csmodule.c:426 #, c-format msgid "Error opening plugin directory '%s': %s" msgstr "" -#: Top/csmodule.c:420 +#: Top/csmodule.c:429 #, fuzzy, c-format msgid "Error opening plugin directory: %s" msgstr "Störung Öffnung ASCII Akte" -#: Top/csmodule.c:455 +#: Top/csmodule.c:464 #, c-format msgid "path name too long, skipping '%s'" msgstr "" -#: Top/csmodule.c:461 +#: Top/csmodule.c:470 #, c-format msgid "Library %s omitted\n" msgstr "" -#: Top/csmodule.c:494 +#: Top/csmodule.c:503 msgid "Loading command-line libraries:\n" msgstr "" -#: Top/csmodule.c:517 +#: Top/csmodule.c:526 #, c-format msgid " *** error loading '%s'" msgstr "" -#: Top/csmodule.c:540 +#: Top/csmodule.c:549 #, c-format msgid "Error starting module '%s'" msgstr "" -#: Top/csmodule.c:639 +#: Top/csmodule.c:648 #, c-format msgid "Error de-initialising module '%s'" msgstr "" @@ -10159,274 +10204,288 @@ msgid "Error allocating opcode list" msgstr "" -#: Top/csound.c:1409 +#: Top/csound.c:1410 #, c-format msgid "Multithread performance: insno: %3d thread %d of %d starting.\n" msgstr "" -#: Top/csound.c:1415 +#: Top/csound.c:1416 msgid "Bad ThreadId" msgstr "" -#: Top/csound.c:1603 Top/csound.c:1635 Top/csound.c:1663 Top/csound.c:1699 -#: Top/csound.c:3879 +#: Top/csound.c:1604 Top/csound.c:1636 Top/csound.c:1664 Top/csound.c:1700 +#: Top/csound.c:3884 msgid "Csound not ready for performance: csoundStart() has not been called \n" msgstr "" -#: Top/csound.c:1619 Top/csound.c:1648 +#: Top/csound.c:1620 Top/csound.c:1649 msgid "Score finished in csoundPerformKsmps().\n" msgstr "" -#: Top/csound.c:1642 Top/csound.c:3886 +#: Top/csound.c:1643 Top/csound.c:3891 msgid "Early return from csoundPerformKsmps().\n" msgstr "" -#: Top/csound.c:1670 +#: Top/csound.c:1671 msgid "Early return from csoundPerformBuffer().\n" msgstr "" -#: Top/csound.c:1708 +#: Top/csound.c:1709 msgid "Early return from csoundPerform().\n" msgstr "" -#: Top/csound.c:1716 +#: Top/csound.c:1717 msgid "Score finished in csoundPerform().\n" msgstr "" -#: Top/csound.c:1727 +#: Top/csound.c:1728 msgid "csoundPerform(): stopped.\n" msgstr "" -#: Top/csound.c:2010 +#: Top/csound.c:2012 msgid "WARNING: " msgstr "ACHTUNG: " -#: Top/csound.c:2150 +#: Top/csound.c:2154 msgid "rtdummy: failed to allocate globals" msgstr "" -#: Top/csound.c:2151 +#: Top/csound.c:2155 msgid "rtaudio: dummy module enabled\n" msgstr "" -#: Top/csound.c:2180 Top/csound.c:2217 +#: Top/csound.c:2184 Top/csound.c:2221 msgid " *** error: rtaudio module set to empty string" msgstr "" -#: Top/csound.c:2184 Top/csound.c:2221 +#: Top/csound.c:2188 Top/csound.c:2225 #, c-format msgid " unknown rtaudio module: '%s', using dummy module" msgstr "" -#: Top/csound.c:2338 +#: Top/csound.c:2342 msgid "WARNING: real time midi input disabled, using dummy functions\n" msgstr "" -#: Top/csound.c:2343 Top/csound.c:2377 +#: Top/csound.c:2347 Top/csound.c:2381 msgid "error: -+rtmidi set to empty string" msgstr "" -#: Top/csound.c:2346 Top/csound.c:2380 +#: Top/csound.c:2350 Top/csound.c:2384 #, c-format msgid "error: -+rtmidi='%s': unknown module" msgstr "" -#: Top/csound.c:2372 +#: Top/csound.c:2376 msgid "WARNING: real time midi output disabled, using dummy functions\n" msgstr "" -#: Top/csound.c:2394 +#: Top/csound.c:2398 msgid "Unknown MIDI error" msgstr "" -#: Top/csound.c:2555 +#: Top/csound.c:2559 msgid "Failed to allocate new opcode entry." msgstr "" -#: Top/csound.c:2577 +#: Top/csound.c:2581 #, c-format msgid "Failed to allocate opcode entry for %s." msgstr "" -#: Top/csound.c:2717 Top/main.c:390 +#: Top/csound.c:2721 Top/main.c:358 msgid "setting dummy interface\n" msgstr "" -#: Top/csound.c:2793 +#: Top/csound.c:2798 msgid "Failed during csoundInitEnv" msgstr "" -#: Top/csound.c:2815 +#: Top/csound.c:2820 msgid "Failed during csoundInitStaticModules" msgstr "" -#: Top/csound.c:2831 +#: Top/csound.c:2836 msgid "Failed during csoundLoadModules" msgstr "" -#: Top/csound.c:2888 +#: Top/csound.c:2893 msgid "Real time audio module name" msgstr "" -#: Top/csound.c:2913 +#: Top/csound.c:2918 msgid "Real time MIDI module name" msgstr "" -#: Top/csound.c:2918 +#: Top/csound.c:2923 msgid "Ignore events (other than tempo changes) in tracks defined by pattern" msgstr "" -#: Top/csound.c:2924 +#: Top/csound.c:2929 msgid "Do not handle special MIDI controllers (sustain pedal etc.)" msgstr "" -#: Top/csound.c:2932 +#: Top/csound.c:2937 msgid "Title tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2938 +#: Top/csound.c:2943 msgid "Copyright tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2944 +#: Top/csound.c:2949 msgid "Software tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2949 +#: Top/csound.c:2954 msgid "Artist tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2956 +#: Top/csound.c:2961 msgid "Comment tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2961 +#: Top/csound.c:2966 msgid "Date tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2971 +#: Top/csound.c:2976 msgid "Enable message attributes (colors etc.)" msgstr "" -#: Top/csound.c:2977 +#: Top/csound.c:2982 msgid "Start score playback at the specified time, skipping earlier events" msgstr "" -#: Top/csound.c:2984 +#: Top/csound.c:2989 msgid "Ignore in CSD files (default: no)" msgstr "" -#: Top/csound.c:3194 +#: Top/csound.c:3199 msgid "Cannot open /proc/cpuinfo. Support for RDTSC is not available.\n" msgstr "" -#: Top/csound.c:3224 +#: Top/csound.c:3229 msgid "No valid CPU frequency entry was found in /proc/cpuinfo.\n" msgstr "" -#: Top/csound.c:3778 +#: Top/csound.c:3783 msgid "csoundDestroyMessageBuffer: Message buffer not allocated." msgstr "" -#: Top/csound.c:3809 +#: Top/csound.c:3814 msgid "csound: internal error: message buffer overflow\n" msgstr "" -#: Top/main.c:64 +#: Top/main.c:65 #, fuzzy, c-format msgid "WARNING: cannot open csound6rc file %s\n" msgstr "ACHTUNG: konnte nicht %s entfernen\n" -#: Top/main.c:67 +#: Top/main.c:68 #, c-format msgid "Reading options from $CSOUND6RC: %s \n" msgstr "" -#: Top/main.c:76 +#: Top/main.c:77 msgid "Reading options from $HOME/.csound6rc\n" msgstr "" -#: Top/main.c:91 +#: Top/main.c:92 msgid "Reading options from local directory .csound6rc \n" msgstr "" -#: Top/main.c:112 +#: Top/main.c:113 msgid "" "Csound is already started, call csoundReset()\n" "before starting again \n" msgstr "" -#: Top/main.c:186 +#: Top/main.c:141 msgid "no orchestra name" msgstr "" -#: Top/main.c:210 +#: Top/main.c:166 msgid "Reading CSD failed ... stopping" msgstr "" -#: Top/main.c:224 +#: Top/main.c:180 msgid "error: multiple uses of stdin" msgstr "" -#: Top/main.c:228 +#: Top/main.c:184 msgid "error: multiple uses of stdout" msgstr "" -#: Top/main.c:237 +#: Top/main.c:193 msgid "realtime performance using dummy numeric scorefile\n" msgstr "" -#: Top/main.c:260 +#: Top/main.c:216 #, c-format msgid "orchname: %s\n" msgstr "" -#: Top/main.c:278 +#: Top/main.c:220 +#, fuzzy, c-format +msgid "Failed to open input file - %s\n" +msgstr "Störung Öffnung ASCII Akte" + +#: Top/main.c:235 #, fuzzy msgid "cannot compile orchestra \n" msgstr "Herstellen des Orchesters\n" -#: Top/main.c:291 +#: Top/main.c:240 +#, fuzzy +msgid "cannot compile orchestra." +msgstr "Herstellen des Orchesters\n" + +#: Top/main.c:241 +msgid "Csound will start with no instruments" +msgstr "" + +#: Top/main.c:259 msgid "end of orchestra compile" msgstr "" -#: Top/main.c:299 +#: Top/main.c:267 #, c-format msgid "using previous %s\n" msgstr "" -#: Top/main.c:309 +#: Top/main.c:277 #, c-format msgid "cannot open scorefile %s" msgstr "" -#: Top/main.c:311 +#: Top/main.c:279 msgid "sorting score ...\n" msgstr "" -#: Top/main.c:321 +#: Top/main.c:289 #, c-format msgid "cannot open extract file %s" msgstr "" -#: Top/main.c:324 +#: Top/main.c:292 msgid " ... extracting ...\n" msgstr "" -#: Top/main.c:333 +#: Top/main.c:301 msgid "end of score sort" msgstr "" -#: Top/main.c:335 +#: Top/main.c:303 msgid "Syntax check completed.\n" msgstr "Syntaxprüfung durchgeführt.\n" -#: Top/main.c:456 util/dnoise.c:266 +#: Top/main.c:424 util/dnoise.c:266 #, c-format msgid "%s not a recognised SFOUTYP env setting" msgstr "" -#: Top/main.c:475 +#: Top/main.c:443 msgid "srate and krate overrides must occur jointly" msgstr "" @@ -10496,158 +10555,158 @@ msgid " *** Type 'csound --help' for the list of available options." msgstr "" -#: Top/one_file.c:105 Top/one_file.c:115 +#: Top/one_file.c:96 Top/one_file.c:106 msgid " *** cannot create temporary file" msgstr "" -#: Top/one_file.c:199 +#: Top/one_file.c:182 #, c-format msgid "Removing temporary file %s ...\n" msgstr "" -#: Top/one_file.c:203 +#: Top/one_file.c:186 #, c-format msgid "WARNING: could not remove %s\n" msgstr "ACHTUNG: konnte nicht %s entfernen\n" -#: Top/one_file.c:270 Top/one_file.c:304 +#: Top/one_file.c:253 Top/one_file.c:287 #, c-format msgid "More than %d arguments in " msgstr "" -#: Top/one_file.c:342 +#: Top/one_file.c:325 #, c-format msgid "Invalid arguments in : %s" msgstr "" -#: Top/one_file.c:345 +#: Top/one_file.c:328 #, c-format msgid "Invalid arguments in .csoundrc or -@ file: %s" msgstr "" -#: Top/one_file.c:351 Top/one_file.c:784 +#: Top/one_file.c:334 Top/one_file.c:767 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:380 +#: Top/one_file.c:361 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:400 Top/one_file.c:467 +#: Top/one_file.c:381 Top/one_file.c:449 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:415 Top/one_file.c:420 +#: Top/one_file.c:396 Top/one_file.c:401 msgid "Missing program in tag " msgstr "" -#: Top/one_file.c:432 +#: Top/one_file.c:414 #, c-format msgid "Creating %s (%p)\n" msgstr "" -#: Top/one_file.c:445 +#: Top/one_file.c:427 msgid "External generation failed" msgstr "" -#: Top/one_file.c:505 +#: Top/one_file.c:487 #, c-format msgid "Non base64 character %c(%2x)" msgstr "" -#: Top/one_file.c:524 +#: Top/one_file.c:506 msgid "Truncated byte at end of base64 stream" msgstr "" -#: Top/one_file.c:540 +#: Top/one_file.c:523 #, c-format msgid "Cannot open temporary file (%s) for MIDI subfile" msgstr "" -#: Top/one_file.c:557 +#: Top/one_file.c:540 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:573 Top/one_file.c:622 +#: Top/one_file.c:556 Top/one_file.c:605 #, c-format msgid "File %s already exists" msgstr "" -#: Top/one_file.c:578 +#: Top/one_file.c:561 #, c-format msgid "Cannot open sample file (%s) subfile" msgstr "" -#: Top/one_file.c:592 +#: Top/one_file.c:575 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:627 +#: Top/one_file.c:610 #, c-format msgid "Cannot open file (%s) subfile" msgstr "" -#: Top/one_file.c:642 +#: Top/one_file.c:625 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:662 +#: Top/one_file.c:645 #, c-format msgid "This CSD file requires a version of Csound before %d.%02d" msgstr "" -#: Top/one_file.c:670 Top/one_file.c:677 +#: Top/one_file.c:653 Top/one_file.c:660 #, c-format msgid "This CSD file requires a version of Csound after %d.%02d" msgstr "" -#: Top/one_file.c:683 +#: Top/one_file.c:666 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:693 +#: Top/one_file.c:676 msgid "**** Licence Information ****\n" msgstr "" -#: Top/one_file.c:699 +#: Top/one_file.c:682 msgid "**** End of Licence Information ****\n" msgstr "" -#: Top/one_file.c:710 +#: Top/one_file.c:693 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:741 +#: Top/one_file.c:724 #, c-format msgid "Failed to open csd file: %s" msgstr "" -#: Top/one_file.c:756 +#: Top/one_file.c:739 msgid "STARTING FILE\n" msgstr "" -#: Top/one_file.c:774 +#: Top/one_file.c:757 msgid "Creating options\n" msgstr "" -#: Top/one_file.c:780 +#: Top/one_file.c:763 msgid "Skipping \n" msgstr "" -#: Top/one_file.c:794 +#: Top/one_file.c:777 msgid "Creating orchestra\n" msgstr "Herstellen des Orchesters\n" -#: Top/one_file.c:799 +#: Top/one_file.c:782 msgid "Creating score\n" msgstr "" -#: Top/one_file.c:833 +#: Top/one_file.c:812 #, c-format msgid "unknown CSD tag: %s\n" msgstr "" -#: Top/one_file.c:838 +#: Top/one_file.c:817 msgid "Could not find tag in CSD file.\n" msgstr "" diff -Nru csound-6.01~dfsg/po/italian.po csound-6.02~dfsg/po/italian.po --- csound-6.01~dfsg/po/italian.po 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/po/italian.po 2014-01-07 16:54:21.000000000 +0000 @@ -206,58 +206,58 @@ msgid "Not a proper list of ints" msgstr "" -#: Engine/csound_orc_compile.c:276 +#: Engine/csound_orc_compile.c:274 msgid "missing or extra arg" msgstr "argomento mancante o in più" -#: Engine/csound_orc_compile.c:281 +#: Engine/csound_orc_compile.c:279 #, fuzzy msgid "too many input args\n" msgstr "troppi argomenti in input" -#: Engine/csound_orc_compile.c:464 +#: Engine/csound_orc_compile.c:462 #, fuzzy, c-format msgid "create_opcode: No rule to handle statement of type %d\n" msgstr "create_opcode: Non c'è regola d'uso per dichiarazione di tipo %d\n" -#: Engine/csound_orc_compile.c:633 Engine/csound_orc_compile.c:691 +#: Engine/csound_orc_compile.c:631 Engine/csound_orc_compile.c:690 #, c-format msgid "%s invalid sample rate" msgstr "%s frequenza di campionamento (sr) non valida" -#: Engine/csound_orc_compile.c:635 Engine/csound_orc_compile.c:693 +#: Engine/csound_orc_compile.c:633 Engine/csound_orc_compile.c:692 #, c-format msgid "%s invalid control rate" msgstr "%s frequenza dei segnali di controllo (kr) non valida" -#: Engine/csound_orc_compile.c:639 Engine/csound_orc_compile.c:689 +#: Engine/csound_orc_compile.c:637 Engine/csound_orc_compile.c:688 #, c-format msgid "%s invalid ksmps value" msgstr "%s valore di ksmps non valido" -#: Engine/csound_orc_compile.c:641 Engine/csound_orc_compile.c:695 +#: Engine/csound_orc_compile.c:639 Engine/csound_orc_compile.c:694 #, c-format msgid "%s inconsistent sr, kr, ksmps" msgstr "%s sr, kr e ksmps sono incongruenti" -#: Engine/csound_orc_compile.c:643 +#: Engine/csound_orc_compile.c:641 #, fuzzy, c-format msgid "%s inconsistent sr, kr, ksmps \n" msgstr "%s sr, kr e ksmps sono incongruenti" -#: Engine/csound_orc_compile.c:659 +#: Engine/csound_orc_compile.c:657 #, fuzzy msgid "bad value for 0dbfs: must be positive. Setting default value." msgstr "pessimo valore per 0dbfs: deve essere positivo." -#: Engine/csound_orc_compile.c:680 +#: Engine/csound_orc_compile.c:679 #, c-format msgid "sample rate overrides: esr = %7.4f, ekr = %7.4f, ksmps = %d\n" msgstr "" "frequenza di campionamento (sr) soprascritta: esr = %7.4f, ekr = %7.4f, " "ksmps = %d\n" -#: Engine/csound_orc_compile.c:686 +#: Engine/csound_orc_compile.c:685 #, c-format msgid "" "sr = %.7g, kr = %.7g, ksmps = %.7g\n" @@ -266,104 +266,104 @@ "sr = %.7g, kr = %.7g, ksmps = %.7g\n" "errore:" -#: Engine/csound_orc_compile.c:832 +#: Engine/csound_orc_compile.c:842 #, c-format msgid "create_instrument: instr num %ld\n" msgstr "create_instrument: strumento num %ld\n" -#: Engine/csound_orc_compile.c:921 +#: Engine/csound_orc_compile.c:934 msgid "-- deleted instr from deadpool \n" msgstr "" -#: Engine/csound_orc_compile.c:949 +#: Engine/csound_orc_compile.c:962 #, fuzzy, c-format msgid " -- free instr def %p \n" msgstr "auxlist per strumento %d (%p):\n" -#: Engine/csound_orc_compile.c:962 Engine/csound_orc_compile.c:973 +#: Engine/csound_orc_compile.c:975 Engine/csound_orc_compile.c:986 #, c-format msgid " -- added to deadpool slot %d \n" msgstr "" -#: Engine/csound_orc_compile.c:998 Engine/csound_orc_compile.c:1144 +#: Engine/csound_orc_compile.c:1011 Engine/csound_orc_compile.c:1158 #, c-format msgid "instr %ld redefined, replacing previous definition" msgstr "" -#: Engine/csound_orc_compile.c:1096 +#: Engine/csound_orc_compile.c:1109 #, c-format msgid "instr %s uses instrument number %d\n" msgstr "lo strumento %s usa il numero di strumento %d\n" -#: Engine/csound_orc_compile.c:1168 +#: Engine/csound_orc_compile.c:1183 #, fuzzy, c-format msgid "no active instances of instr %d \n" msgstr "rimossa l'istanza dello strumento %d\n" -#: Engine/csound_orc_compile.c:1213 +#: Engine/csound_orc_compile.c:1228 msgid "!!! csound->opcodeInfo is NULL !!!\n" msgstr "!!! csound->opcodeInfo e' NULL !!!\n" -#: Engine/csound_orc_compile.c:1249 +#: Engine/csound_orc_compile.c:1264 #, fuzzy, c-format msgid " merging constants %d) %f\n" msgstr "Fisso lo strumento %d %s\n" -#: Engine/csound_orc_compile.c:1258 +#: Engine/csound_orc_compile.c:1273 #, c-format msgid " merging %d) %s:%s\n" msgstr "" -#: Engine/csound_orc_compile.c:1281 +#: Engine/csound_orc_compile.c:1299 #, fuzzy, c-format msgid "merging instr %d \n" msgstr "Fisso lo strumento %d %s\n" -#: Engine/csound_orc_compile.c:1289 +#: Engine/csound_orc_compile.c:1307 #, fuzzy, c-format msgid "merging instr %s \n" msgstr "Fisso lo strumento %s %s\n" -#: Engine/csound_orc_compile.c:1452 Engine/csound_orc_compile.c:1480 -#: Engine/csound_orc_compile.c:1503 +#: Engine/csound_orc_compile.c:1471 Engine/csound_orc_compile.c:1499 +#: Engine/csound_orc_compile.c:1522 msgid "invalid name for instrument" msgstr "nome dello strumento non valido" -#: Engine/csound_orc_compile.c:1485 Engine/csound_orc_compile.c:1508 +#: Engine/csound_orc_compile.c:1504 Engine/csound_orc_compile.c:1527 #, c-format msgid "instr %s redefined" msgstr "strumento %s ridefinito" -#: Engine/csound_orc_compile.c:1530 +#: Engine/csound_orc_compile.c:1549 #, c-format msgid "ERROR: Could not find OPCODINFO for opname: %s\n" msgstr "" -#: Engine/csound_orc_compile.c:1551 +#: Engine/csound_orc_compile.c:1570 #, c-format msgid "Unknown TREE node of type %d found in root.\n" msgstr "Nodo sconosciuto di tipo %d trovato in root.\n" -#: Engine/csound_orc_compile.c:1560 +#: Engine/csound_orc_compile.c:1579 #, c-format msgid "%d syntax errors in orchestra. compilation invalid\n" msgstr "%d errore\\i di sintassi nell'orchestra. Compilazione non valida\n" -#: Engine/csound_orc_compile.c:1600 +#: Engine/csound_orc_compile.c:1620 msgid "perf-pass statements illegal in header blk\n" msgstr "dichiarazione d'esecuzione non valida nel blocco header\n" -#: Engine/csound_orc_compile.c:1772 +#: Engine/csound_orc_compile.c:1792 #, fuzzy msgid "i[fixme] pset args != pmax" msgstr "i%d pset args != pmax" -#: Engine/csound_orc_compile.c:1894 +#: Engine/csound_orc_compile.c:1922 #, fuzzy, c-format msgid "Missing local arg: %s\n" msgstr "argomento mancante o in più" -#: Engine/csound_orc_compile.c:2025 +#: Engine/csound_orc_compile.c:2054 #, c-format msgid "Opcode \"%s\" is deprecated\n" msgstr "" @@ -440,46 +440,46 @@ msgid "Variable type for %s could not be determined.\n" msgstr "argomento in input '%s' usato prima di essere definito" -#: Engine/csound_orc_semantics.c:1300 +#: Engine/csound_orc_semantics.c:1301 #, fuzzy, c-format msgid "Unable to find opcode with name: %s\n" msgstr "non riesco ad aprire il file pvocex %s: %s" -#: Engine/csound_orc_semantics.c:1315 +#: Engine/csound_orc_semantics.c:1316 #, c-format msgid "Unable to find opcode entry for '%s' with matching argument types:\n" msgstr "" -#: Engine/csound_orc_semantics.c:1318 +#: Engine/csound_orc_semantics.c:1319 #, c-format msgid "Found: %s %s %s\n" msgstr "" -#: Engine/csound_orc_semantics.c:1320 +#: Engine/csound_orc_semantics.c:1321 #, c-format msgid "Line: %d Loc: %d\n" msgstr "" -#: Engine/csound_orc_semantics.c:1454 +#: Engine/csound_orc_semantics.c:1455 #, c-format msgid "expression for until statement not a boolean expression, line %d\n" msgstr "" -#: Engine/csound_orc_semantics.c:1607 +#: Engine/csound_orc_semantics.c:1608 #, fuzzy, c-format msgid "" "\n" "error: %s (token \"%s\")" msgstr "%s: errore: %s (%s)\n" -#: Engine/csound_orc_semantics.c:1609 +#: Engine/csound_orc_semantics.c:1610 #, fuzzy, c-format msgid "" " line %d:\n" ">>>" msgstr ", linea %d:\n" -#: Engine/csound_orc_semantics.c:2141 +#: Engine/csound_orc_semantics.c:2142 #, fuzzy, c-format msgid "insufficient required arguments for opcode %s on line %d:%d\n" msgstr "gli argomenti richiesti sono insufficienti" @@ -494,62 +494,62 @@ msgid "Creating search path cache for '%s':" msgstr "Creata cache del percorso di ricerca per '%s':" -#: Engine/envvar.c:729 +#: Engine/envvar.c:731 msgid "Current directory path name too long\n" msgstr "" -#: Engine/envvar.c:1003 +#: Engine/envvar.c:1005 #, c-format msgid "internal error: csoundFileOpen(): invalid type: %d" msgstr "errore interno: csoundFileOpen(): tipo non valido: %d" -#: Engine/envvar.c:1193 +#: Engine/envvar.c:1195 #, c-format msgid "internal error: csoundCreateFileHandle(): invalid type: %d" msgstr "errore interno: csoundCreateFileHandle(): tipo non valido: %d" -#: Engine/fgens.c:91 +#: Engine/fgens.c:99 msgid "unknown GEN number" msgstr "numero di GEN sconosciuto" -#: Engine/fgens.c:133 +#: Engine/fgens.c:141 msgid "ftable does not exist" msgstr "ftable non esiste" -#: Engine/fgens.c:138 +#: Engine/fgens.c:146 #, c-format msgid "ftable %d now deleted\n" msgstr "la ftable %d viene cancellata\n" -#: Engine/fgens.c:153 Engine/fgens.c:1612 Engine/fgens.c:1698 -#: Engine/fgens.c:1777 Engine/fgens.c:1893 Engine/fgens.c:1974 -#: Engine/fgens.c:3023 +#: Engine/fgens.c:161 Engine/fgens.c:1630 Engine/fgens.c:1716 +#: Engine/fgens.c:1795 Engine/fgens.c:1911 Engine/fgens.c:1992 +#: Engine/fgens.c:3043 msgid "insufficient gen arguments" msgstr "gli argomenti della gen sono insufficienti" -#: Engine/fgens.c:179 Opcodes/ftgen.c:117 +#: Engine/fgens.c:187 Opcodes/ftgen.c:117 #, c-format msgid "Named gen \"%s\" not defined" msgstr "gen chiamata \"%s\" non definita" -#: Engine/fgens.c:187 +#: Engine/fgens.c:195 msgid "illegal gen number" msgstr "numero di gen non consentito" -#: Engine/fgens.c:195 +#: Engine/fgens.c:203 msgid "deferred size for GENs 1, 23, 28 or 49 only" msgstr "dimensione differita solo per GENs 1, 23, 28 o 49" -#: Engine/fgens.c:198 Engine/fgens.c:250 +#: Engine/fgens.c:206 Engine/fgens.c:258 #, c-format msgid "ftable %d:\n" msgstr "ftable %d:\n" -#: Engine/fgens.c:223 Engine/fgens.c:2301 Engine/fgens.c:2880 +#: Engine/fgens.c:231 Engine/fgens.c:2320 Engine/fgens.c:2899 msgid "illegal table length" msgstr "lunghezza della tavola illegale" -#: Engine/fgens.c:293 Engine/fgens.c:2262 +#: Engine/fgens.c:304 Engine/fgens.c:2281 #, c-format msgid "" "ftable %d relocating due to size change\n" @@ -558,184 +558,184 @@ "ftable %d ricollocata per cambiamento di dimensioni\n" " gli strumenti attivi potrebbero esserne disturbati" -#: Engine/fgens.c:351 Engine/fgens.c:472 Engine/fgens.c:556 Engine/fgens.c:637 -#: Engine/fgens.c:712 Engine/fgens.c:761 Engine/fgens.c:882 Engine/fgens.c:959 -#: Engine/fgens.c:1060 Engine/fgens.c:1104 Engine/fgens.c:1151 -#: Engine/fgens.c:1405 Engine/fgens.c:1467 Engine/fgens.c:1696 -#: Engine/fgens.c:1774 Engine/fgens.c:2129 Engine/fgens.c:2977 -#: Engine/fgens.c:3020 +#: Engine/fgens.c:362 Engine/fgens.c:483 Engine/fgens.c:567 Engine/fgens.c:648 +#: Engine/fgens.c:723 Engine/fgens.c:772 Engine/fgens.c:893 Engine/fgens.c:970 +#: Engine/fgens.c:1071 Engine/fgens.c:1115 Engine/fgens.c:1165 +#: Engine/fgens.c:1423 Engine/fgens.c:1485 Engine/fgens.c:1714 +#: Engine/fgens.c:1792 Engine/fgens.c:2147 Engine/fgens.c:2997 +#: Engine/fgens.c:3040 msgid "using extended arguments\n" msgstr "uso di argomenti estesi\n" -#: Engine/fgens.c:375 +#: Engine/fgens.c:386 msgid "no coefs present" msgstr "non ci sono coefficienti" -#: Engine/fgens.c:380 Engine/fgens.c:646 Engine/fgens.c:654 +#: Engine/fgens.c:391 Engine/fgens.c:657 Engine/fgens.c:665 msgid "illegal x interval" msgstr "intervallo di x non consentito" -#: Engine/fgens.c:409 Engine/fgens.c:558 Engine/fgens.c:639 Engine/fgens.c:884 -#: Engine/fgens.c:1362 Engine/fgens.c:2473 Engine/fgens.c:2781 -#: Engine/fgens.c:2922 Opcodes/ftest.c:128 Top/main.c:118 util/cvanal.c:67 +#: Engine/fgens.c:420 Engine/fgens.c:569 Engine/fgens.c:650 Engine/fgens.c:895 +#: Engine/fgens.c:1380 Engine/fgens.c:2492 Engine/fgens.c:2800 +#: Engine/fgens.c:2941 Opcodes/ftest.c:128 Top/main.c:119 util/cvanal.c:67 #: util/lpanal.c:401 util/pvanal.c:170 msgid "insufficient arguments" msgstr "argomenti insufficienti" -#: Engine/fgens.c:413 Engine/fgens.c:1367 +#: Engine/fgens.c:424 Engine/fgens.c:1385 msgid "unknown srctable number" msgstr "numero di srctable sconosciuto" -#: Engine/fgens.c:426 +#: Engine/fgens.c:437 msgid "table size too large" msgstr "dimensione della tavola troppo grande" -#: Engine/fgens.c:511 Engine/fgens.c:544 +#: Engine/fgens.c:522 Engine/fgens.c:555 msgid "gen call has negative segment size:" msgstr "la gen chiamata ha dimensione del segmento negativa" -#: Engine/fgens.c:513 +#: Engine/fgens.c:524 #, fuzzy msgid "illegal input vals for gen call, beginning:" msgstr "La gen chiamata ha valori in input non consentiti, inizio:" -#: Engine/fgens.c:579 +#: Engine/fgens.c:590 msgid "negative segsiz" msgstr "segsize negativo" -#: Engine/fgens.c:788 +#: Engine/fgens.c:799 msgid "nh partials < 1" msgstr "parziale nh < 1" -#: Engine/fgens.c:887 +#: Engine/fgens.c:898 msgid "illegal xint value" msgstr "valore di xint non consentito" -#: Engine/fgens.c:890 +#: Engine/fgens.c:901 msgid "illegal xamp value" msgstr "valore di xamp non consentito" -#: Engine/fgens.c:963 +#: Engine/fgens.c:974 msgid "uneven number of args" msgstr "numero di argomenti irregolare" -#: Engine/fgens.c:1088 +#: Engine/fgens.c:1099 msgid "gen call has illegal x-ordinate values:" msgstr "la gen chiamata ha valori di ordinata x non consentiti" -#: Engine/fgens.c:1106 +#: Engine/fgens.c:1117 msgid "wrong number of args" msgstr "numero di argomenti sbagliato" -#: Engine/fgens.c:1120 +#: Engine/fgens.c:1131 msgid "a range given exceeds table length" msgstr "un intervallo dato supera la lunghezza della tavola" -#: Engine/fgens.c:1127 +#: Engine/fgens.c:1138 msgid "an input function does not exist" msgstr "una funzione in input non esiste" -#: Engine/fgens.c:1260 +#: Engine/fgens.c:1274 msgid "No such window!" msgstr "Non c'è una tale finestra!" -#: Engine/fgens.c:1278 +#: Engine/fgens.c:1292 msgid "Wrong number of input arguments" msgstr "Numero di argomenti in input sbagliato" -#: Engine/fgens.c:1279 +#: Engine/fgens.c:1293 msgid "unknown distribution" msgstr "distrbuzione sconosciuta" -#: Engine/fgens.c:1328 +#: Engine/fgens.c:1342 msgid "error opening ASCII file" msgstr "errore in apertura del file ASCII" -#: Engine/fgens.c:1334 +#: Engine/fgens.c:1352 #, c-format msgid "%ld elements in %s\n" msgstr "%ld elementi in %s\n" -#: Engine/fgens.c:1346 +#: Engine/fgens.c:1364 msgid "Numbers after table full in GEN23" msgstr "Numeri in eccesso dopo aver riempito la GEN23" -#: Engine/fgens.c:1375 +#: Engine/fgens.c:1393 msgid "table size must be the same of source table" msgstr "" "il formato della tavola deve essere la stessa della tavola di derivazione " "(source)" -#: Engine/fgens.c:1447 Engine/fgens.c:1507 +#: Engine/fgens.c:1465 Engine/fgens.c:1525 msgid "x coordinates must all be in increasing order:" msgstr "le coordinate x devono essere tutte in ordine crescente" -#: Engine/fgens.c:1450 Engine/fgens.c:1509 +#: Engine/fgens.c:1468 Engine/fgens.c:1527 msgid "x coordinate greater than function size:" msgstr "coordinata x maggiore della dimensione della tavola" -#: Engine/fgens.c:1454 +#: Engine/fgens.c:1472 msgid "illegal input val (y <= 0) for gen call, beginning:" msgstr "valore di input non valido (y <= 0) per la gen chiamata, inizio:" -#: Engine/fgens.c:1527 +#: Engine/fgens.c:1545 msgid "GEN28 requires zero table length" msgstr "GEN28 richiede lunghezza della tavola zero" -#: Engine/fgens.c:1596 +#: Engine/fgens.c:1614 msgid "could not open space file" msgstr "Impossibile aprire il file spazializzazione" -#: Engine/fgens.c:1598 +#: Engine/fgens.c:1616 msgid "Time values must be in increasing order" msgstr "I valori di tempo devono essere in ordine crescente" -#: Engine/fgens.c:1619 +#: Engine/fgens.c:1637 #, fuzzy msgid "GEN30: source ftable not found" msgstr "GEN30: source ftable non trovata" -#: Engine/fgens.c:1702 +#: Engine/fgens.c:1720 #, fuzzy msgid "GEN31: source ftable not found" msgstr "GEN31: source ftable non trovata" -#: Engine/fgens.c:1810 +#: Engine/fgens.c:1828 #, c-format msgid "GEN32: source ftable %d not found" msgstr "GEN32: source ftable %d non trovata" -#: Engine/fgens.c:1904 +#: Engine/fgens.c:1922 #, fuzzy msgid "GEN33: source ftable not found" msgstr "GEN33: source ftable non trovata" -#: Engine/fgens.c:2072 +#: Engine/fgens.c:2090 #, fuzzy msgid "unknown source table number" msgstr "numero di tavola source sconosciuto" -#: Engine/fgens.c:2104 +#: Engine/fgens.c:2122 msgid "Gen41: negative probability not allowed" msgstr "" -#: Engine/fgens.c:2170 Opcodes/fareygen.c:70 +#: Engine/fgens.c:2188 Opcodes/fareygen.c:70 #, c-format msgid "ftable %d: " msgstr "ftable %d: " -#: Engine/fgens.c:2214 +#: Engine/fgens.c:2232 #, c-format msgid "ftable %d:" msgstr "ftable %d:" -#: Engine/fgens.c:2257 +#: Engine/fgens.c:2275 #, c-format msgid "replacing previous ftable %d" msgstr "sostituisco la precedente ftable %d" -#: Engine/fgens.c:2297 Engine/fgens.c:2423 Engine/fgens.c:2451 -#: Engine/fgens.c:2458 Opcodes/gab/gab.c:590 Opcodes/gab/gab.c:645 +#: Engine/fgens.c:2316 Engine/fgens.c:2442 Engine/fgens.c:2470 +#: Engine/fgens.c:2477 Opcodes/gab/gab.c:592 Opcodes/gab/gab.c:647 #: Opcodes/midiops2.c:233 Opcodes/midiops2.c:388 Opcodes/midiops2.c:470 #: Opcodes/uggab.c:1625 Opcodes/uggab.c:1661 Opcodes/uggab.c:1683 #: Opcodes/uggab.c:1736 @@ -743,126 +743,126 @@ msgid "Invalid ftable no. %f" msgstr "ftable num. %f non valida" -#: Engine/fgens.c:2306 +#: Engine/fgens.c:2325 #, c-format msgid "deferred-size ftable %f illegal here" msgstr "la dimensione differita della ftable %f non è valida qui" -#: Engine/fgens.c:2362 Engine/fgens.c:2961 +#: Engine/fgens.c:2381 Engine/fgens.c:2981 #, c-format msgid "Deferred load of '%s' failed" msgstr "fallito caricamento differito di '%s'" -#: Engine/fgens.c:2429 +#: Engine/fgens.c:2448 #, c-format msgid "Deferred-size ftable %f load not available at perf time." msgstr "" "Caricamento della ftable %f a dimensione differita non disponibile al " "momento d'esecuzione" -#: Engine/fgens.c:2497 +#: Engine/fgens.c:2516 #, c-format msgid "non-deferred ftable %d needs size %d\n" msgstr "ftable %d con dimensione non differita necessita di dimensione %d\n" -#: Engine/fgens.c:2544 Opcodes/loscilx.c:69 +#: Engine/fgens.c:2563 Opcodes/loscilx.c:69 #, c-format msgid "invalid sample format: %d" msgstr "formato campione non valido: %d" -#: Engine/fgens.c:2552 Engine/fgens.c:2805 +#: Engine/fgens.c:2571 Engine/fgens.c:2824 #, c-format msgid "channel %d illegal" msgstr "canale %d non consentito" -#: Engine/fgens.c:2558 +#: Engine/fgens.c:2577 msgid "deferred alloc\n" msgstr "allocazione differita\n" -#: Engine/fgens.c:2566 Engine/fgens.c:2878 +#: Engine/fgens.c:2585 Engine/fgens.c:2897 msgid "deferred size, but filesize unknown" msgstr "dimensione differita, ma dimensione del file sconosciuta" -#: Engine/fgens.c:2569 Engine/fgens.c:2882 +#: Engine/fgens.c:2588 Engine/fgens.c:2901 #, c-format msgid " defer length %d\n" msgstr "lunghezza differita %d\n" -#: Engine/fgens.c:2637 +#: Engine/fgens.c:2656 msgid "GEN1: input file truncated by ftable size" msgstr "GEN1: file di input troncato dalla dimensione della ftable" -#: Engine/fgens.c:2641 +#: Engine/fgens.c:2660 #, c-format msgid "\tlooping endpoint %d exceeds ftsize %d\n" msgstr "\til punto finale del loop %d supera ftsize %d\n" -#: Engine/fgens.c:2657 +#: Engine/fgens.c:2676 msgid "GEN1 read error" msgstr "GEN1 errore in lettura" -#: Engine/fgens.c:2662 +#: Engine/fgens.c:2681 msgid "GEN1: aiff file truncated by ftable size" msgstr "GEN1: file aiff troncato dalla dimensione della ftable" -#: Engine/fgens.c:2663 +#: Engine/fgens.c:2682 #, c-format msgid "\taudio samps %d exceeds ftsize %d" msgstr "\tcampioni audio %d superano ftsize %d" -#: Engine/fgens.c:2707 +#: Engine/fgens.c:2726 msgid "wrong number of ftable arguments" msgstr "numero sbagliato di argomenti della ftable" -#: Engine/fgens.c:2717 OOps/pstream.c:379 +#: Engine/fgens.c:2736 OOps/pstream.c:379 msgid "Failed to load PVOC-EX file" msgstr "Caricamento del file PVOC-EX fallito" -#: Engine/fgens.c:2728 InOut/midirecv.c:417 OOps/midiops.c:402 +#: Engine/fgens.c:2747 InOut/midirecv.c:419 OOps/midiops.c:402 #: OOps/midiops.c:452 OOps/midiops.c:464 #, fuzzy msgid "illegal channel number" msgstr "numero di canale non consentito" -#: Engine/fgens.c:2746 +#: Engine/fgens.c:2765 msgid "ftable size too small" msgstr "dimensione della ftable troppo piccola" -#: Engine/fgens.c:2821 Opcodes/mp3in.c:87 Opcodes/mp3in.c:255 +#: Engine/fgens.c:2840 Opcodes/mp3in.c:87 Opcodes/mp3in.c:255 #: Top/cscorfns.c:176 Top/cscorfns.c:207 msgid "Not enough memory\n" msgstr "emoria insufficiente\n" -#: Engine/fgens.c:2987 +#: Engine/fgens.c:3007 #, fuzzy msgid "gen51: invalid number of p-fields (too few grades)" msgstr "gen51: numero di p-fields non valido (troppi pochi gradi)" -#: Engine/fgens.c:3027 +#: Engine/fgens.c:3047 msgid "number of channels inconsistent with number of args" msgstr "numero di canali incongruente con il numero di argomenti" -#: Engine/fgens.c:3186 +#: Engine/fgens.c:3206 msgid "GEN53: invalid number of gen arguments" msgstr "GEN53: numero di argomenti della gen non valido" -#: Engine/fgens.c:3196 +#: Engine/fgens.c:3216 msgid "GEN53: invalid table length" msgstr "GEN53: lunghezza della tavola non valida" -#: Engine/fgens.c:3200 +#: Engine/fgens.c:3220 msgid "GEN53: invalid source table number" msgstr "GEN53: numero di source table non valido" -#: Engine/fgens.c:3203 +#: Engine/fgens.c:3223 msgid "GEN53: mode must be in the range 0 to 15" msgstr "GEN53: mode dev'essere nell'intervallo tra 0 e 15" -#: Engine/fgens.c:3207 +#: Engine/fgens.c:3227 msgid "GEN53: invalid source table length" msgstr "GEN53: numero di source table non valido" -#: Engine/fgens.c:3212 +#: Engine/fgens.c:3232 msgid "GEN53: invalid window table" msgstr "GEN53: window table non valida" @@ -886,23 +886,23 @@ msgid "Instrument %d muted\n" msgstr "Strumento %d silenziato\n" -#: Engine/insert.c:144 Engine/insert.c:374 +#: Engine/insert.c:144 Engine/insert.c:376 #, c-format msgid "cannot allocate last note because it exceeds 100%% of cpu time" msgstr "" "impossibile allocare l'ultima nota perché supera il 100%% di tempo di cpu" -#: Engine/insert.c:150 Engine/insert.c:380 +#: Engine/insert.c:150 Engine/insert.c:382 msgid "cannot allocate last note because it exceeds instr maxalloc" msgstr "" "impossibile allocare l'ultima nota perché supera maxalloc dello strumento" -#: Engine/insert.c:168 Engine/insert.c:400 +#: Engine/insert.c:168 #, fuzzy, c-format msgid "new alloc for instr %s:\n" msgstr "nuova allocazione per lo strumento %d:\n" -#: Engine/insert.c:170 Engine/insert.c:402 +#: Engine/insert.c:170 #, c-format msgid "new alloc for instr %d:\n" msgstr "nuova allocazione per lo strumento %d:\n" @@ -917,51 +917,61 @@ msgid "instr %d uses %d p-fields but is given %d" msgstr "lo strumento %d usa %d p-fields ma gliene sono stati dati %d" -#: Engine/insert.c:345 Engine/insert.c:573 +#: Engine/insert.c:345 Engine/insert.c:575 #, fuzzy, c-format msgid "instr %s now active:\n" msgstr "strumento %d ora attivo:\n" -#: Engine/insert.c:347 Engine/insert.c:575 +#: Engine/insert.c:347 Engine/insert.c:577 #, c-format msgid "instr %d now active:\n" msgstr "strumento %d ora attivo:\n" -#: Engine/insert.c:389 +#: Engine/insert.c:391 #, fuzzy, c-format -msgid "activating instr %s\n" +msgid "MIDI activating instr %s\n" msgstr "attivo lo strumento %s\n" -#: Engine/insert.c:391 -#, c-format -msgid "activating instr %d\n" +#: Engine/insert.c:393 +#, fuzzy, c-format +msgid "MIDI activating instr %d\n" msgstr "attivo lo strumento %d\n" -#: Engine/insert.c:416 +#: Engine/insert.c:402 +#, fuzzy, c-format +msgid "new MIDI alloc for instr %s:\n" +msgstr "nuova allocazione per lo strumento %d:\n" + +#: Engine/insert.c:404 +#, fuzzy, c-format +msgid "new MIDI alloc for instr %d:\n" +msgstr "nuova allocazione per lo strumento %d:\n" + +#: Engine/insert.c:418 #, c-format msgid "MIDI note overlaps with key %d on same channel" msgstr "La nota MIDI si sovrappone alla key %d sullo stesso canale" -#: Engine/insert.c:683 +#: Engine/insert.c:685 #, fuzzy, c-format msgid "removed instance of instr %s\n" msgstr "rimossa l'istanza dello strumento %d\n" -#: Engine/insert.c:685 +#: Engine/insert.c:687 #, c-format msgid "removed instance of instr %d\n" msgstr "rimossa l'istanza dello strumento %d\n" -#: Engine/insert.c:843 +#: Engine/insert.c:851 msgid "inactive allocs returned to freespace\n" msgstr "liberate le allocazioni inattive\n" -#: Engine/insert.c:869 +#: Engine/insert.c:877 #, fuzzy, c-format msgid "could not find playing instr %f\n" msgstr "non posso trovare lo strumento %f che suona indefinitamente\n" -#: Engine/insert.c:882 +#: Engine/insert.c:890 msgid "" "\n" "INIT ERROR: " @@ -969,69 +979,69 @@ "\n" "ERRORE di INIZIALIZZAZIONE: " -#: Engine/insert.c:895 +#: Engine/insert.c:903 #, c-format msgid "INIT ERROR in instr %d (opcode %s): " msgstr "ERRORE di INIZIALIZZAZIONE dello strumento %d (opcode %s): " -#: Engine/insert.c:898 +#: Engine/insert.c:906 #, c-format msgid "INIT ERROR in instr %d (subinstr %d): " msgstr "ERRORE di INIZIALIZZAZIONE nello strumento %d (subinstr %d): " -#: Engine/insert.c:902 +#: Engine/insert.c:910 #, c-format msgid "INIT ERROR in instr %d: " msgstr "ERRORE di INIZIALIZZAZIONE nello strumento %d: " -#: Engine/insert.c:923 +#: Engine/insert.c:931 #, c-format msgid "PERF ERROR in instr %d (opcode %s): " msgstr "ERRORE in ESECUZIONE nello strumento %d (opcode %s): " -#: Engine/insert.c:926 +#: Engine/insert.c:934 #, c-format msgid "PERF ERROR in instr %d (subinstr %d): " msgstr "ERRORE in ESECUZIONE nello strumento %d (subinstr %d): " -#: Engine/insert.c:930 +#: Engine/insert.c:938 #, c-format msgid "PERF ERROR in instr %d: " msgstr "ERRORE in ESECUZIONE nello strumento %d: " -#: Engine/insert.c:935 +#: Engine/insert.c:943 msgid " note aborted\n" msgstr " nota cancellata\n" -#: Engine/insert.c:954 +#: Engine/insert.c:962 msgid "subinstr: number of output args greater than nchnls" msgstr "" "subinstr: numero di argomenti dell'output maggiore del numero dei canali" -#: Engine/insert.c:1022 +#: Engine/insert.c:1030 msgid "subinstr: too many p-fields" msgstr "subinstr: troppi p-fields" -#: Engine/insert.c:1127 +#: Engine/insert.c:1135 #, c-format msgid "%s: invalid local ksmps value: %d" msgstr "%s: valore locale di ksmps non valido: %d" -#: Engine/insert.c:1259 OOps/bus.c:611 Opcodes/stackops.c:293 +#: Engine/insert.c:1278 OOps/bus.c:614 Opcodes/stackops.c:293 #, c-format msgid "%s: not initialised" msgstr "%s: non inizializzato" -#: Engine/insert.c:1442 +#: Engine/insert.c:1458 #, fuzzy, c-format msgid "setksmps: invalid ksmps value: %d, original: %d" msgstr "setksmps: valore do ksmps non valido: %d" -#: Engine/insert.c:1564 +#: Engine/insert.c:1595 msgid "subinstr: not initialised" msgstr "subinstr: non inizializzato" -#: Engine/insert.c:2005 +#: Engine/insert.c:2046 #, c-format msgid "" "instr %d allocated at %p\n" @@ -1040,30 +1050,30 @@ "strumento %d allocato a %p\n" "\tlclbas %p, opds %p\n" -#: Engine/insert.c:2023 +#: Engine/insert.c:2064 #, fuzzy, c-format msgid "op (%s) allocated at %p\n" msgstr "op %d (%s) allocato a %p\n" -#: Engine/insert.c:2048 +#: Engine/insert.c:2089 msgid "null iopadr" msgstr "null iopadr" -#: Engine/insert.c:2059 +#: Engine/insert.c:2100 msgid "null opadr" msgstr "null iopadr" -#: Engine/insert.c:2131 +#: Engine/insert.c:2182 #, fuzzy msgid "inconsistent opds total" msgstr "totale opds inconsistente" -#: Engine/insert.c:2192 +#: Engine/insert.c:2243 #, fuzzy, c-format msgid "Instrument %s is still active" msgstr "Strumento %s ancora attivo" -#: Engine/insert.c:2195 +#: Engine/insert.c:2246 #, fuzzy, c-format msgid "Instrument %d is still active" msgstr "Strumento %d ancora attivo" @@ -1087,42 +1097,42 @@ msgid "stdmode = %.8x Linefd = %d\n" msgstr "stdmode = %.8x Linefd = %d\n" -#: Engine/linevent.c:186 +#: Engine/linevent.c:184 msgid "LineBuffer Overflow - Input Data has been Lost" msgstr "LineBuffer Overflow - I dati in input sono stati persi" -#: Engine/linevent.c:239 +#: Engine/linevent.c:238 #, c-format msgid "unknown opcode %c" msgstr "opcode sconosciuto %c" -#: Engine/linevent.c:259 +#: Engine/linevent.c:258 #, fuzzy msgid "unmatched quotes" msgstr "virgolette senza corrispondenza" -#: Engine/linevent.c:286 +#: Engine/linevent.c:285 #, fuzzy msgid "dot carry has no reference" msgstr "il punto per riporto valore (carry) non ha riferimenti" -#: Engine/linevent.c:291 +#: Engine/linevent.c:290 msgid "cannot carry string p-field" msgstr "impossibile riportare un p-field stringa" -#: Engine/linevent.c:302 +#: Engine/linevent.c:301 msgid "too few pfields" msgstr "troppi pochi pfields" -#: Engine/linevent.c:306 +#: Engine/linevent.c:305 msgid "-L with negative p2 illegal" msgstr "-L con p2 negativo illecito" -#: Engine/linevent.c:317 +#: Engine/linevent.c:316 msgid "too many pfields" msgstr "troppi pfields" -#: Engine/linevent.c:329 +#: Engine/linevent.c:328 #, c-format msgid "" "illegal RT scoreline:\n" @@ -1133,25 +1143,30 @@ "%s\n" "%*s" -#: Engine/linevent.c:351 +#: Engine/linevent.c:350 msgid "event: param 1 must be \"a\", \"i\", \"q\", \"f\", or \"e\"" msgstr "" "event: parametro 1 deve essere \"a\", \"i\", \"q\", \"f\", oppure \"e\"" -#: Engine/linevent.c:353 +#: Engine/linevent.c:352 msgid "event: string name is allowed only for \"i\" and \"q\" events" msgstr "event: nome stringa permesso solo per eventi \"i\" e \"q\"" -#: Engine/linevent.c:394 +#: Engine/linevent.c:395 #, c-format msgid "event: error creating '%c' event" msgstr "event: errore nella creazione dell'evento '%c'" -#: Engine/linevent.c:457 +#: Engine/linevent.c:459 #, c-format msgid "event_i: error creating '%c' event" msgstr "event_i: errore nella creazione dell'evento '%c'" +#: Engine/linevent.c:505 +#, fuzzy +msgid "instance: error creating event" +msgstr "event: errore nella creazione dell'evento '%c'" + #: Engine/memalloc.c:58 #, c-format msgid "memory allocate failure for %lu" @@ -1220,7 +1235,7 @@ msgstr "errore in lettura del file pvoc-ex %s dopo %d frames" #: Engine/memfiles.c:511 Opcodes/pvinterp.c:77 Opcodes/pvinterp.c:193 -#: Opcodes/pvinterp.c:383 Opcodes/ugens9.c:104 Opcodes/vpvoc.c:210 +#: Opcodes/pvinterp.c:383 Opcodes/ugens9.c:104 Opcodes/vpvoc.c:212 #, c-format msgid "%s's srate = %8.0f, orch's srate = %8.0f" msgstr "%s's srate = %8.0f, orch's srate = %8.0f" @@ -1256,22 +1271,22 @@ msgid "Beat mode not in force" msgstr "Modo beat non attivato" -#: Engine/musmon.c:173 Top/csound.c:2854 +#: Engine/musmon.c:173 Top/csound.c:2859 #, c-format msgid "Csound version %s beta (double samples) %s\n" msgstr "Csound versione %s beta (double samples) %s\n" -#: Engine/musmon.c:176 Top/csound.c:2857 +#: Engine/musmon.c:176 Top/csound.c:2862 #, c-format msgid "Csound version %s (double samples) %s\n" msgstr "Csound versione %s (double samples) %s\n" -#: Engine/musmon.c:181 Top/csound.c:2846 +#: Engine/musmon.c:181 Top/csound.c:2851 #, c-format msgid "Csound version %s beta (float samples) %s\n" msgstr "Csound versione %s beta (float samples) %s\n" -#: Engine/musmon.c:184 Top/csound.c:2849 +#: Engine/musmon.c:184 Top/csound.c:2854 #, c-format msgid "Csound version %s (float samples) %s\n" msgstr "Csound versione %s (float samples) %s\n" @@ -1315,7 +1330,7 @@ msgid "sorting cscore.out ..\n" msgstr "sistemo cscore.out ..\n" -#: Engine/musmon.c:340 Top/main.c:329 +#: Engine/musmon.c:340 Top/main.c:297 msgid "\t... done\n" msgstr "\t... fatto\n" @@ -1323,8 +1338,8 @@ msgid "playing from cscore.srt\n" msgstr "suono da cscore.srt\n" -#: Engine/musmon.c:345 Engine/musmon.c:497 Engine/musmon.c:1119 -#: Engine/musmon.c:1329 +#: Engine/musmon.c:345 Engine/musmon.c:501 Engine/musmon.c:1124 +#: Engine/musmon.c:1335 #, c-format msgid "SECTION %d:\n" msgstr "SEZIONE %d:\n" @@ -1334,11 +1349,11 @@ msgid "%c\tbeep!\n" msgstr "%c\tbeep!\n" -#: Engine/musmon.c:450 +#: Engine/musmon.c:454 msgid "end of score.\t\t overall amps:" msgstr "fine della score.\t\t ampiezza totale:" -#: Engine/musmon.c:461 +#: Engine/musmon.c:465 msgid "" "\n" "\t overall samples out of range:" @@ -1346,7 +1361,7 @@ "\n" "\t numero di campioni fuori dall'intervallo (range):" -#: Engine/musmon.c:465 +#: Engine/musmon.c:469 #, c-format msgid "" "\n" @@ -1355,109 +1370,109 @@ "\n" "%d errori nell'esecuzione\n" -#: Engine/musmon.c:467 +#: Engine/musmon.c:471 msgid "end of performance" msgstr "fine dell'esecuzione" -#: Engine/musmon.c:480 +#: Engine/musmon.c:484 msgid "no sound written to disk\n" msgstr "nessun suono scritto sul disco\n" -#: Engine/musmon.c:572 Engine/musmon.c:618 +#: Engine/musmon.c:577 Engine/musmon.c:623 msgid "\t number of samples out of range:" msgstr "\t numero di campioni fuori dall'intervallo:" -#: Engine/musmon.c:611 +#: Engine/musmon.c:616 #, c-format msgid "end of section %d\t sect peak amps:" msgstr "fine della sezione %d\t picchi d'ampiezza della sezione:" -#: Engine/musmon.c:613 +#: Engine/musmon.c:618 msgid "end of lplay event list\t peak amps:" msgstr "fine lista eventi di lplay\t picco d'ampiezza:" -#: Engine/musmon.c:678 Engine/musmon.c:705 +#: Engine/musmon.c:683 Engine/musmon.c:710 #, c-format msgid " - note deleted. instr %s undefined" msgstr " - nota cancellata. strumento %s non definito" -#: Engine/musmon.c:682 +#: Engine/musmon.c:687 #, c-format msgid "Setting instrument %s %s\n" msgstr "Fisso lo strumento %s %s\n" -#: Engine/musmon.c:683 Engine/musmon.c:697 +#: Engine/musmon.c:688 Engine/musmon.c:702 msgid "off" msgstr "off" -#: Engine/musmon.c:683 Engine/musmon.c:697 +#: Engine/musmon.c:688 Engine/musmon.c:702 msgid "on" msgstr "on" -#: Engine/musmon.c:692 Engine/musmon.c:734 +#: Engine/musmon.c:697 Engine/musmon.c:739 #, c-format msgid " - note deleted. instr %d(%d) undefined" msgstr " - nota cancellata. strumento %d(%d) non definito" -#: Engine/musmon.c:696 +#: Engine/musmon.c:701 #, c-format msgid "Setting instrument %d %s\n" msgstr "Fisso lo strumento %d %s\n" -#: Engine/musmon.c:724 +#: Engine/musmon.c:729 #, c-format msgid " - note deleted. i%d (%s) had %d init errors" msgstr " - nota cancellata. i%d (%s) ha %d errori di inizializzazione" -#: Engine/musmon.c:755 +#: Engine/musmon.c:760 #, c-format msgid " - note deleted. i%d had %d init errors" msgstr " - nota cancellata. i%d ha %d errori di inizializzazione" -#: Engine/musmon.c:776 +#: Engine/musmon.c:781 #, c-format msgid "time advanced %5.3f beats by score request\n" msgstr "avanzamento del tempo di %5.3f beats su richiesta della score\n" -#: Engine/musmon.c:794 +#: Engine/musmon.c:799 #, c-format msgid "\t\t T%7.3f - note deleted. " msgstr "\t\t T%7.3f - nota cancellata. " -#: Engine/musmon.c:798 +#: Engine/musmon.c:803 #, fuzzy, c-format msgid "instr %s had %d init errors\n" msgstr "lo strumento %d ha %d errori di inizializzazione\n" -#: Engine/musmon.c:801 +#: Engine/musmon.c:806 #, c-format msgid "instr %d had %d init errors\n" msgstr "lo strumento %d ha %d errori di inizializzazione\n" -#: Engine/musmon.c:893 +#: Engine/musmon.c:898 msgid "terminating.\n" msgstr "finito.\n" -#: Engine/musmon.c:980 +#: Engine/musmon.c:985 #, c-format msgid "error in score. illegal opcode %c (ASCII %d)\n" msgstr "errore nella score. opcode illecito %c (ASCII %d)\n" -#: Engine/musmon.c:1241 +#: Engine/musmon.c:1247 #, fuzzy msgid "insert_score_event(): invalid instrument number or name\n" msgstr "insert_score_event(): numero o nome dello strumento non valido\n" -#: Engine/musmon.c:1261 +#: Engine/musmon.c:1267 #, c-format msgid "insert_score_event(): unknown opcode: %c\n" msgstr "insert_score_event(): opcode sconosciuto: %c\n" -#: Engine/musmon.c:1284 +#: Engine/musmon.c:1290 msgid "insert_score_event(): insufficient p-fields\n" msgstr "insert_score_event(): p-fields insufficienti\n" -#: Engine/musmon.c:1338 +#: Engine/musmon.c:1344 msgid "cannot rewind score: no score in memory \n" msgstr "" @@ -1475,30 +1490,30 @@ msgid "cannot find the specified instrument or opcode" msgstr "impossibile trovare lo strumento o l'opcode specificato" -#: Engine/new_orc_parser.c:92 Top/main.c:264 +#: Engine/new_orc_parser.c:144 #, fuzzy, c-format msgid "Failed to open input file %s\n" msgstr "Non è possibile aprire il file di input %s" -#: Engine/new_orc_parser.c:122 +#: Engine/new_orc_parser.c:177 #, fuzzy msgid "Unmatched #ifdef\n" msgstr "#idef senza corrispondenza" -#: Engine/new_orc_parser.c:156 +#: Engine/new_orc_parser.c:212 msgid "Parsing failed due to invalid input!\n" msgstr "" -#: Engine/new_orc_parser.c:160 +#: Engine/new_orc_parser.c:216 msgid "Parsing failed due to memory exhaustion!\n" msgstr "" -#: Engine/new_orc_parser.c:163 +#: Engine/new_orc_parser.c:219 #, c-format msgid "Parsing failed due to %d syntax error%s!\n" msgstr "" -#: Engine/new_orc_parser.c:208 +#: Engine/new_orc_parser.c:264 msgid "Stopping on parser failure\n" msgstr "" @@ -1516,7 +1531,7 @@ "\n" "\tresto della linea ignorato\n" -#: Engine/rdscor.c:159 +#: Engine/rdscor.c:160 msgid "ERROR: too many pfields: " msgstr "ERRORE: troppi pfields: " @@ -1745,8 +1760,8 @@ msgid "! invalid in p1, p2, or p3" msgstr "! non valido in p1, p2, or p3" -#: Engine/sread.c:1266 Engine/sread.c:1271 Engine/sread.c:1749 -#: Engine/sread.c:1772 Engine/sread.c:1786 +#: Engine/sread.c:1266 Engine/sread.c:1271 Engine/sread.c:1754 +#: Engine/sread.c:1777 Engine/sread.c:1791 msgid " remainder of line flushed\n" msgstr " resto della linea ignorato\n" @@ -1796,47 +1811,47 @@ msgid "Not #include" msgstr "Non #include" -#: Engine/sread.c:1674 +#: Engine/sread.c:1679 #, c-format msgid "Cannot open #include'd file %s" msgstr "Impossibile aprire il file #include %s" -#: Engine/sread.c:1684 +#: Engine/sread.c:1689 msgid "Not #undef" msgstr "Non #undef" -#: Engine/sread.c:1705 +#: Engine/sread.c:1710 #, c-format msgid "macro %s undefined\n" msgstr "macro %s non definita\n" -#: Engine/sread.c:1711 +#: Engine/sread.c:1716 msgid "unknown # option" msgstr "opzione # sconosciuta" -#: Engine/sread.c:1748 +#: Engine/sread.c:1753 #, c-format msgid "illegal opcode %c" msgstr "opcode illecito %c" -#: Engine/sread.c:1771 +#: Engine/sread.c:1776 #, c-format msgid "unexpected char %c" msgstr "carattere inatteso %c" -#: Engine/sread.c:1785 +#: Engine/sread.c:1790 msgid "illegally placed string" msgstr "stringa piazzata illecitamente" -#: Engine/sread.c:1792 +#: Engine/sread.c:1797 msgid "unmatched quote" msgstr "virgolette senza corrispondenza" -#: Engine/sread.c:1836 +#: Engine/sread.c:1841 msgid "sread: illegal number format: " msgstr "sread: formato numerico illecito: " -#: Engine/sread.c:1842 +#: Engine/sread.c:1847 msgid " zero substituted.\n" msgstr " sostituito zero.\n" @@ -2479,56 +2494,56 @@ msgid "unrecognised message type %d" msgstr "tipo di messaggio non riconosciuto %d" -#: InOut/midirecv.c:400 +#: InOut/midirecv.c:402 #, c-format msgid "midi channel %d using instr %d\n" msgstr "il canale midi %d usa lo strumento %d\n" -#: InOut/midirecv.c:403 +#: InOut/midirecv.c:405 #, c-format msgid "midi channel %d is muted\n" msgstr "il canale midi %d è silenziato\n" -#: InOut/midirecv.c:421 +#: InOut/midirecv.c:423 #, c-format msgid "MIDI channel %d muted\n" msgstr "canale MIDI %d silenziato\n" -#: InOut/midirecv.c:426 +#: InOut/midirecv.c:428 #, c-format msgid "Insno = %d\n" msgstr "Insno = %d\n" -#: InOut/midirecv.c:427 +#: InOut/midirecv.c:429 msgid "unknown instr" msgstr "strumento sconosciuto" -#: InOut/midirecv.c:430 +#: InOut/midirecv.c:432 #, c-format msgid "chnl %d using instr %d\n" msgstr "il canale %d usa lo strumento %d\n" -#: InOut/midirecv.c:490 +#: InOut/midirecv.c:492 #, c-format msgid " *** error reading MIDI device: %d (%s)" msgstr " *** errore in lettura del dispositivo MIDI: %d (%s)" -#: InOut/midirecv.c:519 +#: InOut/midirecv.c:521 #, c-format msgid "undefined sys-realtime msg %x\n" msgstr "messaggio sys-realtime non definito %x\n" -#: InOut/midirecv.c:537 +#: InOut/midirecv.c:539 #, c-format msgid "undefined sys_common msg %x\n" msgstr "messaggio sys_common non definito %x\n" -#: InOut/midirecv.c:599 +#: InOut/midirecv.c:601 #, c-format msgid "Error closing MIDI in device: %d (%s)" msgstr "Errore in chiusura del dispositivo MIDI in: %d (%s)" -#: InOut/midirecv.c:606 +#: InOut/midirecv.c:608 #, c-format msgid "Error closing MIDI out device: %d (%s)" msgstr "Errore in chiusura del dispositivo MIDI out: %d (%s)" @@ -3813,80 +3828,80 @@ msgid "non-looping sample" msgstr "" -#: OOps/aops.c:1041 OOps/aops.c:1069 +#: OOps/aops.c:1037 OOps/aops.c:1065 #, c-format msgid "No tuning table %d" msgstr "" -#: OOps/aops.c:1114 OOps/aops.c:1152 +#: OOps/aops.c:1110 OOps/aops.c:1148 msgid "cpstun: invalid table" msgstr "" -#: OOps/aops.c:1544 OOps/aops.c:1580 +#: OOps/aops.c:1540 OOps/aops.c:1576 #, c-format msgid "Input channel %d too large; ignored" msgstr "" -#: OOps/aops.c:1576 +#: OOps/aops.c:1572 #, fuzzy msgid "Input and output argument count differs in inch" msgstr "parametri di input e di output incompatibili" -#: OOps/aops.c:2014 +#: OOps/aops.c:2010 msgid "Unknown function called" msgstr "" -#: OOps/aops.c:2050 +#: OOps/aops.c:2046 msgid "number of arguments != nchnls" msgstr "" -#: OOps/aops.c:2080 +#: OOps/aops.c:2076 msgid "outrg: channel number cannot be < 1 (1 is the first channel)" msgstr "" -#: OOps/bus.c:80 OOps/bus.c:102 OOps/bus.c:127 OOps/bus.c:155 +#: OOps/bus.c:83 OOps/bus.c:105 OOps/bus.c:130 OOps/bus.c:158 msgid "chani: invalid index" msgstr "" -#: OOps/bus.c:88 OOps/bus.c:134 +#: OOps/bus.c:91 OOps/bus.c:137 #, c-format msgid "chani error %d:channel not found or not right type" msgstr "" -#: OOps/bus.c:110 OOps/bus.c:162 +#: OOps/bus.c:113 OOps/bus.c:165 #, c-format msgid "chano error %d:channel not found or not right type" msgstr "" -#: OOps/bus.c:216 +#: OOps/bus.c:219 #, fuzzy msgid "pvsin: invalid index" msgstr "soundin: skip time non valido" -#: OOps/bus.c:224 +#: OOps/bus.c:227 #, c-format msgid "pvsin error %d:channel not found or not right type" msgstr "" -#: OOps/bus.c:279 +#: OOps/bus.c:282 #, fuzzy msgid "pvsout: invalid index" msgstr "soundin: skip time non valido" -#: OOps/bus.c:287 +#: OOps/bus.c:290 #, c-format msgid "pvsout error %d:channel not found or not right type" msgstr "" -#: OOps/bus.c:1026 OOps/bus.c:1075 OOps/bus.c:1096 OOps/bus.c:1143 +#: OOps/bus.c:1029 OOps/bus.c:1078 OOps/bus.c:1099 OOps/bus.c:1146 msgid "invalid mode parameter" msgstr "" -#: OOps/bus.c:1063 OOps/bus.c:1187 +#: OOps/bus.c:1066 OOps/bus.c:1187 msgid "invalid channel parameters" msgstr "" -#: OOps/bus.c:1151 +#: OOps/bus.c:1154 msgid "channel already exists" msgstr "" @@ -3935,11 +3950,11 @@ msgid "diskin2: invalid number of channels" msgstr "" -#: OOps/diskin2.c:289 OOps/diskin2.c:1741 +#: OOps/diskin2.c:289 OOps/diskin2.c:1745 msgid "diskin2: unknown sample format" msgstr "" -#: OOps/diskin2.c:304 OOps/diskin2.c:1756 +#: OOps/diskin2.c:304 OOps/diskin2.c:1760 #, c-format msgid "diskin2: %s: failed to open file" msgstr "" @@ -3949,12 +3964,12 @@ "diskin2: number of output args inconsistent with number of file channels" msgstr "" -#: OOps/diskin2.c:346 OOps/diskin2.c:1813 +#: OOps/diskin2.c:346 OOps/diskin2.c:1817 #, c-format msgid "diskin2: warning: file sample rate (%d) != orchestra sr (%d)\n" msgstr "" -#: OOps/diskin2.c:427 OOps/diskin2.c:1894 +#: OOps/diskin2.c:427 OOps/diskin2.c:1905 #, fuzzy, c-format msgid "" "diskin2: opened (asynchronously) '%s':\n" @@ -3963,7 +3978,7 @@ "File '%s' (sr = %d Hz, %d canale\\\\i, %lu sample frames) caricati in " "memoria\n" -#: OOps/diskin2.c:441 OOps/diskin2.c:1908 +#: OOps/diskin2.c:441 OOps/diskin2.c:1919 #, fuzzy, c-format msgid "" "diskin2: opened '%s':\n" @@ -3973,12 +3988,12 @@ "memoria\n" #: OOps/diskin2.c:520 OOps/diskin2.c:706 OOps/diskin2.c:902 -#: OOps/diskin2.c:1526 OOps/diskin2.c:1940 OOps/diskin2.c:2133 +#: OOps/diskin2.c:1529 OOps/diskin2.c:1951 OOps/diskin2.c:2144 msgid "diskin2: not initialised" msgstr "diskin2: non inizializzato" -#: OOps/diskin2.c:686 OOps/diskin2.c:877 OOps/diskin2.c:1697 -#: OOps/diskin2.c:2106 +#: OOps/diskin2.c:686 OOps/diskin2.c:877 OOps/diskin2.c:1700 +#: OOps/diskin2.c:2117 msgid "diskin2: file descriptor closed or invalid\n" msgstr "" @@ -4046,7 +4061,7 @@ msgid "soundouts: not initialised" msgstr "soundouts: non inizializzato" -#: OOps/diskin2.c:1782 +#: OOps/diskin2.c:1786 #, fuzzy msgid "diskin2: output array too small" msgstr "tipo di output non valido per l'opcode %s" @@ -4824,12 +4839,12 @@ msgid "channel already specific remote" msgstr "" -#: OOps/remote.c:589 OOps/remote.c:614 OOps/remote.c:639 +#: OOps/remote.c:590 OOps/remote.c:615 OOps/remote.c:640 msgid "CLsend failed" msgstr "" -#: OOps/remote.c:706 OOps/remote.c:714 OOps/remote.c:722 OOps/remote.c:730 -#: OOps/remote.c:738 +#: OOps/remote.c:707 OOps/remote.c:715 OOps/remote.c:723 OOps/remote.c:731 +#: OOps/remote.c:739 msgid "" "*** This version of Csound was not compiled with remote event support ***\n" msgstr "" @@ -4844,11 +4859,11 @@ msgid "schedkwhen ignored. Instrument %d undefined\n" msgstr "" -#: OOps/schedule.c:429 +#: OOps/schedule.c:430 msgid "schedkwhen warning: negative kwhen reset to zero" msgstr "" -#: OOps/schedule.c:454 OOps/schedule.c:477 +#: OOps/schedule.c:455 OOps/schedule.c:478 msgid "trigseq: incorrect table number" msgstr "" @@ -4874,25 +4889,25 @@ msgid "filepeak: error getting peak value" msgstr "" -#: OOps/str_ops.c:60 +#: OOps/str_ops.c:64 msgid "illegal strset index" msgstr "" -#: OOps/str_ops.c:68 +#: OOps/str_ops.c:72 #, c-format msgid "strset index conflict at %d" msgstr "" -#: OOps/str_ops.c:69 +#: OOps/str_ops.c:73 #, c-format msgid "previous value: '%s', replaced with '%s'" msgstr "" -#: OOps/str_ops.c:93 OOps/str_ops.c:100 +#: OOps/str_ops.c:97 OOps/str_ops.c:104 msgid "--strset: invalid format" msgstr "" -#: OOps/str_ops.c:921 +#: OOps/str_ops.c:925 #, c-format msgid "invalid option code: %g" msgstr "" @@ -5042,27 +5057,27 @@ msgid "osciln: not initialised" msgstr "osciln: non inizializzato" -#: OOps/ugens2.c:1168 +#: OOps/ugens2.c:1210 msgid "oscil(krate): not initialised" msgstr "oscil(krate): non inizializzato" -#: OOps/ugens2.c:1203 OOps/ugens2.c:1239 OOps/ugens2.c:1272 OOps/ugens2.c:1307 +#: OOps/ugens2.c:1245 OOps/ugens2.c:1281 OOps/ugens2.c:1314 OOps/ugens2.c:1349 msgid "oscil: not initialised" msgstr "oscil: non inizializzato" -#: OOps/ugens2.c:1330 +#: OOps/ugens2.c:1372 msgid "oscili(krate): not initialised" msgstr "oscili(krate): non inizializzato" -#: OOps/ugens2.c:1365 OOps/ugens2.c:1405 OOps/ugens2.c:1441 OOps/ugens2.c:1480 +#: OOps/ugens2.c:1407 OOps/ugens2.c:1447 OOps/ugens2.c:1483 OOps/ugens2.c:1522 msgid "oscili: not initialised" msgstr "oscili: non inizializzato" -#: OOps/ugens2.c:1521 +#: OOps/ugens2.c:1563 msgid "oscil3(krate): not initialised" msgstr "oscil3(krate): non inizializzato" -#: OOps/ugens2.c:1580 OOps/ugens2.c:1636 OOps/ugens2.c:1689 OOps/ugens2.c:1744 +#: OOps/ugens2.c:1622 OOps/ugens2.c:1678 OOps/ugens2.c:1731 OOps/ugens2.c:1786 msgid "oscil3: not initialised" msgstr "oscil3: non inizializzato" @@ -5192,120 +5207,124 @@ msgid "pluck: kcps more than sample rate" msgstr "" -#: OOps/ugens4.c:472 OOps/ugens4.c:580 OOps/ugens4.c:685 +#: OOps/ugens4.c:472 OOps/ugens4.c:580 OOps/ugens4.c:686 #, c-format msgid "Seeding from current time %lu\n" msgstr "" -#: OOps/ugens5.c:287 OOps/ugens5.c:396 Opcodes/gab/gab.c:48 Opcodes/ugsc.c:209 +#: OOps/ugens5.c:287 OOps/ugens5.c:400 Opcodes/gab/gab.c:50 Opcodes/ugsc.c:211 #, c-format msgid "illegal reson iscl value, %f" msgstr "" -#: OOps/ugens5.c:616 +#: OOps/ugens5.c:623 #, c-format msgid "LPREAD cannot load %s" msgstr "" -#: OOps/ugens5.c:627 +#: OOps/ugens5.c:634 #, c-format msgid "Using %s type of file.\n" msgstr "" -#: OOps/ugens5.c:628 +#: OOps/ugens5.c:635 msgid "pole" msgstr "pole" -#: OOps/ugens5.c:628 +#: OOps/ugens5.c:635 msgid "filter coefficient" msgstr "" -#: OOps/ugens5.c:633 +#: OOps/ugens5.c:640 msgid "lpheader overriding inputs" msgstr "" -#: OOps/ugens5.c:637 +#: OOps/ugens5.c:644 msgid "lpfile srate != orch sr" msgstr "" -#: OOps/ugens5.c:645 +#: OOps/ugens5.c:652 #, c-format msgid "file %s bytes are in wrong order" msgstr "" -#: OOps/ugens5.c:655 +#: OOps/ugens5.c:662 msgid "insufficient args and no file header" msgstr "" -#: OOps/ugens5.c:660 +#: OOps/ugens5.c:667 msgid "npoles > MAXPOLES" msgstr "" -#: OOps/ugens5.c:668 +#: OOps/ugens5.c:675 #, c-format msgid "npoles %ld, nvals %ld, totvals %ld, lastfram16 = %lx\n" msgstr "" -#: OOps/ugens5.c:692 util/lpanal.c:324 +#: OOps/ugens5.c:700 util/lpanal.c:324 #, c-format msgid "magnitude: %f Phase: %f\n" msgstr "" -#: OOps/ugens5.c:695 util/lpanal.c:327 +#: OOps/ugens5.c:703 util/lpanal.c:327 #, c-format msgid "Real: %f Imag: %f\n" msgstr "" -#: OOps/ugens5.c:863 +#: OOps/ugens5.c:758 +msgid "Cannot handle uneven pole count yet \n" +msgstr "" + +#: OOps/ugens5.c:871 msgid "lpread: not initialised" msgstr "lpread: non inizializzato" -#: OOps/ugens5.c:869 +#: OOps/ugens5.c:877 msgid "lpread timpnt < 0" msgstr "" -#: OOps/ugens5.c:875 +#: OOps/ugens5.c:883 msgid "lpread ktimpnt truncated to last frame" msgstr "" -#: OOps/ugens5.c:906 OOps/ugens5.c:1409 +#: OOps/ugens5.c:914 OOps/ugens5.c:1417 msgid "Interpolation failed" msgstr "" -#: OOps/ugens5.c:964 +#: OOps/ugens5.c:972 msgid "this opcode only works with LPC pole analysis type (-a)\n" msgstr "" -#: OOps/ugens5.c:1098 +#: OOps/ugens5.c:1106 msgid "Pole file not supported for this opcode !" msgstr "" -#: OOps/ugens5.c:1125 +#: OOps/ugens5.c:1133 #, c-format msgid "illegal frqratio, %5.2f" msgstr "" -#: OOps/ugens5.c:1335 +#: OOps/ugens5.c:1343 msgid "lpslot number should be positive" msgstr "" -#: OOps/ugens5.c:1355 +#: OOps/ugens5.c:1363 msgid "LPC slot is not allocated" msgstr "" -#: OOps/ugens5.c:1363 +#: OOps/ugens5.c:1371 msgid "lpinterpol works only with poles files.." msgstr "" -#: OOps/ugens5.c:1367 +#: OOps/ugens5.c:1375 msgid "The poles files have different pole count" msgstr "" -#: OOps/ugens5.c:1373 +#: OOps/ugens5.c:1381 msgid "padding error" msgstr "" -#: OOps/ugens5.c:1393 +#: OOps/ugens5.c:1401 msgid "lpinterpol: not initialised" msgstr "lpinterpol: non inizializzato" @@ -5343,49 +5362,53 @@ msgid "delayw: not initialised" msgstr "delayw: non inizializzato" -#: OOps/ugens6.c:475 OOps/ugens6.c:774 OOps/ugens6.c:859 +#: OOps/ugens6.c:475 OOps/ugens6.c:785 OOps/ugens6.c:870 msgid "deltap: not initialised" msgstr "deltap: non inizializzato" -#: OOps/ugens6.c:530 +#: OOps/ugens6.c:532 msgid "deltapi: not initialised" msgstr "deltapi: non inizializzato" -#: OOps/ugens6.c:583 +#: OOps/ugens6.c:535 OOps/ugens6.c:677 +msgid "deltapi: INF delaytime" +msgstr "" + +#: OOps/ugens6.c:588 msgid "deltapn: not initialised" msgstr "deltapn: non inizializzato" -#: OOps/ugens6.c:667 +#: OOps/ugens6.c:674 msgid "deltap3: not initialised" msgstr "deltap3: non inizializzato" -#: OOps/ugens6.c:896 OOps/ugens6.c:900 Opcodes/ugmoss.c:483 +#: OOps/ugens6.c:907 OOps/ugens6.c:911 Opcodes/ugmoss.c:483 #: Opcodes/ugmoss.c:487 msgid "illegal loop time" msgstr "" -#: OOps/ugens6.c:963 +#: OOps/ugens6.c:974 msgid "comb: not initialised" msgstr "comb: non inizializzato" -#: OOps/ugens6.c:1002 +#: OOps/ugens6.c:1013 #, fuzzy msgid "combinv: not initialised" msgstr "comb: non inizializzato" -#: OOps/ugens6.c:1039 +#: OOps/ugens6.c:1050 msgid "alpass: not initialised" msgstr "alpass: non inizializzato" -#: OOps/ugens6.c:1072 +#: OOps/ugens6.c:1083 msgid "revlpsiz inconsistent\n" msgstr "" -#: OOps/ugens6.c:1163 +#: OOps/ugens6.c:1174 msgid "reverb: not intialised" msgstr "" -#: OOps/ugens6.c:1237 +#: OOps/ugens6.c:1248 msgid "pan: not initialised" msgstr "pan: non inizializzato" @@ -5548,10 +5571,10 @@ msgstr "" #: OOps/ugtabs.c:38 OOps/ugtabs.c:74 OOps/ugtabs.c:154 OOps/ugtabs.c:266 -#: OOps/ugtabs.c:428 OOps/ugtabs.c:445 OOps/ugtabs.c:461 OOps/ugtabs.c:477 -#: OOps/ugtabs.c:493 OOps/ugtabs.c:508 OOps/ugtabs.c:528 OOps/ugtabs.c:615 -#: OOps/ugtabs.c:632 OOps/ugtabs.c:646 OOps/ugtabs.c:659 OOps/ugtabs.c:695 -#: OOps/ugtabs.c:702 OOps/ugtabs.c:709 OOps/ugtabs.c:793 OOps/ugtabs.c:839 +#: OOps/ugtabs.c:428 OOps/ugtabs.c:445 OOps/ugtabs.c:461 OOps/ugtabs.c:478 +#: OOps/ugtabs.c:493 OOps/ugtabs.c:508 OOps/ugtabs.c:528 OOps/ugtabs.c:616 +#: OOps/ugtabs.c:633 OOps/ugtabs.c:647 OOps/ugtabs.c:660 OOps/ugtabs.c:696 +#: OOps/ugtabs.c:703 OOps/ugtabs.c:710 OOps/ugtabs.c:794 OOps/ugtabs.c:840 #, fuzzy, c-format msgid "table: could not find ftable %d" msgstr "non posso trovare lo strumento %f che suona indefinitamente\n" @@ -5566,12 +5589,12 @@ msgid "tablekt: index type inconsistent with output" msgstr "numero di canali incongruente con il numero di argomenti" -#: OOps/ugtabs.c:673 +#: OOps/ugtabs.c:674 #, fuzzy, c-format msgid "table: could not find ftables %d and/or %d" msgstr "non posso trovare lo strumento %f che suona indefinitamente\n" -#: OOps/ugtabs.c:802 OOps/ugtabs.c:848 +#: OOps/ugtabs.c:803 OOps/ugtabs.c:849 #, c-format msgid "table: could not read negative pos %d" msgstr "" @@ -5978,21 +6001,21 @@ msgid "crossfm: ftable not found" msgstr "GEN30: source ftable non trovata" -#: Opcodes/date.c:96 +#: Opcodes/date.c:97 msgid "cannot determine current directory" msgstr "" -#: Opcodes/date.c:133 +#: Opcodes/date.c:134 #, fuzzy msgid "readf: failed to open file" msgstr "fallita apertura del dispositivo" -#: Opcodes/date.c:159 +#: Opcodes/date.c:161 #, fuzzy msgid "readf: read failure" msgstr "Allocazione di memoria fallita" -#: Opcodes/date.c:169 Opcodes/date.c:177 +#: Opcodes/date.c:171 Opcodes/date.c:179 #, fuzzy msgid "readi failed to initialise" msgstr "lpread: non inizializzato" @@ -6255,12 +6278,12 @@ msgid "ftconv: not initialised" msgstr "ftconv: non inizializzato" -#: Opcodes/ftgen.c:69 Opcodes/ftgen.c:212 +#: Opcodes/ftgen.c:69 Opcodes/ftgen.c:213 #, fuzzy, c-format msgid "Error deleting ftable %d" msgstr "sostituisco la precedente ftable %d" -#: Opcodes/ftgen.c:137 Opcodes/signalflowgraph.cpp:1175 +#: Opcodes/ftgen.c:137 Opcodes/signalflowgraph.cpp:1383 msgid "ftgen string arg not allowed" msgstr "" @@ -6268,118 +6291,118 @@ msgid "ftgen error" msgstr "" -#: Opcodes/ftgen.c:209 +#: Opcodes/ftgen.c:210 #, fuzzy, c-format msgid "Invalid table number: %d" msgstr "ftable num. %f non valida" -#: Opcodes/ftgen.c:392 +#: Opcodes/ftgen.c:393 #, fuzzy msgid "ftload: error allocating ftable" msgstr "rtmidi: allocazione di memoria fallita" -#: Opcodes/ftgen.c:394 +#: Opcodes/ftgen.c:395 #, fuzzy msgid "ftload: no table numbers" msgstr "non posso trovare lo strumento %f che suona indefinitamente\n" -#: Opcodes/ftgen.c:396 +#: Opcodes/ftgen.c:397 #, fuzzy msgid "ftload: unable to open file" msgstr "non riesco ad aprire il file pvocex %s: %s" -#: Opcodes/ftgen.c:399 +#: Opcodes/ftgen.c:400 msgid "ftload: incorrect file" msgstr "" -#: Opcodes/ftgen.c:539 +#: Opcodes/ftgen.c:540 msgid "ftsave: Bad table number. Saving is possible only for existing tables." msgstr "" -#: Opcodes/ftgen.c:542 +#: Opcodes/ftgen.c:543 #, fuzzy msgid "ftsave: no table numbers" msgstr "numero di srctable sconosciuto" -#: Opcodes/ftgen.c:544 +#: Opcodes/ftgen.c:545 #, fuzzy msgid "ftsave: unable to open file" msgstr "non riesco ad aprire il file pvocex %s: %s" -#: Opcodes/ftgen.c:546 +#: Opcodes/ftgen.c:547 msgid "ftsave: failed to write file" msgstr "" -#: Opcodes/gab/gab.c:112 +#: Opcodes/gab/gab.c:114 #, fuzzy msgid "fastab: incorrect table number" msgstr "GEN53: numero di source table non valido" -#: Opcodes/gab/gab.c:139 Opcodes/gab/gab.c:148 Opcodes/gab/gab.c:178 +#: Opcodes/gab/gab.c:141 Opcodes/gab/gab.c:150 Opcodes/gab/gab.c:180 msgid "tabw off end" msgstr "" -#: Opcodes/gab/gab.c:164 Opcodes/gab/gab.c:241 Opcodes/gab/gab.c:250 +#: Opcodes/gab/gab.c:166 Opcodes/gab/gab.c:243 Opcodes/gab/gab.c:252 msgid "tab off end" msgstr "" -#: Opcodes/gab/gab.c:190 +#: Opcodes/gab/gab.c:192 #, fuzzy msgid "tab_i: incorrect table number" msgstr "GEN53: numero di source table non valido" -#: Opcodes/gab/gab.c:198 +#: Opcodes/gab/gab.c:200 #, fuzzy, c-format msgid "tab_i off end: table number: %d\n" msgstr "non posso trovare lo strumento %f che suona indefinitamente\n" -#: Opcodes/gab/gab.c:211 +#: Opcodes/gab/gab.c:213 #, fuzzy msgid "tabw_i: incorrect table number" msgstr "GEN53: numero di source table non valido" -#: Opcodes/gab/gab.c:218 +#: Opcodes/gab/gab.c:220 msgid "tabw_i off end" msgstr "" -#: Opcodes/gab/gab.c:263 +#: Opcodes/gab/gab.c:265 #, fuzzy msgid "tab_init: incorrect table number" msgstr "GEN53: numero di source table non valido" -#: Opcodes/gab/gab.c:332 +#: Opcodes/gab/gab.c:334 msgid "printi parameter was not a \"quoted string\"" msgstr "" -#: Opcodes/gab/gab.c:446 +#: Opcodes/gab/gab.c:448 #, fuzzy msgid "adsynt2: wavetable not found!" msgstr "GEN30: source ftable non trovata" -#: Opcodes/gab/gab.c:458 +#: Opcodes/gab/gab.c:460 #, fuzzy msgid "adsynt2: freqtable not found!" msgstr "GEN30: source ftable non trovata" -#: Opcodes/gab/gab.c:463 +#: Opcodes/gab/gab.c:465 msgid "adsynt2: partial count is greater than freqtable size!" msgstr "" -#: Opcodes/gab/gab.c:472 +#: Opcodes/gab/gab.c:474 #, fuzzy msgid "adsynt2: amptable not found!" msgstr "GEN30: source ftable non trovata" -#: Opcodes/gab/gab.c:477 +#: Opcodes/gab/gab.c:479 msgid "adsynt2: partial count is greater than amptable size!" msgstr "" -#: Opcodes/gab/gab.c:525 +#: Opcodes/gab/gab.c:527 #, fuzzy msgid "adsynt2: not initialised" msgstr "adsynt: non inizializzato" -#: Opcodes/gab/gab.c:759 +#: Opcodes/gab/gab.c:771 #, fuzzy msgid "max_k: invalid imaxflag value" msgstr "%s valore di ksmps non valido" @@ -6930,11 +6953,11 @@ msgid "vlinseg/vexpseg: invalid num. of elements" msgstr "numero errato di discussioni ftable" -#: Opcodes/gab/vectorial.c:2255 Opcodes/vpvoc.c:119 +#: Opcodes/gab/vectorial.c:2255 Opcodes/vpvoc.c:121 msgid "tableseg: not initialised" msgstr "tableseg: non inizializzato" -#: Opcodes/gab/vectorial.c:2285 Opcodes/vpvoc.c:148 +#: Opcodes/gab/vectorial.c:2285 Opcodes/vpvoc.c:150 msgid "tablexseg: not initialised" msgstr "tablexseg: non inizializzato" @@ -7337,8 +7360,8 @@ msgid "loscilx: invalid number of output arguments" msgstr "" -#: Opcodes/loscilx.c:209 Opcodes/loscilx.c:238 Opcodes/pvlock.c:152 -#: Opcodes/pvlock.c:375 Opcodes/pvsbasic.c:566 +#: Opcodes/loscilx.c:209 Opcodes/loscilx.c:238 Opcodes/pvlock.c:160 +#: Opcodes/pvlock.c:383 Opcodes/pvlock.c:657 Opcodes/pvsbasic.c:566 msgid "" "number of output arguments inconsistent with number of sound file channels" msgstr "" @@ -7347,7 +7370,12 @@ msgid "loscilx: not initialised" msgstr "loscilx: non inizializzato" -#: Opcodes/lowpassr.c:85 Opcodes/lowpassr.c:140 +#: Opcodes/lowpassr.c:55 Opcodes/lowpassr.c:99 Opcodes/lowpassr.c:121 +#: Opcodes/lowpassr.c:155 Opcodes/lowpassr.c:176 Opcodes/lowpassr.c:210 +msgid "Cutoff parameter must be positive" +msgstr "" + +#: Opcodes/lowpassr.c:252 Opcodes/lowpassr.c:312 msgid "illegal order num. (min 1, max 10)" msgstr "" @@ -7563,20 +7591,20 @@ msgid "partikkel: " msgstr "partikkel: " -#: Opcodes/partikkel.c:841 +#: Opcodes/partikkel.c:839 msgid "partikkelsync: opcode id needs to be a non-zero integer" msgstr "" -#: Opcodes/partikkel.c:845 Opcodes/partikkel.c:851 +#: Opcodes/partikkel.c:843 Opcodes/partikkel.c:849 msgid "partikkelsync: could not find opcode id" msgstr "" -#: Opcodes/partikkel.c:881 +#: Opcodes/partikkel.c:879 #, fuzzy, c-format msgid "%s: partikkel not initialized" msgstr "spat3di: non inizializzato" -#: Opcodes/partikkel.c:889 +#: Opcodes/partikkel.c:887 #, fuzzy, c-format msgid "%s: could not find opcode id" msgstr "GEN30: source ftable non trovata" @@ -7695,75 +7723,75 @@ msgid "adsynt: partial count is greater than amptable size!" msgstr "" -#: Opcodes/pitch.c:690 +#: Opcodes/pitch.c:691 msgid "adsynt: not initialised" msgstr "adsynt: non inizializzato" -#: Opcodes/pitch.c:770 +#: Opcodes/pitch.c:771 msgid "hsboscil: not initialised" msgstr "hsboscil: non inizializzato" -#: Opcodes/pitch.c:856 +#: Opcodes/pitch.c:857 msgid "pitchamdf: maxcps must be > mincps !" msgstr "" -#: Opcodes/pitch.c:1003 +#: Opcodes/pitch.c:1004 msgid "pitchamdf: not initialised" msgstr "pitchamdf: non inizializzato" -#: Opcodes/pitch.c:1184 Opcodes/pitch.c:1214 +#: Opcodes/pitch.c:1185 Opcodes/pitch.c:1215 msgid "phasorbnk: not initialised" msgstr "phasorbnk: non inizializzato" -#: Opcodes/pitch.c:1281 +#: Opcodes/pitch.c:1282 msgid "pinkish: Invalid method code" msgstr "" -#: Opcodes/pitch.c:1292 +#: Opcodes/pitch.c:1293 msgid "pinkish: Filter method requires a-rate (noise) input" msgstr "" -#: Opcodes/pitch.c:1421 +#: Opcodes/pitch.c:1422 #, c-format msgid "" "pinkish: Gardner method requires 4-%d bands. Default %ld substituted for " "%d.\n" msgstr "" -#: Opcodes/pitch.c:1684 +#: Opcodes/pitch.c:1685 msgid "Incorrect argument count in transeg" msgstr "" -#: Opcodes/pitch.c:1735 +#: Opcodes/pitch.c:1736 msgid "Incorrect argument count in transegb" msgstr "" -#: Opcodes/pitch.c:1786 Opcodes/pitch.c:1947 +#: Opcodes/pitch.c:1787 Opcodes/pitch.c:1948 #, fuzzy msgid "Error: transeg not initialised (krate)\n" msgstr "" "\n" "Error: transeg non inizializzato (krate)" -#: Opcodes/pitch.c:1824 Opcodes/pitch.c:2007 +#: Opcodes/pitch.c:1825 Opcodes/pitch.c:2008 msgid "transeg: not initialised (arate)\n" msgstr "transeg: non inizializzato (arate)\n" -#: Opcodes/pitch.c:1884 +#: Opcodes/pitch.c:1885 msgid "Incorrect argument count in transegr" msgstr "" -#: Opcodes/pitch.c:2303 +#: Opcodes/pitch.c:2321 #, fuzzy msgid "median: not initialised (arate)\n" msgstr "linseg: non inizializzato (arate)\n" -#: Opcodes/pitch.c:2307 Opcodes/pitch.c:2360 +#: Opcodes/pitch.c:2325 Opcodes/pitch.c:2378 #, c-format msgid "median: window (%d)larger than maximum(%d); truncated" msgstr "" -#: Opcodes/pitch.c:2356 +#: Opcodes/pitch.c:2374 #, fuzzy msgid "median: not initialised (krate)\n" msgstr "linseg non inizializzato (krate)\n" @@ -7883,30 +7911,30 @@ msgid "PVBUFREAD cannot load %s" msgstr "" -#: Opcodes/pvinterp.c:82 Opcodes/vpvoc.c:215 +#: Opcodes/pvinterp.c:82 Opcodes/vpvoc.c:217 #, c-format msgid "PVOC frame %ld bigger than %ld in %s" msgstr "" -#: Opcodes/pvinterp.c:87 Opcodes/vpvoc.c:220 +#: Opcodes/pvinterp.c:87 Opcodes/vpvoc.c:222 #, c-format msgid "PVOC frame %ld seems too small in %s" msgstr "" #: Opcodes/pvinterp.c:91 Opcodes/pvinterp.c:203 Opcodes/pvinterp.c:393 -#: Opcodes/vpvoc.c:224 +#: Opcodes/vpvoc.c:226 #, c-format msgid "%d chans (not 1) in PVOC file %s" msgstr "" #: Opcodes/pvinterp.c:106 Opcodes/pvinterp.c:230 Opcodes/pvinterp.c:418 -#: Opcodes/ugens8.c:101 Opcodes/vpvoc.c:252 +#: Opcodes/ugens8.c:101 Opcodes/vpvoc.c:254 #, c-format msgid "ksmps of %d needs wdw of %d, max is %d for pv %s" msgstr "" #: Opcodes/pvinterp.c:135 Opcodes/pvinterp.c:284 Opcodes/pvinterp.c:475 -#: Opcodes/pvread.c:109 Opcodes/ugens8.c:174 Opcodes/vpvoc.c:314 +#: Opcodes/pvread.c:109 Opcodes/ugens8.c:174 Opcodes/vpvoc.c:316 msgid "PVOC ktimpnt truncated to last frame" msgstr "" @@ -7915,7 +7943,7 @@ msgstr "pvbufread: non inizializzato" #: Opcodes/pvinterp.c:146 Opcodes/pvinterp.c:337 Opcodes/pvinterp.c:540 -#: Opcodes/pvread.c:117 Opcodes/ugens8.c:232 Opcodes/vpvoc.c:382 +#: Opcodes/pvread.c:117 Opcodes/ugens8.c:232 Opcodes/vpvoc.c:384 msgid "PVOC timpnt < 0" msgstr "" @@ -7938,12 +7966,12 @@ msgstr "pvinterp: non inizializzato" #: Opcodes/pvinterp.c:332 Opcodes/pvinterp.c:534 Opcodes/ugens8.c:226 -#: Opcodes/vpvoc.c:376 +#: Opcodes/vpvoc.c:378 msgid "PVOC transpose too low" msgstr "" #: Opcodes/pvinterp.c:335 Opcodes/pvinterp.c:537 Opcodes/ugens8.c:229 -#: Opcodes/vpvoc.c:379 +#: Opcodes/vpvoc.c:381 msgid "PVOC transpose too high" msgstr "" @@ -7961,7 +7989,7 @@ msgid "pvcross: %s: frame size %d does not match pvbufread frame size %d\n" msgstr "" -#: Opcodes/pvinterp.c:498 Opcodes/vpvoc.c:339 +#: Opcodes/pvinterp.c:498 Opcodes/vpvoc.c:341 msgid "PVOC debug: one frame gets through\n" msgstr "" @@ -7969,19 +7997,19 @@ msgid "pvcross: not initialised" msgstr "pvcross: non inizializzato" -#: Opcodes/pvlock.c:67 Opcodes/pvsbasic.c:480 +#: Opcodes/pvlock.c:71 Opcodes/pvsbasic.c:480 #, fuzzy msgid "invalid number of output arguments" msgstr "numero errato di discussioni ftable" -#: Opcodes/pvlock.c:536 Opcodes/pvsband.c:46 Opcodes/pvsbasic.c:684 +#: Opcodes/pvlock.c:826 Opcodes/pvsband.c:46 Opcodes/pvsbasic.c:684 #: Opcodes/pvsbasic.c:1007 Opcodes/pvsbasic.c:1220 Opcodes/pvsbasic.c:1326 #: Opcodes/pvsbasic.c:1555 Opcodes/pvsbasic.c:1768 Opcodes/pvsbasic.c:1942 -#: Opcodes/pvsgendy.c:43 Opcodes/signalflowgraph.cpp:627 +#: Opcodes/pvsgendy.c:43 Opcodes/signalflowgraph.cpp:665 msgid "Unsafe to have same fsig as in and out" msgstr "" -#: Opcodes/pvlock.c:548 +#: Opcodes/pvlock.c:838 #, fuzzy msgid "pvsfreeze: signal format must be amp-freq." msgstr "formato campione non valido: deve essere -s, -l, o -f" @@ -8348,49 +8376,49 @@ msgid "Nothing to close" msgstr "" -#: Opcodes/sfont.c:111 +#: Opcodes/sfont.c:114 #, c-format msgid "sfload: cannot open SoundFont file \"%s\" (error %s)" msgstr "" -#: Opcodes/sfont.c:117 +#: Opcodes/sfont.c:120 msgid "Sfload: cannot use globals" msgstr "" -#: Opcodes/sfont.c:150 +#: Opcodes/sfont.c:153 msgid "sfload: could not open globals\n" msgstr "" -#: Opcodes/sfont.c:172 +#: Opcodes/sfont.c:175 #, fuzzy msgid "Extending soundfonts" msgstr "troppi buffers" -#: Opcodes/sfont.c:211 +#: Opcodes/sfont.c:214 #, c-format msgid "" "\n" "Preset list of \"%s\"\n" msgstr "" -#: Opcodes/sfont.c:214 +#: Opcodes/sfont.c:217 #, c-format msgid "%3d) %-20s\tprog:%-3d bank:%d\n" msgstr "" -#: Opcodes/sfont.c:236 +#: Opcodes/sfont.c:239 #, c-format msgid "" "\n" "Assigning all Presets of \"%s\" starting from %d (preset handle number)\n" msgstr "" -#: Opcodes/sfont.c:241 +#: Opcodes/sfont.c:244 #, c-format msgid "%3d<--%-20s\t(prog:%-3d bank:%d)\n" msgstr "" -#: Opcodes/sfont.c:248 +#: Opcodes/sfont.c:251 #, c-format msgid "" "\n" @@ -8398,38 +8426,38 @@ "\n" msgstr "" -#: Opcodes/sfont.c:261 +#: Opcodes/sfont.c:264 #, c-format msgid "" "\n" "Instrument list of \"%s\"\n" msgstr "" -#: Opcodes/sfont.c:279 +#: Opcodes/sfont.c:282 #, c-format msgid "sfpreset: preset handle too big (%d), max: %d" msgstr "" -#: Opcodes/sfont.c:296 +#: Opcodes/sfont.c:299 #, c-format msgid "" "sfpreset: cannot find any preset having prog number %d and bank number %d in " "SoundFont file \"%s\"" msgstr "" -#: Opcodes/sfont.c:318 Opcodes/sfont.c:2248 +#: Opcodes/sfont.c:321 Opcodes/sfont.c:2251 msgid "sfplay: invalid or out-of-range preset number" msgstr "" -#: Opcodes/sfont.c:655 +#: Opcodes/sfont.c:658 msgid "sfplaym: invalid or out-of-range preset number" msgstr "" -#: Opcodes/sfont.c:919 Opcodes/sfont.c:1191 +#: Opcodes/sfont.c:922 Opcodes/sfont.c:1194 msgid "sfinstr: instrument out of range" msgstr "" -#: Opcodes/sfont.c:1648 Opcodes/sfont.c:1886 +#: Opcodes/sfont.c:1651 Opcodes/sfont.c:1889 #, c-format msgid "" "SoundFont file \"%s\" contains ROM samples !\n" @@ -8437,15 +8465,15 @@ "Session aborted !" msgstr "" -#: Opcodes/sfont.c:2041 Opcodes/sfont.c:2049 +#: Opcodes/sfont.c:2044 Opcodes/sfont.c:2052 msgid "Sfont: cannot use globals/" msgstr "" -#: Opcodes/sfont.c:2054 +#: Opcodes/sfont.c:2057 msgid "Sfont format not compatible" msgstr "" -#: Opcodes/sfont.c:2598 +#: Opcodes/sfont.c:2601 msgid "error... could not create sfont globals\n" msgstr "" @@ -8453,32 +8481,37 @@ msgid "powershape: ifullscale must be strictly positive" msgstr "" -#: Opcodes/signalflowgraph.cpp:332 Opcodes/signalflowgraph.cpp:593 +#: Opcodes/signalflowgraph.cpp:360 Opcodes/signalflowgraph.cpp:629 #, c-format msgid "Connected instances of outlet %s to instance 0x%x of inlet %s.\n" msgstr "" -#: Opcodes/signalflowgraph.cpp:408 +#: Opcodes/signalflowgraph.cpp:438 #, fuzzy, c-format msgid "Created instance 0x%x of %d instances of outlet %s\n" msgstr "rimossa l'istanza dello strumento %d\n" -#: Opcodes/signalflowgraph.cpp:468 +#: Opcodes/signalflowgraph.cpp:500 #, c-format msgid "Connected instances of outlet %s to instance 0x%xof inlet %s.\n" msgstr "" -#: Opcodes/signalflowgraph.cpp:655 +#: Opcodes/signalflowgraph.cpp:693 #, fuzzy msgid "inletf: signal format must be amp-phase or amp-freq." msgstr "formato campione non valido: deve essere -s, -l, o -f" -#: Opcodes/signalflowgraph.cpp:948 Opcodes/signalflowgraph.cpp:989 +#: Opcodes/signalflowgraph.cpp:837 +#, fuzzy, c-format +msgid "Connected instances of outlet %s to instance 0x%x of inlet %s\n" +msgstr "rimossa l'istanza dello strumento %d\n" + +#: Opcodes/signalflowgraph.cpp:1150 Opcodes/signalflowgraph.cpp:1193 #, c-format msgid "Connected outlet %s to inlet %s.\n" msgstr "" -#: Opcodes/signalflowgraph.cpp:1116 Opcodes/signalflowgraph.cpp:1200 +#: Opcodes/signalflowgraph.cpp:1322 Opcodes/signalflowgraph.cpp:1408 #, fuzzy msgid "ftgenonce error" msgstr "(nessun errore)" @@ -8792,7 +8825,7 @@ msgid "Error allocating argument stack" msgstr "" -#: Opcodes/stackops.c:206 Top/argdecode.c:1245 util/envext.c:99 +#: Opcodes/stackops.c:206 Top/argdecode.c:1263 util/envext.c:99 #: util/scale.c:248 msgid "too many arguments" msgstr "" @@ -9227,7 +9260,7 @@ msgid "ATSCROSS: you must have an atsbufread before an atsinterpread" msgstr "" -#: Opcodes/ugsc.c:434 +#: Opcodes/ugsc.c:439 msgid "Phaser mode must be either 1 or 2" msgstr "" @@ -9360,21 +9393,21 @@ msgid "Have to have at least %d directions in vbapzmove" msgstr "" -#: Opcodes/vpvoc.c:175 +#: Opcodes/vpvoc.c:177 #, c-format msgid "vpvoc: Could not find ifnmagctrl table %f" msgstr "" -#: Opcodes/vpvoc.c:181 +#: Opcodes/vpvoc.c:183 msgid "vpvoc: associated tableseg not found" msgstr "" -#: Opcodes/vpvoc.c:203 +#: Opcodes/vpvoc.c:205 #, c-format msgid "VPVOC cannot load %s" msgstr "" -#: Opcodes/vpvoc.c:373 +#: Opcodes/vpvoc.c:375 msgid "vpvoc: not initialised" msgstr "vpvoc: non inizializzato" @@ -9447,751 +9480,763 @@ msgid "No wii range" msgstr "" -#: Top/argdecode.c:63 +#: Top/argdecode.c:64 msgid "--help\tprint long usage options" msgstr "" -#: Top/argdecode.c:64 +#: Top/argdecode.c:65 msgid "-U unam\trun utility program unam" msgstr "" -#: Top/argdecode.c:65 +#: Top/argdecode.c:66 msgid "-C\tuse Cscore processing of scorefile" msgstr "" -#: Top/argdecode.c:66 +#: Top/argdecode.c:67 #, fuzzy msgid "-j N\tuse N threads in performance" msgstr "" "\n" "%d errori nell'esecuzione\n" -#: Top/argdecode.c:67 +#: Top/argdecode.c:68 msgid "-I\tI-time only orch run" msgstr "" -#: Top/argdecode.c:68 +#: Top/argdecode.c:69 msgid "-n\tno sound onto disk" msgstr "" -#: Top/argdecode.c:69 +#: Top/argdecode.c:70 msgid "-i fnam\tsound input filename" msgstr "" -#: Top/argdecode.c:70 util/mixer.c:94 util/scale.c:45 +#: Top/argdecode.c:71 util/mixer.c:94 util/scale.c:45 msgid "-o fnam\tsound output filename" msgstr "" -#: Top/argdecode.c:71 +#: Top/argdecode.c:72 msgid "-b N\tsample frames (or -kprds) per software sound I/O buffer" msgstr "" -#: Top/argdecode.c:72 +#: Top/argdecode.c:73 msgid "-B N\tsamples per hardware sound I/O buffer" msgstr "" -#: Top/argdecode.c:73 util/mixer.c:95 util/scale.c:46 util/srconv.c:752 +#: Top/argdecode.c:74 util/mixer.c:95 util/scale.c:46 util/srconv.c:752 msgid "-A\tcreate an AIFF format output soundfile" msgstr "" -#: Top/argdecode.c:74 util/mixer.c:96 util/scale.c:47 util/srconv.c:754 +#: Top/argdecode.c:75 util/mixer.c:96 util/scale.c:47 util/srconv.c:754 msgid "-W\tcreate a WAV format output soundfile" msgstr "" -#: Top/argdecode.c:75 util/srconv.c:753 +#: Top/argdecode.c:76 util/srconv.c:753 msgid "-J\tcreate an IRCAM format output soundfile" msgstr "" -#: Top/argdecode.c:76 util/mixer.c:97 util/scale.c:48 util/srconv.c:755 +#: Top/argdecode.c:77 util/mixer.c:97 util/scale.c:48 util/srconv.c:755 msgid "-h\tno header on output soundfile" msgstr "" -#: Top/argdecode.c:77 util/mixer.c:99 util/scale.c:49 util/srconv.c:756 +#: Top/argdecode.c:78 util/mixer.c:99 util/scale.c:49 util/srconv.c:756 msgid "-c\t8-bit signed_char sound samples" msgstr "" -#: Top/argdecode.c:79 util/mixer.c:101 util/scale.c:50 util/srconv.c:757 +#: Top/argdecode.c:80 util/mixer.c:101 util/scale.c:50 util/srconv.c:757 msgid "-a\talaw sound samples" msgstr "" -#: Top/argdecode.c:81 util/mixer.c:98 util/mixer.c:100 util/srconv.c:758 +#: Top/argdecode.c:82 util/mixer.c:98 util/mixer.c:100 util/srconv.c:758 msgid "-8\t8-bit unsigned_char sound samples" msgstr "" -#: Top/argdecode.c:82 util/mixer.c:102 util/scale.c:51 util/srconv.c:759 +#: Top/argdecode.c:83 util/mixer.c:102 util/scale.c:51 util/srconv.c:759 msgid "-u\tulaw sound samples" msgstr "" -#: Top/argdecode.c:83 util/mixer.c:103 util/scale.c:52 util/srconv.c:760 +#: Top/argdecode.c:84 util/mixer.c:103 util/scale.c:52 util/srconv.c:760 msgid "-s\tshort_int sound samples" msgstr "" -#: Top/argdecode.c:84 util/mixer.c:104 util/scale.c:53 util/srconv.c:761 +#: Top/argdecode.c:85 util/mixer.c:104 util/scale.c:53 util/srconv.c:761 msgid "-l\tlong_int sound samples" msgstr "" -#: Top/argdecode.c:85 util/mixer.c:105 util/scale.c:54 util/srconv.c:762 +#: Top/argdecode.c:86 util/mixer.c:105 util/scale.c:54 util/srconv.c:762 msgid "-f\tfloat sound samples" msgstr "" -#: Top/argdecode.c:86 +#: Top/argdecode.c:87 msgid "-3\t24bit sound samples" msgstr "" -#: Top/argdecode.c:87 util/srconv.c:763 +#: Top/argdecode.c:88 util/srconv.c:763 msgid "-r N\torchestra srate override" msgstr "" -#: Top/argdecode.c:88 +#: Top/argdecode.c:89 msgid "-k N\torchestra krate override" msgstr "" -#: Top/argdecode.c:89 util/srconv.c:764 +#: Top/argdecode.c:90 util/srconv.c:764 msgid "-K\tDo not generate PEAK chunks" msgstr "" -#: Top/argdecode.c:90 +#: Top/argdecode.c:91 msgid "-v\tverbose orch translation" msgstr "" -#: Top/argdecode.c:91 +#: Top/argdecode.c:92 msgid "-m N\ttty message level. Sum of:" msgstr "" -#: Top/argdecode.c:92 +#: Top/argdecode.c:93 msgid "\t\t1=note amps, 2=out-of-range msg, 4=warnings" msgstr "" -#: Top/argdecode.c:93 +#: Top/argdecode.c:94 msgid "\t\t0/32/64/96=note amp format (raw,dB,colors)" msgstr "" -#: Top/argdecode.c:94 +#: Top/argdecode.c:95 msgid "\t\t128=print benchmark information" msgstr "" -#: Top/argdecode.c:95 +#: Top/argdecode.c:96 msgid "-d\tsuppress all displays" msgstr "" -#: Top/argdecode.c:96 +#: Top/argdecode.c:97 msgid "-g\tsuppress graphics, use ascii displays" msgstr "" -#: Top/argdecode.c:97 +#: Top/argdecode.c:98 msgid "-G\tsuppress graphics, use Postscript displays" msgstr "" -#: Top/argdecode.c:98 +#: Top/argdecode.c:99 msgid "-x fnam\textract from score.srt using extract file 'fnam'" msgstr "" -#: Top/argdecode.c:99 +#: Top/argdecode.c:100 msgid "-t N\tuse uninterpreted beats of the score, initially at tempo N" msgstr "" -#: Top/argdecode.c:100 +#: Top/argdecode.c:101 msgid "-t 0\tuse score.srt for sorted score rather than a temporary" msgstr "" -#: Top/argdecode.c:101 +#: Top/argdecode.c:102 msgid "-L dnam\tread Line-oriented realtime score events from device 'dnam'" msgstr "" -#: Top/argdecode.c:102 +#: Top/argdecode.c:103 msgid "-M dnam\tread MIDI realtime events from device 'dnam'" msgstr "" -#: Top/argdecode.c:103 +#: Top/argdecode.c:104 msgid "-F fnam\tread MIDIfile event stream from file 'fnam'" msgstr "" -#: Top/argdecode.c:105 util/mixer.c:106 util/scale.c:59 util/srconv.c:765 +#: Top/argdecode.c:106 util/mixer.c:106 util/scale.c:59 util/srconv.c:765 msgid "-R\tcontinually rewrite header while writing soundfile (WAV/AIFF)" msgstr "" -#: Top/argdecode.c:106 +#: Top/argdecode.c:107 msgid "-H#\tprint heartbeat style 1, 2 or 3 at each soundfile write" msgstr "" -#: Top/argdecode.c:107 util/mixer.c:108 util/scale.c:61 util/srconv.c:767 +#: Top/argdecode.c:108 util/mixer.c:108 util/scale.c:61 util/srconv.c:767 msgid "-N\tnotify (ring the bell) when score or miditrack is done" msgstr "" -#: Top/argdecode.c:108 +#: Top/argdecode.c:109 msgid "-T\tterminate the performance when miditrack is done" msgstr "" -#: Top/argdecode.c:109 +#: Top/argdecode.c:110 msgid "-D\tdefer GEN01 soundfile loads until performance time" msgstr "" -#: Top/argdecode.c:110 +#: Top/argdecode.c:111 msgid "-Q dnam\tselect MIDI output device" msgstr "" -#: Top/argdecode.c:111 +#: Top/argdecode.c:112 msgid "-z\tList opcodes in this version" msgstr "" -#: Top/argdecode.c:112 +#: Top/argdecode.c:113 msgid "-Z\tDither output" msgstr "" -#: Top/argdecode.c:114 +#: Top/argdecode.c:115 msgid "--sched set real-time priority and lock memory" msgstr "" -#: Top/argdecode.c:115 Top/argdecode.c:117 +#: Top/argdecode.c:116 Top/argdecode.c:118 msgid " (requires -d and real time audio (-iadc/-odac))" msgstr "" -#: Top/argdecode.c:116 +#: Top/argdecode.c:117 msgid "--sched=N set specified scheduling priority, and lock memory" msgstr "" -#: Top/argdecode.c:126 +#: Top/argdecode.c:127 msgid "\t\t\tSet output file format" msgstr "" -#: Top/argdecode.c:127 +#: Top/argdecode.c:128 msgid "--aiff\t\t\tSet AIFF format" msgstr "" -#: Top/argdecode.c:128 +#: Top/argdecode.c:129 msgid "--au\t\t\tSet AU format" msgstr "" -#: Top/argdecode.c:129 +#: Top/argdecode.c:130 msgid "--wave\t\t\tSet WAV format" msgstr "" -#: Top/argdecode.c:130 +#: Top/argdecode.c:131 msgid "--ircam\t\t\tSet IRCAM format" msgstr "" -#: Top/argdecode.c:131 +#: Top/argdecode.c:132 msgid "--ogg\t\t\tSet OGG/VORBIS format" msgstr "" -#: Top/argdecode.c:132 +#: Top/argdecode.c:133 msgid "--noheader\t\tRaw format" msgstr "" -#: Top/argdecode.c:133 +#: Top/argdecode.c:134 msgid "--nopeaks\t\tDo not write peak information" msgstr "" -#: Top/argdecode.c:135 +#: Top/argdecode.c:136 msgid "--nodisplays\t\tSuppress all displays" msgstr "" -#: Top/argdecode.c:136 +#: Top/argdecode.c:137 msgid "--asciidisplay\t\tSuppress graphics, use ascii displays" msgstr "" -#: Top/argdecode.c:137 +#: Top/argdecode.c:138 msgid "--postscriptdisplay\tSuppress graphics, use Postscript displays" msgstr "" -#: Top/argdecode.c:139 +#: Top/argdecode.c:140 msgid "--defer-gen1\t\tDefer GEN01 soundfile loads until performance time" msgstr "" -#: Top/argdecode.c:140 +#: Top/argdecode.c:141 msgid "" "--iobufsamps=N\t\tSample frames (or -kprds) per software sound I/O buffer" msgstr "" -#: Top/argdecode.c:142 +#: Top/argdecode.c:143 msgid "--hardwarebufsamps=N\tSamples per hardware sound I/O buffer" msgstr "" -#: Top/argdecode.c:143 +#: Top/argdecode.c:144 msgid "--cscore\t\tUse Cscore processing of scorefile" msgstr "" -#: Top/argdecode.c:144 +#: Top/argdecode.c:145 msgid "--orc\t\t\tUse orchfile without scorefile" msgstr "" -#: Top/argdecode.c:146 +#: Top/argdecode.c:147 msgid "--midifile=FNAME\tRead MIDIfile event stream from file" msgstr "" -#: Top/argdecode.c:147 +#: Top/argdecode.c:148 msgid "--midioutfile=FNAME\tWrite MIDI output to file FNAME" msgstr "" -#: Top/argdecode.c:148 +#: Top/argdecode.c:149 msgid "--midi-device=FNAME\tRead MIDI realtime events from device" msgstr "" -#: Top/argdecode.c:149 +#: Top/argdecode.c:150 msgid "--terminate-on-midi\tTerminate the performance when miditrack is done" msgstr "" -#: Top/argdecode.c:151 +#: Top/argdecode.c:152 msgid "" "--heartbeat=N\t\tPrint a heartbeat style 1, 2 or 3 at each soundfile write" msgstr "" -#: Top/argdecode.c:153 +#: Top/argdecode.c:154 msgid "--notify\t\tNotify (ring the bell) when score or miditrack is done" msgstr "" -#: Top/argdecode.c:154 +#: Top/argdecode.c:155 msgid "" "--rewrite\t\tContinually rewrite header while writing soundfile (WAV/AIFF)" msgstr "" -#: Top/argdecode.c:157 +#: Top/argdecode.c:158 msgid "--input=FNAME\t\tSound input filename" msgstr "" -#: Top/argdecode.c:158 +#: Top/argdecode.c:159 msgid "--output=FNAME\t\tSound output filename" msgstr "" -#: Top/argdecode.c:159 +#: Top/argdecode.c:160 msgid "--logfile=FNAME\t\tLog output to file" msgstr "" -#: Top/argdecode.c:161 +#: Top/argdecode.c:162 msgid "--nosound\t\tNo sound onto disk or device" msgstr "" -#: Top/argdecode.c:162 +#: Top/argdecode.c:163 msgid "--tempo=N\t\tUse uninterpreted beats of the score, initially at tempo N" msgstr "" -#: Top/argdecode.c:164 +#: Top/argdecode.c:165 msgid "--i-only\t\tI-time only orch run" msgstr "" -#: Top/argdecode.c:165 +#: Top/argdecode.c:166 msgid "--syntax-check-only\tStop after checking orchestra and score syntax" msgstr "" -#: Top/argdecode.c:166 +#: Top/argdecode.c:167 msgid "--control-rate=N\tOrchestra krate override" msgstr "" -#: Top/argdecode.c:167 +#: Top/argdecode.c:168 msgid "--sample-rate=N\t\tOrchestra srate override" msgstr "" -#: Top/argdecode.c:168 +#: Top/argdecode.c:169 msgid "--score-in=FNAME\tRead Line-oriented realtime score events from device" msgstr "" -#: Top/argdecode.c:170 +#: Top/argdecode.c:171 msgid "--messagelevel=N\ttty message level, sum of:" msgstr "" -#: Top/argdecode.c:171 +#: Top/argdecode.c:172 msgid "--messageolevel=O\ttty message level in octal, of:" msgstr "" -#: Top/argdecode.c:172 +#: Top/argdecode.c:173 msgid "\t\t\t\t1=note amps, 2=out-of-range msg, 4=warnings," msgstr "" -#: Top/argdecode.c:173 +#: Top/argdecode.c:174 msgid "\t\t\t\t0/32/64/96=note amp format (raw,dB,colors)," msgstr "" -#: Top/argdecode.c:174 +#: Top/argdecode.c:175 msgid "\t\t\t\t128=print benchmark information" msgstr "" -#: Top/argdecode.c:176 +#: Top/argdecode.c:177 msgid "--m-amps=[01]\tmessages on note amps" msgstr "" -#: Top/argdecode.c:177 +#: Top/argdecode.c:178 msgid "--m-range=[01]\tMessages on range errors" msgstr "" -#: Top/argdecode.c:178 +#: Top/argdecode.c:179 msgid "--m-warnings=[01]\tMesage on warnings" msgstr "" -#: Top/argdecode.c:179 +#: Top/argdecode.c:180 msgid "--m-raw=[01]\tRaw amp messages" msgstr "" -#: Top/argdecode.c:180 +#: Top/argdecode.c:181 msgid "--m-dB=[01]\tAmp messages in dB" msgstr "" -#: Top/argdecode.c:181 +#: Top/argdecode.c:182 msgid "--m-colours=[01]\tColour amp messages" msgstr "" -#: Top/argdecode.c:182 +#: Top/argdecode.c:183 msgid "--m-benchmarks=[01]\tPrint benchmark information" msgstr "" -#: Top/argdecode.c:183 +#: Top/argdecode.c:184 msgid "--csd-line-nums=[01]\tControls how error line numbers are printed:" msgstr "" -#: Top/argdecode.c:184 +#: Top/argdecode.c:185 msgid "\t\t\t1=use CSD line #s (default), 0=use ORC/SCO-relative line #s" msgstr "" -#: Top/argdecode.c:185 +#: Top/argdecode.c:186 msgid "--extract-score=FNAME\tExtract from score.srt using extract file" msgstr "" -#: Top/argdecode.c:186 +#: Top/argdecode.c:187 msgid "--keep-sorted-score" msgstr "" -#: Top/argdecode.c:187 +#: Top/argdecode.c:188 msgid "--env:NAME=VALUE\tSet environment variable NAME to VALUE" msgstr "" -#: Top/argdecode.c:188 +#: Top/argdecode.c:189 msgid "--env:NAME+=VALUE\tAppend VALUE to environment variable NAME" msgstr "" -#: Top/argdecode.c:189 +#: Top/argdecode.c:190 msgid "--strsetN=VALUE\t\tSet strset table at index N to VALUE" msgstr "" -#: Top/argdecode.c:190 +#: Top/argdecode.c:191 msgid "--utility=NAME\t\tRun utility program" msgstr "" -#: Top/argdecode.c:191 +#: Top/argdecode.c:192 msgid "--verbose\t\tVerbose orch translation" msgstr "" -#: Top/argdecode.c:192 +#: Top/argdecode.c:193 msgid "--list-opcodes\t\tList opcodes in this version" msgstr "" -#: Top/argdecode.c:193 +#: Top/argdecode.c:194 msgid "--list-opcodesN\t\tList opcodes in style N in this version" msgstr "" -#: Top/argdecode.c:194 +#: Top/argdecode.c:195 msgid "--dither\t\tDither output" msgstr "" -#: Top/argdecode.c:195 +#: Top/argdecode.c:196 msgid "--dither-triangular\t\tDither output with triangular distribution" msgstr "" -#: Top/argdecode.c:196 +#: Top/argdecode.c:197 msgid "--dither-uniform\t\tDither output with rectanular distribution" msgstr "" -#: Top/argdecode.c:197 +#: Top/argdecode.c:198 msgid "--sched\t\t\tSet real-time scheduling priority and lock memory" msgstr "" -#: Top/argdecode.c:198 +#: Top/argdecode.c:199 msgid "--sched=N\t\tSet priority to N and lock memory" msgstr "" -#: Top/argdecode.c:199 +#: Top/argdecode.c:200 msgid "--opcode-lib=NAMES\tDynamic libraries to load" msgstr "" -#: Top/argdecode.c:200 +#: Top/argdecode.c:201 msgid "--opcode-omit=NAMES\tDynamic libraries not to load" msgstr "" -#: Top/argdecode.c:201 +#: Top/argdecode.c:202 msgid "--omacro:XXX=YYY\tSet orchestra macro XXX to value YYY" msgstr "" -#: Top/argdecode.c:202 +#: Top/argdecode.c:203 msgid "--smacro:XXX=YYY\tSet score macro XXX to value YYY" msgstr "" -#: Top/argdecode.c:203 +#: Top/argdecode.c:204 msgid "--midi-key=N\t\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:204 +#: Top/argdecode.c:205 msgid "\t\t\tkey number to pfield N as MIDI value [0-127]" msgstr "" -#: Top/argdecode.c:205 +#: Top/argdecode.c:206 msgid "--midi-key-cps=N\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:206 +#: Top/argdecode.c:207 msgid "\t\t\tkey number to pfield N as cycles per second" msgstr "" -#: Top/argdecode.c:207 +#: Top/argdecode.c:208 msgid "--midi-key-oct=N\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:208 +#: Top/argdecode.c:209 msgid "\t\t\tkey number to pfield N as linear octave" msgstr "" -#: Top/argdecode.c:209 +#: Top/argdecode.c:210 msgid "--midi-key-pch=N\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:210 +#: Top/argdecode.c:211 msgid "\t\t\tkey number to pfield N as oct.pch" msgstr "" -#: Top/argdecode.c:211 +#: Top/argdecode.c:212 msgid "--midi-velocity=N\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:212 +#: Top/argdecode.c:213 msgid "\t\t\tvelocity number to pfield N as MIDI value [0-127]" msgstr "" -#: Top/argdecode.c:213 +#: Top/argdecode.c:214 msgid "--midi-velocity-amp=N\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:214 +#: Top/argdecode.c:215 msgid "\t\t\tvelocity number to pfield N as amplitude" msgstr "" -#: Top/argdecode.c:215 +#: Top/argdecode.c:216 msgid "--no-default-paths\tTurn off relative paths from CSD/ORC/SCO" msgstr "" -#: Top/argdecode.c:216 +#: Top/argdecode.c:217 msgid "--sample-accurate\t\tUse sample-accurate timing of score events" msgstr "" -#: Top/argdecode.c:217 +#: Top/argdecode.c:218 msgid "--realtime\t\trealtime priority mode" msgstr "" -#: Top/argdecode.c:218 +#: Top/argdecode.c:219 #, fuzzy msgid "--nchnls=N\t\t override number of audio channels" msgstr "numero di canali non valido" -#: Top/argdecode.c:219 +#: Top/argdecode.c:220 msgid "--nchnls_i=N\t\t override number of input audio channels" msgstr "" -#: Top/argdecode.c:220 +#: Top/argdecode.c:221 msgid "--0dbfs=N\t\t override 0dbfs (max positive signal amplitude)" msgstr "" -#: Top/argdecode.c:221 +#: Top/argdecode.c:222 msgid "--sinesize\t\tlength of internal sine table" msgstr "" #: Top/argdecode.c:223 +msgid "" +"--daemon\t\t daemon mode: do not exit if CSD/orchestra is not given, is " +"empty or does not compile" +msgstr "" + +#: Top/argdecode.c:225 +msgid "" +"--port=N\t\t listen to UDP port N for instruments/orchestra code (implies --" +"daemon)" +msgstr "" + +#: Top/argdecode.c:228 msgid "--help\t\t\tLong help" msgstr "" -#: Top/argdecode.c:239 +#: Top/argdecode.c:244 #, c-format msgid "flag defaults: csound -s -otest -b%d -B%d -m%d\n" msgstr "" -#: Top/argdecode.c:246 Top/argdecode.c:262 +#: Top/argdecode.c:251 Top/argdecode.c:267 msgid "Usage:\tcsound [-flags] orchfile scorefile\n" msgstr "" -#: Top/argdecode.c:247 Top/argdecode.c:263 util/envext.c:53 util/xtrct.c:67 +#: Top/argdecode.c:252 Top/argdecode.c:268 util/envext.c:53 util/xtrct.c:67 msgid "Legal flags are:\n" msgstr "" -#: Top/argdecode.c:248 +#: Top/argdecode.c:253 msgid "" "Long format:\n" "\n" msgstr "" -#: Top/argdecode.c:253 +#: Top/argdecode.c:258 msgid "" "\n" "Short form:\n" msgstr "" -#: Top/argdecode.c:266 +#: Top/argdecode.c:271 msgid "Csound Command ERROR:\t" msgstr "" -#: Top/argdecode.c:401 +#: Top/argdecode.c:406 #, c-format msgid "unknown output format: '%s'" msgstr "" -#: Top/argdecode.c:419 Top/argdecode.c:1008 +#: Top/argdecode.c:424 Top/argdecode.c:1024 msgid "no iobufsamps" msgstr "" -#: Top/argdecode.c:426 Top/argdecode.c:1015 +#: Top/argdecode.c:431 Top/argdecode.c:1031 msgid "no hardware bufsamps" msgstr "" -#: Top/argdecode.c:452 Top/argdecode.c:1115 +#: Top/argdecode.c:457 Top/argdecode.c:1132 msgid "no midifile name" msgstr "" -#: Top/argdecode.c:457 Top/argdecode.c:1121 +#: Top/argdecode.c:461 Top/argdecode.c:1137 msgid "-F: stdin not supported on this platform" msgstr "" -#: Top/argdecode.c:467 +#: Top/argdecode.c:473 msgid "no midi output file name" msgstr "" -#: Top/argdecode.c:496 +#: Top/argdecode.c:502 msgid "invalid python variable definition syntax" msgstr "" -#: Top/argdecode.c:502 Top/argdecode.c:976 +#: Top/argdecode.c:508 Top/argdecode.c:992 msgid "no infilename" msgstr "" -#: Top/argdecode.c:505 Top/argdecode.c:980 +#: Top/argdecode.c:511 Top/argdecode.c:996 msgid "input cannot be stdout" msgstr "" -#: Top/argdecode.c:509 Top/argdecode.c:984 +#: Top/argdecode.c:515 Top/argdecode.c:1000 msgid "stdin audio not supported" msgstr "" -#: Top/argdecode.c:544 Top/argdecode.c:1048 +#: Top/argdecode.c:550 Top/argdecode.c:1064 msgid "no control rate" msgstr "" -#: Top/argdecode.c:558 Top/argdecode.c:1090 +#: Top/argdecode.c:564 Top/argdecode.c:1106 msgid "no Linein score device_name" msgstr "" -#: Top/argdecode.c:574 Top/argdecode.c:580 Top/argdecode.c:1056 +#: Top/argdecode.c:580 Top/argdecode.c:586 Top/argdecode.c:1072 msgid "no message level" msgstr "" -#: Top/argdecode.c:587 +#: Top/argdecode.c:593 msgid "no message amps" msgstr "" -#: Top/argdecode.c:596 +#: Top/argdecode.c:602 msgid "no message range" msgstr "" -#: Top/argdecode.c:605 +#: Top/argdecode.c:611 msgid "no message warnings" msgstr "" -#: Top/argdecode.c:614 +#: Top/argdecode.c:620 msgid "no message raw" msgstr "" -#: Top/argdecode.c:623 +#: Top/argdecode.c:629 msgid "no message dB" msgstr "" -#: Top/argdecode.c:632 +#: Top/argdecode.c:638 msgid "no message colours" msgstr "" -#: Top/argdecode.c:641 +#: Top/argdecode.c:647 msgid "no benchmark level" msgstr "" -#: Top/argdecode.c:649 +#: Top/argdecode.c:655 msgid "no value for --csd-line-nums" msgstr "" -#: Top/argdecode.c:658 Top/argdecode.c:1101 +#: Top/argdecode.c:664 Top/argdecode.c:1117 msgid "no midi device_name" msgstr "" -#: Top/argdecode.c:663 Top/argdecode.c:1107 +#: Top/argdecode.c:669 Top/argdecode.c:1122 msgid "-M: stdin not supported on this platform" msgstr "" -#: Top/argdecode.c:683 Top/argdecode.c:992 util/envext.c:84 util/mixer.c:206 +#: Top/argdecode.c:689 Top/argdecode.c:1008 util/envext.c:84 util/mixer.c:206 #: util/scale.c:173 util/srconv.c:247 util/xtrct.c:120 msgid "no outfilename" msgstr "" -#: Top/argdecode.c:686 Top/argdecode.c:996 util/scale.c:177 util/srconv.c:251 +#: Top/argdecode.c:692 Top/argdecode.c:1012 util/scale.c:177 util/srconv.c:251 #: util/xtrct.c:124 msgid "-o cannot be stdin" msgstr "" -#: Top/argdecode.c:690 Top/argdecode.c:1000 util/scale.c:180 util/srconv.c:256 +#: Top/argdecode.c:696 Top/argdecode.c:1016 util/scale.c:180 util/srconv.c:256 msgid "stdout audio not supported" msgstr "" -#: Top/argdecode.c:700 Top/argdecode.c:1198 util/hetro.c:232 +#: Top/argdecode.c:706 Top/argdecode.c:1216 util/hetro.c:232 msgid "no log file" msgstr "" -#: Top/argdecode.c:755 Top/argdecode.c:955 +#: Top/argdecode.c:761 Top/argdecode.c:971 msgid "no utility name" msgstr "" -#: Top/argdecode.c:774 Top/argdecode.c:1070 +#: Top/argdecode.c:780 Top/argdecode.c:1086 msgid "no xfilename" msgstr "" -#: Top/argdecode.c:920 +#: Top/argdecode.c:936 #, c-format msgid "unknown long option: '--%s'" msgstr "" -#: Top/argdecode.c:1043 +#: Top/argdecode.c:1059 msgid "no sample rate" msgstr "" -#: Top/argdecode.c:1075 +#: Top/argdecode.c:1091 msgid "no tempo value" msgstr "" -#: Top/argdecode.c:1080 +#: Top/argdecode.c:1096 msgid "illegal tempo" msgstr "" -#: Top/argdecode.c:1129 +#: Top/argdecode.c:1147 msgid "no MIDI output device" msgstr "" -#: Top/argdecode.c:1181 +#: Top/argdecode.c:1199 msgid "No indirection file" msgstr "" -#: Top/argdecode.c:1188 +#: Top/argdecode.c:1206 #, c-format msgid "Cannot open indirection file %s\n" msgstr "" -#: Top/argdecode.c:1217 +#: Top/argdecode.c:1235 #, fuzzy msgid "no number of threads" msgstr "numero di argomenti sbagliato" -#: Top/argdecode.c:1228 util/envext.c:94 util/mixer.c:316 util/scale.c:241 +#: Top/argdecode.c:1246 util/envext.c:94 util/mixer.c:316 util/scale.c:241 #: util/xtrct.c:239 #, c-format msgid "unknown flag -%c" msgstr "" -#: Top/argdecode.c:1235 +#: Top/argdecode.c:1253 msgid "error: orchestra and score name not allowed in .csound6rc" msgstr "" -#: Top/argdecode.c:1381 +#: Top/argdecode.c:1401 msgid "stdout not supported on this platform" msgstr "" -#: Top/argdecode.c:1421 Top/argdecode.c:1441 Top/argdecode.c:1461 +#: Top/argdecode.c:1441 Top/argdecode.c:1461 Top/argdecode.c:1481 msgid "stdin not supported on this platform" msgstr "" @@ -10241,76 +10286,76 @@ msgid "cscoreFileGetCurrent: no fp current" msgstr "" -#: Top/csmodule.c:195 +#: Top/csmodule.c:199 #, c-format msgid "not loading '%s' (uses incompatible floating point type)" msgstr "" -#: Top/csmodule.c:204 +#: Top/csmodule.c:208 #, c-format msgid "" "not loading '%s' (incompatible with this version of Csound (%d.%d/%d.%d)" msgstr "" -#: Top/csmodule.c:247 +#: Top/csmodule.c:251 #, c-format msgid "could not open library '%s' (%s)" msgstr "" -#: Top/csmodule.c:250 +#: Top/csmodule.c:254 #, c-format msgid "could not open library '%s' (%d)" msgstr "" -#: Top/csmodule.c:311 +#: Top/csmodule.c:315 #, c-format msgid "'%s' is not a Csound plugin library" msgstr "" -#: Top/csmodule.c:322 +#: Top/csmodule.c:326 msgid "csoundLoadExternal(): memory allocation failure" msgstr "" -#: Top/csmodule.c:336 Top/csmodule.c:344 +#: Top/csmodule.c:340 Top/csmodule.c:348 #, c-format msgid "Error in pre-initialisation function of module '%s'" msgstr "" -#: Top/csmodule.c:417 +#: Top/csmodule.c:426 #, c-format msgid "Error opening plugin directory '%s': %s" msgstr "" -#: Top/csmodule.c:420 +#: Top/csmodule.c:429 #, fuzzy, c-format msgid "Error opening plugin directory: %s" msgstr "errore in apertura del dispositivo di input %d: %s" -#: Top/csmodule.c:455 +#: Top/csmodule.c:464 #, c-format msgid "path name too long, skipping '%s'" msgstr "" -#: Top/csmodule.c:461 +#: Top/csmodule.c:470 #, c-format msgid "Library %s omitted\n" msgstr "" -#: Top/csmodule.c:494 +#: Top/csmodule.c:503 msgid "Loading command-line libraries:\n" msgstr "" -#: Top/csmodule.c:517 +#: Top/csmodule.c:526 #, c-format msgid " *** error loading '%s'" msgstr "" -#: Top/csmodule.c:540 +#: Top/csmodule.c:549 #, c-format msgid "Error starting module '%s'" msgstr "" -#: Top/csmodule.c:639 +#: Top/csmodule.c:648 #, c-format msgid "Error de-initialising module '%s'" msgstr "" @@ -10319,277 +10364,291 @@ msgid "Error allocating opcode list" msgstr "" -#: Top/csound.c:1409 +#: Top/csound.c:1410 #, c-format msgid "Multithread performance: insno: %3d thread %d of %d starting.\n" msgstr "" -#: Top/csound.c:1415 +#: Top/csound.c:1416 msgid "Bad ThreadId" msgstr "" -#: Top/csound.c:1603 Top/csound.c:1635 Top/csound.c:1663 Top/csound.c:1699 -#: Top/csound.c:3879 +#: Top/csound.c:1604 Top/csound.c:1636 Top/csound.c:1664 Top/csound.c:1700 +#: Top/csound.c:3884 msgid "Csound not ready for performance: csoundStart() has not been called \n" msgstr "" -#: Top/csound.c:1619 Top/csound.c:1648 +#: Top/csound.c:1620 Top/csound.c:1649 msgid "Score finished in csoundPerformKsmps().\n" msgstr "" -#: Top/csound.c:1642 Top/csound.c:3886 +#: Top/csound.c:1643 Top/csound.c:3891 msgid "Early return from csoundPerformKsmps().\n" msgstr "" -#: Top/csound.c:1670 +#: Top/csound.c:1671 msgid "Early return from csoundPerformBuffer().\n" msgstr "" -#: Top/csound.c:1708 +#: Top/csound.c:1709 msgid "Early return from csoundPerform().\n" msgstr "" -#: Top/csound.c:1716 +#: Top/csound.c:1717 msgid "Score finished in csoundPerform().\n" msgstr "" -#: Top/csound.c:1727 +#: Top/csound.c:1728 msgid "csoundPerform(): stopped.\n" msgstr "" -#: Top/csound.c:2010 +#: Top/csound.c:2012 msgid "WARNING: " msgstr "ATTENZIONE: " -#: Top/csound.c:2150 +#: Top/csound.c:2154 msgid "rtdummy: failed to allocate globals" msgstr "" -#: Top/csound.c:2151 +#: Top/csound.c:2155 msgid "rtaudio: dummy module enabled\n" msgstr "" -#: Top/csound.c:2180 Top/csound.c:2217 +#: Top/csound.c:2184 Top/csound.c:2221 msgid " *** error: rtaudio module set to empty string" msgstr "" -#: Top/csound.c:2184 Top/csound.c:2221 +#: Top/csound.c:2188 Top/csound.c:2225 #, c-format msgid " unknown rtaudio module: '%s', using dummy module" msgstr "" -#: Top/csound.c:2338 +#: Top/csound.c:2342 msgid "WARNING: real time midi input disabled, using dummy functions\n" msgstr "" -#: Top/csound.c:2343 Top/csound.c:2377 +#: Top/csound.c:2347 Top/csound.c:2381 msgid "error: -+rtmidi set to empty string" msgstr "" -#: Top/csound.c:2346 Top/csound.c:2380 +#: Top/csound.c:2350 Top/csound.c:2384 #, c-format msgid "error: -+rtmidi='%s': unknown module" msgstr "" -#: Top/csound.c:2372 +#: Top/csound.c:2376 msgid "WARNING: real time midi output disabled, using dummy functions\n" msgstr "" -#: Top/csound.c:2394 +#: Top/csound.c:2398 msgid "Unknown MIDI error" msgstr "" -#: Top/csound.c:2555 +#: Top/csound.c:2559 msgid "Failed to allocate new opcode entry." msgstr "" -#: Top/csound.c:2577 +#: Top/csound.c:2581 #, c-format msgid "Failed to allocate opcode entry for %s." msgstr "" -#: Top/csound.c:2717 Top/main.c:390 +#: Top/csound.c:2721 Top/main.c:358 #, fuzzy msgid "setting dummy interface\n" msgstr "uso dell'interfaccia callback\n" -#: Top/csound.c:2793 +#: Top/csound.c:2798 msgid "Failed during csoundInitEnv" msgstr "" -#: Top/csound.c:2815 +#: Top/csound.c:2820 msgid "Failed during csoundInitStaticModules" msgstr "" -#: Top/csound.c:2831 +#: Top/csound.c:2836 msgid "Failed during csoundLoadModules" msgstr "" -#: Top/csound.c:2888 +#: Top/csound.c:2893 #, fuzzy msgid "Real time audio module name" msgstr "PortAudio modulo audio in tempo reale per Csound\n" -#: Top/csound.c:2913 +#: Top/csound.c:2918 #, fuzzy msgid "Real time MIDI module name" msgstr "rtmidi: PortMIDI modulo abilitato\n" -#: Top/csound.c:2918 +#: Top/csound.c:2923 msgid "Ignore events (other than tempo changes) in tracks defined by pattern" msgstr "" -#: Top/csound.c:2924 +#: Top/csound.c:2929 msgid "Do not handle special MIDI controllers (sustain pedal etc.)" msgstr "" -#: Top/csound.c:2932 +#: Top/csound.c:2937 msgid "Title tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2938 +#: Top/csound.c:2943 msgid "Copyright tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2944 +#: Top/csound.c:2949 msgid "Software tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2949 +#: Top/csound.c:2954 msgid "Artist tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2956 +#: Top/csound.c:2961 msgid "Comment tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2961 +#: Top/csound.c:2966 msgid "Date tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2971 +#: Top/csound.c:2976 msgid "Enable message attributes (colors etc.)" msgstr "" -#: Top/csound.c:2977 +#: Top/csound.c:2982 msgid "Start score playback at the specified time, skipping earlier events" msgstr "" -#: Top/csound.c:2984 +#: Top/csound.c:2989 msgid "Ignore in CSD files (default: no)" msgstr "" -#: Top/csound.c:3194 +#: Top/csound.c:3199 msgid "Cannot open /proc/cpuinfo. Support for RDTSC is not available.\n" msgstr "" -#: Top/csound.c:3224 +#: Top/csound.c:3229 msgid "No valid CPU frequency entry was found in /proc/cpuinfo.\n" msgstr "" -#: Top/csound.c:3778 +#: Top/csound.c:3783 msgid "csoundDestroyMessageBuffer: Message buffer not allocated." msgstr "" -#: Top/csound.c:3809 +#: Top/csound.c:3814 msgid "csound: internal error: message buffer overflow\n" msgstr "" -#: Top/main.c:64 +#: Top/main.c:65 #, fuzzy, c-format msgid "WARNING: cannot open csound6rc file %s\n" msgstr "Impossibile aprire il file #include %s" -#: Top/main.c:67 +#: Top/main.c:68 #, c-format msgid "Reading options from $CSOUND6RC: %s \n" msgstr "" -#: Top/main.c:76 +#: Top/main.c:77 msgid "Reading options from $HOME/.csound6rc\n" msgstr "" -#: Top/main.c:91 +#: Top/main.c:92 msgid "Reading options from local directory .csound6rc \n" msgstr "" -#: Top/main.c:112 +#: Top/main.c:113 msgid "" "Csound is already started, call csoundReset()\n" "before starting again \n" msgstr "" -#: Top/main.c:186 +#: Top/main.c:141 msgid "no orchestra name" msgstr "" -#: Top/main.c:210 +#: Top/main.c:166 msgid "Reading CSD failed ... stopping" msgstr "" -#: Top/main.c:224 +#: Top/main.c:180 msgid "error: multiple uses of stdin" msgstr "" -#: Top/main.c:228 +#: Top/main.c:184 msgid "error: multiple uses of stdout" msgstr "" -#: Top/main.c:237 +#: Top/main.c:193 msgid "realtime performance using dummy numeric scorefile\n" msgstr "" -#: Top/main.c:260 +#: Top/main.c:216 #, c-format msgid "orchname: %s\n" msgstr "" -#: Top/main.c:278 +#: Top/main.c:220 +#, fuzzy, c-format +msgid "Failed to open input file - %s\n" +msgstr "Non è possibile aprire il file di input %s" + +#: Top/main.c:235 #, fuzzy msgid "cannot compile orchestra \n" msgstr "impossibile aprire l'orchestra file %s" -#: Top/main.c:291 +#: Top/main.c:240 +#, fuzzy +msgid "cannot compile orchestra." +msgstr "impossibile aprire l'orchestra file %s" + +#: Top/main.c:241 +msgid "Csound will start with no instruments" +msgstr "" + +#: Top/main.c:259 msgid "end of orchestra compile" msgstr "" -#: Top/main.c:299 +#: Top/main.c:267 #, c-format msgid "using previous %s\n" msgstr "" -#: Top/main.c:309 +#: Top/main.c:277 #, c-format msgid "cannot open scorefile %s" msgstr "" -#: Top/main.c:311 +#: Top/main.c:279 msgid "sorting score ...\n" msgstr "" -#: Top/main.c:321 +#: Top/main.c:289 #, c-format msgid "cannot open extract file %s" msgstr "" -#: Top/main.c:324 +#: Top/main.c:292 msgid " ... extracting ...\n" msgstr "" -#: Top/main.c:333 +#: Top/main.c:301 msgid "end of score sort" msgstr "" -#: Top/main.c:335 +#: Top/main.c:303 msgid "Syntax check completed.\n" msgstr "" -#: Top/main.c:456 util/dnoise.c:266 +#: Top/main.c:424 util/dnoise.c:266 #, c-format msgid "%s not a recognised SFOUTYP env setting" msgstr "" -#: Top/main.c:475 +#: Top/main.c:443 msgid "srate and krate overrides must occur jointly" msgstr "" @@ -10659,158 +10718,158 @@ msgid " *** Type 'csound --help' for the list of available options." msgstr "" -#: Top/one_file.c:105 Top/one_file.c:115 +#: Top/one_file.c:96 Top/one_file.c:106 msgid " *** cannot create temporary file" msgstr "" -#: Top/one_file.c:199 +#: Top/one_file.c:182 #, c-format msgid "Removing temporary file %s ...\n" msgstr "" -#: Top/one_file.c:203 +#: Top/one_file.c:186 #, c-format msgid "WARNING: could not remove %s\n" msgstr "" -#: Top/one_file.c:270 Top/one_file.c:304 +#: Top/one_file.c:253 Top/one_file.c:287 #, c-format msgid "More than %d arguments in " msgstr "" -#: Top/one_file.c:342 +#: Top/one_file.c:325 #, c-format msgid "Invalid arguments in : %s" msgstr "" -#: Top/one_file.c:345 +#: Top/one_file.c:328 #, c-format msgid "Invalid arguments in .csoundrc or -@ file: %s" msgstr "" -#: Top/one_file.c:351 Top/one_file.c:784 +#: Top/one_file.c:334 Top/one_file.c:767 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:380 +#: Top/one_file.c:361 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:400 Top/one_file.c:467 +#: Top/one_file.c:381 Top/one_file.c:449 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:415 Top/one_file.c:420 +#: Top/one_file.c:396 Top/one_file.c:401 msgid "Missing program in tag " msgstr "" -#: Top/one_file.c:432 +#: Top/one_file.c:414 #, c-format msgid "Creating %s (%p)\n" msgstr "" -#: Top/one_file.c:445 +#: Top/one_file.c:427 msgid "External generation failed" msgstr "" -#: Top/one_file.c:505 +#: Top/one_file.c:487 #, c-format msgid "Non base64 character %c(%2x)" msgstr "" -#: Top/one_file.c:524 +#: Top/one_file.c:506 msgid "Truncated byte at end of base64 stream" msgstr "" -#: Top/one_file.c:540 +#: Top/one_file.c:523 #, c-format msgid "Cannot open temporary file (%s) for MIDI subfile" msgstr "" -#: Top/one_file.c:557 +#: Top/one_file.c:540 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:573 Top/one_file.c:622 +#: Top/one_file.c:556 Top/one_file.c:605 #, c-format msgid "File %s already exists" msgstr "" -#: Top/one_file.c:578 +#: Top/one_file.c:561 #, c-format msgid "Cannot open sample file (%s) subfile" msgstr "" -#: Top/one_file.c:592 +#: Top/one_file.c:575 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:627 +#: Top/one_file.c:610 #, c-format msgid "Cannot open file (%s) subfile" msgstr "" -#: Top/one_file.c:642 +#: Top/one_file.c:625 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:662 +#: Top/one_file.c:645 #, c-format msgid "This CSD file requires a version of Csound before %d.%02d" msgstr "" -#: Top/one_file.c:670 Top/one_file.c:677 +#: Top/one_file.c:653 Top/one_file.c:660 #, c-format msgid "This CSD file requires a version of Csound after %d.%02d" msgstr "" -#: Top/one_file.c:683 +#: Top/one_file.c:666 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:693 +#: Top/one_file.c:676 msgid "**** Licence Information ****\n" msgstr "" -#: Top/one_file.c:699 +#: Top/one_file.c:682 msgid "**** End of Licence Information ****\n" msgstr "" -#: Top/one_file.c:710 +#: Top/one_file.c:693 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:741 +#: Top/one_file.c:724 #, c-format msgid "Failed to open csd file: %s" msgstr "" -#: Top/one_file.c:756 +#: Top/one_file.c:739 msgid "STARTING FILE\n" msgstr "" -#: Top/one_file.c:774 +#: Top/one_file.c:757 msgid "Creating options\n" msgstr "" -#: Top/one_file.c:780 +#: Top/one_file.c:763 msgid "Skipping \n" msgstr "" -#: Top/one_file.c:794 +#: Top/one_file.c:777 msgid "Creating orchestra\n" msgstr "" -#: Top/one_file.c:799 +#: Top/one_file.c:782 msgid "Creating score\n" msgstr "" -#: Top/one_file.c:833 +#: Top/one_file.c:812 #, c-format msgid "unknown CSD tag: %s\n" msgstr "" -#: Top/one_file.c:838 +#: Top/one_file.c:817 msgid "Could not find tag in CSD file.\n" msgstr "" diff -Nru csound-6.01~dfsg/po/romanian.po csound-6.02~dfsg/po/romanian.po --- csound-6.01~dfsg/po/romanian.po 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/po/romanian.po 2014-01-07 16:54:21.000000000 +0000 @@ -192,157 +192,157 @@ msgid "Not a proper list of ints" msgstr "" -#: Engine/csound_orc_compile.c:276 +#: Engine/csound_orc_compile.c:274 msgid "missing or extra arg" msgstr "" -#: Engine/csound_orc_compile.c:281 +#: Engine/csound_orc_compile.c:279 msgid "too many input args\n" msgstr "" -#: Engine/csound_orc_compile.c:464 +#: Engine/csound_orc_compile.c:462 #, c-format msgid "create_opcode: No rule to handle statement of type %d\n" msgstr "" -#: Engine/csound_orc_compile.c:633 Engine/csound_orc_compile.c:691 +#: Engine/csound_orc_compile.c:631 Engine/csound_orc_compile.c:690 #, c-format msgid "%s invalid sample rate" msgstr "" -#: Engine/csound_orc_compile.c:635 Engine/csound_orc_compile.c:693 +#: Engine/csound_orc_compile.c:633 Engine/csound_orc_compile.c:692 #, c-format msgid "%s invalid control rate" msgstr "" -#: Engine/csound_orc_compile.c:639 Engine/csound_orc_compile.c:689 +#: Engine/csound_orc_compile.c:637 Engine/csound_orc_compile.c:688 #, c-format msgid "%s invalid ksmps value" msgstr "" -#: Engine/csound_orc_compile.c:641 Engine/csound_orc_compile.c:695 +#: Engine/csound_orc_compile.c:639 Engine/csound_orc_compile.c:694 #, c-format msgid "%s inconsistent sr, kr, ksmps" msgstr "" -#: Engine/csound_orc_compile.c:643 +#: Engine/csound_orc_compile.c:641 #, c-format msgid "%s inconsistent sr, kr, ksmps \n" msgstr "" -#: Engine/csound_orc_compile.c:659 +#: Engine/csound_orc_compile.c:657 msgid "bad value for 0dbfs: must be positive. Setting default value." msgstr "" -#: Engine/csound_orc_compile.c:680 +#: Engine/csound_orc_compile.c:679 #, c-format msgid "sample rate overrides: esr = %7.4f, ekr = %7.4f, ksmps = %d\n" msgstr "" -#: Engine/csound_orc_compile.c:686 +#: Engine/csound_orc_compile.c:685 #, c-format msgid "" "sr = %.7g, kr = %.7g, ksmps = %.7g\n" "error:" msgstr "" -#: Engine/csound_orc_compile.c:832 +#: Engine/csound_orc_compile.c:842 #, c-format msgid "create_instrument: instr num %ld\n" msgstr "" -#: Engine/csound_orc_compile.c:921 +#: Engine/csound_orc_compile.c:934 msgid "-- deleted instr from deadpool \n" msgstr "" -#: Engine/csound_orc_compile.c:949 +#: Engine/csound_orc_compile.c:962 #, c-format msgid " -- free instr def %p \n" msgstr "" -#: Engine/csound_orc_compile.c:962 Engine/csound_orc_compile.c:973 +#: Engine/csound_orc_compile.c:975 Engine/csound_orc_compile.c:986 #, c-format msgid " -- added to deadpool slot %d \n" msgstr "" -#: Engine/csound_orc_compile.c:998 Engine/csound_orc_compile.c:1144 +#: Engine/csound_orc_compile.c:1011 Engine/csound_orc_compile.c:1158 #, c-format msgid "instr %ld redefined, replacing previous definition" msgstr "" -#: Engine/csound_orc_compile.c:1096 +#: Engine/csound_orc_compile.c:1109 #, c-format msgid "instr %s uses instrument number %d\n" msgstr "" -#: Engine/csound_orc_compile.c:1168 +#: Engine/csound_orc_compile.c:1183 #, c-format msgid "no active instances of instr %d \n" msgstr "" -#: Engine/csound_orc_compile.c:1213 +#: Engine/csound_orc_compile.c:1228 msgid "!!! csound->opcodeInfo is NULL !!!\n" msgstr "" -#: Engine/csound_orc_compile.c:1249 +#: Engine/csound_orc_compile.c:1264 #, c-format msgid " merging constants %d) %f\n" msgstr "" -#: Engine/csound_orc_compile.c:1258 +#: Engine/csound_orc_compile.c:1273 #, c-format msgid " merging %d) %s:%s\n" msgstr "" -#: Engine/csound_orc_compile.c:1281 +#: Engine/csound_orc_compile.c:1299 #, c-format msgid "merging instr %d \n" msgstr "" -#: Engine/csound_orc_compile.c:1289 +#: Engine/csound_orc_compile.c:1307 #, c-format msgid "merging instr %s \n" msgstr "" -#: Engine/csound_orc_compile.c:1452 Engine/csound_orc_compile.c:1480 -#: Engine/csound_orc_compile.c:1503 +#: Engine/csound_orc_compile.c:1471 Engine/csound_orc_compile.c:1499 +#: Engine/csound_orc_compile.c:1522 msgid "invalid name for instrument" msgstr "" -#: Engine/csound_orc_compile.c:1485 Engine/csound_orc_compile.c:1508 +#: Engine/csound_orc_compile.c:1504 Engine/csound_orc_compile.c:1527 #, c-format msgid "instr %s redefined" msgstr "" -#: Engine/csound_orc_compile.c:1530 +#: Engine/csound_orc_compile.c:1549 #, c-format msgid "ERROR: Could not find OPCODINFO for opname: %s\n" msgstr "" -#: Engine/csound_orc_compile.c:1551 +#: Engine/csound_orc_compile.c:1570 #, c-format msgid "Unknown TREE node of type %d found in root.\n" msgstr "" -#: Engine/csound_orc_compile.c:1560 +#: Engine/csound_orc_compile.c:1579 #, c-format msgid "%d syntax errors in orchestra. compilation invalid\n" msgstr "" -#: Engine/csound_orc_compile.c:1600 +#: Engine/csound_orc_compile.c:1620 msgid "perf-pass statements illegal in header blk\n" msgstr "" -#: Engine/csound_orc_compile.c:1772 +#: Engine/csound_orc_compile.c:1792 msgid "i[fixme] pset args != pmax" msgstr "" -#: Engine/csound_orc_compile.c:1894 +#: Engine/csound_orc_compile.c:1922 #, c-format msgid "Missing local arg: %s\n" msgstr "" -#: Engine/csound_orc_compile.c:2025 +#: Engine/csound_orc_compile.c:2054 #, c-format msgid "Opcode \"%s\" is deprecated\n" msgstr "" @@ -419,46 +419,46 @@ msgid "Variable type for %s could not be determined.\n" msgstr "" -#: Engine/csound_orc_semantics.c:1300 +#: Engine/csound_orc_semantics.c:1301 #, c-format msgid "Unable to find opcode with name: %s\n" msgstr "" -#: Engine/csound_orc_semantics.c:1315 +#: Engine/csound_orc_semantics.c:1316 #, c-format msgid "Unable to find opcode entry for '%s' with matching argument types:\n" msgstr "" -#: Engine/csound_orc_semantics.c:1318 +#: Engine/csound_orc_semantics.c:1319 #, c-format msgid "Found: %s %s %s\n" msgstr "" -#: Engine/csound_orc_semantics.c:1320 +#: Engine/csound_orc_semantics.c:1321 #, c-format msgid "Line: %d Loc: %d\n" msgstr "" -#: Engine/csound_orc_semantics.c:1454 +#: Engine/csound_orc_semantics.c:1455 #, c-format msgid "expression for until statement not a boolean expression, line %d\n" msgstr "" -#: Engine/csound_orc_semantics.c:1607 +#: Engine/csound_orc_semantics.c:1608 #, c-format msgid "" "\n" "error: %s (token \"%s\")" msgstr "" -#: Engine/csound_orc_semantics.c:1609 +#: Engine/csound_orc_semantics.c:1610 #, c-format msgid "" " line %d:\n" ">>>" msgstr "" -#: Engine/csound_orc_semantics.c:2141 +#: Engine/csound_orc_semantics.c:2142 #, c-format msgid "insufficient required arguments for opcode %s on line %d:%d\n" msgstr "" @@ -473,239 +473,239 @@ msgid "Creating search path cache for '%s':" msgstr "" -#: Engine/envvar.c:729 +#: Engine/envvar.c:731 msgid "Current directory path name too long\n" msgstr "" -#: Engine/envvar.c:1003 +#: Engine/envvar.c:1005 #, c-format msgid "internal error: csoundFileOpen(): invalid type: %d" msgstr "" -#: Engine/envvar.c:1193 +#: Engine/envvar.c:1195 #, c-format msgid "internal error: csoundCreateFileHandle(): invalid type: %d" msgstr "" -#: Engine/fgens.c:91 +#: Engine/fgens.c:99 msgid "unknown GEN number" msgstr "" -#: Engine/fgens.c:133 +#: Engine/fgens.c:141 msgid "ftable does not exist" msgstr "" -#: Engine/fgens.c:138 +#: Engine/fgens.c:146 #, c-format msgid "ftable %d now deleted\n" msgstr "" -#: Engine/fgens.c:153 Engine/fgens.c:1612 Engine/fgens.c:1698 -#: Engine/fgens.c:1777 Engine/fgens.c:1893 Engine/fgens.c:1974 -#: Engine/fgens.c:3023 +#: Engine/fgens.c:161 Engine/fgens.c:1630 Engine/fgens.c:1716 +#: Engine/fgens.c:1795 Engine/fgens.c:1911 Engine/fgens.c:1992 +#: Engine/fgens.c:3043 msgid "insufficient gen arguments" msgstr "" -#: Engine/fgens.c:179 Opcodes/ftgen.c:117 +#: Engine/fgens.c:187 Opcodes/ftgen.c:117 #, c-format msgid "Named gen \"%s\" not defined" msgstr "" -#: Engine/fgens.c:187 +#: Engine/fgens.c:195 msgid "illegal gen number" msgstr "" -#: Engine/fgens.c:195 +#: Engine/fgens.c:203 msgid "deferred size for GENs 1, 23, 28 or 49 only" msgstr "" -#: Engine/fgens.c:198 Engine/fgens.c:250 +#: Engine/fgens.c:206 Engine/fgens.c:258 #, c-format msgid "ftable %d:\n" msgstr "" -#: Engine/fgens.c:223 Engine/fgens.c:2301 Engine/fgens.c:2880 +#: Engine/fgens.c:231 Engine/fgens.c:2320 Engine/fgens.c:2899 msgid "illegal table length" msgstr "" -#: Engine/fgens.c:293 Engine/fgens.c:2262 +#: Engine/fgens.c:304 Engine/fgens.c:2281 #, c-format msgid "" "ftable %d relocating due to size change\n" " currently active instruments may find this disturbing" msgstr "" -#: Engine/fgens.c:351 Engine/fgens.c:472 Engine/fgens.c:556 Engine/fgens.c:637 -#: Engine/fgens.c:712 Engine/fgens.c:761 Engine/fgens.c:882 Engine/fgens.c:959 -#: Engine/fgens.c:1060 Engine/fgens.c:1104 Engine/fgens.c:1151 -#: Engine/fgens.c:1405 Engine/fgens.c:1467 Engine/fgens.c:1696 -#: Engine/fgens.c:1774 Engine/fgens.c:2129 Engine/fgens.c:2977 -#: Engine/fgens.c:3020 +#: Engine/fgens.c:362 Engine/fgens.c:483 Engine/fgens.c:567 Engine/fgens.c:648 +#: Engine/fgens.c:723 Engine/fgens.c:772 Engine/fgens.c:893 Engine/fgens.c:970 +#: Engine/fgens.c:1071 Engine/fgens.c:1115 Engine/fgens.c:1165 +#: Engine/fgens.c:1423 Engine/fgens.c:1485 Engine/fgens.c:1714 +#: Engine/fgens.c:1792 Engine/fgens.c:2147 Engine/fgens.c:2997 +#: Engine/fgens.c:3040 msgid "using extended arguments\n" msgstr "" -#: Engine/fgens.c:375 +#: Engine/fgens.c:386 msgid "no coefs present" msgstr "" -#: Engine/fgens.c:380 Engine/fgens.c:646 Engine/fgens.c:654 +#: Engine/fgens.c:391 Engine/fgens.c:657 Engine/fgens.c:665 msgid "illegal x interval" msgstr "" -#: Engine/fgens.c:409 Engine/fgens.c:558 Engine/fgens.c:639 Engine/fgens.c:884 -#: Engine/fgens.c:1362 Engine/fgens.c:2473 Engine/fgens.c:2781 -#: Engine/fgens.c:2922 Opcodes/ftest.c:128 Top/main.c:118 util/cvanal.c:67 +#: Engine/fgens.c:420 Engine/fgens.c:569 Engine/fgens.c:650 Engine/fgens.c:895 +#: Engine/fgens.c:1380 Engine/fgens.c:2492 Engine/fgens.c:2800 +#: Engine/fgens.c:2941 Opcodes/ftest.c:128 Top/main.c:119 util/cvanal.c:67 #: util/lpanal.c:401 util/pvanal.c:170 msgid "insufficient arguments" msgstr "" -#: Engine/fgens.c:413 Engine/fgens.c:1367 +#: Engine/fgens.c:424 Engine/fgens.c:1385 msgid "unknown srctable number" msgstr "" -#: Engine/fgens.c:426 +#: Engine/fgens.c:437 msgid "table size too large" msgstr "" -#: Engine/fgens.c:511 Engine/fgens.c:544 +#: Engine/fgens.c:522 Engine/fgens.c:555 msgid "gen call has negative segment size:" msgstr "" -#: Engine/fgens.c:513 +#: Engine/fgens.c:524 msgid "illegal input vals for gen call, beginning:" msgstr "" -#: Engine/fgens.c:579 +#: Engine/fgens.c:590 msgid "negative segsiz" msgstr "" -#: Engine/fgens.c:788 +#: Engine/fgens.c:799 msgid "nh partials < 1" msgstr "" -#: Engine/fgens.c:887 +#: Engine/fgens.c:898 msgid "illegal xint value" msgstr "" -#: Engine/fgens.c:890 +#: Engine/fgens.c:901 msgid "illegal xamp value" msgstr "" -#: Engine/fgens.c:963 +#: Engine/fgens.c:974 msgid "uneven number of args" msgstr "" -#: Engine/fgens.c:1088 +#: Engine/fgens.c:1099 msgid "gen call has illegal x-ordinate values:" msgstr "" -#: Engine/fgens.c:1106 +#: Engine/fgens.c:1117 msgid "wrong number of args" msgstr "" -#: Engine/fgens.c:1120 +#: Engine/fgens.c:1131 msgid "a range given exceeds table length" msgstr "" -#: Engine/fgens.c:1127 +#: Engine/fgens.c:1138 msgid "an input function does not exist" msgstr "" -#: Engine/fgens.c:1260 +#: Engine/fgens.c:1274 msgid "No such window!" msgstr "" -#: Engine/fgens.c:1278 +#: Engine/fgens.c:1292 msgid "Wrong number of input arguments" msgstr "" -#: Engine/fgens.c:1279 +#: Engine/fgens.c:1293 msgid "unknown distribution" msgstr "" -#: Engine/fgens.c:1328 +#: Engine/fgens.c:1342 msgid "error opening ASCII file" msgstr "" -#: Engine/fgens.c:1334 +#: Engine/fgens.c:1352 #, c-format msgid "%ld elements in %s\n" msgstr "" -#: Engine/fgens.c:1346 +#: Engine/fgens.c:1364 msgid "Numbers after table full in GEN23" msgstr "" -#: Engine/fgens.c:1375 +#: Engine/fgens.c:1393 msgid "table size must be the same of source table" msgstr "" -#: Engine/fgens.c:1447 Engine/fgens.c:1507 +#: Engine/fgens.c:1465 Engine/fgens.c:1525 msgid "x coordinates must all be in increasing order:" msgstr "" -#: Engine/fgens.c:1450 Engine/fgens.c:1509 +#: Engine/fgens.c:1468 Engine/fgens.c:1527 msgid "x coordinate greater than function size:" msgstr "" -#: Engine/fgens.c:1454 +#: Engine/fgens.c:1472 msgid "illegal input val (y <= 0) for gen call, beginning:" msgstr "" -#: Engine/fgens.c:1527 +#: Engine/fgens.c:1545 msgid "GEN28 requires zero table length" msgstr "" -#: Engine/fgens.c:1596 +#: Engine/fgens.c:1614 msgid "could not open space file" msgstr "" -#: Engine/fgens.c:1598 +#: Engine/fgens.c:1616 msgid "Time values must be in increasing order" msgstr "" -#: Engine/fgens.c:1619 +#: Engine/fgens.c:1637 msgid "GEN30: source ftable not found" msgstr "" -#: Engine/fgens.c:1702 +#: Engine/fgens.c:1720 msgid "GEN31: source ftable not found" msgstr "" -#: Engine/fgens.c:1810 +#: Engine/fgens.c:1828 #, c-format msgid "GEN32: source ftable %d not found" msgstr "" -#: Engine/fgens.c:1904 +#: Engine/fgens.c:1922 msgid "GEN33: source ftable not found" msgstr "" -#: Engine/fgens.c:2072 +#: Engine/fgens.c:2090 msgid "unknown source table number" msgstr "" -#: Engine/fgens.c:2104 +#: Engine/fgens.c:2122 msgid "Gen41: negative probability not allowed" msgstr "" -#: Engine/fgens.c:2170 Opcodes/fareygen.c:70 +#: Engine/fgens.c:2188 Opcodes/fareygen.c:70 #, c-format msgid "ftable %d: " msgstr "" -#: Engine/fgens.c:2214 +#: Engine/fgens.c:2232 #, c-format msgid "ftable %d:" msgstr "" -#: Engine/fgens.c:2257 +#: Engine/fgens.c:2275 #, c-format msgid "replacing previous ftable %d" msgstr "" -#: Engine/fgens.c:2297 Engine/fgens.c:2423 Engine/fgens.c:2451 -#: Engine/fgens.c:2458 Opcodes/gab/gab.c:590 Opcodes/gab/gab.c:645 +#: Engine/fgens.c:2316 Engine/fgens.c:2442 Engine/fgens.c:2470 +#: Engine/fgens.c:2477 Opcodes/gab/gab.c:592 Opcodes/gab/gab.c:647 #: Opcodes/midiops2.c:233 Opcodes/midiops2.c:388 Opcodes/midiops2.c:470 #: Opcodes/uggab.c:1625 Opcodes/uggab.c:1661 Opcodes/uggab.c:1683 #: Opcodes/uggab.c:1736 @@ -713,122 +713,122 @@ msgid "Invalid ftable no. %f" msgstr "" -#: Engine/fgens.c:2306 +#: Engine/fgens.c:2325 #, c-format msgid "deferred-size ftable %f illegal here" msgstr "" -#: Engine/fgens.c:2362 Engine/fgens.c:2961 +#: Engine/fgens.c:2381 Engine/fgens.c:2981 #, c-format msgid "Deferred load of '%s' failed" msgstr "" -#: Engine/fgens.c:2429 +#: Engine/fgens.c:2448 #, c-format msgid "Deferred-size ftable %f load not available at perf time." msgstr "" -#: Engine/fgens.c:2497 +#: Engine/fgens.c:2516 #, c-format msgid "non-deferred ftable %d needs size %d\n" msgstr "" -#: Engine/fgens.c:2544 Opcodes/loscilx.c:69 +#: Engine/fgens.c:2563 Opcodes/loscilx.c:69 #, c-format msgid "invalid sample format: %d" msgstr "" -#: Engine/fgens.c:2552 Engine/fgens.c:2805 +#: Engine/fgens.c:2571 Engine/fgens.c:2824 #, c-format msgid "channel %d illegal" msgstr "" -#: Engine/fgens.c:2558 +#: Engine/fgens.c:2577 msgid "deferred alloc\n" msgstr "" -#: Engine/fgens.c:2566 Engine/fgens.c:2878 +#: Engine/fgens.c:2585 Engine/fgens.c:2897 msgid "deferred size, but filesize unknown" msgstr "" -#: Engine/fgens.c:2569 Engine/fgens.c:2882 +#: Engine/fgens.c:2588 Engine/fgens.c:2901 #, c-format msgid " defer length %d\n" msgstr "" -#: Engine/fgens.c:2637 +#: Engine/fgens.c:2656 msgid "GEN1: input file truncated by ftable size" msgstr "" -#: Engine/fgens.c:2641 +#: Engine/fgens.c:2660 #, c-format msgid "\tlooping endpoint %d exceeds ftsize %d\n" msgstr "" -#: Engine/fgens.c:2657 +#: Engine/fgens.c:2676 msgid "GEN1 read error" msgstr "" -#: Engine/fgens.c:2662 +#: Engine/fgens.c:2681 msgid "GEN1: aiff file truncated by ftable size" msgstr "" -#: Engine/fgens.c:2663 +#: Engine/fgens.c:2682 #, c-format msgid "\taudio samps %d exceeds ftsize %d" msgstr "" -#: Engine/fgens.c:2707 +#: Engine/fgens.c:2726 msgid "wrong number of ftable arguments" msgstr "" -#: Engine/fgens.c:2717 OOps/pstream.c:379 +#: Engine/fgens.c:2736 OOps/pstream.c:379 msgid "Failed to load PVOC-EX file" msgstr "" -#: Engine/fgens.c:2728 InOut/midirecv.c:417 OOps/midiops.c:402 +#: Engine/fgens.c:2747 InOut/midirecv.c:419 OOps/midiops.c:402 #: OOps/midiops.c:452 OOps/midiops.c:464 msgid "illegal channel number" msgstr "" -#: Engine/fgens.c:2746 +#: Engine/fgens.c:2765 msgid "ftable size too small" msgstr "" -#: Engine/fgens.c:2821 Opcodes/mp3in.c:87 Opcodes/mp3in.c:255 +#: Engine/fgens.c:2840 Opcodes/mp3in.c:87 Opcodes/mp3in.c:255 #: Top/cscorfns.c:176 Top/cscorfns.c:207 msgid "Not enough memory\n" msgstr "" -#: Engine/fgens.c:2987 +#: Engine/fgens.c:3007 msgid "gen51: invalid number of p-fields (too few grades)" msgstr "" -#: Engine/fgens.c:3027 +#: Engine/fgens.c:3047 msgid "number of channels inconsistent with number of args" msgstr "" -#: Engine/fgens.c:3186 +#: Engine/fgens.c:3206 msgid "GEN53: invalid number of gen arguments" msgstr "" -#: Engine/fgens.c:3196 +#: Engine/fgens.c:3216 msgid "GEN53: invalid table length" msgstr "" -#: Engine/fgens.c:3200 +#: Engine/fgens.c:3220 msgid "GEN53: invalid source table number" msgstr "" -#: Engine/fgens.c:3203 +#: Engine/fgens.c:3223 msgid "GEN53: mode must be in the range 0 to 15" msgstr "" -#: Engine/fgens.c:3207 +#: Engine/fgens.c:3227 msgid "GEN53: invalid source table length" msgstr "" -#: Engine/fgens.c:3212 +#: Engine/fgens.c:3232 msgid "GEN53: invalid window table" msgstr "" @@ -852,21 +852,21 @@ msgid "Instrument %d muted\n" msgstr "" -#: Engine/insert.c:144 Engine/insert.c:374 +#: Engine/insert.c:144 Engine/insert.c:376 #, c-format msgid "cannot allocate last note because it exceeds 100%% of cpu time" msgstr "" -#: Engine/insert.c:150 Engine/insert.c:380 +#: Engine/insert.c:150 Engine/insert.c:382 msgid "cannot allocate last note because it exceeds instr maxalloc" msgstr "" -#: Engine/insert.c:168 Engine/insert.c:400 +#: Engine/insert.c:168 #, c-format msgid "new alloc for instr %s:\n" msgstr "" -#: Engine/insert.c:170 Engine/insert.c:402 +#: Engine/insert.c:170 #, c-format msgid "new alloc for instr %d:\n" msgstr "" @@ -881,147 +881,157 @@ msgid "instr %d uses %d p-fields but is given %d" msgstr "" -#: Engine/insert.c:345 Engine/insert.c:573 +#: Engine/insert.c:345 Engine/insert.c:575 #, c-format msgid "instr %s now active:\n" msgstr "" -#: Engine/insert.c:347 Engine/insert.c:575 +#: Engine/insert.c:347 Engine/insert.c:577 #, c-format msgid "instr %d now active:\n" msgstr "" -#: Engine/insert.c:389 +#: Engine/insert.c:391 #, c-format -msgid "activating instr %s\n" +msgid "MIDI activating instr %s\n" msgstr "" -#: Engine/insert.c:391 +#: Engine/insert.c:393 +#, c-format +msgid "MIDI activating instr %d\n" +msgstr "" + +#: Engine/insert.c:402 +#, c-format +msgid "new MIDI alloc for instr %s:\n" +msgstr "" + +#: Engine/insert.c:404 #, c-format -msgid "activating instr %d\n" +msgid "new MIDI alloc for instr %d:\n" msgstr "" -#: Engine/insert.c:416 +#: Engine/insert.c:418 #, c-format msgid "MIDI note overlaps with key %d on same channel" msgstr "" -#: Engine/insert.c:683 +#: Engine/insert.c:685 #, c-format msgid "removed instance of instr %s\n" msgstr "" -#: Engine/insert.c:685 +#: Engine/insert.c:687 #, c-format msgid "removed instance of instr %d\n" msgstr "" -#: Engine/insert.c:843 +#: Engine/insert.c:851 msgid "inactive allocs returned to freespace\n" msgstr "" -#: Engine/insert.c:869 +#: Engine/insert.c:877 #, c-format msgid "could not find playing instr %f\n" msgstr "" -#: Engine/insert.c:882 +#: Engine/insert.c:890 msgid "" "\n" "INIT ERROR: " msgstr "" -#: Engine/insert.c:895 +#: Engine/insert.c:903 #, c-format msgid "INIT ERROR in instr %d (opcode %s): " msgstr "" -#: Engine/insert.c:898 +#: Engine/insert.c:906 #, c-format msgid "INIT ERROR in instr %d (subinstr %d): " msgstr "" -#: Engine/insert.c:902 +#: Engine/insert.c:910 #, c-format msgid "INIT ERROR in instr %d: " msgstr "" -#: Engine/insert.c:923 +#: Engine/insert.c:931 #, c-format msgid "PERF ERROR in instr %d (opcode %s): " msgstr "" -#: Engine/insert.c:926 +#: Engine/insert.c:934 #, c-format msgid "PERF ERROR in instr %d (subinstr %d): " msgstr "" -#: Engine/insert.c:930 +#: Engine/insert.c:938 #, c-format msgid "PERF ERROR in instr %d: " msgstr "" -#: Engine/insert.c:935 +#: Engine/insert.c:943 msgid " note aborted\n" msgstr "" -#: Engine/insert.c:954 +#: Engine/insert.c:962 msgid "subinstr: number of output args greater than nchnls" msgstr "" -#: Engine/insert.c:1022 +#: Engine/insert.c:1030 msgid "subinstr: too many p-fields" msgstr "" -#: Engine/insert.c:1127 +#: Engine/insert.c:1135 #, c-format msgid "%s: invalid local ksmps value: %d" msgstr "" -#: Engine/insert.c:1259 OOps/bus.c:611 Opcodes/stackops.c:293 +#: Engine/insert.c:1278 OOps/bus.c:614 Opcodes/stackops.c:293 #, c-format msgid "%s: not initialised" msgstr "" -#: Engine/insert.c:1442 +#: Engine/insert.c:1458 #, c-format msgid "setksmps: invalid ksmps value: %d, original: %d" msgstr "" -#: Engine/insert.c:1564 +#: Engine/insert.c:1595 msgid "subinstr: not initialised" msgstr "" -#: Engine/insert.c:2005 +#: Engine/insert.c:2046 #, c-format msgid "" "instr %d allocated at %p\n" "\tlclbas %p, opds %p\n" msgstr "" -#: Engine/insert.c:2023 +#: Engine/insert.c:2064 #, c-format msgid "op (%s) allocated at %p\n" msgstr "" -#: Engine/insert.c:2048 +#: Engine/insert.c:2089 msgid "null iopadr" msgstr "" -#: Engine/insert.c:2059 +#: Engine/insert.c:2100 msgid "null opadr" msgstr "" -#: Engine/insert.c:2131 +#: Engine/insert.c:2182 msgid "inconsistent opds total" msgstr "" -#: Engine/insert.c:2192 +#: Engine/insert.c:2243 #, c-format msgid "Instrument %s is still active" msgstr "" -#: Engine/insert.c:2195 +#: Engine/insert.c:2246 #, c-format msgid "Instrument %d is still active" msgstr "" @@ -1045,40 +1055,40 @@ msgid "stdmode = %.8x Linefd = %d\n" msgstr "" -#: Engine/linevent.c:186 +#: Engine/linevent.c:184 msgid "LineBuffer Overflow - Input Data has been Lost" msgstr "" -#: Engine/linevent.c:239 +#: Engine/linevent.c:238 #, c-format msgid "unknown opcode %c" msgstr "" -#: Engine/linevent.c:259 +#: Engine/linevent.c:258 msgid "unmatched quotes" msgstr "" -#: Engine/linevent.c:286 +#: Engine/linevent.c:285 msgid "dot carry has no reference" msgstr "" -#: Engine/linevent.c:291 +#: Engine/linevent.c:290 msgid "cannot carry string p-field" msgstr "" -#: Engine/linevent.c:302 +#: Engine/linevent.c:301 msgid "too few pfields" msgstr "" -#: Engine/linevent.c:306 +#: Engine/linevent.c:305 msgid "-L with negative p2 illegal" msgstr "" -#: Engine/linevent.c:317 +#: Engine/linevent.c:316 msgid "too many pfields" msgstr "" -#: Engine/linevent.c:329 +#: Engine/linevent.c:328 #, c-format msgid "" "illegal RT scoreline:\n" @@ -1086,24 +1096,28 @@ "%*s" msgstr "" -#: Engine/linevent.c:351 +#: Engine/linevent.c:350 msgid "event: param 1 must be \"a\", \"i\", \"q\", \"f\", or \"e\"" msgstr "" -#: Engine/linevent.c:353 +#: Engine/linevent.c:352 msgid "event: string name is allowed only for \"i\" and \"q\" events" msgstr "" -#: Engine/linevent.c:394 +#: Engine/linevent.c:395 #, c-format msgid "event: error creating '%c' event" msgstr "" -#: Engine/linevent.c:457 +#: Engine/linevent.c:459 #, c-format msgid "event_i: error creating '%c' event" msgstr "" +#: Engine/linevent.c:505 +msgid "instance: error creating event" +msgstr "" + #: Engine/memalloc.c:58 #, c-format msgid "memory allocate failure for %lu" @@ -1170,7 +1184,7 @@ msgstr "" #: Engine/memfiles.c:511 Opcodes/pvinterp.c:77 Opcodes/pvinterp.c:193 -#: Opcodes/pvinterp.c:383 Opcodes/ugens9.c:104 Opcodes/vpvoc.c:210 +#: Opcodes/pvinterp.c:383 Opcodes/ugens9.c:104 Opcodes/vpvoc.c:212 #, c-format msgid "%s's srate = %8.0f, orch's srate = %8.0f" msgstr "" @@ -1204,22 +1218,22 @@ msgid "Beat mode not in force" msgstr "" -#: Engine/musmon.c:173 Top/csound.c:2854 +#: Engine/musmon.c:173 Top/csound.c:2859 #, c-format msgid "Csound version %s beta (double samples) %s\n" msgstr "" -#: Engine/musmon.c:176 Top/csound.c:2857 +#: Engine/musmon.c:176 Top/csound.c:2862 #, c-format msgid "Csound version %s (double samples) %s\n" msgstr "" -#: Engine/musmon.c:181 Top/csound.c:2846 +#: Engine/musmon.c:181 Top/csound.c:2851 #, c-format msgid "Csound version %s beta (float samples) %s\n" msgstr "" -#: Engine/musmon.c:184 Top/csound.c:2849 +#: Engine/musmon.c:184 Top/csound.c:2854 #, c-format msgid "Csound version %s (float samples) %s\n" msgstr "" @@ -1261,7 +1275,7 @@ msgid "sorting cscore.out ..\n" msgstr "" -#: Engine/musmon.c:340 Top/main.c:329 +#: Engine/musmon.c:340 Top/main.c:297 msgid "\t... done\n" msgstr "" @@ -1269,8 +1283,8 @@ msgid "playing from cscore.srt\n" msgstr "" -#: Engine/musmon.c:345 Engine/musmon.c:497 Engine/musmon.c:1119 -#: Engine/musmon.c:1329 +#: Engine/musmon.c:345 Engine/musmon.c:501 Engine/musmon.c:1124 +#: Engine/musmon.c:1335 #, c-format msgid "SECTION %d:\n" msgstr "" @@ -1280,125 +1294,125 @@ msgid "%c\tbeep!\n" msgstr "" -#: Engine/musmon.c:450 +#: Engine/musmon.c:454 msgid "end of score.\t\t overall amps:" msgstr "" -#: Engine/musmon.c:461 +#: Engine/musmon.c:465 msgid "" "\n" "\t overall samples out of range:" msgstr "" -#: Engine/musmon.c:465 +#: Engine/musmon.c:469 #, c-format msgid "" "\n" "%d errors in performance\n" msgstr "" -#: Engine/musmon.c:467 +#: Engine/musmon.c:471 msgid "end of performance" msgstr "" -#: Engine/musmon.c:480 +#: Engine/musmon.c:484 msgid "no sound written to disk\n" msgstr "" -#: Engine/musmon.c:572 Engine/musmon.c:618 +#: Engine/musmon.c:577 Engine/musmon.c:623 msgid "\t number of samples out of range:" msgstr "" -#: Engine/musmon.c:611 +#: Engine/musmon.c:616 #, c-format msgid "end of section %d\t sect peak amps:" msgstr "" -#: Engine/musmon.c:613 +#: Engine/musmon.c:618 msgid "end of lplay event list\t peak amps:" msgstr "" -#: Engine/musmon.c:678 Engine/musmon.c:705 +#: Engine/musmon.c:683 Engine/musmon.c:710 #, c-format msgid " - note deleted. instr %s undefined" msgstr "" -#: Engine/musmon.c:682 +#: Engine/musmon.c:687 #, c-format msgid "Setting instrument %s %s\n" msgstr "" -#: Engine/musmon.c:683 Engine/musmon.c:697 +#: Engine/musmon.c:688 Engine/musmon.c:702 msgid "off" msgstr "" -#: Engine/musmon.c:683 Engine/musmon.c:697 +#: Engine/musmon.c:688 Engine/musmon.c:702 msgid "on" msgstr "" -#: Engine/musmon.c:692 Engine/musmon.c:734 +#: Engine/musmon.c:697 Engine/musmon.c:739 #, c-format msgid " - note deleted. instr %d(%d) undefined" msgstr "" -#: Engine/musmon.c:696 +#: Engine/musmon.c:701 #, c-format msgid "Setting instrument %d %s\n" msgstr "" -#: Engine/musmon.c:724 +#: Engine/musmon.c:729 #, c-format msgid " - note deleted. i%d (%s) had %d init errors" msgstr "" -#: Engine/musmon.c:755 +#: Engine/musmon.c:760 #, c-format msgid " - note deleted. i%d had %d init errors" msgstr "" -#: Engine/musmon.c:776 +#: Engine/musmon.c:781 #, c-format msgid "time advanced %5.3f beats by score request\n" msgstr "" -#: Engine/musmon.c:794 +#: Engine/musmon.c:799 #, c-format msgid "\t\t T%7.3f - note deleted. " msgstr "" -#: Engine/musmon.c:798 +#: Engine/musmon.c:803 #, c-format msgid "instr %s had %d init errors\n" msgstr "" -#: Engine/musmon.c:801 +#: Engine/musmon.c:806 #, c-format msgid "instr %d had %d init errors\n" msgstr "" -#: Engine/musmon.c:893 +#: Engine/musmon.c:898 msgid "terminating.\n" msgstr "" -#: Engine/musmon.c:980 +#: Engine/musmon.c:985 #, c-format msgid "error in score. illegal opcode %c (ASCII %d)\n" msgstr "" -#: Engine/musmon.c:1241 +#: Engine/musmon.c:1247 msgid "insert_score_event(): invalid instrument number or name\n" msgstr "" -#: Engine/musmon.c:1261 +#: Engine/musmon.c:1267 #, c-format msgid "insert_score_event(): unknown opcode: %c\n" msgstr "" -#: Engine/musmon.c:1284 +#: Engine/musmon.c:1290 msgid "insert_score_event(): insufficient p-fields\n" msgstr "" -#: Engine/musmon.c:1338 +#: Engine/musmon.c:1344 msgid "cannot rewind score: no score in memory \n" msgstr "" @@ -1416,29 +1430,29 @@ msgid "cannot find the specified instrument or opcode" msgstr "" -#: Engine/new_orc_parser.c:92 Top/main.c:264 +#: Engine/new_orc_parser.c:144 #, c-format msgid "Failed to open input file %s\n" msgstr "" -#: Engine/new_orc_parser.c:122 +#: Engine/new_orc_parser.c:177 msgid "Unmatched #ifdef\n" msgstr "" -#: Engine/new_orc_parser.c:156 +#: Engine/new_orc_parser.c:212 msgid "Parsing failed due to invalid input!\n" msgstr "" -#: Engine/new_orc_parser.c:160 +#: Engine/new_orc_parser.c:216 msgid "Parsing failed due to memory exhaustion!\n" msgstr "" -#: Engine/new_orc_parser.c:163 +#: Engine/new_orc_parser.c:219 #, c-format msgid "Parsing failed due to %d syntax error%s!\n" msgstr "" -#: Engine/new_orc_parser.c:208 +#: Engine/new_orc_parser.c:264 msgid "Stopping on parser failure\n" msgstr "" @@ -1453,7 +1467,7 @@ "\tremainder of line flushed\n" msgstr "" -#: Engine/rdscor.c:159 +#: Engine/rdscor.c:160 msgid "ERROR: too many pfields: " msgstr "" @@ -1680,8 +1694,8 @@ msgid "! invalid in p1, p2, or p3" msgstr "" -#: Engine/sread.c:1266 Engine/sread.c:1271 Engine/sread.c:1749 -#: Engine/sread.c:1772 Engine/sread.c:1786 +#: Engine/sread.c:1266 Engine/sread.c:1271 Engine/sread.c:1754 +#: Engine/sread.c:1777 Engine/sread.c:1791 msgid " remainder of line flushed\n" msgstr "" @@ -1729,47 +1743,47 @@ msgid "Not #include" msgstr "" -#: Engine/sread.c:1674 +#: Engine/sread.c:1679 #, c-format msgid "Cannot open #include'd file %s" msgstr "" -#: Engine/sread.c:1684 +#: Engine/sread.c:1689 msgid "Not #undef" msgstr "" -#: Engine/sread.c:1705 +#: Engine/sread.c:1710 #, c-format msgid "macro %s undefined\n" msgstr "" -#: Engine/sread.c:1711 +#: Engine/sread.c:1716 msgid "unknown # option" msgstr "" -#: Engine/sread.c:1748 +#: Engine/sread.c:1753 #, c-format msgid "illegal opcode %c" msgstr "" -#: Engine/sread.c:1771 +#: Engine/sread.c:1776 #, c-format msgid "unexpected char %c" msgstr "" -#: Engine/sread.c:1785 +#: Engine/sread.c:1790 msgid "illegally placed string" msgstr "" -#: Engine/sread.c:1792 +#: Engine/sread.c:1797 msgid "unmatched quote" msgstr "" -#: Engine/sread.c:1836 +#: Engine/sread.c:1841 msgid "sread: illegal number format: " msgstr "" -#: Engine/sread.c:1842 +#: Engine/sread.c:1847 msgid " zero substituted.\n" msgstr "" @@ -2392,56 +2406,56 @@ msgid "unrecognised message type %d" msgstr "" -#: InOut/midirecv.c:400 +#: InOut/midirecv.c:402 #, c-format msgid "midi channel %d using instr %d\n" msgstr "" -#: InOut/midirecv.c:403 +#: InOut/midirecv.c:405 #, c-format msgid "midi channel %d is muted\n" msgstr "" -#: InOut/midirecv.c:421 +#: InOut/midirecv.c:423 #, c-format msgid "MIDI channel %d muted\n" msgstr "" -#: InOut/midirecv.c:426 +#: InOut/midirecv.c:428 #, c-format msgid "Insno = %d\n" msgstr "" -#: InOut/midirecv.c:427 +#: InOut/midirecv.c:429 msgid "unknown instr" msgstr "" -#: InOut/midirecv.c:430 +#: InOut/midirecv.c:432 #, c-format msgid "chnl %d using instr %d\n" msgstr "" -#: InOut/midirecv.c:490 +#: InOut/midirecv.c:492 #, c-format msgid " *** error reading MIDI device: %d (%s)" msgstr "" -#: InOut/midirecv.c:519 +#: InOut/midirecv.c:521 #, c-format msgid "undefined sys-realtime msg %x\n" msgstr "" -#: InOut/midirecv.c:537 +#: InOut/midirecv.c:539 #, c-format msgid "undefined sys_common msg %x\n" msgstr "" -#: InOut/midirecv.c:599 +#: InOut/midirecv.c:601 #, c-format msgid "Error closing MIDI in device: %d (%s)" msgstr "" -#: InOut/midirecv.c:606 +#: InOut/midirecv.c:608 #, c-format msgid "Error closing MIDI out device: %d (%s)" msgstr "" @@ -3681,77 +3695,77 @@ msgid "non-looping sample" msgstr "" -#: OOps/aops.c:1041 OOps/aops.c:1069 +#: OOps/aops.c:1037 OOps/aops.c:1065 #, c-format msgid "No tuning table %d" msgstr "" -#: OOps/aops.c:1114 OOps/aops.c:1152 +#: OOps/aops.c:1110 OOps/aops.c:1148 msgid "cpstun: invalid table" msgstr "" -#: OOps/aops.c:1544 OOps/aops.c:1580 +#: OOps/aops.c:1540 OOps/aops.c:1576 #, c-format msgid "Input channel %d too large; ignored" msgstr "" -#: OOps/aops.c:1576 +#: OOps/aops.c:1572 msgid "Input and output argument count differs in inch" msgstr "" -#: OOps/aops.c:2014 +#: OOps/aops.c:2010 msgid "Unknown function called" msgstr "" -#: OOps/aops.c:2050 +#: OOps/aops.c:2046 msgid "number of arguments != nchnls" msgstr "" -#: OOps/aops.c:2080 +#: OOps/aops.c:2076 msgid "outrg: channel number cannot be < 1 (1 is the first channel)" msgstr "" -#: OOps/bus.c:80 OOps/bus.c:102 OOps/bus.c:127 OOps/bus.c:155 +#: OOps/bus.c:83 OOps/bus.c:105 OOps/bus.c:130 OOps/bus.c:158 msgid "chani: invalid index" msgstr "" -#: OOps/bus.c:88 OOps/bus.c:134 +#: OOps/bus.c:91 OOps/bus.c:137 #, c-format msgid "chani error %d:channel not found or not right type" msgstr "" -#: OOps/bus.c:110 OOps/bus.c:162 +#: OOps/bus.c:113 OOps/bus.c:165 #, c-format msgid "chano error %d:channel not found or not right type" msgstr "" -#: OOps/bus.c:216 +#: OOps/bus.c:219 msgid "pvsin: invalid index" msgstr "" -#: OOps/bus.c:224 +#: OOps/bus.c:227 #, c-format msgid "pvsin error %d:channel not found or not right type" msgstr "" -#: OOps/bus.c:279 +#: OOps/bus.c:282 msgid "pvsout: invalid index" msgstr "" -#: OOps/bus.c:287 +#: OOps/bus.c:290 #, c-format msgid "pvsout error %d:channel not found or not right type" msgstr "" -#: OOps/bus.c:1026 OOps/bus.c:1075 OOps/bus.c:1096 OOps/bus.c:1143 +#: OOps/bus.c:1029 OOps/bus.c:1078 OOps/bus.c:1099 OOps/bus.c:1146 msgid "invalid mode parameter" msgstr "" -#: OOps/bus.c:1063 OOps/bus.c:1187 +#: OOps/bus.c:1066 OOps/bus.c:1187 msgid "invalid channel parameters" msgstr "" -#: OOps/bus.c:1151 +#: OOps/bus.c:1154 msgid "channel already exists" msgstr "" @@ -3799,11 +3813,11 @@ msgid "diskin2: invalid number of channels" msgstr "" -#: OOps/diskin2.c:289 OOps/diskin2.c:1741 +#: OOps/diskin2.c:289 OOps/diskin2.c:1745 msgid "diskin2: unknown sample format" msgstr "" -#: OOps/diskin2.c:304 OOps/diskin2.c:1756 +#: OOps/diskin2.c:304 OOps/diskin2.c:1760 #, c-format msgid "diskin2: %s: failed to open file" msgstr "" @@ -3813,19 +3827,19 @@ "diskin2: number of output args inconsistent with number of file channels" msgstr "" -#: OOps/diskin2.c:346 OOps/diskin2.c:1813 +#: OOps/diskin2.c:346 OOps/diskin2.c:1817 #, c-format msgid "diskin2: warning: file sample rate (%d) != orchestra sr (%d)\n" msgstr "" -#: OOps/diskin2.c:427 OOps/diskin2.c:1894 +#: OOps/diskin2.c:427 OOps/diskin2.c:1905 #, c-format msgid "" "diskin2: opened (asynchronously) '%s':\n" " %d Hz, %d channel(s), %ld sample frames\n" msgstr "" -#: OOps/diskin2.c:441 OOps/diskin2.c:1908 +#: OOps/diskin2.c:441 OOps/diskin2.c:1919 #, c-format msgid "" "diskin2: opened '%s':\n" @@ -3833,12 +3847,12 @@ msgstr "" #: OOps/diskin2.c:520 OOps/diskin2.c:706 OOps/diskin2.c:902 -#: OOps/diskin2.c:1526 OOps/diskin2.c:1940 OOps/diskin2.c:2133 +#: OOps/diskin2.c:1529 OOps/diskin2.c:1951 OOps/diskin2.c:2144 msgid "diskin2: not initialised" msgstr "" -#: OOps/diskin2.c:686 OOps/diskin2.c:877 OOps/diskin2.c:1697 -#: OOps/diskin2.c:2106 +#: OOps/diskin2.c:686 OOps/diskin2.c:877 OOps/diskin2.c:1700 +#: OOps/diskin2.c:2117 msgid "diskin2: file descriptor closed or invalid\n" msgstr "" @@ -3904,7 +3918,7 @@ msgid "soundouts: not initialised" msgstr "" -#: OOps/diskin2.c:1782 +#: OOps/diskin2.c:1786 msgid "diskin2: output array too small" msgstr "" @@ -4678,12 +4692,12 @@ msgid "channel already specific remote" msgstr "" -#: OOps/remote.c:589 OOps/remote.c:614 OOps/remote.c:639 +#: OOps/remote.c:590 OOps/remote.c:615 OOps/remote.c:640 msgid "CLsend failed" msgstr "" -#: OOps/remote.c:706 OOps/remote.c:714 OOps/remote.c:722 OOps/remote.c:730 -#: OOps/remote.c:738 +#: OOps/remote.c:707 OOps/remote.c:715 OOps/remote.c:723 OOps/remote.c:731 +#: OOps/remote.c:739 msgid "" "*** This version of Csound was not compiled with remote event support ***\n" msgstr "" @@ -4698,11 +4712,11 @@ msgid "schedkwhen ignored. Instrument %d undefined\n" msgstr "" -#: OOps/schedule.c:429 +#: OOps/schedule.c:430 msgid "schedkwhen warning: negative kwhen reset to zero" msgstr "" -#: OOps/schedule.c:454 OOps/schedule.c:477 +#: OOps/schedule.c:455 OOps/schedule.c:478 msgid "trigseq: incorrect table number" msgstr "" @@ -4728,25 +4742,25 @@ msgid "filepeak: error getting peak value" msgstr "" -#: OOps/str_ops.c:60 +#: OOps/str_ops.c:64 msgid "illegal strset index" msgstr "" -#: OOps/str_ops.c:68 +#: OOps/str_ops.c:72 #, c-format msgid "strset index conflict at %d" msgstr "" -#: OOps/str_ops.c:69 +#: OOps/str_ops.c:73 #, c-format msgid "previous value: '%s', replaced with '%s'" msgstr "" -#: OOps/str_ops.c:93 OOps/str_ops.c:100 +#: OOps/str_ops.c:97 OOps/str_ops.c:104 msgid "--strset: invalid format" msgstr "" -#: OOps/str_ops.c:921 +#: OOps/str_ops.c:925 #, c-format msgid "invalid option code: %g" msgstr "" @@ -4893,27 +4907,27 @@ msgid "osciln: not initialised" msgstr "" -#: OOps/ugens2.c:1168 +#: OOps/ugens2.c:1210 msgid "oscil(krate): not initialised" msgstr "" -#: OOps/ugens2.c:1203 OOps/ugens2.c:1239 OOps/ugens2.c:1272 OOps/ugens2.c:1307 +#: OOps/ugens2.c:1245 OOps/ugens2.c:1281 OOps/ugens2.c:1314 OOps/ugens2.c:1349 msgid "oscil: not initialised" msgstr "" -#: OOps/ugens2.c:1330 +#: OOps/ugens2.c:1372 msgid "oscili(krate): not initialised" msgstr "" -#: OOps/ugens2.c:1365 OOps/ugens2.c:1405 OOps/ugens2.c:1441 OOps/ugens2.c:1480 +#: OOps/ugens2.c:1407 OOps/ugens2.c:1447 OOps/ugens2.c:1483 OOps/ugens2.c:1522 msgid "oscili: not initialised" msgstr "" -#: OOps/ugens2.c:1521 +#: OOps/ugens2.c:1563 msgid "oscil3(krate): not initialised" msgstr "" -#: OOps/ugens2.c:1580 OOps/ugens2.c:1636 OOps/ugens2.c:1689 OOps/ugens2.c:1744 +#: OOps/ugens2.c:1622 OOps/ugens2.c:1678 OOps/ugens2.c:1731 OOps/ugens2.c:1786 msgid "oscil3: not initialised" msgstr "" @@ -5037,120 +5051,124 @@ msgid "pluck: kcps more than sample rate" msgstr "" -#: OOps/ugens4.c:472 OOps/ugens4.c:580 OOps/ugens4.c:685 +#: OOps/ugens4.c:472 OOps/ugens4.c:580 OOps/ugens4.c:686 #, c-format msgid "Seeding from current time %lu\n" msgstr "" -#: OOps/ugens5.c:287 OOps/ugens5.c:396 Opcodes/gab/gab.c:48 Opcodes/ugsc.c:209 +#: OOps/ugens5.c:287 OOps/ugens5.c:400 Opcodes/gab/gab.c:50 Opcodes/ugsc.c:211 #, c-format msgid "illegal reson iscl value, %f" msgstr "" -#: OOps/ugens5.c:616 +#: OOps/ugens5.c:623 #, c-format msgid "LPREAD cannot load %s" msgstr "" -#: OOps/ugens5.c:627 +#: OOps/ugens5.c:634 #, c-format msgid "Using %s type of file.\n" msgstr "" -#: OOps/ugens5.c:628 +#: OOps/ugens5.c:635 msgid "pole" msgstr "" -#: OOps/ugens5.c:628 +#: OOps/ugens5.c:635 msgid "filter coefficient" msgstr "" -#: OOps/ugens5.c:633 +#: OOps/ugens5.c:640 msgid "lpheader overriding inputs" msgstr "" -#: OOps/ugens5.c:637 +#: OOps/ugens5.c:644 msgid "lpfile srate != orch sr" msgstr "" -#: OOps/ugens5.c:645 +#: OOps/ugens5.c:652 #, c-format msgid "file %s bytes are in wrong order" msgstr "" -#: OOps/ugens5.c:655 +#: OOps/ugens5.c:662 msgid "insufficient args and no file header" msgstr "" -#: OOps/ugens5.c:660 +#: OOps/ugens5.c:667 msgid "npoles > MAXPOLES" msgstr "" -#: OOps/ugens5.c:668 +#: OOps/ugens5.c:675 #, c-format msgid "npoles %ld, nvals %ld, totvals %ld, lastfram16 = %lx\n" msgstr "" -#: OOps/ugens5.c:692 util/lpanal.c:324 +#: OOps/ugens5.c:700 util/lpanal.c:324 #, c-format msgid "magnitude: %f Phase: %f\n" msgstr "" -#: OOps/ugens5.c:695 util/lpanal.c:327 +#: OOps/ugens5.c:703 util/lpanal.c:327 #, c-format msgid "Real: %f Imag: %f\n" msgstr "" -#: OOps/ugens5.c:863 +#: OOps/ugens5.c:758 +msgid "Cannot handle uneven pole count yet \n" +msgstr "" + +#: OOps/ugens5.c:871 msgid "lpread: not initialised" msgstr "" -#: OOps/ugens5.c:869 +#: OOps/ugens5.c:877 msgid "lpread timpnt < 0" msgstr "" -#: OOps/ugens5.c:875 +#: OOps/ugens5.c:883 msgid "lpread ktimpnt truncated to last frame" msgstr "" -#: OOps/ugens5.c:906 OOps/ugens5.c:1409 +#: OOps/ugens5.c:914 OOps/ugens5.c:1417 msgid "Interpolation failed" msgstr "" -#: OOps/ugens5.c:964 +#: OOps/ugens5.c:972 msgid "this opcode only works with LPC pole analysis type (-a)\n" msgstr "" -#: OOps/ugens5.c:1098 +#: OOps/ugens5.c:1106 msgid "Pole file not supported for this opcode !" msgstr "" -#: OOps/ugens5.c:1125 +#: OOps/ugens5.c:1133 #, c-format msgid "illegal frqratio, %5.2f" msgstr "" -#: OOps/ugens5.c:1335 +#: OOps/ugens5.c:1343 msgid "lpslot number should be positive" msgstr "" -#: OOps/ugens5.c:1355 +#: OOps/ugens5.c:1363 msgid "LPC slot is not allocated" msgstr "" -#: OOps/ugens5.c:1363 +#: OOps/ugens5.c:1371 msgid "lpinterpol works only with poles files.." msgstr "" -#: OOps/ugens5.c:1367 +#: OOps/ugens5.c:1375 msgid "The poles files have different pole count" msgstr "" -#: OOps/ugens5.c:1373 +#: OOps/ugens5.c:1381 msgid "padding error" msgstr "" -#: OOps/ugens5.c:1393 +#: OOps/ugens5.c:1401 msgid "lpinterpol: not initialised" msgstr "" @@ -5188,48 +5206,52 @@ msgid "delayw: not initialised" msgstr "" -#: OOps/ugens6.c:475 OOps/ugens6.c:774 OOps/ugens6.c:859 +#: OOps/ugens6.c:475 OOps/ugens6.c:785 OOps/ugens6.c:870 msgid "deltap: not initialised" msgstr "" -#: OOps/ugens6.c:530 +#: OOps/ugens6.c:532 msgid "deltapi: not initialised" msgstr "" -#: OOps/ugens6.c:583 +#: OOps/ugens6.c:535 OOps/ugens6.c:677 +msgid "deltapi: INF delaytime" +msgstr "" + +#: OOps/ugens6.c:588 msgid "deltapn: not initialised" msgstr "" -#: OOps/ugens6.c:667 +#: OOps/ugens6.c:674 msgid "deltap3: not initialised" msgstr "" -#: OOps/ugens6.c:896 OOps/ugens6.c:900 Opcodes/ugmoss.c:483 +#: OOps/ugens6.c:907 OOps/ugens6.c:911 Opcodes/ugmoss.c:483 #: Opcodes/ugmoss.c:487 msgid "illegal loop time" msgstr "" -#: OOps/ugens6.c:963 +#: OOps/ugens6.c:974 msgid "comb: not initialised" msgstr "" -#: OOps/ugens6.c:1002 +#: OOps/ugens6.c:1013 msgid "combinv: not initialised" msgstr "" -#: OOps/ugens6.c:1039 +#: OOps/ugens6.c:1050 msgid "alpass: not initialised" msgstr "" -#: OOps/ugens6.c:1072 +#: OOps/ugens6.c:1083 msgid "revlpsiz inconsistent\n" msgstr "" -#: OOps/ugens6.c:1163 +#: OOps/ugens6.c:1174 msgid "reverb: not intialised" msgstr "" -#: OOps/ugens6.c:1237 +#: OOps/ugens6.c:1248 msgid "pan: not initialised" msgstr "" @@ -5392,10 +5414,10 @@ msgstr "" #: OOps/ugtabs.c:38 OOps/ugtabs.c:74 OOps/ugtabs.c:154 OOps/ugtabs.c:266 -#: OOps/ugtabs.c:428 OOps/ugtabs.c:445 OOps/ugtabs.c:461 OOps/ugtabs.c:477 -#: OOps/ugtabs.c:493 OOps/ugtabs.c:508 OOps/ugtabs.c:528 OOps/ugtabs.c:615 -#: OOps/ugtabs.c:632 OOps/ugtabs.c:646 OOps/ugtabs.c:659 OOps/ugtabs.c:695 -#: OOps/ugtabs.c:702 OOps/ugtabs.c:709 OOps/ugtabs.c:793 OOps/ugtabs.c:839 +#: OOps/ugtabs.c:428 OOps/ugtabs.c:445 OOps/ugtabs.c:461 OOps/ugtabs.c:478 +#: OOps/ugtabs.c:493 OOps/ugtabs.c:508 OOps/ugtabs.c:528 OOps/ugtabs.c:616 +#: OOps/ugtabs.c:633 OOps/ugtabs.c:647 OOps/ugtabs.c:660 OOps/ugtabs.c:696 +#: OOps/ugtabs.c:703 OOps/ugtabs.c:710 OOps/ugtabs.c:794 OOps/ugtabs.c:840 #, c-format msgid "table: could not find ftable %d" msgstr "" @@ -5408,12 +5430,12 @@ msgid "tablekt: index type inconsistent with output" msgstr "" -#: OOps/ugtabs.c:673 +#: OOps/ugtabs.c:674 #, c-format msgid "table: could not find ftables %d and/or %d" msgstr "" -#: OOps/ugtabs.c:802 OOps/ugtabs.c:848 +#: OOps/ugtabs.c:803 OOps/ugtabs.c:849 #, c-format msgid "table: could not read negative pos %d" msgstr "" @@ -5806,19 +5828,19 @@ msgid "crossfm: ftable not found" msgstr "" -#: Opcodes/date.c:96 +#: Opcodes/date.c:97 msgid "cannot determine current directory" msgstr "" -#: Opcodes/date.c:133 +#: Opcodes/date.c:134 msgid "readf: failed to open file" msgstr "" -#: Opcodes/date.c:159 +#: Opcodes/date.c:161 msgid "readf: read failure" msgstr "" -#: Opcodes/date.c:169 Opcodes/date.c:177 +#: Opcodes/date.c:171 Opcodes/date.c:179 msgid "readi failed to initialise" msgstr "" @@ -6068,12 +6090,12 @@ msgid "ftconv: not initialised" msgstr "" -#: Opcodes/ftgen.c:69 Opcodes/ftgen.c:212 +#: Opcodes/ftgen.c:69 Opcodes/ftgen.c:213 #, c-format msgid "Error deleting ftable %d" msgstr "" -#: Opcodes/ftgen.c:137 Opcodes/signalflowgraph.cpp:1175 +#: Opcodes/ftgen.c:137 Opcodes/signalflowgraph.cpp:1383 msgid "ftgen string arg not allowed" msgstr "" @@ -6081,105 +6103,105 @@ msgid "ftgen error" msgstr "" -#: Opcodes/ftgen.c:209 +#: Opcodes/ftgen.c:210 #, c-format msgid "Invalid table number: %d" msgstr "" -#: Opcodes/ftgen.c:392 +#: Opcodes/ftgen.c:393 msgid "ftload: error allocating ftable" msgstr "" -#: Opcodes/ftgen.c:394 +#: Opcodes/ftgen.c:395 msgid "ftload: no table numbers" msgstr "" -#: Opcodes/ftgen.c:396 +#: Opcodes/ftgen.c:397 msgid "ftload: unable to open file" msgstr "" -#: Opcodes/ftgen.c:399 +#: Opcodes/ftgen.c:400 msgid "ftload: incorrect file" msgstr "" -#: Opcodes/ftgen.c:539 +#: Opcodes/ftgen.c:540 msgid "ftsave: Bad table number. Saving is possible only for existing tables." msgstr "" -#: Opcodes/ftgen.c:542 +#: Opcodes/ftgen.c:543 msgid "ftsave: no table numbers" msgstr "" -#: Opcodes/ftgen.c:544 +#: Opcodes/ftgen.c:545 msgid "ftsave: unable to open file" msgstr "" -#: Opcodes/ftgen.c:546 +#: Opcodes/ftgen.c:547 msgid "ftsave: failed to write file" msgstr "" -#: Opcodes/gab/gab.c:112 +#: Opcodes/gab/gab.c:114 msgid "fastab: incorrect table number" msgstr "" -#: Opcodes/gab/gab.c:139 Opcodes/gab/gab.c:148 Opcodes/gab/gab.c:178 +#: Opcodes/gab/gab.c:141 Opcodes/gab/gab.c:150 Opcodes/gab/gab.c:180 msgid "tabw off end" msgstr "" -#: Opcodes/gab/gab.c:164 Opcodes/gab/gab.c:241 Opcodes/gab/gab.c:250 +#: Opcodes/gab/gab.c:166 Opcodes/gab/gab.c:243 Opcodes/gab/gab.c:252 msgid "tab off end" msgstr "" -#: Opcodes/gab/gab.c:190 +#: Opcodes/gab/gab.c:192 msgid "tab_i: incorrect table number" msgstr "" -#: Opcodes/gab/gab.c:198 +#: Opcodes/gab/gab.c:200 #, c-format msgid "tab_i off end: table number: %d\n" msgstr "" -#: Opcodes/gab/gab.c:211 +#: Opcodes/gab/gab.c:213 msgid "tabw_i: incorrect table number" msgstr "" -#: Opcodes/gab/gab.c:218 +#: Opcodes/gab/gab.c:220 msgid "tabw_i off end" msgstr "" -#: Opcodes/gab/gab.c:263 +#: Opcodes/gab/gab.c:265 msgid "tab_init: incorrect table number" msgstr "" -#: Opcodes/gab/gab.c:332 +#: Opcodes/gab/gab.c:334 msgid "printi parameter was not a \"quoted string\"" msgstr "" -#: Opcodes/gab/gab.c:446 +#: Opcodes/gab/gab.c:448 msgid "adsynt2: wavetable not found!" msgstr "" -#: Opcodes/gab/gab.c:458 +#: Opcodes/gab/gab.c:460 msgid "adsynt2: freqtable not found!" msgstr "" -#: Opcodes/gab/gab.c:463 +#: Opcodes/gab/gab.c:465 msgid "adsynt2: partial count is greater than freqtable size!" msgstr "" -#: Opcodes/gab/gab.c:472 +#: Opcodes/gab/gab.c:474 msgid "adsynt2: amptable not found!" msgstr "" -#: Opcodes/gab/gab.c:477 +#: Opcodes/gab/gab.c:479 msgid "adsynt2: partial count is greater than amptable size!" msgstr "" -#: Opcodes/gab/gab.c:525 +#: Opcodes/gab/gab.c:527 msgid "adsynt2: not initialised" msgstr "" -#: Opcodes/gab/gab.c:759 +#: Opcodes/gab/gab.c:771 msgid "max_k: invalid imaxflag value" msgstr "" @@ -6697,11 +6719,11 @@ msgid "vlinseg/vexpseg: invalid num. of elements" msgstr "" -#: Opcodes/gab/vectorial.c:2255 Opcodes/vpvoc.c:119 +#: Opcodes/gab/vectorial.c:2255 Opcodes/vpvoc.c:121 msgid "tableseg: not initialised" msgstr "" -#: Opcodes/gab/vectorial.c:2285 Opcodes/vpvoc.c:148 +#: Opcodes/gab/vectorial.c:2285 Opcodes/vpvoc.c:150 msgid "tablexseg: not initialised" msgstr "" @@ -7099,8 +7121,8 @@ msgid "loscilx: invalid number of output arguments" msgstr "" -#: Opcodes/loscilx.c:209 Opcodes/loscilx.c:238 Opcodes/pvlock.c:152 -#: Opcodes/pvlock.c:375 Opcodes/pvsbasic.c:566 +#: Opcodes/loscilx.c:209 Opcodes/loscilx.c:238 Opcodes/pvlock.c:160 +#: Opcodes/pvlock.c:383 Opcodes/pvlock.c:657 Opcodes/pvsbasic.c:566 msgid "" "number of output arguments inconsistent with number of sound file channels" msgstr "" @@ -7109,7 +7131,12 @@ msgid "loscilx: not initialised" msgstr "" -#: Opcodes/lowpassr.c:85 Opcodes/lowpassr.c:140 +#: Opcodes/lowpassr.c:55 Opcodes/lowpassr.c:99 Opcodes/lowpassr.c:121 +#: Opcodes/lowpassr.c:155 Opcodes/lowpassr.c:176 Opcodes/lowpassr.c:210 +msgid "Cutoff parameter must be positive" +msgstr "" + +#: Opcodes/lowpassr.c:252 Opcodes/lowpassr.c:312 msgid "illegal order num. (min 1, max 10)" msgstr "" @@ -7324,20 +7351,20 @@ msgid "partikkel: " msgstr "" -#: Opcodes/partikkel.c:841 +#: Opcodes/partikkel.c:839 msgid "partikkelsync: opcode id needs to be a non-zero integer" msgstr "" -#: Opcodes/partikkel.c:845 Opcodes/partikkel.c:851 +#: Opcodes/partikkel.c:843 Opcodes/partikkel.c:849 msgid "partikkelsync: could not find opcode id" msgstr "" -#: Opcodes/partikkel.c:881 +#: Opcodes/partikkel.c:879 #, c-format msgid "%s: partikkel not initialized" msgstr "" -#: Opcodes/partikkel.c:889 +#: Opcodes/partikkel.c:887 #, c-format msgid "%s: could not find opcode id" msgstr "" @@ -7456,71 +7483,71 @@ msgid "adsynt: partial count is greater than amptable size!" msgstr "" -#: Opcodes/pitch.c:690 +#: Opcodes/pitch.c:691 msgid "adsynt: not initialised" msgstr "" -#: Opcodes/pitch.c:770 +#: Opcodes/pitch.c:771 msgid "hsboscil: not initialised" msgstr "" -#: Opcodes/pitch.c:856 +#: Opcodes/pitch.c:857 msgid "pitchamdf: maxcps must be > mincps !" msgstr "" -#: Opcodes/pitch.c:1003 +#: Opcodes/pitch.c:1004 msgid "pitchamdf: not initialised" msgstr "" -#: Opcodes/pitch.c:1184 Opcodes/pitch.c:1214 +#: Opcodes/pitch.c:1185 Opcodes/pitch.c:1215 msgid "phasorbnk: not initialised" msgstr "" -#: Opcodes/pitch.c:1281 +#: Opcodes/pitch.c:1282 msgid "pinkish: Invalid method code" msgstr "" -#: Opcodes/pitch.c:1292 +#: Opcodes/pitch.c:1293 msgid "pinkish: Filter method requires a-rate (noise) input" msgstr "" -#: Opcodes/pitch.c:1421 +#: Opcodes/pitch.c:1422 #, c-format msgid "" "pinkish: Gardner method requires 4-%d bands. Default %ld substituted for " "%d.\n" msgstr "" -#: Opcodes/pitch.c:1684 +#: Opcodes/pitch.c:1685 msgid "Incorrect argument count in transeg" msgstr "" -#: Opcodes/pitch.c:1735 +#: Opcodes/pitch.c:1736 msgid "Incorrect argument count in transegb" msgstr "" -#: Opcodes/pitch.c:1786 Opcodes/pitch.c:1947 +#: Opcodes/pitch.c:1787 Opcodes/pitch.c:1948 msgid "Error: transeg not initialised (krate)\n" msgstr "" -#: Opcodes/pitch.c:1824 Opcodes/pitch.c:2007 +#: Opcodes/pitch.c:1825 Opcodes/pitch.c:2008 msgid "transeg: not initialised (arate)\n" msgstr "" -#: Opcodes/pitch.c:1884 +#: Opcodes/pitch.c:1885 msgid "Incorrect argument count in transegr" msgstr "" -#: Opcodes/pitch.c:2303 +#: Opcodes/pitch.c:2321 msgid "median: not initialised (arate)\n" msgstr "" -#: Opcodes/pitch.c:2307 Opcodes/pitch.c:2360 +#: Opcodes/pitch.c:2325 Opcodes/pitch.c:2378 #, c-format msgid "median: window (%d)larger than maximum(%d); truncated" msgstr "" -#: Opcodes/pitch.c:2356 +#: Opcodes/pitch.c:2374 msgid "median: not initialised (krate)\n" msgstr "" @@ -7638,30 +7665,30 @@ msgid "PVBUFREAD cannot load %s" msgstr "" -#: Opcodes/pvinterp.c:82 Opcodes/vpvoc.c:215 +#: Opcodes/pvinterp.c:82 Opcodes/vpvoc.c:217 #, c-format msgid "PVOC frame %ld bigger than %ld in %s" msgstr "" -#: Opcodes/pvinterp.c:87 Opcodes/vpvoc.c:220 +#: Opcodes/pvinterp.c:87 Opcodes/vpvoc.c:222 #, c-format msgid "PVOC frame %ld seems too small in %s" msgstr "" #: Opcodes/pvinterp.c:91 Opcodes/pvinterp.c:203 Opcodes/pvinterp.c:393 -#: Opcodes/vpvoc.c:224 +#: Opcodes/vpvoc.c:226 #, c-format msgid "%d chans (not 1) in PVOC file %s" msgstr "" #: Opcodes/pvinterp.c:106 Opcodes/pvinterp.c:230 Opcodes/pvinterp.c:418 -#: Opcodes/ugens8.c:101 Opcodes/vpvoc.c:252 +#: Opcodes/ugens8.c:101 Opcodes/vpvoc.c:254 #, c-format msgid "ksmps of %d needs wdw of %d, max is %d for pv %s" msgstr "" #: Opcodes/pvinterp.c:135 Opcodes/pvinterp.c:284 Opcodes/pvinterp.c:475 -#: Opcodes/pvread.c:109 Opcodes/ugens8.c:174 Opcodes/vpvoc.c:314 +#: Opcodes/pvread.c:109 Opcodes/ugens8.c:174 Opcodes/vpvoc.c:316 msgid "PVOC ktimpnt truncated to last frame" msgstr "" @@ -7670,7 +7697,7 @@ msgstr "" #: Opcodes/pvinterp.c:146 Opcodes/pvinterp.c:337 Opcodes/pvinterp.c:540 -#: Opcodes/pvread.c:117 Opcodes/ugens8.c:232 Opcodes/vpvoc.c:382 +#: Opcodes/pvread.c:117 Opcodes/ugens8.c:232 Opcodes/vpvoc.c:384 msgid "PVOC timpnt < 0" msgstr "" @@ -7693,12 +7720,12 @@ msgstr "" #: Opcodes/pvinterp.c:332 Opcodes/pvinterp.c:534 Opcodes/ugens8.c:226 -#: Opcodes/vpvoc.c:376 +#: Opcodes/vpvoc.c:378 msgid "PVOC transpose too low" msgstr "" #: Opcodes/pvinterp.c:335 Opcodes/pvinterp.c:537 Opcodes/ugens8.c:229 -#: Opcodes/vpvoc.c:379 +#: Opcodes/vpvoc.c:381 msgid "PVOC transpose too high" msgstr "" @@ -7716,7 +7743,7 @@ msgid "pvcross: %s: frame size %d does not match pvbufread frame size %d\n" msgstr "" -#: Opcodes/pvinterp.c:498 Opcodes/vpvoc.c:339 +#: Opcodes/pvinterp.c:498 Opcodes/vpvoc.c:341 msgid "PVOC debug: one frame gets through\n" msgstr "" @@ -7724,18 +7751,18 @@ msgid "pvcross: not initialised" msgstr "" -#: Opcodes/pvlock.c:67 Opcodes/pvsbasic.c:480 +#: Opcodes/pvlock.c:71 Opcodes/pvsbasic.c:480 msgid "invalid number of output arguments" msgstr "" -#: Opcodes/pvlock.c:536 Opcodes/pvsband.c:46 Opcodes/pvsbasic.c:684 +#: Opcodes/pvlock.c:826 Opcodes/pvsband.c:46 Opcodes/pvsbasic.c:684 #: Opcodes/pvsbasic.c:1007 Opcodes/pvsbasic.c:1220 Opcodes/pvsbasic.c:1326 #: Opcodes/pvsbasic.c:1555 Opcodes/pvsbasic.c:1768 Opcodes/pvsbasic.c:1942 -#: Opcodes/pvsgendy.c:43 Opcodes/signalflowgraph.cpp:627 +#: Opcodes/pvsgendy.c:43 Opcodes/signalflowgraph.cpp:665 msgid "Unsafe to have same fsig as in and out" msgstr "" -#: Opcodes/pvlock.c:548 +#: Opcodes/pvlock.c:838 msgid "pvsfreeze: signal format must be amp-freq." msgstr "" @@ -8091,48 +8118,48 @@ msgid "Nothing to close" msgstr "" -#: Opcodes/sfont.c:111 +#: Opcodes/sfont.c:114 #, c-format msgid "sfload: cannot open SoundFont file \"%s\" (error %s)" msgstr "" -#: Opcodes/sfont.c:117 +#: Opcodes/sfont.c:120 msgid "Sfload: cannot use globals" msgstr "" -#: Opcodes/sfont.c:150 +#: Opcodes/sfont.c:153 msgid "sfload: could not open globals\n" msgstr "" -#: Opcodes/sfont.c:172 +#: Opcodes/sfont.c:175 msgid "Extending soundfonts" msgstr "" -#: Opcodes/sfont.c:211 +#: Opcodes/sfont.c:214 #, c-format msgid "" "\n" "Preset list of \"%s\"\n" msgstr "" -#: Opcodes/sfont.c:214 +#: Opcodes/sfont.c:217 #, c-format msgid "%3d) %-20s\tprog:%-3d bank:%d\n" msgstr "" -#: Opcodes/sfont.c:236 +#: Opcodes/sfont.c:239 #, c-format msgid "" "\n" "Assigning all Presets of \"%s\" starting from %d (preset handle number)\n" msgstr "" -#: Opcodes/sfont.c:241 +#: Opcodes/sfont.c:244 #, c-format msgid "%3d<--%-20s\t(prog:%-3d bank:%d)\n" msgstr "" -#: Opcodes/sfont.c:248 +#: Opcodes/sfont.c:251 #, c-format msgid "" "\n" @@ -8140,38 +8167,38 @@ "\n" msgstr "" -#: Opcodes/sfont.c:261 +#: Opcodes/sfont.c:264 #, c-format msgid "" "\n" "Instrument list of \"%s\"\n" msgstr "" -#: Opcodes/sfont.c:279 +#: Opcodes/sfont.c:282 #, c-format msgid "sfpreset: preset handle too big (%d), max: %d" msgstr "" -#: Opcodes/sfont.c:296 +#: Opcodes/sfont.c:299 #, c-format msgid "" "sfpreset: cannot find any preset having prog number %d and bank number %d in " "SoundFont file \"%s\"" msgstr "" -#: Opcodes/sfont.c:318 Opcodes/sfont.c:2248 +#: Opcodes/sfont.c:321 Opcodes/sfont.c:2251 msgid "sfplay: invalid or out-of-range preset number" msgstr "" -#: Opcodes/sfont.c:655 +#: Opcodes/sfont.c:658 msgid "sfplaym: invalid or out-of-range preset number" msgstr "" -#: Opcodes/sfont.c:919 Opcodes/sfont.c:1191 +#: Opcodes/sfont.c:922 Opcodes/sfont.c:1194 msgid "sfinstr: instrument out of range" msgstr "" -#: Opcodes/sfont.c:1648 Opcodes/sfont.c:1886 +#: Opcodes/sfont.c:1651 Opcodes/sfont.c:1889 #, c-format msgid "" "SoundFont file \"%s\" contains ROM samples !\n" @@ -8179,15 +8206,15 @@ "Session aborted !" msgstr "" -#: Opcodes/sfont.c:2041 Opcodes/sfont.c:2049 +#: Opcodes/sfont.c:2044 Opcodes/sfont.c:2052 msgid "Sfont: cannot use globals/" msgstr "" -#: Opcodes/sfont.c:2054 +#: Opcodes/sfont.c:2057 msgid "Sfont format not compatible" msgstr "" -#: Opcodes/sfont.c:2598 +#: Opcodes/sfont.c:2601 msgid "error... could not create sfont globals\n" msgstr "" @@ -8195,31 +8222,36 @@ msgid "powershape: ifullscale must be strictly positive" msgstr "" -#: Opcodes/signalflowgraph.cpp:332 Opcodes/signalflowgraph.cpp:593 +#: Opcodes/signalflowgraph.cpp:360 Opcodes/signalflowgraph.cpp:629 #, c-format msgid "Connected instances of outlet %s to instance 0x%x of inlet %s.\n" msgstr "" -#: Opcodes/signalflowgraph.cpp:408 +#: Opcodes/signalflowgraph.cpp:438 #, c-format msgid "Created instance 0x%x of %d instances of outlet %s\n" msgstr "" -#: Opcodes/signalflowgraph.cpp:468 +#: Opcodes/signalflowgraph.cpp:500 #, c-format msgid "Connected instances of outlet %s to instance 0x%xof inlet %s.\n" msgstr "" -#: Opcodes/signalflowgraph.cpp:655 +#: Opcodes/signalflowgraph.cpp:693 msgid "inletf: signal format must be amp-phase or amp-freq." msgstr "" -#: Opcodes/signalflowgraph.cpp:948 Opcodes/signalflowgraph.cpp:989 +#: Opcodes/signalflowgraph.cpp:837 +#, c-format +msgid "Connected instances of outlet %s to instance 0x%x of inlet %s\n" +msgstr "" + +#: Opcodes/signalflowgraph.cpp:1150 Opcodes/signalflowgraph.cpp:1193 #, c-format msgid "Connected outlet %s to inlet %s.\n" msgstr "" -#: Opcodes/signalflowgraph.cpp:1116 Opcodes/signalflowgraph.cpp:1200 +#: Opcodes/signalflowgraph.cpp:1322 Opcodes/signalflowgraph.cpp:1408 msgid "ftgenonce error" msgstr "" @@ -8531,7 +8563,7 @@ msgid "Error allocating argument stack" msgstr "" -#: Opcodes/stackops.c:206 Top/argdecode.c:1245 util/envext.c:99 +#: Opcodes/stackops.c:206 Top/argdecode.c:1263 util/envext.c:99 #: util/scale.c:248 msgid "too many arguments" msgstr "" @@ -8961,7 +8993,7 @@ msgid "ATSCROSS: you must have an atsbufread before an atsinterpread" msgstr "" -#: Opcodes/ugsc.c:434 +#: Opcodes/ugsc.c:439 msgid "Phaser mode must be either 1 or 2" msgstr "" @@ -9089,21 +9121,21 @@ msgid "Have to have at least %d directions in vbapzmove" msgstr "" -#: Opcodes/vpvoc.c:175 +#: Opcodes/vpvoc.c:177 #, c-format msgid "vpvoc: Could not find ifnmagctrl table %f" msgstr "" -#: Opcodes/vpvoc.c:181 +#: Opcodes/vpvoc.c:183 msgid "vpvoc: associated tableseg not found" msgstr "" -#: Opcodes/vpvoc.c:203 +#: Opcodes/vpvoc.c:205 #, c-format msgid "VPVOC cannot load %s" msgstr "" -#: Opcodes/vpvoc.c:373 +#: Opcodes/vpvoc.c:375 msgid "vpvoc: not initialised" msgstr "" @@ -9175,746 +9207,758 @@ msgid "No wii range" msgstr "" -#: Top/argdecode.c:63 +#: Top/argdecode.c:64 msgid "--help\tprint long usage options" msgstr "" -#: Top/argdecode.c:64 +#: Top/argdecode.c:65 msgid "-U unam\trun utility program unam" msgstr "" -#: Top/argdecode.c:65 +#: Top/argdecode.c:66 msgid "-C\tuse Cscore processing of scorefile" msgstr "" -#: Top/argdecode.c:66 +#: Top/argdecode.c:67 msgid "-j N\tuse N threads in performance" msgstr "" -#: Top/argdecode.c:67 +#: Top/argdecode.c:68 msgid "-I\tI-time only orch run" msgstr "" -#: Top/argdecode.c:68 +#: Top/argdecode.c:69 msgid "-n\tno sound onto disk" msgstr "" -#: Top/argdecode.c:69 +#: Top/argdecode.c:70 msgid "-i fnam\tsound input filename" msgstr "" -#: Top/argdecode.c:70 util/mixer.c:94 util/scale.c:45 +#: Top/argdecode.c:71 util/mixer.c:94 util/scale.c:45 msgid "-o fnam\tsound output filename" msgstr "" -#: Top/argdecode.c:71 +#: Top/argdecode.c:72 msgid "-b N\tsample frames (or -kprds) per software sound I/O buffer" msgstr "" -#: Top/argdecode.c:72 +#: Top/argdecode.c:73 msgid "-B N\tsamples per hardware sound I/O buffer" msgstr "" -#: Top/argdecode.c:73 util/mixer.c:95 util/scale.c:46 util/srconv.c:752 +#: Top/argdecode.c:74 util/mixer.c:95 util/scale.c:46 util/srconv.c:752 msgid "-A\tcreate an AIFF format output soundfile" msgstr "" -#: Top/argdecode.c:74 util/mixer.c:96 util/scale.c:47 util/srconv.c:754 +#: Top/argdecode.c:75 util/mixer.c:96 util/scale.c:47 util/srconv.c:754 msgid "-W\tcreate a WAV format output soundfile" msgstr "" -#: Top/argdecode.c:75 util/srconv.c:753 +#: Top/argdecode.c:76 util/srconv.c:753 msgid "-J\tcreate an IRCAM format output soundfile" msgstr "" -#: Top/argdecode.c:76 util/mixer.c:97 util/scale.c:48 util/srconv.c:755 +#: Top/argdecode.c:77 util/mixer.c:97 util/scale.c:48 util/srconv.c:755 msgid "-h\tno header on output soundfile" msgstr "" -#: Top/argdecode.c:77 util/mixer.c:99 util/scale.c:49 util/srconv.c:756 +#: Top/argdecode.c:78 util/mixer.c:99 util/scale.c:49 util/srconv.c:756 msgid "-c\t8-bit signed_char sound samples" msgstr "" -#: Top/argdecode.c:79 util/mixer.c:101 util/scale.c:50 util/srconv.c:757 +#: Top/argdecode.c:80 util/mixer.c:101 util/scale.c:50 util/srconv.c:757 msgid "-a\talaw sound samples" msgstr "" -#: Top/argdecode.c:81 util/mixer.c:98 util/mixer.c:100 util/srconv.c:758 +#: Top/argdecode.c:82 util/mixer.c:98 util/mixer.c:100 util/srconv.c:758 msgid "-8\t8-bit unsigned_char sound samples" msgstr "" -#: Top/argdecode.c:82 util/mixer.c:102 util/scale.c:51 util/srconv.c:759 +#: Top/argdecode.c:83 util/mixer.c:102 util/scale.c:51 util/srconv.c:759 msgid "-u\tulaw sound samples" msgstr "" -#: Top/argdecode.c:83 util/mixer.c:103 util/scale.c:52 util/srconv.c:760 +#: Top/argdecode.c:84 util/mixer.c:103 util/scale.c:52 util/srconv.c:760 msgid "-s\tshort_int sound samples" msgstr "" -#: Top/argdecode.c:84 util/mixer.c:104 util/scale.c:53 util/srconv.c:761 +#: Top/argdecode.c:85 util/mixer.c:104 util/scale.c:53 util/srconv.c:761 msgid "-l\tlong_int sound samples" msgstr "" -#: Top/argdecode.c:85 util/mixer.c:105 util/scale.c:54 util/srconv.c:762 +#: Top/argdecode.c:86 util/mixer.c:105 util/scale.c:54 util/srconv.c:762 msgid "-f\tfloat sound samples" msgstr "" -#: Top/argdecode.c:86 +#: Top/argdecode.c:87 msgid "-3\t24bit sound samples" msgstr "" -#: Top/argdecode.c:87 util/srconv.c:763 +#: Top/argdecode.c:88 util/srconv.c:763 msgid "-r N\torchestra srate override" msgstr "" -#: Top/argdecode.c:88 +#: Top/argdecode.c:89 msgid "-k N\torchestra krate override" msgstr "" -#: Top/argdecode.c:89 util/srconv.c:764 +#: Top/argdecode.c:90 util/srconv.c:764 msgid "-K\tDo not generate PEAK chunks" msgstr "" -#: Top/argdecode.c:90 +#: Top/argdecode.c:91 msgid "-v\tverbose orch translation" msgstr "" -#: Top/argdecode.c:91 +#: Top/argdecode.c:92 msgid "-m N\ttty message level. Sum of:" msgstr "" -#: Top/argdecode.c:92 +#: Top/argdecode.c:93 msgid "\t\t1=note amps, 2=out-of-range msg, 4=warnings" msgstr "" -#: Top/argdecode.c:93 +#: Top/argdecode.c:94 msgid "\t\t0/32/64/96=note amp format (raw,dB,colors)" msgstr "" -#: Top/argdecode.c:94 +#: Top/argdecode.c:95 msgid "\t\t128=print benchmark information" msgstr "" -#: Top/argdecode.c:95 +#: Top/argdecode.c:96 msgid "-d\tsuppress all displays" msgstr "" -#: Top/argdecode.c:96 +#: Top/argdecode.c:97 msgid "-g\tsuppress graphics, use ascii displays" msgstr "" -#: Top/argdecode.c:97 +#: Top/argdecode.c:98 msgid "-G\tsuppress graphics, use Postscript displays" msgstr "" -#: Top/argdecode.c:98 +#: Top/argdecode.c:99 msgid "-x fnam\textract from score.srt using extract file 'fnam'" msgstr "" -#: Top/argdecode.c:99 +#: Top/argdecode.c:100 msgid "-t N\tuse uninterpreted beats of the score, initially at tempo N" msgstr "" -#: Top/argdecode.c:100 +#: Top/argdecode.c:101 msgid "-t 0\tuse score.srt for sorted score rather than a temporary" msgstr "" -#: Top/argdecode.c:101 +#: Top/argdecode.c:102 msgid "-L dnam\tread Line-oriented realtime score events from device 'dnam'" msgstr "" -#: Top/argdecode.c:102 +#: Top/argdecode.c:103 msgid "-M dnam\tread MIDI realtime events from device 'dnam'" msgstr "" -#: Top/argdecode.c:103 +#: Top/argdecode.c:104 msgid "-F fnam\tread MIDIfile event stream from file 'fnam'" msgstr "" -#: Top/argdecode.c:105 util/mixer.c:106 util/scale.c:59 util/srconv.c:765 +#: Top/argdecode.c:106 util/mixer.c:106 util/scale.c:59 util/srconv.c:765 msgid "-R\tcontinually rewrite header while writing soundfile (WAV/AIFF)" msgstr "" -#: Top/argdecode.c:106 +#: Top/argdecode.c:107 msgid "-H#\tprint heartbeat style 1, 2 or 3 at each soundfile write" msgstr "" -#: Top/argdecode.c:107 util/mixer.c:108 util/scale.c:61 util/srconv.c:767 +#: Top/argdecode.c:108 util/mixer.c:108 util/scale.c:61 util/srconv.c:767 msgid "-N\tnotify (ring the bell) when score or miditrack is done" msgstr "" -#: Top/argdecode.c:108 +#: Top/argdecode.c:109 msgid "-T\tterminate the performance when miditrack is done" msgstr "" -#: Top/argdecode.c:109 +#: Top/argdecode.c:110 msgid "-D\tdefer GEN01 soundfile loads until performance time" msgstr "" -#: Top/argdecode.c:110 +#: Top/argdecode.c:111 msgid "-Q dnam\tselect MIDI output device" msgstr "" -#: Top/argdecode.c:111 +#: Top/argdecode.c:112 msgid "-z\tList opcodes in this version" msgstr "" -#: Top/argdecode.c:112 +#: Top/argdecode.c:113 msgid "-Z\tDither output" msgstr "" -#: Top/argdecode.c:114 +#: Top/argdecode.c:115 msgid "--sched set real-time priority and lock memory" msgstr "" -#: Top/argdecode.c:115 Top/argdecode.c:117 +#: Top/argdecode.c:116 Top/argdecode.c:118 msgid " (requires -d and real time audio (-iadc/-odac))" msgstr "" -#: Top/argdecode.c:116 +#: Top/argdecode.c:117 msgid "--sched=N set specified scheduling priority, and lock memory" msgstr "" -#: Top/argdecode.c:126 +#: Top/argdecode.c:127 msgid "\t\t\tSet output file format" msgstr "" -#: Top/argdecode.c:127 +#: Top/argdecode.c:128 msgid "--aiff\t\t\tSet AIFF format" msgstr "" -#: Top/argdecode.c:128 +#: Top/argdecode.c:129 msgid "--au\t\t\tSet AU format" msgstr "" -#: Top/argdecode.c:129 +#: Top/argdecode.c:130 msgid "--wave\t\t\tSet WAV format" msgstr "" -#: Top/argdecode.c:130 +#: Top/argdecode.c:131 msgid "--ircam\t\t\tSet IRCAM format" msgstr "" -#: Top/argdecode.c:131 +#: Top/argdecode.c:132 msgid "--ogg\t\t\tSet OGG/VORBIS format" msgstr "" -#: Top/argdecode.c:132 +#: Top/argdecode.c:133 msgid "--noheader\t\tRaw format" msgstr "" -#: Top/argdecode.c:133 +#: Top/argdecode.c:134 msgid "--nopeaks\t\tDo not write peak information" msgstr "" -#: Top/argdecode.c:135 +#: Top/argdecode.c:136 msgid "--nodisplays\t\tSuppress all displays" msgstr "" -#: Top/argdecode.c:136 +#: Top/argdecode.c:137 msgid "--asciidisplay\t\tSuppress graphics, use ascii displays" msgstr "" -#: Top/argdecode.c:137 +#: Top/argdecode.c:138 msgid "--postscriptdisplay\tSuppress graphics, use Postscript displays" msgstr "" -#: Top/argdecode.c:139 +#: Top/argdecode.c:140 msgid "--defer-gen1\t\tDefer GEN01 soundfile loads until performance time" msgstr "" -#: Top/argdecode.c:140 +#: Top/argdecode.c:141 msgid "" "--iobufsamps=N\t\tSample frames (or -kprds) per software sound I/O buffer" msgstr "" -#: Top/argdecode.c:142 +#: Top/argdecode.c:143 msgid "--hardwarebufsamps=N\tSamples per hardware sound I/O buffer" msgstr "" -#: Top/argdecode.c:143 +#: Top/argdecode.c:144 msgid "--cscore\t\tUse Cscore processing of scorefile" msgstr "" -#: Top/argdecode.c:144 +#: Top/argdecode.c:145 msgid "--orc\t\t\tUse orchfile without scorefile" msgstr "" -#: Top/argdecode.c:146 +#: Top/argdecode.c:147 msgid "--midifile=FNAME\tRead MIDIfile event stream from file" msgstr "" -#: Top/argdecode.c:147 +#: Top/argdecode.c:148 msgid "--midioutfile=FNAME\tWrite MIDI output to file FNAME" msgstr "" -#: Top/argdecode.c:148 +#: Top/argdecode.c:149 msgid "--midi-device=FNAME\tRead MIDI realtime events from device" msgstr "" -#: Top/argdecode.c:149 +#: Top/argdecode.c:150 msgid "--terminate-on-midi\tTerminate the performance when miditrack is done" msgstr "" -#: Top/argdecode.c:151 +#: Top/argdecode.c:152 msgid "" "--heartbeat=N\t\tPrint a heartbeat style 1, 2 or 3 at each soundfile write" msgstr "" -#: Top/argdecode.c:153 +#: Top/argdecode.c:154 msgid "--notify\t\tNotify (ring the bell) when score or miditrack is done" msgstr "" -#: Top/argdecode.c:154 +#: Top/argdecode.c:155 msgid "" "--rewrite\t\tContinually rewrite header while writing soundfile (WAV/AIFF)" msgstr "" -#: Top/argdecode.c:157 +#: Top/argdecode.c:158 msgid "--input=FNAME\t\tSound input filename" msgstr "" -#: Top/argdecode.c:158 +#: Top/argdecode.c:159 msgid "--output=FNAME\t\tSound output filename" msgstr "" -#: Top/argdecode.c:159 +#: Top/argdecode.c:160 msgid "--logfile=FNAME\t\tLog output to file" msgstr "" -#: Top/argdecode.c:161 +#: Top/argdecode.c:162 msgid "--nosound\t\tNo sound onto disk or device" msgstr "" -#: Top/argdecode.c:162 +#: Top/argdecode.c:163 msgid "--tempo=N\t\tUse uninterpreted beats of the score, initially at tempo N" msgstr "" -#: Top/argdecode.c:164 +#: Top/argdecode.c:165 msgid "--i-only\t\tI-time only orch run" msgstr "" -#: Top/argdecode.c:165 +#: Top/argdecode.c:166 msgid "--syntax-check-only\tStop after checking orchestra and score syntax" msgstr "" -#: Top/argdecode.c:166 +#: Top/argdecode.c:167 msgid "--control-rate=N\tOrchestra krate override" msgstr "" -#: Top/argdecode.c:167 +#: Top/argdecode.c:168 msgid "--sample-rate=N\t\tOrchestra srate override" msgstr "" -#: Top/argdecode.c:168 +#: Top/argdecode.c:169 msgid "--score-in=FNAME\tRead Line-oriented realtime score events from device" msgstr "" -#: Top/argdecode.c:170 +#: Top/argdecode.c:171 msgid "--messagelevel=N\ttty message level, sum of:" msgstr "" -#: Top/argdecode.c:171 +#: Top/argdecode.c:172 msgid "--messageolevel=O\ttty message level in octal, of:" msgstr "" -#: Top/argdecode.c:172 +#: Top/argdecode.c:173 msgid "\t\t\t\t1=note amps, 2=out-of-range msg, 4=warnings," msgstr "" -#: Top/argdecode.c:173 +#: Top/argdecode.c:174 msgid "\t\t\t\t0/32/64/96=note amp format (raw,dB,colors)," msgstr "" -#: Top/argdecode.c:174 +#: Top/argdecode.c:175 msgid "\t\t\t\t128=print benchmark information" msgstr "" -#: Top/argdecode.c:176 +#: Top/argdecode.c:177 msgid "--m-amps=[01]\tmessages on note amps" msgstr "" -#: Top/argdecode.c:177 +#: Top/argdecode.c:178 msgid "--m-range=[01]\tMessages on range errors" msgstr "" -#: Top/argdecode.c:178 +#: Top/argdecode.c:179 msgid "--m-warnings=[01]\tMesage on warnings" msgstr "" -#: Top/argdecode.c:179 +#: Top/argdecode.c:180 msgid "--m-raw=[01]\tRaw amp messages" msgstr "" -#: Top/argdecode.c:180 +#: Top/argdecode.c:181 msgid "--m-dB=[01]\tAmp messages in dB" msgstr "" -#: Top/argdecode.c:181 +#: Top/argdecode.c:182 msgid "--m-colours=[01]\tColour amp messages" msgstr "" -#: Top/argdecode.c:182 +#: Top/argdecode.c:183 msgid "--m-benchmarks=[01]\tPrint benchmark information" msgstr "" -#: Top/argdecode.c:183 +#: Top/argdecode.c:184 msgid "--csd-line-nums=[01]\tControls how error line numbers are printed:" msgstr "" -#: Top/argdecode.c:184 +#: Top/argdecode.c:185 msgid "\t\t\t1=use CSD line #s (default), 0=use ORC/SCO-relative line #s" msgstr "" -#: Top/argdecode.c:185 +#: Top/argdecode.c:186 msgid "--extract-score=FNAME\tExtract from score.srt using extract file" msgstr "" -#: Top/argdecode.c:186 +#: Top/argdecode.c:187 msgid "--keep-sorted-score" msgstr "" -#: Top/argdecode.c:187 +#: Top/argdecode.c:188 msgid "--env:NAME=VALUE\tSet environment variable NAME to VALUE" msgstr "" -#: Top/argdecode.c:188 +#: Top/argdecode.c:189 msgid "--env:NAME+=VALUE\tAppend VALUE to environment variable NAME" msgstr "" -#: Top/argdecode.c:189 +#: Top/argdecode.c:190 msgid "--strsetN=VALUE\t\tSet strset table at index N to VALUE" msgstr "" -#: Top/argdecode.c:190 +#: Top/argdecode.c:191 msgid "--utility=NAME\t\tRun utility program" msgstr "" -#: Top/argdecode.c:191 +#: Top/argdecode.c:192 msgid "--verbose\t\tVerbose orch translation" msgstr "" -#: Top/argdecode.c:192 +#: Top/argdecode.c:193 msgid "--list-opcodes\t\tList opcodes in this version" msgstr "" -#: Top/argdecode.c:193 +#: Top/argdecode.c:194 msgid "--list-opcodesN\t\tList opcodes in style N in this version" msgstr "" -#: Top/argdecode.c:194 +#: Top/argdecode.c:195 msgid "--dither\t\tDither output" msgstr "" -#: Top/argdecode.c:195 +#: Top/argdecode.c:196 msgid "--dither-triangular\t\tDither output with triangular distribution" msgstr "" -#: Top/argdecode.c:196 +#: Top/argdecode.c:197 msgid "--dither-uniform\t\tDither output with rectanular distribution" msgstr "" -#: Top/argdecode.c:197 +#: Top/argdecode.c:198 msgid "--sched\t\t\tSet real-time scheduling priority and lock memory" msgstr "" -#: Top/argdecode.c:198 +#: Top/argdecode.c:199 msgid "--sched=N\t\tSet priority to N and lock memory" msgstr "" -#: Top/argdecode.c:199 +#: Top/argdecode.c:200 msgid "--opcode-lib=NAMES\tDynamic libraries to load" msgstr "" -#: Top/argdecode.c:200 +#: Top/argdecode.c:201 msgid "--opcode-omit=NAMES\tDynamic libraries not to load" msgstr "" -#: Top/argdecode.c:201 +#: Top/argdecode.c:202 msgid "--omacro:XXX=YYY\tSet orchestra macro XXX to value YYY" msgstr "" -#: Top/argdecode.c:202 +#: Top/argdecode.c:203 msgid "--smacro:XXX=YYY\tSet score macro XXX to value YYY" msgstr "" -#: Top/argdecode.c:203 +#: Top/argdecode.c:204 msgid "--midi-key=N\t\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:204 +#: Top/argdecode.c:205 msgid "\t\t\tkey number to pfield N as MIDI value [0-127]" msgstr "" -#: Top/argdecode.c:205 +#: Top/argdecode.c:206 msgid "--midi-key-cps=N\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:206 +#: Top/argdecode.c:207 msgid "\t\t\tkey number to pfield N as cycles per second" msgstr "" -#: Top/argdecode.c:207 +#: Top/argdecode.c:208 msgid "--midi-key-oct=N\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:208 +#: Top/argdecode.c:209 msgid "\t\t\tkey number to pfield N as linear octave" msgstr "" -#: Top/argdecode.c:209 +#: Top/argdecode.c:210 msgid "--midi-key-pch=N\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:210 +#: Top/argdecode.c:211 msgid "\t\t\tkey number to pfield N as oct.pch" msgstr "" -#: Top/argdecode.c:211 +#: Top/argdecode.c:212 msgid "--midi-velocity=N\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:212 +#: Top/argdecode.c:213 msgid "\t\t\tvelocity number to pfield N as MIDI value [0-127]" msgstr "" -#: Top/argdecode.c:213 +#: Top/argdecode.c:214 msgid "--midi-velocity-amp=N\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:214 +#: Top/argdecode.c:215 msgid "\t\t\tvelocity number to pfield N as amplitude" msgstr "" -#: Top/argdecode.c:215 +#: Top/argdecode.c:216 msgid "--no-default-paths\tTurn off relative paths from CSD/ORC/SCO" msgstr "" -#: Top/argdecode.c:216 +#: Top/argdecode.c:217 msgid "--sample-accurate\t\tUse sample-accurate timing of score events" msgstr "" -#: Top/argdecode.c:217 +#: Top/argdecode.c:218 msgid "--realtime\t\trealtime priority mode" msgstr "" -#: Top/argdecode.c:218 +#: Top/argdecode.c:219 msgid "--nchnls=N\t\t override number of audio channels" msgstr "" -#: Top/argdecode.c:219 +#: Top/argdecode.c:220 msgid "--nchnls_i=N\t\t override number of input audio channels" msgstr "" -#: Top/argdecode.c:220 +#: Top/argdecode.c:221 msgid "--0dbfs=N\t\t override 0dbfs (max positive signal amplitude)" msgstr "" -#: Top/argdecode.c:221 +#: Top/argdecode.c:222 msgid "--sinesize\t\tlength of internal sine table" msgstr "" #: Top/argdecode.c:223 +msgid "" +"--daemon\t\t daemon mode: do not exit if CSD/orchestra is not given, is " +"empty or does not compile" +msgstr "" + +#: Top/argdecode.c:225 +msgid "" +"--port=N\t\t listen to UDP port N for instruments/orchestra code (implies --" +"daemon)" +msgstr "" + +#: Top/argdecode.c:228 msgid "--help\t\t\tLong help" msgstr "" -#: Top/argdecode.c:239 +#: Top/argdecode.c:244 #, c-format msgid "flag defaults: csound -s -otest -b%d -B%d -m%d\n" msgstr "" -#: Top/argdecode.c:246 Top/argdecode.c:262 +#: Top/argdecode.c:251 Top/argdecode.c:267 msgid "Usage:\tcsound [-flags] orchfile scorefile\n" msgstr "" -#: Top/argdecode.c:247 Top/argdecode.c:263 util/envext.c:53 util/xtrct.c:67 +#: Top/argdecode.c:252 Top/argdecode.c:268 util/envext.c:53 util/xtrct.c:67 msgid "Legal flags are:\n" msgstr "" -#: Top/argdecode.c:248 +#: Top/argdecode.c:253 msgid "" "Long format:\n" "\n" msgstr "" -#: Top/argdecode.c:253 +#: Top/argdecode.c:258 msgid "" "\n" "Short form:\n" msgstr "" -#: Top/argdecode.c:266 +#: Top/argdecode.c:271 msgid "Csound Command ERROR:\t" msgstr "" -#: Top/argdecode.c:401 +#: Top/argdecode.c:406 #, c-format msgid "unknown output format: '%s'" msgstr "" -#: Top/argdecode.c:419 Top/argdecode.c:1008 +#: Top/argdecode.c:424 Top/argdecode.c:1024 msgid "no iobufsamps" msgstr "" -#: Top/argdecode.c:426 Top/argdecode.c:1015 +#: Top/argdecode.c:431 Top/argdecode.c:1031 msgid "no hardware bufsamps" msgstr "" -#: Top/argdecode.c:452 Top/argdecode.c:1115 +#: Top/argdecode.c:457 Top/argdecode.c:1132 msgid "no midifile name" msgstr "" -#: Top/argdecode.c:457 Top/argdecode.c:1121 +#: Top/argdecode.c:461 Top/argdecode.c:1137 msgid "-F: stdin not supported on this platform" msgstr "" -#: Top/argdecode.c:467 +#: Top/argdecode.c:473 msgid "no midi output file name" msgstr "" -#: Top/argdecode.c:496 +#: Top/argdecode.c:502 msgid "invalid python variable definition syntax" msgstr "" -#: Top/argdecode.c:502 Top/argdecode.c:976 +#: Top/argdecode.c:508 Top/argdecode.c:992 msgid "no infilename" msgstr "" -#: Top/argdecode.c:505 Top/argdecode.c:980 +#: Top/argdecode.c:511 Top/argdecode.c:996 msgid "input cannot be stdout" msgstr "" -#: Top/argdecode.c:509 Top/argdecode.c:984 +#: Top/argdecode.c:515 Top/argdecode.c:1000 msgid "stdin audio not supported" msgstr "" -#: Top/argdecode.c:544 Top/argdecode.c:1048 +#: Top/argdecode.c:550 Top/argdecode.c:1064 msgid "no control rate" msgstr "" -#: Top/argdecode.c:558 Top/argdecode.c:1090 +#: Top/argdecode.c:564 Top/argdecode.c:1106 msgid "no Linein score device_name" msgstr "" -#: Top/argdecode.c:574 Top/argdecode.c:580 Top/argdecode.c:1056 +#: Top/argdecode.c:580 Top/argdecode.c:586 Top/argdecode.c:1072 msgid "no message level" msgstr "" -#: Top/argdecode.c:587 +#: Top/argdecode.c:593 msgid "no message amps" msgstr "" -#: Top/argdecode.c:596 +#: Top/argdecode.c:602 msgid "no message range" msgstr "" -#: Top/argdecode.c:605 +#: Top/argdecode.c:611 msgid "no message warnings" msgstr "" -#: Top/argdecode.c:614 +#: Top/argdecode.c:620 msgid "no message raw" msgstr "" -#: Top/argdecode.c:623 +#: Top/argdecode.c:629 msgid "no message dB" msgstr "" -#: Top/argdecode.c:632 +#: Top/argdecode.c:638 msgid "no message colours" msgstr "" -#: Top/argdecode.c:641 +#: Top/argdecode.c:647 msgid "no benchmark level" msgstr "" -#: Top/argdecode.c:649 +#: Top/argdecode.c:655 msgid "no value for --csd-line-nums" msgstr "" -#: Top/argdecode.c:658 Top/argdecode.c:1101 +#: Top/argdecode.c:664 Top/argdecode.c:1117 msgid "no midi device_name" msgstr "" -#: Top/argdecode.c:663 Top/argdecode.c:1107 +#: Top/argdecode.c:669 Top/argdecode.c:1122 msgid "-M: stdin not supported on this platform" msgstr "" -#: Top/argdecode.c:683 Top/argdecode.c:992 util/envext.c:84 util/mixer.c:206 +#: Top/argdecode.c:689 Top/argdecode.c:1008 util/envext.c:84 util/mixer.c:206 #: util/scale.c:173 util/srconv.c:247 util/xtrct.c:120 msgid "no outfilename" msgstr "" -#: Top/argdecode.c:686 Top/argdecode.c:996 util/scale.c:177 util/srconv.c:251 +#: Top/argdecode.c:692 Top/argdecode.c:1012 util/scale.c:177 util/srconv.c:251 #: util/xtrct.c:124 msgid "-o cannot be stdin" msgstr "" -#: Top/argdecode.c:690 Top/argdecode.c:1000 util/scale.c:180 util/srconv.c:256 +#: Top/argdecode.c:696 Top/argdecode.c:1016 util/scale.c:180 util/srconv.c:256 msgid "stdout audio not supported" msgstr "" -#: Top/argdecode.c:700 Top/argdecode.c:1198 util/hetro.c:232 +#: Top/argdecode.c:706 Top/argdecode.c:1216 util/hetro.c:232 msgid "no log file" msgstr "" -#: Top/argdecode.c:755 Top/argdecode.c:955 +#: Top/argdecode.c:761 Top/argdecode.c:971 msgid "no utility name" msgstr "" -#: Top/argdecode.c:774 Top/argdecode.c:1070 +#: Top/argdecode.c:780 Top/argdecode.c:1086 msgid "no xfilename" msgstr "" -#: Top/argdecode.c:920 +#: Top/argdecode.c:936 #, c-format msgid "unknown long option: '--%s'" msgstr "" -#: Top/argdecode.c:1043 +#: Top/argdecode.c:1059 msgid "no sample rate" msgstr "" -#: Top/argdecode.c:1075 +#: Top/argdecode.c:1091 msgid "no tempo value" msgstr "" -#: Top/argdecode.c:1080 +#: Top/argdecode.c:1096 msgid "illegal tempo" msgstr "" -#: Top/argdecode.c:1129 +#: Top/argdecode.c:1147 msgid "no MIDI output device" msgstr "" -#: Top/argdecode.c:1181 +#: Top/argdecode.c:1199 msgid "No indirection file" msgstr "" -#: Top/argdecode.c:1188 +#: Top/argdecode.c:1206 #, c-format msgid "Cannot open indirection file %s\n" msgstr "" -#: Top/argdecode.c:1217 +#: Top/argdecode.c:1235 msgid "no number of threads" msgstr "" -#: Top/argdecode.c:1228 util/envext.c:94 util/mixer.c:316 util/scale.c:241 +#: Top/argdecode.c:1246 util/envext.c:94 util/mixer.c:316 util/scale.c:241 #: util/xtrct.c:239 #, c-format msgid "unknown flag -%c" msgstr "" -#: Top/argdecode.c:1235 +#: Top/argdecode.c:1253 msgid "error: orchestra and score name not allowed in .csound6rc" msgstr "" -#: Top/argdecode.c:1381 +#: Top/argdecode.c:1401 msgid "stdout not supported on this platform" msgstr "" -#: Top/argdecode.c:1421 Top/argdecode.c:1441 Top/argdecode.c:1461 +#: Top/argdecode.c:1441 Top/argdecode.c:1461 Top/argdecode.c:1481 msgid "stdin not supported on this platform" msgstr "" @@ -9964,76 +10008,76 @@ msgid "cscoreFileGetCurrent: no fp current" msgstr "" -#: Top/csmodule.c:195 +#: Top/csmodule.c:199 #, c-format msgid "not loading '%s' (uses incompatible floating point type)" msgstr "" -#: Top/csmodule.c:204 +#: Top/csmodule.c:208 #, c-format msgid "" "not loading '%s' (incompatible with this version of Csound (%d.%d/%d.%d)" msgstr "" -#: Top/csmodule.c:247 +#: Top/csmodule.c:251 #, c-format msgid "could not open library '%s' (%s)" msgstr "" -#: Top/csmodule.c:250 +#: Top/csmodule.c:254 #, c-format msgid "could not open library '%s' (%d)" msgstr "" -#: Top/csmodule.c:311 +#: Top/csmodule.c:315 #, c-format msgid "'%s' is not a Csound plugin library" msgstr "" -#: Top/csmodule.c:322 +#: Top/csmodule.c:326 msgid "csoundLoadExternal(): memory allocation failure" msgstr "" -#: Top/csmodule.c:336 Top/csmodule.c:344 +#: Top/csmodule.c:340 Top/csmodule.c:348 #, c-format msgid "Error in pre-initialisation function of module '%s'" msgstr "" -#: Top/csmodule.c:417 +#: Top/csmodule.c:426 #, c-format msgid "Error opening plugin directory '%s': %s" msgstr "" -#: Top/csmodule.c:420 +#: Top/csmodule.c:429 #, c-format msgid "Error opening plugin directory: %s" msgstr "" -#: Top/csmodule.c:455 +#: Top/csmodule.c:464 #, c-format msgid "path name too long, skipping '%s'" msgstr "" -#: Top/csmodule.c:461 +#: Top/csmodule.c:470 #, c-format msgid "Library %s omitted\n" msgstr "" -#: Top/csmodule.c:494 +#: Top/csmodule.c:503 msgid "Loading command-line libraries:\n" msgstr "" -#: Top/csmodule.c:517 +#: Top/csmodule.c:526 #, c-format msgid " *** error loading '%s'" msgstr "" -#: Top/csmodule.c:540 +#: Top/csmodule.c:549 #, c-format msgid "Error starting module '%s'" msgstr "" -#: Top/csmodule.c:639 +#: Top/csmodule.c:648 #, c-format msgid "Error de-initialising module '%s'" msgstr "" @@ -10042,273 +10086,286 @@ msgid "Error allocating opcode list" msgstr "" -#: Top/csound.c:1409 +#: Top/csound.c:1410 #, c-format msgid "Multithread performance: insno: %3d thread %d of %d starting.\n" msgstr "" -#: Top/csound.c:1415 +#: Top/csound.c:1416 msgid "Bad ThreadId" msgstr "" -#: Top/csound.c:1603 Top/csound.c:1635 Top/csound.c:1663 Top/csound.c:1699 -#: Top/csound.c:3879 +#: Top/csound.c:1604 Top/csound.c:1636 Top/csound.c:1664 Top/csound.c:1700 +#: Top/csound.c:3884 msgid "Csound not ready for performance: csoundStart() has not been called \n" msgstr "" -#: Top/csound.c:1619 Top/csound.c:1648 +#: Top/csound.c:1620 Top/csound.c:1649 msgid "Score finished in csoundPerformKsmps().\n" msgstr "" -#: Top/csound.c:1642 Top/csound.c:3886 +#: Top/csound.c:1643 Top/csound.c:3891 msgid "Early return from csoundPerformKsmps().\n" msgstr "" -#: Top/csound.c:1670 +#: Top/csound.c:1671 msgid "Early return from csoundPerformBuffer().\n" msgstr "" -#: Top/csound.c:1708 +#: Top/csound.c:1709 msgid "Early return from csoundPerform().\n" msgstr "" -#: Top/csound.c:1716 +#: Top/csound.c:1717 msgid "Score finished in csoundPerform().\n" msgstr "" -#: Top/csound.c:1727 +#: Top/csound.c:1728 msgid "csoundPerform(): stopped.\n" msgstr "" -#: Top/csound.c:2010 +#: Top/csound.c:2012 msgid "WARNING: " msgstr "" -#: Top/csound.c:2150 +#: Top/csound.c:2154 msgid "rtdummy: failed to allocate globals" msgstr "" -#: Top/csound.c:2151 +#: Top/csound.c:2155 msgid "rtaudio: dummy module enabled\n" msgstr "" -#: Top/csound.c:2180 Top/csound.c:2217 +#: Top/csound.c:2184 Top/csound.c:2221 msgid " *** error: rtaudio module set to empty string" msgstr "" -#: Top/csound.c:2184 Top/csound.c:2221 +#: Top/csound.c:2188 Top/csound.c:2225 #, c-format msgid " unknown rtaudio module: '%s', using dummy module" msgstr "" -#: Top/csound.c:2338 +#: Top/csound.c:2342 msgid "WARNING: real time midi input disabled, using dummy functions\n" msgstr "" -#: Top/csound.c:2343 Top/csound.c:2377 +#: Top/csound.c:2347 Top/csound.c:2381 msgid "error: -+rtmidi set to empty string" msgstr "" -#: Top/csound.c:2346 Top/csound.c:2380 +#: Top/csound.c:2350 Top/csound.c:2384 #, c-format msgid "error: -+rtmidi='%s': unknown module" msgstr "" -#: Top/csound.c:2372 +#: Top/csound.c:2376 msgid "WARNING: real time midi output disabled, using dummy functions\n" msgstr "" -#: Top/csound.c:2394 +#: Top/csound.c:2398 msgid "Unknown MIDI error" msgstr "" -#: Top/csound.c:2555 +#: Top/csound.c:2559 msgid "Failed to allocate new opcode entry." msgstr "" -#: Top/csound.c:2577 +#: Top/csound.c:2581 #, c-format msgid "Failed to allocate opcode entry for %s." msgstr "" -#: Top/csound.c:2717 Top/main.c:390 +#: Top/csound.c:2721 Top/main.c:358 msgid "setting dummy interface\n" msgstr "" -#: Top/csound.c:2793 +#: Top/csound.c:2798 msgid "Failed during csoundInitEnv" msgstr "" -#: Top/csound.c:2815 +#: Top/csound.c:2820 msgid "Failed during csoundInitStaticModules" msgstr "" -#: Top/csound.c:2831 +#: Top/csound.c:2836 msgid "Failed during csoundLoadModules" msgstr "" -#: Top/csound.c:2888 +#: Top/csound.c:2893 msgid "Real time audio module name" msgstr "" -#: Top/csound.c:2913 +#: Top/csound.c:2918 msgid "Real time MIDI module name" msgstr "" -#: Top/csound.c:2918 +#: Top/csound.c:2923 msgid "Ignore events (other than tempo changes) in tracks defined by pattern" msgstr "" -#: Top/csound.c:2924 +#: Top/csound.c:2929 msgid "Do not handle special MIDI controllers (sustain pedal etc.)" msgstr "" -#: Top/csound.c:2932 +#: Top/csound.c:2937 msgid "Title tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2938 +#: Top/csound.c:2943 msgid "Copyright tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2944 +#: Top/csound.c:2949 msgid "Software tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2949 +#: Top/csound.c:2954 msgid "Artist tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2956 +#: Top/csound.c:2961 msgid "Comment tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2961 +#: Top/csound.c:2966 msgid "Date tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2971 +#: Top/csound.c:2976 msgid "Enable message attributes (colors etc.)" msgstr "" -#: Top/csound.c:2977 +#: Top/csound.c:2982 msgid "Start score playback at the specified time, skipping earlier events" msgstr "" -#: Top/csound.c:2984 +#: Top/csound.c:2989 msgid "Ignore in CSD files (default: no)" msgstr "" -#: Top/csound.c:3194 +#: Top/csound.c:3199 msgid "Cannot open /proc/cpuinfo. Support for RDTSC is not available.\n" msgstr "" -#: Top/csound.c:3224 +#: Top/csound.c:3229 msgid "No valid CPU frequency entry was found in /proc/cpuinfo.\n" msgstr "" -#: Top/csound.c:3778 +#: Top/csound.c:3783 msgid "csoundDestroyMessageBuffer: Message buffer not allocated." msgstr "" -#: Top/csound.c:3809 +#: Top/csound.c:3814 msgid "csound: internal error: message buffer overflow\n" msgstr "" -#: Top/main.c:64 +#: Top/main.c:65 #, c-format msgid "WARNING: cannot open csound6rc file %s\n" msgstr "" -#: Top/main.c:67 +#: Top/main.c:68 #, c-format msgid "Reading options from $CSOUND6RC: %s \n" msgstr "" -#: Top/main.c:76 +#: Top/main.c:77 msgid "Reading options from $HOME/.csound6rc\n" msgstr "" -#: Top/main.c:91 +#: Top/main.c:92 msgid "Reading options from local directory .csound6rc \n" msgstr "" -#: Top/main.c:112 +#: Top/main.c:113 msgid "" "Csound is already started, call csoundReset()\n" "before starting again \n" msgstr "" -#: Top/main.c:186 +#: Top/main.c:141 msgid "no orchestra name" msgstr "" -#: Top/main.c:210 +#: Top/main.c:166 msgid "Reading CSD failed ... stopping" msgstr "" -#: Top/main.c:224 +#: Top/main.c:180 msgid "error: multiple uses of stdin" msgstr "" -#: Top/main.c:228 +#: Top/main.c:184 msgid "error: multiple uses of stdout" msgstr "" -#: Top/main.c:237 +#: Top/main.c:193 msgid "realtime performance using dummy numeric scorefile\n" msgstr "" -#: Top/main.c:260 +#: Top/main.c:216 #, c-format msgid "orchname: %s\n" msgstr "" -#: Top/main.c:278 +#: Top/main.c:220 +#, c-format +msgid "Failed to open input file - %s\n" +msgstr "" + +#: Top/main.c:235 msgid "cannot compile orchestra \n" msgstr "" -#: Top/main.c:291 +#: Top/main.c:240 +msgid "cannot compile orchestra." +msgstr "" + +#: Top/main.c:241 +msgid "Csound will start with no instruments" +msgstr "" + +#: Top/main.c:259 msgid "end of orchestra compile" msgstr "" -#: Top/main.c:299 +#: Top/main.c:267 #, c-format msgid "using previous %s\n" msgstr "" -#: Top/main.c:309 +#: Top/main.c:277 #, c-format msgid "cannot open scorefile %s" msgstr "" -#: Top/main.c:311 +#: Top/main.c:279 msgid "sorting score ...\n" msgstr "" -#: Top/main.c:321 +#: Top/main.c:289 #, c-format msgid "cannot open extract file %s" msgstr "" -#: Top/main.c:324 +#: Top/main.c:292 msgid " ... extracting ...\n" msgstr "" -#: Top/main.c:333 +#: Top/main.c:301 msgid "end of score sort" msgstr "" -#: Top/main.c:335 +#: Top/main.c:303 msgid "Syntax check completed.\n" msgstr "" -#: Top/main.c:456 util/dnoise.c:266 +#: Top/main.c:424 util/dnoise.c:266 #, c-format msgid "%s not a recognised SFOUTYP env setting" msgstr "" -#: Top/main.c:475 +#: Top/main.c:443 msgid "srate and krate overrides must occur jointly" msgstr "" @@ -10377,158 +10434,158 @@ msgid " *** Type 'csound --help' for the list of available options." msgstr "" -#: Top/one_file.c:105 Top/one_file.c:115 +#: Top/one_file.c:96 Top/one_file.c:106 msgid " *** cannot create temporary file" msgstr "" -#: Top/one_file.c:199 +#: Top/one_file.c:182 #, c-format msgid "Removing temporary file %s ...\n" msgstr "" -#: Top/one_file.c:203 +#: Top/one_file.c:186 #, c-format msgid "WARNING: could not remove %s\n" msgstr "" -#: Top/one_file.c:270 Top/one_file.c:304 +#: Top/one_file.c:253 Top/one_file.c:287 #, c-format msgid "More than %d arguments in " msgstr "" -#: Top/one_file.c:342 +#: Top/one_file.c:325 #, c-format msgid "Invalid arguments in : %s" msgstr "" -#: Top/one_file.c:345 +#: Top/one_file.c:328 #, c-format msgid "Invalid arguments in .csoundrc or -@ file: %s" msgstr "" -#: Top/one_file.c:351 Top/one_file.c:784 +#: Top/one_file.c:334 Top/one_file.c:767 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:380 +#: Top/one_file.c:361 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:400 Top/one_file.c:467 +#: Top/one_file.c:381 Top/one_file.c:449 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:415 Top/one_file.c:420 +#: Top/one_file.c:396 Top/one_file.c:401 msgid "Missing program in tag " msgstr "" -#: Top/one_file.c:432 +#: Top/one_file.c:414 #, c-format msgid "Creating %s (%p)\n" msgstr "" -#: Top/one_file.c:445 +#: Top/one_file.c:427 msgid "External generation failed" msgstr "" -#: Top/one_file.c:505 +#: Top/one_file.c:487 #, c-format msgid "Non base64 character %c(%2x)" msgstr "" -#: Top/one_file.c:524 +#: Top/one_file.c:506 msgid "Truncated byte at end of base64 stream" msgstr "" -#: Top/one_file.c:540 +#: Top/one_file.c:523 #, c-format msgid "Cannot open temporary file (%s) for MIDI subfile" msgstr "" -#: Top/one_file.c:557 +#: Top/one_file.c:540 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:573 Top/one_file.c:622 +#: Top/one_file.c:556 Top/one_file.c:605 #, c-format msgid "File %s already exists" msgstr "" -#: Top/one_file.c:578 +#: Top/one_file.c:561 #, c-format msgid "Cannot open sample file (%s) subfile" msgstr "" -#: Top/one_file.c:592 +#: Top/one_file.c:575 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:627 +#: Top/one_file.c:610 #, c-format msgid "Cannot open file (%s) subfile" msgstr "" -#: Top/one_file.c:642 +#: Top/one_file.c:625 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:662 +#: Top/one_file.c:645 #, c-format msgid "This CSD file requires a version of Csound before %d.%02d" msgstr "" -#: Top/one_file.c:670 Top/one_file.c:677 +#: Top/one_file.c:653 Top/one_file.c:660 #, c-format msgid "This CSD file requires a version of Csound after %d.%02d" msgstr "" -#: Top/one_file.c:683 +#: Top/one_file.c:666 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:693 +#: Top/one_file.c:676 msgid "**** Licence Information ****\n" msgstr "" -#: Top/one_file.c:699 +#: Top/one_file.c:682 msgid "**** End of Licence Information ****\n" msgstr "" -#: Top/one_file.c:710 +#: Top/one_file.c:693 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:741 +#: Top/one_file.c:724 #, c-format msgid "Failed to open csd file: %s" msgstr "" -#: Top/one_file.c:756 +#: Top/one_file.c:739 msgid "STARTING FILE\n" msgstr "" -#: Top/one_file.c:774 +#: Top/one_file.c:757 msgid "Creating options\n" msgstr "" -#: Top/one_file.c:780 +#: Top/one_file.c:763 msgid "Skipping \n" msgstr "" -#: Top/one_file.c:794 +#: Top/one_file.c:777 msgid "Creating orchestra\n" msgstr "" -#: Top/one_file.c:799 +#: Top/one_file.c:782 msgid "Creating score\n" msgstr "" -#: Top/one_file.c:833 +#: Top/one_file.c:812 #, c-format msgid "unknown CSD tag: %s\n" msgstr "" -#: Top/one_file.c:838 +#: Top/one_file.c:817 msgid "Could not find tag in CSD file.\n" msgstr "" diff -Nru csound-6.01~dfsg/po/russian.po csound-6.02~dfsg/po/russian.po --- csound-6.01~dfsg/po/russian.po 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/po/russian.po 2014-01-07 16:54:21.000000000 +0000 @@ -191,157 +191,157 @@ msgid "Not a proper list of ints" msgstr "" -#: Engine/csound_orc_compile.c:276 +#: Engine/csound_orc_compile.c:274 msgid "missing or extra arg" msgstr "" -#: Engine/csound_orc_compile.c:281 +#: Engine/csound_orc_compile.c:279 msgid "too many input args\n" msgstr "" -#: Engine/csound_orc_compile.c:464 +#: Engine/csound_orc_compile.c:462 #, c-format msgid "create_opcode: No rule to handle statement of type %d\n" msgstr "" -#: Engine/csound_orc_compile.c:633 Engine/csound_orc_compile.c:691 +#: Engine/csound_orc_compile.c:631 Engine/csound_orc_compile.c:690 #, c-format msgid "%s invalid sample rate" msgstr "" -#: Engine/csound_orc_compile.c:635 Engine/csound_orc_compile.c:693 +#: Engine/csound_orc_compile.c:633 Engine/csound_orc_compile.c:692 #, c-format msgid "%s invalid control rate" msgstr "" -#: Engine/csound_orc_compile.c:639 Engine/csound_orc_compile.c:689 +#: Engine/csound_orc_compile.c:637 Engine/csound_orc_compile.c:688 #, c-format msgid "%s invalid ksmps value" msgstr "" -#: Engine/csound_orc_compile.c:641 Engine/csound_orc_compile.c:695 +#: Engine/csound_orc_compile.c:639 Engine/csound_orc_compile.c:694 #, c-format msgid "%s inconsistent sr, kr, ksmps" msgstr "" -#: Engine/csound_orc_compile.c:643 +#: Engine/csound_orc_compile.c:641 #, c-format msgid "%s inconsistent sr, kr, ksmps \n" msgstr "" -#: Engine/csound_orc_compile.c:659 +#: Engine/csound_orc_compile.c:657 msgid "bad value for 0dbfs: must be positive. Setting default value." msgstr "" -#: Engine/csound_orc_compile.c:680 +#: Engine/csound_orc_compile.c:679 #, c-format msgid "sample rate overrides: esr = %7.4f, ekr = %7.4f, ksmps = %d\n" msgstr "" -#: Engine/csound_orc_compile.c:686 +#: Engine/csound_orc_compile.c:685 #, c-format msgid "" "sr = %.7g, kr = %.7g, ksmps = %.7g\n" "error:" msgstr "" -#: Engine/csound_orc_compile.c:832 +#: Engine/csound_orc_compile.c:842 #, c-format msgid "create_instrument: instr num %ld\n" msgstr "" -#: Engine/csound_orc_compile.c:921 +#: Engine/csound_orc_compile.c:934 msgid "-- deleted instr from deadpool \n" msgstr "" -#: Engine/csound_orc_compile.c:949 +#: Engine/csound_orc_compile.c:962 #, c-format msgid " -- free instr def %p \n" msgstr "" -#: Engine/csound_orc_compile.c:962 Engine/csound_orc_compile.c:973 +#: Engine/csound_orc_compile.c:975 Engine/csound_orc_compile.c:986 #, c-format msgid " -- added to deadpool slot %d \n" msgstr "" -#: Engine/csound_orc_compile.c:998 Engine/csound_orc_compile.c:1144 +#: Engine/csound_orc_compile.c:1011 Engine/csound_orc_compile.c:1158 #, c-format msgid "instr %ld redefined, replacing previous definition" msgstr "" -#: Engine/csound_orc_compile.c:1096 +#: Engine/csound_orc_compile.c:1109 #, c-format msgid "instr %s uses instrument number %d\n" msgstr "" -#: Engine/csound_orc_compile.c:1168 +#: Engine/csound_orc_compile.c:1183 #, c-format msgid "no active instances of instr %d \n" msgstr "" -#: Engine/csound_orc_compile.c:1213 +#: Engine/csound_orc_compile.c:1228 msgid "!!! csound->opcodeInfo is NULL !!!\n" msgstr "" -#: Engine/csound_orc_compile.c:1249 +#: Engine/csound_orc_compile.c:1264 #, c-format msgid " merging constants %d) %f\n" msgstr "" -#: Engine/csound_orc_compile.c:1258 +#: Engine/csound_orc_compile.c:1273 #, c-format msgid " merging %d) %s:%s\n" msgstr "" -#: Engine/csound_orc_compile.c:1281 +#: Engine/csound_orc_compile.c:1299 #, c-format msgid "merging instr %d \n" msgstr "" -#: Engine/csound_orc_compile.c:1289 +#: Engine/csound_orc_compile.c:1307 #, c-format msgid "merging instr %s \n" msgstr "" -#: Engine/csound_orc_compile.c:1452 Engine/csound_orc_compile.c:1480 -#: Engine/csound_orc_compile.c:1503 +#: Engine/csound_orc_compile.c:1471 Engine/csound_orc_compile.c:1499 +#: Engine/csound_orc_compile.c:1522 msgid "invalid name for instrument" msgstr "" -#: Engine/csound_orc_compile.c:1485 Engine/csound_orc_compile.c:1508 +#: Engine/csound_orc_compile.c:1504 Engine/csound_orc_compile.c:1527 #, c-format msgid "instr %s redefined" msgstr "" -#: Engine/csound_orc_compile.c:1530 +#: Engine/csound_orc_compile.c:1549 #, c-format msgid "ERROR: Could not find OPCODINFO for opname: %s\n" msgstr "" -#: Engine/csound_orc_compile.c:1551 +#: Engine/csound_orc_compile.c:1570 #, c-format msgid "Unknown TREE node of type %d found in root.\n" msgstr "" -#: Engine/csound_orc_compile.c:1560 +#: Engine/csound_orc_compile.c:1579 #, c-format msgid "%d syntax errors in orchestra. compilation invalid\n" msgstr "" -#: Engine/csound_orc_compile.c:1600 +#: Engine/csound_orc_compile.c:1620 msgid "perf-pass statements illegal in header blk\n" msgstr "" -#: Engine/csound_orc_compile.c:1772 +#: Engine/csound_orc_compile.c:1792 msgid "i[fixme] pset args != pmax" msgstr "" -#: Engine/csound_orc_compile.c:1894 +#: Engine/csound_orc_compile.c:1922 #, c-format msgid "Missing local arg: %s\n" msgstr "" -#: Engine/csound_orc_compile.c:2025 +#: Engine/csound_orc_compile.c:2054 #, c-format msgid "Opcode \"%s\" is deprecated\n" msgstr "" @@ -418,46 +418,46 @@ msgid "Variable type for %s could not be determined.\n" msgstr "" -#: Engine/csound_orc_semantics.c:1300 +#: Engine/csound_orc_semantics.c:1301 #, c-format msgid "Unable to find opcode with name: %s\n" msgstr "" -#: Engine/csound_orc_semantics.c:1315 +#: Engine/csound_orc_semantics.c:1316 #, c-format msgid "Unable to find opcode entry for '%s' with matching argument types:\n" msgstr "" -#: Engine/csound_orc_semantics.c:1318 +#: Engine/csound_orc_semantics.c:1319 #, c-format msgid "Found: %s %s %s\n" msgstr "" -#: Engine/csound_orc_semantics.c:1320 +#: Engine/csound_orc_semantics.c:1321 #, c-format msgid "Line: %d Loc: %d\n" msgstr "" -#: Engine/csound_orc_semantics.c:1454 +#: Engine/csound_orc_semantics.c:1455 #, c-format msgid "expression for until statement not a boolean expression, line %d\n" msgstr "" -#: Engine/csound_orc_semantics.c:1607 +#: Engine/csound_orc_semantics.c:1608 #, c-format msgid "" "\n" "error: %s (token \"%s\")" msgstr "" -#: Engine/csound_orc_semantics.c:1609 +#: Engine/csound_orc_semantics.c:1610 #, c-format msgid "" " line %d:\n" ">>>" msgstr "" -#: Engine/csound_orc_semantics.c:2141 +#: Engine/csound_orc_semantics.c:2142 #, fuzzy, c-format msgid "insufficient required arguments for opcode %s on line %d:%d\n" msgstr "недостаточные аргументы" @@ -472,239 +472,239 @@ msgid "Creating search path cache for '%s':" msgstr "" -#: Engine/envvar.c:729 +#: Engine/envvar.c:731 msgid "Current directory path name too long\n" msgstr "" -#: Engine/envvar.c:1003 +#: Engine/envvar.c:1005 #, c-format msgid "internal error: csoundFileOpen(): invalid type: %d" msgstr "" -#: Engine/envvar.c:1193 +#: Engine/envvar.c:1195 #, c-format msgid "internal error: csoundCreateFileHandle(): invalid type: %d" msgstr "" -#: Engine/fgens.c:91 +#: Engine/fgens.c:99 msgid "unknown GEN number" msgstr "" -#: Engine/fgens.c:133 +#: Engine/fgens.c:141 msgid "ftable does not exist" msgstr "" -#: Engine/fgens.c:138 +#: Engine/fgens.c:146 #, c-format msgid "ftable %d now deleted\n" msgstr "" -#: Engine/fgens.c:153 Engine/fgens.c:1612 Engine/fgens.c:1698 -#: Engine/fgens.c:1777 Engine/fgens.c:1893 Engine/fgens.c:1974 -#: Engine/fgens.c:3023 +#: Engine/fgens.c:161 Engine/fgens.c:1630 Engine/fgens.c:1716 +#: Engine/fgens.c:1795 Engine/fgens.c:1911 Engine/fgens.c:1992 +#: Engine/fgens.c:3043 msgid "insufficient gen arguments" msgstr "" -#: Engine/fgens.c:179 Opcodes/ftgen.c:117 +#: Engine/fgens.c:187 Opcodes/ftgen.c:117 #, c-format msgid "Named gen \"%s\" not defined" msgstr "" -#: Engine/fgens.c:187 +#: Engine/fgens.c:195 msgid "illegal gen number" msgstr "" -#: Engine/fgens.c:195 +#: Engine/fgens.c:203 msgid "deferred size for GENs 1, 23, 28 or 49 only" msgstr "" -#: Engine/fgens.c:198 Engine/fgens.c:250 +#: Engine/fgens.c:206 Engine/fgens.c:258 #, c-format msgid "ftable %d:\n" msgstr "" -#: Engine/fgens.c:223 Engine/fgens.c:2301 Engine/fgens.c:2880 +#: Engine/fgens.c:231 Engine/fgens.c:2320 Engine/fgens.c:2899 msgid "illegal table length" msgstr "" -#: Engine/fgens.c:293 Engine/fgens.c:2262 +#: Engine/fgens.c:304 Engine/fgens.c:2281 #, c-format msgid "" "ftable %d relocating due to size change\n" " currently active instruments may find this disturbing" msgstr "" -#: Engine/fgens.c:351 Engine/fgens.c:472 Engine/fgens.c:556 Engine/fgens.c:637 -#: Engine/fgens.c:712 Engine/fgens.c:761 Engine/fgens.c:882 Engine/fgens.c:959 -#: Engine/fgens.c:1060 Engine/fgens.c:1104 Engine/fgens.c:1151 -#: Engine/fgens.c:1405 Engine/fgens.c:1467 Engine/fgens.c:1696 -#: Engine/fgens.c:1774 Engine/fgens.c:2129 Engine/fgens.c:2977 -#: Engine/fgens.c:3020 +#: Engine/fgens.c:362 Engine/fgens.c:483 Engine/fgens.c:567 Engine/fgens.c:648 +#: Engine/fgens.c:723 Engine/fgens.c:772 Engine/fgens.c:893 Engine/fgens.c:970 +#: Engine/fgens.c:1071 Engine/fgens.c:1115 Engine/fgens.c:1165 +#: Engine/fgens.c:1423 Engine/fgens.c:1485 Engine/fgens.c:1714 +#: Engine/fgens.c:1792 Engine/fgens.c:2147 Engine/fgens.c:2997 +#: Engine/fgens.c:3040 msgid "using extended arguments\n" msgstr "" -#: Engine/fgens.c:375 +#: Engine/fgens.c:386 msgid "no coefs present" msgstr "" -#: Engine/fgens.c:380 Engine/fgens.c:646 Engine/fgens.c:654 +#: Engine/fgens.c:391 Engine/fgens.c:657 Engine/fgens.c:665 msgid "illegal x interval" msgstr "" -#: Engine/fgens.c:409 Engine/fgens.c:558 Engine/fgens.c:639 Engine/fgens.c:884 -#: Engine/fgens.c:1362 Engine/fgens.c:2473 Engine/fgens.c:2781 -#: Engine/fgens.c:2922 Opcodes/ftest.c:128 Top/main.c:118 util/cvanal.c:67 +#: Engine/fgens.c:420 Engine/fgens.c:569 Engine/fgens.c:650 Engine/fgens.c:895 +#: Engine/fgens.c:1380 Engine/fgens.c:2492 Engine/fgens.c:2800 +#: Engine/fgens.c:2941 Opcodes/ftest.c:128 Top/main.c:119 util/cvanal.c:67 #: util/lpanal.c:401 util/pvanal.c:170 msgid "insufficient arguments" msgstr "недостаточные аргументы" -#: Engine/fgens.c:413 Engine/fgens.c:1367 +#: Engine/fgens.c:424 Engine/fgens.c:1385 msgid "unknown srctable number" msgstr "" -#: Engine/fgens.c:426 +#: Engine/fgens.c:437 msgid "table size too large" msgstr "" -#: Engine/fgens.c:511 Engine/fgens.c:544 +#: Engine/fgens.c:522 Engine/fgens.c:555 msgid "gen call has negative segment size:" msgstr "" -#: Engine/fgens.c:513 +#: Engine/fgens.c:524 msgid "illegal input vals for gen call, beginning:" msgstr "" -#: Engine/fgens.c:579 +#: Engine/fgens.c:590 msgid "negative segsiz" msgstr "" -#: Engine/fgens.c:788 +#: Engine/fgens.c:799 msgid "nh partials < 1" msgstr "" -#: Engine/fgens.c:887 +#: Engine/fgens.c:898 msgid "illegal xint value" msgstr "" -#: Engine/fgens.c:890 +#: Engine/fgens.c:901 msgid "illegal xamp value" msgstr "" -#: Engine/fgens.c:963 +#: Engine/fgens.c:974 msgid "uneven number of args" msgstr "" -#: Engine/fgens.c:1088 +#: Engine/fgens.c:1099 msgid "gen call has illegal x-ordinate values:" msgstr "" -#: Engine/fgens.c:1106 +#: Engine/fgens.c:1117 msgid "wrong number of args" msgstr "неправильный число аргументов" -#: Engine/fgens.c:1120 +#: Engine/fgens.c:1131 msgid "a range given exceeds table length" msgstr "" -#: Engine/fgens.c:1127 +#: Engine/fgens.c:1138 msgid "an input function does not exist" msgstr "" -#: Engine/fgens.c:1260 +#: Engine/fgens.c:1274 msgid "No such window!" msgstr "" -#: Engine/fgens.c:1278 +#: Engine/fgens.c:1292 msgid "Wrong number of input arguments" msgstr "неправильный число аргументов входного сигнала" -#: Engine/fgens.c:1279 +#: Engine/fgens.c:1293 msgid "unknown distribution" msgstr "" -#: Engine/fgens.c:1328 +#: Engine/fgens.c:1342 msgid "error opening ASCII file" msgstr "" -#: Engine/fgens.c:1334 +#: Engine/fgens.c:1352 #, c-format msgid "%ld elements in %s\n" msgstr "" -#: Engine/fgens.c:1346 +#: Engine/fgens.c:1364 msgid "Numbers after table full in GEN23" msgstr "" -#: Engine/fgens.c:1375 +#: Engine/fgens.c:1393 msgid "table size must be the same of source table" msgstr "" -#: Engine/fgens.c:1447 Engine/fgens.c:1507 +#: Engine/fgens.c:1465 Engine/fgens.c:1525 msgid "x coordinates must all be in increasing order:" msgstr "" -#: Engine/fgens.c:1450 Engine/fgens.c:1509 +#: Engine/fgens.c:1468 Engine/fgens.c:1527 msgid "x coordinate greater than function size:" msgstr "" -#: Engine/fgens.c:1454 +#: Engine/fgens.c:1472 msgid "illegal input val (y <= 0) for gen call, beginning:" msgstr "" -#: Engine/fgens.c:1527 +#: Engine/fgens.c:1545 msgid "GEN28 requires zero table length" msgstr "" -#: Engine/fgens.c:1596 +#: Engine/fgens.c:1614 msgid "could not open space file" msgstr "" -#: Engine/fgens.c:1598 +#: Engine/fgens.c:1616 msgid "Time values must be in increasing order" msgstr "" -#: Engine/fgens.c:1619 +#: Engine/fgens.c:1637 msgid "GEN30: source ftable not found" msgstr "" -#: Engine/fgens.c:1702 +#: Engine/fgens.c:1720 msgid "GEN31: source ftable not found" msgstr "" -#: Engine/fgens.c:1810 +#: Engine/fgens.c:1828 #, c-format msgid "GEN32: source ftable %d not found" msgstr "" -#: Engine/fgens.c:1904 +#: Engine/fgens.c:1922 msgid "GEN33: source ftable not found" msgstr "" -#: Engine/fgens.c:2072 +#: Engine/fgens.c:2090 msgid "unknown source table number" msgstr "" -#: Engine/fgens.c:2104 +#: Engine/fgens.c:2122 msgid "Gen41: negative probability not allowed" msgstr "" -#: Engine/fgens.c:2170 Opcodes/fareygen.c:70 +#: Engine/fgens.c:2188 Opcodes/fareygen.c:70 #, c-format msgid "ftable %d: " msgstr "" -#: Engine/fgens.c:2214 +#: Engine/fgens.c:2232 #, c-format msgid "ftable %d:" msgstr "" -#: Engine/fgens.c:2257 +#: Engine/fgens.c:2275 #, c-format msgid "replacing previous ftable %d" msgstr "" -#: Engine/fgens.c:2297 Engine/fgens.c:2423 Engine/fgens.c:2451 -#: Engine/fgens.c:2458 Opcodes/gab/gab.c:590 Opcodes/gab/gab.c:645 +#: Engine/fgens.c:2316 Engine/fgens.c:2442 Engine/fgens.c:2470 +#: Engine/fgens.c:2477 Opcodes/gab/gab.c:592 Opcodes/gab/gab.c:647 #: Opcodes/midiops2.c:233 Opcodes/midiops2.c:388 Opcodes/midiops2.c:470 #: Opcodes/uggab.c:1625 Opcodes/uggab.c:1661 Opcodes/uggab.c:1683 #: Opcodes/uggab.c:1736 @@ -712,122 +712,122 @@ msgid "Invalid ftable no. %f" msgstr "" -#: Engine/fgens.c:2306 +#: Engine/fgens.c:2325 #, c-format msgid "deferred-size ftable %f illegal here" msgstr "" -#: Engine/fgens.c:2362 Engine/fgens.c:2961 +#: Engine/fgens.c:2381 Engine/fgens.c:2981 #, c-format msgid "Deferred load of '%s' failed" msgstr "" -#: Engine/fgens.c:2429 +#: Engine/fgens.c:2448 #, c-format msgid "Deferred-size ftable %f load not available at perf time." msgstr "" -#: Engine/fgens.c:2497 +#: Engine/fgens.c:2516 #, c-format msgid "non-deferred ftable %d needs size %d\n" msgstr "" -#: Engine/fgens.c:2544 Opcodes/loscilx.c:69 +#: Engine/fgens.c:2563 Opcodes/loscilx.c:69 #, c-format msgid "invalid sample format: %d" msgstr "" -#: Engine/fgens.c:2552 Engine/fgens.c:2805 +#: Engine/fgens.c:2571 Engine/fgens.c:2824 #, c-format msgid "channel %d illegal" msgstr "" -#: Engine/fgens.c:2558 +#: Engine/fgens.c:2577 msgid "deferred alloc\n" msgstr "" -#: Engine/fgens.c:2566 Engine/fgens.c:2878 +#: Engine/fgens.c:2585 Engine/fgens.c:2897 msgid "deferred size, but filesize unknown" msgstr "" -#: Engine/fgens.c:2569 Engine/fgens.c:2882 +#: Engine/fgens.c:2588 Engine/fgens.c:2901 #, c-format msgid " defer length %d\n" msgstr "" -#: Engine/fgens.c:2637 +#: Engine/fgens.c:2656 msgid "GEN1: input file truncated by ftable size" msgstr "" -#: Engine/fgens.c:2641 +#: Engine/fgens.c:2660 #, c-format msgid "\tlooping endpoint %d exceeds ftsize %d\n" msgstr "" -#: Engine/fgens.c:2657 +#: Engine/fgens.c:2676 msgid "GEN1 read error" msgstr "" -#: Engine/fgens.c:2662 +#: Engine/fgens.c:2681 msgid "GEN1: aiff file truncated by ftable size" msgstr "" -#: Engine/fgens.c:2663 +#: Engine/fgens.c:2682 #, c-format msgid "\taudio samps %d exceeds ftsize %d" msgstr "" -#: Engine/fgens.c:2707 +#: Engine/fgens.c:2726 msgid "wrong number of ftable arguments" msgstr "" -#: Engine/fgens.c:2717 OOps/pstream.c:379 +#: Engine/fgens.c:2736 OOps/pstream.c:379 msgid "Failed to load PVOC-EX file" msgstr "" -#: Engine/fgens.c:2728 InOut/midirecv.c:417 OOps/midiops.c:402 +#: Engine/fgens.c:2747 InOut/midirecv.c:419 OOps/midiops.c:402 #: OOps/midiops.c:452 OOps/midiops.c:464 msgid "illegal channel number" msgstr "" -#: Engine/fgens.c:2746 +#: Engine/fgens.c:2765 msgid "ftable size too small" msgstr "" -#: Engine/fgens.c:2821 Opcodes/mp3in.c:87 Opcodes/mp3in.c:255 +#: Engine/fgens.c:2840 Opcodes/mp3in.c:87 Opcodes/mp3in.c:255 #: Top/cscorfns.c:176 Top/cscorfns.c:207 msgid "Not enough memory\n" msgstr "" -#: Engine/fgens.c:2987 +#: Engine/fgens.c:3007 msgid "gen51: invalid number of p-fields (too few grades)" msgstr "" -#: Engine/fgens.c:3027 +#: Engine/fgens.c:3047 msgid "number of channels inconsistent with number of args" msgstr "" -#: Engine/fgens.c:3186 +#: Engine/fgens.c:3206 msgid "GEN53: invalid number of gen arguments" msgstr "" -#: Engine/fgens.c:3196 +#: Engine/fgens.c:3216 msgid "GEN53: invalid table length" msgstr "" -#: Engine/fgens.c:3200 +#: Engine/fgens.c:3220 msgid "GEN53: invalid source table number" msgstr "" -#: Engine/fgens.c:3203 +#: Engine/fgens.c:3223 msgid "GEN53: mode must be in the range 0 to 15" msgstr "" -#: Engine/fgens.c:3207 +#: Engine/fgens.c:3227 msgid "GEN53: invalid source table length" msgstr "" -#: Engine/fgens.c:3212 +#: Engine/fgens.c:3232 msgid "GEN53: invalid window table" msgstr "" @@ -851,21 +851,21 @@ msgid "Instrument %d muted\n" msgstr "" -#: Engine/insert.c:144 Engine/insert.c:374 +#: Engine/insert.c:144 Engine/insert.c:376 #, c-format msgid "cannot allocate last note because it exceeds 100%% of cpu time" msgstr "" -#: Engine/insert.c:150 Engine/insert.c:380 +#: Engine/insert.c:150 Engine/insert.c:382 msgid "cannot allocate last note because it exceeds instr maxalloc" msgstr "" -#: Engine/insert.c:168 Engine/insert.c:400 +#: Engine/insert.c:168 #, c-format msgid "new alloc for instr %s:\n" msgstr "" -#: Engine/insert.c:170 Engine/insert.c:402 +#: Engine/insert.c:170 #, c-format msgid "new alloc for instr %d:\n" msgstr "" @@ -880,147 +880,157 @@ msgid "instr %d uses %d p-fields but is given %d" msgstr "" -#: Engine/insert.c:345 Engine/insert.c:573 +#: Engine/insert.c:345 Engine/insert.c:575 #, c-format msgid "instr %s now active:\n" msgstr "" -#: Engine/insert.c:347 Engine/insert.c:575 +#: Engine/insert.c:347 Engine/insert.c:577 #, c-format msgid "instr %d now active:\n" msgstr "" -#: Engine/insert.c:389 +#: Engine/insert.c:391 #, c-format -msgid "activating instr %s\n" +msgid "MIDI activating instr %s\n" msgstr "" -#: Engine/insert.c:391 +#: Engine/insert.c:393 +#, c-format +msgid "MIDI activating instr %d\n" +msgstr "" + +#: Engine/insert.c:402 +#, c-format +msgid "new MIDI alloc for instr %s:\n" +msgstr "" + +#: Engine/insert.c:404 #, c-format -msgid "activating instr %d\n" +msgid "new MIDI alloc for instr %d:\n" msgstr "" -#: Engine/insert.c:416 +#: Engine/insert.c:418 #, c-format msgid "MIDI note overlaps with key %d on same channel" msgstr "" -#: Engine/insert.c:683 +#: Engine/insert.c:685 #, c-format msgid "removed instance of instr %s\n" msgstr "" -#: Engine/insert.c:685 +#: Engine/insert.c:687 #, c-format msgid "removed instance of instr %d\n" msgstr "" -#: Engine/insert.c:843 +#: Engine/insert.c:851 msgid "inactive allocs returned to freespace\n" msgstr "" -#: Engine/insert.c:869 +#: Engine/insert.c:877 #, c-format msgid "could not find playing instr %f\n" msgstr "" -#: Engine/insert.c:882 +#: Engine/insert.c:890 msgid "" "\n" "INIT ERROR: " msgstr "" -#: Engine/insert.c:895 +#: Engine/insert.c:903 #, c-format msgid "INIT ERROR in instr %d (opcode %s): " msgstr "" -#: Engine/insert.c:898 +#: Engine/insert.c:906 #, c-format msgid "INIT ERROR in instr %d (subinstr %d): " msgstr "" -#: Engine/insert.c:902 +#: Engine/insert.c:910 #, c-format msgid "INIT ERROR in instr %d: " msgstr "" -#: Engine/insert.c:923 +#: Engine/insert.c:931 #, c-format msgid "PERF ERROR in instr %d (opcode %s): " msgstr "" -#: Engine/insert.c:926 +#: Engine/insert.c:934 #, c-format msgid "PERF ERROR in instr %d (subinstr %d): " msgstr "" -#: Engine/insert.c:930 +#: Engine/insert.c:938 #, c-format msgid "PERF ERROR in instr %d: " msgstr "" -#: Engine/insert.c:935 +#: Engine/insert.c:943 msgid " note aborted\n" msgstr "" -#: Engine/insert.c:954 +#: Engine/insert.c:962 msgid "subinstr: number of output args greater than nchnls" msgstr "" -#: Engine/insert.c:1022 +#: Engine/insert.c:1030 msgid "subinstr: too many p-fields" msgstr "" -#: Engine/insert.c:1127 +#: Engine/insert.c:1135 #, c-format msgid "%s: invalid local ksmps value: %d" msgstr "" -#: Engine/insert.c:1259 OOps/bus.c:611 Opcodes/stackops.c:293 +#: Engine/insert.c:1278 OOps/bus.c:614 Opcodes/stackops.c:293 #, c-format msgid "%s: not initialised" msgstr "%s: не выступлено с иничиативой" -#: Engine/insert.c:1442 +#: Engine/insert.c:1458 #, c-format msgid "setksmps: invalid ksmps value: %d, original: %d" msgstr "" -#: Engine/insert.c:1564 +#: Engine/insert.c:1595 msgid "subinstr: not initialised" msgstr "" -#: Engine/insert.c:2005 +#: Engine/insert.c:2046 #, c-format msgid "" "instr %d allocated at %p\n" "\tlclbas %p, opds %p\n" msgstr "" -#: Engine/insert.c:2023 +#: Engine/insert.c:2064 #, c-format msgid "op (%s) allocated at %p\n" msgstr "" -#: Engine/insert.c:2048 +#: Engine/insert.c:2089 msgid "null iopadr" msgstr "" -#: Engine/insert.c:2059 +#: Engine/insert.c:2100 msgid "null opadr" msgstr "" -#: Engine/insert.c:2131 +#: Engine/insert.c:2182 msgid "inconsistent opds total" msgstr "" -#: Engine/insert.c:2192 +#: Engine/insert.c:2243 #, c-format msgid "Instrument %s is still active" msgstr "" -#: Engine/insert.c:2195 +#: Engine/insert.c:2246 #, c-format msgid "Instrument %d is still active" msgstr "" @@ -1044,40 +1054,40 @@ msgid "stdmode = %.8x Linefd = %d\n" msgstr "" -#: Engine/linevent.c:186 +#: Engine/linevent.c:184 msgid "LineBuffer Overflow - Input Data has been Lost" msgstr "" -#: Engine/linevent.c:239 +#: Engine/linevent.c:238 #, c-format msgid "unknown opcode %c" msgstr "" -#: Engine/linevent.c:259 +#: Engine/linevent.c:258 msgid "unmatched quotes" msgstr "" -#: Engine/linevent.c:286 +#: Engine/linevent.c:285 msgid "dot carry has no reference" msgstr "" -#: Engine/linevent.c:291 +#: Engine/linevent.c:290 msgid "cannot carry string p-field" msgstr "" -#: Engine/linevent.c:302 +#: Engine/linevent.c:301 msgid "too few pfields" msgstr "" -#: Engine/linevent.c:306 +#: Engine/linevent.c:305 msgid "-L with negative p2 illegal" msgstr "" -#: Engine/linevent.c:317 +#: Engine/linevent.c:316 msgid "too many pfields" msgstr "" -#: Engine/linevent.c:329 +#: Engine/linevent.c:328 #, c-format msgid "" "illegal RT scoreline:\n" @@ -1085,24 +1095,28 @@ "%*s" msgstr "" -#: Engine/linevent.c:351 +#: Engine/linevent.c:350 msgid "event: param 1 must be \"a\", \"i\", \"q\", \"f\", or \"e\"" msgstr "" -#: Engine/linevent.c:353 +#: Engine/linevent.c:352 msgid "event: string name is allowed only for \"i\" and \"q\" events" msgstr "" -#: Engine/linevent.c:394 +#: Engine/linevent.c:395 #, c-format msgid "event: error creating '%c' event" msgstr "" -#: Engine/linevent.c:457 +#: Engine/linevent.c:459 #, c-format msgid "event_i: error creating '%c' event" msgstr "" +#: Engine/linevent.c:505 +msgid "instance: error creating event" +msgstr "" + #: Engine/memalloc.c:58 #, c-format msgid "memory allocate failure for %lu" @@ -1169,7 +1183,7 @@ msgstr "" #: Engine/memfiles.c:511 Opcodes/pvinterp.c:77 Opcodes/pvinterp.c:193 -#: Opcodes/pvinterp.c:383 Opcodes/ugens9.c:104 Opcodes/vpvoc.c:210 +#: Opcodes/pvinterp.c:383 Opcodes/ugens9.c:104 Opcodes/vpvoc.c:212 #, c-format msgid "%s's srate = %8.0f, orch's srate = %8.0f" msgstr "" @@ -1203,22 +1217,22 @@ msgid "Beat mode not in force" msgstr "" -#: Engine/musmon.c:173 Top/csound.c:2854 +#: Engine/musmon.c:173 Top/csound.c:2859 #, c-format msgid "Csound version %s beta (double samples) %s\n" msgstr "" -#: Engine/musmon.c:176 Top/csound.c:2857 +#: Engine/musmon.c:176 Top/csound.c:2862 #, c-format msgid "Csound version %s (double samples) %s\n" msgstr "" -#: Engine/musmon.c:181 Top/csound.c:2846 +#: Engine/musmon.c:181 Top/csound.c:2851 #, c-format msgid "Csound version %s beta (float samples) %s\n" msgstr "" -#: Engine/musmon.c:184 Top/csound.c:2849 +#: Engine/musmon.c:184 Top/csound.c:2854 #, c-format msgid "Csound version %s (float samples) %s\n" msgstr "" @@ -1260,7 +1274,7 @@ msgid "sorting cscore.out ..\n" msgstr "" -#: Engine/musmon.c:340 Top/main.c:329 +#: Engine/musmon.c:340 Top/main.c:297 msgid "\t... done\n" msgstr "" @@ -1268,8 +1282,8 @@ msgid "playing from cscore.srt\n" msgstr "" -#: Engine/musmon.c:345 Engine/musmon.c:497 Engine/musmon.c:1119 -#: Engine/musmon.c:1329 +#: Engine/musmon.c:345 Engine/musmon.c:501 Engine/musmon.c:1124 +#: Engine/musmon.c:1335 #, c-format msgid "SECTION %d:\n" msgstr "" @@ -1279,125 +1293,125 @@ msgid "%c\tbeep!\n" msgstr "" -#: Engine/musmon.c:450 +#: Engine/musmon.c:454 msgid "end of score.\t\t overall amps:" msgstr "" -#: Engine/musmon.c:461 +#: Engine/musmon.c:465 msgid "" "\n" "\t overall samples out of range:" msgstr "" -#: Engine/musmon.c:465 +#: Engine/musmon.c:469 #, c-format msgid "" "\n" "%d errors in performance\n" msgstr "" -#: Engine/musmon.c:467 +#: Engine/musmon.c:471 msgid "end of performance" msgstr "" -#: Engine/musmon.c:480 +#: Engine/musmon.c:484 msgid "no sound written to disk\n" msgstr "" -#: Engine/musmon.c:572 Engine/musmon.c:618 +#: Engine/musmon.c:577 Engine/musmon.c:623 msgid "\t number of samples out of range:" msgstr "" -#: Engine/musmon.c:611 +#: Engine/musmon.c:616 #, c-format msgid "end of section %d\t sect peak amps:" msgstr "" -#: Engine/musmon.c:613 +#: Engine/musmon.c:618 msgid "end of lplay event list\t peak amps:" msgstr "" -#: Engine/musmon.c:678 Engine/musmon.c:705 +#: Engine/musmon.c:683 Engine/musmon.c:710 #, c-format msgid " - note deleted. instr %s undefined" msgstr "" -#: Engine/musmon.c:682 +#: Engine/musmon.c:687 #, c-format msgid "Setting instrument %s %s\n" msgstr "" -#: Engine/musmon.c:683 Engine/musmon.c:697 +#: Engine/musmon.c:688 Engine/musmon.c:702 msgid "off" msgstr "" -#: Engine/musmon.c:683 Engine/musmon.c:697 +#: Engine/musmon.c:688 Engine/musmon.c:702 msgid "on" msgstr "" -#: Engine/musmon.c:692 Engine/musmon.c:734 +#: Engine/musmon.c:697 Engine/musmon.c:739 #, c-format msgid " - note deleted. instr %d(%d) undefined" msgstr "" -#: Engine/musmon.c:696 +#: Engine/musmon.c:701 #, c-format msgid "Setting instrument %d %s\n" msgstr "" -#: Engine/musmon.c:724 +#: Engine/musmon.c:729 #, c-format msgid " - note deleted. i%d (%s) had %d init errors" msgstr "" -#: Engine/musmon.c:755 +#: Engine/musmon.c:760 #, c-format msgid " - note deleted. i%d had %d init errors" msgstr "" -#: Engine/musmon.c:776 +#: Engine/musmon.c:781 #, c-format msgid "time advanced %5.3f beats by score request\n" msgstr "" -#: Engine/musmon.c:794 +#: Engine/musmon.c:799 #, c-format msgid "\t\t T%7.3f - note deleted. " msgstr "" -#: Engine/musmon.c:798 +#: Engine/musmon.c:803 #, c-format msgid "instr %s had %d init errors\n" msgstr "" -#: Engine/musmon.c:801 +#: Engine/musmon.c:806 #, c-format msgid "instr %d had %d init errors\n" msgstr "" -#: Engine/musmon.c:893 +#: Engine/musmon.c:898 msgid "terminating.\n" msgstr "" -#: Engine/musmon.c:980 +#: Engine/musmon.c:985 #, c-format msgid "error in score. illegal opcode %c (ASCII %d)\n" msgstr "" -#: Engine/musmon.c:1241 +#: Engine/musmon.c:1247 msgid "insert_score_event(): invalid instrument number or name\n" msgstr "" -#: Engine/musmon.c:1261 +#: Engine/musmon.c:1267 #, c-format msgid "insert_score_event(): unknown opcode: %c\n" msgstr "" -#: Engine/musmon.c:1284 +#: Engine/musmon.c:1290 msgid "insert_score_event(): insufficient p-fields\n" msgstr "" -#: Engine/musmon.c:1338 +#: Engine/musmon.c:1344 msgid "cannot rewind score: no score in memory \n" msgstr "" @@ -1415,29 +1429,29 @@ msgid "cannot find the specified instrument or opcode" msgstr "" -#: Engine/new_orc_parser.c:92 Top/main.c:264 +#: Engine/new_orc_parser.c:144 #, c-format msgid "Failed to open input file %s\n" msgstr "" -#: Engine/new_orc_parser.c:122 +#: Engine/new_orc_parser.c:177 msgid "Unmatched #ifdef\n" msgstr "" -#: Engine/new_orc_parser.c:156 +#: Engine/new_orc_parser.c:212 msgid "Parsing failed due to invalid input!\n" msgstr "" -#: Engine/new_orc_parser.c:160 +#: Engine/new_orc_parser.c:216 msgid "Parsing failed due to memory exhaustion!\n" msgstr "" -#: Engine/new_orc_parser.c:163 +#: Engine/new_orc_parser.c:219 #, c-format msgid "Parsing failed due to %d syntax error%s!\n" msgstr "" -#: Engine/new_orc_parser.c:208 +#: Engine/new_orc_parser.c:264 msgid "Stopping on parser failure\n" msgstr "" @@ -1452,7 +1466,7 @@ "\tremainder of line flushed\n" msgstr "" -#: Engine/rdscor.c:159 +#: Engine/rdscor.c:160 msgid "ERROR: too many pfields: " msgstr "" @@ -1679,8 +1693,8 @@ msgid "! invalid in p1, p2, or p3" msgstr "" -#: Engine/sread.c:1266 Engine/sread.c:1271 Engine/sread.c:1749 -#: Engine/sread.c:1772 Engine/sread.c:1786 +#: Engine/sread.c:1266 Engine/sread.c:1271 Engine/sread.c:1754 +#: Engine/sread.c:1777 Engine/sread.c:1791 msgid " remainder of line flushed\n" msgstr "" @@ -1728,47 +1742,47 @@ msgid "Not #include" msgstr "" -#: Engine/sread.c:1674 +#: Engine/sread.c:1679 #, c-format msgid "Cannot open #include'd file %s" msgstr "" -#: Engine/sread.c:1684 +#: Engine/sread.c:1689 msgid "Not #undef" msgstr "" -#: Engine/sread.c:1705 +#: Engine/sread.c:1710 #, c-format msgid "macro %s undefined\n" msgstr "" -#: Engine/sread.c:1711 +#: Engine/sread.c:1716 msgid "unknown # option" msgstr "" -#: Engine/sread.c:1748 +#: Engine/sread.c:1753 #, c-format msgid "illegal opcode %c" msgstr "" -#: Engine/sread.c:1771 +#: Engine/sread.c:1776 #, c-format msgid "unexpected char %c" msgstr "" -#: Engine/sread.c:1785 +#: Engine/sread.c:1790 msgid "illegally placed string" msgstr "" -#: Engine/sread.c:1792 +#: Engine/sread.c:1797 msgid "unmatched quote" msgstr "" -#: Engine/sread.c:1836 +#: Engine/sread.c:1841 msgid "sread: illegal number format: " msgstr "" -#: Engine/sread.c:1842 +#: Engine/sread.c:1847 msgid " zero substituted.\n" msgstr "" @@ -2391,56 +2405,56 @@ msgid "unrecognised message type %d" msgstr "" -#: InOut/midirecv.c:400 +#: InOut/midirecv.c:402 #, c-format msgid "midi channel %d using instr %d\n" msgstr "" -#: InOut/midirecv.c:403 +#: InOut/midirecv.c:405 #, c-format msgid "midi channel %d is muted\n" msgstr "" -#: InOut/midirecv.c:421 +#: InOut/midirecv.c:423 #, c-format msgid "MIDI channel %d muted\n" msgstr "" -#: InOut/midirecv.c:426 +#: InOut/midirecv.c:428 #, c-format msgid "Insno = %d\n" msgstr "" -#: InOut/midirecv.c:427 +#: InOut/midirecv.c:429 msgid "unknown instr" msgstr "" -#: InOut/midirecv.c:430 +#: InOut/midirecv.c:432 #, c-format msgid "chnl %d using instr %d\n" msgstr "" -#: InOut/midirecv.c:490 +#: InOut/midirecv.c:492 #, c-format msgid " *** error reading MIDI device: %d (%s)" msgstr "" -#: InOut/midirecv.c:519 +#: InOut/midirecv.c:521 #, c-format msgid "undefined sys-realtime msg %x\n" msgstr "" -#: InOut/midirecv.c:537 +#: InOut/midirecv.c:539 #, c-format msgid "undefined sys_common msg %x\n" msgstr "" -#: InOut/midirecv.c:599 +#: InOut/midirecv.c:601 #, c-format msgid "Error closing MIDI in device: %d (%s)" msgstr "" -#: InOut/midirecv.c:606 +#: InOut/midirecv.c:608 #, c-format msgid "Error closing MIDI out device: %d (%s)" msgstr "" @@ -3694,79 +3708,79 @@ msgid "non-looping sample" msgstr "" -#: OOps/aops.c:1041 OOps/aops.c:1069 +#: OOps/aops.c:1037 OOps/aops.c:1065 #, c-format msgid "No tuning table %d" msgstr "" -#: OOps/aops.c:1114 OOps/aops.c:1152 +#: OOps/aops.c:1110 OOps/aops.c:1148 msgid "cpstun: invalid table" msgstr "" -#: OOps/aops.c:1544 OOps/aops.c:1580 +#: OOps/aops.c:1540 OOps/aops.c:1576 #, c-format msgid "Input channel %d too large; ignored" msgstr "" -#: OOps/aops.c:1576 +#: OOps/aops.c:1572 msgid "Input and output argument count differs in inch" msgstr "" -#: OOps/aops.c:2014 +#: OOps/aops.c:2010 msgid "Unknown function called" msgstr "" -#: OOps/aops.c:2050 +#: OOps/aops.c:2046 msgid "number of arguments != nchnls" msgstr "" -#: OOps/aops.c:2080 +#: OOps/aops.c:2076 msgid "outrg: channel number cannot be < 1 (1 is the first channel)" msgstr "" -#: OOps/bus.c:80 OOps/bus.c:102 OOps/bus.c:127 OOps/bus.c:155 +#: OOps/bus.c:83 OOps/bus.c:105 OOps/bus.c:130 OOps/bus.c:158 msgid "chani: invalid index" msgstr "" -#: OOps/bus.c:88 OOps/bus.c:134 +#: OOps/bus.c:91 OOps/bus.c:137 #, c-format msgid "chani error %d:channel not found or not right type" msgstr "" -#: OOps/bus.c:110 OOps/bus.c:162 +#: OOps/bus.c:113 OOps/bus.c:165 #, c-format msgid "chano error %d:channel not found or not right type" msgstr "" -#: OOps/bus.c:216 +#: OOps/bus.c:219 #, fuzzy msgid "pvsin: invalid index" msgstr "неправильный число аргументов" -#: OOps/bus.c:224 +#: OOps/bus.c:227 #, c-format msgid "pvsin error %d:channel not found or not right type" msgstr "" -#: OOps/bus.c:279 +#: OOps/bus.c:282 #, fuzzy msgid "pvsout: invalid index" msgstr "неправильный число аргументов" -#: OOps/bus.c:287 +#: OOps/bus.c:290 #, c-format msgid "pvsout error %d:channel not found or not right type" msgstr "" -#: OOps/bus.c:1026 OOps/bus.c:1075 OOps/bus.c:1096 OOps/bus.c:1143 +#: OOps/bus.c:1029 OOps/bus.c:1078 OOps/bus.c:1099 OOps/bus.c:1146 msgid "invalid mode parameter" msgstr "" -#: OOps/bus.c:1063 OOps/bus.c:1187 +#: OOps/bus.c:1066 OOps/bus.c:1187 msgid "invalid channel parameters" msgstr "" -#: OOps/bus.c:1151 +#: OOps/bus.c:1154 msgid "channel already exists" msgstr "" @@ -3814,11 +3828,11 @@ msgid "diskin2: invalid number of channels" msgstr "" -#: OOps/diskin2.c:289 OOps/diskin2.c:1741 +#: OOps/diskin2.c:289 OOps/diskin2.c:1745 msgid "diskin2: unknown sample format" msgstr "" -#: OOps/diskin2.c:304 OOps/diskin2.c:1756 +#: OOps/diskin2.c:304 OOps/diskin2.c:1760 #, c-format msgid "diskin2: %s: failed to open file" msgstr "" @@ -3828,19 +3842,19 @@ "diskin2: number of output args inconsistent with number of file channels" msgstr "" -#: OOps/diskin2.c:346 OOps/diskin2.c:1813 +#: OOps/diskin2.c:346 OOps/diskin2.c:1817 #, c-format msgid "diskin2: warning: file sample rate (%d) != orchestra sr (%d)\n" msgstr "" -#: OOps/diskin2.c:427 OOps/diskin2.c:1894 +#: OOps/diskin2.c:427 OOps/diskin2.c:1905 #, c-format msgid "" "diskin2: opened (asynchronously) '%s':\n" " %d Hz, %d channel(s), %ld sample frames\n" msgstr "" -#: OOps/diskin2.c:441 OOps/diskin2.c:1908 +#: OOps/diskin2.c:441 OOps/diskin2.c:1919 #, c-format msgid "" "diskin2: opened '%s':\n" @@ -3848,12 +3862,12 @@ msgstr "" #: OOps/diskin2.c:520 OOps/diskin2.c:706 OOps/diskin2.c:902 -#: OOps/diskin2.c:1526 OOps/diskin2.c:1940 OOps/diskin2.c:2133 +#: OOps/diskin2.c:1529 OOps/diskin2.c:1951 OOps/diskin2.c:2144 msgid "diskin2: not initialised" msgstr "" -#: OOps/diskin2.c:686 OOps/diskin2.c:877 OOps/diskin2.c:1697 -#: OOps/diskin2.c:2106 +#: OOps/diskin2.c:686 OOps/diskin2.c:877 OOps/diskin2.c:1700 +#: OOps/diskin2.c:2117 msgid "diskin2: file descriptor closed or invalid\n" msgstr "" @@ -3919,7 +3933,7 @@ msgid "soundouts: not initialised" msgstr "" -#: OOps/diskin2.c:1782 +#: OOps/diskin2.c:1786 msgid "diskin2: output array too small" msgstr "" @@ -4693,12 +4707,12 @@ msgid "channel already specific remote" msgstr "" -#: OOps/remote.c:589 OOps/remote.c:614 OOps/remote.c:639 +#: OOps/remote.c:590 OOps/remote.c:615 OOps/remote.c:640 msgid "CLsend failed" msgstr "" -#: OOps/remote.c:706 OOps/remote.c:714 OOps/remote.c:722 OOps/remote.c:730 -#: OOps/remote.c:738 +#: OOps/remote.c:707 OOps/remote.c:715 OOps/remote.c:723 OOps/remote.c:731 +#: OOps/remote.c:739 msgid "" "*** This version of Csound was not compiled with remote event support ***\n" msgstr "" @@ -4713,11 +4727,11 @@ msgid "schedkwhen ignored. Instrument %d undefined\n" msgstr "" -#: OOps/schedule.c:429 +#: OOps/schedule.c:430 msgid "schedkwhen warning: negative kwhen reset to zero" msgstr "" -#: OOps/schedule.c:454 OOps/schedule.c:477 +#: OOps/schedule.c:455 OOps/schedule.c:478 msgid "trigseq: incorrect table number" msgstr "" @@ -4743,25 +4757,25 @@ msgid "filepeak: error getting peak value" msgstr "" -#: OOps/str_ops.c:60 +#: OOps/str_ops.c:64 msgid "illegal strset index" msgstr "" -#: OOps/str_ops.c:68 +#: OOps/str_ops.c:72 #, c-format msgid "strset index conflict at %d" msgstr "" -#: OOps/str_ops.c:69 +#: OOps/str_ops.c:73 #, c-format msgid "previous value: '%s', replaced with '%s'" msgstr "" -#: OOps/str_ops.c:93 OOps/str_ops.c:100 +#: OOps/str_ops.c:97 OOps/str_ops.c:104 msgid "--strset: invalid format" msgstr "" -#: OOps/str_ops.c:921 +#: OOps/str_ops.c:925 #, c-format msgid "invalid option code: %g" msgstr "" @@ -4912,27 +4926,27 @@ msgid "osciln: not initialised" msgstr "" -#: OOps/ugens2.c:1168 +#: OOps/ugens2.c:1210 msgid "oscil(krate): not initialised" msgstr "" -#: OOps/ugens2.c:1203 OOps/ugens2.c:1239 OOps/ugens2.c:1272 OOps/ugens2.c:1307 +#: OOps/ugens2.c:1245 OOps/ugens2.c:1281 OOps/ugens2.c:1314 OOps/ugens2.c:1349 msgid "oscil: not initialised" msgstr "" -#: OOps/ugens2.c:1330 +#: OOps/ugens2.c:1372 msgid "oscili(krate): not initialised" msgstr "" -#: OOps/ugens2.c:1365 OOps/ugens2.c:1405 OOps/ugens2.c:1441 OOps/ugens2.c:1480 +#: OOps/ugens2.c:1407 OOps/ugens2.c:1447 OOps/ugens2.c:1483 OOps/ugens2.c:1522 msgid "oscili: not initialised" msgstr "" -#: OOps/ugens2.c:1521 +#: OOps/ugens2.c:1563 msgid "oscil3(krate): not initialised" msgstr "" -#: OOps/ugens2.c:1580 OOps/ugens2.c:1636 OOps/ugens2.c:1689 OOps/ugens2.c:1744 +#: OOps/ugens2.c:1622 OOps/ugens2.c:1678 OOps/ugens2.c:1731 OOps/ugens2.c:1786 msgid "oscil3: not initialised" msgstr "" @@ -5061,120 +5075,124 @@ msgid "pluck: kcps more than sample rate" msgstr "" -#: OOps/ugens4.c:472 OOps/ugens4.c:580 OOps/ugens4.c:685 +#: OOps/ugens4.c:472 OOps/ugens4.c:580 OOps/ugens4.c:686 #, c-format msgid "Seeding from current time %lu\n" msgstr "" -#: OOps/ugens5.c:287 OOps/ugens5.c:396 Opcodes/gab/gab.c:48 Opcodes/ugsc.c:209 +#: OOps/ugens5.c:287 OOps/ugens5.c:400 Opcodes/gab/gab.c:50 Opcodes/ugsc.c:211 #, c-format msgid "illegal reson iscl value, %f" msgstr "" -#: OOps/ugens5.c:616 +#: OOps/ugens5.c:623 #, c-format msgid "LPREAD cannot load %s" msgstr "" -#: OOps/ugens5.c:627 +#: OOps/ugens5.c:634 #, c-format msgid "Using %s type of file.\n" msgstr "" -#: OOps/ugens5.c:628 +#: OOps/ugens5.c:635 msgid "pole" msgstr "" -#: OOps/ugens5.c:628 +#: OOps/ugens5.c:635 msgid "filter coefficient" msgstr "" -#: OOps/ugens5.c:633 +#: OOps/ugens5.c:640 msgid "lpheader overriding inputs" msgstr "" -#: OOps/ugens5.c:637 +#: OOps/ugens5.c:644 msgid "lpfile srate != orch sr" msgstr "" -#: OOps/ugens5.c:645 +#: OOps/ugens5.c:652 #, c-format msgid "file %s bytes are in wrong order" msgstr "" -#: OOps/ugens5.c:655 +#: OOps/ugens5.c:662 msgid "insufficient args and no file header" msgstr "" -#: OOps/ugens5.c:660 +#: OOps/ugens5.c:667 msgid "npoles > MAXPOLES" msgstr "" -#: OOps/ugens5.c:668 +#: OOps/ugens5.c:675 #, c-format msgid "npoles %ld, nvals %ld, totvals %ld, lastfram16 = %lx\n" msgstr "" -#: OOps/ugens5.c:692 util/lpanal.c:324 +#: OOps/ugens5.c:700 util/lpanal.c:324 #, c-format msgid "magnitude: %f Phase: %f\n" msgstr "" -#: OOps/ugens5.c:695 util/lpanal.c:327 +#: OOps/ugens5.c:703 util/lpanal.c:327 #, c-format msgid "Real: %f Imag: %f\n" msgstr "" -#: OOps/ugens5.c:863 +#: OOps/ugens5.c:758 +msgid "Cannot handle uneven pole count yet \n" +msgstr "" + +#: OOps/ugens5.c:871 msgid "lpread: not initialised" msgstr "" -#: OOps/ugens5.c:869 +#: OOps/ugens5.c:877 msgid "lpread timpnt < 0" msgstr "" -#: OOps/ugens5.c:875 +#: OOps/ugens5.c:883 msgid "lpread ktimpnt truncated to last frame" msgstr "" -#: OOps/ugens5.c:906 OOps/ugens5.c:1409 +#: OOps/ugens5.c:914 OOps/ugens5.c:1417 msgid "Interpolation failed" msgstr "" -#: OOps/ugens5.c:964 +#: OOps/ugens5.c:972 msgid "this opcode only works with LPC pole analysis type (-a)\n" msgstr "" -#: OOps/ugens5.c:1098 +#: OOps/ugens5.c:1106 msgid "Pole file not supported for this opcode !" msgstr "" -#: OOps/ugens5.c:1125 +#: OOps/ugens5.c:1133 #, c-format msgid "illegal frqratio, %5.2f" msgstr "" -#: OOps/ugens5.c:1335 +#: OOps/ugens5.c:1343 msgid "lpslot number should be positive" msgstr "" -#: OOps/ugens5.c:1355 +#: OOps/ugens5.c:1363 msgid "LPC slot is not allocated" msgstr "" -#: OOps/ugens5.c:1363 +#: OOps/ugens5.c:1371 msgid "lpinterpol works only with poles files.." msgstr "" -#: OOps/ugens5.c:1367 +#: OOps/ugens5.c:1375 msgid "The poles files have different pole count" msgstr "" -#: OOps/ugens5.c:1373 +#: OOps/ugens5.c:1381 msgid "padding error" msgstr "" -#: OOps/ugens5.c:1393 +#: OOps/ugens5.c:1401 msgid "lpinterpol: not initialised" msgstr "" @@ -5212,49 +5230,53 @@ msgid "delayw: not initialised" msgstr "" -#: OOps/ugens6.c:475 OOps/ugens6.c:774 OOps/ugens6.c:859 +#: OOps/ugens6.c:475 OOps/ugens6.c:785 OOps/ugens6.c:870 msgid "deltap: not initialised" msgstr "" -#: OOps/ugens6.c:530 +#: OOps/ugens6.c:532 msgid "deltapi: not initialised" msgstr "" -#: OOps/ugens6.c:583 +#: OOps/ugens6.c:535 OOps/ugens6.c:677 +msgid "deltapi: INF delaytime" +msgstr "" + +#: OOps/ugens6.c:588 msgid "deltapn: not initialised" msgstr "" -#: OOps/ugens6.c:667 +#: OOps/ugens6.c:674 msgid "deltap3: not initialised" msgstr "" -#: OOps/ugens6.c:896 OOps/ugens6.c:900 Opcodes/ugmoss.c:483 +#: OOps/ugens6.c:907 OOps/ugens6.c:911 Opcodes/ugmoss.c:483 #: Opcodes/ugmoss.c:487 msgid "illegal loop time" msgstr "" -#: OOps/ugens6.c:963 +#: OOps/ugens6.c:974 msgid "comb: not initialised" msgstr "" -#: OOps/ugens6.c:1002 +#: OOps/ugens6.c:1013 #, fuzzy msgid "combinv: not initialised" msgstr "%s: не выступлено с иничиативой" -#: OOps/ugens6.c:1039 +#: OOps/ugens6.c:1050 msgid "alpass: not initialised" msgstr "" -#: OOps/ugens6.c:1072 +#: OOps/ugens6.c:1083 msgid "revlpsiz inconsistent\n" msgstr "" -#: OOps/ugens6.c:1163 +#: OOps/ugens6.c:1174 msgid "reverb: not intialised" msgstr "" -#: OOps/ugens6.c:1237 +#: OOps/ugens6.c:1248 msgid "pan: not initialised" msgstr "" @@ -5417,10 +5439,10 @@ msgstr "" #: OOps/ugtabs.c:38 OOps/ugtabs.c:74 OOps/ugtabs.c:154 OOps/ugtabs.c:266 -#: OOps/ugtabs.c:428 OOps/ugtabs.c:445 OOps/ugtabs.c:461 OOps/ugtabs.c:477 -#: OOps/ugtabs.c:493 OOps/ugtabs.c:508 OOps/ugtabs.c:528 OOps/ugtabs.c:615 -#: OOps/ugtabs.c:632 OOps/ugtabs.c:646 OOps/ugtabs.c:659 OOps/ugtabs.c:695 -#: OOps/ugtabs.c:702 OOps/ugtabs.c:709 OOps/ugtabs.c:793 OOps/ugtabs.c:839 +#: OOps/ugtabs.c:428 OOps/ugtabs.c:445 OOps/ugtabs.c:461 OOps/ugtabs.c:478 +#: OOps/ugtabs.c:493 OOps/ugtabs.c:508 OOps/ugtabs.c:528 OOps/ugtabs.c:616 +#: OOps/ugtabs.c:633 OOps/ugtabs.c:647 OOps/ugtabs.c:660 OOps/ugtabs.c:696 +#: OOps/ugtabs.c:703 OOps/ugtabs.c:710 OOps/ugtabs.c:794 OOps/ugtabs.c:840 #, fuzzy, c-format msgid "table: could not find ftable %d" msgstr "%s: не выступлено с иничиативой" @@ -5433,12 +5455,12 @@ msgid "tablekt: index type inconsistent with output" msgstr "" -#: OOps/ugtabs.c:673 +#: OOps/ugtabs.c:674 #, c-format msgid "table: could not find ftables %d and/or %d" msgstr "" -#: OOps/ugtabs.c:802 OOps/ugtabs.c:848 +#: OOps/ugtabs.c:803 OOps/ugtabs.c:849 #, c-format msgid "table: could not read negative pos %d" msgstr "" @@ -5841,19 +5863,19 @@ msgid "crossfm: ftable not found" msgstr "" -#: Opcodes/date.c:96 +#: Opcodes/date.c:97 msgid "cannot determine current directory" msgstr "" -#: Opcodes/date.c:133 +#: Opcodes/date.c:134 msgid "readf: failed to open file" msgstr "" -#: Opcodes/date.c:159 +#: Opcodes/date.c:161 msgid "readf: read failure" msgstr "" -#: Opcodes/date.c:169 Opcodes/date.c:177 +#: Opcodes/date.c:171 Opcodes/date.c:179 #, fuzzy msgid "readi failed to initialise" msgstr "%s: не выступлено с иничиативой" @@ -6113,12 +6135,12 @@ msgid "ftconv: not initialised" msgstr "%s: не выступлено с иничиативой" -#: Opcodes/ftgen.c:69 Opcodes/ftgen.c:212 +#: Opcodes/ftgen.c:69 Opcodes/ftgen.c:213 #, c-format msgid "Error deleting ftable %d" msgstr "" -#: Opcodes/ftgen.c:137 Opcodes/signalflowgraph.cpp:1175 +#: Opcodes/ftgen.c:137 Opcodes/signalflowgraph.cpp:1383 msgid "ftgen string arg not allowed" msgstr "" @@ -6126,106 +6148,106 @@ msgid "ftgen error" msgstr "" -#: Opcodes/ftgen.c:209 +#: Opcodes/ftgen.c:210 #, fuzzy, c-format msgid "Invalid table number: %d" msgstr "неправильный число аргументов" -#: Opcodes/ftgen.c:392 +#: Opcodes/ftgen.c:393 msgid "ftload: error allocating ftable" msgstr "" -#: Opcodes/ftgen.c:394 +#: Opcodes/ftgen.c:395 msgid "ftload: no table numbers" msgstr "" -#: Opcodes/ftgen.c:396 +#: Opcodes/ftgen.c:397 msgid "ftload: unable to open file" msgstr "" -#: Opcodes/ftgen.c:399 +#: Opcodes/ftgen.c:400 msgid "ftload: incorrect file" msgstr "" -#: Opcodes/ftgen.c:539 +#: Opcodes/ftgen.c:540 msgid "ftsave: Bad table number. Saving is possible only for existing tables." msgstr "" -#: Opcodes/ftgen.c:542 +#: Opcodes/ftgen.c:543 msgid "ftsave: no table numbers" msgstr "" -#: Opcodes/ftgen.c:544 +#: Opcodes/ftgen.c:545 msgid "ftsave: unable to open file" msgstr "" -#: Opcodes/ftgen.c:546 +#: Opcodes/ftgen.c:547 msgid "ftsave: failed to write file" msgstr "" -#: Opcodes/gab/gab.c:112 +#: Opcodes/gab/gab.c:114 msgid "fastab: incorrect table number" msgstr "" -#: Opcodes/gab/gab.c:139 Opcodes/gab/gab.c:148 Opcodes/gab/gab.c:178 +#: Opcodes/gab/gab.c:141 Opcodes/gab/gab.c:150 Opcodes/gab/gab.c:180 msgid "tabw off end" msgstr "" -#: Opcodes/gab/gab.c:164 Opcodes/gab/gab.c:241 Opcodes/gab/gab.c:250 +#: Opcodes/gab/gab.c:166 Opcodes/gab/gab.c:243 Opcodes/gab/gab.c:252 msgid "tab off end" msgstr "" -#: Opcodes/gab/gab.c:190 +#: Opcodes/gab/gab.c:192 msgid "tab_i: incorrect table number" msgstr "" -#: Opcodes/gab/gab.c:198 +#: Opcodes/gab/gab.c:200 #, c-format msgid "tab_i off end: table number: %d\n" msgstr "" -#: Opcodes/gab/gab.c:211 +#: Opcodes/gab/gab.c:213 msgid "tabw_i: incorrect table number" msgstr "" -#: Opcodes/gab/gab.c:218 +#: Opcodes/gab/gab.c:220 msgid "tabw_i off end" msgstr "" -#: Opcodes/gab/gab.c:263 +#: Opcodes/gab/gab.c:265 msgid "tab_init: incorrect table number" msgstr "" -#: Opcodes/gab/gab.c:332 +#: Opcodes/gab/gab.c:334 msgid "printi parameter was not a \"quoted string\"" msgstr "" -#: Opcodes/gab/gab.c:446 +#: Opcodes/gab/gab.c:448 msgid "adsynt2: wavetable not found!" msgstr "" -#: Opcodes/gab/gab.c:458 +#: Opcodes/gab/gab.c:460 msgid "adsynt2: freqtable not found!" msgstr "" -#: Opcodes/gab/gab.c:463 +#: Opcodes/gab/gab.c:465 msgid "adsynt2: partial count is greater than freqtable size!" msgstr "" -#: Opcodes/gab/gab.c:472 +#: Opcodes/gab/gab.c:474 msgid "adsynt2: amptable not found!" msgstr "" -#: Opcodes/gab/gab.c:477 +#: Opcodes/gab/gab.c:479 msgid "adsynt2: partial count is greater than amptable size!" msgstr "" -#: Opcodes/gab/gab.c:525 +#: Opcodes/gab/gab.c:527 #, fuzzy msgid "adsynt2: not initialised" msgstr "%s: не выступлено с иничиативой" -#: Opcodes/gab/gab.c:759 +#: Opcodes/gab/gab.c:771 msgid "max_k: invalid imaxflag value" msgstr "" @@ -6767,11 +6789,11 @@ msgid "vlinseg/vexpseg: invalid num. of elements" msgstr "неправильный число аргументов" -#: Opcodes/gab/vectorial.c:2255 Opcodes/vpvoc.c:119 +#: Opcodes/gab/vectorial.c:2255 Opcodes/vpvoc.c:121 msgid "tableseg: not initialised" msgstr "" -#: Opcodes/gab/vectorial.c:2285 Opcodes/vpvoc.c:148 +#: Opcodes/gab/vectorial.c:2285 Opcodes/vpvoc.c:150 msgid "tablexseg: not initialised" msgstr "" @@ -7174,8 +7196,8 @@ msgid "loscilx: invalid number of output arguments" msgstr "" -#: Opcodes/loscilx.c:209 Opcodes/loscilx.c:238 Opcodes/pvlock.c:152 -#: Opcodes/pvlock.c:375 Opcodes/pvsbasic.c:566 +#: Opcodes/loscilx.c:209 Opcodes/loscilx.c:238 Opcodes/pvlock.c:160 +#: Opcodes/pvlock.c:383 Opcodes/pvlock.c:657 Opcodes/pvsbasic.c:566 msgid "" "number of output arguments inconsistent with number of sound file channels" msgstr "" @@ -7184,7 +7206,12 @@ msgid "loscilx: not initialised" msgstr "" -#: Opcodes/lowpassr.c:85 Opcodes/lowpassr.c:140 +#: Opcodes/lowpassr.c:55 Opcodes/lowpassr.c:99 Opcodes/lowpassr.c:121 +#: Opcodes/lowpassr.c:155 Opcodes/lowpassr.c:176 Opcodes/lowpassr.c:210 +msgid "Cutoff parameter must be positive" +msgstr "" + +#: Opcodes/lowpassr.c:252 Opcodes/lowpassr.c:312 msgid "illegal order num. (min 1, max 10)" msgstr "" @@ -7400,20 +7427,20 @@ msgid "partikkel: " msgstr "" -#: Opcodes/partikkel.c:841 +#: Opcodes/partikkel.c:839 msgid "partikkelsync: opcode id needs to be a non-zero integer" msgstr "" -#: Opcodes/partikkel.c:845 Opcodes/partikkel.c:851 +#: Opcodes/partikkel.c:843 Opcodes/partikkel.c:849 msgid "partikkelsync: could not find opcode id" msgstr "" -#: Opcodes/partikkel.c:881 +#: Opcodes/partikkel.c:879 #, fuzzy, c-format msgid "%s: partikkel not initialized" msgstr "%s: не выступлено с иничиативой" -#: Opcodes/partikkel.c:889 +#: Opcodes/partikkel.c:887 #, c-format msgid "%s: could not find opcode id" msgstr "" @@ -7532,73 +7559,73 @@ msgid "adsynt: partial count is greater than amptable size!" msgstr "" -#: Opcodes/pitch.c:690 +#: Opcodes/pitch.c:691 msgid "adsynt: not initialised" msgstr "" -#: Opcodes/pitch.c:770 +#: Opcodes/pitch.c:771 msgid "hsboscil: not initialised" msgstr "" -#: Opcodes/pitch.c:856 +#: Opcodes/pitch.c:857 msgid "pitchamdf: maxcps must be > mincps !" msgstr "" -#: Opcodes/pitch.c:1003 +#: Opcodes/pitch.c:1004 msgid "pitchamdf: not initialised" msgstr "" -#: Opcodes/pitch.c:1184 Opcodes/pitch.c:1214 +#: Opcodes/pitch.c:1185 Opcodes/pitch.c:1215 msgid "phasorbnk: not initialised" msgstr "" -#: Opcodes/pitch.c:1281 +#: Opcodes/pitch.c:1282 msgid "pinkish: Invalid method code" msgstr "" -#: Opcodes/pitch.c:1292 +#: Opcodes/pitch.c:1293 msgid "pinkish: Filter method requires a-rate (noise) input" msgstr "" -#: Opcodes/pitch.c:1421 +#: Opcodes/pitch.c:1422 #, c-format msgid "" "pinkish: Gardner method requires 4-%d bands. Default %ld substituted for " "%d.\n" msgstr "" -#: Opcodes/pitch.c:1684 +#: Opcodes/pitch.c:1685 msgid "Incorrect argument count in transeg" msgstr "" -#: Opcodes/pitch.c:1735 +#: Opcodes/pitch.c:1736 msgid "Incorrect argument count in transegb" msgstr "" -#: Opcodes/pitch.c:1786 Opcodes/pitch.c:1947 +#: Opcodes/pitch.c:1787 Opcodes/pitch.c:1948 #, fuzzy msgid "Error: transeg not initialised (krate)\n" msgstr "%s: не выступлено с иничиативой" -#: Opcodes/pitch.c:1824 Opcodes/pitch.c:2007 +#: Opcodes/pitch.c:1825 Opcodes/pitch.c:2008 msgid "transeg: not initialised (arate)\n" msgstr "" -#: Opcodes/pitch.c:1884 +#: Opcodes/pitch.c:1885 msgid "Incorrect argument count in transegr" msgstr "" -#: Opcodes/pitch.c:2303 +#: Opcodes/pitch.c:2321 #, fuzzy msgid "median: not initialised (arate)\n" msgstr "%s: не выступлено с иничиативой" -#: Opcodes/pitch.c:2307 Opcodes/pitch.c:2360 +#: Opcodes/pitch.c:2325 Opcodes/pitch.c:2378 #, c-format msgid "median: window (%d)larger than maximum(%d); truncated" msgstr "" -#: Opcodes/pitch.c:2356 +#: Opcodes/pitch.c:2374 #, fuzzy msgid "median: not initialised (krate)\n" msgstr "%s: не выступлено с иничиативой" @@ -7717,30 +7744,30 @@ msgid "PVBUFREAD cannot load %s" msgstr "" -#: Opcodes/pvinterp.c:82 Opcodes/vpvoc.c:215 +#: Opcodes/pvinterp.c:82 Opcodes/vpvoc.c:217 #, c-format msgid "PVOC frame %ld bigger than %ld in %s" msgstr "" -#: Opcodes/pvinterp.c:87 Opcodes/vpvoc.c:220 +#: Opcodes/pvinterp.c:87 Opcodes/vpvoc.c:222 #, c-format msgid "PVOC frame %ld seems too small in %s" msgstr "" #: Opcodes/pvinterp.c:91 Opcodes/pvinterp.c:203 Opcodes/pvinterp.c:393 -#: Opcodes/vpvoc.c:224 +#: Opcodes/vpvoc.c:226 #, c-format msgid "%d chans (not 1) in PVOC file %s" msgstr "" #: Opcodes/pvinterp.c:106 Opcodes/pvinterp.c:230 Opcodes/pvinterp.c:418 -#: Opcodes/ugens8.c:101 Opcodes/vpvoc.c:252 +#: Opcodes/ugens8.c:101 Opcodes/vpvoc.c:254 #, c-format msgid "ksmps of %d needs wdw of %d, max is %d for pv %s" msgstr "" #: Opcodes/pvinterp.c:135 Opcodes/pvinterp.c:284 Opcodes/pvinterp.c:475 -#: Opcodes/pvread.c:109 Opcodes/ugens8.c:174 Opcodes/vpvoc.c:314 +#: Opcodes/pvread.c:109 Opcodes/ugens8.c:174 Opcodes/vpvoc.c:316 msgid "PVOC ktimpnt truncated to last frame" msgstr "" @@ -7749,7 +7776,7 @@ msgstr "" #: Opcodes/pvinterp.c:146 Opcodes/pvinterp.c:337 Opcodes/pvinterp.c:540 -#: Opcodes/pvread.c:117 Opcodes/ugens8.c:232 Opcodes/vpvoc.c:382 +#: Opcodes/pvread.c:117 Opcodes/ugens8.c:232 Opcodes/vpvoc.c:384 msgid "PVOC timpnt < 0" msgstr "" @@ -7772,12 +7799,12 @@ msgstr "" #: Opcodes/pvinterp.c:332 Opcodes/pvinterp.c:534 Opcodes/ugens8.c:226 -#: Opcodes/vpvoc.c:376 +#: Opcodes/vpvoc.c:378 msgid "PVOC transpose too low" msgstr "" #: Opcodes/pvinterp.c:335 Opcodes/pvinterp.c:537 Opcodes/ugens8.c:229 -#: Opcodes/vpvoc.c:379 +#: Opcodes/vpvoc.c:381 msgid "PVOC transpose too high" msgstr "" @@ -7795,7 +7822,7 @@ msgid "pvcross: %s: frame size %d does not match pvbufread frame size %d\n" msgstr "" -#: Opcodes/pvinterp.c:498 Opcodes/vpvoc.c:339 +#: Opcodes/pvinterp.c:498 Opcodes/vpvoc.c:341 msgid "PVOC debug: one frame gets through\n" msgstr "" @@ -7803,19 +7830,19 @@ msgid "pvcross: not initialised" msgstr "" -#: Opcodes/pvlock.c:67 Opcodes/pvsbasic.c:480 +#: Opcodes/pvlock.c:71 Opcodes/pvsbasic.c:480 #, fuzzy msgid "invalid number of output arguments" msgstr "неправильный число аргументов" -#: Opcodes/pvlock.c:536 Opcodes/pvsband.c:46 Opcodes/pvsbasic.c:684 +#: Opcodes/pvlock.c:826 Opcodes/pvsband.c:46 Opcodes/pvsbasic.c:684 #: Opcodes/pvsbasic.c:1007 Opcodes/pvsbasic.c:1220 Opcodes/pvsbasic.c:1326 #: Opcodes/pvsbasic.c:1555 Opcodes/pvsbasic.c:1768 Opcodes/pvsbasic.c:1942 -#: Opcodes/pvsgendy.c:43 Opcodes/signalflowgraph.cpp:627 +#: Opcodes/pvsgendy.c:43 Opcodes/signalflowgraph.cpp:665 msgid "Unsafe to have same fsig as in and out" msgstr "" -#: Opcodes/pvlock.c:548 +#: Opcodes/pvlock.c:838 msgid "pvsfreeze: signal format must be amp-freq." msgstr "" @@ -8175,48 +8202,48 @@ msgid "Nothing to close" msgstr "" -#: Opcodes/sfont.c:111 +#: Opcodes/sfont.c:114 #, c-format msgid "sfload: cannot open SoundFont file \"%s\" (error %s)" msgstr "" -#: Opcodes/sfont.c:117 +#: Opcodes/sfont.c:120 msgid "Sfload: cannot use globals" msgstr "" -#: Opcodes/sfont.c:150 +#: Opcodes/sfont.c:153 msgid "sfload: could not open globals\n" msgstr "" -#: Opcodes/sfont.c:172 +#: Opcodes/sfont.c:175 msgid "Extending soundfonts" msgstr "" -#: Opcodes/sfont.c:211 +#: Opcodes/sfont.c:214 #, c-format msgid "" "\n" "Preset list of \"%s\"\n" msgstr "" -#: Opcodes/sfont.c:214 +#: Opcodes/sfont.c:217 #, c-format msgid "%3d) %-20s\tprog:%-3d bank:%d\n" msgstr "" -#: Opcodes/sfont.c:236 +#: Opcodes/sfont.c:239 #, c-format msgid "" "\n" "Assigning all Presets of \"%s\" starting from %d (preset handle number)\n" msgstr "" -#: Opcodes/sfont.c:241 +#: Opcodes/sfont.c:244 #, c-format msgid "%3d<--%-20s\t(prog:%-3d bank:%d)\n" msgstr "" -#: Opcodes/sfont.c:248 +#: Opcodes/sfont.c:251 #, c-format msgid "" "\n" @@ -8224,38 +8251,38 @@ "\n" msgstr "" -#: Opcodes/sfont.c:261 +#: Opcodes/sfont.c:264 #, c-format msgid "" "\n" "Instrument list of \"%s\"\n" msgstr "" -#: Opcodes/sfont.c:279 +#: Opcodes/sfont.c:282 #, c-format msgid "sfpreset: preset handle too big (%d), max: %d" msgstr "" -#: Opcodes/sfont.c:296 +#: Opcodes/sfont.c:299 #, c-format msgid "" "sfpreset: cannot find any preset having prog number %d and bank number %d in " "SoundFont file \"%s\"" msgstr "" -#: Opcodes/sfont.c:318 Opcodes/sfont.c:2248 +#: Opcodes/sfont.c:321 Opcodes/sfont.c:2251 msgid "sfplay: invalid or out-of-range preset number" msgstr "" -#: Opcodes/sfont.c:655 +#: Opcodes/sfont.c:658 msgid "sfplaym: invalid or out-of-range preset number" msgstr "" -#: Opcodes/sfont.c:919 Opcodes/sfont.c:1191 +#: Opcodes/sfont.c:922 Opcodes/sfont.c:1194 msgid "sfinstr: instrument out of range" msgstr "" -#: Opcodes/sfont.c:1648 Opcodes/sfont.c:1886 +#: Opcodes/sfont.c:1651 Opcodes/sfont.c:1889 #, c-format msgid "" "SoundFont file \"%s\" contains ROM samples !\n" @@ -8263,15 +8290,15 @@ "Session aborted !" msgstr "" -#: Opcodes/sfont.c:2041 Opcodes/sfont.c:2049 +#: Opcodes/sfont.c:2044 Opcodes/sfont.c:2052 msgid "Sfont: cannot use globals/" msgstr "" -#: Opcodes/sfont.c:2054 +#: Opcodes/sfont.c:2057 msgid "Sfont format not compatible" msgstr "" -#: Opcodes/sfont.c:2598 +#: Opcodes/sfont.c:2601 msgid "error... could not create sfont globals\n" msgstr "" @@ -8279,31 +8306,36 @@ msgid "powershape: ifullscale must be strictly positive" msgstr "" -#: Opcodes/signalflowgraph.cpp:332 Opcodes/signalflowgraph.cpp:593 +#: Opcodes/signalflowgraph.cpp:360 Opcodes/signalflowgraph.cpp:629 #, c-format msgid "Connected instances of outlet %s to instance 0x%x of inlet %s.\n" msgstr "" -#: Opcodes/signalflowgraph.cpp:408 +#: Opcodes/signalflowgraph.cpp:438 #, c-format msgid "Created instance 0x%x of %d instances of outlet %s\n" msgstr "" -#: Opcodes/signalflowgraph.cpp:468 +#: Opcodes/signalflowgraph.cpp:500 #, c-format msgid "Connected instances of outlet %s to instance 0x%xof inlet %s.\n" msgstr "" -#: Opcodes/signalflowgraph.cpp:655 +#: Opcodes/signalflowgraph.cpp:693 msgid "inletf: signal format must be amp-phase or amp-freq." msgstr "" -#: Opcodes/signalflowgraph.cpp:948 Opcodes/signalflowgraph.cpp:989 +#: Opcodes/signalflowgraph.cpp:837 +#, c-format +msgid "Connected instances of outlet %s to instance 0x%x of inlet %s\n" +msgstr "" + +#: Opcodes/signalflowgraph.cpp:1150 Opcodes/signalflowgraph.cpp:1193 #, c-format msgid "Connected outlet %s to inlet %s.\n" msgstr "" -#: Opcodes/signalflowgraph.cpp:1116 Opcodes/signalflowgraph.cpp:1200 +#: Opcodes/signalflowgraph.cpp:1322 Opcodes/signalflowgraph.cpp:1408 msgid "ftgenonce error" msgstr "" @@ -8616,7 +8648,7 @@ msgid "Error allocating argument stack" msgstr "" -#: Opcodes/stackops.c:206 Top/argdecode.c:1245 util/envext.c:99 +#: Opcodes/stackops.c:206 Top/argdecode.c:1263 util/envext.c:99 #: util/scale.c:248 msgid "too many arguments" msgstr "" @@ -9049,7 +9081,7 @@ msgid "ATSCROSS: you must have an atsbufread before an atsinterpread" msgstr "" -#: Opcodes/ugsc.c:434 +#: Opcodes/ugsc.c:439 msgid "Phaser mode must be either 1 or 2" msgstr "" @@ -9181,21 +9213,21 @@ msgid "Have to have at least %d directions in vbapzmove" msgstr "" -#: Opcodes/vpvoc.c:175 +#: Opcodes/vpvoc.c:177 #, c-format msgid "vpvoc: Could not find ifnmagctrl table %f" msgstr "" -#: Opcodes/vpvoc.c:181 +#: Opcodes/vpvoc.c:183 msgid "vpvoc: associated tableseg not found" msgstr "" -#: Opcodes/vpvoc.c:203 +#: Opcodes/vpvoc.c:205 #, c-format msgid "VPVOC cannot load %s" msgstr "" -#: Opcodes/vpvoc.c:373 +#: Opcodes/vpvoc.c:375 msgid "vpvoc: not initialised" msgstr "" @@ -9267,748 +9299,760 @@ msgid "No wii range" msgstr "" -#: Top/argdecode.c:63 +#: Top/argdecode.c:64 msgid "--help\tprint long usage options" msgstr "" -#: Top/argdecode.c:64 +#: Top/argdecode.c:65 msgid "-U unam\trun utility program unam" msgstr "" -#: Top/argdecode.c:65 +#: Top/argdecode.c:66 msgid "-C\tuse Cscore processing of scorefile" msgstr "" -#: Top/argdecode.c:66 +#: Top/argdecode.c:67 msgid "-j N\tuse N threads in performance" msgstr "" -#: Top/argdecode.c:67 +#: Top/argdecode.c:68 msgid "-I\tI-time only orch run" msgstr "" -#: Top/argdecode.c:68 +#: Top/argdecode.c:69 msgid "-n\tno sound onto disk" msgstr "" -#: Top/argdecode.c:69 +#: Top/argdecode.c:70 msgid "-i fnam\tsound input filename" msgstr "" -#: Top/argdecode.c:70 util/mixer.c:94 util/scale.c:45 +#: Top/argdecode.c:71 util/mixer.c:94 util/scale.c:45 msgid "-o fnam\tsound output filename" msgstr "" -#: Top/argdecode.c:71 +#: Top/argdecode.c:72 msgid "-b N\tsample frames (or -kprds) per software sound I/O buffer" msgstr "" -#: Top/argdecode.c:72 +#: Top/argdecode.c:73 msgid "-B N\tsamples per hardware sound I/O buffer" msgstr "" -#: Top/argdecode.c:73 util/mixer.c:95 util/scale.c:46 util/srconv.c:752 +#: Top/argdecode.c:74 util/mixer.c:95 util/scale.c:46 util/srconv.c:752 msgid "-A\tcreate an AIFF format output soundfile" msgstr "" -#: Top/argdecode.c:74 util/mixer.c:96 util/scale.c:47 util/srconv.c:754 +#: Top/argdecode.c:75 util/mixer.c:96 util/scale.c:47 util/srconv.c:754 msgid "-W\tcreate a WAV format output soundfile" msgstr "" -#: Top/argdecode.c:75 util/srconv.c:753 +#: Top/argdecode.c:76 util/srconv.c:753 msgid "-J\tcreate an IRCAM format output soundfile" msgstr "" -#: Top/argdecode.c:76 util/mixer.c:97 util/scale.c:48 util/srconv.c:755 +#: Top/argdecode.c:77 util/mixer.c:97 util/scale.c:48 util/srconv.c:755 msgid "-h\tno header on output soundfile" msgstr "" -#: Top/argdecode.c:77 util/mixer.c:99 util/scale.c:49 util/srconv.c:756 +#: Top/argdecode.c:78 util/mixer.c:99 util/scale.c:49 util/srconv.c:756 msgid "-c\t8-bit signed_char sound samples" msgstr "" -#: Top/argdecode.c:79 util/mixer.c:101 util/scale.c:50 util/srconv.c:757 +#: Top/argdecode.c:80 util/mixer.c:101 util/scale.c:50 util/srconv.c:757 msgid "-a\talaw sound samples" msgstr "" -#: Top/argdecode.c:81 util/mixer.c:98 util/mixer.c:100 util/srconv.c:758 +#: Top/argdecode.c:82 util/mixer.c:98 util/mixer.c:100 util/srconv.c:758 msgid "-8\t8-bit unsigned_char sound samples" msgstr "" -#: Top/argdecode.c:82 util/mixer.c:102 util/scale.c:51 util/srconv.c:759 +#: Top/argdecode.c:83 util/mixer.c:102 util/scale.c:51 util/srconv.c:759 msgid "-u\tulaw sound samples" msgstr "" -#: Top/argdecode.c:83 util/mixer.c:103 util/scale.c:52 util/srconv.c:760 +#: Top/argdecode.c:84 util/mixer.c:103 util/scale.c:52 util/srconv.c:760 msgid "-s\tshort_int sound samples" msgstr "" -#: Top/argdecode.c:84 util/mixer.c:104 util/scale.c:53 util/srconv.c:761 +#: Top/argdecode.c:85 util/mixer.c:104 util/scale.c:53 util/srconv.c:761 msgid "-l\tlong_int sound samples" msgstr "" -#: Top/argdecode.c:85 util/mixer.c:105 util/scale.c:54 util/srconv.c:762 +#: Top/argdecode.c:86 util/mixer.c:105 util/scale.c:54 util/srconv.c:762 msgid "-f\tfloat sound samples" msgstr "" -#: Top/argdecode.c:86 +#: Top/argdecode.c:87 msgid "-3\t24bit sound samples" msgstr "" -#: Top/argdecode.c:87 util/srconv.c:763 +#: Top/argdecode.c:88 util/srconv.c:763 msgid "-r N\torchestra srate override" msgstr "" -#: Top/argdecode.c:88 +#: Top/argdecode.c:89 msgid "-k N\torchestra krate override" msgstr "" -#: Top/argdecode.c:89 util/srconv.c:764 +#: Top/argdecode.c:90 util/srconv.c:764 msgid "-K\tDo not generate PEAK chunks" msgstr "" -#: Top/argdecode.c:90 +#: Top/argdecode.c:91 msgid "-v\tverbose orch translation" msgstr "" -#: Top/argdecode.c:91 +#: Top/argdecode.c:92 msgid "-m N\ttty message level. Sum of:" msgstr "" -#: Top/argdecode.c:92 +#: Top/argdecode.c:93 msgid "\t\t1=note amps, 2=out-of-range msg, 4=warnings" msgstr "" -#: Top/argdecode.c:93 +#: Top/argdecode.c:94 msgid "\t\t0/32/64/96=note amp format (raw,dB,colors)" msgstr "" -#: Top/argdecode.c:94 +#: Top/argdecode.c:95 msgid "\t\t128=print benchmark information" msgstr "" -#: Top/argdecode.c:95 +#: Top/argdecode.c:96 msgid "-d\tsuppress all displays" msgstr "" -#: Top/argdecode.c:96 +#: Top/argdecode.c:97 msgid "-g\tsuppress graphics, use ascii displays" msgstr "" -#: Top/argdecode.c:97 +#: Top/argdecode.c:98 msgid "-G\tsuppress graphics, use Postscript displays" msgstr "" -#: Top/argdecode.c:98 +#: Top/argdecode.c:99 msgid "-x fnam\textract from score.srt using extract file 'fnam'" msgstr "" -#: Top/argdecode.c:99 +#: Top/argdecode.c:100 msgid "-t N\tuse uninterpreted beats of the score, initially at tempo N" msgstr "" -#: Top/argdecode.c:100 +#: Top/argdecode.c:101 msgid "-t 0\tuse score.srt for sorted score rather than a temporary" msgstr "" -#: Top/argdecode.c:101 +#: Top/argdecode.c:102 msgid "-L dnam\tread Line-oriented realtime score events from device 'dnam'" msgstr "" -#: Top/argdecode.c:102 +#: Top/argdecode.c:103 msgid "-M dnam\tread MIDI realtime events from device 'dnam'" msgstr "" -#: Top/argdecode.c:103 +#: Top/argdecode.c:104 msgid "-F fnam\tread MIDIfile event stream from file 'fnam'" msgstr "" -#: Top/argdecode.c:105 util/mixer.c:106 util/scale.c:59 util/srconv.c:765 +#: Top/argdecode.c:106 util/mixer.c:106 util/scale.c:59 util/srconv.c:765 msgid "-R\tcontinually rewrite header while writing soundfile (WAV/AIFF)" msgstr "" -#: Top/argdecode.c:106 +#: Top/argdecode.c:107 msgid "-H#\tprint heartbeat style 1, 2 or 3 at each soundfile write" msgstr "" -#: Top/argdecode.c:107 util/mixer.c:108 util/scale.c:61 util/srconv.c:767 +#: Top/argdecode.c:108 util/mixer.c:108 util/scale.c:61 util/srconv.c:767 msgid "-N\tnotify (ring the bell) when score or miditrack is done" msgstr "" -#: Top/argdecode.c:108 +#: Top/argdecode.c:109 msgid "-T\tterminate the performance when miditrack is done" msgstr "" -#: Top/argdecode.c:109 +#: Top/argdecode.c:110 msgid "-D\tdefer GEN01 soundfile loads until performance time" msgstr "" -#: Top/argdecode.c:110 +#: Top/argdecode.c:111 msgid "-Q dnam\tselect MIDI output device" msgstr "" -#: Top/argdecode.c:111 +#: Top/argdecode.c:112 msgid "-z\tList opcodes in this version" msgstr "" -#: Top/argdecode.c:112 +#: Top/argdecode.c:113 msgid "-Z\tDither output" msgstr "" -#: Top/argdecode.c:114 +#: Top/argdecode.c:115 msgid "--sched set real-time priority and lock memory" msgstr "" -#: Top/argdecode.c:115 Top/argdecode.c:117 +#: Top/argdecode.c:116 Top/argdecode.c:118 msgid " (requires -d and real time audio (-iadc/-odac))" msgstr "" -#: Top/argdecode.c:116 +#: Top/argdecode.c:117 msgid "--sched=N set specified scheduling priority, and lock memory" msgstr "" -#: Top/argdecode.c:126 +#: Top/argdecode.c:127 msgid "\t\t\tSet output file format" msgstr "" -#: Top/argdecode.c:127 +#: Top/argdecode.c:128 msgid "--aiff\t\t\tSet AIFF format" msgstr "" -#: Top/argdecode.c:128 +#: Top/argdecode.c:129 msgid "--au\t\t\tSet AU format" msgstr "" -#: Top/argdecode.c:129 +#: Top/argdecode.c:130 msgid "--wave\t\t\tSet WAV format" msgstr "" -#: Top/argdecode.c:130 +#: Top/argdecode.c:131 msgid "--ircam\t\t\tSet IRCAM format" msgstr "" -#: Top/argdecode.c:131 +#: Top/argdecode.c:132 msgid "--ogg\t\t\tSet OGG/VORBIS format" msgstr "" -#: Top/argdecode.c:132 +#: Top/argdecode.c:133 msgid "--noheader\t\tRaw format" msgstr "" -#: Top/argdecode.c:133 +#: Top/argdecode.c:134 msgid "--nopeaks\t\tDo not write peak information" msgstr "" -#: Top/argdecode.c:135 +#: Top/argdecode.c:136 msgid "--nodisplays\t\tSuppress all displays" msgstr "" -#: Top/argdecode.c:136 +#: Top/argdecode.c:137 msgid "--asciidisplay\t\tSuppress graphics, use ascii displays" msgstr "" -#: Top/argdecode.c:137 +#: Top/argdecode.c:138 msgid "--postscriptdisplay\tSuppress graphics, use Postscript displays" msgstr "" -#: Top/argdecode.c:139 +#: Top/argdecode.c:140 msgid "--defer-gen1\t\tDefer GEN01 soundfile loads until performance time" msgstr "" -#: Top/argdecode.c:140 +#: Top/argdecode.c:141 msgid "" "--iobufsamps=N\t\tSample frames (or -kprds) per software sound I/O buffer" msgstr "" -#: Top/argdecode.c:142 +#: Top/argdecode.c:143 msgid "--hardwarebufsamps=N\tSamples per hardware sound I/O buffer" msgstr "" -#: Top/argdecode.c:143 +#: Top/argdecode.c:144 msgid "--cscore\t\tUse Cscore processing of scorefile" msgstr "" -#: Top/argdecode.c:144 +#: Top/argdecode.c:145 msgid "--orc\t\t\tUse orchfile without scorefile" msgstr "" -#: Top/argdecode.c:146 +#: Top/argdecode.c:147 msgid "--midifile=FNAME\tRead MIDIfile event stream from file" msgstr "" -#: Top/argdecode.c:147 +#: Top/argdecode.c:148 msgid "--midioutfile=FNAME\tWrite MIDI output to file FNAME" msgstr "" -#: Top/argdecode.c:148 +#: Top/argdecode.c:149 msgid "--midi-device=FNAME\tRead MIDI realtime events from device" msgstr "" -#: Top/argdecode.c:149 +#: Top/argdecode.c:150 msgid "--terminate-on-midi\tTerminate the performance when miditrack is done" msgstr "" -#: Top/argdecode.c:151 +#: Top/argdecode.c:152 msgid "" "--heartbeat=N\t\tPrint a heartbeat style 1, 2 or 3 at each soundfile write" msgstr "" -#: Top/argdecode.c:153 +#: Top/argdecode.c:154 msgid "--notify\t\tNotify (ring the bell) when score or miditrack is done" msgstr "" -#: Top/argdecode.c:154 +#: Top/argdecode.c:155 msgid "" "--rewrite\t\tContinually rewrite header while writing soundfile (WAV/AIFF)" msgstr "" -#: Top/argdecode.c:157 +#: Top/argdecode.c:158 msgid "--input=FNAME\t\tSound input filename" msgstr "" -#: Top/argdecode.c:158 +#: Top/argdecode.c:159 msgid "--output=FNAME\t\tSound output filename" msgstr "" -#: Top/argdecode.c:159 +#: Top/argdecode.c:160 msgid "--logfile=FNAME\t\tLog output to file" msgstr "" -#: Top/argdecode.c:161 +#: Top/argdecode.c:162 msgid "--nosound\t\tNo sound onto disk or device" msgstr "" -#: Top/argdecode.c:162 +#: Top/argdecode.c:163 msgid "--tempo=N\t\tUse uninterpreted beats of the score, initially at tempo N" msgstr "" -#: Top/argdecode.c:164 +#: Top/argdecode.c:165 msgid "--i-only\t\tI-time only orch run" msgstr "" -#: Top/argdecode.c:165 +#: Top/argdecode.c:166 msgid "--syntax-check-only\tStop after checking orchestra and score syntax" msgstr "" -#: Top/argdecode.c:166 +#: Top/argdecode.c:167 msgid "--control-rate=N\tOrchestra krate override" msgstr "" -#: Top/argdecode.c:167 +#: Top/argdecode.c:168 msgid "--sample-rate=N\t\tOrchestra srate override" msgstr "" -#: Top/argdecode.c:168 +#: Top/argdecode.c:169 msgid "--score-in=FNAME\tRead Line-oriented realtime score events from device" msgstr "" -#: Top/argdecode.c:170 +#: Top/argdecode.c:171 msgid "--messagelevel=N\ttty message level, sum of:" msgstr "" -#: Top/argdecode.c:171 +#: Top/argdecode.c:172 msgid "--messageolevel=O\ttty message level in octal, of:" msgstr "" -#: Top/argdecode.c:172 +#: Top/argdecode.c:173 msgid "\t\t\t\t1=note amps, 2=out-of-range msg, 4=warnings," msgstr "" -#: Top/argdecode.c:173 +#: Top/argdecode.c:174 msgid "\t\t\t\t0/32/64/96=note amp format (raw,dB,colors)," msgstr "" -#: Top/argdecode.c:174 +#: Top/argdecode.c:175 msgid "\t\t\t\t128=print benchmark information" msgstr "" -#: Top/argdecode.c:176 +#: Top/argdecode.c:177 msgid "--m-amps=[01]\tmessages on note amps" msgstr "" -#: Top/argdecode.c:177 +#: Top/argdecode.c:178 msgid "--m-range=[01]\tMessages on range errors" msgstr "" -#: Top/argdecode.c:178 +#: Top/argdecode.c:179 msgid "--m-warnings=[01]\tMesage on warnings" msgstr "" -#: Top/argdecode.c:179 +#: Top/argdecode.c:180 msgid "--m-raw=[01]\tRaw amp messages" msgstr "" -#: Top/argdecode.c:180 +#: Top/argdecode.c:181 msgid "--m-dB=[01]\tAmp messages in dB" msgstr "" -#: Top/argdecode.c:181 +#: Top/argdecode.c:182 msgid "--m-colours=[01]\tColour amp messages" msgstr "" -#: Top/argdecode.c:182 +#: Top/argdecode.c:183 msgid "--m-benchmarks=[01]\tPrint benchmark information" msgstr "" -#: Top/argdecode.c:183 +#: Top/argdecode.c:184 msgid "--csd-line-nums=[01]\tControls how error line numbers are printed:" msgstr "" -#: Top/argdecode.c:184 +#: Top/argdecode.c:185 msgid "\t\t\t1=use CSD line #s (default), 0=use ORC/SCO-relative line #s" msgstr "" -#: Top/argdecode.c:185 +#: Top/argdecode.c:186 msgid "--extract-score=FNAME\tExtract from score.srt using extract file" msgstr "" -#: Top/argdecode.c:186 +#: Top/argdecode.c:187 msgid "--keep-sorted-score" msgstr "" -#: Top/argdecode.c:187 +#: Top/argdecode.c:188 msgid "--env:NAME=VALUE\tSet environment variable NAME to VALUE" msgstr "" -#: Top/argdecode.c:188 +#: Top/argdecode.c:189 msgid "--env:NAME+=VALUE\tAppend VALUE to environment variable NAME" msgstr "" -#: Top/argdecode.c:189 +#: Top/argdecode.c:190 msgid "--strsetN=VALUE\t\tSet strset table at index N to VALUE" msgstr "" -#: Top/argdecode.c:190 +#: Top/argdecode.c:191 msgid "--utility=NAME\t\tRun utility program" msgstr "" -#: Top/argdecode.c:191 +#: Top/argdecode.c:192 msgid "--verbose\t\tVerbose orch translation" msgstr "" -#: Top/argdecode.c:192 +#: Top/argdecode.c:193 msgid "--list-opcodes\t\tList opcodes in this version" msgstr "" -#: Top/argdecode.c:193 +#: Top/argdecode.c:194 msgid "--list-opcodesN\t\tList opcodes in style N in this version" msgstr "" -#: Top/argdecode.c:194 +#: Top/argdecode.c:195 msgid "--dither\t\tDither output" msgstr "" -#: Top/argdecode.c:195 +#: Top/argdecode.c:196 msgid "--dither-triangular\t\tDither output with triangular distribution" msgstr "" -#: Top/argdecode.c:196 +#: Top/argdecode.c:197 msgid "--dither-uniform\t\tDither output with rectanular distribution" msgstr "" -#: Top/argdecode.c:197 +#: Top/argdecode.c:198 msgid "--sched\t\t\tSet real-time scheduling priority and lock memory" msgstr "" -#: Top/argdecode.c:198 +#: Top/argdecode.c:199 msgid "--sched=N\t\tSet priority to N and lock memory" msgstr "" -#: Top/argdecode.c:199 +#: Top/argdecode.c:200 msgid "--opcode-lib=NAMES\tDynamic libraries to load" msgstr "" -#: Top/argdecode.c:200 +#: Top/argdecode.c:201 msgid "--opcode-omit=NAMES\tDynamic libraries not to load" msgstr "" -#: Top/argdecode.c:201 +#: Top/argdecode.c:202 msgid "--omacro:XXX=YYY\tSet orchestra macro XXX to value YYY" msgstr "" -#: Top/argdecode.c:202 +#: Top/argdecode.c:203 msgid "--smacro:XXX=YYY\tSet score macro XXX to value YYY" msgstr "" -#: Top/argdecode.c:203 +#: Top/argdecode.c:204 msgid "--midi-key=N\t\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:204 +#: Top/argdecode.c:205 msgid "\t\t\tkey number to pfield N as MIDI value [0-127]" msgstr "" -#: Top/argdecode.c:205 +#: Top/argdecode.c:206 msgid "--midi-key-cps=N\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:206 +#: Top/argdecode.c:207 msgid "\t\t\tkey number to pfield N as cycles per second" msgstr "" -#: Top/argdecode.c:207 +#: Top/argdecode.c:208 msgid "--midi-key-oct=N\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:208 +#: Top/argdecode.c:209 msgid "\t\t\tkey number to pfield N as linear octave" msgstr "" -#: Top/argdecode.c:209 +#: Top/argdecode.c:210 msgid "--midi-key-pch=N\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:210 +#: Top/argdecode.c:211 msgid "\t\t\tkey number to pfield N as oct.pch" msgstr "" -#: Top/argdecode.c:211 +#: Top/argdecode.c:212 msgid "--midi-velocity=N\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:212 +#: Top/argdecode.c:213 msgid "\t\t\tvelocity number to pfield N as MIDI value [0-127]" msgstr "" -#: Top/argdecode.c:213 +#: Top/argdecode.c:214 msgid "--midi-velocity-amp=N\tRoute MIDI note on message" msgstr "" -#: Top/argdecode.c:214 +#: Top/argdecode.c:215 msgid "\t\t\tvelocity number to pfield N as amplitude" msgstr "" -#: Top/argdecode.c:215 +#: Top/argdecode.c:216 msgid "--no-default-paths\tTurn off relative paths from CSD/ORC/SCO" msgstr "" -#: Top/argdecode.c:216 +#: Top/argdecode.c:217 msgid "--sample-accurate\t\tUse sample-accurate timing of score events" msgstr "" -#: Top/argdecode.c:217 +#: Top/argdecode.c:218 msgid "--realtime\t\trealtime priority mode" msgstr "" -#: Top/argdecode.c:218 +#: Top/argdecode.c:219 #, fuzzy msgid "--nchnls=N\t\t override number of audio channels" msgstr "неправильный число аргументов" -#: Top/argdecode.c:219 +#: Top/argdecode.c:220 msgid "--nchnls_i=N\t\t override number of input audio channels" msgstr "" -#: Top/argdecode.c:220 +#: Top/argdecode.c:221 msgid "--0dbfs=N\t\t override 0dbfs (max positive signal amplitude)" msgstr "" -#: Top/argdecode.c:221 +#: Top/argdecode.c:222 msgid "--sinesize\t\tlength of internal sine table" msgstr "" #: Top/argdecode.c:223 +msgid "" +"--daemon\t\t daemon mode: do not exit if CSD/orchestra is not given, is " +"empty or does not compile" +msgstr "" + +#: Top/argdecode.c:225 +msgid "" +"--port=N\t\t listen to UDP port N for instruments/orchestra code (implies --" +"daemon)" +msgstr "" + +#: Top/argdecode.c:228 msgid "--help\t\t\tLong help" msgstr "" -#: Top/argdecode.c:239 +#: Top/argdecode.c:244 #, c-format msgid "flag defaults: csound -s -otest -b%d -B%d -m%d\n" msgstr "" -#: Top/argdecode.c:246 Top/argdecode.c:262 +#: Top/argdecode.c:251 Top/argdecode.c:267 msgid "Usage:\tcsound [-flags] orchfile scorefile\n" msgstr "" -#: Top/argdecode.c:247 Top/argdecode.c:263 util/envext.c:53 util/xtrct.c:67 +#: Top/argdecode.c:252 Top/argdecode.c:268 util/envext.c:53 util/xtrct.c:67 msgid "Legal flags are:\n" msgstr "" -#: Top/argdecode.c:248 +#: Top/argdecode.c:253 msgid "" "Long format:\n" "\n" msgstr "" -#: Top/argdecode.c:253 +#: Top/argdecode.c:258 msgid "" "\n" "Short form:\n" msgstr "" -#: Top/argdecode.c:266 +#: Top/argdecode.c:271 msgid "Csound Command ERROR:\t" msgstr "" -#: Top/argdecode.c:401 +#: Top/argdecode.c:406 #, c-format msgid "unknown output format: '%s'" msgstr "" -#: Top/argdecode.c:419 Top/argdecode.c:1008 +#: Top/argdecode.c:424 Top/argdecode.c:1024 msgid "no iobufsamps" msgstr "" -#: Top/argdecode.c:426 Top/argdecode.c:1015 +#: Top/argdecode.c:431 Top/argdecode.c:1031 msgid "no hardware bufsamps" msgstr "" -#: Top/argdecode.c:452 Top/argdecode.c:1115 +#: Top/argdecode.c:457 Top/argdecode.c:1132 msgid "no midifile name" msgstr "" -#: Top/argdecode.c:457 Top/argdecode.c:1121 +#: Top/argdecode.c:461 Top/argdecode.c:1137 msgid "-F: stdin not supported on this platform" msgstr "" -#: Top/argdecode.c:467 +#: Top/argdecode.c:473 msgid "no midi output file name" msgstr "" -#: Top/argdecode.c:496 +#: Top/argdecode.c:502 msgid "invalid python variable definition syntax" msgstr "" -#: Top/argdecode.c:502 Top/argdecode.c:976 +#: Top/argdecode.c:508 Top/argdecode.c:992 msgid "no infilename" msgstr "" -#: Top/argdecode.c:505 Top/argdecode.c:980 +#: Top/argdecode.c:511 Top/argdecode.c:996 msgid "input cannot be stdout" msgstr "" -#: Top/argdecode.c:509 Top/argdecode.c:984 +#: Top/argdecode.c:515 Top/argdecode.c:1000 msgid "stdin audio not supported" msgstr "" -#: Top/argdecode.c:544 Top/argdecode.c:1048 +#: Top/argdecode.c:550 Top/argdecode.c:1064 msgid "no control rate" msgstr "" -#: Top/argdecode.c:558 Top/argdecode.c:1090 +#: Top/argdecode.c:564 Top/argdecode.c:1106 msgid "no Linein score device_name" msgstr "" -#: Top/argdecode.c:574 Top/argdecode.c:580 Top/argdecode.c:1056 +#: Top/argdecode.c:580 Top/argdecode.c:586 Top/argdecode.c:1072 msgid "no message level" msgstr "" -#: Top/argdecode.c:587 +#: Top/argdecode.c:593 msgid "no message amps" msgstr "" -#: Top/argdecode.c:596 +#: Top/argdecode.c:602 msgid "no message range" msgstr "" -#: Top/argdecode.c:605 +#: Top/argdecode.c:611 msgid "no message warnings" msgstr "" -#: Top/argdecode.c:614 +#: Top/argdecode.c:620 msgid "no message raw" msgstr "" -#: Top/argdecode.c:623 +#: Top/argdecode.c:629 msgid "no message dB" msgstr "" -#: Top/argdecode.c:632 +#: Top/argdecode.c:638 msgid "no message colours" msgstr "" -#: Top/argdecode.c:641 +#: Top/argdecode.c:647 msgid "no benchmark level" msgstr "" -#: Top/argdecode.c:649 +#: Top/argdecode.c:655 msgid "no value for --csd-line-nums" msgstr "" -#: Top/argdecode.c:658 Top/argdecode.c:1101 +#: Top/argdecode.c:664 Top/argdecode.c:1117 msgid "no midi device_name" msgstr "" -#: Top/argdecode.c:663 Top/argdecode.c:1107 +#: Top/argdecode.c:669 Top/argdecode.c:1122 msgid "-M: stdin not supported on this platform" msgstr "" -#: Top/argdecode.c:683 Top/argdecode.c:992 util/envext.c:84 util/mixer.c:206 +#: Top/argdecode.c:689 Top/argdecode.c:1008 util/envext.c:84 util/mixer.c:206 #: util/scale.c:173 util/srconv.c:247 util/xtrct.c:120 msgid "no outfilename" msgstr "" -#: Top/argdecode.c:686 Top/argdecode.c:996 util/scale.c:177 util/srconv.c:251 +#: Top/argdecode.c:692 Top/argdecode.c:1012 util/scale.c:177 util/srconv.c:251 #: util/xtrct.c:124 msgid "-o cannot be stdin" msgstr "" -#: Top/argdecode.c:690 Top/argdecode.c:1000 util/scale.c:180 util/srconv.c:256 +#: Top/argdecode.c:696 Top/argdecode.c:1016 util/scale.c:180 util/srconv.c:256 msgid "stdout audio not supported" msgstr "" -#: Top/argdecode.c:700 Top/argdecode.c:1198 util/hetro.c:232 +#: Top/argdecode.c:706 Top/argdecode.c:1216 util/hetro.c:232 msgid "no log file" msgstr "" -#: Top/argdecode.c:755 Top/argdecode.c:955 +#: Top/argdecode.c:761 Top/argdecode.c:971 msgid "no utility name" msgstr "" -#: Top/argdecode.c:774 Top/argdecode.c:1070 +#: Top/argdecode.c:780 Top/argdecode.c:1086 msgid "no xfilename" msgstr "" -#: Top/argdecode.c:920 +#: Top/argdecode.c:936 #, c-format msgid "unknown long option: '--%s'" msgstr "" -#: Top/argdecode.c:1043 +#: Top/argdecode.c:1059 msgid "no sample rate" msgstr "" -#: Top/argdecode.c:1075 +#: Top/argdecode.c:1091 msgid "no tempo value" msgstr "" -#: Top/argdecode.c:1080 +#: Top/argdecode.c:1096 msgid "illegal tempo" msgstr "" -#: Top/argdecode.c:1129 +#: Top/argdecode.c:1147 msgid "no MIDI output device" msgstr "" -#: Top/argdecode.c:1181 +#: Top/argdecode.c:1199 msgid "No indirection file" msgstr "" -#: Top/argdecode.c:1188 +#: Top/argdecode.c:1206 #, c-format msgid "Cannot open indirection file %s\n" msgstr "" -#: Top/argdecode.c:1217 +#: Top/argdecode.c:1235 #, fuzzy msgid "no number of threads" msgstr "неправильный число аргументов" -#: Top/argdecode.c:1228 util/envext.c:94 util/mixer.c:316 util/scale.c:241 +#: Top/argdecode.c:1246 util/envext.c:94 util/mixer.c:316 util/scale.c:241 #: util/xtrct.c:239 #, c-format msgid "unknown flag -%c" msgstr "" -#: Top/argdecode.c:1235 +#: Top/argdecode.c:1253 msgid "error: orchestra and score name not allowed in .csound6rc" msgstr "" -#: Top/argdecode.c:1381 +#: Top/argdecode.c:1401 msgid "stdout not supported on this platform" msgstr "" -#: Top/argdecode.c:1421 Top/argdecode.c:1441 Top/argdecode.c:1461 +#: Top/argdecode.c:1441 Top/argdecode.c:1461 Top/argdecode.c:1481 msgid "stdin not supported on this platform" msgstr "" @@ -10058,76 +10102,76 @@ msgid "cscoreFileGetCurrent: no fp current" msgstr "" -#: Top/csmodule.c:195 +#: Top/csmodule.c:199 #, c-format msgid "not loading '%s' (uses incompatible floating point type)" msgstr "" -#: Top/csmodule.c:204 +#: Top/csmodule.c:208 #, c-format msgid "" "not loading '%s' (incompatible with this version of Csound (%d.%d/%d.%d)" msgstr "" -#: Top/csmodule.c:247 +#: Top/csmodule.c:251 #, c-format msgid "could not open library '%s' (%s)" msgstr "" -#: Top/csmodule.c:250 +#: Top/csmodule.c:254 #, c-format msgid "could not open library '%s' (%d)" msgstr "" -#: Top/csmodule.c:311 +#: Top/csmodule.c:315 #, c-format msgid "'%s' is not a Csound plugin library" msgstr "" -#: Top/csmodule.c:322 +#: Top/csmodule.c:326 msgid "csoundLoadExternal(): memory allocation failure" msgstr "" -#: Top/csmodule.c:336 Top/csmodule.c:344 +#: Top/csmodule.c:340 Top/csmodule.c:348 #, c-format msgid "Error in pre-initialisation function of module '%s'" msgstr "" -#: Top/csmodule.c:417 +#: Top/csmodule.c:426 #, c-format msgid "Error opening plugin directory '%s': %s" msgstr "" -#: Top/csmodule.c:420 +#: Top/csmodule.c:429 #, c-format msgid "Error opening plugin directory: %s" msgstr "" -#: Top/csmodule.c:455 +#: Top/csmodule.c:464 #, c-format msgid "path name too long, skipping '%s'" msgstr "" -#: Top/csmodule.c:461 +#: Top/csmodule.c:470 #, c-format msgid "Library %s omitted\n" msgstr "" -#: Top/csmodule.c:494 +#: Top/csmodule.c:503 msgid "Loading command-line libraries:\n" msgstr "" -#: Top/csmodule.c:517 +#: Top/csmodule.c:526 #, c-format msgid " *** error loading '%s'" msgstr "" -#: Top/csmodule.c:540 +#: Top/csmodule.c:549 #, c-format msgid "Error starting module '%s'" msgstr "" -#: Top/csmodule.c:639 +#: Top/csmodule.c:648 #, c-format msgid "Error de-initialising module '%s'" msgstr "" @@ -10136,273 +10180,286 @@ msgid "Error allocating opcode list" msgstr "" -#: Top/csound.c:1409 +#: Top/csound.c:1410 #, c-format msgid "Multithread performance: insno: %3d thread %d of %d starting.\n" msgstr "" -#: Top/csound.c:1415 +#: Top/csound.c:1416 msgid "Bad ThreadId" msgstr "" -#: Top/csound.c:1603 Top/csound.c:1635 Top/csound.c:1663 Top/csound.c:1699 -#: Top/csound.c:3879 +#: Top/csound.c:1604 Top/csound.c:1636 Top/csound.c:1664 Top/csound.c:1700 +#: Top/csound.c:3884 msgid "Csound not ready for performance: csoundStart() has not been called \n" msgstr "" -#: Top/csound.c:1619 Top/csound.c:1648 +#: Top/csound.c:1620 Top/csound.c:1649 msgid "Score finished in csoundPerformKsmps().\n" msgstr "" -#: Top/csound.c:1642 Top/csound.c:3886 +#: Top/csound.c:1643 Top/csound.c:3891 msgid "Early return from csoundPerformKsmps().\n" msgstr "" -#: Top/csound.c:1670 +#: Top/csound.c:1671 msgid "Early return from csoundPerformBuffer().\n" msgstr "" -#: Top/csound.c:1708 +#: Top/csound.c:1709 msgid "Early return from csoundPerform().\n" msgstr "" -#: Top/csound.c:1716 +#: Top/csound.c:1717 msgid "Score finished in csoundPerform().\n" msgstr "" -#: Top/csound.c:1727 +#: Top/csound.c:1728 msgid "csoundPerform(): stopped.\n" msgstr "" -#: Top/csound.c:2010 +#: Top/csound.c:2012 msgid "WARNING: " msgstr "ПРЕДУПРЕЖДЕНИЕ:" -#: Top/csound.c:2150 +#: Top/csound.c:2154 msgid "rtdummy: failed to allocate globals" msgstr "" -#: Top/csound.c:2151 +#: Top/csound.c:2155 msgid "rtaudio: dummy module enabled\n" msgstr "" -#: Top/csound.c:2180 Top/csound.c:2217 +#: Top/csound.c:2184 Top/csound.c:2221 msgid " *** error: rtaudio module set to empty string" msgstr "" -#: Top/csound.c:2184 Top/csound.c:2221 +#: Top/csound.c:2188 Top/csound.c:2225 #, c-format msgid " unknown rtaudio module: '%s', using dummy module" msgstr "" -#: Top/csound.c:2338 +#: Top/csound.c:2342 msgid "WARNING: real time midi input disabled, using dummy functions\n" msgstr "" -#: Top/csound.c:2343 Top/csound.c:2377 +#: Top/csound.c:2347 Top/csound.c:2381 msgid "error: -+rtmidi set to empty string" msgstr "" -#: Top/csound.c:2346 Top/csound.c:2380 +#: Top/csound.c:2350 Top/csound.c:2384 #, c-format msgid "error: -+rtmidi='%s': unknown module" msgstr "" -#: Top/csound.c:2372 +#: Top/csound.c:2376 msgid "WARNING: real time midi output disabled, using dummy functions\n" msgstr "" -#: Top/csound.c:2394 +#: Top/csound.c:2398 msgid "Unknown MIDI error" msgstr "" -#: Top/csound.c:2555 +#: Top/csound.c:2559 msgid "Failed to allocate new opcode entry." msgstr "" -#: Top/csound.c:2577 +#: Top/csound.c:2581 #, c-format msgid "Failed to allocate opcode entry for %s." msgstr "" -#: Top/csound.c:2717 Top/main.c:390 +#: Top/csound.c:2721 Top/main.c:358 msgid "setting dummy interface\n" msgstr "" -#: Top/csound.c:2793 +#: Top/csound.c:2798 msgid "Failed during csoundInitEnv" msgstr "" -#: Top/csound.c:2815 +#: Top/csound.c:2820 msgid "Failed during csoundInitStaticModules" msgstr "" -#: Top/csound.c:2831 +#: Top/csound.c:2836 msgid "Failed during csoundLoadModules" msgstr "" -#: Top/csound.c:2888 +#: Top/csound.c:2893 msgid "Real time audio module name" msgstr "" -#: Top/csound.c:2913 +#: Top/csound.c:2918 msgid "Real time MIDI module name" msgstr "" -#: Top/csound.c:2918 +#: Top/csound.c:2923 msgid "Ignore events (other than tempo changes) in tracks defined by pattern" msgstr "" -#: Top/csound.c:2924 +#: Top/csound.c:2929 msgid "Do not handle special MIDI controllers (sustain pedal etc.)" msgstr "" -#: Top/csound.c:2932 +#: Top/csound.c:2937 msgid "Title tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2938 +#: Top/csound.c:2943 msgid "Copyright tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2944 +#: Top/csound.c:2949 msgid "Software tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2949 +#: Top/csound.c:2954 msgid "Artist tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2956 +#: Top/csound.c:2961 msgid "Comment tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2961 +#: Top/csound.c:2966 msgid "Date tag in output soundfile (no spaces)" msgstr "" -#: Top/csound.c:2971 +#: Top/csound.c:2976 msgid "Enable message attributes (colors etc.)" msgstr "" -#: Top/csound.c:2977 +#: Top/csound.c:2982 msgid "Start score playback at the specified time, skipping earlier events" msgstr "" -#: Top/csound.c:2984 +#: Top/csound.c:2989 msgid "Ignore in CSD files (default: no)" msgstr "" -#: Top/csound.c:3194 +#: Top/csound.c:3199 msgid "Cannot open /proc/cpuinfo. Support for RDTSC is not available.\n" msgstr "" -#: Top/csound.c:3224 +#: Top/csound.c:3229 msgid "No valid CPU frequency entry was found in /proc/cpuinfo.\n" msgstr "" -#: Top/csound.c:3778 +#: Top/csound.c:3783 msgid "csoundDestroyMessageBuffer: Message buffer not allocated." msgstr "" -#: Top/csound.c:3809 +#: Top/csound.c:3814 msgid "csound: internal error: message buffer overflow\n" msgstr "" -#: Top/main.c:64 +#: Top/main.c:65 #, c-format msgid "WARNING: cannot open csound6rc file %s\n" msgstr "" -#: Top/main.c:67 +#: Top/main.c:68 #, c-format msgid "Reading options from $CSOUND6RC: %s \n" msgstr "" -#: Top/main.c:76 +#: Top/main.c:77 msgid "Reading options from $HOME/.csound6rc\n" msgstr "" -#: Top/main.c:91 +#: Top/main.c:92 msgid "Reading options from local directory .csound6rc \n" msgstr "" -#: Top/main.c:112 +#: Top/main.c:113 msgid "" "Csound is already started, call csoundReset()\n" "before starting again \n" msgstr "" -#: Top/main.c:186 +#: Top/main.c:141 msgid "no orchestra name" msgstr "" -#: Top/main.c:210 +#: Top/main.c:166 msgid "Reading CSD failed ... stopping" msgstr "" -#: Top/main.c:224 +#: Top/main.c:180 msgid "error: multiple uses of stdin" msgstr "" -#: Top/main.c:228 +#: Top/main.c:184 msgid "error: multiple uses of stdout" msgstr "" -#: Top/main.c:237 +#: Top/main.c:193 msgid "realtime performance using dummy numeric scorefile\n" msgstr "" -#: Top/main.c:260 +#: Top/main.c:216 #, c-format msgid "orchname: %s\n" msgstr "" -#: Top/main.c:278 +#: Top/main.c:220 +#, c-format +msgid "Failed to open input file - %s\n" +msgstr "" + +#: Top/main.c:235 msgid "cannot compile orchestra \n" msgstr "" -#: Top/main.c:291 +#: Top/main.c:240 +msgid "cannot compile orchestra." +msgstr "" + +#: Top/main.c:241 +msgid "Csound will start with no instruments" +msgstr "" + +#: Top/main.c:259 msgid "end of orchestra compile" msgstr "" -#: Top/main.c:299 +#: Top/main.c:267 #, c-format msgid "using previous %s\n" msgstr "" -#: Top/main.c:309 +#: Top/main.c:277 #, c-format msgid "cannot open scorefile %s" msgstr "" -#: Top/main.c:311 +#: Top/main.c:279 msgid "sorting score ...\n" msgstr "" -#: Top/main.c:321 +#: Top/main.c:289 #, c-format msgid "cannot open extract file %s" msgstr "" -#: Top/main.c:324 +#: Top/main.c:292 msgid " ... extracting ...\n" msgstr "" -#: Top/main.c:333 +#: Top/main.c:301 msgid "end of score sort" msgstr "" -#: Top/main.c:335 +#: Top/main.c:303 msgid "Syntax check completed.\n" msgstr "" -#: Top/main.c:456 util/dnoise.c:266 +#: Top/main.c:424 util/dnoise.c:266 #, c-format msgid "%s not a recognised SFOUTYP env setting" msgstr "" -#: Top/main.c:475 +#: Top/main.c:443 msgid "srate and krate overrides must occur jointly" msgstr "" @@ -10471,158 +10528,158 @@ msgid " *** Type 'csound --help' for the list of available options." msgstr "" -#: Top/one_file.c:105 Top/one_file.c:115 +#: Top/one_file.c:96 Top/one_file.c:106 msgid " *** cannot create temporary file" msgstr "" -#: Top/one_file.c:199 +#: Top/one_file.c:182 #, c-format msgid "Removing temporary file %s ...\n" msgstr "" -#: Top/one_file.c:203 +#: Top/one_file.c:186 #, c-format msgid "WARNING: could not remove %s\n" msgstr "" -#: Top/one_file.c:270 Top/one_file.c:304 +#: Top/one_file.c:253 Top/one_file.c:287 #, c-format msgid "More than %d arguments in " msgstr "" -#: Top/one_file.c:342 +#: Top/one_file.c:325 #, c-format msgid "Invalid arguments in : %s" msgstr "" -#: Top/one_file.c:345 +#: Top/one_file.c:328 #, c-format msgid "Invalid arguments in .csoundrc or -@ file: %s" msgstr "" -#: Top/one_file.c:351 Top/one_file.c:784 +#: Top/one_file.c:334 Top/one_file.c:767 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:380 +#: Top/one_file.c:361 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:400 Top/one_file.c:467 +#: Top/one_file.c:381 Top/one_file.c:449 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:415 Top/one_file.c:420 +#: Top/one_file.c:396 Top/one_file.c:401 msgid "Missing program in tag " msgstr "" -#: Top/one_file.c:432 +#: Top/one_file.c:414 #, c-format msgid "Creating %s (%p)\n" msgstr "" -#: Top/one_file.c:445 +#: Top/one_file.c:427 msgid "External generation failed" msgstr "" -#: Top/one_file.c:505 +#: Top/one_file.c:487 #, c-format msgid "Non base64 character %c(%2x)" msgstr "" -#: Top/one_file.c:524 +#: Top/one_file.c:506 msgid "Truncated byte at end of base64 stream" msgstr "" -#: Top/one_file.c:540 +#: Top/one_file.c:523 #, c-format msgid "Cannot open temporary file (%s) for MIDI subfile" msgstr "" -#: Top/one_file.c:557 +#: Top/one_file.c:540 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:573 Top/one_file.c:622 +#: Top/one_file.c:556 Top/one_file.c:605 #, c-format msgid "File %s already exists" msgstr "" -#: Top/one_file.c:578 +#: Top/one_file.c:561 #, c-format msgid "Cannot open sample file (%s) subfile" msgstr "" -#: Top/one_file.c:592 +#: Top/one_file.c:575 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:627 +#: Top/one_file.c:610 #, c-format msgid "Cannot open file (%s) subfile" msgstr "" -#: Top/one_file.c:642 +#: Top/one_file.c:625 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:662 +#: Top/one_file.c:645 #, c-format msgid "This CSD file requires a version of Csound before %d.%02d" msgstr "" -#: Top/one_file.c:670 Top/one_file.c:677 +#: Top/one_file.c:653 Top/one_file.c:660 #, c-format msgid "This CSD file requires a version of Csound after %d.%02d" msgstr "" -#: Top/one_file.c:683 +#: Top/one_file.c:666 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:693 +#: Top/one_file.c:676 msgid "**** Licence Information ****\n" msgstr "" -#: Top/one_file.c:699 +#: Top/one_file.c:682 msgid "**** End of Licence Information ****\n" msgstr "" -#: Top/one_file.c:710 +#: Top/one_file.c:693 msgid "Missing end tag " msgstr "" -#: Top/one_file.c:741 +#: Top/one_file.c:724 #, c-format msgid "Failed to open csd file: %s" msgstr "" -#: Top/one_file.c:756 +#: Top/one_file.c:739 msgid "STARTING FILE\n" msgstr "" -#: Top/one_file.c:774 +#: Top/one_file.c:757 msgid "Creating options\n" msgstr "" -#: Top/one_file.c:780 +#: Top/one_file.c:763 msgid "Skipping \n" msgstr "" -#: Top/one_file.c:794 +#: Top/one_file.c:777 msgid "Creating orchestra\n" msgstr "" -#: Top/one_file.c:799 +#: Top/one_file.c:782 msgid "Creating score\n" msgstr "" -#: Top/one_file.c:833 +#: Top/one_file.c:812 #, c-format msgid "unknown CSD tag: %s\n" msgstr "" -#: Top/one_file.c:838 +#: Top/one_file.c:817 msgid "Could not find tag in CSD file.\n" msgstr "" diff -Nru csound-6.01~dfsg/tests/c/channel_tests.c csound-6.02~dfsg/tests/c/channel_tests.c --- csound-6.01~dfsg/tests/c/channel_tests.c 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/tests/c/channel_tests.c 2014-01-07 16:54:21.000000000 +0000 @@ -327,7 +327,7 @@ void test_string_channel(void) { - const char orcS[] = "chn_S \"testing\", 3\n instr 1\n endin\n"; + const char orcS[] = "instr 1\n endin\n"; csoundSetGlobalEnv("OPCODE6DIR64", "../../"); CSOUND *csound = csoundCreate(0); @@ -337,8 +337,11 @@ int err = csoundStart(csound); CU_ASSERT(err == CSOUND_SUCCESS); - csoundSetStringChannel(csound, "testing", "ttt"); + int len = csoundGetChannelDatasize(csound, "testing"); + char string[len]; + csoundGetStringChannel(csound, "testing", string); + CU_ASSERT_STRING_EQUAL(string, "ttt"); csoundCleanup(csound); csoundDestroyMessageBuffer(csound); csoundDestroy(csound); diff -Nru csound-6.01~dfsg/tests/c/csound_message_buffer_test.c csound-6.02~dfsg/tests/c/csound_message_buffer_test.c --- csound-6.01~dfsg/tests/c/csound_message_buffer_test.c 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/tests/c/csound_message_buffer_test.c 2014-01-07 16:54:21.000000000 +0000 @@ -37,6 +37,32 @@ csoundDestroy(csound); } +void test_buffer_run(void) +{ + csoundSetGlobalEnv("OPCODE6DIR64", "../../"); + CSOUND *csound = csoundCreate(0); + csoundCreateMessageBuffer(csound, 0); + int result = csoundCompileOrc(csound, "instr 1\n" + "asig oscil 0.1, 440\n" + "out asig\n" + "endin\n"); + csoundReadScore(csound, "i 1 0 0.1\n"); + csoundStart(csound); + + csoundPerform(csound); + + while (csoundGetMessageCnt(csound)) { + const char * msg = csoundGetFirstMessage(csound); + CU_ASSERT_PTR_NOT_NULL(msg); + csoundPopFirstMessage(csound); + printf("CSOUND MESSAGE: %s", msg); + } + + csoundCleanup(csound); + csoundDestroyMessageBuffer(csound); + csoundDestroy(csound); +} + int main() { CU_pSuite pSuite = NULL; @@ -54,7 +80,7 @@ /* add the tests to the suite */ if ((NULL == CU_add_test(pSuite, "Create Message Buffer", test_create_buffer)) -// || (NULL == CU_add_test(pSuite, "test of fread()", testFREAD)) + || (NULL == CU_add_test(pSuite, "Test run", test_buffer_run)) ) { CU_cleanup_registry(); diff -Nru csound-6.01~dfsg/tests/c/io_test.c csound-6.02~dfsg/tests/c/io_test.c --- csound-6.01~dfsg/tests/c/io_test.c 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/tests/c/io_test.c 2014-01-07 16:54:21.000000000 +0000 @@ -144,6 +144,114 @@ csoundDestroy(csound); } + +void test_audio_modules(void) +{ + CSOUND *csound; + csound = csoundCreate(NULL); + char *name, *type; + int n = 0; + + while(!csoundGetModule(csound, n++, &name, &type)) { + if (strcmp(type, "audio") == 0) { + const char *instrument = + "ksmps = 256\n" + "instr 1 \n" + "asig oscil 0.1, 440\n" + "out asig\n" + "endin \n"; + csoundSetOption(csound, "-B4096"); + csoundCompileOrc(csound, instrument); + csoundReadScore(csound, "i 1 0 0.1\n e 0.2"); + csoundSetRTAudioModule(csound, name); + csoundSetOutput(csound, "dac", NULL, NULL); + int ret = csoundStart(csound); + CU_ASSERT(ret == 0); + ret = csoundPerform(csound); + CU_ASSERT(ret > 0); + csoundReset(csound); + } + } + +} + +void test_audio_hostbased(void) +{ + CSOUND *csound; + csound = csoundCreate(NULL); + const char *instrument = + "ksmps = 256\n" + "instr 1 \n" + "asig oscil 0.1, 440\n" + "out asig\n" + "endin \n"; + csoundSetOption(csound, "-B4096"); + csoundCompileOrc(csound, instrument); + csoundReadScore(csound, "i 1 0 0.1\n e 0.2"); +// csoundSetRTAudioModule(csound, "hostbased"); + csoundSetHostImplementedAudioIO(csound, 1, 256); + csoundSetOutput(csound, "dac", NULL, NULL); + int ret = csoundStart(csound); + CU_ASSERT(ret == 0); + ret = csoundPerform(csound); + CU_ASSERT(ret > 0); + csoundReset(csound); +} + + +void test_midi_modules(void) +{ + CSOUND *csound; + csound = csoundCreate(NULL); + char *name, *type; + int n = 0; + + while(!csoundGetModule(csound, n++, &name, &type)) { + if (strcmp(type, "midi") == 0) { + const char *instrument = + "ksmps = 256\n" + "instr 1 \n" + "asig oscil 0.1, 440\n" + "out asig\n" + "endin \n"; + csoundSetOption(csound, "-B4096"); + csoundCompileOrc(csound, instrument); + csoundReadScore(csound, "i 1 0 0.1\n e 0.2"); + csoundSetMIDIModule(csound, name); + csoundSetOutput(csound, "dac", NULL, NULL); + int ret = csoundStart(csound); + CU_ASSERT(ret == 0); + ret = csoundPerform(csound); + CU_ASSERT(ret > 0); + csoundReset(csound); + } + } +} + +void test_midi_hostbased(void) +{ + CSOUND *csound; + csound = csoundCreate(NULL); + const char *instrument = + "ksmps = 256\n" + "instr 1 \n" + "asig oscil 0.1, 440\n" + "out asig\n" + "endin \n"; + csoundSetOption(csound, "-B4096"); + csoundCompileOrc(csound, instrument); + csoundReadScore(csound, "i 1 0 0.1\n e 0.2"); +// csoundSetMIDIModule(csound, "hostbased"); + csoundSetHostImplementedMIDIIO(csound, 1); + csoundSetOutput(csound, "dac", NULL, NULL); + int ret = csoundStart(csound); + CU_ASSERT(ret == 0); + ret = csoundPerform(csound); + CU_ASSERT(ret > 0); + csoundReset(csound); +} + + int main(int argc, char **argv) { CU_pSuite pSuite = NULL; @@ -162,6 +270,10 @@ /* add the tests to the suite */ if ((NULL == CU_add_test(pSuite, "Device Listing", test_dev_list)) || (NULL == CU_add_test(pSuite, "Keyboard IO", test_keyboard_io)) + || (NULL == CU_add_test(pSuite, "Audio Modules", test_audio_modules)) + || (NULL == CU_add_test(pSuite, "Audio Hostbased", test_audio_hostbased)) + || (NULL == CU_add_test(pSuite, "MIDI Modules", test_midi_modules)) + || (NULL == CU_add_test(pSuite, "MIDI Hostbased", test_midi_hostbased)) ) { CU_cleanup_registry(); diff -Nru csound-6.01~dfsg/tests/c/perfthread_test.cpp csound-6.02~dfsg/tests/c/perfthread_test.cpp --- csound-6.01~dfsg/tests/c/perfthread_test.cpp 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/tests/c/perfthread_test.cpp 2014-01-07 16:54:21.000000000 +0000 @@ -23,9 +23,9 @@ "endin \n"; Csound csound; - csound.SetOption("-odac"); + csound.SetOption((char*)"-odac"); csound.CompileOrc(instrument); - csound.ReadScore("i 1 0 3 10000 5000\n"); + csound.ReadScore((char*)"i 1 0 3 10000 5000\n"); csound.Start(); CsoundPerformanceThread performanceThread1(csound.GetCsound()); performanceThread1.Play(); @@ -33,9 +33,9 @@ csound.Cleanup(); csound.Reset(); CsoundPerformanceThread performanceThread2(csound.GetCsound()); - csound.SetOption("-odac"); + csound.SetOption((char*)"-odac"); csound.CompileOrc(instrument); - csound.ReadScore("i 1 0 3 10000 5000\n"); + csound.ReadScore((char*)"i 1 0 3 10000 5000\n"); csound.Start(); performanceThread2.Play(); performanceThread2.Join(); diff -Nru csound-6.01~dfsg/tests/soak/CMakeLists.txt csound-6.02~dfsg/tests/soak/CMakeLists.txt --- csound-6.01~dfsg/tests/soak/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.02~dfsg/tests/soak/CMakeLists.txt 2014-01-07 16:54:21.000000000 +0000 @@ -0,0 +1,5 @@ +cmake_minimum_required(VERSION 2.8) + +add_custom_target(soak python runtests.py --csound-executable=${CMAKE_BINARY_DIR}/csound --opcode6dir64=${CMAKE_BINARY_DIR} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) + diff -Nru csound-6.01~dfsg/tests/soak/lenarray.csd csound-6.02~dfsg/tests/soak/lenarray.csd --- csound-6.01~dfsg/tests/soak/lenarray.csd 2013-10-18 18:39:42.000000000 +0000 +++ csound-6.02~dfsg/tests/soak/lenarray.csd 2014-01-07 16:54:21.000000000 +0000 @@ -10,6 +10,7 @@ 0dbfs = 1 instr 1 ;simple example + seed 6543 kArr[] fillarray 1, 2, 3, 4 ;fill array manually printks "Length of kArr = %d\n\n", 0, lenarray(kArr) ;print out its length turnoff ;only do this in the first k-cycle