karasz
/
package-update
1
0
Fork 0
Code Issues Releases Activity
Browse Source

rezound: removed obsolete patches

user/karasz/next/updates
Christian Wiese 15 years ago
parent
7a750d1910
commit
750eed0648
5 changed files with 0 additions and 538 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 65
      audio/rezound/64bit.patch
  2. 29
      audio/rezound/float.patch
  3. 164
      audio/rezound/fox-1.6.patch
  4. 75
      audio/rezound/gcc41-hacky.patch
  5. 205
      audio/rezound/gcc41.patch

65
audio/rezound/64bit.patch
Unescape View File

@ -1,65 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../rezound/64bit.patch
# Copyright (C) 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
CVS pull to make it not segfault on playback on 64bit platforms ...
- Rene Rebe <rene@exactcode.de>
===================================================================
RCS file: /cvsroot/rezound/rezound/src/backend/DSP/Convolver.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rezound/src/backend/DSP/Convolver.h 2003/07/22 21:12:00 1.6
+++ rezound/src/backend/DSP/Convolver.h 2005/11/12 04:13:29 1.7
@@ -64,7 +64,7 @@
const sample_t processSample(const sample_t input)
{
coefficient_t output=input*coefficients[0];
- for(size_t t=coefficientCountSub1;t>0;t--)
+ for(unsigned t=coefficientCountSub1;t>0;t--)
output+=delay.getSample(t)*coefficients[t];
delay.putSample((coefficient_t)input);
===================================================================
RCS file: /cvsroot/rezound/rezound/src/backend/CSoundPlayerChannel.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- rezound/src/backend/CSoundPlayerChannel.cpp 2005/08/21 01:01:15 1.37
+++ rezound/src/backend/CSoundPlayerChannel.cpp 2005/11/12 04:13:29 1.38
@@ -721,8 +721,8 @@
if(!muted[i]) // ??? this memory needs to be locked for JACK's sake
{
// populate for interpolation
- readBuffer[-(2*channelCount)+i]=prevLast2Frames[0][i];
- readBuffer[- channelCount +i]=prevLast2Frames[1][i];
+ readBuffer[-(2*(int)channelCount)+(int)i]=prevLast2Frames[0][i];
+ readBuffer[- (int)channelCount +(int)i]=prevLast2Frames[1][i];
const sample_t * const rreadBuffer=readBuffer-(2*channelCount);
const vector<bool> outputRouting=getOutputRoute(0,i); // ??? this needs to be put into a data member of memory NOT TO BE SWAPPED for jack's sake and it needs to be updated in updateAfterEdit()
@@ -765,8 +765,8 @@
}
// save the last 2 samples and (later) the offset into the next-to-last so that we can use it for interpolation the next go around
- prevLast2Frames[0][i]=readBuffer[((framesRead-2)*channelCount)+i];
- prevLast2Frames[1][i]=readBuffer[((framesRead-1)*channelCount)+i];
+ prevLast2Frames[0][i]=readBuffer[(((int)framesRead-2)*(int)channelCount)+(int)i];
+ prevLast2Frames[1][i]=readBuffer[(((int)framesRead-1)*(int)channelCount)+(int)i];
}
// if all channels were muted, or none were mapped to an output device then this value never got set

29
audio/rezound/float.patch
Unescape View File

@ -1,29 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../rezound/float.patch
# Copyright (C) 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
do not throw because of floating point representation
--- rezound-0.12.2beta/src/backend/settings.cpp_orig 2006-03-06 11:49:50.130992750 +0100
+++ rezound-0.12.2beta/src/backend/settings.cpp 2006-03-06 15:42:48.244570250 +0100
@@ -222,7 +222,7 @@
GET_SETTING("DesiredOutputBufferCount",gDesiredOutputBufferCount,int)
gDesiredOutputBufferCount=max(2,gDesiredOutputBufferCount);
GET_SETTING("DesiredOutputBufferSize",gDesiredOutputBufferSize,unsigned)
- if(gDesiredOutputBufferSize<256 || log((double)gDesiredOutputBufferSize)/log(2.0)!=floor(log((double)gDesiredOutputBufferSize)/log(2.0)))
+ if(gDesiredOutputBufferSize<256 || (gDesiredOutputBufferSize & gDesiredOutputBufferSize-1))
throw runtime_error(string(__func__)+" -- DesiredOutputBufferSize in "+gSettingsRegistry->getFilename()+" must be a power of 2 and >= than 256");

