Pd-cvs December 2005

pd-cvs@lists.iem.at

13 participants
490 discussions

externals/grill/py py.vcproj,1.27,1.28
by Thomas Grill 06 Dec '05

06 Dec '05

Update of /cvsroot/pure-data/externals/grill/py In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11456 Modified Files: py.vcproj Log Message: fixes for pthreads version 2 fixes for pthreads V2 Index: py.vcproj =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/py.vcproj,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** py.vcproj 3 Nov 2005 20:36:41 -0000 1.27 --- py.vcproj 6 Dec 2005 21:54:32 -0000 1.28 *************** *** 86,90 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="c:\programme\audio\pd-0.39-1\src;..\flext\source;c:\programme\prog\Python24\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PY_EXPORTS;FLEXT_SYS=2;FLEXT_THREADS;PY_NUMARRAY" BasicRuntimeChecks="3" --- 86,90 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="C:\data\prog\packs\pthreads\include;c:\programme\audio\pd\src;..\flext\source;c:\programme\prog\Python24\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PY_EXPORTS;FLEXT_SYS=2;FLEXT_THREADS;PY_NUMARRAY" BasicRuntimeChecks="3" *************** *** 102,110 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="pd.lib pthreadVC.lib" OutputFile="$(outdir)/py.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories=""C:\data\prog\packs\Python-2.4\PCbuild";"c:/programme/audio/pd-0.39-1/bin"" GenerateDebugInformation="TRUE" ProgramDatabaseFile="$(outdir)/py.pdb" --- 102,110 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="pd.lib pthreadVC2.lib" OutputFile="$(outdir)/py.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories=""C:\data\prog\packs\Python-2.4\PCbuild";C:\data\prog\packs\pthreads\lib;c:/programme/audio/pd/bin" GenerateDebugInformation="TRUE" ProgramDatabaseFile="$(outdir)/py.pdb"

1 0

externals/grill/flext/source flqueue.cpp, 1.33, 1.34 flsupport.h, 1.99, 1.100 flthr.cpp, 1.32, 1.33
by Thomas Grill 06 Dec '05

06 Dec '05

