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

Track::SetLinked() and Track::SetChannel() are private...

Browse Source 
... but class WaveTrack needs to invoke SetLinked still during project load
This commit is contained in:
Paul Licameli 2018-09-20 12:28:41 -04:00
parent beebe648fb
commit 32d767c7f5
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Track.h
View File

@ -327,8 +327,11 @@ private:
Track *GetLink() const; Track *GetLink() const;
bool GetLinked () const { return mLinked; } bool GetLinked () const { return mLinked; }
public:
friend WaveTrack; // WaveTrack needs to call SetLinked when reloading project
void SetLinked (bool l); void SetLinked (bool l);
void SetChannel(ChannelType c) { mChannel = c; }
private: private:
// No need yet to make this virtual // No need yet to make this virtual
void DoSetLinked(bool l); void DoSetLinked(bool l);
@ -380,7 +383,6 @@ public:
void Offset(double t) { SetOffset(GetOffset() + t); } void Offset(double t) { SetOffset(GetOffset() + t); }
virtual void SetOffset (double o) { mOffset = o; } virtual void SetOffset (double o) { mOffset = o; }
void SetChannel(ChannelType c) { mChannel = c; }
virtual void SetPan( float ){ ;} virtual void SetPan( float ){ ;}
virtual void SetPanFromChannelType(){ ;}; virtual void SetPanFromChannelType(){ ;};

2
src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp
View File

@ -802,6 +802,7 @@ void WaveTrackMenuTable::OnSpectrogramSettings(wxCommandEvent &)
} }
} }
#if 0
void WaveTrackMenuTable::OnChannelChange(wxCommandEvent & event) void WaveTrackMenuTable::OnChannelChange(wxCommandEvent & event)
{ {
int id = event.GetId(); int id = event.GetId();
@ -834,6 +835,7 @@ void WaveTrackMenuTable::OnChannelChange(wxCommandEvent & event)
_("Channel")); _("Channel"));
mpData->result = RefreshCode::RefreshAll; mpData->result = RefreshCode::RefreshAll;
} }
#endif
/// Merge two tracks into one stereo track ?? /// Merge two tracks into one stereo track ??
void WaveTrackMenuTable::OnMergeStereo(wxCommandEvent &) void WaveTrackMenuTable::OnMergeStereo(wxCommandEvent &)