Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-29 15:09:30 +02:00
Code Issues Releases Wiki Activity

build fixes

Browse Source
This commit is contained in:
Paul Licameli 2017-07-09 13:27:03 -04:00
parent 65c098f85e
commit 1c281faf52
4 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Snap.h
View File

@ -35,18 +35,13 @@ class TrackClip
public:
TrackClip(Track *t, WaveClip *c);
#ifndef __AUDACITY_OLD_STD__
// TrackClip(TrackClip&&) = default; is not supported by vs2013/5 so explicit version needed
TrackClip(TrackClip&&);
#endif
~TrackClip();
Track *track;
Track *origTrack;
WaveTrack *dstTrack;
WaveClip *clip;
movable_ptr<WaveClip> holder;
std::shared_ptr<WaveClip> holder;
};
class TrackClipArray : public std::vector < TrackClip > {};

5
src/tracks/labeltrack/ui/LabelDefaultClickHandle.h
View File

@ -21,13 +21,12 @@ class LabelTrack;
// Adds some behavior to clicks.
class LabelDefaultClickHandle /* not final */ : public UIHandle
{
LabelDefaultClickHandle(const LabelDefaultClickHandle&) = delete;
public:
LabelDefaultClickHandle();
virtual ~LabelDefaultClickHandle();
LabelDefaultClickHandle &operator=(LabelDefaultClickHandle&&) = default;
LabelDefaultClickHandle &operator=
(const LabelDefaultClickHandle&) = default;
Result Click
(const TrackPanelMouseEvent &event, AudacityProject *pProject) override;

3
src/tracks/labeltrack/ui/LabelGlyphHandle.h
View File

@ -38,7 +38,6 @@ struct LabelTrackHit {
class LabelGlyphHandle final : public LabelDefaultClickHandle
{
LabelGlyphHandle(const LabelGlyphHandle&) = delete;
static HitTestPreview HitPreview(bool hitCenter);
public:
@ -46,7 +45,7 @@ public:
(const std::shared_ptr<LabelTrack> &pLT,
const wxRect &rect, const LabelTrackHit &hit);
LabelGlyphHandle &operator=(LabelGlyphHandle&&) = default;
LabelGlyphHandle &operator=(const LabelGlyphHandle&) = default;
static UIHandlePtr HitTest
(std::weak_ptr<LabelGlyphHandle> &holder,

4
src/tracks/labeltrack/ui/LabelTextHandle.h
View File

@ -22,8 +22,6 @@ class SelectionStateChanger;
class LabelTextHandle final : public LabelDefaultClickHandle
{
LabelTextHandle(const LabelTextHandle&) = delete;
static HitTestPreview HitPreview();
public:
@ -31,7 +29,7 @@ public:
(std::weak_ptr<LabelTextHandle> &holder,
const wxMouseState &state, const std::shared_ptr<LabelTrack> &pLT);
LabelTextHandle &operator=(LabelTextHandle&&) = default;
LabelTextHandle &operator=(const LabelTextHandle&) = default;
explicit LabelTextHandle
( const std::shared_ptr<LabelTrack> &pLT, int labelNum );