Update of /cvsroot/pure-data/externals/grill/flext/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10973/source Modified Files: flqueue.cpp flsupport.h flthr.cpp Log Message: fixed and cleaned up library related stuff, especially co-existance of Max message and DSP library objects fixes for pthreads version 2 more pthreads V2 fixes updated docs update docs updates for OSX Index: flqueue.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flqueue.cpp,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** flqueue.cpp 7 Jun 2005 14:13:43 -0000 1.33 --- flqueue.cpp 6 Dec 2005 21:52:26 -0000 1.34 *************** *** 24,30 **** #ifdef FLEXT_THREADS //! Thread id of message queue thread ! flext::thrid_t flext::thrmsgid = 0; #endif #ifdef FLEXT_SHARED /* --- 24,32 ---- #ifdef FLEXT_THREADS //! Thread id of message queue thread ! flext::thrid_t flext::thrmsgid; #endif + static bool qustarted = false; + #ifdef FLEXT_SHARED /* *************** *** 300,303 **** --- 302,306 ---- { thrmsgid = GetThreadId(); + qustarted = true; for(;;) { qthrcond.Wait(); *************** *** 309,325 **** void flext_base::StartQueue() { ! static bool started = false; ! if(started) return; ! else started = true; ! #if FLEXT_QMODE == 1 #ifdef PERMANENTIDLE sys_callback(QTick,NULL,0); #endif #elif FLEXT_QMODE == 2 LaunchThread(QWorker,NULL); #elif FLEXT_QMODE == 0 && (FLEXT_SYS == FLEXT_SYS_PD || FLEXT_SYS == FLEXT_SYS_MAX) // qclk = (t_qelem *)(qelem_new(NULL,(t_method)QTick)); qclk = (t_clock *)(clock_new(NULL,(t_method)QTick)); #else #error Not implemented! --- 312,328 ---- void flext_base::StartQueue() { ! if(qustarted) return; #if FLEXT_QMODE == 1 #ifdef PERMANENTIDLE sys_callback(QTick,NULL,0); + qustarted = true; #endif #elif FLEXT_QMODE == 2 LaunchThread(QWorker,NULL); + while(!qustarted) Sleep(0.001); #elif FLEXT_QMODE == 0 && (FLEXT_SYS == FLEXT_SYS_PD || FLEXT_SYS == FLEXT_SYS_MAX) // qclk = (t_qelem *)(qelem_new(NULL,(t_method)QTick)); qclk = (t_clock *)(clock_new(NULL,(t_method)QTick)); + qustarted = true; #else #error Not implemented! Index: flthr.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flthr.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** flthr.cpp 6 Jul 2005 16:08:20 -0000 1.32 --- flthr.cpp 6 Dec 2005 21:52:26 -0000 1.33 *************** *** 39,47 **** #include <errno.h> ! //! Thread id of system thread ! flext::thrid_t flext::thrid = 0; ! //! Thread id of helper thread ! flext::thrid_t flext::thrhelpid = 0; --- 39,47 ---- #include <errno.h> ! //! Thread id of system thread - will be initialized in flext::Setup ! flext::thrid_t flext::thrid; ! //! Thread id of helper thread - will be initialized in flext::Setup ! flext::thrid_t flext::thrhelpid; *************** *** 111,127 **** } //! Start helper thread bool flext::StartHelper() { - if(thrhelpid) return true; - - if(!thrid) { - // system thread has not been set - ERRINTERNAL(); - return false; - } - bool ok = false; #if FLEXT_THREADS == FLEXT_THR_POSIX pthread_attr_t attr; --- 111,121 ---- } + bool initialized = false; //! Start helper thread bool flext::StartHelper() { bool ok = false; + initialized = false; #if FLEXT_THREADS == FLEXT_THR_POSIX pthread_attr_t attr; *************** *** 129,138 **** pthread_attr_setdetachstate(&attr,PTHREAD_CREATE_DETACHED); ! ok = pthread_create (&thrhelpid,&attr,(void *(*)(void *))ThrHelper,NULL) == 0; #elif FLEXT_THREADS == FLEXT_THR_MP if(!MPLibraryIsLoaded()) error("Thread library is not loaded"); else { ! OSStatus ret = MPCreateTask((TaskProc)ThrHelper,NULL,0,0,0,0,0,&thrhelpid); ok = ret == noErr; } --- 123,134 ---- pthread_attr_setdetachstate(&attr,PTHREAD_CREATE_DETACHED); ! pthread_t tmp; ! ok = pthread_create (&tmp,&attr,(void *(*)(void *))ThrHelper,NULL) == 0; #elif FLEXT_THREADS == FLEXT_THR_MP if(!MPLibraryIsLoaded()) error("Thread library is not loaded"); else { ! MPTaskID tmp; ! OSStatus ret = MPCreateTask((TaskProc)ThrHelper,NULL,0,0,0,0,0,&tmp); ok = ret == noErr; } *************** *** 146,150 **** else { // now we have to wait for thread helper to initialize ! while(!thrhelpid || !thrhelpcond) Sleep(0.001); // we are ready for threading now! --- 142,146 ---- else { // now we have to wait for thread helper to initialize ! while(!initialized) Sleep(0.001); // we are ready for threading now! *************** *** 175,178 **** --- 171,176 ---- thrhelpcond = new ThrCond; + initialized = true; + // helper loop for(;;) { Index: flsupport.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flsupport.h,v retrieving revision 1.99 retrieving revision 1.100 diff -C2 -d -r1.99 -r1.100 *** flsupport.h 11 Oct 2005 22:22:48 -0000 1.99 --- flsupport.h 6 Dec 2005 21:52:26 -0000 1.100 *************** *** 18,21 **** --- 18,22 ---- #include "flstdc.h" #include <new> + #include <string.h> /*! \defgroup FLEXT_SUPPORT Flext support classes *************** *** 829,833 **** static thrid_t thrhelpid; static thrid_t thrmsgid; - static bool StartHelper(); static void ThrHelper(void *); --- 830,833 ---- *************** *** 835,838 **** --- 835,841 ---- static thrid_t thrid; // the system thread + private: + static bool StartHelper(); // used in flext::Setup() + public:

1 0

externals/grill/flext build.txt, 1.10, 1.11 changes.txt, 1.89, 1.90 flext.vcproj, 1.51, 1.52
by Thomas Grill 06 Dec '05

06 Dec '05

