mirror of
https://github.com/cookiengineer/audacity
synced 2025-09-19 09:30:52 +02:00
fixed initialization order warnings
This commit is contained in:
parent
c6de7d6095
commit
50901b9454
@ -125,13 +125,13 @@ END_EVENT_TABLE()
|
|||||||
|
|
||||||
SelectionBar::SelectionBar()
|
SelectionBar::SelectionBar()
|
||||||
: ToolBar(SelectionBarID, _("Selection"), wxT("Selection")),
|
: ToolBar(SelectionBarID, _("Selection"), wxT("Selection")),
|
||||||
mListener(NULL), mRate(0.0),
|
mListener(NULL), mRate(0.0),
|
||||||
mStart(0.0), mEnd(0.0), mLength(0.0), mCenter(0.0), mAudio(0.0),
|
mStart(0.0), mEnd(0.0), mLength(0.0), mCenter(0.0), mAudio(0.0),
|
||||||
mStartTime(NULL), mEndTime(NULL), mLengthTime(NULL), mCenterTime(NULL),
|
|
||||||
mAudioTime(NULL),
|
|
||||||
mChoice(NULL),
|
|
||||||
mDrive1( StartTimeID), mDrive2( EndTimeID ),
|
mDrive1( StartTimeID), mDrive2( EndTimeID ),
|
||||||
mSelectionMode(0)
|
mSelectionMode(0),
|
||||||
|
mStartTime(NULL), mCenterTime(NULL), mLengthTime(NULL), mEndTime(NULL),
|
||||||
|
mAudioTime(NULL),
|
||||||
|
mChoice(NULL)
|
||||||
{
|
{
|
||||||
// Make sure we have a valid rate as the NumericTextCtrl()s
|
// Make sure we have a valid rate as the NumericTextCtrl()s
|
||||||
// created in Populate()
|
// created in Populate()
|
||||||
|
@ -26,9 +26,9 @@ Paul Licameli split from TrackPanel.cpp
|
|||||||
LabelGlyphHandle::LabelGlyphHandle
|
LabelGlyphHandle::LabelGlyphHandle
|
||||||
(const std::shared_ptr<LabelTrack> &pLT,
|
(const std::shared_ptr<LabelTrack> &pLT,
|
||||||
const wxRect &rect, const LabelTrackHit &hit)
|
const wxRect &rect, const LabelTrackHit &hit)
|
||||||
: mpLT{ pLT }
|
: mHit{ hit }
|
||||||
|
, mpLT{ pLT }
|
||||||
, mRect{ rect }
|
, mRect{ rect }
|
||||||
, mHit{ hit }
|
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -53,8 +53,7 @@ namespace
|
|||||||
|
|
||||||
NoteTrackVZoomHandle::NoteTrackVZoomHandle
|
NoteTrackVZoomHandle::NoteTrackVZoomHandle
|
||||||
(const std::shared_ptr<NoteTrack> &pTrack, const wxRect &rect, int y)
|
(const std::shared_ptr<NoteTrack> &pTrack, const wxRect &rect, int y)
|
||||||
: mZoomStart(y), mZoomEnd(y), mRect(rect)
|
: mpTrack{ pTrack } , mZoomStart(y), mZoomEnd(y), mRect(rect)
|
||||||
, mpTrack{ pTrack }
|
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -66,11 +66,11 @@ public:
|
|||||||
bool StopsOnKeystroke() override { return true; }
|
bool StopsOnKeystroke() override { return true; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
std::shared_ptr<WaveTrack> mpTrack{};
|
||||||
enum Operation { Merge, Expand, Remove };
|
enum Operation { Merge, Expand, Remove };
|
||||||
Operation mOperation{ Merge };
|
Operation mOperation{ Merge };
|
||||||
double mStartTime{}, mEndTime{};
|
double mStartTime{}, mEndTime{};
|
||||||
WaveTrackLocation mLocation {};
|
WaveTrackLocation mLocation {};
|
||||||
std::shared_ptr<WaveTrack> mpTrack{};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -49,8 +49,7 @@ bool IsDragZooming(int zoomStart, int zoomEnd)
|
|||||||
|
|
||||||
WaveTrackVZoomHandle::WaveTrackVZoomHandle
|
WaveTrackVZoomHandle::WaveTrackVZoomHandle
|
||||||
(const std::shared_ptr<WaveTrack> &pTrack, const wxRect &rect, int y)
|
(const std::shared_ptr<WaveTrack> &pTrack, const wxRect &rect, int y)
|
||||||
: mZoomStart(y), mZoomEnd(y), mRect(rect)
|
: mpTrack{ pTrack } , mZoomStart(y), mZoomEnd(y), mRect(rect)
|
||||||
, mpTrack{ pTrack }
|
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -183,7 +183,8 @@ void Scrubber::ScrubPoller::Notify()
|
|||||||
}
|
}
|
||||||
|
|
||||||
Scrubber::Scrubber(AudacityProject *project)
|
Scrubber::Scrubber(AudacityProject *project)
|
||||||
: mScrubToken(-1)
|
: mInOneShotMode( false )
|
||||||
|
, mScrubToken(-1)
|
||||||
, mPaused(true)
|
, mPaused(true)
|
||||||
, mScrubSpeedDisplayCountdown(0)
|
, mScrubSpeedDisplayCountdown(0)
|
||||||
, mScrubStartPosition(-1)
|
, mScrubStartPosition(-1)
|
||||||
@ -195,7 +196,6 @@ Scrubber::Scrubber(AudacityProject *project)
|
|||||||
, mProject(project)
|
, mProject(project)
|
||||||
, mPoller { std::make_unique<ScrubPoller>(*this) }
|
, mPoller { std::make_unique<ScrubPoller>(*this) }
|
||||||
, mOptions {}
|
, mOptions {}
|
||||||
, mInOneShotMode( false )
|
|
||||||
|
|
||||||
{
|
{
|
||||||
if (wxTheApp)
|
if (wxTheApp)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user