This commit was generated by cvs2svn to compensate for changes in r186,

which included commits to RCS files with non-trunk default branches.

svn path=/trunk/; revision=187

3 files changed, 175 insertions, 0 deletions

diff --git a/externals/grill/flext/tutorial/simple2/main.cpp b/externals/grill/flext/tutorial/simple2/main.cpp
new file mode 100755
index 00000000..306a953b
--- /dev/null
+++ b/externals/grill/flext/tutorial/simple2/main.cpp
@@ -0,0 +1,80 @@
+/* 
+flext tutorial - simple 2
+
+Copyright (c) 2002 Thomas Grill (xovo@gmx.net)
+For information on usage and redistribution, and for a DISCLAIMER OF ALL
+WARRANTIES, see the file, "license.txt," in this distribution.  
+
+-------------------------------------------------------------------------
+
+This is an example of a simple object doing a float addition
+*/
+
+// include flext header
+#include <flext.h>
+
+// check for appropriate flext version
+#if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 300)
+#error You need at least flext version 0.3.0
+#endif
+
+
+class simple2:
+	public flext_base
+{
+	FLEXT_HEADER(simple2,flext_base)
+ 
+public:
+	// constructor with float argument
+	simple2(float init);
+
+protected:
+	void m_float1(float f);   
+	void m_float2(float f);   
+	
+	// stored argument of right inlet
+	float arg; 
+
+private:
+	// FLEXT_CALLBACK_F(...) is a shortcut for FLEXT_CALLBACK_1(...,float) 
+	FLEXT_CALLBACK_F(m_float1);  // callback for method "m_float1" (with one float argument)
+	FLEXT_CALLBACK_F(m_float2);  // callback for method "m_float2" (with one float argument)
+};
+
+// instantiate the class (constructor has one float argument)
+FLEXT_NEW_1("simple2",simple2,float)
+
+
+simple2::simple2(float init):
+	arg(init)  // store argument
+{ 
+	// define inlets
+	AddInAnything();  // first inlet of type anything (index 0)
+	AddInFloat();     // additional float inlet (index 1)
+	
+	// define outlets
+	AddOutFloat();  // one float outlet (has index 0)
+	
+	 // set up inlets and outlets - obligatory! 
+	SetupInOut(); 
+
+	// register methods
+	FLEXT_ADDMETHOD(0,m_float1);  // register method (for floats) "m_float1" for inlet 0
+	FLEXT_ADDMETHOD(1,m_float2);  // register method (for floats) "m_float2" for inlet 1
+} 
+
+void simple2::m_float1(float f)
+{
+	float res;
+	res = arg+f;
+	
+	// output value to outlet
+	ToOutFloat(0,res); // (0 stands for the outlet index 0)
+}
+
+void simple2::m_float2(float f)
+{
+	// store float
+	arg = f;
+}
+
diff --git a/externals/grill/flext/tutorial/simple2/simple2.cw b/externals/grill/flext/tutorial/simple2/simple2.cw
new file mode 100755
index 00000000..1bc9379f
--- /dev/null
+++ b/externals/grill/flext/tutorial/simple2/simple2.cw
diff --git a/externals/grill/flext/tutorial/simple2/simple2.dsp b/externals/grill/flext/tutorial/simple2/simple2.dsp
new file mode 100644
index 00000000..22b75a5e
--- /dev/null
+++ b/externals/grill/flext/tutorial/simple2/simple2.dsp
@@ -0,0 +1,95 @@
+# Microsoft Developer Studio Project File - Name="simple2" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** NICHT BEARBEITEN **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=simple2 - 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 
+!MESSAGE NMAKE /f "simple2.mak".
+!MESSAGE 
+!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 "simple2.mak" CFG="simple2 - Win32 Debug"
+!MESSAGE 
+!MESSAGE Für die Konfiguration stehen zur Auswahl:
+!MESSAGE 
+!MESSAGE "simple2 - Win32 Release" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "simple2 - Win32 Debug" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName "simple2"
+# PROP Scc_LocalPath "."
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "simple2 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "msvc"
+# PROP Intermediate_Dir "msvc"
+# 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" /YX /FD /c
+# ADD CPP /nologo /W3 /GR- /GX- /O2 /I "..\..\source" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NT" /D "PD" /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"
+# ADD RSC /l 0xc07 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib /nologo /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib pd.lib flext-pdwin.lib /nologo /dll /machine:I386 /out:"../msvc/simple2.dll" /libpath:"..\..\pd-msvc"
+
+!ELSEIF  "$(CFG)" == "simple2 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "msvc-debug"
+# PROP Intermediate_Dir "msvc-debug"
+# 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" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GR- /GX- /ZI /Od /I "..\..\source" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NT" /D "PD" /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"
+# ADD RSC /l 0xc07 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib pd.lib flext_d-pdwin.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\pd-msvc"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "simple2 - Win32 Release"
+# Name "simple2 - Win32 Debug"
+# Begin Source File
+
+SOURCE=.\main.cpp
+# End Source File
+# End Target
+# End Project