Update of /cvsroot/pure-data/externals/grill/flext In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10973 Modified Files: build.txt changes.txt flext.vcproj Log Message: fixed and cleaned up library related stuff, especially co-existance of Max message and DSP library objects fixes for pthreads version 2 more pthreads V2 fixes updated docs update docs updates for OSX Index: flext.vcproj =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/flext.vcproj,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** flext.vcproj 3 Nov 2005 20:29:28 -0000 1.51 --- flext.vcproj 6 Dec 2005 21:52:25 -0000 1.52 *************** *** 122,126 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="c:\programme\audio\pd-0.39-1\src;c:\data\prog\audio\sndobj\include;c:\data\prog\audio\stk\include" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;FLEXT_SYS_PD;FLEXT_THREADS;FLEXT_USE_SIMD;FLEXT_EXPORTS;xFLEXT_ATTRHIDE;xFLEXT_NOATTREDIT;_WIN32_WINNT=0x501" BasicRuntimeChecks="3" --- 122,126 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="c:\data\prog\packs\pthreads\include;c:\programme\audio\pd\src;c:\data\prog\audio\sndobj\include;c:\data\prog\audio\stk\include" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;FLEXT_SYS_PD;FLEXT_THREADS;FLEXT_USE_SIMD;FLEXT_EXPORTS;xFLEXT_ATTRHIDE;xFLEXT_NOATTREDIT;_WIN32_WINNT=0x501" BasicRuntimeChecks="3" Index: changes.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/changes.txt,v retrieving revision 1.89 retrieving revision 1.90 diff -C2 -d -r1.89 -r1.90 *** changes.txt 11 Oct 2005 22:22:48 -0000 1.89 --- changes.txt 6 Dec 2005 21:52:25 -0000 1.90 *************** *** 22,25 **** --- 22,26 ---- - cleaned up internals (like Max/MSP typedefs) - fixed coexistence of message and signal objects in Max/MSP object libraries + - fixes for pthreads version 2 0.5.0: Index: build.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/build.txt,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** build.txt 3 Nov 2005 20:29:28 -0000 1.10 --- build.txt 6 Dec 2005 21:52:25 -0000 1.11 *************** *** 56,71 **** under Windows: pd msvc, using nmake ! pd cygwin, using gnumake ! pd mingw, using gnumake (from the CMD prompt, not msys!) max msvc, using nmake ! max cygwin, using gnumake ! max mingw, using gnumake (from the CMD prompt, not msys!) ! pd bcc, using bmake under Linux or MacOSX: ! pd gcc, using gnumake under MacOSX: ! max gcc, using gnumake - Mach-O externals only (Max 4.5 upwards) --- 56,71 ---- under Windows: pd msvc, using nmake ! pd cygwin, using GNU make ! pd mingw, using GNU make (from the CMD prompt, not msys!) max msvc, using nmake ! max cygwin, using GNU make ! max mingw, using GNU make (from the CMD prompt, not msys!) ! pd bcc, using Borland make under Linux or MacOSX: ! pd gcc, using GNU make under MacOSX: ! max gcc, using GNU make - Mach-O externals only (Max 4.5 upwards)

1 0

externals/frankenstein common.h,1.11,1.12 test.c,1.2,1.3
by dmorelli 06 Dec '05

06 Dec '05

Update of /cvsroot/pure-data/externals/frankenstein In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29193 Modified Files: common.h test.c Log Message: added simpler functions to manage the rhythms memory Index: test.c =================================================================== RCS file: /cvsroot/pure-data/externals/frankenstein/test.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** test.c 2 Dec 2005 18:56:07 -0000 1.2 --- test.c 6 Dec 2005 18:09:59 -0000 1.3 *************** *** 19,24 **** t_object x_obj; // myself t_outlet *l_out; ! t_rhythm_event *seq; int seq_initialized; } t_test; --- 19,25 ---- t_object x_obj; // myself t_outlet *l_out; ! t_rhythm_event *curr_seq; int seq_initialized; + t_rhythm_memory_representation *rhythms_memory; } t_test; *************** *** 26,30 **** void test_free(t_test *x) { ! freeBeats(x->seq); } --- 27,31 ---- void test_free(t_test *x) { ! freeBeats(x->curr_seq); } *************** *** 43,55 **** if (x->seq_initialized) { ! concatenateBeat(x->seq, 0, rnd, 1); } else { ! setFirstBeat(&(x->seq), 0, rnd, 1); x->seq_initialized = 1; } // print the sequence ! events = x->seq; while(events) { --- 44,56 ---- if (x->seq_initialized) { ! concatenateBeat(x->curr_seq, 0, rnd, 1); } else { ! setFirstBeat(&(x->curr_seq), 0, rnd, 1); x->seq_initialized = 1; } // print the sequence ! events = x->curr_seq; while(events) { *************** *** 69,72 **** --- 70,75 ---- x->seq_initialized = 0; + rhythm_memory_create(&(x->rhythms_memory)); + return (x); } Index: common.h =================================================================== RCS file: /cvsroot/pure-data/externals/frankenstein/common.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** common.h 6 Dec 2005 12:08:28 -0000 1.11 --- common.h 6 Dec 2005 18:09:59 -0000 1.12 *************** *** 193,196 **** --- 193,198 ---- // first of all declare a pointer for the memory t_rhythm_memory_representation *rhythms_memory; + // initialize it + rhythm_memory_create(&this_rep); // then each time you get a rhythm let the memory evaluate it and // tell you if is a new rhythm or a old one

1 0

abstractions Makefile,1.19,1.20
by Frank Barknecht 06 Dec '05

06 Dec '05

Update of /cvsroot/pure-data/abstractions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8288 Modified Files: Makefile Log Message: small type corrected Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/abstractions/Makefile,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Makefile 6 Dec 2005 14:12:51 -0000 1.19 --- Makefile 6 Dec 2005 14:13:44 -0000 1.20 *************** *** 87,91 **** --description "a collection of objects for manipulating lists. Requires pd>=0.39" install -d $(helpdir)/$(LIST-ABS_NAME) ! install -p $(abstractions_src)/footils//list-abs/*-help.pd \ $(helpdir)/$(LIST-ABS_NAME) --- 87,91 ---- --description "a collection of objects for manipulating lists. Requires pd>=0.39" install -d $(helpdir)/$(LIST-ABS_NAME) ! install -p $(abstractions_src)/footils/list-abs/*-help.pd \ $(helpdir)/$(LIST-ABS_NAME)

