Move classes EffectUIHost and EffectPanel to EffectUI.cpp
This commit is contained in:
parent
91536d734f
commit
8c4d8db133
|
@ -2014,7 +2014,7 @@
|
||||||
1790B01619883BFD008A330A /* EBUR128.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = EBUR128.h; sourceTree = "<group>"; tabWidth = 3; };
|
1790B01619883BFD008A330A /* EBUR128.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = EBUR128.h; sourceTree = "<group>"; tabWidth = 3; };
|
||||||
1790B01709883BFD008A330A /* Echo.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.cpp.cpp; path = Echo.cpp; sourceTree = "<group>"; tabWidth = 3; };
|
1790B01709883BFD008A330A /* Echo.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.cpp.cpp; path = Echo.cpp; sourceTree = "<group>"; tabWidth = 3; };
|
||||||
1790B01809883BFD008A330A /* Echo.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = Echo.h; sourceTree = "<group>"; tabWidth = 3; };
|
1790B01809883BFD008A330A /* Echo.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = Echo.h; sourceTree = "<group>"; tabWidth = 3; };
|
||||||
1790B01909883BFD008A330A /* Effect.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; indentWidth = 3; path = Effect.cpp; sourceTree = "<group>"; tabWidth = 3; };
|
1790B01909883BFD008A330A /* Effect.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; indentWidth = 3; path = Effect.cpp; sourceTree = "<group>"; tabWidth = 3; };
|
||||||
1790B01A09883BFD008A330A /* Effect.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = Effect.h; sourceTree = "<group>"; tabWidth = 3; };
|
1790B01A09883BFD008A330A /* Effect.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = Effect.h; sourceTree = "<group>"; tabWidth = 3; };
|
||||||
1790B01B09883BFD008A330A /* Equalization.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.cpp.cpp; path = Equalization.cpp; sourceTree = "<group>"; tabWidth = 3; };
|
1790B01B09883BFD008A330A /* Equalization.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.cpp.cpp; path = Equalization.cpp; sourceTree = "<group>"; tabWidth = 3; };
|
||||||
1790B01C09883BFD008A330A /* Equalization.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = Equalization.h; sourceTree = "<group>"; tabWidth = 3; };
|
1790B01C09883BFD008A330A /* Equalization.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = Equalization.h; sourceTree = "<group>"; tabWidth = 3; };
|
||||||
|
@ -3402,7 +3402,7 @@
|
||||||
5EBD1C9322D11DAF00299FD4 /* WaveformVZoomHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WaveformVZoomHandle.h; sourceTree = "<group>"; };
|
5EBD1C9322D11DAF00299FD4 /* WaveformVZoomHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WaveformVZoomHandle.h; sourceTree = "<group>"; };
|
||||||
5EBD243C1F74C50800132E0A /* eu_ES.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = eu_ES.po; path = ../locale/eu_ES.po; sourceTree = "<group>"; };
|
5EBD243C1F74C50800132E0A /* eu_ES.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = eu_ES.po; path = ../locale/eu_ES.po; sourceTree = "<group>"; };
|
||||||
5EBD35851F78D37A0084D13F /* pt_PT.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = pt_PT.po; path = ../locale/pt_PT.po; sourceTree = "<group>"; };
|
5EBD35851F78D37A0084D13F /* pt_PT.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = pt_PT.po; path = ../locale/pt_PT.po; sourceTree = "<group>"; };
|
||||||
5EBDF98322E49CE700DD697E /* EffectUI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EffectUI.cpp; sourceTree = "<group>"; };
|
5EBDF98322E49CE700DD697E /* EffectUI.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = EffectUI.cpp; sourceTree = "<group>"; };
|
||||||
5EBDF98422E49CE700DD697E /* EffectUI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EffectUI.h; sourceTree = "<group>"; };
|
5EBDF98422E49CE700DD697E /* EffectUI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EffectUI.h; sourceTree = "<group>"; };
|
||||||
5EBE711422D0EA82004ABABB /* SpectrumView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SpectrumView.cpp; sourceTree = "<group>"; };
|
5EBE711422D0EA82004ABABB /* SpectrumView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SpectrumView.cpp; sourceTree = "<group>"; };
|
||||||
5EBE711522D0EA82004ABABB /* SpectrumView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpectrumView.h; sourceTree = "<group>"; };
|
5EBE711522D0EA82004ABABB /* SpectrumView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpectrumView.h; sourceTree = "<group>"; };
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -583,105 +583,6 @@ private:
|
||||||
wxDECLARE_NO_COPY_CLASS(EffectDialog);
|
wxDECLARE_NO_COPY_CLASS(EffectDialog);
|
||||||
};
|
};
|
||||||
|
|
||||||
//
|
|
||||||
class EffectUIHost final : public wxDialogWrapper,
|
|
||||||
public EffectUIHostInterface
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
// constructors and destructors
|
|
||||||
EffectUIHost(wxWindow *parent,
|
|
||||||
Effect *effect,
|
|
||||||
EffectUIClientInterface *client);
|
|
||||||
EffectUIHost(wxWindow *parent,
|
|
||||||
AudacityCommand *command,
|
|
||||||
EffectUIClientInterface *client);
|
|
||||||
virtual ~EffectUIHost();
|
|
||||||
|
|
||||||
bool TransferDataToWindow() override;
|
|
||||||
bool TransferDataFromWindow() override;
|
|
||||||
|
|
||||||
int ShowModal() override;
|
|
||||||
|
|
||||||
bool Initialize();
|
|
||||||
|
|
||||||
private:
|
|
||||||
void OnInitDialog(wxInitDialogEvent & evt);
|
|
||||||
void OnErase(wxEraseEvent & evt);
|
|
||||||
void OnPaint(wxPaintEvent & evt);
|
|
||||||
void OnClose(wxCloseEvent & evt);
|
|
||||||
void OnApply(wxCommandEvent & evt);
|
|
||||||
void DoCancel();
|
|
||||||
void OnCancel(wxCommandEvent & evt);
|
|
||||||
void OnHelp(wxCommandEvent & evt);
|
|
||||||
void OnDebug(wxCommandEvent & evt);
|
|
||||||
void OnMenu(wxCommandEvent & evt);
|
|
||||||
void OnEnable(wxCommandEvent & evt);
|
|
||||||
void OnPlay(wxCommandEvent & evt);
|
|
||||||
void OnRewind(wxCommandEvent & evt);
|
|
||||||
void OnFFwd(wxCommandEvent & evt);
|
|
||||||
void OnPlayback(wxCommandEvent & evt);
|
|
||||||
void OnCapture(wxCommandEvent & evt);
|
|
||||||
void OnUserPreset(wxCommandEvent & evt);
|
|
||||||
void OnFactoryPreset(wxCommandEvent & evt);
|
|
||||||
void OnDeletePreset(wxCommandEvent & evt);
|
|
||||||
void OnSaveAs(wxCommandEvent & evt);
|
|
||||||
void OnImport(wxCommandEvent & evt);
|
|
||||||
void OnExport(wxCommandEvent & evt);
|
|
||||||
void OnOptions(wxCommandEvent & evt);
|
|
||||||
void OnDefaults(wxCommandEvent & evt);
|
|
||||||
|
|
||||||
void UpdateControls();
|
|
||||||
wxBitmap CreateBitmap(const char * const xpm[], bool up, bool pusher);
|
|
||||||
void LoadUserPresets();
|
|
||||||
|
|
||||||
void InitializeRealtime();
|
|
||||||
void CleanupRealtime();
|
|
||||||
void Resume();
|
|
||||||
|
|
||||||
private:
|
|
||||||
AudacityProject *mProject;
|
|
||||||
wxWindow *mParent;
|
|
||||||
Effect *mEffect;
|
|
||||||
AudacityCommand * mCommand;
|
|
||||||
EffectUIClientInterface *mClient;
|
|
||||||
|
|
||||||
RegistryPaths mUserPresets;
|
|
||||||
bool mInitialized;
|
|
||||||
bool mSupportsRealtime;
|
|
||||||
bool mIsGUI;
|
|
||||||
bool mIsBatch;
|
|
||||||
|
|
||||||
wxButton *mApplyBtn;
|
|
||||||
wxButton *mCloseBtn;
|
|
||||||
wxButton *mMenuBtn;
|
|
||||||
wxButton *mPlayBtn;
|
|
||||||
wxButton *mRewindBtn;
|
|
||||||
wxButton *mFFwdBtn;
|
|
||||||
wxCheckBox *mEnableCb;
|
|
||||||
|
|
||||||
wxButton *mEnableToggleBtn;
|
|
||||||
wxButton *mPlayToggleBtn;
|
|
||||||
|
|
||||||
wxBitmap mPlayBM;
|
|
||||||
wxBitmap mPlayDisabledBM;
|
|
||||||
wxBitmap mStopBM;
|
|
||||||
wxBitmap mStopDisabledBM;
|
|
||||||
|
|
||||||
bool mEnabled;
|
|
||||||
|
|
||||||
bool mDisableTransport;
|
|
||||||
bool mPlaying;
|
|
||||||
bool mCapturing;
|
|
||||||
|
|
||||||
SelectedRegion mRegion;
|
|
||||||
double mPlayPos;
|
|
||||||
|
|
||||||
bool mDismissed{};
|
|
||||||
bool mNeedsResume{};
|
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE()
|
|
||||||
};
|
|
||||||
|
|
||||||
class EffectPresetsDialog final : public wxDialogWrapper
|
class EffectPresetsDialog final : public wxDialogWrapper
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -102,4 +102,114 @@ private:
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include "audacity/EffectInterface.h"
|
||||||
|
#include "../widgets/wxPanelWrapper.h" // to inherit
|
||||||
|
|
||||||
|
#include "../SelectedRegion.h"
|
||||||
|
|
||||||
|
class AudacityCommand;
|
||||||
|
class AudacityProject;
|
||||||
|
class Effect;
|
||||||
|
|
||||||
|
class wxCheckBox;
|
||||||
|
|
||||||
|
//
|
||||||
|
class EffectUIHost final : public wxDialogWrapper,
|
||||||
|
public EffectUIHostInterface
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
// constructors and destructors
|
||||||
|
EffectUIHost(wxWindow *parent,
|
||||||
|
Effect *effect,
|
||||||
|
EffectUIClientInterface *client);
|
||||||
|
EffectUIHost(wxWindow *parent,
|
||||||
|
AudacityCommand *command,
|
||||||
|
EffectUIClientInterface *client);
|
||||||
|
virtual ~EffectUIHost();
|
||||||
|
|
||||||
|
bool TransferDataToWindow() override;
|
||||||
|
bool TransferDataFromWindow() override;
|
||||||
|
|
||||||
|
int ShowModal() override;
|
||||||
|
|
||||||
|
bool Initialize();
|
||||||
|
|
||||||
|
private:
|
||||||
|
void OnInitDialog(wxInitDialogEvent & evt);
|
||||||
|
void OnErase(wxEraseEvent & evt);
|
||||||
|
void OnPaint(wxPaintEvent & evt);
|
||||||
|
void OnClose(wxCloseEvent & evt);
|
||||||
|
void OnApply(wxCommandEvent & evt);
|
||||||
|
void DoCancel();
|
||||||
|
void OnCancel(wxCommandEvent & evt);
|
||||||
|
void OnHelp(wxCommandEvent & evt);
|
||||||
|
void OnDebug(wxCommandEvent & evt);
|
||||||
|
void OnMenu(wxCommandEvent & evt);
|
||||||
|
void OnEnable(wxCommandEvent & evt);
|
||||||
|
void OnPlay(wxCommandEvent & evt);
|
||||||
|
void OnRewind(wxCommandEvent & evt);
|
||||||
|
void OnFFwd(wxCommandEvent & evt);
|
||||||
|
void OnPlayback(wxCommandEvent & evt);
|
||||||
|
void OnCapture(wxCommandEvent & evt);
|
||||||
|
void OnUserPreset(wxCommandEvent & evt);
|
||||||
|
void OnFactoryPreset(wxCommandEvent & evt);
|
||||||
|
void OnDeletePreset(wxCommandEvent & evt);
|
||||||
|
void OnSaveAs(wxCommandEvent & evt);
|
||||||
|
void OnImport(wxCommandEvent & evt);
|
||||||
|
void OnExport(wxCommandEvent & evt);
|
||||||
|
void OnOptions(wxCommandEvent & evt);
|
||||||
|
void OnDefaults(wxCommandEvent & evt);
|
||||||
|
|
||||||
|
void UpdateControls();
|
||||||
|
wxBitmap CreateBitmap(const char * const xpm[], bool up, bool pusher);
|
||||||
|
void LoadUserPresets();
|
||||||
|
|
||||||
|
void InitializeRealtime();
|
||||||
|
void CleanupRealtime();
|
||||||
|
void Resume();
|
||||||
|
|
||||||
|
private:
|
||||||
|
AudacityProject *mProject;
|
||||||
|
wxWindow *mParent;
|
||||||
|
Effect *mEffect;
|
||||||
|
AudacityCommand * mCommand;
|
||||||
|
EffectUIClientInterface *mClient;
|
||||||
|
|
||||||
|
RegistryPaths mUserPresets;
|
||||||
|
bool mInitialized;
|
||||||
|
bool mSupportsRealtime;
|
||||||
|
bool mIsGUI;
|
||||||
|
bool mIsBatch;
|
||||||
|
|
||||||
|
wxButton *mApplyBtn;
|
||||||
|
wxButton *mCloseBtn;
|
||||||
|
wxButton *mMenuBtn;
|
||||||
|
wxButton *mPlayBtn;
|
||||||
|
wxButton *mRewindBtn;
|
||||||
|
wxButton *mFFwdBtn;
|
||||||
|
wxCheckBox *mEnableCb;
|
||||||
|
|
||||||
|
wxButton *mEnableToggleBtn;
|
||||||
|
wxButton *mPlayToggleBtn;
|
||||||
|
|
||||||
|
wxBitmap mPlayBM;
|
||||||
|
wxBitmap mPlayDisabledBM;
|
||||||
|
wxBitmap mStopBM;
|
||||||
|
wxBitmap mStopDisabledBM;
|
||||||
|
|
||||||
|
bool mEnabled;
|
||||||
|
|
||||||
|
bool mDisableTransport;
|
||||||
|
bool mPlaying;
|
||||||
|
bool mCapturing;
|
||||||
|
|
||||||
|
SelectedRegion mRegion;
|
||||||
|
double mPlayPos;
|
||||||
|
|
||||||
|
bool mDismissed{};
|
||||||
|
bool mNeedsResume{};
|
||||||
|
|
||||||
|
DECLARE_EVENT_TABLE()
|
||||||
|
};
|
||||||
|
|
||||||
#endif // __AUDACITY_EFFECTUI_H__
|
#endif // __AUDACITY_EFFECTUI_H__
|
||||||
|
|
Loading…
Reference in New Issue