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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
James Crook 2015-09-02 20:10:40 +01:00
commit 6ac9609d10
7 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib-src/mod-nyq-bench/NyqBench.cpp
View File

@ -170,7 +170,7 @@ extern "C"
case AppQuiting: {
wxASSERT(gBench != NULL);
if (gBench) {
delete gBench;
gBench->Close(true);
gBench = NULL;
}
}
@ -270,7 +270,7 @@ void NyqTextCtrl::OnChar(wxKeyEvent & e)
}
}
#if defined(__WXMAC__)
#if defined(__WXMAC__REMOVED_UNTIL_ITS_PROVEN_THAT_IT_IS_STILL_NEEDED)
#include <wx/mac/uma.h>
// This is hackage to correct a problem on Leopard where the

2
lib-src/mod-nyq-bench/NyqBench.h
View File

@ -53,7 +53,7 @@ class NyqTextCtrl:public wxTextCtrl
void GoNext();
private:
#if defined(__WXMAC__)
#if defined(__WXMAC__REMOVED_UNTIL_ITS_PROVEN_THAT_IT_IS_STILL_NEEDED)
void OnKeyDown(wxKeyEvent & e);
#endif
void OnKeyUp(wxKeyEvent & e);

2
lib-src/mod-nyq-bench/mod-nyq-bench.vcxproj
View File

@ -84,7 +84,7 @@ copy "$(TargetPath)" "%25dest%25"
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;../../include;../../win;../../src;../../src/include/win32;../../src/include;../../lib-src/libsndfile/win32;../../lib-src/libsndfile/src;../../lib-src/portaudio-v19/include;../../lib-src/portmixer/include;../../lib-src/portsmf;../../lib-src/libnyquist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WXUSINGDLL;__WXMSW__;WIN32;NDEBUG;STRICT;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>wxDEBUG_LEVEL=0;WXUSINGDLL;__WXMSW__;WIN32;NDEBUG;STRICT;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader />
<WarningLevel>Level3</WarningLevel>

2
mac/Audacity.xcodeproj/project.pbxproj
View File

@ -7976,6 +7976,7 @@
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1)",
);
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1 = "AUDACITY_DLL_API=\"\"";
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = /Audacity;
LIBRARY_SEARCH_PATHS = (
@ -8291,6 +8292,7 @@
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1)",
);
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1 = "AUDACITY_DLL_API=\"\"";
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = /Audacity;
LIBRARY_SEARCH_PATHS = (

6
src/FreqWindow.cpp
View File

@ -993,7 +993,11 @@ void FreqWindow::Recalc()
int windowFunc = mFuncChoice->GetSelection();
wxWindow *hadFocus = FindFocus();
wxWindowDisabler *blocker = new wxWindowDisabler(mProgress);
// In wxMac, the skipped window MUST be a top level window. I'd originally made it
// just the mProgress window with the idea of preventing user interaction with the
// controls while the plot was being recalculated. This doesn't appear to be necessary
// so just use the the top level window instead.
wxWindowDisabler *blocker = new wxWindowDisabler(this);
wxYieldIfNeeded();
mAnalyst->Calculate(alg, windowFunc, mWindowSize, mRate,

4
src/TrackPanel.cpp
View File

@ -6258,7 +6258,7 @@ void TrackPanel::HandleWheelRotationInVRuler
settings.NextHigherDBRange();
}
if (event.CmdDown()) {
if (!event.CmdDown()) {
// extra-special case that varies the db limit without changing
// magnification
const float extreme = (LINEAR_TO_DB(2) + newdBRange) / newdBRange;
@ -6272,7 +6272,7 @@ void TrackPanel::HandleWheelRotationInVRuler
}
}
}
else if (event.CmdDown()) {
else if (event.CmdDown() && !event.ShiftDown()) {
HandleWaveTrackVZoom(
mTracks, rect, event.m_y, event.m_y,
wt, false, (event.m_wheelRotation < 0),

2
src/effects/NoiseReduction.cpp
View File

@ -520,7 +520,7 @@ bool EffectNoiseReduction::Settings::PrefsIO(bool read)
{ &Settings::mNoiseGain, wxT("Gain"), 12.0 },
{ &Settings::mAttackTime, wxT("AttackTime"), 0.02 },
{ &Settings::mReleaseTime, wxT("ReleaseTime"), 0.10 },
{ &Settings::mFreqSmoothingBands, wxT("FreqSmoothing"), 0.0 },
{ &Settings::mFreqSmoothingBands, wxT("FreqSmoothing"), 6.0 },
// Advanced settings
{ &Settings::mOldSensitivity, wxT("OldSensitivity"), DEFAULT_OLD_SENSITIVITY },