1 0

abstractions Makefile,1.18,1.19
by Frank Barknecht 06 Dec '05

06 Dec '05

Update of /cvsroot/pure-data/abstractions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8162 Modified Files: Makefile Log Message: added list-abs to Makefile Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/abstractions/Makefile,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Makefile 2 Dec 2005 07:17:50 -0000 1.18 --- Makefile 6 Dec 2005 14:12:51 -0000 1.19 *************** *** 31,35 **** install: all $(objectsdir) $(helpdir) $(manualsdir) $(examplesdir) \ ! gyre_install keyboardkeys_install la_install-kitchen memento_install \ nusmuk_install nqpoly_install parazit_install pddp_install pixeltango_install \ rradical_install --- 31,35 ---- install: all $(objectsdir) $(helpdir) $(manualsdir) $(examplesdir) \ ! gyre_install keyboardkeys_install la_install-kitchen list-abs_install memento_install \ nusmuk_install nqpoly_install parazit_install pddp_install pixeltango_install \ rradical_install *************** *** 75,78 **** --- 75,94 ---- $(examplesdir)/$(KEYBOARDKEYS_NAME) + #------------------------------------------------------------------------------- + # list-abs + LIST-ABS_NAME = list-abs + list-abs_install: + install -d $(objectsdir)/$(LIST-ABS_NAME) + install -p $(shell ls -1 $(abstractions_src)/footils/list-abs/*.pd | \ + grep -v '\-help.pd') $(objectsdir)/$(LIST-ABS_NAME) + $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(LIST-ABS_NAME) \ + --author "Frank Barknecht" \ + --license "GNU GPL" \ + --description "a collection of objects for manipulating lists. Requires pd>=0.39" + install -d $(helpdir)/$(LIST-ABS_NAME) + install -p $(abstractions_src)/footils//list-abs/*-help.pd \ + $(helpdir)/$(LIST-ABS_NAME) + + #-------------------------------------------------------------------------------

1 0

externals/frankenstein Makefile, 1.5, 1.6 chords_memory.c, 1.4, 1.5 common.c, 1.10, 1.11 common.h, 1.10, 1.11
by dmorelli 06 Dec '05

06 Dec '05

