From 60ee6bb60b11bbfbccf56f335c9c6213e6daa79d Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Thu, 5 Dec 2002 05:36:32 +0000 Subject: "" svn path=/trunk/; revision=278 --- externals/grill/xsample/readme.txt | 2 +- externals/grill/xsample/source/groove.cpp | 12 ++++++------ externals/grill/xsample/source/main.cpp | 8 ++++---- externals/grill/xsample/source/main.h | 6 +++--- externals/grill/xsample/source/play.cpp | 12 ++++++------ externals/grill/xsample/source/record.cpp | 12 ++++++------ externals/grill/xsample/source/xsample.dsp | 12 ++++++------ 7 files changed, 32 insertions(+), 32 deletions(-) (limited to 'externals/grill/xsample') diff --git a/externals/grill/xsample/readme.txt b/externals/grill/xsample/readme.txt index cf678085..74095a30 100644 --- a/externals/grill/xsample/readme.txt +++ b/externals/grill/xsample/readme.txt @@ -76,7 +76,7 @@ Version history: - xgroove~, xrecord~: introduced a loop/end bang outlet - added MaxMSP buffer resize recognition - xgroove~: introduced a crossfading loop zone -- adapted source for flext 0.4.0 +- adapted source for flext 0.4.1 0.2.4: - according to flext 0.2.3 changed sample type to t_sample (S) diff --git a/externals/grill/xsample/source/groove.cpp b/externals/grill/xsample/source/groove.cpp index e5a0eaf5..b4748a6f 100644 --- a/externals/grill/xsample/source/groove.cpp +++ b/externals/grill/xsample/source/groove.cpp @@ -31,7 +31,7 @@ public: virtual BL Init(); -#ifdef MAXMSP +#if FLEXT_SYS == FLEXT_SYS_MAX virtual V m_assist(L msg,L arg,C *s); #endif @@ -139,7 +139,7 @@ xgroove::xgroove(I argc,const t_atom *argv): bidir(1) { I argi = 0; -#ifdef MAXMSP +#if FLEXT_SYS == FLEXT_SYS_MAX if(argc > argi && CanbeInt(argv[argi])) { outchns = GetAInt(argv[argi]); argi++; @@ -150,7 +150,7 @@ xgroove::xgroove(I argc,const t_atom *argv): buf = new buffer(GetSymbol(argv[argi]),true); argi++; -#ifdef MAXMSP +#if FLEXT_SYS == FLEXT_SYS_MAX // oldstyle command line? if(argi == 1 && argc == 2 && CanbeInt(argv[argi])) { outchns = GetAInt(argv[argi]); @@ -621,11 +621,11 @@ V xgroove::s_dsp() V xgroove::m_help() { post("%s - part of xsample objects, version " XSAMPLE_VERSION,thisName()); -#ifdef _DEBUG +#ifdef FLEXT_DEBUG post("compiled on " __DATE__ " " __TIME__); #endif post("(C) Thomas Grill, 2001-2002"); -#ifdef MAXMSP +#if FLEXT_SYS == FLEXT_SYS_MAX post("Arguments: %s [channels=1] [buffer]",thisName()); #else post("Arguments: %s [buffer]",thisName()); @@ -671,7 +671,7 @@ V xgroove::m_print() post(""); } -#ifdef MAXMSP +#if FLEXT_SYS == FLEXT_SYS_MAX V xgroove::m_assist(long msg, long arg, char *s) { switch(msg) { diff --git a/externals/grill/xsample/source/main.cpp b/externals/grill/xsample/source/main.cpp index 85fea90d..30aad069 100644 --- a/externals/grill/xsample/source/main.cpp +++ b/externals/grill/xsample/source/main.cpp @@ -23,7 +23,7 @@ V lib_setup() FLEXT_DSP_SETUP(xplay); FLEXT_DSP_SETUP(xgroove); -#ifdef MAXMSP +#if FLEXT_SYS == FLEXT_SYS_MAX finder_addclass((C *)"MSP Sampling",(C *)"xgroove~"); finder_addclass((C *)"MSP Sampling",(C *)"xplay~"); finder_addclass((C *)"MSP Sampling",(C *)"xrecord~"); @@ -38,10 +38,10 @@ FLEXT_LIB_SETUP(xsample,lib_setup) xsample::xsample(): buf(NULL), -#ifdef PD - unitmode(xsu_sample), // PD defaults to samples -#else +#if FLEXT_SYS == FLEXT_SYS_MAX unitmode(xsu_ms), // Max/MSP defaults to milliseconds +#else + unitmode(xsu_sample), // PD defaults to samples #endif sclmode(xss_unitsinbuf), curmin(0),curmax(1<<30) diff --git a/externals/grill/xsample/source/main.h b/externals/grill/xsample/source/main.h index 5467bc1d..c50f8dd6 100644 --- a/externals/grill/xsample/source/main.h +++ b/externals/grill/xsample/source/main.h @@ -16,8 +16,8 @@ WARRANTIES, see the file, "license.txt," in this distribution. #include -#if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 400) -#error You need at least flext version 0.4.0 +#if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 401) +#error You need at least flext version 0.4.1 #endif @@ -217,7 +217,7 @@ private: const I IOCHNS = _IOCHNS_ < 0?MIN(iochns,BCHNS):MIN(_IOCHNS_,BCHNS) #else // no template optimization - #ifdef PD // only mono buffers + #if FLEXT_SYS == FLEXT_SYS_PD // only mono buffers #define SIGCHNS(BCHNS,bchns,IOCHNS,iochns) \ const I BCHNS = 1; \ const I IOCHNS = MIN(iochns,BCHNS) diff --git a/externals/grill/xsample/source/play.cpp b/externals/grill/xsample/source/play.cpp index 6a84548f..3b934ecb 100644 --- a/externals/grill/xsample/source/play.cpp +++ b/externals/grill/xsample/source/play.cpp @@ -26,7 +26,7 @@ public: virtual BL Init(); -#ifdef MAXMSP +#if FLEXT_SYS == FLEXT_SYS_MAX virtual V m_assist(L msg,L arg,C *s); #endif @@ -57,7 +57,7 @@ V xplay::setup(t_class *) xplay::xplay(I argc,const t_atom *argv) { I argi = 0; -#ifdef MAXMSP +#if FLEXT_SYS == FLEXT_SYS_MAX if(argc > argi && CanbeInt(argv[argi])) { outchns = GetAInt(argv[argi]); argi++; @@ -68,7 +68,7 @@ xplay::xplay(I argc,const t_atom *argv) buf = new buffer(GetSymbol(argv[argi]),true); argi++; -#ifdef MAXMSP +#if FLEXT_SYS == FLEXT_SYS_MAX // oldstyle command line? if(argi == 1 && argc == 2 && CanbeInt(argv[argi])) { outchns = GetAInt(argv[argi]); @@ -101,11 +101,11 @@ BL xplay::Init() V xplay::m_help() { post("%s - part of xsample objects, version " XSAMPLE_VERSION,thisName()); -#ifdef _DEBUG +#ifdef FLEXT_DEBUG post("compiled on " __DATE__ " " __TIME__); #endif post("(C) Thomas Grill, 2001-2002"); -#ifdef MAXMSP +#if FLEXT_SYS == FLEXT_SYS_MAX post("Arguments: %s [channels=1] [buffer]",thisName()); #else post("Arguments: %s [buffer]",thisName()); @@ -137,7 +137,7 @@ V xplay::m_print() } -#ifdef MAXMSP +#if FLEXT_SYS == FLEXT_SYS_MAX V xplay::m_assist(L msg,L arg,C *s) { switch(msg) { diff --git a/externals/grill/xsample/source/record.cpp b/externals/grill/xsample/source/record.cpp index 869ca3d2..052bcc06 100644 --- a/externals/grill/xsample/source/record.cpp +++ b/externals/grill/xsample/source/record.cpp @@ -26,7 +26,7 @@ public: virtual BL Init(); -#ifdef MAXMSP +#if FLEXT_SYS == FLEXT_SYS_MAX virtual V m_assist(L msg,L arg,C *s); #endif @@ -113,7 +113,7 @@ xrecord::xrecord(I argc,const t_atom *argv): inchns(1) { I argi = 0; -#ifdef MAXMSP +#if FLEXT_SYS == FLEXT_SYS_MAX if(argc > argi && CanbeInt(argv[argi])) { inchns = GetAInt(argv[argi]); argi++; @@ -124,7 +124,7 @@ xrecord::xrecord(I argc,const t_atom *argv): buf = new buffer(GetSymbol(argv[argi]),true); argi++; -#ifdef MAXMSP +#if FLEXT_SYS == FLEXT_SYS_MAX // oldstyle command line? if(argi == 1 && argc == 2 && CanbeInt(argv[argi])) { inchns = GetAInt(argv[argi]); @@ -418,11 +418,11 @@ V xrecord::s_dsp() V xrecord::m_help() { post("%s - part of xsample objects, version " XSAMPLE_VERSION,thisName()); -#ifdef _DEBUG +#ifdef FLEXT_DEBUG post("compiled on " __DATE__ " " __TIME__); #endif post("(C) Thomas Grill, 2001-2002"); -#ifdef MAXMSP +#if FLEXT_SYS == FLEXT_SYS_MAX post("Arguments: %s [channels=1] [buffer]",thisName()); #else post("Arguments: %s [buffer]",thisName()); @@ -465,7 +465,7 @@ V xrecord::m_print() } -#ifdef MAXMSP +#if FLEXT_SYS == FLEXT_SYS_MAX V xrecord::m_assist(L msg,L arg,C *s) { switch(msg) { diff --git a/externals/grill/xsample/source/xsample.dsp b/externals/grill/xsample/source/xsample.dsp index 161c0264..838d709d 100644 --- a/externals/grill/xsample/source/xsample.dsp +++ b/externals/grill/xsample/source/xsample.dsp @@ -5,17 +5,17 @@ # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 CFG=xsample - Win32 Debug -!MESSAGE Dies ist kein gŸltiges Makefile. Zum Erstellen dieses Projekts mit NMAKE -!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und fŸhren Sie den Befehl +!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE +!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl !MESSAGE !MESSAGE NMAKE /f "xsample.mak". !MESSAGE -!MESSAGE Sie kšnnen beim AusfŸhren von NMAKE eine Konfiguration angeben +!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben !MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: !MESSAGE !MESSAGE NMAKE /f "xsample.mak" CFG="xsample - Win32 Debug" !MESSAGE -!MESSAGE FŸr die Konfiguration stehen zur Auswahl: +!MESSAGE Für die Konfiguration stehen zur Auswahl: !MESSAGE !MESSAGE "xsample - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library") !MESSAGE "xsample - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library") @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XSAMPLE_EXPORTS" /YX /FD /c -# ADD CPP /nologo /G6 /W3 /O2 /I "c:\programme\audio\pd\src" /I "f:\prog\max\flext\source" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NT" /D "PD" /YX /FD /c +# ADD CPP /nologo /G6 /W3 /O2 /I "c:\programme\audio\pd\src" /I "f:\prog\max\flext\source" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D FLEXT_SYS=2 /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0xc07 /d "NDEBUG" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XSAMPLE_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /G6 /W3 /Gm /ZI /Od /I "c:\programme\audio\pd\src" /I "f:\prog\max\flext\source" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NT" /D "PD" /FR /YX /FD /GZ /c +# ADD CPP /nologo /G6 /W3 /Gm /ZI /Od /I "c:\programme\audio\pd\src" /I "f:\prog\max\flext\source" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D FLEXT_SYS=2 /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0xc07 /d "_DEBUG" -- cgit v1.2.1