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

Consistent bit rates in MP3 export dialog

Browse Source 
and update Plot Spectrum default.
This commit is contained in:
Steve Daulton 2016-04-07 13:15:31 +01:00
parent 7f3edc2523
commit 1be7b0086f
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/FreqWindow.cpp
View File

@ -245,7 +245,7 @@ FreqWindow::FreqWindow(wxWindow * parent, wxWindowID id,
gPrefs->Read(wxT("/FreqWindow/DrawGrid"), &mDrawGrid, true);
long size;
gPrefs->Read(wxT("/FreqWindow/SizeChoice"), &mSize, 2);
gPrefs->Read(wxT("/FreqWindow/SizeChoice"), &mSize, 3);
sizeChoices[mSize].ToLong(&size);
mWindowSize = size;
@ -254,7 +254,7 @@ FreqWindow::FreqWindow(wxWindow * parent, wxWindowID id,
mAlg = static_cast<SpectrumAnalyst::Algorithm>(alg);
gPrefs->Read(wxT("/FreqWindow/FuncChoice"), &mFunc, 3);
gPrefs->Read(wxT("/FreqWindow/AxisChoice"), &mAxis, 0);
gPrefs->Read(wxT("/FreqWindow/AxisChoice"), &mAxis, 1);
gPrefs->Read(ENV_DB_KEY, &dBRange, ENV_DB_RANGE);
if(dBRange < 90.)
dBRange = 90.;
@ -474,7 +474,7 @@ FreqWindow::FreqWindow(wxWindow * parent, wxWindowID id,
// -------------------------------------------------------------------
// ROW 8: Spacer
// -------------------------------------------------------------------
S.AddSpace(5);
mProgress = safenew FreqGauge(this); //, wxID_ANY, wxST_SIZEGRIP);
@ -487,7 +487,7 @@ FreqWindow::FreqWindow(wxWindow * parent, wxWindowID id,
mAxisChoice->Disable();
}
mLogAxis = mAxis != 0;
mCloseButton->SetDefault();
mCloseButton->SetFocus();

40
src/export/ExportMP3.cpp
View File

@ -147,24 +147,24 @@ typedef struct
static CHOICES fixRates[] =
{
/* i18n-hint: kbps is the bitrate of the MP3 file, kilobits per second*/
{wxT(""), 8},
{wxT(""), 16},
{wxT(""), 24},
{wxT(""), 32},
{wxT(""), 40},
{wxT(""), 48},
{wxT(""), 56},
{wxT(""), 64},
{wxT(""), 80},
{wxT(""), 96},
{wxT(""), 112},
{wxT(""), 128},
{wxT(""), 144},
{wxT(""), 160},
{wxT(""), 192},
{wxT(""), 224},
{wxT(""), 320},
{wxT(""), 256},
{wxT(""), 320}
{wxT(""), 224},
{wxT(""), 192},
{wxT(""), 160},
{wxT(""), 144},
{wxT(""), 128},
{wxT(""), 112},
{wxT(""), 96},
{wxT(""), 80},
{wxT(""), 64},
{wxT(""), 56},
{wxT(""), 48},
{wxT(""), 40},
{wxT(""), 32},
{wxT(""), 24},
{wxT(""), 16},
{wxT(""), 8}
};
static CHOICES varRates[] =
@ -178,7 +178,7 @@ static CHOICES varRates[] =
{wxT(""), QUALITY_6},
{wxT(""), QUALITY_7},
{wxT(""), QUALITY_8},
{wxT(""), QUALITY_9},
{wxT(""), QUALITY_9}
};
static CHOICES varModes[] =
@ -192,7 +192,7 @@ static CHOICES setRates[] =
{wxT(""), PRESET_INSANE },
{wxT(""), PRESET_EXTREME },
{wxT(""), PRESET_STANDARD},
{wxT(""), PRESET_MEDIUM },
{wxT(""), PRESET_MEDIUM }
};
static CHOICES sampRates[] =
@ -205,7 +205,7 @@ static CHOICES sampRates[] =
{wxT(""), 24000 },
{wxT(""), 32000 },
{wxT(""), 44100 },
{wxT(""), 48000 },
{wxT(""), 48000 }
};
#define ID_SET 7000