Update of /cvsroot/pure-data/externals/frankenstein In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv491 Modified Files: Makefile chords_memory.c common.c common.h Log Message: added simpler functions to manage the rhythms memory Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/frankenstein/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile 6 Dec 2005 00:34:07 -0000 1.5 --- Makefile 6 Dec 2005 12:08:28 -0000 1.6 *************** *** 2,7 **** #VC="C:\Programmi\Microsoft Visual Studio .NET\Vc7" VC="C:\Programmi\Microsoft Visual Studio .NET\Vc7" ! PDPATH="H:\PureData\pd-0.38-3.msw\pd" ! #PDPATH="C:\Documents and Settings\Davide\Documenti\personali\pd-0.38-3.msw\pd" --- 2,7 ---- #VC="C:\Programmi\Microsoft Visual Studio .NET\Vc7" VC="C:\Programmi\Microsoft Visual Studio .NET\Vc7" ! #PDPATH="H:\PureData\pd-0.38-3.msw\pd" ! PDPATH="C:\Documents and Settings\Davide\Documenti\personali\pd-0.38-3.msw\pd" Index: common.h =================================================================== RCS file: /cvsroot/pure-data/externals/frankenstein/common.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** common.h 6 Dec 2005 00:34:07 -0000 1.10 --- common.h 6 Dec 2005 12:08:28 -0000 1.11 *************** *** 83,86 **** --- 83,90 ---- // the minimum percentage for a beat to be considered part of the main rhythm #define min_to_be_main_rhythm_beat 0.7 + // minimum value to be considered a subrhythm of this rhythm + #define min_to_be_same_rhythm 0.7 + // minimum percentage to be considered this exact rhythm + #define min_to_be_same_subrhythm 0.9 // this defines a space for rhythms, variations, transitions and representations *************** *** 159,163 **** // add a new rhythm in the list of similar rhythms related to one main rhythm // the sub id is auto-generated and returned ! unsigned short int add_similar_rhythm(t_rhythm_memory_representation *this_rep, t_rhythm_event *new_rhythm); // free the list of representations --- 163,167 ---- // add a new rhythm in the list of similar rhythms related to one main rhythm // the sub id is auto-generated and returned ! unsigned short int add_t_rhythm_memory_element(t_rhythm_memory_representation *this_rep, t_rhythm_event *new_rhythm); // free the list of representations *************** *** 184,187 **** --- 188,265 ---- ); + // the following are the functions that externals should use + /* usage: + + // first of all declare a pointer for the memory + t_rhythm_memory_representation *rhythms_memory; + // then each time you get a rhythm let the memory evaluate it and + // tell you if is a new rhythm or a old one + float root_closeness, sub_closeness; + unsigned short int id, subid, is_it_a_new_rhythm; + rhythm_memory_evaluate(rhythms_memory, rhythm, &is_it_a_new_rhythm, + &id, &subid, &root_closeness, &sub_closeness); + if (is_it_a_new_rhythm==1) + { + // it was a completely new rhythm + // id tells us new id assigned + // and subid tells us the new sub id assigned + } + if (is_it_a_new_rhythm==2) + { + // it was a new sub-rhythm of a known rhythm + // id tells us rht root rhythm id + // and subid tells us the new sub id assigned + } + if (is_it_a_new_rhythm==0) + { + // it was a known rhythm and subrhythm + // id and subid tell us the identificator + } + // i can also use root_closeness and sub_closeness and is_it_a_new_rhythm + // to know how much novelty there was in this rhythm + + // i can ask the memory to give me back a specific rhythm + t_rhythm_event *wanted_rhythm + int rhythm_found = rhythm_memory_get_rhythm(rhythms_memory, + wanted_rhythm, + id, // the id of the main rhythm wanted + sub_id // the sub-id of the sub-rhythm wanted + ); + if (rhythm_found == 0) + { + // that rhythm was not present! + } + + // when i am ready I should free the memory + rhythm_memory_free(rhythms_memory); + */ + + + // create a new memory for rhythms + void rhythm_memory_create(t_rhythm_memory_representation **this_rep); + // free the space + void rhythm_memory_free(t_rhythm_memory_representation *rep_list); + // evaluate this rhythm and add it to the memory if is new + void rhythm_memory_evaluate(t_rhythm_memory_representation *rep_list, // the memory + t_rhythm_event *src_rhythm, // the rhythm to evaluate + // is it a new rhythm? (0 if no, 1 if new main rhythm, 2 if new subrhythm) + unsigned short int *new_rhythm, + // the id of the closest rhythm or the new id assigned + unsigned short int *id, + // the sub-id of the closest sub-rhythm or the new sub-id assigned + unsigned short int *sub_id, + // how much this rhythm is close to the root (1=identical, 0=nothing common) + float *root_closeness, + // how much this rhythm is close to the closest sub-rhythm (1=identical, 0=nothing common) + float *sub_closeness + ); + // return 0 if failed finding the rhythm, 1 if the rhythm was found + int rhythm_memory_get_rhythm(t_rhythm_memory_representation *rep_list, // the memory + t_rhythm_event *out_rhythm, // a pointer to the returned rhythm + // the id of the main rhythm wanted + unsigned short int id, + // the sub-id of the sub-rhythm wanted + unsigned short int sub_id); + // -------- notes manipulation functions Index: common.c =================================================================== RCS file: /cvsroot/pure-data/externals/frankenstein/common.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** common.c 6 Dec 2005 00:34:07 -0000 1.10 --- common.c 6 Dec 2005 12:08:28 -0000 1.11 *************** *** 539,542 **** --- 539,693 ---- + // create a new memory for rhythms + void rhythm_memory_create(t_rhythm_memory_representation **this_rep) + { + create_rhythm_memory_representation(this_rep, 0); + } + + // free the space + void rhythm_memory_free(t_rhythm_memory_representation *rep_list) + { + t_rhythm_memory_representation *curr, *next; + next = rep_list; + while (next) + { + curr = next; + next = curr->next; + free_memory_representations(curr); + } + } + // evaluate this rhythm and add it to the memory if is new + void rhythm_memory_evaluate(t_rhythm_memory_representation *rep_list, // the memory + t_rhythm_event *src_rhythm, // the rhythm to evaluate + // is it a new rhythm? (0 if no, 1 if new main rhythm, 2 if new subrhythm) + unsigned short int *new_rhythm, + // the id of the closest rhythm or the new id assigned + unsigned short int *id, + // the sub-id of the closest sub-rhythm or the new sub-id assigned + unsigned short int *sub_id, + // how much this rhythm is close to the root (1=identical, 0=nothing common) + float *root_closeness, + // how much this rhythm is close to the closest sub-rhythm (1=identical, 0=nothing common) + float *sub_closeness + ) + { + float root_closeness_found, sub_closeness_found; + unsigned short int id_found, sub_id_found, new_id; + t_rhythm_memory_representation *curr, *newRep, *lastRep; + int found; + + // look for the closest main rhythm and subrhythm + find_rhythm_in_memory(rep_list, + src_rhythm, // the src rhythm + &id_found, // the id of the closest rhythm + &sub_id_found, // the sub-id of the closest sub-rhythm + &root_closeness_found, // how much this rhythm is close to the root (1=identical, 0=nothing common) + &sub_closeness_found // how much this rhythm is close to the closest sub-rhythm (1=identical, 0=nothing common) + ); + + // decide if add to the memory or if return the closest + + if (root_closeness_found>=min_to_be_same_rhythm) + { + // is close enough to be considered a subrhythm + *new_rhythm = 0; + *id = id_found; + *root_closeness = root_closeness_found; + if (sub_closeness_found>=min_to_be_same_subrhythm) + { + // this is a known subrhythm + *sub_id = sub_id_found; + *sub_closeness = sub_closeness_found; + } else + { + // add this rhythm as a new subrhythm + curr = rep_list; + found = 0; + while (curr && !found) + { + if (curr->id == id_found) + { + // i've found the rhythm + found = 1; + } else + { + curr = curr->next; + } + } + + sub_id_found = add_t_rhythm_memory_element(curr, src_rhythm); + sub_closeness_found = 1; + *sub_id = sub_id_found; + *sub_closeness = sub_closeness_found; + *new_rhythm = 2; + } + } else + { + // this is a completely new rhythm! + // find the last id and representation + curr = rep_list; + new_id = 0; + lastRep = 0; + while (curr) + { + new_id = curr->id; + lastRep = curr; + curr = curr->next; + } + // create a new representation with a new id + new_id++; + create_rhythm_memory_representation(&newRep, new_id); + // link the representations + lastRep->next = newRep; + // add the rhythm as subrhythm + sub_id_found = add_t_rhythm_memory_element(newRep, src_rhythm); + sub_closeness_found = 1; + *sub_id = sub_id_found; + *sub_closeness = sub_closeness_found; + *id = new_id; + *root_closeness = 1; + *new_rhythm = 1; + } + + } + // return 0 if failed finding the rhythm, 1 if the rhythm was found + int rhythm_memory_get_rhythm(t_rhythm_memory_representation *rep_list, // the memory + t_rhythm_event *out_rhythm, // a pointer to the returned rhythm + // the id of the main rhythm wanted + unsigned short int id, + // the sub-id of the sub-rhythm wanted + unsigned short int sub_id) + { + // look for this id and subid in memory and return that subrhythm + t_rhythm_memory_representation *curr; + t_rhythm_memory_element *curr2; + curr = rep_list; + while (curr) + { + if (curr->id == id) + { + // this is the right main rhythm + // now look for the correct subid + curr2 = curr->rhythms; + while (curr2) + { + if (curr2->id == sub_id) + { + // i've found the rhythm! + out_rhythm=curr2->rhythm; + return 1; + } + curr2 = curr2->next; + } + + } + + curr = curr->next; + } + // if i am here then i didn't find the rhythm + return 0; + } + + // ------------------- themes manipulation functions Index: chords_memory.c =================================================================== RCS file: /cvsroot/pure-data/externals/frankenstein/chords_memory.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** chords_memory.c 5 Dec 2005 21:05:34 -0000 1.4 --- chords_memory.c 6 Dec 2005 12:08:28 -0000 1.5 *************** *** 126,135 **** kHalfDim7=9, //pland adding 9ths 30.11.05 and beyond ! kDomb9=10 ! kMaj9=11 ! kDom9=12 ! kMin9=13 ! kHalfDim9=14 ! kMinMaj9=15 kDimMaj9=16 } chord_type_t; --- 126,135 ---- kHalfDim7=9, //pland adding 9ths 30.11.05 and beyond ! kDomb9=10, ! kMaj9=11, ! kDom9=12, ! kMin9=13, ! kHalfDim9=14, ! kMinMaj9=15, kDimMaj9=16 } chord_type_t;

