Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-22 15:20:15 +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:23:55 -04:00
parent 06d01ee424
commit f37c37e67c
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 {
struct WavePortion {
wxRect rect;
const double averageZoom;
const bool inFisheye;
CONST double averageZoom;
CONST bool inFisheye;
WavePortion(int x, int y, int w, int h, double zoom, bool i)
: rect(x, y, w, h), averageZoom(zoom), inFisheye(i)
{}

7
src/ViewInfo.h
View File

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