164
audio/rezound/fox-1.6.patch
Unescape View File

@ -1,164 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../rezound/fox-1.6.patch
# Copyright (C) 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
Out of the proaudio SVN repository.
- Rene Rebe <rene@exactcode.de>
--- rezound/src/frontend_fox/Makefile.am.fox16~ 2005-04-30 23:58:16.000000000 +0200
+++ rezound/src/frontend_fox/Makefile.am 2006-03-27 23:40:35.000000000 +0200
@@ -115,14 +115,14 @@
$(top_builddir)/src/misc/CNestedDataFile/libmiscCN.la \
$(top_builddir)/src/PoolFile/libPoolFile.la
-rezound_LDADD=$(_rezound_LDADD) @FOX_1_5_LIBS@ @FOX_1_4_LIBS@ @FOX_1_3_LIBS@ @FOX_1_2_LIBS@ @FOX_1_1_LIBS@ @FOX_LIBS@
+rezound_LDADD=$(_rezound_LDADD) @FOX_1_6_LIBS@ @FOX_1_5_LIBS@ @FOX_1_4_LIBS@ @FOX_1_3_LIBS@ @FOX_1_2_LIBS@ @FOX_1_1_LIBS@ @FOX_LIBS@
## if I don't do this, automake leaves out @abc@ vars when creating the rezound_DEPENDENCES value
## so changes to the LADSPA lib (that may or may not be built) don't cause a re-link
rezound_DEPENDENCIES=$(_rezound_LDADD)
-AM_CXXFLAGS=@FOX_1_5_CXXFLAGS@ @FOX_1_4_CXXFLAGS@ @FOX_1_3_CXXFLAGS@ @FOX_1_2_CXXFLAGS@ @FOX_1_1_CXXFLAGS@ @FOX_CXXFLAGS@
+AM_CXXFLAGS=-I/usr/include/fox-1.6 @FOX_1_6_CXXFLAGS@ @FOX_1_5_CXXFLAGS@ @FOX_1_4_CXXFLAGS@ @FOX_1_3_CXXFLAGS@ @FOX_1_2_CXXFLAGS@ @FOX_1_1_CXXFLAGS@ @FOX_CXXFLAGS@
noinst_HEADERS=\
fox_compat.h \
--- rezound/configure.ac.fox16~ 2005-09-05 17:34:06.000000000 +0200
+++ rezound/configure.ac 2006-03-27 23:28:45.000000000 +0200
@@ -615,19 +615,22 @@
# This is a check for a class in a C++ library. To pinpoint the specific version we need we could change what class is linked.
# it sets $1_CXXFLAGS and $1_LIBS to either something useful or nothing
-ajv_CXX_CHECK_LIB(FOX-1.5,FXApp,fox-1.5/fx.h,[http://fox-toolkit.org],[],false)
-if test -z "$FOX_1_5_LIBS"; then
- ajv_CXX_CHECK_LIB(FOX-1.4,FXApp,fox-1.4/fx.h,[http://fox-toolkit.org],[],false)
- if test -z "$FOX_1_4_LIBS"; then
- ajv_CXX_CHECK_LIB(FOX-1.3,FXApp,fox-1.3/fx.h,[http://fox-toolkit.org],[],false)
- if test -z "$FOX_1_3_LIBS"; then
- ajv_CXX_CHECK_LIB(FOX-1.2,FXApp,fox-1.2/fx.h,[http://fox-toolkit.org],[],false)
- if test -z "$FOX_1_2_LIBS"; then
- # libFOX-1.2 was not found, now try libFOX-1.1
- ajv_CXX_CHECK_LIB(FOX-1.1,FXApp,fox-1.1/fx.h,[http://fox-toolkit.org],[],false)
- if test -z "$FOX_1_1_LIBS"; then
- # libFOX-1.1 was not found, now try libFOX
- ajv_CXX_CHECK_LIB(FOX,FXApp,fox/fx.h,[http://fox-toolkit.org],[],true)
+ajv_CXX_CHECK_LIB(FOX-1.6,FXApp,fox-1.6/fx.h,[http://fox-toolkit.org],[],false)
+if test -z "$FOX_1_6_LIBS"; then
+ ajv_CXX_CHECK_LIB(FOX-1.5,FXApp,fox-1.5/fx.h,[http://fox-toolkit.org],[],false)
+ if test -z "$FOX_1_5_LIBS"; then
+ ajv_CXX_CHECK_LIB(FOX-1.4,FXApp,fox-1.4/fx.h,[http://fox-toolkit.org],[],false)
+ if test -z "$FOX_1_4_LIBS"; then
+ ajv_CXX_CHECK_LIB(FOX-1.3,FXApp,fox-1.3/fx.h,[http://fox-toolkit.org],[],false)
+ if test -z "$FOX_1_3_LIBS"; then
+ ajv_CXX_CHECK_LIB(FOX-1.2,FXApp,fox-1.2/fx.h,[http://fox-toolkit.org],[],false)
+ if test -z "$FOX_1_2_LIBS"; then
+ # libFOX-1.2 was not found, now try libFOX-1.1
+ ajv_CXX_CHECK_LIB(FOX-1.1,FXApp,fox-1.1/fx.h,[http://fox-toolkit.org],[],false)
+ if test -z "$FOX_1_1_LIBS"; then
+ # libFOX-1.1 was not found, now try libFOX
+ ajv_CXX_CHECK_LIB(FOX,FXApp,fox/fx.h,[http://fox-toolkit.org],[],true)
+ fi
fi
fi
fi
@@ -644,6 +647,8 @@
AC_SUBST(FOX_1_4_LIBS)
AC_SUBST(FOX_1_5_CXXFLAGS)
AC_SUBST(FOX_1_5_LIBS)
+AC_SUBST(FOX_1_6_CXXFLAGS)
+AC_SUBST(FOX_1_6_LIBS)
AC_SUBST(FOX_CXXFLAGS)
AC_SUBST(FOX_LIBS)
--- rezound/src/frontend_fox/fox_compat.h.ark 2006-03-28 00:02:23.000000000 +0200
+++ rezound/src/frontend_fox/fox_compat.h 2006-03-28 00:02:39.000000000 +0200
@@ -21,6 +21,9 @@
#elif defined(HAVE_LIBFOX_1_5)
#include <fox-1.5/fx.h>
#include <fox-1.5/fxkeys.h>
+#elif defined(HAVE_LIBFOX_1_6)
+ #include <fox-1.6/fx.h>
+ #include <fox-1.6/fxkeys.h>
#else
#error no HAVE_LIBFOX defined
#endif
--- rezound/src/frontend_fox/CMainWindow.cpp.ark 2006-03-28 00:15:06.000000000 +0200
+++ rezound/src/frontend_fox/CMainWindow.cpp 2006-03-28 00:15:59.000000000 +0200
@@ -1303,7 +1303,11 @@
if(value=="")
continue; // no key bound to this action
+#ifdef HAVE_LIBFOX_1_6
+ FXHotKey acckey=parseAccel(value.c_str());
+#else
FXHotKey acckey=fxparseAccel(value.c_str());
+#endif
mc->setAccelText(value.c_str());
/* these shuttle controls have to be handle specially because they require key up events to return the shuttle to the middle */
@@ -1344,7 +1348,11 @@
vector<FXHotKey> removeKeyBindingsList;
const vector<string> actionsWithKeyBindings=gKeyBindingsStore->getChildKeys("");
for(size_t t=0;t<actionsWithKeyBindings.size();t++)
+#ifdef HAVE_LIBFOX_1_6
+ removeKeyBindingsList.push_back(parseAccel(gKeyBindingsStore->getValue<string>(actionsWithKeyBindings[t]).c_str()));
+#else
removeKeyBindingsList.push_back(fxparseAccel(gKeyBindingsStore->getValue<string>(actionsWithKeyBindings[t]).c_str()));
+#endif
if(gKeyBindingsDialog->showIt(gKeyBindingRegistry))
{
--- rezound/src/frontend_fox/FXRezWaveView.cpp.ark 2006-03-28 00:22:20.000000000 +0200
+++ rezound/src/frontend_fox/FXRezWaveView.cpp 2006-03-28 00:22:49.000000000 +0200
@@ -48,7 +48,11 @@
virtual void create();
+#ifdef HAVE_LIBFOX_1_6
+ virtual bool canFocus() const;
+#else
virtual FXbool canFocus() const;
+#endif
size_t getClickedCue(FXint x,FXint y);
@@ -369,7 +373,11 @@
font->create();
}
+#ifdef HAVE_LIBFOX_1_6
+bool FXWaveRuler::canFocus() const
+#else
FXbool FXWaveRuler::canFocus() const
+#endif
{
return 1;
}
--- rezound/src/frontend_fox/CKeyBindingsDialog.cpp.ark 2006-03-28 00:23:09.000000000 +0200
+++ rezound/src/frontend_fox/CKeyBindingsDialog.cpp 2006-03-28 00:23:22.000000000 +0200
@@ -208,7 +208,11 @@
}
else
{
+#ifdef HAVE_LIBFOX_1_6
+ string tmp_key=unparseAccel(keycode).text();
+#else
string tmp_key=fxunparseAccel(keycode).text();
+#endif
if(tmp_key=="")
Error(_("Unhandled Key Combination"));
else

75
audio/rezound/gcc41-hacky.patch
Unescape View File

@ -1,75 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../rezound/gcc41-hacky.patch
# Copyright (C) 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
Well, this part is hacky, gcc41 does not seem to match against the provided
std::vector<> specialization. After some trial 'n error I decided to take
a shortpath and let the default work on any contrainer a-like type.
--- rezound-0.12.2beta/src/misc/CNestedDataFile/anytype.h.vanilla 2006-03-05 23:45:44.856469500 +0100
+++ rezound-0.12.2beta/src/misc/CNestedDataFile/anytype.h 2006-03-06 00:09:06.584072000 +0100
@@ -60,7 +60,26 @@
// or we could leave these unimplemented to get a linker error instead (that's what I have to do with gcc>=3.4
// /* the reason I haven't made string_to_anytype return a reference is because currently, it's probably not a big deal for most types.. and with string, we'd be making a copy into the ret parameter if I implemented it that way anyway.. perhaps I could remove the return type all together and always use the ret parameter to get back the data */
template<typename Type> static const Type string_to_anytype(const string &str,Type &ret) ;// { no_specialization_of_this_template_with_the_given_type; }
-template<typename Type> static const string anytype_to_string(const Type &any) ;// { no_specialization_of_this_template_with_the_given_type; }
+
+template<typename Type> static const string anytype_to_string(const Type &any)
+/*
+// I really wished that I didn't have to explicitly use 'vector' in the definition, I'd have like to use any container with an iterator interface
+template<class Type> __attribute__((always_inline)) inline const string anytype_to_string(const vector<Type> &any) */
+{
+ string s;
+ size_t l=any.size();
+ s="{";
+ for(size_t t=0;t<l;t++)
+ {
+ // leaving type in case it's not able to deduce aruments and chooses the default template implemenation
+ // if I knew how to constrain the original definition of the template, I would make it fully constrained
+ s+=anytype_to_string(any[t]);
+ if(t!=(l-1))
+ s+=",";
+ }
+ return s+"}";
+}
+
@@ -146,24 +165,6 @@
template<> static const string anytype_to_string<long double>(const long double &any) { if(isnan(any)) return "0"; else { ostringstream ss; if(any>999999.0) {ss.setf(ios::scientific); ss.width(0); ss.precision(12); ss.fill(' '); } else {ss.setf(ios::fixed); ss.precision(6); ss.fill(' '); } ss << any; return istring(ss.str()).trim(); } }
-// I really wished that I didn't have to explicitly use 'vector' in the definition, I'd have like to use any container with an iterator interface
-template<class Type> static const string anytype_to_string(const vector<Type> &any)
-{
- string s;
- size_t l=any.size();
- s="{";
- for(size_t t=0;t<l;t++)
- {
- // leaving type in case it's not able to deduce aruments and chooses the default template implemenation
- // if I knew how to constrain the original definition of the template, I would make it fully constrained
- s+=anytype_to_string(any[t]);
- if(t!=(l-1))
- s+=",";
- }
- return s+"}";
-}
-
-
// ----------------------------------------------------------------------------
namespace s2at // s2at signifies string_to_anytype/anytype_to_string

205
audio/rezound/gcc41.patch
Unescape View File

@ -1,205 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../rezound/gcc41.patch
# Copyright (C) 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- rezound-0.12.2beta/src/misc/CNestedDataFile/anytype.h.vanilla 2006-03-04 19:55:28.559323250 +0100
+++ rezound-0.12.2beta/src/misc/CNestedDataFile/anytype.h 2006-03-04 20:08:36.228549500 +0100
@@ -93,6 +93,7 @@
// I really wished that I didn't have to explicitly use 'vector' in the definition; I'd have like to use any container with an iterator interface
#include <CMutex.h>
#include <CNestedDataFile/CNestedDataFile.h>
+extern int cfg_parse();
template<class Type> static const vector<Type> &string_to_anytype(const string &str,vector<Type> &ret)
{
// This function has to parse '{' ..., ... '}' where the ... can contain nested array
--- rezound-0.12.2beta/src/frontend_fox/CMetersWindow.cpp.vanilla 2006-03-05 15:37:25.240988250 +0100
+++ rezound-0.12.2beta/src/frontend_fox/CMetersWindow.cpp 2006-03-05 15:40:24.508191750 +0100
@@ -82,7 +82,7 @@
{
FXDECLARE(CLevelMeter);
public:
- CLevelMeter::CLevelMeter(FXComposite *parent) :
+ CLevelMeter(FXComposite *parent) :
FXHorizontalFrame(parent,LAYOUT_FILL_X|LAYOUT_FIX_HEIGHT|LAYOUT_TOP | FRAME_NONE,0,0,0,0, 0,0,0,0, 0,0),
statusFont(getApp()->getNormalFont()),
canvas(new FXCanvas(this,this,ID_CANVAS,FRAME_NONE | LAYOUT_FILL_X|LAYOUT_FILL_Y)),
@@ -121,7 +121,7 @@
}
- CLevelMeter::~CLevelMeter()
+ ~CLevelMeter()
{
delete statusFont;
}
@@ -133,7 +133,7 @@
setHeight(max(statusFont->getFontHeight(),MIN_METER_HEIGHT)); // make meter only as tall as necessary (also with a defined minimum)
}
- long CLevelMeter::onCanvasPaint(FXObject *sender,FXSelector sel,void *ptr)
+ long onCanvasPaint(FXObject *sender,FXSelector sel,void *ptr)
{
FXDCWindow dc(canvas);
@@ -327,7 +327,7 @@
{
FXDECLARE(CBalanceMeter);
public:
- CBalanceMeter::CBalanceMeter(FXComposite *parent) :
+ CBalanceMeter(FXComposite *parent) :
FXHorizontalFrame(parent,LAYOUT_FILL_X|LAYOUT_FIX_HEIGHT | FRAME_NONE, 0,0,0,0, 0,0,0,0, 0,0),
statusFont(getApp()->getNormalFont()),
leftLabel(new FXLabel(this,"-1.0")),
@@ -361,7 +361,7 @@
}
- CBalanceMeter::~CBalanceMeter()
+ ~CBalanceMeter()
{
delete statusFont;
}
@@ -372,7 +372,7 @@
setHeight(max(statusFont->getFontHeight(),MIN_METER_HEIGHT)); // make meter only as tall as necessary (also with a defined minimum)
}
- long CBalanceMeter::onCanvasPaint(FXObject *sender,FXSelector sel,void *ptr)
+ long onCanvasPaint(FXObject *sender,FXSelector sel,void *ptr)
{
FXDCWindow dc(canvas);
@@ -478,7 +478,7 @@
{
FXDECLARE(CStereoPhaseMeter);
public:
- CStereoPhaseMeter::CStereoPhaseMeter(FXComposite *parent,sample_t *_samplingBuffer,size_t _samplingNFrames,unsigned _samplingNChannels,unsigned _samplingLeftChannel,unsigned _samplingRightChannel) :
+ CStereoPhaseMeter(FXComposite *parent,sample_t *_samplingBuffer,size_t _samplingNFrames,unsigned _samplingNChannels,unsigned _samplingLeftChannel,unsigned _samplingRightChannel) :
FXHorizontalFrame(parent,LAYOUT_RIGHT|LAYOUT_FIX_WIDTH|LAYOUT_FILL_Y, 0,0,0,0, 0,0,0,0, 0,0),
canvasFrame(new FXVerticalFrame(this,LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN|FRAME_THICK,0,0,0,0, 2,2,2,2, 0,1)),
canvas(new FXBackBufferedCanvas(canvasFrame,this,ID_CANVAS,LAYOUT_FILL_X|LAYOUT_FILL_Y)),
@@ -519,19 +519,19 @@
statusFont=new FXFont(getApp(),d);
}
- CStereoPhaseMeter::~CStereoPhaseMeter()
+ ~CStereoPhaseMeter()
{
delete statusFont;
}
- long CStereoPhaseMeter::onZoomDial(FXObject *sender,FXSelector sel,void *ptr)
+ long onZoomDial(FXObject *sender,FXSelector sel,void *ptr)
{
zoom=((float)zoomDial->getValue())/100.0f;
canvas->update(); // not really necessary since we're doing it several times a second anyway
return 1;
}
- long CStereoPhaseMeter::onResize(FXObject *sender,FXSelector sel,void *ptr)
+ long onResize(FXObject *sender,FXSelector sel,void *ptr)
{
// make square
resize(getHeight()+getHSpacing()+zoomDial->getWidth(),getHeight());
@@ -540,7 +540,7 @@
return 1;
}
- long CStereoPhaseMeter::onCanvasPaint(FXObject *sender,FXSelector sel,void *ptr)
+ long onCanvasPaint(FXObject *sender,FXSelector sel,void *ptr)
{
FXColor *data=(FXColor *)canvas->getBackBufferData();
@@ -730,7 +730,7 @@
{
FXDECLARE(CAnalyzer);
public:
- CAnalyzer::CAnalyzer(FXComposite *parent) :
+ CAnalyzer(FXComposite *parent) :
FXHorizontalFrame(parent,LAYOUT_RIGHT|LAYOUT_FILL_Y, 0,0,0,0, 0,0,0,0, 0,0),
canvasFrame(new FXVerticalFrame(this,LAYOUT_FIX_WIDTH|LAYOUT_FILL_Y|FRAME_SUNKEN|FRAME_THICK,0,0,0,0, 2,2,2,2, 0,1)),
canvas(new FXBackBufferedCanvas(canvasFrame,this,ID_CANVAS,LAYOUT_FILL_X|LAYOUT_FILL_Y)),
@@ -763,25 +763,25 @@
canvasFrame->setWidth(150);
}
- CAnalyzer::~CAnalyzer()
+ ~CAnalyzer()
{
delete statusFont;
}
- long CAnalyzer::onZoomDial(FXObject *sender,FXSelector sel,void *ptr)
+ long onZoomDial(FXObject *sender,FXSelector sel,void *ptr)
{
zoom=zoomDial->getValue();
canvas->update(); // not really necessary since we're doing it several times a second anyway
return 1;
}
- long CAnalyzer::onZoomDialDefault(FXObject *sender,FXSelector sel,void *ptr)
+ long onZoomDialDefault(FXObject *sender,FXSelector sel,void *ptr)
{
zoomDial->setValue(25);
return onZoomDial(sender,sel,ptr);
}
- long CAnalyzer::onCanvasPaint(FXObject *sender,FXSelector sel,void *ptr)
+ long onCanvasPaint(FXObject *sender,FXSelector sel,void *ptr)
{
FXDC &dc=*((FXDC*)ptr); // back buffered canvases send the DC to draw onto in ptr
@@ -865,19 +865,19 @@
return 1;
}
- long CAnalyzer::onCanvasEnter(FXObject *sender,FXSelector sel,void *ptr)
+ long onCanvasEnter(FXObject *sender,FXSelector sel,void *ptr)
{
drawBarFreq=true;
return onCanvasMotion(sender,sel,ptr);
}
- long CAnalyzer::onCanvasLeave(FXObject *sender,FXSelector sel,void *ptr)
+ long onCanvasLeave(FXObject *sender,FXSelector sel,void *ptr)
{
drawBarFreq=false;
return onCanvasMotion(sender,sel,ptr);
}
- long CAnalyzer::onCanvasMotion(FXObject *sender,FXSelector sel,void *ptr)
+ long onCanvasMotion(FXObject *sender,FXSelector sel,void *ptr)
{
barFreqIndex=((FXEvent *)ptr)->win_x/ANALYZER_BAR_WIDTH;
return 1;
--- rezound-0.12.2beta/src/frontend_fox/FileActionDialogs.h.vanilla 2006-03-05 15:35:42.134544500 +0100
+++ rezound-0.12.2beta/src/frontend_fox/FileActionDialogs.h 2006-03-05 15:36:12.788460250 +0100
@@ -87,7 +87,7 @@
long onDetectDeviceButton(FXObject *object,FXSelector sel,void *ptr);
protected:
- CBurnToCDDialog::CBurnToCDDialog() {}
+ CBurnToCDDialog() {}
const string getExplanation() const;
};
@@ -111,7 +111,7 @@
long onRemoveButton(FXObject *object,FXSelector sel,void *ptr);
protected:
- CRunMacroDialog::CRunMacroDialog() {}
+ CRunMacroDialog() {}
};
Write Preview
Loading…
Cancel
Save