1 0

pd/src/locale espanol.tcl,NONE,1.1.2.1
by Mathieu Bouchard 06 Dec '05

06 Dec '05

Update of /cvsroot/pure-data/pd/src/locale In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7872 Added Files: Tag: devel_0_39 espanol.tcl Log Message: Espanol translations by Ramiro Cosentino --- NEW FILE: espanol.tcl --- #!/usr/bin/env tclsh # Espanol translations for PureData # $Id: espanol.tcl,v 1.1.2.1 2005/12/06 09:58:03 matju Exp $ # translated by Ramiro Cosentino ### Menus say file "Archivo" say new_file "Nuevo Archivo" say open_file "Abrir Archivo..." say pdrc_editor "Editor .pdrc" say send_message "Enviar Mensaje..." say paths "Rutas..." say close "Cerrar" say save "Guardar" say save_as "Guardar Como..." say print "Imprimir..." say quit "Salir" say edit "Edición" say undo "Deshacer" say redo "Rehacer" say cut "Cortar" say copy "Copiar" say paste "Pegar" say duplicate "Duplicar" say select_all "Seleccionar Todo" say text_editor "Editor de Texto..." say font_bomb "Bomba Fuente..." ;# WTH IS THIS ? say tidy_up "Ordenar" say edit_mode "Modo Edición" say view "Ver" say reload "Recargar" say redraw "Refrescar" say find "Buscar" say find_again "Buscar Nuevamente" say find_last_error "Buscar Último Error" say put "Poner" say media "Media" say audio_on "Audio ON" say audio_off "Audio OFF" say test_audio_and_midi "Probar Audio y MIDI" say load_meter "Medidor de Carga" say window "Ventana" say help "Ayuda" say about "Acerca de..." say pure_documentation "Pura Documentación..." say class_browser "Navegador de Clases..." ### Main Window say in "in" say out "out" say audio "Audio" say meters "Medidores" say io_errors "Errores de E/S" ### Other say cannot "no puedo"

