Pd-cvs October 2005

pd-cvs@lists.iem.at

15 participants
477 discussions

externals/tb/chaos/src chaos_dsp.hpp,1.11,1.12
by Tim Blechmann 09 Oct '05

09 Oct '05

Update of /cvsroot/pure-data/externals/tb/chaos/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14428/src Modified Files: chaos_dsp.hpp Log Message: cleaner behaviour for high frequency resampling Index: chaos_dsp.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/tb/chaos/src/chaos_dsp.hpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** chaos_dsp.hpp 9 Oct 2005 09:55:24 -0000 1.11 --- chaos_dsp.hpp 9 Oct 2005 10:21:36 -0000 1.12 *************** *** 37,42 **** --- 37,46 ---- /* linear interpolation */ void m_signal_l(int n, t_sample *const *insigs,t_sample *const *outsigs); + /* linear interpolation for high frequencies */ + void m_signal_l_hf(int n, t_sample *const *insigs,t_sample *const *outsigs); /* cubic interpolation */ void m_signal_c(int n, t_sample *const *insigs,t_sample *const *outsigs); + /* cubic interpolation for high frequencies */ + void m_signal_c_hf(int n, t_sample *const *insigs,t_sample *const *outsigs); virtual void CbSignal() *************** *** 67,72 **** float m_freq; /* frequency of oscillations */ float m_invfreq; /* inverse frequency */ ! int m_phase; /* phase counter */ ! float m_fphase; /* phase for high frequency linear interpolation */ float m_sr; /* sample rate */ --- 71,75 ---- float m_freq; /* frequency of oscillations */ float m_invfreq; /* inverse frequency */ ! float m_phase; /* phase */ float m_sr; /* sample rate */ *************** *** 119,123 **** } } ! } --- 122,126 ---- } } ! set_freq(m_freq); } *************** *** 134,151 **** if( f <= m_sr * 0.1 ) { ! if (m_freq >= m_sr * 0.5) ! set_imethod(m_imethod); ! m_freq = f; ! m_invfreq = 1.f / f; } ! else if (f > m_sr * 0.1) { ! m_freq = f; ! m_invfreq = 1.f / f; ! ! m_routine = &thisType::m_signal_n_hf; } ! else ! post("frequency out of range"); } --- 137,175 ---- if( f <= m_sr * 0.1 ) { ! switch(m_imethod) ! { ! case 0: ! m_routine = &thisType::m_signal_n; ! break; ! case 1: ! m_routine = &thisType::m_signal_l; ! break; ! case 2: ! m_routine = &thisType::m_signal_c; ! break; ! default: ! assert(false); ! } } ! else { ! switch(m_imethod) ! { ! case 0: ! m_routine = &thisType::m_signal_n_hf; ! break; ! case 1: ! m_routine = &thisType::m_signal_l_hf; ! break; ! case 2: ! m_routine = &thisType::m_signal_c_hf; ! break; ! default: ! assert(false); ! } } ! ! m_freq = f; ! m_invfreq = 1.f / f; } *************** *** 227,231 **** template <class system> void chaos_dsp<system>::m_signal_(int n, t_sample *const *insigs, ! t_sample *const *outsigs) { int outlets = m_system->get_num_eq(); --- 251,255 ---- template <class system> void chaos_dsp<system>::m_signal_(int n, t_sample *const *insigs, ! t_sample *const *outsigs) { int outlets = m_system->get_num_eq(); *************** *** 248,252 **** int outlets = m_system->get_num_eq(); ! float phase = m_fphase; int offset = 0; --- 272,276 ---- int outlets = m_system->get_num_eq(); ! float phase = m_phase; int offset = 0; *************** *** 268,272 **** offset += next; } ! m_fphase = phase; } --- 292,296 ---- offset += next; } ! m_phase = phase; } *************** *** 274,282 **** template <class system> void chaos_dsp<system>::m_signal_n(int n, t_sample *const *insigs, ! t_sample *const *outsigs) { int outlets = m_system->get_num_eq(); ! int phase = m_phase; int offset = 0; --- 298,306 ---- template <class system> void chaos_dsp<system>::m_signal_n(int n, t_sample *const *insigs, ! t_sample *const *outsigs) { int outlets = m_system->get_num_eq(); ! int phase = int(m_phase); int offset = 0; *************** *** 305,313 **** template <class system> void chaos_dsp<system>::m_signal_l(int n, t_sample *const *insigs, ! t_sample *const *outsigs) { int outlets = m_system->get_num_eq(); ! int phase = m_phase; int i = 0; --- 329,337 ---- template <class system> void chaos_dsp<system>::m_signal_l(int n, t_sample *const *insigs, ! t_sample *const *outsigs) { int outlets = m_system->get_num_eq(); ! int phase = int(m_phase); int i = 0; *************** *** 342,352 **** template <class system> void chaos_dsp<system>::m_signal_c(int n, t_sample *const *insigs, ! t_sample *const *outsigs) { int outlets = m_system->get_num_eq(); ! int phase = m_phase; int i = 0; --- 366,416 ---- + + template <class system> + void chaos_dsp<system>::m_signal_l_hf(int n, t_sample *const *insigs, + t_sample *const *outsigs) + { + int outlets = m_system->get_num_eq(); + + float phase = int(m_phase); + + int i = 0; + + while (n) + { + if (phase == 0) + { + m_system->m_perform(); + phase = int (m_sr * m_invfreq); + + for (int j = 0; j != outlets; ++j) + m_slopes[j] = (m_system->get_data(j) - m_values[j]) / phase; + } + + int next = (phase < n) ? int(ceilf (phase)) : n; + n -= next; + phase -=next; + + while (next--) + { + for (int j = 0; j != outlets; ++j) + { + outsigs[j][i] = m_values[j]; + m_values[j]+=m_slopes[j]; + } + ++i; + } + } + m_phase = phase; + } + + template <class system> void chaos_dsp<system>::m_signal_c(int n, t_sample *const *insigs, ! t_sample *const *outsigs) { int outlets = m_system->get_num_eq(); ! int phase = int(m_phase); int i = 0; *************** *** 370,374 **** float fseglen = (float)phase; m_curves[j] = 2.f * (m_nextmidpts[j] - m_values[j] - ! fseglen * m_slopes[j]) / (fseglen * fseglen + fseglen); } --- 434,438 ---- float fseglen = (float)phase; m_curves[j] = 2.f * (m_nextmidpts[j] - m_values[j] - ! fseglen * m_slopes[j]) / (fseglen * fseglen + fseglen); } *************** *** 392,393 **** --- 456,509 ---- m_phase = phase; } + + + template <class system> + void chaos_dsp<system>::m_signal_c_hf(int n, t_sample *const *insigs, + t_sample *const *outsigs) + { + int outlets = m_system->get_num_eq(); + + float phase = m_phase; + + int i = 0; + + while (n) + { + if (phase == 0) + { + m_system->m_perform(); + phase = int (m_sr * m_invfreq); + phase = (phase > 2) ? phase : 2; + + for (int j = 0; j != outlets; ++j) + { + t_sample value = m_nextvalues[j]; + m_nextvalues[j]= m_system->get_data(j); + + m_values[j] = m_nextmidpts[j]; + m_nextmidpts[j] = (m_nextvalues[j] + value) * 0.5f; + + float fseglen = (float)phase; + m_curves[j] = 2.f * (m_nextmidpts[j] - m_values[j] - + fseglen * m_slopes[j]) + / (fseglen * fseglen + fseglen); + } + } + + int next = (phase < n) ? int(ceilf (phase)) : n; + n -= next; + phase -=next; + + while (next--) + { + for (int j = 0; j != outlets; ++j) + { + outsigs[j][i] = m_values[j]; + m_slopes[j]+=m_curves[j]; + m_values[j]+=m_slopes[j]; + } + ++i; + } + } + m_phase = phase; + }

1 0

externals/tb/chaos/src chaos_dsp.hpp,1.10,1.11
by Tim Blechmann 09 Oct '05

09 Oct '05

Update of /cvsroot/pure-data/externals/tb/chaos/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8526 Modified Files: chaos_dsp.hpp Log Message: more flext-like dsp callbacks Index: chaos_dsp.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/tb/chaos/src/chaos_dsp.hpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** chaos_dsp.hpp 16 Jun 2005 13:02:01 -0000 1.10 --- chaos_dsp.hpp 9 Oct 2005 09:55:24 -0000 1.11 *************** *** 40,52 **** void m_signal_c(int n, t_sample *const *insigs,t_sample *const *outsigs); ! virtual void m_signal(int n, t_sample *const *insigs,t_sample *const *outsigs) { ! (this->*m_routine)(n,insigs,outsigs); } ! virtual void m_dsp(int n, t_sample *const *insigs,t_sample *const *outsigs) { m_sr = Samplerate(); set_freq(m_freq); /* maybe we have to change the interpolation mode */ } --- 40,53 ---- void m_signal_c(int n, t_sample *const *insigs,t_sample *const *outsigs); ! virtual void CbSignal() { ! (this->*m_routine)(Blocksize(),InSig(),OutSig()); } ! virtual bool CbDsp() { m_sr = Samplerate(); set_freq(m_freq); /* maybe we have to change the interpolation mode */ + return true; } *************** *** 131,135 **** f = -f; ! if( f <= m_sr * 0.5 ) { if (m_freq >= m_sr * 0.5) --- 132,136 ---- f = -f; ! if( f <= m_sr * 0.1 ) { if (m_freq >= m_sr * 0.5) *************** *** 138,142 **** m_invfreq = 1.f / f; } ! else if (f > m_sr * 0.5) { m_freq = f; --- 139,143 ---- m_invfreq = 1.f / f; } ! else if (f > m_sr * 0.1) { m_freq = f;

1 0

pd/extra SConscript,1.1.2.4,1.1.2.5
by Thomas Grill 08 Oct '05

08 Oct '05

Update of /cvsroot/pure-data/pd/extra In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21561/extra Modified Files: Tag: devel_0_39 SConscript Log Message: updated for Windows' exported setup functions Index: SConscript =================================================================== RCS file: /cvsroot/pure-data/pd/extra/Attic/SConscript,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** SConscript 7 Oct 2005 22:11:37 -0000 1.1.2.4 --- SConscript 8 Oct 2005 18:33:03 -0000 1.1.2.5 *************** *** 18,31 **** extra_env.Append(CPPPATH='../src') - extra_env.Append(CPPDEFINES='PD') extras = [] for extra in Split("bonk~ choice fiddle~ loop~ lrshift~ pique"): ! extras.append(extra_env.SharedLibrary(extra, extra+'/'+extra+'.c')) for extra in Split("expr expr~ fexpr~"): ! extras.append(extra_env.SharedLibrary(extra, map(lambda x: 'expr~/'+x+'.c',\ ! Split("vexp vexp_fun vexp_if")))) Default(extras) --- 18,44 ---- extra_env.Append(CPPPATH='../src') extras = [] + def getlocalenv(env,name): + '''make environment with flags for exported setup function''' + loc_env = env.Copy() + if 'msvc' in pdenv['TOOLS']: + parts = name.split("~") + setup_name = parts[0] + if len(parts) > 1: + setup_name += "_tilde" + loc_env.Append(LINKFLAGS=["/EXPORT:"+setup_name+"_setup"]) + return loc_env + for extra in Split("bonk~ choice fiddle~ loop~ lrshift~ pique"): ! env = getlocalenv(extra_env,extra) ! extras.append(env.SharedLibrary(extra, extra+'/'+extra+'.c')) ! ! exprfiles = map(lambda x: 'expr~/'+x+'.c',Split("vexp vexp_fun vexp_if")) for extra in Split("expr expr~ fexpr~"): ! env = getlocalenv(extra_env,extra) ! extras.append(env.SharedLibrary(extra,exprfiles)) Default(extras)

1 0

pd/src m_obj.c,1.2.4.3.2.1,1.2.4.3.2.2
by Mathieu Bouchard 08 Oct '05

08 Oct '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10252 Modified Files: Tag: devel_0_39 m_obj.c Log Message: had broken desire=0 ... sorry guys Index: m_obj.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_obj.c,v retrieving revision 1.2.4.3.2.1 retrieving revision 1.2.4.3.2.2 diff -C2 -d -r1.2.4.3.2.1 -r1.2.4.3.2.2 *** m_obj.c 22 May 2005 12:50:23 -0000 1.2.4.3.2.1 --- m_obj.c 8 Oct 2005 15:08:32 -0000 1.2.4.3.2.2 *************** *** 802,803 **** --- 802,811 ---- } + /* ---------------------------------------------------------------- */ + #ifdef DESIRE + + EXTERN void gobj_notice(t_gobj *x, t_gobj *origin, int dirty) { + x->g_obs->notice(x,origin,dirty); + } + + #endif

1 0

pd/src SConscript,1.1.4.31,1.1.4.32
by Thomas Grill 08 Oct '05

08 Oct '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11085/src Modified Files: Tag: devel_0_39 SConscript Log Message: Windows compilation: now covers all features and yields working executable Index: SConscript =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/SConscript,v retrieving revision 1.1.4.31 retrieving revision 1.1.4.32 diff -C2 -d -r1.1.4.31 -r1.1.4.32 *** SConscript 7 Oct 2005 22:15:11 -0000 1.1.4.31 --- SConscript 8 Oct 2005 09:39:42 -0000 1.1.4.32 *************** *** 8,11 **** --- 8,15 ---- opt = Options(['options.cache', 'custom.py']) + + + # general options + opt.AddOptions( BoolOption('debug', 'Build with debugging symbols', False), *************** *** 13,36 **** BoolOption('daz', 'Build using DAZ flag on x86-SSE2 cpus (must be set to False for AMD cpus)', False), BoolOption('portaudio', 'Build with portaudio', True), ! BoolOption('asio', 'Build with native ASIO (for Windows)', False), BoolOption('threadedsf', 'Build with threaded soundfiler', False), BoolOption('atomic', 'Build with atomic operations', False), BoolOption('newhash', 'Build with 16 bit symbol hash table', True), ! BoolOption('lockfree', 'Build with lock-free fifos', True), BoolOption('pdlib', 'Build with pdlib', False), ! BoolOption('app_pkg', 'Build for inclusion in .app package - OSX only', False), ! ('optimize', 'Optimize for specific architecture', None), ('prefix', 'install prefix', '/usr/local'), BoolOption('desire', 'Build with desire', False), BoolOption('wall', 'Build with a wall of warnings', False), - BoolOption('shared', 'Build against shared C libraries (for Windows)', True), ) if pdenv['PLATFORM'] == 'win32': opt.AddOptions( ('asiopath', 'Path to ASIOSDK', None), ('tclpath', 'Path to tcl', None), ! ('pthreadspath', 'Path to pthreads', None) ! ) --- 17,49 ---- BoolOption('daz', 'Build using DAZ flag on x86-SSE2 cpus (must be set to False for AMD cpus)', False), BoolOption('portaudio', 'Build with portaudio', True), ! ('portaudiopath', 'Path to portaudio','../portaudio'), BoolOption('threadedsf', 'Build with threaded soundfiler', False), BoolOption('atomic', 'Build with atomic operations', False), BoolOption('newhash', 'Build with 16 bit symbol hash table', True), ! BoolOption('lockfree', 'Build with lock-free fifos (not working for 1st generation AMD64)', True), BoolOption('pdlib', 'Build with pdlib', False), ! ('optimize', 'Optimize for specific architecture (give cpu model)', None), ('prefix', 'install prefix', '/usr/local'), BoolOption('desire', 'Build with desire', False), BoolOption('wall', 'Build with a wall of warnings', False), ) + + #platform-specific options + if pdenv['PLATFORM'] == 'win32': opt.AddOptions( + BoolOption('shared', 'Build against shared C libraries', True), + # BoolOption('mmio', 'Build with MMIO audio interface', True), + BoolOption('asio', 'Build with native ASIO interface', False), ('asiopath', 'Path to ASIOSDK', None), ('tclpath', 'Path to tcl', None), ! ('pthreadspath', 'Path to pthreads', None), ! ) ! elif pdenv['PLATFORM'] == 'darwin': ! opt.AddOptions( ! ('portmidipath', 'Path to portmidi','../portmidi_osx'), ! BoolOption('app_pkg', 'Build for inclusion in .app package', False), ! ) *************** *** 128,132 **** pdenv.Append(LIBPATH=[path_asio]) - # portaudio = False sep = "" if 'msvc' in pdenv['TOOLS']: --- 141,144 ---- *************** *** 271,284 **** # # portaudio stuff ! pa_common_sources = map(lambda x: '../portaudio/pa_common/' + x, ! Split("""pa_allocation.c ! pa_converters.c ! pa_cpuload.c ! pa_dither.c ! pa_front.c ! pa_process.c ! pa_skeleton.c ! pa_stream.c ! pa_trace.c""")) --- 283,302 ---- # # portaudio stuff ! ! papath = pdenv['portaudiopath'] ! ! pa_common_sources = map(lambda x: papath+'/pa_common/' + x, ! Split(""" ! pa_allocation.c ! pa_converters.c ! pa_cpuload.c ! pa_dither.c ! pa_front.c ! pa_process.c ! pa_skeleton.c ! pa_stream.c ! pa_trace.c ! """) ! ) *************** *** 289,307 **** if pdenv['PLATFORM'] == 'win32': ! pdenv.Append(CPPDEFINES=["MSW","NT","USEAPI_MMIO"]) # this is needed for ASIO pdenv.Append(CPPDEFINES="WIN32") ! # # these are additional ones from the original makefile - we shouldn't really need them, but need to make sure ! # pdenv.Append(CPPDEFINES=["_CONSOLE","WINDOWS","__i386__","_WINDOWS"]) pdenv.Append(LIBS=Split("user32 ole32 winmm wsock32 advapi32")) ! sources += Split("s_audio_mmio.c s_midi_mmio.c") ! if pdenv['asio']: # enable native ASIO support - sources += ["s_audio_asio.cpp"] - sources += [path_asio+"/common/asio.cpp",path_asio+"/host/asiodrivers.cpp",path_asio+"/host/pc/asiolist.cpp"] pdenv.Append(CPPDEFINES="USEAPI_ASIO") pdenv.Append(LIBS="asiolib") --- 307,355 ---- if pdenv['PLATFORM'] == 'win32': ! pdenv.Append(CPPDEFINES=["MSW","NT"]) # this is needed for ASIO pdenv.Append(CPPDEFINES="WIN32") ! ! # # these are additional ones from the original makefile - we shouldn't really need them ! # pdenv.Append(CPPDEFINES=["WINDOWS","__i386__","_WINDOWS"]) ! ! # in debug mode, make it a console application, in release a native Windows one ! if pdenv['debug']: ! pdenv.Append(CPPDEFINES="_CONSOLE") pdenv.Append(LIBS=Split("user32 ole32 winmm wsock32 advapi32")) ! sources += Split("s_midi_mmio.c") ! # PD wants to have MMIO in any case ! pdenv.Append(CPPDEFINES="USEAPI_MMIO") ! sources += Split("s_audio_mmio.c") ! ! if pdenv['portaudio']: ! pdenv.Append(CPPDEFINES="USEAPI_PORTAUDIO") ! sources += pa_sources+pa_common_sources ! sources += map(lambda x: papath+x, ! Split(""" ! /pa_asio/pa_asio.cpp ! /pa_win/pa_win_hostapis.c ! /pa_win/pa_win_util.c ! /pa_win/pa_x86_plain_converters.c ! /pa_win_ds/pa_win_ds.c ! /pa_win_ds/dsound_wrapper.c ! /pa_win_wmme/pa_win_wmme.c ! """) ! ) ! ! if pdenv['asio'] or pdenv['portaudio']: # enable native ASIO support pdenv.Append(CPPDEFINES="USEAPI_ASIO") + sources += ["s_audio_asio.cpp"] + sources += map(lambda x: path_asio+x, + Split(""" + /common/asio.cpp + /host/asiodrivers.cpp + /host/pc/asiolist.cpp + """) + ) pdenv.Append(LIBS="asiolib") *************** *** 311,315 **** sources += simd_sse_gcc_sources ! pdenv['pdlib'] = True ## split pd to pd.exe and pd.dll ###################################################################### --- 359,364 ---- sources += simd_sse_gcc_sources ! # split pd to pd.exe and pd.dll ! pdenv['pdlib'] = True ###################################################################### *************** *** 319,330 **** jack_sources = Split("s_audio_jack.c") ! alsa_sources = Split("""s_audio_alsamm.c ! s_audio_alsa.c""") oss_sources = Split("s_audio_oss.c") ! pa_linux_sources = Split("""../portaudio/pa_unix/pa_unix_util.c ! ../portaudio/pa_unix/pa_unix_hostapis.c ! ../portaudio/pa_unix_oss/pa_unix_oss.c""") ! linux_defs = Split("UNISTD UNIX USEAPI_OSS PA_LITTLE_ENDIAN PA_USE_OSS") linux_defs.append('INSTALL_PREFIX=\\\"%s\\\"' % pdenv['prefix']) --- 368,381 ---- jack_sources = Split("s_audio_jack.c") ! alsa_sources = Split("s_audio_alsamm.c s_audio_alsa.c") oss_sources = Split("s_audio_oss.c") ! pa_linux_sources = map(lambda x: papath+x, ! Split(""" ! /pa_unix/pa_unix_util.c ! /pa_unix/pa_unix_hostapis.c ! /pa_unix_oss/pa_unix_oss.c ! """) ! ) linux_defs = Split("UNISTD UNIX USEAPI_OSS PA_LITTLE_ENDIAN PA_USE_OSS") linux_defs.append('INSTALL_PREFIX=\\\"%s\\\"' % pdenv['prefix']) *************** *** 341,345 **** if alsa: linux_sources.append(alsa_sources) ! linux_sources.append('../portaudio/pa_linux_alsa/pa_linux_alsa.c') linux_defs.append("USEAPI_ALSA") linux_defs.append("PA_USE_ALSA") --- 392,396 ---- if alsa: linux_sources.append(alsa_sources) ! linux_sources.append(papath+'/pa_linux_alsa/pa_linux_alsa.c') linux_defs.append("USEAPI_ALSA") linux_defs.append("PA_USE_ALSA") *************** *** 363,377 **** if pdenv['PLATFORM'] == 'darwin': ! pm_osx_sources = Split("""../portmidi_osx/pmdarwin.c ! ../portmidi_osx/pmmacosx.c ! ../portmidi_osx/pmutil.c ! ../portmidi_osx/portmidi.c ! ../portmidi_osx/ptdarwin.c""") ! ! pa_osx_sources = (Split("""../portaudio/pa_mac_core/pa_mac_core.c ! ../portaudio/pa_mac/pa_mac_hostapis.c ! ../portaudio/pa_unix/pa_unix_util.c""")) ! osx_sources = pa_sources + pa_common_sources + pa_osx_sources + pm_sources + pm_osx_sources + simd_ve_gcc_sources --- 414,435 ---- if pdenv['PLATFORM'] == 'darwin': ! pmpath = pdenv['portmidipath'] + pm_osx_sources = map(lambda x: pmpath+x, + Split(""" + /pmdarwin.c + /pmmacosx.c + /pmutil.c + /portmidi.c + /ptdarwin.c + """) + ) + pa_osx_sources = map(lambda x: papath+x, + Split(""" + /pa_mac_core/pa_mac_core.c + /pa_mac/pa_mac_hostapis.c + /pa_unix/pa_unix_util.c + """) + ) osx_sources = pa_sources + pa_common_sources + pa_osx_sources + pm_sources + pm_osx_sources + simd_ve_gcc_sources *************** *** 379,383 **** sources.append(osx_sources) ! pdenv.Append(CPPPATH='../portmidi_osx/') pdenv.Append(CPPDEFINES=osx_defs) --- 437,441 ---- sources.append(osx_sources) ! pdenv.Append(CPPPATH=pmpath) pdenv.Append(CPPDEFINES=osx_defs) *************** *** 402,406 **** if pdenv['portaudio']: pdenv.Append(CPPDEFINES=Split("USEAPI_PORTAUDIO PA19")) ! pdenv.Append(CPPPATH=Split("../portaudio/pa_common ../portaudio/pablio")) --- 460,464 ---- if pdenv['portaudio']: pdenv.Append(CPPDEFINES=Split("USEAPI_PORTAUDIO PA19")) ! pdenv.Append(CPPPATH=[papath+'/pa_common',papath+'/pablio']) *************** *** 426,430 **** cflags += ' /Od /Zi' ! lflags += ' /DEBUG' else: flags += " -g" --- 484,488 ---- cflags += ' /Od /Zi' ! lflags += ' /DEBUG /INCREMENTAL:NO' else: flags += " -g"

1 0

pd/src s_entry.c,1.2.4.2.2.1,1.2.4.2.2.2
by Thomas Grill 08 Oct '05

08 Oct '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10957/src Modified Files: Tag: devel_0_39 s_entry.c Log Message: more Windows-like #defines Index: s_entry.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_entry.c,v retrieving revision 1.2.4.2.2.1 retrieving revision 1.2.4.2.2.2 diff -C2 -d -r1.2.4.2.2.1 -r1.2.4.2.2.2 *** s_entry.c 16 Jul 2005 21:18:33 -0000 1.2.4.2.2.1 --- s_entry.c 8 Oct 2005 09:38:46 -0000 1.2.4.2.2.2 *************** *** 4,8 **** int sys_main(int argc, char **argv); ! #if defined(MSW) && !defined (__GNUC__) #include <windows.h> #include <stdio.h> --- 4,8 ---- int sys_main(int argc, char **argv); ! #if defined(_WIN32) && !defined(_CONSOLE) #include <windows.h> #include <stdio.h>

1 0

pd/src s_audio_asio.cpp,1.1.4.26.2.3,1.1.4.26.2.4
by Thomas Grill 08 Oct '05

08 Oct '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10860/src Modified Files: Tag: devel_0_39 s_audio_asio.cpp Log Message: prevent debug version from bailing out on external syncing Index: s_audio_asio.cpp =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/s_audio_asio.cpp,v retrieving revision 1.1.4.26.2.3 retrieving revision 1.1.4.26.2.4 diff -C2 -d -r1.1.4.26.2.3 -r1.1.4.26.2.4 *** s_audio_asio.cpp 13 Jul 2005 22:49:39 -0000 1.1.4.26.2.3 --- s_audio_asio.cpp 8 Oct 2005 09:38:12 -0000 1.1.4.26.2.4 *************** *** 199,203 **** asio_srate=(ASIOSampleRate)srate; #else ! sprintf(asio_srate,"%d",srate); #endif --- 199,203 ---- asio_srate=(ASIOSampleRate)srate; #else ! sprintf(asio_srate,"%8d",srate); #endif *************** *** 301,305 **** ! /* set sample rate */ if(ASIOCanSampleRate( asio_srate ) != ASE_OK) { --- 301,305 ---- ! /* try to set sample rate */ if(ASIOCanSampleRate( asio_srate ) != ASE_OK) { *************** *** 308,312 **** asio_srate = (ASIOSampleRate)44100.0; #else ! sprintf(&asio_srate,"%d",44100); #endif srate=44100; --- 308,312 ---- asio_srate = (ASIOSampleRate)44100.0; #else ! sprintf(&asio_srate,"%8d",44100); #endif srate=44100; *************** *** 314,320 **** status = ASIOSetSampleRate( asio_srate ); ! ASSERT(status == ASE_OK); ! post ("ASIOSetSampleRate\t %d", srate); ! if(ASIOOutputReady() == ASE_OK) asio_useoutputready = 1; --- 314,324 ---- status = ASIOSetSampleRate( asio_srate ); ! if(status != ASE_OK) ! #ifdef IEEE754_64FLOAT ! post("Setting ASIO sample rate to %lg failed... is the device in slave sync mode?", (double)asio_srate); ! #else ! post("Setting ASIO sample rate to %s failed... is the device in slave sync mode?", asio_srate); ! #endif ! if(ASIOOutputReady() == ASE_OK) asio_useoutputready = 1;

1 0

pd/src s_inter.c,1.5.4.10.2.8,1.5.4.10.2.9
by Thomas Grill 08 Oct '05

08 Oct '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23787/src Modified Files: Tag: devel_0_39 s_inter.c Log Message: Windows: also try wish application in system path, if not found in pd distro Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.5.4.10.2.8 retrieving revision 1.5.4.10.2.9 diff -C2 -d -r1.5.4.10.2.8 -r1.5.4.10.2.9 *** s_inter.c 11 Sep 2005 12:01:48 -0000 1.5.4.10.2.8 --- s_inter.c 8 Oct 2005 07:56:54 -0000 1.5.4.10.2.9 *************** *** 1159,1174 **** sprintf(portbuf, "%d", portno); strcpy(wishbuf, sys_libdir->s_name); strcat(wishbuf, "/" PDBINDIR WISHAPP); sys_bashfilename(wishbuf, wishbuf); spawnret = _spawnl(P_NOWAIT, wishbuf, WISHAPP, scriptbuf, portbuf, 0); ! if (spawnret < 0) ! { ! perror("spawnl"); ! fprintf(stderr, "%s: couldn't load TCL\n", wishbuf); ! exit(1); ! } #endif /* MSW */ } --- 1159,1180 ---- sprintf(portbuf, "%d", portno); + /* try WISHAPP in PD path */ strcpy(wishbuf, sys_libdir->s_name); strcat(wishbuf, "/" PDBINDIR WISHAPP); + strcat(wishbuf,WISHAPP); sys_bashfilename(wishbuf, wishbuf); spawnret = _spawnl(P_NOWAIT, wishbuf, WISHAPP, scriptbuf, portbuf, 0); ! if(spawnret >= 0) goto ok; + /* try WISHAPP in system path */ + spawnret = _spawnlp(P_NOWAIT, WISHAPP, WISHAPP, scriptbuf, portbuf, 0); + if(spawnret >= 0) goto ok; + + perror("spawnl"); + fprintf(stderr, "%s: couldn't load TCL\n", wishbuf); + exit(1); + ok: + ; #endif /* MSW */ }

1 0

pd/src SConscript,1.1.4.30,1.1.4.31
by Thomas Grill 08 Oct '05

08 Oct '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13026/src Modified Files: Tag: devel_0_39 SConscript Log Message: more changes... seems to compile ok under Windows now Index: SConscript =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/SConscript,v retrieving revision 1.1.4.30 retrieving revision 1.1.4.31 diff -C2 -d -r1.1.4.30 -r1.1.4.31 *** SConscript 5 Oct 2005 14:49:12 -0000 1.1.4.30 --- SConscript 7 Oct 2005 22:15:11 -0000 1.1.4.31 *************** *** 73,77 **** ! defs = [] --- 73,77 ---- ! defs = ['PD'] *************** *** 95,113 **** # determine pthread and tcl/tk lib layout if pdenv['PLATFORM'] == 'win32': ! if pdenv['pthreadspath']: path_pthread = pdenv['pthreadspath'] ! else: print "Please enter path to pthread library" Exit(1) ! if pdenv['tclpath']: path_tcl = pdenv['tclpath'] ! else: print "Please enter path to tcl" Exit(1) ! if pdenv['asiopath']: path_asio = pdenv['asiopath'] ! else: print "Please enter path to ASIO SDK" Exit(1) --- 95,122 ---- # determine pthread and tcl/tk lib layout if pdenv['PLATFORM'] == 'win32': ! path_pthread = None ! try: path_pthread = pdenv['pthreadspath'] ! except: ! pass ! if not path_pthread: print "Please enter path to pthread library" Exit(1) ! path_tcl = None ! try: path_tcl = pdenv['tclpath'] ! except: ! pass ! if not path_tcl: print "Please enter path to tcl" Exit(1) ! path_asio = None ! try: path_asio = pdenv['asiopath'] ! except: ! pass ! if not path_asio: print "Please enter path to ASIO SDK" Exit(1) *************** *** 116,120 **** pdenv.Append(LIBPATH=[path_pthread,path_tcl+'/lib']) ! pdenv.Append(CPPPATH=[path_asio+'/common',path_asio+'/host',path_asio+'/pc']) pdenv.Append(LIBPATH=[path_asio]) --- 125,129 ---- pdenv.Append(LIBPATH=[path_pthread,path_tcl+'/lib']) ! pdenv.Append(CPPPATH=[path_asio+'/common',path_asio+'/host',path_asio+'/host/pc']) pdenv.Append(LIBPATH=[path_asio]) *************** *** 256,260 **** pdenv.Append(CPPPATH=".") ! pdenv.Append(LIBPATH=".") --- 265,269 ---- pdenv.Append(CPPPATH=".") ! #pdenv.Append(LIBPATH=".") # really? *************** *** 280,285 **** if pdenv['PLATFORM'] == 'win32': ! pdenv.Append(CPPDEFINES=["MSW","NT"]) ! pdenv.Append(LIBS=Split("ole32 winmm wsock32 advapi32")) sources += Split("s_audio_mmio.c s_midi_mmio.c") --- 289,299 ---- if pdenv['PLATFORM'] == 'win32': ! pdenv.Append(CPPDEFINES=["MSW","NT","USEAPI_MMIO"]) ! # this is needed for ASIO ! pdenv.Append(CPPDEFINES="WIN32") ! # # these are additional ones from the original makefile - we shouldn't really need them, but need to make sure ! # pdenv.Append(CPPDEFINES=["_CONSOLE","WINDOWS","__i386__","_WINDOWS"]) ! ! pdenv.Append(LIBS=Split("user32 ole32 winmm wsock32 advapi32")) sources += Split("s_audio_mmio.c s_midi_mmio.c") *************** *** 287,291 **** if pdenv['asio']: # enable native ASIO support ! sources += Split("s_audio_asio.cpp asio.cpp asiodrivers.cpp asiolist.cpp") pdenv.Append(CPPDEFINES="USEAPI_ASIO") pdenv.Append(LIBS="asiolib") --- 301,306 ---- if pdenv['asio']: # enable native ASIO support ! sources += ["s_audio_asio.cpp"] ! sources += [path_asio+"/common/asio.cpp",path_asio+"/host/asiodrivers.cpp",path_asio+"/host/pc/asiolist.cpp"] pdenv.Append(CPPDEFINES="USEAPI_ASIO") pdenv.Append(LIBS="asiolib") *************** *** 398,402 **** lflags = '' - #lflags += " /SUBSYSTEM:CONSOLE" if pdenv['wall']: --- 413,416 ---- *************** *** 451,455 **** if pdenv['PLATFORM'] == 'win32': ! if not 'msvc' in pdenv['TOOLS']: flags += " -mms-bitfields" ## binary compatibility with msvc --- 465,471 ---- if pdenv['PLATFORM'] == 'win32': ! if 'msvc' in pdenv['TOOLS']: ! cflags += " /EHsc" ## we need that for ASIO C++, won't hurt for pure C ! else: flags += " -mms-bitfields" ## binary compatibility with msvc *************** *** 518,522 **** LINKFLAGS='-framework Tcl -framework Tk') if pdenv['PLATFORM']=='win32': ! pdgui = pdenv.SharedLibrary('../bin/pdtcl', Split("t_main.c t_tkcmd.c")) --- 534,540 ---- LINKFLAGS='-framework Tcl -framework Tk') if pdenv['PLATFORM']=='win32': ! envtcl = pdenv.Copy() ! envtcl.Append(LINKFLAGS=["/EXPORT:Pdtcl_Init"]) ! pdgui = envtcl.SharedLibrary('../bin/pdtcl', Split("t_main.c t_tkcmd.c"))

1 0

pd/extra SConscript,1.1.2.3,1.1.2.4
by Thomas Grill 08 Oct '05

08 Oct '05

Update of /cvsroot/pure-data/pd/extra In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11427/extra Modified Files: Tag: devel_0_39 SConscript Log Message: NT must be defined in main SConscript anyway Index: SConscript =================================================================== RCS file: /cvsroot/pure-data/pd/extra/Attic/SConscript,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** SConscript 4 Aug 2005 11:00:02 -0000 1.1.2.3 --- SConscript 7 Oct 2005 22:11:37 -0000 1.1.2.4 *************** *** 6,10 **** if extra_env['PLATFORM'] == 'win32': - extra_env.Append(CPPDEFINES=Split("NT")) extra_env['SHLIBSUFFIX']='.dll' elif extra_env['PLATFORM'] == 'darwin': --- 6,9 ----

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
48
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 October 2005