On Monday 03 February 2003 12:22, Austin Acton wrote:
> On Mon, 2003-02-03 at 13:09, Austin Acton wrote:
> > The error I was referring to though, is a gcc3.2 problem.
> > Maybe you (or someone else) can figure it out?
>
> To clarify, the problem I quoted earlier is in SpiralLoops, not
> spiralsynth or ssmodular.
>
> Austin
Ok, I have attached a patch suggestion for SpiralLoops
Apply as:
tar zxf SpiralLoops-2.0.0.tar.gz
patch -p0 < patch1.p
I took the liberty of reinterpreting the command:
down(box())
in Fl_LED_Button::draw()
as being a typo for
down_box()
so maybe knowledgeable people should test the application and make sure that
the LED buttons look correct :-)
Narfi.
ps. I can compile and run the application on 9.0, can't try on cooker right
now.
diff -ru SpiralLoops-2.0.0/GUI/LoopGUI.C SpiralLoops-2.0.0.modified/GUI/LoopGUI.C
--- SpiralLoops-2.0.0/GUI/LoopGUI.C 2001-04-19 15:48:10.000000000 -0500
+++ SpiralLoops-2.0.0.modified/GUI/LoopGUI.C 2003-02-03 12:56:07.000000000 -0600
@@ -23,6 +23,8 @@
#include "../Loop.h"
#include <FL/fl_file_chooser.h>
+using namespace std;
+
static const int EFFECT_ADDITION = 130;
/////////////////////////////////////////////////////////////////////////////
diff -ru SpiralLoops-2.0.0/GUI/LoopGUI.h SpiralLoops-2.0.0.modified/GUI/LoopGUI.h
--- SpiralLoops-2.0.0/GUI/LoopGUI.h 2001-04-19 15:48:10.000000000 -0500
+++ SpiralLoops-2.0.0.modified/GUI/LoopGUI.h 2003-02-03 12:58:17.000000000 -0600
@@ -37,6 +37,8 @@
#include "../SpiralSound/Reverb.h"
#include <vector>
+using namespace std;
+
#ifndef LOOPGUI
#define LOOPGUI
diff -ru SpiralLoops-2.0.0/GUI/MixerGUI.C SpiralLoops-2.0.0.modified/GUI/MixerGUI.C
--- SpiralLoops-2.0.0/GUI/MixerGUI.C 2001-04-19 15:48:10.000000000 -0500
+++ SpiralLoops-2.0.0.modified/GUI/MixerGUI.C 2003-02-03 13:00:42.000000000 -0600
@@ -24,7 +24,7 @@
if (!m_mix) cerr<<"WARNING: Mixer not correctly set up"<<endl;
}
-void MixerGUI::CreateGUI(int xoff=0, int yoff=0, char *name)
+void MixerGUI::CreateGUI(int xoff, int yoff, char *name)
{
Fl_Group* o = GUIMixGroup = new Fl_Group(xoff, yoff, 100, 110, name);
o->type(1);
diff -ru SpiralLoops-2.0.0/GUI/OutputGUI.C SpiralLoops-2.0.0.modified/GUI/OutputGUI.C
--- SpiralLoops-2.0.0/GUI/OutputGUI.C 2001-04-19 15:48:10.000000000 -0500
+++ SpiralLoops-2.0.0.modified/GUI/OutputGUI.C 2003-02-03 13:00:42.000000000 -0600
@@ -26,7 +26,7 @@
if (!m_out) cerr<<"WARNING: Output not correctly set up"<<endl;
}
-void OutputGUI::CreateGUI(int xoff=0, int yoff=0, char *name)
+void OutputGUI::CreateGUI(int xoff, int yoff, char *name)
{
Fl_Group* o = GUIMixGroup = new Fl_Group(xoff, yoff, 85, 110, name);
o->type(1);
diff -ru SpiralLoops-2.0.0/GUI/ScopeGUI.C SpiralLoops-2.0.0.modified/GUI/ScopeGUI.C
--- SpiralLoops-2.0.0/GUI/ScopeGUI.C 2001-04-19 15:48:11.000000000 -0500
+++ SpiralLoops-2.0.0.modified/GUI/ScopeGUI.C 2003-02-03 13:03:40.000000000 -0600
@@ -23,7 +23,7 @@
#include <FL/fl_draw.H>
-ScopeWidget::ScopeWidget(int x,int y,int w,int h,const char *l=0) :
+ScopeWidget::ScopeWidget(int x,int y,int w,int h,const char *l) :
Fl_Widget(x,y,w,h,l),
m_Channels(1)
{
@@ -69,7 +69,7 @@
if (!m_Bypass) m_Scope->redraw();
}
-void ScopeGUI::CreateGUI(int xoff=0, int yoff=0, char *name)
+void ScopeGUI::CreateGUI(int xoff, int yoff, char *name)
{
Fl_Group* o = GUIScopeGroup = new Fl_Group(xoff, yoff, 225, 110, name);
o->type(1);
diff -ru SpiralLoops-2.0.0/GUI/Widgets/Fl_Knob.cxx SpiralLoops-2.0.0.modified/GUI/Widgets/Fl_Knob.cxx
--- SpiralLoops-2.0.0/GUI/Widgets/Fl_Knob.cxx 2001-04-19 15:48:10.000000000 -0500
+++ SpiralLoops-2.0.0.modified/GUI/Widgets/Fl_Knob.cxx 2003-02-03 13:06:57.000000000 -0600
@@ -1,10 +1,11 @@
// generated by Fast Light User Interface Designer (fluid) version 2.00
#include "Fl_Knob.H"
+#include "FL/Fl_Group.h"
#include <FL/fl_draw.H>
#include <math.h>
-Fl_Knob::Fl_Knob(int xx,int yy,int ww,int hh,const char *l=0): Fl_Valuator(xx,yy,ww,hh,l) {
+Fl_Knob::Fl_Knob(int xx,int yy,int ww,int hh,const char *l): Fl_Valuator(xx,yy,ww,hh,l) {
a1 = 35;
a2 = 325;
_type = DOTLIN;
diff -ru SpiralLoops-2.0.0/GUI/Widgets/Fl_LED_Button.cxx SpiralLoops-2.0.0.modified/GUI/Widgets/Fl_LED_Button.cxx
--- SpiralLoops-2.0.0/GUI/Widgets/Fl_LED_Button.cxx 2001-04-19 15:48:11.000000000 -0500
+++ SpiralLoops-2.0.0.modified/GUI/Widgets/Fl_LED_Button.cxx 2003-02-03 13:19:42.000000000 -0600
@@ -1,9 +1,10 @@
// generated by Fast Light User Interface Designer (fluid) version 2.00
#include "Fl_LED_Button.H"
+#include <FL/Fl_Group.H>
#include <FL/fl_draw.H>
-Fl_LED_Button::Fl_LED_Button(int x, int y, int w, int h, const char* l=0):Fl_Light_Button(x,y,w,h,l) {
+Fl_LED_Button::Fl_LED_Button(int x, int y, int w, int h, const char* l):Fl_Light_Button(x,y,w,h,l) {
box(FL_NO_BOX);
down_box(FL_ROUND_DOWN_BOX);
selection_color(FL_RED);
@@ -15,7 +16,8 @@
void Fl_LED_Button::draw() {
uchar r,g,b;
- if (box()) draw_box(this==Fl::pushed() ? down(box()) : box(), color());
+// if (box()) draw_box(this==Fl::pushed() ? down(box()) : box(), color());
+ if (box()) draw_box(this==Fl::pushed() ? down_box() : box(), color());
Fl_Color col = value() ? selection_color() : color();
Fl::get_color((Fl_Color)selection_color(),r,g,b);
int d = h()/6;
diff -ru SpiralLoops-2.0.0/GUI/Widgets/Fl_Loop.C SpiralLoops-2.0.0.modified/GUI/Widgets/Fl_Loop.C
--- SpiralLoops-2.0.0/GUI/Widgets/Fl_Loop.C 2001-04-19 15:48:10.000000000 -0500
+++ SpiralLoops-2.0.0.modified/GUI/Widgets/Fl_Loop.C 2003-02-03 13:00:42.000000000 -0600
@@ -17,11 +17,13 @@
*/
#include "Fl_Loop.h"
-#include <iostream.h>
+#include <iostream>
#include <FL/fl_draw.H>
#include <FL/x.H>
#include <math.h>
+using namespace std;
+
/////////////////////////////////////////////////////////////////////////////
static const float NORM = ((1.0f)/(32767.0f));
@@ -30,7 +32,7 @@
static const int INDW = 3; // indicator width
static const int UPDATECYCLES = 4;
-Fl_Loop::Fl_Loop(int x, int y, int w, int h, const char* label=0) :
+Fl_Loop::Fl_Loop(int x, int y, int w, int h, const char* label) :
Fl_Double_Window(x,y,w,h,label),
m_data(NULL),
m_MainWin(NULL),
diff -ru SpiralLoops-2.0.0/GUI/Widgets/Fl_Loop.h SpiralLoops-2.0.0.modified/GUI/Widgets/Fl_Loop.h
--- SpiralLoops-2.0.0/GUI/Widgets/Fl_Loop.h 2001-04-19 15:48:10.000000000 -0500
+++ SpiralLoops-2.0.0.modified/GUI/Widgets/Fl_Loop.h 2003-02-03 12:59:11.000000000 -0600
@@ -18,7 +18,7 @@
#include <FL/Fl.H>
#include <FL/Fl_Double_Window.H>
-#include <iostream.h>
+#include <iostream>
#ifndef LOOPWIDGET
#define LOOPWIDGET
diff -ru SpiralLoops-2.0.0/GUI/Widgets/Fl_Trigger.C SpiralLoops-2.0.0.modified/GUI/Widgets/Fl_Trigger.C
--- SpiralLoops-2.0.0/GUI/Widgets/Fl_Trigger.C 2001-05-07 15:43:34.000000000 -0500
+++ SpiralLoops-2.0.0.modified/GUI/Widgets/Fl_Trigger.C 2003-02-03 13:11:34.000000000 -0600
@@ -17,17 +17,19 @@
*/
#include "Fl_Trigger.h"
-#include <iostream.h>
+#include <iostream>
#include <FL/fl_draw.H>
#include <math.h>
#include <stdio.h>
#include "Fl_Loop.h"
+using namespace std;
+
/////////////////////////////////////////////////////////////////////////////
static const float RADCONV = 0.017453292;
-Fl_Trigger::Fl_Trigger(int x, int y, int w, int h, const char* label=0) :
+Fl_Trigger::Fl_Trigger(int x, int y, int w, int h, const char* label) :
Fl_Widget(x,y,w,h,label),
m_CentreX(0),
m_CentreY(0),
@@ -90,7 +92,7 @@
if (LastButtonPushed==1)
{
- if (sqrt(mx-x()*my-y())<w())
+ if (sqrt((double)(mx-x()*my-y()))<w())
{
m_Dragging=true;
}
diff -ru SpiralLoops-2.0.0/GUI/Widgets/Fl_Trigger.h SpiralLoops-2.0.0.modified/GUI/Widgets/Fl_Trigger.h
--- SpiralLoops-2.0.0/GUI/Widgets/Fl_Trigger.h 2001-04-19 15:48:10.000000000 -0500
+++ SpiralLoops-2.0.0.modified/GUI/Widgets/Fl_Trigger.h 2003-02-03 13:11:07.000000000 -0600
@@ -19,7 +19,9 @@
#include <FL/Fl.H>
#include <FL/Fl_Widget.H>
-#include <iostream.h>
+#include <iostream>
+
+using namespace std;
#ifndef TRIGGERWIDGET
#define TRIGGERWIDGET
diff -ru SpiralLoops-2.0.0/SpiralInfo.C SpiralLoops-2.0.0.modified/SpiralInfo.C
--- SpiralLoops-2.0.0/SpiralInfo.C 2001-04-19 15:48:08.000000000 -0500
+++ SpiralLoops-2.0.0.modified/SpiralInfo.C 2003-02-03 12:57:09.000000000 -0600
@@ -16,12 +16,14 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
#include <stdlib.h>
#include "SpiralSound/SpiralInfo.h"
+using namespace std;
+
float RandFloat(float s=0.0f, float e=1.0f)
{
return s+((rand()%10000/10000.0)*(e-s));
diff -ru SpiralLoops-2.0.0/SpiralInfo.h SpiralLoops-2.0.0.modified/SpiralInfo.h
--- SpiralLoops-2.0.0/SpiralInfo.h 2001-04-19 15:48:11.000000000 -0500
+++ SpiralLoops-2.0.0.modified/SpiralInfo.h 2003-02-03 12:58:41.000000000 -0600
@@ -16,10 +16,12 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include <iostream.h>
+#include <iostream>
#include <string>
#include <stdlib.h>
+using namespace std;
+
#ifndef SpiralINFO
#define SpiralINFO
diff -ru SpiralLoops-2.0.0/SpiralLoops.C SpiralLoops-2.0.0.modified/SpiralLoops.C
--- SpiralLoops-2.0.0/SpiralLoops.C 2001-04-19 15:48:11.000000000 -0500
+++ SpiralLoops-2.0.0.modified/SpiralLoops.C 2003-02-03 12:57:11.000000000 -0600
@@ -34,6 +34,8 @@
#include "Loop.h"
#include <list>
+using namespace std;
+
static const int FILE_VERSION = 1;
LoopWin::~LoopWin()
diff -ru SpiralLoops-2.0.0/SpiralLoops.h SpiralLoops-2.0.0.modified/SpiralLoops.h
--- SpiralLoops-2.0.0/SpiralLoops.h 2001-04-19 15:48:11.000000000 -0500
+++ SpiralLoops-2.0.0.modified/SpiralLoops.h 2003-02-03 12:58:46.000000000 -0600
@@ -38,6 +38,8 @@
#include "SpiralSound/Reverb.h"
#include "SpiralSound/Sample.h"
+using namespace std;
+
class Loop;
class LoopWin
diff -ru SpiralLoops-2.0.0/SpiralSound/Output.C SpiralLoops-2.0.0.modified/SpiralSound/Output.C
--- SpiralLoops-2.0.0/SpiralSound/Output.C 2001-04-19 15:48:12.000000000 -0500
+++ SpiralLoops-2.0.0.modified/SpiralSound/Output.C 2003-02-03 13:02:54.000000000 -0600
@@ -29,7 +29,7 @@
m_Buffer.Zero();
}
-void Output::Send(Sample &data, float LeftVolume=1, float RightVolume=1)
+void Output::Send(Sample &data, float LeftVolume, float RightVolume)
{
long temp;
int on=0;
diff -ru SpiralLoops-2.0.0/SpiralSound/Reverb.h SpiralLoops-2.0.0.modified/SpiralSound/Reverb.h
--- SpiralLoops-2.0.0/SpiralSound/Reverb.h 2001-04-19 15:48:13.000000000 -0500
+++ SpiralLoops-2.0.0.modified/SpiralSound/Reverb.h 2003-02-03 12:58:34.000000000 -0600
@@ -20,6 +20,8 @@
#include "Delay.h"
#include <vector>
+using namespace std;
+
#ifndef REVERB
#define REVERB
diff -ru SpiralLoops-2.0.0/SpiralSound/RiffWav.C SpiralLoops-2.0.0.modified/SpiralSound/RiffWav.C
--- SpiralLoops-2.0.0/SpiralSound/RiffWav.C 2001-04-19 15:48:12.000000000 -0500
+++ SpiralLoops-2.0.0.modified/SpiralSound/RiffWav.C 2003-02-03 13:03:15.000000000 -0600
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include <iostream.h>
+#include <iostream>
#include <fstream>
#include <stdio.h>
#include <stdlib.h>
@@ -26,6 +26,8 @@
#include <sys/stat.h>
#include <fcntl.h>
+using namespace std;
+
const int HEADERLEN = (4+24+8);
#if __BYTE_ORDER == BIG_ENDIAN
@@ -55,7 +57,7 @@
#endif
}
-int WavFile::Open(string FileName, Mode mode, Channels channels=MONO)
+int WavFile::Open(string FileName, Mode mode, Channels channels)
{
if (m_Stream!=NULL)
{
diff -ru SpiralLoops-2.0.0/SpiralSound/RiffWav.h SpiralLoops-2.0.0.modified/SpiralSound/RiffWav.h
--- SpiralLoops-2.0.0/SpiralSound/RiffWav.h 2001-04-19 15:48:12.000000000 -0500
+++ SpiralLoops-2.0.0.modified/SpiralSound/RiffWav.h 2003-02-03 12:58:28.000000000 -0600
@@ -24,6 +24,8 @@
#include <stdio.h>
#include "Sample.h"
+using namespace std;
+
class WavFile
{
public:
diff -ru SpiralLoops-2.0.0/SpiralSound/Sample.C SpiralLoops-2.0.0.modified/SpiralSound/Sample.C
--- SpiralLoops-2.0.0/SpiralSound/Sample.C 2001-04-19 15:48:13.000000000 -0500
+++ SpiralLoops-2.0.0.modified/SpiralSound/Sample.C 2003-02-03 13:01:28.000000000 -0600
@@ -18,9 +18,9 @@
#include <string.h>
#include "Sample.h"
-#include "iostream.h"
+#include "iostream"
-Sample::Sample(int Len=0) :
+Sample::Sample(int Len) :
m_Data(NULL),
m_Length(0)
{
diff -ru SpiralLoops-2.0.0/SpiralSound/Sample.h SpiralLoops-2.0.0.modified/SpiralSound/Sample.h
--- SpiralLoops-2.0.0/SpiralSound/Sample.h 2001-04-19 15:48:13.000000000 -0500
+++ SpiralLoops-2.0.0.modified/SpiralSound/Sample.h 2003-02-03 12:58:31.000000000 -0600
@@ -23,6 +23,8 @@
#include <iostream>
#include "SpiralInfo.h"
+using namespace std;
+
static const unsigned short UMAX_LEV = 65535;
static const short MAX_LEV = 32768;
static const float FREQ_CONV = 5.0f;
diff -ru SpiralLoops-2.0.0/SpiralSound/SpiralInfo.C SpiralLoops-2.0.0.modified/SpiralSound/SpiralInfo.C
--- SpiralLoops-2.0.0/SpiralSound/SpiralInfo.C 2001-04-19 15:48:13.000000000 -0500
+++ SpiralLoops-2.0.0.modified/SpiralSound/SpiralInfo.C 2003-02-03 13:02:36.000000000 -0600
@@ -16,13 +16,15 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
#include <stdlib.h>
#include "SpiralInfo.h"
-float RandFloat(float s=0.0f, float e=1.0f)
+using namespace std;
+
+float RandFloat(float s, float e)
{
return s+((rand()%10000/10000.0)*(e-s));
}
diff -ru SpiralLoops-2.0.0/SpiralSound/SpiralInfo.h SpiralLoops-2.0.0.modified/SpiralSound/SpiralInfo.h
--- SpiralLoops-2.0.0/SpiralSound/SpiralInfo.h 2001-04-19 15:48:12.000000000 -0500
+++ SpiralLoops-2.0.0.modified/SpiralSound/SpiralInfo.h 2003-02-03 12:58:25.000000000 -0600
@@ -16,11 +16,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include <iostream.h>
+#include <iostream>
#include <string>
#include <stdlib.h>
#include "Sample.h"
+using namespace std;
+
#ifndef SpiralINFO
#define SpiralINFO
