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

Move DbChoices out of Shuttle.h

Browse Source
This commit is contained in:
Paul Licameli
2018-03-26 20:30:31 -04:00
parent 1a3005182b
commit 180cf92790
3 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Shuttle.cpp
View File

@@ -72,25 +72,6 @@ preferences.
//#include "commands/CommandManager.h" //#include "commands/CommandManager.h"
//#include "effects/Effect.h" //#include "effects/Effect.h"
const int Enums::NumDbChoices = 13;
const wxString Enums::DbChoices[] =
{wxT("-20 dB"), wxT("-25 dB"), wxT("-30 dB"),
wxT("-35 dB"), wxT("-40 dB"), wxT("-45 dB"),
wxT("-50 dB"), wxT("-55 dB"), wxT("-60 dB"),
wxT("-65 dB"), wxT("-70 dB"), wxT("-75 dB"),
wxT("-80 dB")};
const double Enums::Db2Signal[] =
// -20dB -25dB -30dB -35dB -40dB -45dB -50dB -55dB -60dB -65dB -70dB -75dB -80dB Off
{ 0.10000, 0.05620, 0.03160, 0.01780, 0.01000, 0.00562, 0.00316, 0.00178, 0.00100, 0.000562, 0.000316, 0.000178, 0.0001000, 0.0 };
const wxString * Enums::GetDbChoices()
{
return DbChoices;
}
Shuttle::Shuttle() Shuttle::Shuttle()
{ {

8
src/Shuttle.h
View File

@@ -13,14 +13,6 @@
#include "commands/CommandTargets.h" #include "commands/CommandTargets.h"
class Enums {
public:
static const wxString * GetDbChoices();
static const int NumDbChoices;
static const double Db2Signal[];
static const wxString DbChoices[];
};
class WrappedType; class WrappedType;
class Shuttle /* not final */ { class Shuttle /* not final */ {

35
src/effects/TruncSilence.cpp
View File

@@ -34,6 +34,39 @@
#include "../widgets/valnum.h" #include "../widgets/valnum.h"
#include "../widgets/ErrorDialog.h" #include "../widgets/ErrorDialog.h"
class Enums {
public:
static const size_t NumDbChoices;
static const double Db2Signal[];
static const wxString DbChoices[];
};
const wxString Enums::DbChoices[] = {
wxT("-20 dB"),
wxT("-25 dB"),
wxT("-30 dB"),
wxT("-35 dB"),
wxT("-40 dB"),
wxT("-45 dB"),
wxT("-50 dB"),
wxT("-55 dB"),
wxT("-60 dB"),
wxT("-65 dB"),
wxT("-70 dB"),
wxT("-75 dB"),
wxT("-80 dB")
};
const double Enums::Db2Signal[] =
// -20dB -25dB -30dB -35dB -40dB -45dB -50dB -55dB -60dB -65dB -70dB -75dB -80dB
{ 0.10000, 0.05620, 0.03160, 0.01780, 0.01000, 0.00562, 0.00316, 0.00178, 0.00100, 0.000562, 0.000316, 0.000178, 0.0001000 };
const size_t Enums::NumDbChoices = WXSIZEOF(Enums::DbChoices);
static_assert( Enums::NumDbChoices == WXSIZEOF( Enums::Db2Signal ),
"size mismatch" );
// Declaration of RegionList // Declaration of RegionList
class RegionList : public std::list < Region > {}; class RegionList : public std::list < Region > {};
@@ -90,7 +123,7 @@ END_EVENT_TABLE()
EffectTruncSilence::EffectTruncSilence() EffectTruncSilence::EffectTruncSilence()
{ {
mDbChoices = wxArrayString(Enums::NumDbChoices, Enums::GetDbChoices()); mDbChoices = wxArrayString(Enums::NumDbChoices, Enums::DbChoices);
mInitialAllowedSilence = DEF_Minimum; mInitialAllowedSilence = DEF_Minimum;
mTruncLongestAllowedSilence = DEF_Truncate; mTruncLongestAllowedSilence = DEF_Truncate;