Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-19 14:17:41 +02:00
Code Issues Releases Wiki Activity

Fix travis errors by other means

Browse Source
This commit is contained in:
Paul Licameli 2015-07-26 19:36:00 -04:00
commit 3e5d2af7cb
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/TrackArtist.cpp
View File

@ -1633,11 +1633,17 @@ struct ClipParameters
}; };
} }
#ifdef __GNUC__
#define CONST
#else
#define CONST const
#endif
namespace { namespace {
struct WavePortion { struct WavePortion {
wxRect rect; wxRect rect;
/*const*/ double averageZoom; CONST double averageZoom;
/*const*/ bool inFisheye; CONST bool inFisheye;
WavePortion(int x, int y, int w, int h, double zoom, bool i) WavePortion(int x, int y, int w, int h, double zoom, bool i)
: rect(x, y, w, h), averageZoom(zoom), inFisheye(i) : rect(x, y, w, h), averageZoom(zoom), inFisheye(i)
{} {}

7
src/ViewInfo.h
View File

@ -17,6 +17,11 @@
class Track; class Track;
#ifdef __GNUC__
#define CONST
#else
#define CONST const
#endif
// The subset of ViewInfo information (other than selection) // The subset of ViewInfo information (other than selection)
// that is sufficient for purposes of TrackArtist, // that is sufficient for purposes of TrackArtist,
@ -85,7 +90,7 @@ public:
void ZoomBy(double multiplier); void ZoomBy(double multiplier);
struct Interval { struct Interval {
/* const */ wxInt64 position; /* const */ double averageZoom; /* const */ bool inFisheye; CONST wxInt64 position; CONST double averageZoom; CONST bool inFisheye;
Interval(wxInt64 p, double z, bool i) Interval(wxInt64 p, double z, bool i)
: position(p), averageZoom(z), inFisheye(i) {} : position(p), averageZoom(z), inFisheye(i) {}
}; };