Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-15 16:14:11 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into deletes

Browse Source
This commit is contained in:
Paul Licameli 2016-08-10 11:05:04 -04:00
commit a27d0aca2b
6 changed files with 41 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/HelpText.cpp
View File

@ -216,11 +216,11 @@ audio CDs</a>.") + wxT("</p>")
if(Key == wxT("remotehelp") )
{
// *URL* will be replaced by whatever URL we are looking for.
return WrapText(_("You do not appear to have the 'help' folder installed.<br> \
return WrapText(_("You do not appear to have the 'help' folder installed. \
Please <a href=\"*URL*\">view the content online</a> or \
<a href=\"http://manual.audacityteam.org/o/man/unzipping_the_manual.html\"> \
download the current Manual</a>.<br><br>\
To always view the Manual online, change \"Location of Manual\" in<br> \
To always view the Manual online, change \"Location of Manual\" in \
Interface Preferences to \"From Internet\".")
);
}

12
src/MemoryX.h
View File

@ -185,6 +185,12 @@ namespace std {
}
}
void swap(unique_ptr& that)
{
std::swap(p, that.p);
std::swap(get_deleter(), that.get_deleter());
}
private:
T *p{};
};
@ -261,6 +267,12 @@ namespace std {
}
}
void swap(unique_ptr& that)
{
std::swap(p, that.p);
std::swap(get_deleter(), that.get_deleter());
}
private:
T *p{};
};

40
src/TrackPanel.cpp
View File

@ -5578,7 +5578,7 @@ void TrackPanel::HandleWheelRotation(wxMouseEvent & event)
return;
// Special case of pointer in the vertical ruler
{
if (event.ShiftDown() || event.CmdDown()) {
wxRect rect;
Track *const pTrack = FindTrack(event.m_x, event.m_y, true, false, &rect);
if (pTrack && event.m_x >= GetVRulerOffset()) {
@ -5682,36 +5682,30 @@ void TrackPanel::HandleWheelRotationInVRuler
const bool isDB =
wt->GetDisplay() == WaveTrack::Waveform &&
wt->GetWaveformSettings().scaleType == WaveformSettings::stLogarithmic;
if (isDB && event.ShiftDown()) {
// Special cases for Waveform dB only
// Vary the bottom of the dB scale, but only if the midline is visible
// Special cases for Waveform dB only.
// Set the bottom of the dB scale but only if it's visible
if (isDB && event.ShiftDown() && event.CmdDown()) {
float min, max;
wt->GetDisplayBounds(&min, &max);
if (!(min < 0.0 && max > 0.0))
return;
WaveformSettings &settings = wt->GetIndependentWaveformSettings();
float olddBRange = settings.dBRange;
if (steps < 0)
// Zoom out
settings.NextLowerDBRange();
else
settings.NextHigherDBRange();
float newdBRange = settings.dBRange;
if (partner) {
WaveformSettings &settings = partner->GetIndependentWaveformSettings();
if (min < 0.0 && max > 0.0) {
WaveformSettings &settings = wt->GetIndependentWaveformSettings();
float olddBRange = settings.dBRange;
if (steps < 0)
// Zoom out
settings.NextLowerDBRange();
else
settings.NextHigherDBRange();
}
float newdBRange = settings.dBRange;
if (!event.CmdDown()) {
// extra-special case that varies the db limit without changing
// magnification
if (partner) {
WaveformSettings &settings = partner->GetIndependentWaveformSettings();
if (steps < 0)
// Zoom out
settings.NextLowerDBRange();
else
settings.NextHigherDBRange();
}
const float extreme = (LINEAR_TO_DB(2) + newdBRange) / newdBRange;
max = std::min(extreme, max * olddBRange / newdBRange);
min = std::max(-extreme, min * olddBRange / newdBRange);
@ -5729,7 +5723,7 @@ void TrackPanel::HandleWheelRotationInVRuler
wt, false, (steps < 0),
true);
}
else if (!(event.CmdDown() || event.ShiftDown())) {
else if (!event.CmdDown() && event.ShiftDown()) {
// Scroll some fixed number of pixels, independent of zoom level or track height:
static const float movement = 10.0f;
const int height = wt->GetHeight() - (kTopMargin + kBottomMargin);

6
src/prefs/MousePrefs.cpp
View File

@ -154,9 +154,9 @@ void MousePrefs::CreateList()
// AddItem(_("ESC"), _("Select"), _("Toggle center snapping in spectrogram"), _("same as select tool"));
#endif
AddItem(_("Wheel-Rotate"), _("Any"), _("Scroll up or down"));
AddItem(_("Shift-Wheel-Rotate"),_("Any"), _("Scroll left or right"));
AddItem(CTRL + _("-Wheel-Rotate"), _("Any"), _("Zoom in or out on Mouse Pointer"));
AddItem(_("Shift-Wheel-Rotate"),_("Any"), _("Scroll waveform"));
AddItem(CTRL + _("-Wheel-Rotate"), _("Any"), _("Zoom waveform in or out"));
AddItem(CTRL + _("-Shift-Wheel-Rotate"),_("Any"), _("Waveform (dB) range"));
mList->SetColumnWidth(BlankColumn, 0);
mList->SetColumnWidth(ToolColumn, wxLIST_AUTOSIZE);

4
src/tracks/ui/Scrubbing.cpp
View File

@ -233,12 +233,12 @@ namespace {
"Seeking" is normal speed playback but with skips, ...
*/
{ wxT("Scrub"), XO("&Scrub"), XO("Scrubbing"),
CanStopAudioStreamFlag,
CaptureNotBusyFlag,
&Scrubber::OnScrub, false, &Scrubber::Scrubs,
},
{ wxT("Seek"), XO("See&k"), XO("Seeking"),
CanStopAudioStreamFlag,
CaptureNotBusyFlag,
&Scrubber::OnSeek, true, &Scrubber::Seeks,
},

15
win/compile.txt
View File

@ -300,16 +300,6 @@ So for instance, a Debug version of Audacity should have:
in the "audacity\win\Debug" directory.
If this procedure doesn't work, check the "Common Compilation
Errors" section on
http://audacityteam.org/wiki/index.php?title=Developing_On_Windows .
If you still need help after that, please ask on the "Compiling
Audacity" board at http://forum.audacityteam.org/. However, the first
suggestion there is likely to be "try it again with a clean
installation of the wxWidgets source and the latest Audacity source
from GitHub". So if that's not what you attempted, please try that first.
------------------------------------------------------------------------
HELP! I get linker errors!
@ -360,6 +350,11 @@ depending on the library which actually causes the conflict.
Note that if you have configured all libraries correctly,
none of the above should actually be necessary.
If you still receive errors, it often helps to try it again with
a clean installation of the wxWidgets sources and the latest Audacity
source from GitHub. Also check "Common compilation errors" on:
http://wiki.audacityteam.org/wiki/Developing_On_Windows#common
for more assistance.
========================================================================