1 0

externals/frankenstein Makefile, 1.4, 1.5 common.c, 1.9, 1.10 common.h, 1.9, 1.10
by dmorelli 06 Dec '05

06 Dec '05

Update of /cvsroot/pure-data/externals/frankenstein In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10900 Modified Files: Makefile common.c common.h Log Message: finding rhythm functions ready Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/frankenstein/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile 4 Dec 2005 02:03:40 -0000 1.4 --- Makefile 6 Dec 2005 00:34:07 -0000 1.5 *************** *** 2,7 **** #VC="C:\Programmi\Microsoft Visual Studio .NET\Vc7" VC="C:\Programmi\Microsoft Visual Studio .NET\Vc7" ! #PDPATH="H:\PureData\pd-0.38-3.msw\pd" ! PDPATH="C:\Documents and Settings\Davide\Documenti\personali\pd-0.38-3.msw\pd" --- 2,7 ---- #VC="C:\Programmi\Microsoft Visual Studio .NET\Vc7" VC="C:\Programmi\Microsoft Visual Studio .NET\Vc7" ! PDPATH="H:\PureData\pd-0.38-3.msw\pd" ! #PDPATH="C:\Documents and Settings\Davide\Documenti\personali\pd-0.38-3.msw\pd" Index: common.h =================================================================== RCS file: /cvsroot/pure-data/externals/frankenstein/common.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** common.h 5 Dec 2005 18:08:53 -0000 1.9 --- common.h 6 Dec 2005 00:34:07 -0000 1.10 *************** *** 81,84 **** --- 81,87 ---- static unsigned short int possible_denominators[] = {1,2,3,4,6,8,12,16,18,24,32}; + // the minimum percentage for a beat to be considered part of the main rhythm + #define min_to_be_main_rhythm_beat 0.7 + // this defines a space for rhythms, variations, transitions and representations typedef struct t_rhythm_memory_representation t_rhythm_memory_representation; *************** *** 107,110 **** --- 110,116 ---- } ; + // define a return value to express "rhythm not found in this representation" + #define INVALID_RHYTHM 65535 + // ------------------------------------------------ functions *************** *** 141,144 **** --- 147,153 ---- // --- memory representation of rhythms + // create an array of nodes (without arcs?) to express the beats in this rhythm (the noteon moments) + void create_array_beats(unsigned short int **this_array, t_rhythm_event *currentEvent); + // add an arc to this node void add_t_rhythm_memory_arc(t_rhythm_memory_node *srcNode, unsigned short int dstNode); *************** *** 148,154 **** void create_rhythm_memory_representation(t_rhythm_memory_representation **this_rep, unsigned short int id); - // define a return value to express "rhythm not found in this representation" - #define INVALID_RHYTHM 65535 - // add a new rhythm in the list of similar rhythms related to one main rhythm // the sub id is auto-generated and returned --- 157,160 ---- Index: common.c =================================================================== RCS file: /cvsroot/pure-data/externals/frankenstein/common.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** common.c 5 Dec 2005 18:08:53 -0000 1.9 --- common.c 6 Dec 2005 00:34:07 -0000 1.10 *************** *** 336,339 **** --- 336,364 ---- } + void create_array_beats(unsigned short int **this_array, t_rhythm_event *currentEvent) + { + unsigned short int *new_array; + t_rhythm_event *curr_event; + int i, maxi, startint; + maxi = possible_durations(); + // allocate space for the nodes + new_array = (unsigned short int *) malloc(sizeof(unsigned short int) * maxi); + // set default values + for (i=0; i<maxi; i++) + { + new_array[i] = 0; + } + // set the actual data + curr_event = currentEvent; + while(curr_event) + { + startint = duration2int(curr_event->start); + new_array[startint]=1; + curr_event = curr_event->next; + } + *this_array = new_array; + + } + // compares this rhythm to this representation // and tells you how close it is to it *************** *** 347,352 **** t_duration tmp_dur, this_dur; t_rhythm_event *curr_event; ! float this_weight_float; ! int i, max_i, int_from_dur, this_weight_int; // check that the return values have been allocated --- 372,382 ---- t_duration tmp_dur, this_dur; t_rhythm_event *curr_event; ! float this_weight_float, average_weight, strong_ratio; ! int i, max_i, int_from_dur, this_weight_int, beats, strong_ok, strong_no; ! unsigned short int *src_rhythm_array, *tmp_rhythm_array; ! unsigned short int best_subid, curr_subid; ! float best_closeness, curr_closeness; ! int sub_ok, sub_no; ! t_rhythm_memory_element *possible_rhythms; // check that the return values have been allocated *************** *** 357,362 **** --- 387,401 ---- } + max_i = possible_durations(); + // create an array of bools + create_array_beats(&src_rhythm_array, src_rhythm); + // look the main table for closeness to the main rhythm curr_event = src_rhythm; + beats=0; + strong_ok=0; + strong_no=0; + strong_ratio=0; + average_weight = 0; while(curr_event) { *************** *** 364,384 **** // get the weight of this beat this_weight_int = this_rep->transitions[int_from_dur].weight; ! this_weight_float = (float) (((float) this_weight_int)/((float) this_rep->max_weight); ! // TODO ! curr_event = curr_event->next; } - // for each rhythm in the list // count the number of identical nodes // cound thenumber of different nodes ! ! // TODO // return the better matching rhythm id // and the closeness floats ! // TODO } --- 403,500 ---- // get the weight of this beat this_weight_int = this_rep->transitions[int_from_dur].weight; ! this_weight_float = (float) ( ((float) this_weight_int) / ((float) this_rep->max_weight)); ! average_weight += this_weight_float; ! beats++; curr_event = curr_event->next; } + // look all the representation's rhythm + // looking for strong beats corrispondance + for (i=0; i<max_i; i++) + { + if (this_weight_float > min_to_be_main_rhythm_beat) + { + this_weight_int = this_rep->transitions[i].weight; + this_weight_float = (float) (((float) this_weight_int) / ((float) this_rep->max_weight)); + // this is a main rhythm beat + if (src_rhythm_array[i]>0) + { + // both playing + strong_ok++; + } else + { + // strong beat miss + strong_no++; + } + } + } + + // this is the average weight of this rhythm in this representation + if (beats==0) + { + average_weight = 0; + } else + { + average_weight = (float) (average_weight / ((float) beats)); + } + // ratio of corresponding strong beats.. + // close to 0 = no corrispondance + // close to 1 = corrispondance + if (strong_no==0) + { + strong_ratio = 1; + } else + { + strong_ratio = (float) ( ((float) strong_ok) / ((float)strong_no) ); + } // for each rhythm in the list // count the number of identical nodes // cound thenumber of different nodes ! best_subid = curr_subid = INVALID_RHYTHM; ! best_closeness = curr_closeness = 0; ! possible_rhythms = this_rep->rhythms; ! while(possible_rhythms) ! { ! // create the table of this rhythm ! create_array_beats(&tmp_rhythm_array, possible_rhythms->rhythm); ! sub_ok = sub_no = 0; ! for (i=0; i<max_i; i++) ! { ! if (tmp_rhythm_array[i]>0 && src_rhythm_array[i]>0) ! { ! sub_ok++; ! } else if (tmp_rhythm_array[i]==0 && src_rhythm_array[i]==0) ! { ! // nothing important ! } else ! { ! sub_no++; ! } ! } ! if (sub_no == 0) ! { ! curr_closeness = 1; ! } else ! { ! curr_closeness = (float) ( ((float) sub_ok) / ((float) sub_no) ); ! } ! if (curr_closeness > best_closeness) ! { ! best_closeness = curr_closeness; ! best_subid = possible_rhythms->id; ! } ! possible_rhythms = possible_rhythms->next; ! free(tmp_rhythm_array); ! } // return the better matching rhythm id // and the closeness floats ! *sub_id = best_subid; ! *sub_closeness = best_closeness; ! *root_closeness = strong_ratio; ! ! // free allocated memory ! free(src_rhythm_array); } *************** *** 391,405 **** ) { // for each element of the rep_list ! // TODO ! ! // invoke find_similar_rhythm_in_memory ! ! // TODO ! ! // return the cosest representation with its subrhythm and closeness values - // TODO } --- 507,538 ---- ) { + unsigned short int best_id, curr_id, best_subid, curr_subid; + float best_closeness, curr_closeness, best_sub_closeness, curr_sub_closeness; + t_rhythm_memory_representation *this_rep; + best_closeness = curr_closeness = best_sub_closeness = curr_sub_closeness = 0; + best_id = curr_id = best_subid = curr_subid = INVALID_RHYTHM; // for each element of the rep_list + this_rep = rep_list; + while(this_rep) + { + compare_rhythm_vs_representation(this_rep, + src_rhythm, + &curr_subid, + &curr_closeness, + &curr_sub_closeness); + if (curr_closeness > best_closeness) + { + best_closeness = curr_closeness; + best_id = this_rep->id; + best_sub_closeness = curr_sub_closeness; + best_subid = curr_subid; + } + } ! *id = best_id; ! *sub_id = best_subid; ! *root_closeness = best_closeness; ! *sub_closeness = best_sub_closeness; }

1 0

externals/zexy/src Makefile,1.6,1.7
by IOhannes m zmölnig 05 Dec '05

05 Dec '05

Update of /cvsroot/pure-data/externals/zexy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21932 Modified Files: Makefile Log Message: on distclean remove configure-leftovers (but keep configure) Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile 5 Dec 2005 21:46:51 -0000 1.6 --- Makefile 5 Dec 2005 21:48:15 -0000 1.7 *************** *** 63,66 **** --- 63,67 ---- -rm -f zexy.exp zexy.lib zexy.ncb \ zexy.opt zexy.plg + -rm -rf autom4te.cache/ install: install-bin install-doc install-abs

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs December 2005