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

build fix

Browse Source
This commit is contained in:
Paul Licameli 2017-07-09 14:09:33 -04:00
parent 0fa0d480e4
commit cb9d37f362
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/WaveClip.h
View File

@ -119,9 +119,9 @@ public:
class WaveClip;
// Array of pointers that assume ownership
using WaveClipHolder = movable_ptr< WaveClip >;
using WaveClipHolder = std::shared_ptr< WaveClip >;
using WaveClipHolders = std::vector < WaveClipHolder >;
using WaveClipConstHolders = std::vector < movable_ptr< const WaveClip > >;
using WaveClipConstHolders = std::vector < std::shared_ptr< const WaveClip > >;
// Temporary arrays of mere pointers
using WaveClipPointers = std::vector < WaveClip* >;

4
src/WaveTrack.cpp
View File

@ -1020,7 +1020,7 @@ namespace
}
}
movable_ptr<WaveClip> WaveTrack::RemoveAndReturnClip(WaveClip* clip)
std::shared_ptr<WaveClip> WaveTrack::RemoveAndReturnClip(WaveClip* clip)
{
// Be clear about who owns the clip!!
auto it = FindClip(mClips, clip);
@ -1033,7 +1033,7 @@ movable_ptr<WaveClip> WaveTrack::RemoveAndReturnClip(WaveClip* clip)
return {};
}
void WaveTrack::AddClip(movable_ptr<WaveClip> &&clip)
void WaveTrack::AddClip(std::shared_ptr<WaveClip> &&clip)
{
// Uncomment the following line after we correct the problem of zero-length clips
//if (CanInsertClip(clip))

4
src/WaveTrack.h
View File

@ -495,10 +495,10 @@ class AUDACITY_DLL_API WaveTrack final : public PlayableTrack {
// Remove the clip from the track and return a SMART pointer to it.
// You assume responsibility for its memory!
movable_ptr<WaveClip> RemoveAndReturnClip(WaveClip* clip);
std::shared_ptr<WaveClip> RemoveAndReturnClip(WaveClip* clip);
// Append a clip to the track
void AddClip(movable_ptr<WaveClip> &&clip); // Call using std::move
void AddClip(std::shared_ptr<WaveClip> &&clip); // Call using std::move
// Merge two clips, that is append data from clip2 to clip1,
// then remove clip2 from track.