audacia
/
audacia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replace virtual with override wherever possible; eliminate needless virtual... 

... for functions in final classes.

override is like const -- it's not necessary, but it helps the compiler to
catch mistakes.

There may be some overriding functions not explicitly declared virtual and I did
not identify such cases, in which I might also add override.
This commit is contained in:
Paul Licameli 2016-02-24 01:06:47 -05:00
parent 74121c1494
commit 990080ae7d
169 changed files with 1652 additions and 1639 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/AudacityApp.h
View File

@ -99,9 +99,9 @@ class BlockFile;
class AudacityApp final : public wxApp {
public:
AudacityApp();
virtual bool OnInit(void);
virtual int OnExit(void);
virtual void OnFatalException();
bool OnInit(void) override;
int OnExit(void) override;
void OnFatalException() override;
int FilterEvent(wxEvent & event);
@ -151,9 +151,9 @@ class AudacityApp final : public wxApp {
#ifdef __WXMAC__
// In response to Apple Events
virtual void MacOpenFile(const wxString &fileName) ;
virtual void MacPrintFile(const wxString &fileName) ;
virtual void MacNewFile() ;
void MacOpenFile(const wxString &fileName) override;
void MacPrintFile(const wxString &fileName) override;
void MacNewFile() override;
#endif
#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) && !defined(__CYGWIN__)

4
src/AudacityLogger.h
View File

@ -37,8 +37,8 @@ class AudacityLogger final : public wxEvtHandler, public wxLog {
#endif
protected:
virtual void Flush();
virtual void DoLogText(const wxString & msg);
void Flush() override;
void DoLogText(const wxString & msg) override;
private:
void OnCloseWindow(wxCloseEvent & e);

45
src/AutoRecovery.h
View File

@ -45,12 +45,12 @@ class RecordingRecoveryHandler final : public XMLTagHandler
{
public:
RecordingRecoveryHandler(AudacityProject* proj);
virtual bool HandleXMLTag(const wxChar *tag, const wxChar **attrs);
virtual void HandleXMLEndTag(const wxChar *tag);
virtual XMLTagHandler *HandleXMLChild(const wxChar *tag);
bool HandleXMLTag(const wxChar *tag, const wxChar **attrs) override;
void HandleXMLEndTag(const wxChar *tag) override;
XMLTagHandler *HandleXMLChild(const wxChar *tag) override;
// This class only knows reading tags
virtual void WriteXML(XMLWriter & WXUNUSED(xmlFile)) { wxASSERT(false); }
// void WriteXML(XMLWriter & WXUNUSED(xmlFile)) /* not override */ { wxASSERT(false); }
private:
@ -80,31 +80,32 @@ public:
AutoSaveFile(size_t allocSize = 1024 * 1024);
virtual ~AutoSaveFile();
virtual void StartTag(const wxString & name);
virtual void EndTag(const wxString & name);
void StartTag(const wxString & name) override;
void EndTag(const wxString & name) override;
virtual void WriteAttr(const wxString & name, const wxString &value);
virtual void WriteAttr(const wxString & name, const wxChar *value);
void WriteAttr(const wxString & name, const wxString &value) override;
void WriteAttr(const wxString & name, const wxChar *value) override;
virtual void WriteAttr(const wxString & name, int value);
virtual void WriteAttr(const wxString & name, bool value);
virtual void WriteAttr(const wxString & name, long value);
virtual void WriteAttr(const wxString & name, long long value);
virtual void WriteAttr(const wxString & name, size_t value);
virtual void WriteAttr(const wxString & name, float value, int digits = -1);
virtual void WriteAttr(const wxString & name, double value, int digits = -1);
void WriteAttr(const wxString & name, int value) override;
void WriteAttr(const wxString & name, bool value) override;
void WriteAttr(const wxString & name, long value) override;
void WriteAttr(const wxString & name, long long value) override;
void WriteAttr(const wxString & name, size_t value) override;
void WriteAttr(const wxString & name, float value, int digits = -1) override;
void WriteAttr(const wxString & name, double value, int digits = -1) override;
virtual void WriteData(const wxString & value);
void WriteData(const wxString & value) override;
void Write(const wxString & data) override;
virtual void WriteSubTree(const AutoSaveFile & value);
// Non-override functions
void WriteSubTree(const AutoSaveFile & value);
virtual void Write(const wxString & data);
virtual bool Write(wxFFile & file) const;
virtual bool Append(wxFFile & file) const;
bool Write(wxFFile & file) const;
bool Append(wxFFile & file) const;
virtual bool IsEmpty() const;
bool IsEmpty() const;
virtual bool Decode(const wxString & fileName);
bool Decode(const wxString & fileName);
private:
void WriteName(const wxString & name);

13
src/BlockFile.h
View File

@ -38,7 +38,7 @@ class SummaryInfo {
class PROFILE_DLL_API BlockFile /* not final */ {
class PROFILE_DLL_API BlockFile /* not final, abstract */ {
public:
// Constructor / Destructor
@ -196,11 +196,7 @@ class AliasBlockFile /* not final */ : public BlockFile
// Reading
/// Retrieves audio data from the aliased file.
virtual int ReadData(samplePtr data, sampleFormat format,
sampleCount start, sampleCount len) = 0;
virtual wxLongLong GetSpaceUsage();
wxLongLong GetSpaceUsage() override;
/// as SilentLog (which would affect Summary data access), but
// applying to Alias file access
@ -211,13 +207,14 @@ class AliasBlockFile /* not final */ : public BlockFile
//
wxFileName GetAliasedFileName() { return mAliasedFileName; }
void ChangeAliasedFileName(wxFileName newAliasedFile);
virtual bool IsAlias() { return true; }
bool IsAlias() override { return true; }
protected:
// Introduce a NEW virtual.
/// Write the summary to disk, using the derived ReadData() to get the data
virtual void WriteSummary();
/// Read the summary into a buffer
virtual bool ReadSummary(void *data);
bool ReadSummary(void *data) override;
wxFileName mAliasedFileName;
sampleCount mAliasStart;

10
src/Envelope.h
View File

@ -98,13 +98,13 @@ class Envelope final : public XMLTagHandler {
#if LEGACY_PROJECT_FILE_SUPPORT
// File I/O
virtual bool Load(wxTextFile * in, DirManager * dirManager);
virtual bool Save(wxTextFile * out, bool overwrite);
bool Load(wxTextFile * in, DirManager * dirManager) override;
bool Save(wxTextFile * out, bool overwrite) override;
#endif
// Newfangled XML file I/O
virtual bool HandleXMLTag(const wxChar *tag, const wxChar **attrs);
virtual XMLTagHandler *HandleXMLChild(const wxChar *tag);
virtual void WriteXML(XMLWriter &xmlFile) const;
bool HandleXMLTag(const wxChar *tag, const wxChar **attrs) override;
XMLTagHandler *HandleXMLChild(const wxChar *tag) override;
void WriteXML(XMLWriter &xmlFile) const /* not override */;
void DrawPoints(wxDC & dc, const wxRect & r, const ZoomInfo &zoomInfo,
bool dB, double dBRange,

2
src/FreqWindow.h
View File

@ -130,7 +130,7 @@ public:
const wxString & title, const wxPoint & pos);
virtual ~ FreqWindow();
virtual bool Show( bool show = true );
bool Show( bool show = true ) override;
private:
void GetAudio();

2
src/LabelDialog.h
View File

@ -42,7 +42,7 @@ class LabelDialog final : public wxDialog
const wxString & format);
~LabelDialog();
virtual bool Show(bool show = true);
bool Show(bool show = true) override;
private:

36
src/LabelTrack.h
View File

@ -122,7 +122,7 @@ class AUDACITY_DLL_API LabelTrack final : public Track
LabelTrack(const LabelTrack &orig);
virtual ~ LabelTrack();
virtual void SetOffset(double dOffset);
void SetOffset(double dOffset) override;
static void ResetFont();
@ -133,37 +133,37 @@ class AUDACITY_DLL_API LabelTrack final : public Track
int getSelectedIndex() const { return mSelIndex; }
bool IsAdjustingLabel() const { return mIsAdjustingLabel; }
virtual int GetKind() const { return Label; }
int GetKind() const override { return Label; }
virtual double GetOffset() const;
virtual double GetStartTime() const;
virtual double GetEndTime() const;
double GetOffset() const override;
double GetStartTime() const override;
double GetEndTime() const override;
virtual Track *Duplicate() const;
Track *Duplicate() const override;
virtual void SetSelected(bool s);
void SetSelected(bool s) override;
virtual bool HandleXMLTag(const wxChar *tag, const wxChar **attrs);
virtual XMLTagHandler *HandleXMLChild(const wxChar *tag);
virtual void WriteXML(XMLWriter &xmlFile);
bool HandleXMLTag(const wxChar *tag, const wxChar **attrs) override;
XMLTagHandler *HandleXMLChild(const wxChar *tag) override;
void WriteXML(XMLWriter &xmlFile) override;
#if LEGACY_PROJECT_FILE_SUPPORT
virtual bool Load(wxTextFile * in, DirManager * dirManager);
virtual bool Save(wxTextFile * out, bool overwrite);
bool Load(wxTextFile * in, DirManager * dirManager) override;
bool Save(wxTextFile * out, bool overwrite) override;
#endif
virtual bool Cut (double t0, double t1, Track ** dest);
bool Cut (double t0, double t1, Track ** dest) override;
// JKC Do not add the const modifier to Copy(), Clear()
// or Paste() because then it
// is no longer recognised as a virtual function matching the
// one in Track.
virtual bool Copy (double t0, double t1, Track ** dest);// const;
virtual bool Clear(double t0, double t1);
virtual bool Paste(double t, Track * src);
bool Copy (double t0, double t1, Track ** dest) override;// const;
bool Clear(double t0, double t1) override;
bool Paste(double t, Track * src) override;
bool Repeat(double t0, double t1, int n);
virtual bool Silence(double t0, double t1);
virtual bool InsertSilence(double t, double len);
bool Silence(double t0, double t1) override;
bool InsertSilence(double t, double len) override;
int OverGlyph(int x, int y);
static wxBitmap & GetGlyph( int i);

8
src/Menus.cpp
View File

@ -6009,7 +6009,7 @@ class ASAProgress final : public SAProgress {
fclose(mTimeFile);
#endif
}
virtual void set_phase(int i) {
void set_phase(int i) override {
float work[2]; // chromagram computation work estimates
float work2, work3 = 0; // matrix and smoothing work estimates
SAProgress::set_phase(i);
@ -6067,7 +6067,7 @@ class ASAProgress final : public SAProgress {
(ms * 0.001) / (wxMax(mFrames[0], mFrames[1]) * iterations));
}
}
virtual bool set_feature_progress(float s) {
bool set_feature_progress(float s) override {
float work;
if (phase == 0) {
float f = s / frame_period;
@ -6080,7 +6080,7 @@ class ASAProgress final : public SAProgress {
int updateResult = mProgress->Update(int(work), int(mTotalWork));
return (updateResult == eProgressSuccess);
}
virtual bool set_matrix_progress(int cells) {
bool set_matrix_progress(int cells) override {
mCellCount += cells;
float work =
(is_audio[0] ? AUDIO_WORK_UNIT : MIDI_WORK_UNIT) * mFrames[0] +
@ -6089,7 +6089,7 @@ class ASAProgress final : public SAProgress {
int updateResult = mProgress->Update(int(work), int(mTotalWork));
return (updateResult == eProgressSuccess);
}
virtual bool set_smoothing_progress(int i) {
bool set_smoothing_progress(int i) override {
iterations = i;
float work =
(is_audio[0] ? AUDIO_WORK_UNIT : MIDI_WORK_UNIT) * mFrames[0] +

2
src/ModuleManager.h
View File

@ -75,7 +75,7 @@ public:
// ModuleManagerInterface implementation
// -------------------------------------------------------------------------
virtual void RegisterModule(ModuleInterface *module);
void RegisterModule(ModuleInterface *module) override;
// -------------------------------------------------------------------------
// ModuleManager implementation

28
src/NoteTrack.h
View File

@ -57,13 +57,13 @@ class AUDACITY_DLL_API NoteTrack final : public Track {
NoteTrack(DirManager * projDirManager);
virtual ~NoteTrack();
virtual Track *Duplicate() const;
Track *Duplicate() const override;
virtual int GetKind() const { return Note; }
int GetKind() const override { return Note; }
virtual double GetOffset() const;
virtual double GetStartTime() const;
virtual double GetEndTime() const;
double GetOffset() const override;
double GetStartTime() const override;
double GetEndTime() const override;
void WarpAndTransposeNotes(double t0, double t1,
const TimeWarper &warper, double semitones);
@ -89,12 +89,12 @@ class AUDACITY_DLL_API NoteTrack final : public Track {
// }
// High-level editing
virtual bool Cut (double t0, double t1, Track **dest);
virtual bool Copy (double t0, double t1, Track **dest);
virtual bool Trim (double t0, double t1);
virtual bool Clear(double t0, double t1);
virtual bool Paste(double t, Track *src);
virtual bool Shift(double t);
bool Cut (double t0, double t1, Track **dest) override;
bool Copy (double t0, double t1, Track **dest) override;
bool Trim (double t0, double t1) /* not override */;
bool Clear(double t0, double t1) override;
bool Paste(double t, Track *src) override;
bool Shift(double t) /* not override */;
#ifdef EXPERIMENTAL_MIDI_OUT
float GetGain() const { return mGain; }
@ -169,9 +169,9 @@ class AUDACITY_DLL_API NoteTrack final : public Track {
void SetGainPlacementRect(const wxRect &r) { mGainPlacementRect = r; }
#endif
virtual bool HandleXMLTag(const wxChar *tag, const wxChar **attrs);
virtual XMLTagHandler *HandleXMLChild(const wxChar *tag);
virtual void WriteXML(XMLWriter &xmlFile);
bool HandleXMLTag(const wxChar *tag, const wxChar **attrs) override;
XMLTagHandler *HandleXMLChild(const wxChar *tag) override;
void WriteXML(XMLWriter &xmlFile) override;
// channels are numbered as integers 0-15, visible channels
// (mVisibleChannels) is a bit set. Channels are displayed as

26
src/PluginManager.cpp
View File

@ -68,10 +68,10 @@ public:
// Retrieves the address of an IDispatch interface for the specified child.
// All objects must support this property.
virtual wxAccStatus GetChild( int childId, wxAccessible **child );
wxAccStatus GetChild( int childId, wxAccessible **child ) override;
// Gets the number of children.
virtual wxAccStatus GetChildCount( int *childCount );
wxAccStatus GetChildCount( int *childCount ) override;
// Gets the default action for this object (0) or > 0 (the action for a child).
// Return wxACC_OK even if there is no action. actionName is the action, or the empty
@ -79,33 +79,33 @@ public:
// The retrieved string describes the action that is performed on an object,
// not what the object does as a result. For example, a toolbar button that prints
// a document has a default action of "Press" rather than "Prints the current document."
virtual wxAccStatus GetDefaultAction( int childId, wxString *actionName );
wxAccStatus GetDefaultAction( int childId, wxString *actionName ) override;
// Returns the description for this object or a child.
virtual wxAccStatus GetDescription( int childId, wxString *description );
wxAccStatus GetDescription( int childId, wxString *description ) override;
// Gets the window with the keyboard focus.
// If childId is 0 and child is NULL, no object in
// this subhierarchy has the focus.
// If this object has the focus, child should be 'this'.
virtual wxAccStatus GetFocus( int *childId, wxAccessible **child );
wxAccStatus GetFocus( int *childId, wxAccessible **child ) override;
// Returns help text for this object or a child, similar to tooltip text.
virtual wxAccStatus GetHelpText( int childId, wxString *helpText );
wxAccStatus GetHelpText( int childId, wxString *helpText ) override;
// Returns the keyboard shortcut for this object or child.
// Return e.g. ALT+K
virtual wxAccStatus GetKeyboardShortcut( int childId, wxString *shortcut );
wxAccStatus GetKeyboardShortcut( int childId, wxString *shortcut ) override;
// Returns the rectangle for this object (id = 0) or a child element (id > 0).
// rect is in screen coordinates.
virtual wxAccStatus GetLocation( wxRect& rect, int elementId );
wxAccStatus GetLocation( wxRect& rect, int elementId ) override;
// Gets the name of the specified object.
virtual wxAccStatus GetName( int childId, wxString *name );
wxAccStatus GetName( int childId, wxString *name ) override;
// Returns a role constant.
virtual wxAccStatus GetRole( int childId, wxAccRole *role );
wxAccStatus GetRole( int childId, wxAccRole *role ) override;
// Gets a variant representing the selected children
// of this object.
@ -115,14 +115,14 @@ public:
// - an integer representing the selected child element,
// or 0 if this object is selected (GetType() == wxT("long"))
// - a "void*" pointer to a wxAccessible child object
virtual wxAccStatus GetSelections( wxVariant *selections );
wxAccStatus GetSelections( wxVariant *selections ) override;
// Returns a state constant.
virtual wxAccStatus GetState( int childId, long* state );
wxAccStatus GetState( int childId, long* state ) override;
// Returns a localized string representing the value for the object
// or child.
virtual wxAccStatus GetValue( int childId, wxString *strValue );
wxAccStatus GetValue( int childId, wxString *strValue ) override;
void SetSelected( int item, bool focused = true );

76
src/PluginManager.h
View File

@ -172,56 +172,56 @@ public:
// PluginManagerInterface implementation
virtual bool IsPluginRegistered(const wxString & path);
bool IsPluginRegistered(const wxString & path) override;
virtual const PluginID & RegisterPlugin(ModuleInterface *module);
virtual const PluginID & RegisterPlugin(ModuleInterface *provider, EffectIdentInterface *effect);
virtual const PluginID & RegisterPlugin(ModuleInterface *provider, ImporterInterface *importer);
const PluginID & RegisterPlugin(ModuleInterface *module) override;
const PluginID & RegisterPlugin(ModuleInterface *provider, EffectIdentInterface *effect) override;
const PluginID & RegisterPlugin(ModuleInterface *provider, ImporterInterface *importer) override;
virtual void FindFilesInPathList(const wxString & pattern,
void FindFilesInPathList(const wxString & pattern,
const wxArrayString & pathList,
wxArrayString & files,
bool directories = false);
bool directories = false) override;
virtual bool HasSharedConfigGroup(const PluginID & ID, const wxString & group);
virtual bool GetSharedConfigSubgroups(const PluginID & ID, const wxString & group, wxArrayString & subgroups);
bool HasSharedConfigGroup(const PluginID & ID, const wxString & group) /* not override */;
bool GetSharedConfigSubgroups(const PluginID & ID, const wxString & group, wxArrayString & subgroups) override;
virtual bool GetSharedConfig(const PluginID & ID, const wxString & group, const wxString & key, wxString & value, const wxString & defval = _T(""));
virtual bool GetSharedConfig(const PluginID & ID, const wxString & group, const wxString & key, int & value, int defval = 0);
virtual bool GetSharedConfig(const PluginID & ID, const wxString & group, const wxString & key, bool & value, bool defval = false);
virtual bool GetSharedConfig(const PluginID & ID, const wxString & group, const wxString & key, float & value, float defval = 0.0);
virtual bool GetSharedConfig(const PluginID & ID, const wxString & group, const wxString & key, double & value, double defval = 0.0);
virtual bool GetSharedConfig(const PluginID & ID, const wxString & group, const wxString & key, sampleCount & value, sampleCount defval = 0);
bool GetSharedConfig(const PluginID & ID, const wxString & group, const wxString & key, wxString & value, const wxString & defval = _T("")) override;
bool GetSharedConfig(const PluginID & ID, const wxString & group, const wxString & key, int & value, int defval = 0) override;
bool GetSharedConfig(const PluginID & ID, const wxString & group, const wxString & key, bool & value, bool defval = false) override;
bool GetSharedConfig(const PluginID & ID, const wxString & group, const wxString & key, float & value, float defval = 0.0) override;
bool GetSharedConfig(const PluginID & ID, const wxString & group, const wxString & key, double & value, double defval = 0.0) override;
bool GetSharedConfig(const PluginID & ID, const wxString & group, const wxString & key, sampleCount & value, sampleCount defval = 0) override;
virtual bool SetSharedConfig(const PluginID & ID, const wxString & group, const wxString & key, const wxString & value);
virtual bool SetSharedConfig(const PluginID & ID, const wxString & group, const wxString & key, const int & value);
virtual bool SetSharedConfig(const PluginID & ID, const wxString & group, const wxString & key, const bool & value);
virtual bool SetSharedConfig(const PluginID & ID, const wxString & group, const wxString & key, const float & value);
virtual bool SetSharedConfig(const PluginID & ID, const wxString & group, const wxString & key, const double & value);
virtual bool SetSharedConfig(const PluginID & ID, const wxString & group, const wxString & key, const sampleCount & value);
bool SetSharedConfig(const PluginID & ID, const wxString & group, const wxString & key, const wxString & value) override;
bool SetSharedConfig(const PluginID & ID, const wxString & group, const wxString & key, const int & value) override;
bool SetSharedConfig(const PluginID & ID, const wxString & group, const wxString & key, const bool & value) override;
bool SetSharedConfig(const PluginID & ID, const wxString & group, const wxString & key, const float & value) override;
bool SetSharedConfig(const PluginID & ID, const wxString & group, const wxString & key, const double & value) override;
bool SetSharedConfig(const PluginID & ID, const wxString & group, const wxString & key, const sampleCount & value) override;
virtual bool RemoveSharedConfigSubgroup(const PluginID & ID, const wxString & group);
virtual bool RemoveSharedConfig(const PluginID & ID, const wxString & group, const wxString & key);
bool RemoveSharedConfigSubgroup(const PluginID & ID, const wxString & group) override;
bool RemoveSharedConfig(const PluginID & ID, const wxString & group, const wxString & key) override;
virtual bool HasPrivateConfigGroup(const PluginID & ID, const wxString & group);
virtual bool GetPrivateConfigSubgroups(const PluginID & ID, const wxString & group, wxArrayString & subgroups);
bool HasPrivateConfigGroup(const PluginID & ID, const wxString & group) /* not override */;
bool GetPrivateConfigSubgroups(const PluginID & ID, const wxString & group, wxArrayString & subgroups) override;
virtual bool GetPrivateConfig(const PluginID & ID, const wxString & group, const wxString & key, wxString & value, const wxString & defval = _T(""));
virtual bool GetPrivateConfig(const PluginID & ID, const wxString & group, const wxString & key, int & value, int defval = 0);
virtual bool GetPrivateConfig(const PluginID & ID, const wxString & group, const wxString & key, bool & value, bool defval = false);
virtual bool GetPrivateConfig(const PluginID & ID, const wxString & group, const wxString & key, float & value, float defval = 0.0);
virtual bool GetPrivateConfig(const PluginID & ID, const wxString & group, const wxString & key, double & value, double defval = 0.0);
virtual bool GetPrivateConfig(const PluginID & ID, const wxString & group, const wxString & key, sampleCount & value, sampleCount defval = 0);
bool GetPrivateConfig(const PluginID & ID, const wxString & group, const wxString & key, wxString & value, const wxString & defval = _T("")) override;
bool GetPrivateConfig(const PluginID & ID, const wxString & group, const wxString & key, int & value, int defval = 0) override;
bool GetPrivateConfig(const PluginID & ID, const wxString & group, const wxString & key, bool & value, bool defval = false) override;
bool GetPrivateConfig(const PluginID & ID, const wxString & group, const wxString & key, float & value, float defval = 0.0) override;
bool GetPrivateConfig(const PluginID & ID, const wxString & group, const wxString & key, double & value, double defval = 0.0) override;
bool GetPrivateConfig(const PluginID & ID, const wxString & group, const wxString & key, sampleCount & value, sampleCount defval = 0) override;
virtual bool SetPrivateConfig(const PluginID & ID, const wxString & group, const wxString & key, const wxString & value);
virtual bool SetPrivateConfig(const PluginID & ID, const wxString & group, const wxString & key, const int & value);
virtual bool SetPrivateConfig(const PluginID & ID, const wxString & group, const wxString & key, const bool & value);
virtual bool SetPrivateConfig(const PluginID & ID, const wxString & group, const wxString & key, const float & value);
virtual bool SetPrivateConfig(const PluginID & ID, const wxString & group, const wxString & key, const double & value);
virtual bool SetPrivateConfig(const PluginID & ID, const wxString & group, const wxString & key, const sampleCount & value);
bool SetPrivateConfig(const PluginID & ID, const wxString & group, const wxString & key, const wxString & value) override;
bool SetPrivateConfig(const PluginID & ID, const wxString & group, const wxString & key, const int & value) override;
bool SetPrivateConfig(const PluginID & ID, const wxString & group, const wxString & key, const bool & value) override;
bool SetPrivateConfig(const PluginID & ID, const wxString & group, const wxString & key, const float & value) override;
bool SetPrivateConfig(const PluginID & ID, const wxString & group, const wxString & key, const double & value) override;
bool SetPrivateConfig(const PluginID & ID, const wxString & group, const wxString & key, const sampleCount & value) override;
virtual bool RemovePrivateConfigSubgroup(const PluginID & ID, const wxString & group);
virtual bool RemovePrivateConfig(const PluginID & ID, const wxString & group, const wxString & key);
bool RemovePrivateConfigSubgroup(const PluginID & ID, const wxString & group) override;
bool RemovePrivateConfig(const PluginID & ID, const wxString & group, const wxString & key) override;
// PluginManager implementation

73
src/Project.h
View File

@ -133,12 +133,12 @@ class ImportXMLTagHandler final : public XMLTagHandler
public:
ImportXMLTagHandler(AudacityProject* pProject) { mProject = pProject; }
virtual bool HandleXMLTag(const wxChar *tag, const wxChar **attrs);
virtual XMLTagHandler *HandleXMLChild(const wxChar * WXUNUSED(tag)) { return NULL; }
bool HandleXMLTag(const wxChar *tag, const wxChar **attrs) override;
XMLTagHandler *HandleXMLChild(const wxChar * WXUNUSED(tag)) override { return NULL; }
// Don't want a WriteXML method because ImportXMLTagHandler is not a WaveTrack.
// <import> tags are instead written by AudacityProject::WriteXML.
// virtual void WriteXML(XMLWriter &xmlFile) { wxASSERT(false); }
// void WriteXML(XMLWriter &xmlFile) /* not override */ { wxASSERT(false); }
private:
AudacityProject* mProject;
@ -390,26 +390,27 @@ class AUDACITY_DLL_API AudacityProject final : public wxFrame,
double PixelWidthBeforeTime(double scrollto) const;
void SetHorizontalThumb(double scrollto);
// PRL: old and incorrect comment below, these functions are used elsewhere than TrackPanel
// TrackPanel access
virtual wxSize GetTPTracksUsableArea();
virtual void RefreshTPTrack(Track* pTrk, bool refreshbacking = true);
wxSize GetTPTracksUsableArea() /* not override */;
void RefreshTPTrack(Track* pTrk, bool refreshbacking = true) /* not override */;
// TrackPanel callback methods, overrides of TrackPanelListener
virtual void TP_DisplaySelection();
virtual void TP_DisplayStatusMessage(const wxString &msg) override;
void TP_DisplaySelection() override;
void TP_DisplayStatusMessage(const wxString &msg) override;
virtual ToolsToolBar * TP_GetToolsToolBar();
ToolsToolBar * TP_GetToolsToolBar() override;
virtual void TP_PushState(const wxString &longDesc, const wxString &shortDesc,
void TP_PushState(const wxString &longDesc, const wxString &shortDesc,
UndoPush flags) override;
virtual void TP_ModifyState(bool bWantsAutoSave); // if true, writes auto-save file. Should set only if you really want the state change restored after
void TP_ModifyState(bool bWantsAutoSave) override; // if true, writes auto-save file. Should set only if you really want the state change restored after
// a crash, as it can take many seconds for large (eg. 10 track-hours) projects
virtual void TP_RedrawScrollbars();
virtual void TP_ScrollLeft();
virtual void TP_ScrollRight();
virtual void TP_ScrollWindow(double scrollto);
virtual void TP_ScrollUpDown(int delta);
virtual void TP_HandleResize();
void TP_RedrawScrollbars() override;
void TP_ScrollLeft() override;
void TP_ScrollRight() override;
void TP_ScrollWindow(double scrollto) override;
void TP_ScrollUpDown(int delta) override;
void TP_HandleResize() override;
// ToolBar
@ -442,33 +443,33 @@ private:
public:
// SelectionBarListener callback methods
virtual double AS_GetRate();
virtual void AS_SetRate(double rate);
virtual int AS_GetSnapTo();
virtual void AS_SetSnapTo(int snap);
virtual const wxString & AS_GetSelectionFormat();
virtual void AS_SetSelectionFormat(const wxString & format);
virtual void AS_ModifySelection(double &start, double &end, bool done);
double AS_GetRate() override;
void AS_SetRate(double rate) override;
int AS_GetSnapTo() override;
void AS_SetSnapTo(int snap) override;
const wxString & AS_GetSelectionFormat() override;
void AS_SetSelectionFormat(const wxString & format) override;
void AS_ModifySelection(double &start, double &end, bool done) override;
// SpectralSelectionBarListener callback methods
virtual double SSBL_GetRate() const;
double SSBL_GetRate() const override;
virtual const wxString & SSBL_GetFrequencySelectionFormatName();
virtual void SSBL_SetFrequencySelectionFormatName(const wxString & formatName);
const wxString & SSBL_GetFrequencySelectionFormatName() override;
void SSBL_SetFrequencySelectionFormatName(const wxString & formatName) override;
virtual const wxString & SSBL_GetBandwidthSelectionFormatName();
virtual void SSBL_SetBandwidthSelectionFormatName(const wxString & formatName);
const wxString & SSBL_GetBandwidthSelectionFormatName() override;
void SSBL_SetBandwidthSelectionFormatName(const wxString & formatName) override;
virtual void SSBL_ModifySpectralSelection(double &bottom, double &top, bool done);
void SSBL_ModifySpectralSelection(double &bottom, double &top, bool done) override;
void SetStateTo(unsigned int n);
// XMLTagHandler callback methods
virtual bool HandleXMLTag(const wxChar *tag, const wxChar **attrs);
virtual XMLTagHandler *HandleXMLChild(const wxChar *tag);
virtual void WriteXML(XMLWriter &xmlFile);
bool HandleXMLTag(const wxChar *tag, const wxChar **attrs) override;
XMLTagHandler *HandleXMLChild(const wxChar *tag) override;
void WriteXML(XMLWriter &xmlFile) /* not override */;
void WriteXMLHeader(XMLWriter &xmlFile);
@ -476,10 +477,10 @@ public:
ViewInfo mViewInfo;
// Audio IO callback methods
virtual void OnAudioIORate(int rate);
virtual void OnAudioIOStartRecording();
virtual void OnAudioIOStopRecording();
virtual void OnAudioIONewBlockFiles(const AutoSaveFile & blockFileLog);
void OnAudioIORate(int rate) override;
void OnAudioIOStartRecording() override;
void OnAudioIOStopRecording() override;
void OnAudioIONewBlockFiles(const AutoSaveFile & blockFileLog) override;
// Command Handling
bool TryToMakeActionAllowed( wxUint32 & flags, wxUint32 flagsRqd, wxUint32 mask );

2
src/Resample.h
View File

@ -65,7 +65,7 @@ class Resample final
@param outBufferLen How big outBuffer is.
@return Number of output samples created by this call
*/
virtual int Process(double factor,
int Process(double factor,
float *inBuffer,
int inBufferLen,
bool lastFlag,

4
src/Screenshot.cpp
View File

@ -47,7 +47,7 @@ class ScreenFrame final : public wxFrame
ScreenFrame(wxWindow *parent, wxWindowID id);
virtual ~ScreenFrame();
virtual bool ProcessEvent(wxEvent & event);
bool ProcessEvent(wxEvent & event) override;
private:
void Populate();
@ -143,7 +143,7 @@ class ScreenFrameTimer final : public wxTimer
evt = event.Clone();
}
virtual void Notify()
void Notify() override
{
evt->SetEventObject(NULL);
screenFrame->ProcessEvent(*evt);

8
src/Sequence.h
View File

@ -136,10 +136,10 @@ class PROFILE_DLL_API Sequence final : public XMLTagHandler{
// XMLTagHandler callback methods for loading and saving
//
virtual bool HandleXMLTag(const wxChar *tag, const wxChar **attrs);
virtual void HandleXMLEndTag(const wxChar *tag);
virtual XMLTagHandler *HandleXMLChild(const wxChar *tag);
virtual void WriteXML(XMLWriter &xmlFile);
bool HandleXMLTag(const wxChar *tag, const wxChar **attrs) override;
void HandleXMLEndTag(const wxChar *tag) override;
XMLTagHandler *HandleXMLChild(const wxChar *tag) override;
void WriteXML(XMLWriter &xmlFile) /* not override */;
bool GetErrorOpening() { return mErrorOpening; }

2
src/Shuttle.h
View File

@ -56,7 +56,7 @@ public:
wxString mParams;
ShuttleCli(){ mParams = wxT("") ;}
virtual ~ShuttleCli() {}
virtual bool ExchangeWithMaster(const wxString & Name);
bool ExchangeWithMaster(const wxString & Name) override;
};
#endif

16
src/ShuttlePrefs.h
View File

@ -19,16 +19,16 @@ class ShuttlePrefs final : public Shuttle
public:
// constructors and destructors
ShuttlePrefs(){;};
virtual ~ShuttlePrefs() {;};
virtual ~ShuttlePrefs() {};
public:
virtual bool TransferBool( const wxString & Name, bool & bValue, const bool & bDefault );
// virtual bool TransferFloat( const wxString & Name, float & fValue, const float &fDefault );
virtual bool TransferDouble( const wxString & Name, double & dValue, const double &dDefault );
virtual bool TransferInt( const wxString & Name, int & iValue, const int &iDefault );
virtual bool TransferString( const wxString & Name, wxString & strValue, const wxString &strDefault );
virtual bool TransferWrappedType( const wxString & Name, WrappedType & W );
virtual bool ExchangeWithMaster(const wxString & Name);
bool TransferBool( const wxString & Name, bool & bValue, const bool & bDefault ) override;
// bool TransferFloat( const wxString & Name, float & fValue, const float &fDefault ) override;
bool TransferDouble( const wxString & Name, double & dValue, const double &dDefault ) override;
bool TransferInt(const wxString & Name, int & iValue, const int &iDefault) override;
bool TransferString(const wxString & Name, wxString & strValue, const wxString &strDefault) override;
bool TransferWrappedType(const wxString & Name, WrappedType & W) override;
bool ExchangeWithMaster(const wxString & Name) override;
};
#endif

10
src/Tags.h
View File

@ -83,9 +83,9 @@ class AUDACITY_DLL_API Tags final : public XMLTagHandler {
bool ShowEditDialog(wxWindow *parent, const wxString &title, bool force = false);
virtual bool HandleXMLTag(const wxChar *tag, const wxChar **attrs);
virtual XMLTagHandler *HandleXMLChild(const wxChar *tag);
virtual void WriteXML(XMLWriter &xmlFile);
bool HandleXMLTag(const wxChar *tag, const wxChar **attrs) override;
XMLTagHandler *HandleXMLChild(const wxChar *tag) override;
void WriteXML(XMLWriter &xmlFile) /* not override */;
void AllowEditTitle(bool editTitle);
void AllowEditTrackNumber(bool editTrackNumber);
@ -143,8 +143,8 @@ class TagsEditor final : public wxDialog
void PopulateOrExchange(ShuttleGui & S);
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow();
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
private:
void PopulateGenres();

2
src/Theme.cpp
View File

@ -485,7 +485,7 @@ public:
virtual ~SourceOutputStream();
protected:
virtual size_t OnSysWrite(const void *buffer, size_t bufsize);
size_t OnSysWrite(const void *buffer, size_t bufsize) override;
wxFile File;
int nBytes;
};

4
src/Theme.h
View File

@ -143,8 +143,8 @@ public:
public:
~Theme(void);
public:
virtual void EnsureInitialised();
virtual void ApplyUpdatedImages();
void EnsureInitialised() override;
void ApplyUpdatedImages() override;
void RegisterImages();
void RegisterColours();
bool mbInitialised;

20
src/TimeTrack.h
View File

@ -40,24 +40,24 @@ class TimeTrack final : public Track {
virtual ~TimeTrack();
// Identifying the type of track
virtual int GetKind() const { return Time; }
int GetKind() const override { return Time; }
// TimeTrack parameters
virtual double GetOffset() const { return 0.0; }
virtual void SetOffset(double /* t */) {}
double GetOffset() const override { return 0.0; }
void SetOffset(double /* t */) override {}
virtual double GetStartTime() const { return 0.0; }
virtual double GetEndTime() const { return 0.0; }
double GetStartTime() const override { return 0.0; }
double GetEndTime() const override { return 0.0; }
void Draw(wxDC & dc, const wxRect & r, const ZoomInfo &zoomInfo);
// XMLTagHandler callback methods for loading and saving
virtual bool HandleXMLTag(const wxChar *tag, const wxChar **attrs);
virtual void HandleXMLEndTag(const wxChar *tag);
virtual XMLTagHandler *HandleXMLChild(const wxChar *tag);
virtual void WriteXML(XMLWriter &xmlFile);
bool HandleXMLTag(const wxChar *tag, const wxChar **attrs) override;
void HandleXMLEndTag(const wxChar *tag) override;
XMLTagHandler *HandleXMLChild(const wxChar *tag) override;
void WriteXML(XMLWriter &xmlFile) override;
// Lock and unlock the track: you must lock the track before
// doing a copy and paste between projects.
@ -131,7 +131,7 @@ class TimeTrack final : public Track {
* @param orig the TimeTrack to copy from
*/
void Init(const TimeTrack &orig);
virtual Track *Duplicate() const;
Track *Duplicate() const override;
friend class TrackFactory;

26
src/Track.h
View File

@ -194,10 +194,7 @@ class AUDACITY_DLL_API Track /* not final */ : public XMLTagHandler
virtual int GetKind() const { return None; }
// XMLTagHandler callback methods
virtual bool HandleXMLTag(const wxChar *tag, const wxChar **attrs) = 0;
virtual XMLTagHandler *HandleXMLChild(const wxChar *tag) = 0;
// XMLTagHandler callback methods -- NEW virtual for writing
virtual void WriteXML(XMLWriter &xmlFile) = 0;
// Returns true if an error was encountered while trying to
@ -273,13 +270,14 @@ class AUDACITY_DLL_API TrackListCondIterator /* not final */ : public TrackListI
virtual ~TrackListCondIterator() {}
// Iteration functions
Track *First(TrackList *val = NULL);
Track *StartWith(Track *val);
Track *Next(bool skiplinked = false);
Track *Prev(bool skiplinked = false);
Track *Last(bool skiplinked = false);
Track *First(TrackList *val = NULL) override;
Track *StartWith(Track *val) override;
Track *Next(bool skiplinked = false) override;
Track *Prev(bool skiplinked = false) override;
Track *Last(bool skiplinked = false) override;
protected:
// NEW virtual
virtual bool Condition(Track *t) = 0;
};
@ -295,7 +293,7 @@ class AUDACITY_DLL_API TrackListOfKindIterator /* not final */ : public TrackLis
virtual ~TrackListOfKindIterator() {}
protected:
virtual bool Condition(Track *t);
virtual bool Condition(Track *t) override;
private:
int kind;
@ -313,7 +311,7 @@ class AUDACITY_DLL_API SelectedTrackListOfKindIterator final : public TrackListO
virtual ~SelectedTrackListOfKindIterator() {}
protected:
bool Condition(Track *t);
bool Condition(Track *t) override;
};
//
@ -328,7 +326,7 @@ class AUDACITY_DLL_API VisibleTrackIterator final : public TrackListCondIterator
virtual ~VisibleTrackIterator() {}
protected:
bool Condition(Track *t);
bool Condition(Track *t) override;
private:
AudacityProject *mProject;
@ -450,8 +448,8 @@ class AUDACITY_DLL_API TrackList final : public wxEvtHandler
#if LEGACY_PROJECT_FILE_SUPPORT
// File I/O
virtual bool Load(wxTextFile * in, DirManager * dirManager);
virtual bool Save(wxTextFile * out, bool overwrite);
bool Load(wxTextFile * in, DirManager * dirManager) override;
bool Save(wxTextFile * out, bool overwrite) override;
#endif
private:

6
src/TrackPanel.cpp
View File

@ -8857,12 +8857,12 @@ public:
{
}
virtual long GetPreferredPage()
long GetPreferredPage() override
{
return mPage;
}
virtual void SavePreferredPage()
void SavePreferredPage() override
{
}
@ -9362,7 +9362,7 @@ public:
TrackPanelFontEnumerator(wxArrayString* fontNames) :
mFontNames(fontNames) {}
virtual bool OnFacename(const wxString& font)
bool OnFacename(const wxString& font) override
{
mFontNames->Add(font);
return true;

2
src/TrackPanel.h
View File

@ -579,7 +579,7 @@ protected:
class AUDACITY_DLL_API AudacityTimer final : public wxTimer {
public:
virtual void Notify() {
void Notify() override{
// (From Debian)
//
// Don't call parent->OnTimer(..) directly here, but instead post

26
src/TrackPanelAx.h
View File

@ -44,10 +44,10 @@ public:
#if wxUSE_ACCESSIBILITY
// Retrieves the address of an IDispatch interface for the specified child.
// All objects must support this property.
virtual wxAccStatus GetChild( int childId, wxAccessible** child );
wxAccStatus GetChild(int childId, wxAccessible** child) override;
// Gets the number of children.
virtual wxAccStatus GetChildCount(int* childCount);
wxAccStatus GetChildCount(int* childCount) override;
// Gets the default action for this object (0) or > 0 (the action for a child).
// Return wxACC_OK even if there is no action. actionName is the action, or the empty
@ -55,33 +55,33 @@ public:
// The retrieved string describes the action that is performed on an object,
// not what the object does as a result. For example, a toolbar button that prints
// a document has a default action of "Press" rather than "Prints the current document."
virtual wxAccStatus GetDefaultAction( int childId, wxString *actionName );
wxAccStatus GetDefaultAction(int childId, wxString *actionName) override;
// Returns the description for this object or a child.
virtual wxAccStatus GetDescription( int childId, wxString *description );
wxAccStatus GetDescription(int childId, wxString *description) override;
// Gets the window with the keyboard focus.
// If childId is 0 and child is NULL, no object in
// this subhierarchy has the focus.
// If this object has the focus, child should be 'this'.
virtual wxAccStatus GetFocus( int *childId, wxAccessible **child );
wxAccStatus GetFocus(int *childId, wxAccessible **child) override;
// Returns help text for this object or a child, similar to tooltip text.
virtual wxAccStatus GetHelpText( int childId, wxString *helpText );
wxAccStatus GetHelpText(int childId, wxString *helpText) override;
// Returns the keyboard shortcut for this object or child.
// Return e.g. ALT+K
virtual wxAccStatus GetKeyboardShortcut( int childId, wxString *shortcut );
wxAccStatus GetKeyboardShortcut(int childId, wxString *shortcut) override;
// Returns the rectangle for this object (id = 0) or a child element (id > 0).
// rect is in screen coordinates.
virtual wxAccStatus GetLocation( wxRect& rect, int elementId );
wxAccStatus GetLocation(wxRect& rect, int elementId) override;
// Gets the name of the specified object.
virtual wxAccStatus GetName( int childId, wxString *name );
wxAccStatus GetName(int childId, wxString *name) override;
// Returns a role constant.
virtual wxAccStatus GetRole( int childId, wxAccRole *role );
wxAccStatus GetRole(int childId, wxAccRole *role) override;
// Gets a variant representing the selected children
// of this object.
@ -91,14 +91,14 @@ public:
// - an integer representing the selected child element,
// or 0 if this object is selected (GetType() == wxT("long"))
// - a "void*" pointer to a wxAccessible child object
virtual wxAccStatus GetSelections( wxVariant *selections );
wxAccStatus GetSelections(wxVariant *selections) override;
// Returns a state constant.
virtual wxAccStatus GetState(int childId, long* state);
wxAccStatus GetState(int childId, long* state) override;
// Returns a localized string representing the value for the object
// or child.
virtual wxAccStatus GetValue(int childId, wxString* strValue);
wxAccStatus GetValue(int childId, wxString* strValue) override;
#endif
private:

8
src/WaveClip.h
View File

@ -367,10 +367,10 @@ public:
// XMLTagHandler callback methods for loading and saving
//
virtual bool HandleXMLTag(const wxChar *tag, const wxChar **attrs);
virtual void HandleXMLEndTag(const wxChar *tag);
virtual XMLTagHandler *HandleXMLChild(const wxChar *tag);
virtual void WriteXML(XMLWriter &xmlFile);
bool HandleXMLTag(const wxChar *tag, const wxChar **attrs) override;
void HandleXMLEndTag(const wxChar *tag) override;
XMLTagHandler *HandleXMLChild(const wxChar *tag) override;
void WriteXML(XMLWriter &xmlFile) /* not override */;
// Cache of values to colour pixels of Spectrogram - used by TrackArtist
SpecPxCache *mSpecPxCache;

56
src/WaveTrack.h
View File

@ -89,8 +89,8 @@ class AUDACITY_DLL_API WaveTrack final : public Track {
typedef WaveTrackLocation Location;
virtual ~WaveTrack();
virtual double GetOffset() const;
virtual void SetOffset (double o);
double GetOffset() const override;
void SetOffset(double o) override;
/** @brief Get the time at which the first clip in the track starts
*
@ -109,9 +109,9 @@ class AUDACITY_DLL_API WaveTrack final : public Track {
// Identifying the type of track
//
virtual int GetKind() const { return Wave; }
int GetKind() const override { return Wave; }
#ifdef EXPERIMENTAL_OUTPUT_DISPLAY
virtual int GetMinimizedHeight() const;
int GetMinimizedHeight() const override;
#endif
//
// WaveTrack parameters
@ -153,34 +153,34 @@ class AUDACITY_DLL_API WaveTrack final : public Track {
// High-level editing
//
virtual bool Cut (double t0, double t1, Track **dest);
virtual bool Copy (double t0, double t1, Track **dest);
virtual bool Clear(double t0, double t1);
virtual bool Paste(double t0, Track *src);
virtual bool ClearAndPaste(double t0, double t1,
bool Cut(double t0, double t1, Track **dest) override;
bool Copy(double t0, double t1, Track **dest) override;
bool Clear(double t0, double t1) override;
bool Paste(double t0, Track *src) override;
bool ClearAndPaste(double t0, double t1,
Track *src,
bool preserve = true,
bool merge = true,
TimeWarper *effectWarper = NULL);
TimeWarper *effectWarper = NULL) /* not override */;
virtual bool Silence(double t0, double t1);
virtual bool InsertSilence(double t, double len);
bool Silence(double t0, double t1) override;
bool InsertSilence(double t, double len) override;
virtual bool SplitAt(double t);
virtual bool Split( double t0, double t1 );
// bool CutAndAddCutLine(double t0, double t1, Track **dest);
virtual bool ClearAndAddCutLine(double t0, double t1);
bool SplitAt(double t) /* not override */;
bool Split(double t0, double t1) /* not override */;
// bool CutAndAddCutLine(double t0, double t1, Track **dest) /* not override */;
bool ClearAndAddCutLine(double t0, double t1) /* not override */;
virtual bool SplitCut (double t0, double t1, Track **dest);
virtual bool SplitDelete(double t0, double t1);
virtual bool Join (double t0, double t1);
virtual bool Disjoin (double t0, double t1);
bool SplitCut(double t0, double t1, Track **dest) /* not override */;
bool SplitDelete(double t0, double t1) /* not override */;
bool Join(double t0, double t1) /* not override */;
bool Disjoin(double t0, double t1) /* not override */;
virtual bool Trim (double t0, double t1);
bool Trim(double t0, double t1) /* not override */;
bool HandleClear(double t0, double t1, bool addCutLines, bool split);
virtual bool SyncLockAdjust(double oldT1, double newT1);
bool SyncLockAdjust(double oldT1, double newT1) override;
/** @brief Returns true if there are no WaveClips in the specified region
*
@ -268,13 +268,13 @@ class AUDACITY_DLL_API WaveTrack final : public Track {
// XMLTagHandler callback methods for loading and saving
//
virtual bool HandleXMLTag(const wxChar *tag, const wxChar **attrs);
virtual void HandleXMLEndTag(const wxChar *tag);
virtual XMLTagHandler *HandleXMLChild(const wxChar *tag);
virtual void WriteXML(XMLWriter &xmlFile);
bool HandleXMLTag(const wxChar *tag, const wxChar **attrs) override;
void HandleXMLEndTag(const wxChar *tag) override;
XMLTagHandler *HandleXMLChild(const wxChar *tag) override;
void WriteXML(XMLWriter &xmlFile) override;
// Returns true if an error occurred while reading from XML
virtual bool GetErrorOpening();
bool GetErrorOpening() override;
//
// Lock and unlock the track: you must lock the track before
@ -387,7 +387,7 @@ class AUDACITY_DLL_API WaveTrack final : public Track {
// This track has been merged into a stereo track. Copy shared parameters
// from the NEW partner.
virtual void Merge(const Track &orig);
void Merge(const Track &orig) override;
// Resample track (i.e. all clips in the track)
bool Resample(int rate, ProgressDialog *progress = NULL);

6
src/blockfile/LegacyAliasBlockFile.h
View File

@ -31,9 +31,9 @@ class LegacyAliasBlockFile final : public PCMAliasBlockFile
bool noRMS);
virtual ~LegacyAliasBlockFile();
virtual void SaveXML(XMLWriter &xmlFile);
virtual BlockFile *Copy(wxFileName fileName);
virtual void Recover();
void SaveXML(XMLWriter &xmlFile) override;
BlockFile *Copy(wxFileName fileName) override;
void Recover() override;
static BlockFile *BuildFromXML(const wxString &projDir, const wxChar **attrs);
};

14
src/blockfile/LegacyBlockFile.h
View File

@ -48,17 +48,17 @@ class LegacyBlockFile final : public BlockFile {
// Reading
/// Read the summary section of the disk file
virtual bool ReadSummary(void *data);
bool ReadSummary(void *data) override;
/// Read the data section of the disk file
virtual int ReadData(samplePtr data, sampleFormat format,
sampleCount start, sampleCount len);
int ReadData(samplePtr data, sampleFormat format,
sampleCount start, sampleCount len) override;
/// Create a NEW block file identical to this one
virtual BlockFile *Copy(wxFileName newFileName);
BlockFile *Copy(wxFileName newFileName) override;
/// Write an XML representation of this file
virtual void SaveXML(XMLWriter &xmlFile);
virtual wxLongLong GetSpaceUsage();
virtual void Recover();
void SaveXML(XMLWriter &xmlFile) override;
wxLongLong GetSpaceUsage() override;
void Recover() override;
static BlockFile *BuildFromXML(const wxString &dir, const wxChar **attrs,
sampleCount len,

48
src/blockfile/ODDecodeBlockFile.h
View File

@ -51,25 +51,25 @@ class ODDecodeBlockFile final : public SimpleBlockFile
virtual ~ODDecodeBlockFile();
//checks to see if summary data has been computed and written to disk yet. Thread safe. Blocks if we are writing summary data.
virtual bool IsSummaryAvailable();
bool IsSummaryAvailable() override;
/// Returns TRUE if this block's complete data is ready to be accessed by Read()
virtual bool IsDataAvailable();
bool IsDataAvailable() override;
/// Returns TRUE if the summary has not yet been written, but is actively being computed and written to disk
virtual bool IsSummaryBeingComputed(){return false;}
bool IsSummaryBeingComputed() override { return false; }
//Calls that rely on summary files need to be overidden
virtual wxLongLong GetSpaceUsage();
wxLongLong GetSpaceUsage() override;
/// Gets extreme values for the specified region
virtual void GetMinMax(sampleCount start, sampleCount len,
float *outMin, float *outMax, float *outRMS);
void GetMinMax(sampleCount start, sampleCount len,
float *outMin, float *outMax, float *outRMS) override;
/// Gets extreme values for the entire block
virtual void GetMinMax(float *outMin, float *outMax, float *outRMS);
void GetMinMax(float *outMin, float *outMax, float *outRMS) override;
/// Returns the 256 byte summary data block
virtual bool Read256(float *buffer, sampleCount start, sampleCount len);
bool Read256(float *buffer, sampleCount start, sampleCount len) override;
/// Returns the 64K summary data block
virtual bool Read64K(float *buffer, sampleCount start, sampleCount len);
bool Read64K(float *buffer, sampleCount start, sampleCount len) override;
/// returns true before decoding is complete, because it is linked to the encoded file until then.
/// returns false afterwards.
@ -77,16 +77,16 @@ class ODDecodeBlockFile final : public SimpleBlockFile
///Makes NEW ODPCMAliasBlockFile or PCMAliasBlockFile depending on summary availability
virtual BlockFile *Copy(wxFileName fileName);
BlockFile *Copy(wxFileName fileName) override;
///Saves as xml ODPCMAliasBlockFile or PCMAliasBlockFile depending on summary availability
virtual void SaveXML(XMLWriter &xmlFile);
void SaveXML(XMLWriter &xmlFile) override;
///Reconstructs from XML a ODPCMAliasBlockFile and reschedules it for OD loading
static BlockFile *BuildFromXML(DirManager &dm, const wxChar **attrs);
///Writes the summary file if summary data is available
virtual void Recover(void);
void Recover(void) override;
///A public interface to WriteSummary
int DoWriteBlockFile(){return WriteODDecodeBlockFile();}
@ -108,15 +108,15 @@ class ODDecodeBlockFile final : public SimpleBlockFile
//Below calls are overrided just so we can take wxlog calls out, which are not threadsafe.
/// Reads the specified data from the aliased file using libsndfile
virtual int ReadData(samplePtr data, sampleFormat format,
sampleCount start, sampleCount len);
int ReadData(samplePtr data, sampleFormat format,
sampleCount start, sampleCount len) override;
/// Read the summary into a buffer
virtual bool ReadSummary(void *data);
bool ReadSummary(void *data) override;
///Returns the type of audiofile this blockfile is loaded from.
virtual unsigned int GetDecodeType(){return mType;}
// virtual void SetDecodeType(unsigned int type){mType=type;}
unsigned int GetDecodeType() /* not override */ { return mType; }
// void SetDecodeType(unsigned int type) /* not override */ { mType = type; }
///sets the amount of samples the clip associated with this blockfile is offset in the wavetrack (non effecting)
void SetClipOffset(sampleCount numSamples){mClipOffset= numSamples;}
@ -132,13 +132,13 @@ class ODDecodeBlockFile final : public SimpleBlockFile
wxFileName GetAudioFileName(){return mAudioFileName;}
///sets the file name the summary info will be saved in. threadsafe.
virtual void SetFileName(wxFileName &name);
virtual wxFileName GetFileName();
void SetFileName(wxFileName &name) override;
wxFileName GetFileName() override;
/// Prevents a read on other threads of the encoded audio file.
virtual void LockRead();
void LockRead() override;
/// Allows reading of encoded file on other threads.
virtual void UnlockRead();
void UnlockRead() override;
///// Get the name of the file where the audio data for this block is
/// stored.
@ -154,9 +154,9 @@ class ODDecodeBlockFile final : public SimpleBlockFile
protected:
// virtual void WriteSimpleBlockFile();
virtual void *CalcSummary(samplePtr buffer, sampleCount len,
sampleFormat format);
// void WriteSimpleBlockFile() override;
void *CalcSummary(samplePtr buffer, sampleCount len,
sampleFormat format) override;
//The on demand type.
unsigned int mType;

50
src/blockfile/ODPCMAliasBlockFile.h
View File

@ -57,34 +57,34 @@ class ODPCMAliasBlockFile final : public PCMAliasBlockFile
virtual ~ODPCMAliasBlockFile();
//checks to see if summary data has been computed and written to disk yet. Thread safe. Blocks if we are writing summary data.
virtual bool IsSummaryAvailable();
bool IsSummaryAvailable() override;
/// Returns TRUE if the summary has not yet been written, but is actively being computed and written to disk
virtual bool IsSummaryBeingComputed(){return mSummaryBeingComputed;}
bool IsSummaryBeingComputed() override { return mSummaryBeingComputed; }
//Calls that rely on summary files need to be overidden
virtual wxLongLong GetSpaceUsage();
wxLongLong GetSpaceUsage() override;
/// Gets extreme values for the specified region
virtual void GetMinMax(sampleCount start, sampleCount len,
float *outMin, float *outMax, float *outRMS);
void GetMinMax(sampleCount start, sampleCount len,
float *outMin, float *outMax, float *outRMS) override;
/// Gets extreme values for the entire block
virtual void GetMinMax(float *outMin, float *outMax, float *outRMS);
void GetMinMax(float *outMin, float *outMax, float *outRMS) override;
/// Returns the 256 byte summary data block
virtual bool Read256(float *buffer, sampleCount start, sampleCount len);
bool Read256(float *buffer, sampleCount start, sampleCount len) override;
/// Returns the 64K summary data block
virtual bool Read64K(float *buffer, sampleCount start, sampleCount len);
bool Read64K(float *buffer, sampleCount start, sampleCount len) override;
///Makes NEW ODPCMAliasBlockFile or PCMAliasBlockFile depending on summary availability
virtual BlockFile *Copy(wxFileName fileName);
BlockFile *Copy(wxFileName fileName) override;
///Saves as xml ODPCMAliasBlockFile or PCMAliasBlockFile depending on summary availability
virtual void SaveXML(XMLWriter &xmlFile);
void SaveXML(XMLWriter &xmlFile) override;
///Reconstructs from XML a ODPCMAliasBlockFile and reschedules it for OD loading
static BlockFile *BuildFromXML(DirManager &dm, const wxChar **attrs);
///Writes the summary file if summary data is available
virtual void Recover(void);
void Recover(void) override;
///A public interface to WriteSummary
void DoWriteSummary();
@ -117,33 +117,33 @@ class ODPCMAliasBlockFile final : public PCMAliasBlockFile
//Below calls are overrided just so we can take wxlog calls out, which are not threadsafe.
/// Reads the specified data from the aliased file using libsndfile
virtual int ReadData(samplePtr data, sampleFormat format,
sampleCount start, sampleCount len);
int ReadData(samplePtr data, sampleFormat format,
sampleCount start, sampleCount len) override;
/// Read the summary into a buffer
virtual bool ReadSummary(void *data);
bool ReadSummary(void *data) override;
///sets the file name the summary info will be saved in. threadsafe.
virtual void SetFileName(wxFileName &name);
virtual wxFileName GetFileName();
void SetFileName(wxFileName &name) override;
wxFileName GetFileName() override;
//when the file closes, it locks the blockfiles, but it calls this so we can check if it has been saved before.
virtual void CloseLock();
void CloseLock() override;
/// Prevents a read on other threads.
virtual void LockRead();
void LockRead() override;
/// Allows reading on other threads.
virtual void UnlockRead();
void UnlockRead() override;
protected:
virtual void WriteSummary();
virtual void *CalcSummary(samplePtr buffer, sampleCount len,
sampleFormat format);
protected:
void WriteSummary() override;
void *CalcSummary(samplePtr buffer, sampleCount len,
sampleFormat format) override;
private:
//Thread-safe versions
virtual void Ref();
virtual bool Deref();
void Ref() override;
bool Deref() override;
//needed for Ref/Deref access.
friend class DirManager;
friend class ODComputeSummaryTask;

10
src/blockfile/PCMAliasBlockFile.h
View File

@ -37,12 +37,12 @@ class PCMAliasBlockFile /* not final */ : public AliasBlockFile
virtual ~PCMAliasBlockFile();
/// Reads the specified data from the aliased file using libsndfile
virtual int ReadData(samplePtr data, sampleFormat format,
sampleCount start, sampleCount len);
int ReadData(samplePtr data, sampleFormat format,
sampleCount start, sampleCount len) override;
virtual void SaveXML(XMLWriter &xmlFile);
virtual BlockFile *Copy(wxFileName fileName);
virtual void Recover();
void SaveXML(XMLWriter &xmlFile) override;
BlockFile *Copy(wxFileName fileName) override;
void Recover() override;
static BlockFile *BuildFromXML(DirManager &dm, const wxChar **attrs);
};

14
src/blockfile/SilentBlockFile.h
View File

@ -33,17 +33,17 @@ class SilentBlockFile final : public BlockFile {
// Reading
/// Read the summary section of the disk file
virtual bool ReadSummary(void *data);
bool ReadSummary(void *data) override;
/// Read the data section of the disk file
virtual int ReadData(samplePtr data, sampleFormat format,
sampleCount start, sampleCount len);
int ReadData(samplePtr data, sampleFormat format,
sampleCount start, sampleCount len) override;
/// Create a NEW block file identical to this one
virtual BlockFile *Copy(wxFileName newFileName);
BlockFile *Copy(wxFileName newFileName) override;
/// Write an XML representation of this file
virtual void SaveXML(XMLWriter &xmlFile);
virtual wxLongLong GetSpaceUsage();
virtual void Recover() { };
void SaveXML(XMLWriter &xmlFile) override;
wxLongLong GetSpaceUsage() override;
void Recover() override { };
static BlockFile *BuildFromXML(DirManager &dm, const wxChar **attrs);
};

22
src/blockfile/SimpleBlockFile.h
View File

@ -62,26 +62,26 @@ class PROFILE_DLL_API SimpleBlockFile /* not final */ : public BlockFile {
// Reading
/// Read the summary section of the disk file
virtual bool ReadSummary(void *data);
bool ReadSummary(void *data) override;
/// Read the data section of the disk file
virtual int ReadData(samplePtr data, sampleFormat format,
sampleCount start, sampleCount len);
int ReadData(samplePtr data, sampleFormat format,
sampleCount start, sampleCount len) override;
/// Create a NEW block file identical to this one
virtual BlockFile *Copy(wxFileName newFileName);
BlockFile *Copy(wxFileName newFileName) override;
/// Write an XML representation of this file
virtual void SaveXML(XMLWriter &xmlFile);
void SaveXML(XMLWriter &xmlFile) override;
virtual wxLongLong GetSpaceUsage();
virtual void Recover();
wxLongLong GetSpaceUsage() override;
void Recover() override;
static BlockFile *BuildFromXML(DirManager &dm, const wxChar **attrs);
virtual bool GetNeedWriteCacheToDisk();
virtual void WriteCacheToDisk();
bool GetNeedWriteCacheToDisk() override;
void WriteCacheToDisk() override;
virtual bool GetNeedFillCache() { return !mCache.active; }
virtual void FillCache();
bool GetNeedFillCache() override { return !mCache.active; }
void FillCache() override;
protected:

2
src/commands/AppCommandEvent.h
View File

@ -34,7 +34,7 @@ public:
AppCommandEvent(const AppCommandEvent &event);
~AppCommandEvent();
virtual wxEvent *Clone() const;
wxEvent *Clone() const override;
void SetCommand(Command *cmd);
Command *GetCommand();

8
src/commands/BatchEvalCommand.h
View File

@ -29,9 +29,9 @@ to that system.
class BatchEvalCommandType final : public CommandType
{
public:
virtual wxString BuildName();
virtual void BuildSignature(CommandSignature &signature);
virtual Command *Create(CommandOutputTarget *target);
wxString BuildName() override;
void BuildSignature(CommandSignature &signature) override;
Command *Create(CommandOutputTarget *target) override;
};
class BatchEvalCommand final : public CommandImplementation
@ -43,7 +43,7 @@ public:
{ }
virtual ~BatchEvalCommand();
virtual bool Apply(CommandExecutionContext context);
bool Apply(CommandExecutionContext context) override;
};
#endif /* End of include guard: __BATCHEVALCOMMAND__ */

17
src/commands/Command.h
View File

@ -76,9 +76,9 @@ class DecoratedCommand /* not final */ : public Command
protected:
Command *mCommand;
public:
virtual void Progress(double completed);
virtual void Status(const wxString &message) override;
virtual void Error(const wxString &message) override;
void Progress(double completed) override;
void Status(const wxString &message) override;
void Error(const wxString &message) override;
DecoratedCommand(Command *cmd)
: mCommand(cmd)
@ -86,10 +86,9 @@ public:
wxASSERT(cmd != NULL);
}
virtual ~DecoratedCommand();
virtual wxString GetName();
virtual CommandSignature &GetSignature();
virtual bool SetParameter(const wxString &paramName, const wxVariant &paramValue);
virtual bool Apply(CommandExecutionContext context) = 0;
wxString GetName() override;
CommandSignature &GetSignature() override;
bool SetParameter(const wxString &paramName, const wxVariant &paramValue) override;
};
// Decorator command that performs the given command and then outputs a status
@ -101,7 +100,7 @@ public:
: DecoratedCommand(cmd)
{ }
virtual bool Apply(CommandExecutionContext context);
bool Apply(CommandExecutionContext context) override;
};
class CommandImplementation /* not final */ : public Command
@ -155,7 +154,7 @@ public:
/// Actually carry out the command. Return true if successful and false
/// otherwise.
virtual bool Apply(CommandExecutionContext context);
bool Apply(CommandExecutionContext context) override;
};
#endif /* End of include guard: __COMMAND__ */

8
src/commands/CommandManager.h
View File

@ -247,7 +247,7 @@ class AUDACITY_DLL_API CommandManager final : public XMLTagHandler
// Loading/Saving
//
virtual void WriteXML(XMLWriter &xmlFile);
void WriteXML(XMLWriter &xmlFile) /* not override */;
protected:
@ -299,9 +299,9 @@ protected:
// Loading/Saving
//
virtual bool HandleXMLTag(const wxChar *tag, const wxChar **attrs);
virtual void HandleXMLEndTag(const wxChar *tag);
virtual XMLTagHandler *HandleXMLChild(const wxChar *tag);
bool HandleXMLTag(const wxChar *tag, const wxChar **attrs) override;
void HandleXMLEndTag(const wxChar *tag) override;
XMLTagHandler *HandleXMLChild(const wxChar *tag) override;
private:
MenuBarList mMenuBarList;

16
src/commands/CommandTargets.h
View File

@ -42,7 +42,7 @@ class NullProgressTarget final : public CommandProgressTarget
{
public:
virtual ~NullProgressTarget() {}
virtual void Update(double WXUNUSED(completed)) {}
void Update(double WXUNUSED(completed)) override {}
};
/// Sends command progress information to a ProgressDialog
@ -55,7 +55,7 @@ public:
: mProgress(pd)
{}
virtual ~GUIProgressTarget() {}
virtual void Update(double completed)
void Update(double completed) override
{
mProgress.Update(completed);
}
@ -82,7 +82,7 @@ public:
{
// delete &mTarget;
}
virtual void Update(double completed)
void Update(double completed) override
{
mTarget.Update(wxString::Format(wxT("%.2f%%"), completed*100));
}
@ -93,7 +93,7 @@ class NullMessageTarget final : public CommandMessageTarget
{
public:
virtual ~NullMessageTarget() {}
virtual void Update(const wxString &message) override {}
void Update(const wxString &message) override {}
};
/// Displays messages from a command in a wxMessageBox
@ -101,7 +101,7 @@ class MessageBoxTarget final : public CommandMessageTarget
{
public:
virtual ~MessageBoxTarget() {}
virtual void Update(const wxString &message) override
void Update(const wxString &message) override
{
wxMessageBox(message);
}
@ -116,7 +116,7 @@ public:
StatusBarTarget(wxStatusBar &sb)
: mStatus(sb)
{}
virtual void Update(const wxString &message) override
void Update(const wxString &message) override
{
mStatus.SetStatusText(message, 0);
}
@ -135,7 +135,7 @@ public:
{
mResponseQueue.AddResponse(wxString(wxT("\n")));
}
virtual void Update(const wxString &message) override
void Update(const wxString &message) override
{
mResponseQueue.AddResponse(message);
}
@ -158,7 +158,7 @@ public:
delete m1;
delete m2;
}
virtual void Update(const wxString &message) override
void Update(const wxString &message) override
{
m1->Update(message);
m2->Update(message);

10
src/commands/CompareAudioCommand.h
View File

@ -25,9 +25,9 @@ class WaveTrack;
class CompareAudioCommandType final : public CommandType
{
public:
virtual wxString BuildName();
virtual void BuildSignature(CommandSignature &signature);
virtual Command *Create(CommandOutputTarget *target);
wxString BuildName() override;
void BuildSignature(CommandSignature &signature) override;
Command *Create(CommandOutputTarget *target) override;
};
class CompareAudioCommand final : public CommandImplementation
@ -41,13 +41,13 @@ private:
bool GetSelection(AudacityProject &proj);
protected:
virtual double CompareSample(double value1, double value2);
double CompareSample(double value1, double value2) /* not override */;
public:
CompareAudioCommand(CommandType &type, CommandOutputTarget *target)
: CommandImplementation(type, target)
{ }
virtual bool Apply(CommandExecutionContext context);
bool Apply(CommandExecutionContext context) override;
};
#endif /* End of include guard: __COMPAREAUDIOCOMMAND__ */

8
src/commands/ExecMenuCommand.h
View File

@ -26,9 +26,9 @@ name.
class ExecMenuCommandType final : public CommandType
{
public:
virtual wxString BuildName();
virtual void BuildSignature(CommandSignature &signature);
virtual Command *Create(CommandOutputTarget *target);
wxString BuildName() override;
void BuildSignature(CommandSignature &signature) override;
Command *Create(CommandOutputTarget *target) override;
};
class ExecMenuCommand final : public CommandImplementation
@ -39,7 +39,7 @@ public:
: CommandImplementation(type, target)
{ }
virtual ~ExecMenuCommand() { }
virtual bool Apply(CommandExecutionContext context);
bool Apply(CommandExecutionContext context) override;
};
#endif /* End of include guard: __EXECMENUCOMMAND__ */

8
src/commands/GetAllMenuCommands.h
View File

@ -26,9 +26,9 @@ channel.
class GetAllMenuCommandsType final : public CommandType
{
public:
virtual wxString BuildName();
virtual void BuildSignature(CommandSignature &signature);
virtual Command *Create(CommandOutputTarget *target);
wxString BuildName() override;
void BuildSignature(CommandSignature &signature) override;
Command *Create(CommandOutputTarget *target) override;
};
class GetAllMenuCommands final : public CommandImplementation
@ -42,7 +42,7 @@ public:
virtual ~GetAllMenuCommands()
{ }
virtual bool Apply(CommandExecutionContext context);
bool Apply(CommandExecutionContext context) override;
};
#endif /* End of include guard: __GETALLMENUCOMMANDS__ */

8
src/commands/GetProjectInfoCommand.h
View File

@ -22,9 +22,9 @@
class GetProjectInfoCommandType final : public CommandType
{
public:
virtual wxString BuildName();
virtual void BuildSignature(CommandSignature &signature);
virtual Command *Create(CommandOutputTarget *target);
wxString BuildName() override;
void BuildSignature(CommandSignature &signature) override;
Command *Create(CommandOutputTarget *target) override;
};
@ -37,7 +37,7 @@ public:
virtual ~GetProjectInfoCommand()
{ }
virtual bool Apply(CommandExecutionContext context);
bool Apply(CommandExecutionContext context) override;
private:
int SendNumberOfTracks(CommandExecutionContext context);

8
src/commands/GetTrackInfoCommand.h
View File

@ -22,9 +22,9 @@
class GetTrackInfoCommandType final : public CommandType
{
public:
virtual wxString BuildName();
virtual void BuildSignature(CommandSignature &signature);
virtual Command *Create(CommandOutputTarget *target);
wxString BuildName() override;
void BuildSignature(CommandSignature &signature) override;
Command *Create(CommandOutputTarget *target) override;
};
class GetTrackInfoCommand final : public CommandImplementation
@ -36,7 +36,7 @@ public:
virtual ~GetTrackInfoCommand()
{ }
virtual bool Apply(CommandExecutionContext context);
bool Apply(CommandExecutionContext context) override;
private:
void SendBooleanStatus(bool BooleanValue);

8
src/commands/HelpCommand.h
View File

@ -25,9 +25,9 @@
class HelpCommandType final : public CommandType
{
public:
virtual wxString BuildName();
virtual void BuildSignature(CommandSignature &signature);
virtual Command *Create(CommandOutputTarget *target);
wxString BuildName() override;
void BuildSignature(CommandSignature &signature) override;
Command *Create(CommandOutputTarget *target) override;
};
class HelpCommand final : public CommandImplementation
@ -35,7 +35,7 @@ class HelpCommand final : public CommandImplementation
public:
HelpCommand(HelpCommandType &type, CommandOutputTarget *target)
: CommandImplementation(type, target) { }
virtual bool Apply(CommandExecutionContext context);
bool Apply(CommandExecutionContext context) override;
};
#endif /* End of include guard: __HELPCOMMAND__ */

16
src/commands/ImportExportCommands.h
View File

@ -25,9 +25,9 @@
class ImportCommandType final : public CommandType
{
public:
virtual wxString BuildName();
virtual void BuildSignature(CommandSignature &signature);
virtual Command *Create(CommandOutputTarget *target);
wxString BuildName() override;
void BuildSignature(CommandSignature &signature) override;
Command *Create(CommandOutputTarget *target) override;
};
class ImportCommand final : public CommandImplementation
@ -39,7 +39,7 @@ public:
{ }
virtual ~ImportCommand();
virtual bool Apply(CommandExecutionContext context);
bool Apply(CommandExecutionContext context) override;
};
// Export
@ -47,9 +47,9 @@ public:
class ExportCommandType final : public CommandType
{
public:
virtual wxString BuildName();
virtual void BuildSignature(CommandSignature &signature);
virtual Command *Create(CommandOutputTarget *target);
wxString BuildName() override;
void BuildSignature(CommandSignature &signature) override;
Command *Create(CommandOutputTarget *target) override;
};
class ExportCommand final : public CommandImplementation
@ -61,5 +61,5 @@ public:
{ }
virtual ~ExportCommand();
virtual bool Apply(CommandExecutionContext context);
bool Apply(CommandExecutionContext context) override;
};

8
src/commands/MessageCommand.h
View File

@ -27,9 +27,9 @@
class MessageCommandType final : public CommandType
{
public:
virtual wxString BuildName();
virtual void BuildSignature(CommandSignature &signature);
virtual Command *Create(CommandOutputTarget *target);
wxString BuildName() override;
void BuildSignature(CommandSignature &signature) override;
Command *Create(CommandOutputTarget *target) override;
};
class MessageCommand final : public CommandImplementation
@ -38,7 +38,7 @@ public:
MessageCommand(CommandType &type,
CommandOutputTarget *target)
: CommandImplementation(type, target) {}
virtual bool Apply(CommandExecutionContext context);
bool Apply(CommandExecutionContext context) override;
};
#endif /* End of include guard: __MESSAGECOMMAND__ */

16
src/commands/OpenSaveCommands.h
View File

@ -25,9 +25,9 @@
class OpenProjectCommandType final : public CommandType
{
public:
virtual wxString BuildName();
virtual void BuildSignature(CommandSignature &signature);
virtual Command *Create(CommandOutputTarget *target);
wxString BuildName() override;
void BuildSignature(CommandSignature &signature) override;
Command *Create(CommandOutputTarget *target) override;
};
class OpenProjectCommand final : public CommandImplementation
@ -39,7 +39,7 @@ public:
{ }
virtual ~OpenProjectCommand();
virtual bool Apply(CommandExecutionContext context);
bool Apply(CommandExecutionContext context) override;
};
// Save
@ -47,9 +47,9 @@ public:
class SaveProjectCommandType final : public CommandType
{
public:
virtual wxString BuildName();
virtual void BuildSignature(CommandSignature &signature);
virtual Command *Create(CommandOutputTarget *target);
wxString BuildName() override;
void BuildSignature(CommandSignature &signature) override;
Command *Create(CommandOutputTarget *target) override;
};
class SaveProjectCommand final : public CommandImplementation
@ -61,5 +61,5 @@ public:
{ }
virtual ~SaveProjectCommand();
virtual bool Apply(CommandExecutionContext context);
bool Apply(CommandExecutionContext context) override;
};

16
src/commands/PreferenceCommands.h
View File

@ -28,9 +28,9 @@
class GetPreferenceCommandType final : public CommandType
{
public:
virtual wxString BuildName();
virtual void BuildSignature(CommandSignature &signature);
virtual Command *Create(CommandOutputTarget *target);
wxString BuildName() override;
void BuildSignature(CommandSignature &signature) override;
Command *Create(CommandOutputTarget *target) override;
};
class GetPreferenceCommand final : public CommandImplementation
@ -42,7 +42,7 @@ public:
{ }
virtual ~GetPreferenceCommand();
virtual bool Apply(CommandExecutionContext context);
bool Apply(CommandExecutionContext context) override;
};
// SetPreference
@ -50,9 +50,9 @@ public:
class SetPreferenceCommandType final : public CommandType
{
public:
virtual wxString BuildName();
virtual void BuildSignature(CommandSignature &signature);
virtual Command *Create(CommandOutputTarget *target);
wxString BuildName() override;
void BuildSignature(CommandSignature &signature) override;
Command *Create(CommandOutputTarget *target) override;
};
class SetPreferenceCommand final : public CommandImplementation
@ -64,7 +64,7 @@ public:
{ }
virtual ~SetPreferenceCommand();
virtual bool Apply(CommandExecutionContext context);
bool Apply(CommandExecutionContext context) override;
};
#endif /* End of include guard: __PREFERENCECOMMANDS__ */

6
src/commands/ScreenshotCommand.h
View File

@ -26,9 +26,9 @@ class CommandOutputTarget;
class ScreenshotCommandType final : public CommandType
{
public:
virtual wxString BuildName();
virtual void BuildSignature(CommandSignature &signature);
virtual Command *Create(CommandOutputTarget *target);
wxString BuildName() override;
void BuildSignature(CommandSignature &signature) override;
Command *Create(CommandOutputTarget *target) override;
};
class ScreenshotCommand final : public CommandImplementation

8
src/commands/SelectCommand.h
View File

@ -22,9 +22,9 @@
class SelectCommandType final : public CommandType
{
public:
virtual wxString BuildName();
virtual void BuildSignature(CommandSignature &signature);
virtual Command *Create(CommandOutputTarget *target);
wxString BuildName() override;
void BuildSignature(CommandSignature &signature) override;
Command *Create(CommandOutputTarget *target) override;
};
class SelectCommand final : public CommandImplementation
@ -32,7 +32,7 @@ class SelectCommand final : public CommandImplementation
public:
SelectCommand(SelectCommandType &type, CommandOutputTarget *target)
: CommandImplementation(type, target) { }
virtual bool Apply(CommandExecutionContext context);
bool Apply(CommandExecutionContext context) override;
};
#endif /* End of include guard: __SELECTCOMMAND__ */

8
src/commands/SetProjectInfoCommand.h
View File

@ -26,9 +26,9 @@ class TrackList;
class SetProjectInfoCommandType final : public CommandType
{
public:
virtual wxString BuildName();
virtual void BuildSignature(CommandSignature &signature);
virtual Command *Create(CommandOutputTarget *target);
wxString BuildName() override;
void BuildSignature(CommandSignature &signature) override;
Command *Create(CommandOutputTarget *target) override;
};
@ -41,7 +41,7 @@ public:
virtual ~SetProjectInfoCommand()
{ }
virtual bool Apply(CommandExecutionContext context);
bool Apply(CommandExecutionContext context) override;
private:
// Function pointer to set a particular Track parameter

8
src/commands/SetTrackInfoCommand.h
View File

@ -22,9 +22,9 @@
class SetTrackInfoCommandType final : public CommandType
{
public:
virtual wxString BuildName();
virtual void BuildSignature(CommandSignature &signature);
virtual Command *Create(CommandOutputTarget *target);
wxString BuildName() override;
void BuildSignature(CommandSignature &signature) override;
Command *Create(CommandOutputTarget *target) override;
};
class SetTrackInfoCommand final : public CommandImplementation
@ -36,7 +36,7 @@ public:
virtual ~SetTrackInfoCommand()
{ }
virtual bool Apply(CommandExecutionContext context);
bool Apply(CommandExecutionContext context) override;
};
#endif /* End of include guard: __SETTRACKINFOCOMMAND__ */

40
src/commands/Validators.h
View File

@ -95,12 +95,12 @@ public:
{
mOptions.insert(mOptions.begin(), options.begin(), options.end());
}
virtual bool Validate(const wxVariant &v)
bool Validate(const wxVariant &v) override
{
SetConverted(v);
return (mOptions.Index(v.GetString()) != wxNOT_FOUND);
}
virtual wxString GetDescription() const
wxString GetDescription() const override
{
wxString desc = wxT("one of: ");
int optionCount = mOptions.GetCount();
@ -112,7 +112,7 @@ public:
desc += mOptions[optionCount-1];
return desc;
}
virtual Validator *GetClone() const
Validator *GetClone() const override
{
OptionValidator *v = new OptionValidator();
v->mOptions = mOptions;
@ -123,18 +123,18 @@ public:
class BoolValidator final : public Validator
{
public:
virtual bool Validate(const wxVariant &v)
bool Validate(const wxVariant &v) override
{
bool val;
if (!v.Convert(&val)) return false;
SetConverted(val);
return GetConverted().IsType(wxT("bool"));
}
virtual wxString GetDescription() const
wxString GetDescription() const override
{
return wxT("true/false or 1/0 or yes/no");
}
virtual Validator *GetClone() const
Validator *GetClone() const override
{
return new BoolValidator();
}
@ -154,11 +154,11 @@ public:
return false;
return true;
}
virtual wxString GetDescription() const
wxString GetDescription() const override
{
return wxT("0X101XX101...etc. where 0=false, 1=true, and X=don't care. Numbering starts at leftmost = track 0");
}
virtual Validator *GetClone() const
Validator *GetClone() const override
{
return new BoolArrayValidator();
}
@ -167,18 +167,18 @@ public:
class DoubleValidator final : public Validator
{
public:
virtual bool Validate(const wxVariant &v)
bool Validate(const wxVariant &v) override
{
double val;
if (!v.Convert(&val)) return false;
SetConverted(val);
return GetConverted().IsType(wxT("double"));
}
virtual wxString GetDescription() const
wxString GetDescription() const override
{
return wxT("a floating-point number");
}
virtual Validator *GetClone() const
Validator *GetClone() const override
{
return new DoubleValidator();
}
@ -192,18 +192,18 @@ public:
RangeValidator(double l, double u)
: mLower(l), mUpper(u)
{ }
virtual bool Validate(const wxVariant &v)
bool Validate(const wxVariant &v) override
{
double val;
if (!v.Convert(&val)) return false;
SetConverted(val);
return ((mLower < val) && (val < mUpper));
}
virtual wxString GetDescription() const
wxString GetDescription() const override
{
return wxString::Format(wxT("between %f and %f"), mLower, mUpper);
}
virtual Validator *GetClone() const
Validator *GetClone() const override
{
return new RangeValidator(mLower, mUpper);
}
@ -212,7 +212,7 @@ public:
class IntValidator final : public Validator
{
public:
virtual bool Validate(const wxVariant &v)
bool Validate(const wxVariant &v) override
{
double val;
if (!v.Convert(&val)) return false;
@ -220,11 +220,11 @@ public:
if (!GetConverted().IsType(wxT("double"))) return false;
return ((long)val == val);
}
virtual wxString GetDescription() const
wxString GetDescription() const override
{
return wxT("an integer");
}
virtual Validator *GetClone() const
Validator *GetClone() const override
{
return new IntValidator();
}
@ -239,16 +239,16 @@ public:
AndValidator(Validator *u1, Validator *u2)
: v1(*u1), v2(*u2)
{ }
virtual bool Validate(const wxVariant &v)
bool Validate(const wxVariant &v) override
{
if (!v1.Validate(v)) return false;
return v2.Validate(v);
}
virtual wxString GetDescription() const
wxString GetDescription() const override
{
return v1.GetDescription() + wxT(" and ") + v2.GetDescription();
}
virtual Validator *GetClone() const
Validator *GetClone() const override
{
return new AndValidator(v1.GetClone(), v2.GetClone());
}

28
src/effects/Amplify.h
View File

@ -35,29 +35,29 @@ public:
// IdentInterface implementation
virtual wxString GetSymbol();
virtual wxString GetDescription();
wxString GetSymbol() override;
wxString GetDescription() override;
// EffectIdentInterface implementation
virtual EffectType GetType();
EffectType GetType() override;
// EffectClientInterface implementation
virtual int GetAudioInCount();
virtual int GetAudioOutCount();
virtual sampleCount ProcessBlock(float **inBlock, float **outBlock, sampleCount blockLen);
virtual bool GetAutomationParameters(EffectAutomationParameters & parms);
virtual bool SetAutomationParameters(EffectAutomationParameters & parms);
virtual bool LoadFactoryDefaults();
int GetAudioInCount() override;
int GetAudioOutCount() override;
sampleCount ProcessBlock(float **inBlock, float **outBlock, sampleCount blockLen) override;
bool GetAutomationParameters(EffectAutomationParameters & parms) override;
bool SetAutomationParameters(EffectAutomationParameters & parms) override;
bool LoadFactoryDefaults() override;
// Effect implementation
virtual bool Init();
virtual void Preview(bool dryOnly);
virtual void PopulateOrExchange(ShuttleGui & S);
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow();
bool Init() override;
void Preview(bool dryOnly) override;
void PopulateOrExchange(ShuttleGui & S) override;
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
private:
// EffectAmplify implementation

28
src/effects/AutoDuck.h
View File

@ -36,27 +36,27 @@ public:
// IdentInterface implementation
virtual wxString GetSymbol();
virtual wxString GetDescription();
wxString GetSymbol() override;
wxString GetDescription() override;
// EffectIdentInterface implementation
virtual EffectType GetType();
EffectType GetType() override;
// EffectClientInterface implementation
virtual bool GetAutomationParameters(EffectAutomationParameters & parms);
virtual bool SetAutomationParameters(EffectAutomationParameters & parms);
bool GetAutomationParameters(EffectAutomationParameters & parms) override;
bool SetAutomationParameters(EffectAutomationParameters & parms) override;
// Effect implementation
virtual bool Startup();
virtual bool Init();
virtual void End();
virtual bool Process();
virtual void PopulateOrExchange(ShuttleGui & S);
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow();
bool Startup() override;
bool Init() override;
void End() override;
bool Process() override;
void PopulateOrExchange(ShuttleGui & S) override;
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
private:
// EffectAutoDuck implementation
@ -107,9 +107,9 @@ private:
none = 99,
};
virtual bool AcceptsFocus() const {return false;}
bool AcceptsFocus() const override { return false; }
// So that wxPanel is not included in Tab traversal - see wxWidgets bug 15581
virtual bool AcceptsFocusFromKeyboard() const {return false;}
bool AcceptsFocusFromKeyboard() const override { return false; }
void OnPaint(wxPaintEvent & evt);

30
src/effects/BassTreble.h
View File

@ -33,31 +33,31 @@ public:
// IdentInterface implementation
virtual wxString GetSymbol();
virtual wxString GetDescription();
wxString GetSymbol() override;
wxString GetDescription() override;
// EffectIdentInterface implementation
virtual EffectType GetType();
EffectType GetType() override;
// EffectClientInterface implementation
virtual int GetAudioInCount();
virtual int GetAudioOutCount();
virtual bool ProcessInitialize(sampleCount totalLen, ChannelNames chanMap = NULL);
virtual sampleCount ProcessBlock(float **inBlock, float **outBlock, sampleCount blockLen);
virtual bool GetAutomationParameters(EffectAutomationParameters & parms);
virtual bool SetAutomationParameters(EffectAutomationParameters & parms);
int GetAudioInCount() override;
int GetAudioOutCount() override;
bool ProcessInitialize(sampleCount totalLen, ChannelNames chanMap = NULL) override;
sampleCount ProcessBlock(float **inBlock, float **outBlock, sampleCount blockLen) override;
bool GetAutomationParameters(EffectAutomationParameters & parms) override;
bool SetAutomationParameters(EffectAutomationParameters & parms) override;
// Effect Implementation
virtual bool Startup();
virtual bool InitPass1();
virtual bool InitPass2();
bool Startup() override;
bool InitPass1() override;
bool InitPass2() override;
virtual void PopulateOrExchange(ShuttleGui & S);
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow();
void PopulateOrExchange(ShuttleGui & S) override;
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
private:
// EffectBassTreble implementation

26
src/effects/ChangePitch.h
View File

@ -41,34 +41,34 @@ public:
// IdentInterface implementation
virtual wxString GetSymbol();
virtual wxString GetDescription();
wxString GetSymbol() override;
wxString GetDescription() override;
// EffectIdentInterface implementation
virtual EffectType GetType();
EffectType GetType() override;
// EffectClientInterface implementation
virtual bool GetAutomationParameters(EffectAutomationParameters & parms);
virtual bool SetAutomationParameters(EffectAutomationParameters & parms);
virtual bool LoadFactoryDefaults();
bool GetAutomationParameters(EffectAutomationParameters & parms) override;
bool SetAutomationParameters(EffectAutomationParameters & parms) override;
bool LoadFactoryDefaults() override;
// Effect implementation
virtual bool Init();
virtual bool Process();
virtual bool CheckWhetherSkipEffect();
virtual void PopulateOrExchange(ShuttleGui & S);
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow();
bool Init() override;
bool Process() override;
bool CheckWhetherSkipEffect() override;
void PopulateOrExchange(ShuttleGui & S) override;
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
private:
// EffectChangePitch implementation
// Deduce m_FromFrequency from the samples at the beginning of
// the selection. Then set some other params accordingly.
virtual void DeduceFrequencies();
void DeduceFrequencies();
// calculations
void Calc_ToPitch(); // Update m_nToPitch from NEW m_dSemitonesChange.

28
src/effects/ChangeSpeed.h
View File

@ -35,29 +35,29 @@ public:
// IdentInterface implementation
virtual wxString GetSymbol();
virtual wxString GetDescription();
wxString GetSymbol() override;
wxString GetDescription() override;
// EffectIdentInterface implementation
virtual EffectType GetType();
EffectType GetType() override;
// EffectClientInterface implementation
virtual bool GetAutomationParameters(EffectAutomationParameters & parms);
virtual bool SetAutomationParameters(EffectAutomationParameters & parms);
virtual bool LoadFactoryDefaults();
bool GetAutomationParameters(EffectAutomationParameters & parms) override;
bool SetAutomationParameters(EffectAutomationParameters & parms) override;
bool LoadFactoryDefaults() override;
// Effect implementation
virtual bool CheckWhetherSkipEffect();
virtual double CalcPreviewInputLength(double previewLength);
virtual bool Startup();
virtual bool Init();
virtual bool Process();
virtual void PopulateOrExchange(ShuttleGui & S);
virtual bool TransferDataFromWindow();
virtual bool TransferDataToWindow();
bool CheckWhetherSkipEffect() override;
double CalcPreviewInputLength(double previewLength) override;
bool Startup() override;
bool Init() override;
bool Process() override;
void PopulateOrExchange(ShuttleGui & S) override;
bool TransferDataFromWindow() override;
bool TransferDataToWindow() override;
private:
// EffectChangeSpeed implementation

26
src/effects/ChangeTempo.h
View File

@ -35,28 +35,28 @@ public:
// IdentInterface implementation
virtual wxString GetSymbol();
virtual wxString GetDescription();
wxString GetSymbol() override;
wxString GetDescription() override;
// EffectIdentInterface implementation
virtual EffectType GetType();
virtual bool SupportsAutomation();
EffectType GetType() override;
bool SupportsAutomation() override;
// EffectClientInterface implementation
virtual bool GetAutomationParameters(EffectAutomationParameters & parms);
virtual bool SetAutomationParameters(EffectAutomationParameters & parms);
bool GetAutomationParameters(EffectAutomationParameters & parms) override;
bool SetAutomationParameters(EffectAutomationParameters & parms) override;
// Effect implementation
virtual bool Init();
virtual bool CheckWhetherSkipEffect();
virtual bool Process();
virtual double CalcPreviewInputLength(double previewLength);
virtual void PopulateOrExchange(ShuttleGui & S);
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow();
bool Init() override;
bool CheckWhetherSkipEffect() override;
bool Process() override;
double CalcPreviewInputLength(double previewLength) override;
void PopulateOrExchange(ShuttleGui & S) override;
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
private:
// EffectChangeTempo implementation

22
src/effects/ClickRemoval.h
View File

@ -36,26 +36,26 @@ public:
// IdentInterface implementation
virtual wxString GetSymbol();
virtual wxString GetDescription();
wxString GetSymbol() override;
wxString GetDescription() override;
// EffectIdentInterface implementation
virtual EffectType GetType();
EffectType GetType() override;
// EffectClientInterface implementation
virtual bool GetAutomationParameters(EffectAutomationParameters & parms);
virtual bool SetAutomationParameters(EffectAutomationParameters & parms);
bool GetAutomationParameters(EffectAutomationParameters & parms) override;
bool SetAutomationParameters(EffectAutomationParameters & parms) override;
// Effect implementation
virtual bool CheckWhetherSkipEffect();
virtual bool Startup();
virtual bool Process();
virtual void PopulateOrExchange(ShuttleGui & S);
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow();
bool CheckWhetherSkipEffect() override;
bool Startup() override;
bool Process() override;
void PopulateOrExchange(ShuttleGui & S) override;
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
private:
bool ProcessOne(int count, WaveTrack * track,

28
src/effects/Compressor.h
View File

@ -37,33 +37,33 @@ public:
// IdentInterface implementation
virtual wxString GetSymbol();
virtual wxString GetDescription();
wxString GetSymbol() override;
wxString GetDescription() override;
// EffectIdentInterface implementation
virtual EffectType GetType();
EffectType GetType() override;
// EffectClientInterface implementation
virtual bool GetAutomationParameters(EffectAutomationParameters & parms);
virtual bool SetAutomationParameters(EffectAutomationParameters & parms);
bool GetAutomationParameters(EffectAutomationParameters & parms) override;
bool SetAutomationParameters(EffectAutomationParameters & parms) override;
// Effect implementation
virtual bool Startup();
virtual void PopulateOrExchange(ShuttleGui & S);
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow();
bool Startup() override;
void PopulateOrExchange(ShuttleGui & S) override;
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
protected:
// EffectTwoPassSimpleMono implementation
virtual bool InitPass1();
virtual bool InitPass2();
virtual bool NewTrackPass1();
virtual bool ProcessPass2(float *buffer, sampleCount len);
virtual bool TwoBufferProcessPass1(float *buffer1, sampleCount len1, float *buffer2, sampleCount len2);
bool InitPass1() override;
bool InitPass2() override;
bool NewTrackPass1() override;
bool ProcessPass2(float *buffer, sampleCount len) override;
bool TwoBufferProcessPass1(float *buffer1, sampleCount len1, float *buffer2, sampleCount len2) override;
private:
// EffectCompressor implementation

26
src/effects/DtmfGen.h
View File

@ -35,28 +35,28 @@ public:
// IdentInterface implementation
virtual wxString GetSymbol();
virtual wxString GetDescription();
wxString GetSymbol() override;
wxString GetDescription() override;
// EffectIdentInterface implementation
virtual EffectType GetType();
EffectType GetType() override;
// EffectClientInterface implementation
virtual int GetAudioOutCount();
virtual bool ProcessInitialize(sampleCount totalLen, ChannelNames chanMap = NULL);
virtual sampleCount ProcessBlock(float **inBlock, float **outBlock, sampleCount blockLen);
virtual bool GetAutomationParameters(EffectAutomationParameters & parms);
virtual bool SetAutomationParameters(EffectAutomationParameters & parms);
int GetAudioOutCount() override;
bool ProcessInitialize(sampleCount totalLen, ChannelNames chanMap = NULL) override;
sampleCount ProcessBlock(float **inBlock, float **outBlock, sampleCount blockLen) override;
bool GetAutomationParameters(EffectAutomationParameters & parms) override;
bool SetAutomationParameters(EffectAutomationParameters & parms) override;
// Effect implementation
virtual bool Startup();
virtual bool Init();
virtual void PopulateOrExchange(ShuttleGui & S);
virtual bool TransferDataFromWindow();
virtual bool TransferDataToWindow();
bool Startup() override;
bool Init() override;
void PopulateOrExchange(ShuttleGui & S) override;
bool TransferDataFromWindow() override;
bool TransferDataToWindow() override;
private:
// EffectDtmf implementation

26
src/effects/Echo.h
View File

@ -30,27 +30,27 @@ public:
// IdentInterface implementation
virtual wxString GetSymbol();
virtual wxString GetDescription();
wxString GetSymbol() override;
wxString GetDescription() override;
// EffectIdentInterface implementation
virtual EffectType GetType();
EffectType GetType() override;
// EffectClientInterface implementation
virtual int GetAudioInCount();
virtual int GetAudioOutCount();
virtual bool ProcessInitialize(sampleCount totalLen, ChannelNames chanMap = NULL);
virtual bool ProcessFinalize();
virtual sampleCount ProcessBlock(float **inBlock, float **outBlock, sampleCount blockLen);
virtual bool GetAutomationParameters(EffectAutomationParameters & parms);
virtual bool SetAutomationParameters(EffectAutomationParameters & parms);
int GetAudioInCount() override;
int GetAudioOutCount() override;
bool ProcessInitialize(sampleCount totalLen, ChannelNames chanMap = NULL) override;
bool ProcessFinalize() override;
sampleCount ProcessBlock(float **inBlock, float **outBlock, sampleCount blockLen) override;
bool GetAutomationParameters(EffectAutomationParameters & parms) override;
bool SetAutomationParameters(EffectAutomationParameters & parms) override;
// Effect implementation
virtual void PopulateOrExchange(ShuttleGui & S);
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow();
void PopulateOrExchange(ShuttleGui & S) override;
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
private:
// EffectEcho implementation

4
src/effects/Effect.cpp
View File

@ -2740,13 +2740,13 @@ public:
// wxWindow implementation
// ============================================================================
virtual bool AcceptsFocus() const
bool AcceptsFocus() const override
{
return mAcceptsFocus;
}
// So that wxPanel is not included in Tab traversal, when required - see wxWidgets bug 15581
virtual bool AcceptsFocusFromKeyboard() const
bool AcceptsFocusFromKeyboard() const override
{
return mAcceptsFocus;
}

219
src/effects/Effect.h
View File

@ -71,146 +71,147 @@ class AUDACITY_DLL_API Effect /* not final */ : public wxEvtHandler,
// IdentInterface implementation
virtual wxString GetPath();
virtual wxString GetSymbol();
virtual wxString GetName();
virtual wxString GetVendor();
virtual wxString GetVersion();
virtual wxString GetDescription();
wxString GetPath() override;
wxString GetSymbol() override;
wxString GetName() override;
wxString GetVendor() override;
wxString GetVersion() override;
wxString GetDescription() override;
// EffectIdentInterface implementation
virtual EffectType GetType();
virtual wxString GetFamily();
virtual bool IsInteractive();
virtual bool IsDefault();
virtual bool IsLegacy();
virtual bool SupportsRealtime();
virtual bool SupportsAutomation();
EffectType GetType() override;
wxString GetFamily() override;
bool IsInteractive() override;
bool IsDefault() override;
bool IsLegacy() override;
bool SupportsRealtime() override;
bool SupportsAutomation() override;
// EffectClientInterface implementation
virtual bool SetHost(EffectHostInterface *host);
bool SetHost(EffectHostInterface *host) override;
virtual int GetAudioInCount();
virtual int GetAudioOutCount();
int GetAudioInCount() override;
int GetAudioOutCount() override;
virtual int GetMidiInCount();
virtual int GetMidiOutCount();
int GetMidiInCount() override;
int GetMidiOutCount() override;
virtual sampleCount GetLatency();
virtual sampleCount GetTailSize();
sampleCount GetLatency() override;
sampleCount GetTailSize() override;
virtual void SetSampleRate(sampleCount rate);
virtual sampleCount SetBlockSize(sampleCount maxBlockSize);
void SetSampleRate(sampleCount rate) override;
sampleCount SetBlockSize(sampleCount maxBlockSize) override;
virtual bool IsReady();
virtual bool ProcessInitialize(sampleCount totalLen, ChannelNames chanMap = NULL);
virtual bool ProcessFinalize();
virtual sampleCount ProcessBlock(float **inBlock, float **outBlock, sampleCount blockLen);
bool IsReady() override;
bool ProcessInitialize(sampleCount totalLen, ChannelNames chanMap = NULL) override;
bool ProcessFinalize() override;
sampleCount ProcessBlock(float **inBlock, float **outBlock, sampleCount blockLen) override;
virtual bool RealtimeInitialize();
virtual bool RealtimeAddProcessor(int numChannels, float sampleRate);
virtual bool RealtimeFinalize();
virtual bool RealtimeSuspend();
virtual bool RealtimeResume();
virtual bool RealtimeProcessStart();
virtual sampleCount RealtimeProcess(int group,
bool RealtimeInitialize() override;
bool RealtimeAddProcessor(int numChannels, float sampleRate) override;
bool RealtimeFinalize() override;
bool RealtimeSuspend() override;
bool RealtimeResume() override;
bool RealtimeProcessStart() override;
sampleCount RealtimeProcess(int group,
float **inbuf,
float **outbuf,
sampleCount numSamples);
virtual bool RealtimeProcessEnd();
sampleCount numSamples) override;
bool RealtimeProcessEnd() override;
virtual bool ShowInterface(wxWindow *parent, bool forceModal = false);
bool ShowInterface(wxWindow *parent, bool forceModal = false) override;
virtual bool GetAutomationParameters(EffectAutomationParameters & parms);
virtual bool SetAutomationParameters(EffectAutomationParameters & parms);
bool GetAutomationParameters(EffectAutomationParameters & parms) override;
bool SetAutomationParameters(EffectAutomationParameters & parms) override;
virtual bool LoadUserPreset(const wxString & name);
virtual bool SaveUserPreset(const wxString & name);
bool LoadUserPreset(const wxString & name) override;
bool SaveUserPreset(const wxString & name) override;
virtual wxArrayString GetFactoryPresets();
virtual bool LoadFactoryPreset(int id);
virtual bool LoadFactoryDefaults();
wxArrayString GetFactoryPresets() override;
bool LoadFactoryPreset(int id) override;
bool LoadFactoryDefaults() override;
// EffectUIClientInterface implementation
virtual void SetHostUI(EffectUIHostInterface *host);
virtual bool PopulateUI(wxWindow *parent);
virtual bool IsGraphicalUI();
virtual bool ValidateUI();
virtual bool HideUI();
virtual bool CloseUI();
void SetHostUI(EffectUIHostInterface *host) override;
bool PopulateUI(wxWindow *parent) override;
bool IsGraphicalUI() override;
bool ValidateUI() override;
bool HideUI() override;
bool CloseUI() override;
virtual bool CanExportPresets();
virtual void ExportPresets();
virtual void ImportPresets();
bool CanExportPresets() override;
void ExportPresets() override;
void ImportPresets() override;
virtual bool HasOptions();
virtual void ShowOptions();
bool HasOptions() override;
void ShowOptions() override;
// EffectHostInterface implementation
virtual double GetDefaultDuration();
virtual double GetDuration();
virtual wxString GetDurationFormat();
double GetDefaultDuration() override;
double GetDuration() override;
wxString GetDurationFormat() override;
virtual wxString GetSelectionFormat() /* not override? */; // time format in Selection toolbar
virtual void SetDuration(double duration);
void SetDuration(double duration) override;
virtual bool Apply();
virtual void Preview();
bool Apply() override;
void Preview() override;
virtual wxDialog *CreateUI(wxWindow *parent, EffectUIClientInterface *client);
wxDialog *CreateUI(wxWindow *parent, EffectUIClientInterface *client) override;
virtual wxString GetUserPresetsGroup(const wxString & name);
virtual wxString GetCurrentSettingsGroup();
virtual wxString GetFactoryDefaultsGroup();
wxString GetUserPresetsGroup(const wxString & name) override;
wxString GetCurrentSettingsGroup() override;
wxString GetFactoryDefaultsGroup() override;
virtual wxString GetSavedStateGroup() /* not override? */;
// ConfigClientInterface implementation
virtual bool HasSharedConfigGroup(const wxString & group);
virtual bool GetSharedConfigSubgroups(const wxString & group, wxArrayString & subgroups);
bool HasSharedConfigGroup(const wxString & group) override;
bool GetSharedConfigSubgroups(const wxString & group, wxArrayString & subgroups) override;
virtual bool GetSharedConfig(const wxString & group, const wxString & key, wxString & value, const wxString & defval = wxEmptyString);
virtual bool GetSharedConfig(const wxString & group, const wxString & key, int & value, int defval = 0);
virtual bool GetSharedConfig(const wxString & group, const wxString & key, bool & value, bool defval = false);
virtual bool GetSharedConfig(const wxString & group, const wxString & key, float & value, float defval = 0.0);
virtual bool GetSharedConfig(const wxString & group, const wxString & key, double & value, double defval = 0.0);
virtual bool GetSharedConfig(const wxString & group, const wxString & key, sampleCount & value, sampleCount defval = 0);
bool GetSharedConfig(const wxString & group, const wxString & key, wxString & value, const wxString & defval = wxEmptyString) override;
bool GetSharedConfig(const wxString & group, const wxString & key, int & value, int defval = 0) override;
bool GetSharedConfig(const wxString & group, const wxString & key, bool & value, bool defval = false) override;
bool GetSharedConfig(const wxString & group, const wxString & key, float & value, float defval = 0.0) override;
bool GetSharedConfig(const wxString & group, const wxString & key, double & value, double defval = 0.0) override;
bool GetSharedConfig(const wxString & group, const wxString & key, sampleCount & value, sampleCount defval = 0) override;
virtual bool SetSharedConfig(const wxString & group, const wxString & key, const wxString & value);
virtual bool SetSharedConfig(const wxString & group, const wxString & key, const int & value);
virtual bool SetSharedConfig(const wxString & group, const wxString & key, const bool & value);
virtual bool SetSharedConfig(const wxString & group, const wxString & key, const float & value);
virtual bool SetSharedConfig(const wxString & group, const wxString & key, const double & value);
virtual bool SetSharedConfig(const wxString & group, const wxString & key, const sampleCount & value);
bool SetSharedConfig(const wxString & group, const wxString & key, const wxString & value) override;
bool SetSharedConfig(const wxString & group, const wxString & key, const int & value) override;
bool SetSharedConfig(const wxString & group, const wxString & key, const bool & value) override;
bool SetSharedConfig(const wxString & group, const wxString & key, const float & value) override;
bool SetSharedConfig(const wxString & group, const wxString & key, const double & value) override;
bool SetSharedConfig(const wxString & group, const wxString & key, const sampleCount & value) override;
virtual bool RemoveSharedConfigSubgroup(const wxString & group);
virtual bool RemoveSharedConfig(const wxString & group, const wxString & key);
bool RemoveSharedConfigSubgroup(const wxString & group) override;
bool RemoveSharedConfig(const wxString & group, const wxString & key) override;
virtual bool HasPrivateConfigGroup(const wxString & group);
virtual bool GetPrivateConfigSubgroups(const wxString & group, wxArrayString & subgroups);
bool HasPrivateConfigGroup(const wxString & group) override;
bool GetPrivateConfigSubgroups(const wxString & group, wxArrayString & subgroups) override;
virtual bool GetPrivateConfig(const wxString & group, const wxString & key, wxString & value, const wxString & defval = wxEmptyString);
virtual bool GetPrivateConfig(const wxString & group, const wxString & key, int & value, int defval = 0);
virtual bool GetPrivateConfig(const wxString & group, const wxString & key, bool & value, bool defval = false);
virtual bool GetPrivateConfig(const wxString & group, const wxString & key, float & value, float defval = 0.0);
virtual bool GetPrivateConfig(const wxString & group, const wxString & key, double & value, double defval = 0.0);
virtual bool GetPrivateConfig(const wxString & group, const wxString & key, sampleCount & value, sampleCount defval = 0);
bool GetPrivateConfig(const wxString & group, const wxString & key, wxString & value, const wxString & defval = wxEmptyString) override;
bool GetPrivateConfig(const wxString & group, const wxString & key, int & value, int defval = 0) override;
bool GetPrivateConfig(const wxString & group, const wxString & key, bool & value, bool defval = false) override;
bool GetPrivateConfig(const wxString & group, const wxString & key, float & value, float defval = 0.0) override;
bool GetPrivateConfig(const wxString & group, const wxString & key, double & value, double defval = 0.0) override;
bool GetPrivateConfig(const wxString & group, const wxString & key, sampleCount & value, sampleCount defval = 0) override;
virtual bool SetPrivateConfig(const wxString & group, const wxString & key, const wxString & value);
virtual bool SetPrivateConfig(const wxString & group, const wxString & key, const int & value);
virtual bool SetPrivateConfig(const wxString & group, const wxString & key, const bool & value);
virtual bool SetPrivateConfig(const wxString & group, const wxString & key, const float & value);
virtual bool SetPrivateConfig(const wxString & group, const wxString & key, const double & value);
virtual bool SetPrivateConfig(const wxString & group, const wxString & key, const sampleCount & value);
bool SetPrivateConfig(const wxString & group, const wxString & key, const wxString & value) override;
bool SetPrivateConfig(const wxString & group, const wxString & key, const int & value) override;
bool SetPrivateConfig(const wxString & group, const wxString & key, const bool & value) override;
bool SetPrivateConfig(const wxString & group, const wxString & key, const float & value) override;
bool SetPrivateConfig(const wxString & group, const wxString & key, const double & value) override;
bool SetPrivateConfig(const wxString & group, const wxString & key, const sampleCount & value) override;
virtual bool RemovePrivateConfigSubgroup(const wxString & group);
virtual bool RemovePrivateConfig(const wxString & group, const wxString & key);
bool RemovePrivateConfigSubgroup(const wxString & group) override;
bool RemovePrivateConfig(const wxString & group, const wxString & key) override;
// Effect implementation
// NEW virtuals
virtual PluginID GetID();
virtual bool Startup(EffectClientInterface *client);
@ -227,7 +228,7 @@ class AUDACITY_DLL_API Effect /* not final */ : public wxEvtHandler,
virtual bool IsBatchProcessing();
virtual void SetBatchProcessing(bool start);
void SetPresetParameters( const wxArrayString * Names, const wxArrayString * Values ){
/* not virtual */ void SetPresetParameters( const wxArrayString * Names, const wxArrayString * Values ) {
if( Names ) mPresetNames = *Names;
if( Values ) mPresetValues = *Values;
}
@ -235,18 +236,18 @@ class AUDACITY_DLL_API Effect /* not final */ : public wxEvtHandler,
// Returns true on success. Will only operate on tracks that
// have the "selected" flag set to true, which is consistent with
// Audacity's standard UI.
bool DoEffect(wxWindow *parent, double projectRate, TrackList *list,
/* not virtual */ bool DoEffect(wxWindow *parent, double projectRate, TrackList *list,
TrackFactory *factory, SelectedRegion *selectedRegion,
bool shouldPrompt = true);
// Realtime Effect Processing
bool RealtimeAddProcessor(int group, int chans, float rate);
sampleCount RealtimeProcess(int group,
/* not virtual */ bool RealtimeAddProcessor(int group, int chans, float rate);
/* not virtual */ sampleCount RealtimeProcess(int group,
int chans,
float **inbuf,
float **outbuf,
sampleCount numSamples);
bool IsRealtimeActive();
/* not virtual */ bool IsRealtimeActive();
virtual bool IsHidden();
@ -300,6 +301,8 @@ protected:
virtual bool EnablePreview(bool enable = true);
virtual void EnableDebug(bool enable = true);
// No more virtuals!
// The Progress methods all return true if the user has cancelled;
// you should exit immediately if this happens (cleaning up memory
// is okay, but don't try to undo).
@ -484,10 +487,12 @@ public:
void Init();
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
bool Validate() override;
// NEW virtuals:
virtual void PopulateOrExchange(ShuttleGui & S);
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow();
virtual bool Validate();
virtual void OnPreview(wxCommandEvent & evt);
virtual void OnOk(wxCommandEvent & evt);
@ -509,10 +514,10 @@ public:
EffectUIClientInterface *client);
virtual ~EffectUIHost();
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow();
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
virtual int ShowModal();
int ShowModal() override;
bool Initialize();

58
src/effects/Equalization.h
View File

@ -91,34 +91,34 @@ public:
// IdentInterface implementation
virtual wxString GetSymbol();
virtual wxString GetDescription();
wxString GetSymbol() override;
wxString GetDescription() override;
// EffectIdentInterface implementation
virtual EffectType GetType();
EffectType GetType() override;
// EffectClientInterface implementation
virtual bool GetAutomationParameters(EffectAutomationParameters & parms);
virtual bool SetAutomationParameters(EffectAutomationParameters & parms);
virtual bool LoadFactoryDefaults();
bool GetAutomationParameters(EffectAutomationParameters & parms) override;
bool SetAutomationParameters(EffectAutomationParameters & parms) override;
bool LoadFactoryDefaults() override;
// EffectUIClientInterface implementation
virtual bool ValidateUI();
bool ValidateUI() override;
// Effect implementation
virtual bool Startup();
virtual bool Init();
virtual bool Process();
bool Startup() override;
bool Init() override;
bool Process() override;
virtual bool PopulateUI(wxWindow *parent);
virtual bool CloseUI();
virtual void PopulateOrExchange(ShuttleGui & S);
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow();
bool PopulateUI(wxWindow *parent) override;
bool CloseUI() override;
void PopulateOrExchange(ShuttleGui & S) override;
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
private:
// EffectEqualization implementation
@ -132,7 +132,7 @@ private:
bool ProcessOne(int count, WaveTrack * t,
sampleCount start, sampleCount len);
virtual bool CalcFilter();
bool CalcFilter();
void Filter(sampleCount len, float *buffer);
void Flatten();
@ -373,10 +373,10 @@ public:
// Retrieves the address of an IDispatch interface for the specified child.
// All objects must support this property.
virtual wxAccStatus GetChild( int childId, wxAccessible** child );
wxAccStatus GetChild(int childId, wxAccessible** child) override;
// Gets the number of children.
virtual wxAccStatus GetChildCount(int* childCount);
wxAccStatus GetChildCount(int* childCount) override;
// Gets the default action for this object (0) or > 0 (the action for a child).
// Return wxACC_OK even if there is no action. actionName is the action, or the empty
@ -384,33 +384,33 @@ public:
// The retrieved string describes the action that is performed on an object,
// not what the object does as a result. For example, a toolbar button that prints
// a document has a default action of "Press" rather than "Prints the current document."
virtual wxAccStatus GetDefaultAction( int childId, wxString *actionName );
wxAccStatus GetDefaultAction(int childId, wxString *actionName) override;
// Returns the description for this object or a child.
virtual wxAccStatus GetDescription( int childId, wxString *description );
wxAccStatus GetDescription(int childId, wxString *description) override;
// Gets the window with the keyboard focus.
// If childId is 0 and child is NULL, no object in
// this subhierarchy has the focus.
// If this object has the focus, child should be 'this'.
virtual wxAccStatus GetFocus( int *childId, wxAccessible **child );
wxAccStatus GetFocus(int *childId, wxAccessible **child) override;
// Returns help text for this object or a child, similar to tooltip text.
virtual wxAccStatus GetHelpText( int childId, wxString *helpText );
wxAccStatus GetHelpText(int childId, wxString *helpText) override;
// Returns the keyboard shortcut for this object or child.
// Return e.g. ALT+K
virtual wxAccStatus GetKeyboardShortcut( int childId, wxString *shortcut );
wxAccStatus GetKeyboardShortcut(int childId, wxString *shortcut) override;
// Returns the rectangle for this object (id = 0) or a child element (id > 0).
// rect is in screen coordinates.
virtual wxAccStatus GetLocation( wxRect& rect, int elementId );
wxAccStatus GetLocation(wxRect& rect, int elementId) override;
// Gets the name of the specified object.
virtual wxAccStatus GetName( int childId, wxString *name );
wxAccStatus GetName(int childId, wxString *name) override;
// Returns a role constant.
virtual wxAccStatus GetRole( int childId, wxAccRole *role );
wxAccStatus GetRole(int childId, wxAccRole *role) override;
// Gets a variant representing the selected children
// of this object.
@ -420,14 +420,14 @@ public:
// - an integer representing the selected child element,
// or 0 if this object is selected (GetType() == wxT("long"))
// - a "void*" pointer to a wxAccessible child object
virtual wxAccStatus GetSelections( wxVariant *selections );
wxAccStatus GetSelections(wxVariant *selections) override;
// Returns a state constant.
virtual wxAccStatus GetState(int childId, long* state);
wxAccStatus GetState(int childId, long* state) override;
// Returns a localized string representing the value for the object
// or child.
virtual wxAccStatus GetValue(int childId, wxString* strValue);
wxAccStatus GetValue(int childId, wxString* strValue) override;
private:
wxWindow *mParent;

2
src/effects/Equalization48x.h
View File

@ -93,7 +93,7 @@ public:
void ExitLoop() { // this will cause the thread to drop from the loops
mExitLoop=true;
}
virtual void* Entry();
void* Entry() override;
BufferInfo* mBufferInfoList;
int mBufferInfoCount, mThreadID;
wxMutex *mMutex;

16
src/effects/Fade.h
View File

@ -26,20 +26,20 @@ public:
// IdentInterface implementation
virtual wxString GetSymbol();
virtual wxString GetDescription();
wxString GetSymbol() override;
wxString GetDescription() override;
// EffectIdentInterface implementation
virtual EffectType GetType();
virtual bool IsInteractive();
EffectType GetType() override;
bool IsInteractive() override;
// EffectClientInterface implementation
virtual int GetAudioInCount();
virtual int GetAudioOutCount();
virtual bool ProcessInitialize(sampleCount totalLen, ChannelNames chanMap = NULL);
virtual sampleCount ProcessBlock(float **inBlock, float **outBlock, sampleCount blockLen);
int GetAudioInCount() override;
int GetAudioOutCount() override;
bool ProcessInitialize(sampleCount totalLen, ChannelNames chanMap = NULL) override;
sampleCount ProcessBlock(float **inBlock, float **outBlock, sampleCount blockLen) override;
private:
// EffectFadeIn implementation

18
src/effects/FindClipping.h
View File

@ -30,24 +30,24 @@ public:
// IdentInterface implementation
virtual wxString GetSymbol();
virtual wxString GetDescription();
wxString GetSymbol() override;
wxString GetDescription() override;
// EffectIdentInterface implementation
virtual EffectType GetType();
EffectType GetType() override;
// EffectClientInterface implementation
virtual bool GetAutomationParameters(EffectAutomationParameters & parms);
virtual bool SetAutomationParameters(EffectAutomationParameters & parms);
bool GetAutomationParameters(EffectAutomationParameters & parms) override;
bool SetAutomationParameters(EffectAutomationParameters & parms) override;
// Effect implementation
virtual bool Process();
virtual void PopulateOrExchange(ShuttleGui & S);
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow();
bool Process() override;
void PopulateOrExchange(ShuttleGui & S) override;
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
private:
// EffectFindCliping implementation

7
src/effects/Generator.h
View File

@ -34,23 +34,24 @@ protected:
const WaveTrack &track,
int ntrack) = 0;
virtual bool Init() { return true; }
bool Init() override { return true; }
// Actions to perform at the respective points in the generation process
// NEW virtuals
virtual void BeforeGenerate() { };
virtual void BeforeTrack(const WaveTrack & WXUNUSED(track)) { };
// Actions to perform upon respective outcomes
// (For example, Success might save the parameters that were used.)
virtual void Success() { };
virtual void Failure() { };
virtual void Failure() {};
// Precondition:
// mDuration is set to the amount of time to generate in seconds
// Postcondition:
// If mDuration was valid (>= 0), then the tracks are replaced by the
// generated results and true is returned. Otherwise, return false.
bool Process();
bool Process() override;
};
// Abstract generator which creates the sound in discrete blocks, whilst

14
src/effects/Invert.h
View File

@ -27,19 +27,19 @@ public:
// IdentInterface implementation
virtual wxString GetSymbol();
virtual wxString GetDescription();
wxString GetSymbol() override;
wxString GetDescription() override;
// EffectIdentInterface implementation
virtual EffectType GetType();
virtual bool IsInteractive();
EffectType GetType() override;
bool IsInteractive() override;
// EffectClientInterface implementation
virtual int GetAudioInCount();
virtual int GetAudioOutCount();
virtual sampleCount ProcessBlock(float **inBlock, float **outBlock, sampleCount blockLen);
int GetAudioInCount() override;
int GetAudioOutCount() override;
sampleCount ProcessBlock(float **inBlock, float **outBlock, sampleCount blockLen) override;
};
#endif

24
src/effects/Leveller.h
View File

@ -28,27 +28,27 @@ public:
// IdentInterface implementation
virtual wxString GetSymbol();
virtual wxString GetDescription();
wxString GetSymbol() override;
wxString GetDescription() override;
// EffectIdentInterface implementation
virtual EffectType GetType();
EffectType GetType() override;
// EffectClientInterface implementation
virtual int GetAudioInCount();
virtual int GetAudioOutCount();
virtual sampleCount ProcessBlock(float **inBlock, float **outBlock, sampleCount blockLen);
virtual bool GetAutomationParameters(EffectAutomationParameters & parms);
virtual bool SetAutomationParameters(EffectAutomationParameters & parms);
int GetAudioInCount() override;
int GetAudioOutCount() override;
sampleCount ProcessBlock(float **inBlock, float **outBlock, sampleCount blockLen) override;
bool GetAutomationParameters(EffectAutomationParameters & parms) override;
bool SetAutomationParameters(EffectAutomationParameters & parms) override;
// Effect implementation
virtual bool Startup();
virtual void PopulateOrExchange(ShuttleGui & S);
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow();
bool Startup() override;
void PopulateOrExchange(ShuttleGui & S) override;
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
private:
// EffectLeveller implementation

28
src/effects/LoadEffects.h
View File

@ -28,26 +28,26 @@ public:
// IdentInterface implementatino
virtual wxString GetPath();
virtual wxString GetSymbol();
virtual wxString GetName();
virtual wxString GetVendor();
virtual wxString GetVersion();
virtual wxString GetDescription();
wxString GetPath() override;
wxString GetSymbol() override;
wxString GetName() override;
wxString GetVendor() override;
wxString GetVersion() override;
wxString GetDescription() override;
// ModuleInterface implementation
virtual bool Initialize();
virtual void Terminate();
bool Initialize() override;
void Terminate() override;
virtual bool AutoRegisterPlugins(PluginManagerInterface & pm);
virtual wxArrayString FindPlugins(PluginManagerInterface & pm);
virtual bool RegisterPlugin(PluginManagerInterface & pm, const wxString & path);
bool AutoRegisterPlugins(PluginManagerInterface & pm) override;
wxArrayString FindPlugins(PluginManagerInterface & pm) override;
bool RegisterPlugin(PluginManagerInterface & pm, const wxString & path) override;
virtual bool IsPluginValid(const wxString & path);
bool IsPluginValid(const wxString & path) override;
virtual IdentInterface *CreateInstance(const wxString & path);
virtual void DeleteInstance(IdentInterface *instance);
IdentInterface *CreateInstance(const wxString & path) override;
void DeleteInstance(IdentInterface *instance) override;
private:
// BuiltinEffectModule implementation

22
src/effects/Noise.h
View File

@ -31,26 +31,26 @@ public:
// IdentInterface implementation
virtual wxString GetSymbol();
virtual wxString GetDescription();
wxString GetSymbol() override;
wxString GetDescription() override;
// EffectIdentInterface implementation
virtual EffectType GetType();
EffectType GetType() override;
// EffectClientInterface implementation
virtual int GetAudioOutCount();
virtual sampleCount ProcessBlock(float **inBlock, float **outBlock, sampleCount blockLen);
virtual bool GetAutomationParameters(EffectAutomationParameters & parms);
virtual bool SetAutomationParameters(EffectAutomationParameters & parms);
int GetAudioOutCount() override;
sampleCount ProcessBlock(float **inBlock, float **outBlock, sampleCount blockLen) override;
bool GetAutomationParameters(EffectAutomationParameters & parms) override;
bool SetAutomationParameters(EffectAutomationParameters & parms) override;
// Effect implementation
virtual bool Startup();
virtual void PopulateOrExchange(ShuttleGui & S);
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow();
bool Startup() override;
void PopulateOrExchange(ShuttleGui & S) override;
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
private:
// EffectNoise implementation

14
src/effects/NoiseReduction.h
View File

@ -29,22 +29,22 @@ public:
// IdentInterface implementation
virtual wxString GetSymbol();
virtual wxString GetDescription();
wxString GetSymbol() override;
wxString GetDescription() override;
// EffectIdentInterface implementation
virtual EffectType GetType();
EffectType GetType() override;
// Effect implementation
// using Effect::TrackProgress;
virtual bool PromptUser(wxWindow *parent);
bool PromptUser(wxWindow *parent) override;
virtual bool Init();
virtual bool CheckWhetherSkipEffect();
virtual bool Process();
bool Init() override;
bool CheckWhetherSkipEffect() override;
bool Process() override;
class Settings;
class Statistics;

16
src/effects/NoiseRemoval.h
View File

@ -40,20 +40,20 @@ public:
// IdentInterface implementation
virtual wxString GetSymbol();
virtual wxString GetDescription();
wxString GetSymbol() override;
wxString GetDescription() override;
// EffectIdentInterface implementation
virtual EffectType GetType();
virtual bool SupportsAutomation();
EffectType GetType() override;
bool SupportsAutomation() override;
// Effect implementation
virtual bool PromptUser();
virtual bool Init();
virtual bool CheckWhetherSkipEffect();
virtual bool Process();
bool PromptUser() override;
bool Init() override;
bool CheckWhetherSkipEffect() override;
bool Process() override;
private:

28
src/effects/Normalize.h
View File

@ -32,35 +32,35 @@ public:
// IdentInterface implementation
virtual wxString GetSymbol();
virtual wxString GetDescription();
wxString GetSymbol() override;
wxString GetDescription() override;
// EffectIdentInterface implementation
virtual EffectType GetType();
EffectType GetType() override;
// EffectClientInterface implementation
virtual bool GetAutomationParameters(EffectAutomationParameters & parms);
virtual bool SetAutomationParameters(EffectAutomationParameters & parms);
bool GetAutomationParameters(EffectAutomationParameters & parms) override;
bool SetAutomationParameters(EffectAutomationParameters & parms) override;
// Effect implementation
virtual bool CheckWhetherSkipEffect();
virtual bool Startup();
virtual bool Process();
virtual void PopulateOrExchange(ShuttleGui & S);
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow();
bool CheckWhetherSkipEffect() override;
bool Startup() override;
bool Process() override;
void PopulateOrExchange(ShuttleGui & S) override;
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
private:
// EffectNormalize implementation
bool ProcessOne(WaveTrack * t, const wxString &msg);
virtual void AnalyseTrack(WaveTrack * track, const wxString &msg);
virtual void AnalyzeData(float *buffer, sampleCount len);
void AnalyseTrack(WaveTrack * track, const wxString &msg);
void AnalyzeData(float *buffer, sampleCount len);
bool AnalyseDC(WaveTrack * track, const wxString &msg);
virtual void ProcessData(float *buffer, sampleCount len);
void ProcessData(float *buffer, sampleCount len);
void OnUpdateUI(wxCommandEvent & evt);
void UpdateUI();

2
src/effects/Paulstretch.cpp
View File

@ -59,7 +59,7 @@ public:
void set_rap(float newrap);//set the current stretch value
protected:
virtual void process_spectrum(float *WXUNUSED(freq)){};
void process_spectrum(float *WXUNUSED(freq)) {};
float samplerate;
private:

20
src/effects/Paulstretch.h
View File

@ -26,25 +26,25 @@ public:
// IdentInterface implementation
virtual wxString GetSymbol();
virtual wxString GetDescription();
wxString GetSymbol() override;
wxString GetDescription() override;
// EffectIdentInterface implementation
virtual EffectType GetType();
EffectType GetType() override;
// EffectClientInterface implementation
virtual bool GetAutomationParameters(EffectAutomationParameters & parms);
virtual bool SetAutomationParameters(EffectAutomationParameters & parms);
bool GetAutomationParameters(EffectAutomationParameters & parms) override;
bool SetAutomationParameters(EffectAutomationParameters & parms) override;
// Effect implementation
virtual double CalcPreviewInputLength(double previewLength);
virtual bool Process();
virtual void PopulateOrExchange(ShuttleGui & S);
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow();
double CalcPreviewInputLength(double previewLength) override;
bool Process() override;
void PopulateOrExchange(ShuttleGui & S) override;
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
private:
// EffectPaulstretch implementation

30
src/effects/Phaser.h
View File

@ -54,29 +54,29 @@ public:
// IdentInterface implementation
virtual wxString GetSymbol();
virtual wxString GetDescription();
wxString GetSymbol() override;
wxString GetDescription() override;
// EffectIdentInterface implementation
virtual EffectType GetType();
virtual bool SupportsRealtime();
EffectType GetType() override;
bool SupportsRealtime() override;
// EffectClientInterface implementation
virtual int GetAudioInCount();
virtual int GetAudioOutCount();
virtual bool ProcessInitialize(sampleCount totalLen, ChannelNames chanMap = NULL);
virtual sampleCount ProcessBlock(float **inBlock, float **outBlock, sampleCount blockLen);
virtual bool RealtimeInitialize();
virtual bool RealtimeAddProcessor(int numChannels, float sampleRate);
virtual bool RealtimeFinalize();
virtual sampleCount RealtimeProcess(int group,
int GetAudioInCount() override;
int GetAudioOutCount() override;
bool ProcessInitialize(sampleCount totalLen, ChannelNames chanMap = NULL) override;
sampleCount ProcessBlock(float **inBlock, float **outBlock, sampleCount blockLen) override;
bool RealtimeInitialize() override;
bool RealtimeAddProcessor(int numChannels, float sampleRate) override;
bool RealtimeFinalize() override;
sampleCount RealtimeProcess(int group,
float **inbuf,
float **outbuf,
sampleCount numSamples);
virtual bool GetAutomationParameters(EffectAutomationParameters & parms);
virtual bool SetAutomationParameters(EffectAutomationParameters & parms);
sampleCount numSamples) override;
bool GetAutomationParameters(EffectAutomationParameters & parms) override;
bool SetAutomationParameters(EffectAutomationParameters & parms) override;
// Effect implementation

10
src/effects/Repair.h
View File

@ -27,17 +27,17 @@ public:
// IdentInterface implementation
virtual wxString GetSymbol();
virtual wxString GetDescription();
wxString GetSymbol() override;
wxString GetDescription() override;
// EffectIdentInterface implementation
virtual EffectType GetType();
virtual bool IsInteractive();
EffectType GetType() override;
bool IsInteractive() override;
// Effect implementation
virtual bool Process();
bool Process() override;
private:
// EffectRepair implementaion

18
src/effects/Repeat.h
View File

@ -30,24 +30,24 @@ public:
// IdentInterface implementation
virtual wxString GetSymbol();
virtual wxString GetDescription();
wxString GetSymbol() override;
wxString GetDescription() override;
// EffectIdentInterface implementation
virtual EffectType GetType();
EffectType GetType() override;
// EffectClientInterface implementation
virtual bool GetAutomationParameters(EffectAutomationParameters & parms);
virtual bool SetAutomationParameters(EffectAutomationParameters & parms);
bool GetAutomationParameters(EffectAutomationParameters & parms) override;
bool SetAutomationParameters(EffectAutomationParameters & parms) override;
// Effect implementation
virtual bool Process();
virtual void PopulateOrExchange(ShuttleGui & S);
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow();
bool Process() override;
void PopulateOrExchange(ShuttleGui & S) override;
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
private:
// EffectRepeat implementation

24
src/effects/Reverb.h
View File

@ -48,24 +48,24 @@ public:
// IdentInterface implementation
virtual wxString GetSymbol();
virtual wxString GetDescription();
wxString GetSymbol() override;
wxString GetDescription() override;
// EffectIdentInterface implementation
virtual EffectType GetType();
EffectType GetType() override;
// EffectClientInterface implementation
virtual int GetAudioInCount();
virtual int GetAudioOutCount();
virtual bool ProcessInitialize(sampleCount totalLen, ChannelNames chanMap = NULL);
virtual bool ProcessFinalize();
virtual sampleCount ProcessBlock(float **inBlock, float **outBlock, sampleCount blockLen);
virtual bool GetAutomationParameters(EffectAutomationParameters & parms);
virtual bool SetAutomationParameters(EffectAutomationParameters & parms);
virtual wxArrayString GetFactoryPresets();
virtual bool LoadFactoryPreset(int id);
int GetAudioInCount() override;
int GetAudioOutCount() override;
bool ProcessInitialize(sampleCount totalLen, ChannelNames chanMap = NULL) override;
bool ProcessFinalize() override;
sampleCount ProcessBlock(float **inBlock, float **outBlock, sampleCount blockLen) override;
bool GetAutomationParameters(EffectAutomationParameters & parms) override;
bool SetAutomationParameters(EffectAutomationParameters & parms) override;
wxArrayString GetFactoryPresets() override;
bool LoadFactoryPreset(int id) override;
// Effect implementation

10
src/effects/Reverse.h
View File

@ -27,17 +27,17 @@ public:
// IdentInterface implementation
virtual wxString GetSymbol();
virtual wxString GetDescription();
wxString GetSymbol() override;
wxString GetDescription() override;
// EffectIdentInterface implementation
virtual EffectType GetType();
virtual bool IsInteractive();
EffectType GetType() override;
bool IsInteractive() override;
// Effect implementation
virtual bool Process();
bool Process() override;
private:
// EffectReverse implementation

2
src/effects/SBSMSEffect.h
View File

@ -24,7 +24,7 @@ using namespace _sbsms_;
class EffectSBSMS /* not final */ : public Effect
{
public:
virtual bool Process();
bool Process() override;
void setParameters(double rateStart, double rateEnd, double pitchStart, double pitchEnd,
SlideType rateSlideType, SlideType pitchSlideType,
bool bLinkRatePitch, bool bRateReferenceInput, bool bPitchReferenceInput);

32
src/effects/ScienFilter.h
View File

@ -43,35 +43,35 @@ public:
// IdentInterface implementation
virtual wxString GetSymbol();
virtual wxString GetDescription();
wxString GetSymbol() override;
wxString GetDescription() override;
// EffectIdentInterface implementation
virtual EffectType GetType();
EffectType GetType() override;
// EffectClientInterface implementation
virtual int GetAudioInCount();
virtual int GetAudioOutCount();
virtual bool ProcessInitialize(sampleCount totalLen, ChannelNames chanMap = NULL);
virtual sampleCount ProcessBlock(float **inBlock, float **outBlock, sampleCount blockLen);
virtual bool GetAutomationParameters(EffectAutomationParameters & parms);
virtual bool SetAutomationParameters(EffectAutomationParameters & parms);
int GetAudioInCount() override;
int GetAudioOutCount() override;
bool ProcessInitialize(sampleCount totalLen, ChannelNames chanMap = NULL) override;
sampleCount ProcessBlock(float **inBlock, float **outBlock, sampleCount blockLen) override;
bool GetAutomationParameters(EffectAutomationParameters & parms) override;
bool SetAutomationParameters(EffectAutomationParameters & parms) override;
// Effect implementation
virtual bool Startup();
virtual bool Init();
virtual void PopulateOrExchange(ShuttleGui & S);
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow();
bool Startup() override;
bool Init() override;
void PopulateOrExchange(ShuttleGui & S) override;
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
private:
// EffectScienFilter implementation
virtual bool TransferGraphLimitsFromWindow();
virtual bool CalcFilter();
bool TransferGraphLimitsFromWindow();
bool CalcFilter();
double ChebyPoly (int Order, double NormFreq);
float FilterMagnAtFreq(float Freq);

12
src/effects/Silence.h
View File

@ -29,18 +29,18 @@ public:
// IdentInterface implementation
virtual wxString GetSymbol();
virtual wxString GetDescription();
wxString GetSymbol() override;
wxString GetDescription() override;
// EffectIdentInterface implementation
virtual EffectType GetType();
EffectType GetType() override;
// Effect implementation
virtual void PopulateOrExchange(ShuttleGui & S);
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow();
void PopulateOrExchange(ShuttleGui & S) override;
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
protected:
// Generator implementation

5
src/effects/SimpleMono.h
View File

@ -24,13 +24,14 @@ class WaveTrack;
class EffectSimpleMono /* not final */ : public Effect
{
public:
virtual bool Process();
bool Process() override;
protected:
// Override this method if you need to do things
// before every track (including the first one)
virtual bool NewTrackSimpleMono();
// NEW override
virtual bool NewTrackSimpleMono() = 0;
// Override this method to actually process audio
virtual bool ProcessSimpleMono(float *buffer, sampleCount len) = 0;

2
src/effects/SoundTouchEffect.h
View File

@ -40,7 +40,7 @@ public:
// Effect implementation
virtual bool Process();
bool Process() override;
// EffectSoundTouch implementation

16
src/effects/StereoToMono.h
View File

@ -25,23 +25,23 @@ public:
// IdentInterface implementation
virtual wxString GetSymbol();
virtual wxString GetDescription();
wxString GetSymbol() override;
wxString GetDescription() override;
// EffectIdentInterface implementation
virtual EffectType GetType();
virtual bool IsInteractive();
EffectType GetType() override;
bool IsInteractive() override;
// EffectClientInterface implementation
virtual int GetAudioInCount();
virtual int GetAudioOutCount();
int GetAudioInCount() override;
int GetAudioOutCount() override;
// Effect implementation
virtual bool Process();
virtual bool IsHidden();
bool Process() override;
bool IsHidden() override;
private:
// EffectStereoToMono implementation

26
src/effects/TimeScale.h
View File

@ -34,28 +34,28 @@ public:
// IdentInterface implementation
virtual wxString GetSymbol();
virtual wxString GetName();
virtual wxString GetDescription();
wxString GetSymbol() override;
wxString GetName() override;
wxString GetDescription() override;
// EffectIdentInterface implementation
virtual EffectType GetType();
EffectType GetType() override;
// EffectClientInterface implementation
virtual bool GetAutomationParameters(EffectAutomationParameters & parms);
virtual bool SetAutomationParameters(EffectAutomationParameters & parms);
bool GetAutomationParameters(EffectAutomationParameters & parms) override;
bool SetAutomationParameters(EffectAutomationParameters & parms) override;
// Effect implementation
virtual bool Init();
virtual void Preview(bool dryOnly);
virtual bool Process();
virtual void PopulateOrExchange(ShuttleGui & S);
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow();
virtual double CalcPreviewInputLength(double previewLength);
bool Init() override;
void Preview(bool dryOnly) override;
bool Process() override;
void PopulateOrExchange(ShuttleGui & S) override;
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
double CalcPreviewInputLength(double previewLength) override;
private:
// EffectTimeScale implementation

22
src/effects/TimeWarper.h
View File

@ -66,7 +66,7 @@ public:
class IdentityTimeWarper final : public TimeWarper
{
public:
virtual double Warp(double originalTime) const;
double Warp(double originalTime) const override;
};
class ShiftTimeWarper final : public TimeWarper
@ -79,7 +79,7 @@ public:
: mWarper(warper), mShift(shiftAmount) { }
virtual ~ShiftTimeWarper()
{ delete mWarper; }
virtual double Warp(double originalTime) const;
double Warp(double originalTime) const override;
};
class LinearTimeWarper final : public TimeWarper
@ -93,7 +93,7 @@ public:
: mScale((tAfter1 - tAfter0)/(tBefore1 - tBefore0)),
mShift(tAfter0 - mScale*tBefore0)
{ }
virtual double Warp(double originalTime) const;
double Warp(double originalTime) const override;
};
class LinearInputRateTimeWarper final : public TimeWarper
@ -106,7 +106,7 @@ private:
public:
LinearInputRateTimeWarper(double tStart, double tEnd,
double rStart, double rEnd);
virtual double Warp(double originalTime) const;
double Warp(double originalTime) const override;
};
class LinearOutputRateTimeWarper final : public TimeWarper
@ -121,7 +121,7 @@ private:
public:
LinearOutputRateTimeWarper(double tStart, double tEnd,
double rStart, double rEnd);
virtual double Warp(double originalTime) const;
double Warp(double originalTime) const override;
};
class LinearInputStretchTimeWarper final : public TimeWarper
@ -134,7 +134,7 @@ private:
public:
LinearInputStretchTimeWarper(double tStart, double tEnd,
double rStart, double rEnd);
virtual double Warp(double originalTime) const;
double Warp(double originalTime) const override;
};
class LinearOutputStretchTimeWarper final : public TimeWarper
@ -147,7 +147,7 @@ private:
public:
LinearOutputStretchTimeWarper(double tStart, double tEnd,
double rStart, double rEnd);
virtual double Warp(double originalTime) const;
double Warp(double originalTime) const override;
};
class GeometricInputTimeWarper final : public TimeWarper
@ -160,7 +160,7 @@ private:
public:
GeometricInputTimeWarper(double tStart, double tEnd,
double rStart, double rEnd);
virtual double Warp(double originalTime) const;
double Warp(double originalTime) const override;
};
class GeometricOutputTimeWarper final : public TimeWarper
@ -173,7 +173,7 @@ private:
public:
GeometricOutputTimeWarper(double tStart, double tEnd,
double rStart, double rEnd);
virtual double Warp(double originalTime) const;
double Warp(double originalTime) const override;
};
class StepTimeWarper final : public TimeWarper
@ -183,7 +183,7 @@ private:
double mOffset;
public:
StepTimeWarper(double tStep, double offset);
virtual double Warp(double originalTime) const;
double Warp(double originalTime) const override;
};
@ -202,7 +202,7 @@ public:
{ }
virtual ~RegionTimeWarper()
{ delete mWarper; }
virtual double Warp(double originalTime) const
double Warp(double originalTime) const override
{
if (originalTime < mTStart)
{

16
src/effects/ToneGen.h
View File

@ -33,20 +33,20 @@ public:
// IdentInterface implementation
virtual wxString GetSymbol();
virtual wxString GetDescription();
wxString GetSymbol() override;
wxString GetDescription() override;
// EffectIdentInterface implementation
virtual EffectType GetType();
EffectType GetType() override;
// EffectClientInterface implementation
virtual int GetAudioOutCount();
virtual bool ProcessInitialize(sampleCount totalLen, ChannelNames chanMap = NULL);
virtual sampleCount ProcessBlock(float **inBlock, float **outBlock, sampleCount blockLen);
virtual bool GetAutomationParameters(EffectAutomationParameters & parms);
virtual bool SetAutomationParameters(EffectAutomationParameters & parms);
int GetAudioOutCount() override;
bool ProcessInitialize(sampleCount totalLen, ChannelNames chanMap = NULL) override;
sampleCount ProcessBlock(float **inBlock, float **outBlock, sampleCount blockLen) override;
bool GetAutomationParameters(EffectAutomationParameters & parms) override;
bool SetAutomationParameters(EffectAutomationParameters & parms) override;
// Effect implementation

24
src/effects/TruncSilence.h
View File

@ -41,27 +41,27 @@ public:
// IdentInterface implementation
virtual wxString GetSymbol();
virtual wxString GetDescription();
wxString GetSymbol() override;
wxString GetDescription() override;
// EffectIdentInterface implementation
virtual EffectType GetType();
EffectType GetType() override;
// EffectClientInterface implementation
virtual bool GetAutomationParameters(EffectAutomationParameters & parms);
virtual bool SetAutomationParameters(EffectAutomationParameters & parms);
bool GetAutomationParameters(EffectAutomationParameters & parms) override;
bool SetAutomationParameters(EffectAutomationParameters & parms) override;
// Effect implementation
virtual double CalcPreviewInputLength(double previewLength);
virtual bool Startup();
double CalcPreviewInputLength(double previewLength) override;
bool Startup() override;
// Analyze a single track to find silences
// If inputLength is not NULL we are calculating the minimum
// amount of input for previewing.
virtual bool Analyze(RegionList &silenceList,
bool Analyze(RegionList &silenceList,
RegionList &trackSilences,
WaveTrack* wt,
sampleCount* silentFrame,
@ -70,10 +70,10 @@ public:
double* inputLength = NULL,
double* minInputLength = NULL);
virtual bool Process();
virtual void PopulateOrExchange(ShuttleGui & S);
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow();
bool Process() override;
void PopulateOrExchange(ShuttleGui & S) override;
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
private:
// EffectTruncSilence implementation

10
src/effects/TwoPassSimpleMono.h
View File

@ -22,7 +22,7 @@ class EffectTwoPassSimpleMono /* not final */ : public Effect
public:
// Effect implementation
virtual bool Process();
bool Process() override;
protected:
// EffectTwoPassSimpleMono implemetation
@ -30,8 +30,10 @@ protected:
// Override these methods if you need to initialize something
// before each pass. Return None if processing should stop.
// These should not depend on mOutputTracks having been set up via CopyInputTracks().
virtual bool InitPass1();
virtual bool InitPass2();
bool InitPass1() override;
bool InitPass2() override;
// NEW virtuals
// Override these methods if you need to do things
// before every track (including the first one)
@ -51,6 +53,8 @@ protected:
virtual bool TwoBufferProcessPass2(float *buffer1, sampleCount len1, float * WXUNUSED(buffer2), sampleCount WXUNUSED(len2))
{ if(buffer1 != NULL) return ProcessPass2(buffer1, len1); else return true; }
// End of NEW virtuals
// Call this if you know in advance that no second pass will be needed.
// This is used as a hint for the progress bar
void DisableSecondPass() { mSecondPassDisabled = true; }

144
src/effects/VST/VSTEffect.h
View File

@ -73,83 +73,83 @@ class VSTEffect final : public wxEvtHandler,
// IdentInterface implementation
virtual wxString GetPath();
virtual wxString GetSymbol();
virtual wxString GetName();
virtual wxString GetVendor();
virtual wxString GetVersion();
virtual wxString GetDescription();
wxString GetPath() override;
wxString GetSymbol() override;
wxString GetName() override;
wxString GetVendor() override;
wxString GetVersion() override;
wxString GetDescription() override;
// EffectIdentInterface implementation
virtual EffectType GetType();
virtual wxString GetFamily();
virtual bool IsInteractive();
virtual bool IsDefault();
virtual bool IsLegacy();
virtual bool SupportsRealtime();
virtual bool SupportsAutomation();
EffectType GetType() override;
wxString GetFamily() override;
bool IsInteractive() override;
bool IsDefault() override;
bool IsLegacy() override;
bool SupportsRealtime() override;
bool SupportsAutomation() override;
// EffectClientInterface implementation
virtual bool SetHost(EffectHostInterface *host);
bool SetHost(EffectHostInterface *host) override;
virtual int GetAudioInCount();
virtual int GetAudioOutCount();
int GetAudioInCount() override;
int GetAudioOutCount() override;
virtual int GetMidiInCount();
virtual int GetMidiOutCount();
int GetMidiInCount() override;
int GetMidiOutCount() override;
virtual sampleCount GetLatency();
virtual sampleCount GetTailSize();
sampleCount GetLatency() override;
sampleCount GetTailSize() override;
virtual void SetSampleRate(sampleCount rate);
virtual sampleCount SetBlockSize(sampleCount maxBlockSize);
void SetSampleRate(sampleCount rate) override;
sampleCount SetBlockSize(sampleCount maxBlockSize) override;
virtual bool IsReady();
virtual bool ProcessInitialize(sampleCount totalLen, ChannelNames chanMap = NULL);
virtual bool ProcessFinalize();
virtual sampleCount ProcessBlock(float **inBlock, float **outBlock, sampleCount blockLen);
bool IsReady() override;
bool ProcessInitialize(sampleCount totalLen, ChannelNames chanMap = NULL) override;
bool ProcessFinalize() override;
sampleCount ProcessBlock(float **inBlock, float **outBlock, sampleCount blockLen) override;
virtual bool RealtimeInitialize();
virtual bool RealtimeAddProcessor(int numChannels, float sampleRate);
virtual bool RealtimeFinalize();
virtual bool RealtimeSuspend();
virtual bool RealtimeResume();
virtual bool RealtimeProcessStart();
virtual sampleCount RealtimeProcess(int group,
bool RealtimeInitialize() override;
bool RealtimeAddProcessor(int numChannels, float sampleRate) override;
bool RealtimeFinalize() override;
bool RealtimeSuspend() override;
bool RealtimeResume() override;
bool RealtimeProcessStart() override;
sampleCount RealtimeProcess(int group,
float **inbuf,
float **outbuf,
sampleCount numSamples);
virtual bool RealtimeProcessEnd();
sampleCount numSamples) override;
bool RealtimeProcessEnd() override;
virtual bool ShowInterface(wxWindow *parent, bool forceModal = false);
bool ShowInterface(wxWindow *parent, bool forceModal = false) override;
virtual bool GetAutomationParameters(EffectAutomationParameters & parms);
virtual bool SetAutomationParameters(EffectAutomationParameters & parms);
bool GetAutomationParameters(EffectAutomationParameters & parms) override;
bool SetAutomationParameters(EffectAutomationParameters & parms) override;
virtual bool LoadUserPreset(const wxString & name);
virtual bool SaveUserPreset(const wxString & name);
bool LoadUserPreset(const wxString & name) override;
bool SaveUserPreset(const wxString & name) override;
virtual wxArrayString GetFactoryPresets();
virtual bool LoadFactoryPreset(int id);
virtual bool LoadFactoryDefaults();
wxArrayString GetFactoryPresets() override;
bool LoadFactoryPreset(int id) override;
bool LoadFactoryDefaults() override;
// EffectUIClientInterface implementation
virtual void SetHostUI(EffectUIHostInterface *host);
virtual bool PopulateUI(wxWindow *parent);
virtual bool IsGraphicalUI();
virtual bool ValidateUI();
virtual bool HideUI();
virtual bool CloseUI();
void SetHostUI(EffectUIHostInterface *host) override;
bool PopulateUI(wxWindow *parent) override;
bool IsGraphicalUI() override;
bool ValidateUI() override;
bool HideUI() override;
bool CloseUI() override;
virtual bool CanExportPresets();
virtual void ExportPresets();
virtual void ImportPresets();
bool CanExportPresets() override;
void ExportPresets() override;
void ImportPresets() override;
virtual bool HasOptions();
virtual void ShowOptions();
bool HasOptions() override;
void ShowOptions() override;
// VSTEffect implementation
@ -210,10 +210,10 @@ private:
void SaveXML(const wxFileName & fn);
void SaveFXProgram(wxMemoryBuffer & buf, int index);
virtual bool HandleXMLTag(const wxChar *tag, const wxChar **attrs);
virtual void HandleXMLEndTag(const wxChar *tag);
virtual void HandleXMLContent(const wxString & content);
virtual XMLTagHandler *HandleXMLChild(const wxChar *tag);
bool HandleXMLTag(const wxChar *tag, const wxChar **attrs) override;
void HandleXMLEndTag(const wxChar *tag) override;
void HandleXMLContent(const wxString & content) override;
XMLTagHandler *HandleXMLChild(const wxChar *tag) override;
// Utility methods
@ -337,26 +337,26 @@ public:
// IdentInterface implementatino
virtual wxString GetPath();
virtual wxString GetSymbol();
virtual wxString GetName();
virtual wxString GetVendor();
virtual wxString GetVersion();
virtual wxString GetDescription();
wxString GetPath() override;
wxString GetSymbol() override;
wxString GetName() override;
wxString GetVendor() override;
wxString GetVersion() override;
wxString GetDescription() override;
// ModuleInterface implementation
virtual bool Initialize();
virtual void Terminate();
bool Initialize() override;
void Terminate() override;
virtual bool AutoRegisterPlugins(PluginManagerInterface & pm);
virtual wxArrayString FindPlugins(PluginManagerInterface & pm);
virtual bool RegisterPlugin(PluginManagerInterface & pm, const wxString & path);
bool AutoRegisterPlugins(PluginManagerInterface & pm) override;
wxArrayString FindPlugins(PluginManagerInterface & pm) override;
bool RegisterPlugin(PluginManagerInterface & pm, const wxString & path) override;
virtual bool IsPluginValid(const wxString & path);
bool IsPluginValid(const wxString & path) override;
virtual IdentInterface *CreateInstance(const wxString & path);
virtual void DeleteInstance(IdentInterface *instance);
IdentInterface *CreateInstance(const wxString & path) override;
void DeleteInstance(IdentInterface *instance) override;
// VSTEffectModule implementation

36
src/effects/Wahwah.h
View File

@ -51,35 +51,35 @@ public:
// IdentInterface implementation
virtual wxString GetSymbol();
virtual wxString GetDescription();
wxString GetSymbol() override;
wxString GetDescription() override;
// EffectIdentInterface implementation
virtual EffectType GetType();
virtual bool SupportsRealtime();
EffectType GetType() override;
bool SupportsRealtime() override;
// EffectClientInterface implementation
virtual int GetAudioInCount();
virtual int GetAudioOutCount();
virtual bool ProcessInitialize(sampleCount totalLen, ChannelNames chanMap = NULL);
virtual sampleCount ProcessBlock(float **inBlock, float **outBlock, sampleCount blockLen);
virtual bool RealtimeInitialize();
virtual bool RealtimeAddProcessor(int numChannels, float sampleRate);
virtual bool RealtimeFinalize();
virtual sampleCount RealtimeProcess(int group,
int GetAudioInCount() override;
int GetAudioOutCount() override;
bool ProcessInitialize(sampleCount totalLen, ChannelNames chanMap = NULL) override;
sampleCount ProcessBlock(float **inBlock, float **outBlock, sampleCount blockLen) override;
bool RealtimeInitialize() override;
bool RealtimeAddProcessor(int numChannels, float sampleRate) override;
bool RealtimeFinalize() override;
sampleCount RealtimeProcess(int group,
float **inbuf,
float **outbuf,
sampleCount numSamples);
virtual bool GetAutomationParameters(EffectAutomationParameters & parms);
virtual bool SetAutomationParameters(EffectAutomationParameters & parms);
sampleCount numSamples) override;
bool GetAutomationParameters(EffectAutomationParameters & parms) override;
bool SetAutomationParameters(EffectAutomationParameters & parms) override;
// Effect implementation
virtual void PopulateOrExchange(ShuttleGui & S);
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow();
void PopulateOrExchange(ShuttleGui & S) override;
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
private:
// EffectWahwah implementation

Some files were not shown because too many files have changed in this diff Show More