mirror of
https://github.com/cookiengineer/audacity
synced 2025-05-05 14:18:53 +02:00
Consitently use On<something> iff it is a direct menu handler.
Some former 'On' functions have been renamed 'Do' since they didn't directly handle the menu item. Some functions that used 'Context' now use 'Project'.
This commit is contained in:
James Crook
parent
fc6570646d
commit
708cbe173e
167
src/Menus.cpp
167
src/Menus.cpp
@ -1538,16 +1538,16 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
|
||||
c->SetDefaultFlags(AlwaysEnabledFlag, AlwaysEnabledFlag);
|
||||
c->AddSeparator();
|
||||
|
||||
c->AddGlobalCommand(wxT("PrevWindow"), XXO("Move Backward Through Active Windows"), FN(PrevWindow), wxT("Alt+Shift+F6"));
|
||||
c->AddGlobalCommand(wxT("NextWindow"), XXO("Move Forward Through Active Windows"), FN(NextWindow), wxT("Alt+F6"));
|
||||
c->AddGlobalCommand(wxT("PrevWindow"), XXO("Move Backward Through Active Windows"), FN(OnPrevWindow), wxT("Alt+Shift+F6"));
|
||||
c->AddGlobalCommand(wxT("NextWindow"), XXO("Move Forward Through Active Windows"), FN(OnNextWindow), wxT("Alt+F6"));
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
|
||||
c->SetDefaultFlags(AlwaysEnabledFlag, AlwaysEnabledFlag);
|
||||
c->BeginSubMenu(_("F&ocus"));
|
||||
|
||||
c->AddItem(wxT("PrevFrame"), XXO("Move &Backward from Toolbars to Tracks"), FN(PrevFrame), wxT("Ctrl+Shift+F6"));
|
||||
c->AddItem(wxT("NextFrame"), XXO("Move F&orward from Toolbars to Tracks"), FN(NextFrame), wxT("Ctrl+F6"));
|
||||
c->AddItem(wxT("PrevFrame"), XXO("Move &Backward from Toolbars to Tracks"), FN(OnPrevFrame), wxT("Ctrl+Shift+F6"));
|
||||
c->AddItem(wxT("NextFrame"), XXO("Move F&orward from Toolbars to Tracks"), FN(OnNextFrame), wxT("Ctrl+F6"));
|
||||
|
||||
c->SetDefaultFlags(TracksExistFlag | TrackPanelHasFocus,
|
||||
TracksExistFlag | TrackPanelHasFocus);
|
||||
@ -3365,22 +3365,26 @@ void MenuCommandHandler::OnSkipEnd(const CommandContext &context)
|
||||
|
||||
void MenuCommandHandler::OnSeekLeftShort(const CommandContext &context)
|
||||
{
|
||||
SeekLeftOrRight( context, DIRECTION_LEFT, CURSOR_MOVE );
|
||||
auto &project = context.project;
|
||||
SeekLeftOrRight( project, DIRECTION_LEFT, CURSOR_MOVE );
|
||||
}
|
||||
|
||||
void MenuCommandHandler::OnSeekRightShort(const CommandContext &context)
|
||||
{
|
||||
SeekLeftOrRight( context, DIRECTION_RIGHT, CURSOR_MOVE );
|
||||
auto &project = context.project;
|
||||
SeekLeftOrRight( project, DIRECTION_RIGHT, CURSOR_MOVE );
|
||||
}
|
||||
|
||||
void MenuCommandHandler::OnSeekLeftLong(const CommandContext &context)
|
||||
{
|
||||
SeekLeftOrRight( context, DIRECTION_LEFT, SELECTION_EXTEND );
|
||||
auto &project = context.project;
|
||||
SeekLeftOrRight( project, DIRECTION_LEFT, SELECTION_EXTEND );
|
||||
}
|
||||
|
||||
void MenuCommandHandler::OnSeekRightLong(const CommandContext &context)
|
||||
{
|
||||
SeekLeftOrRight( context, DIRECTION_RIGHT, SELECTION_EXTEND );
|
||||
auto &project = context.project;
|
||||
SeekLeftOrRight( project, DIRECTION_RIGHT, SELECTION_EXTEND );
|
||||
}
|
||||
|
||||
void MenuCommandHandler::OnSelToStart(const CommandContext &context)
|
||||
@ -3400,16 +3404,16 @@ void MenuCommandHandler::OnSelToEnd(const CommandContext &context)
|
||||
void MenuCommandHandler::OnMoveToNextLabel(const CommandContext &context)
|
||||
{
|
||||
auto &project = context.project;
|
||||
OnMoveToLabel(project, true);
|
||||
DoMoveToLabel(project, true);
|
||||
}
|
||||
|
||||
void MenuCommandHandler::OnMoveToPrevLabel(const CommandContext &context)
|
||||
{
|
||||
auto &project = context.project;
|
||||
OnMoveToLabel(project, false);
|
||||
DoMoveToLabel(project, false);
|
||||
}
|
||||
|
||||
void MenuCommandHandler::OnMoveToLabel(AudacityProject &project, bool next)
|
||||
void MenuCommandHandler::DoMoveToLabel(AudacityProject &project, bool next)
|
||||
{
|
||||
auto tracks = project.GetTracks();
|
||||
auto trackPanel = project.GetTrackPanel();
|
||||
@ -3468,7 +3472,7 @@ void MenuCommandHandler::OnMoveToLabel(AudacityProject &project, bool next)
|
||||
/// block or not.
|
||||
|
||||
/// \todo Merge related methods, OnPrevTrack and OnNextTrack.
|
||||
void MenuCommandHandler::OnPrevTrack( AudacityProject &project, bool shift )
|
||||
void MenuCommandHandler::DoPrevTrack( AudacityProject &project, bool shift )
|
||||
{
|
||||
auto trackPanel = project.GetTrackPanel();
|
||||
auto tracks = project.GetTracks();
|
||||
@ -3578,7 +3582,7 @@ void MenuCommandHandler::OnPrevTrack( AudacityProject &project, bool shift )
|
||||
/// The following method moves to the next track,
|
||||
/// selecting and unselecting depending if you are on the start of a
|
||||
/// block or not.
|
||||
void MenuCommandHandler::OnNextTrack( AudacityProject &project, bool shift )
|
||||
void MenuCommandHandler::DoNextTrack( AudacityProject &project, bool shift )
|
||||
{
|
||||
auto trackPanel = project.GetTrackPanel();
|
||||
auto tracks = project.GetTracks();
|
||||
@ -3681,13 +3685,13 @@ void MenuCommandHandler::OnNextTrack( AudacityProject &project, bool shift )
|
||||
void MenuCommandHandler::OnCursorUp(const CommandContext &context)
|
||||
{
|
||||
auto &project = context.project;
|
||||
OnPrevTrack( project, false );
|
||||
DoPrevTrack( project, false );
|
||||
}
|
||||
|
||||
void MenuCommandHandler::OnCursorDown(const CommandContext &context)
|
||||
{
|
||||
auto &project = context.project;
|
||||
OnNextTrack( project, false );
|
||||
DoNextTrack( project, false );
|
||||
}
|
||||
|
||||
void MenuCommandHandler::OnFirstTrack(const CommandContext &context)
|
||||
@ -3731,13 +3735,13 @@ void MenuCommandHandler::OnLastTrack(const CommandContext &context)
|
||||
void MenuCommandHandler::OnShiftUp(const CommandContext &context)
|
||||
{
|
||||
auto &project = context.project;
|
||||
OnPrevTrack( project, true );
|
||||
DoPrevTrack( project, true );
|
||||
}
|
||||
|
||||
void MenuCommandHandler::OnShiftDown(const CommandContext &context)
|
||||
{
|
||||
auto &project = context.project;
|
||||
OnNextTrack( project, true );
|
||||
DoNextTrack( project, true );
|
||||
}
|
||||
|
||||
#include "TrackPanelAx.h"
|
||||
@ -3806,67 +3810,67 @@ bool MenuCommandHandler::OnlyHandleKeyUp( const CommandContext &context )
|
||||
void MenuCommandHandler::OnCursorLeft(const CommandContext &context)
|
||||
{
|
||||
if( !OnlyHandleKeyUp( context ) )
|
||||
SeekLeftOrRight( context, DIRECTION_LEFT, CURSOR_MOVE);
|
||||
SeekLeftOrRight( context.project, DIRECTION_LEFT, CURSOR_MOVE);
|
||||
}
|
||||
|
||||
void MenuCommandHandler::OnCursorRight(const CommandContext &context)
|
||||
{
|
||||
if( !OnlyHandleKeyUp( context ) )
|
||||
SeekLeftOrRight( context, DIRECTION_RIGHT, CURSOR_MOVE);
|
||||
SeekLeftOrRight( context.project, DIRECTION_RIGHT, CURSOR_MOVE);
|
||||
}
|
||||
|
||||
void MenuCommandHandler::OnCursorShortJumpLeft(const CommandContext &context)
|
||||
{
|
||||
OnCursorMove( context, -mSeekShort );
|
||||
DoCursorMove( context.project, -mSeekShort );
|
||||
}
|
||||
|
||||
void MenuCommandHandler::OnCursorShortJumpRight(const CommandContext &context)
|
||||
{
|
||||
OnCursorMove( context, mSeekShort );
|
||||
DoCursorMove( context.project, mSeekShort );
|
||||
}
|
||||
|
||||
void MenuCommandHandler::OnCursorLongJumpLeft(const CommandContext &context)
|
||||
{
|
||||
OnCursorMove( context, -mSeekLong );
|
||||
DoCursorMove( context.project, -mSeekLong );
|
||||
}
|
||||
|
||||
void MenuCommandHandler::OnCursorLongJumpRight(const CommandContext &context)
|
||||
{
|
||||
OnCursorMove( context, mSeekLong );
|
||||
DoCursorMove( context.project, mSeekLong );
|
||||
}
|
||||
|
||||
void MenuCommandHandler::OnSelSetExtendLeft(const CommandContext &context)
|
||||
{
|
||||
OnBoundaryMove( context, DIRECTION_LEFT);
|
||||
DoBoundaryMove( context.project, DIRECTION_LEFT);
|
||||
}
|
||||
|
||||
void MenuCommandHandler::OnSelSetExtendRight(const CommandContext &context)
|
||||
{
|
||||
OnBoundaryMove( context, DIRECTION_RIGHT);
|
||||
DoBoundaryMove( context.project, DIRECTION_RIGHT);
|
||||
}
|
||||
|
||||
void MenuCommandHandler::OnSelExtendLeft(const CommandContext &context)
|
||||
{
|
||||
if( !OnlyHandleKeyUp( context ) )
|
||||
SeekLeftOrRight( context, DIRECTION_LEFT, SELECTION_EXTEND );
|
||||
SeekLeftOrRight( context.project, DIRECTION_LEFT, SELECTION_EXTEND );
|
||||
}
|
||||
|
||||
void MenuCommandHandler::OnSelExtendRight(const CommandContext &context)
|
||||
{
|
||||
if( !OnlyHandleKeyUp( context ) )
|
||||
SeekLeftOrRight( context, DIRECTION_RIGHT, SELECTION_EXTEND );
|
||||
SeekLeftOrRight( context.project, DIRECTION_RIGHT, SELECTION_EXTEND );
|
||||
}
|
||||
|
||||
void MenuCommandHandler::OnSelContractLeft(const CommandContext &context)
|
||||
{
|
||||
if( !OnlyHandleKeyUp( context ) )
|
||||
SeekLeftOrRight( context, DIRECTION_RIGHT, SELECTION_CONTRACT );
|
||||
SeekLeftOrRight( context.project, DIRECTION_RIGHT, SELECTION_CONTRACT );
|
||||
}
|
||||
|
||||
void MenuCommandHandler::OnSelContractRight(const CommandContext &context)
|
||||
{
|
||||
if( !OnlyHandleKeyUp( context ) )
|
||||
SeekLeftOrRight( context, DIRECTION_LEFT, SELECTION_CONTRACT );
|
||||
SeekLeftOrRight( context.project, DIRECTION_LEFT, SELECTION_CONTRACT );
|
||||
}
|
||||
|
||||
#include "tracks/ui/TimeShiftHandle.h"
|
||||
@ -4138,19 +4142,19 @@ void MenuCommandHandler::NextOrPrevFrame(AudacityProject &project, bool forward)
|
||||
}
|
||||
}
|
||||
|
||||
void MenuCommandHandler::NextFrame(const CommandContext &context)
|
||||
void MenuCommandHandler::OnNextFrame(const CommandContext &context)
|
||||
{
|
||||
auto &project = context.project;
|
||||
NextOrPrevFrame(project, true);
|
||||
}
|
||||
|
||||
void MenuCommandHandler::PrevFrame(const CommandContext &context)
|
||||
void MenuCommandHandler::OnPrevFrame(const CommandContext &context)
|
||||
{
|
||||
auto &project = context.project;
|
||||
NextOrPrevFrame(project, false);
|
||||
}
|
||||
|
||||
void MenuCommandHandler::NextWindow(const CommandContext &context)
|
||||
void MenuCommandHandler::OnNextWindow(const CommandContext &context)
|
||||
{
|
||||
auto &project = context.project;
|
||||
auto isEnabled = project.IsEnabled();
|
||||
@ -4210,7 +4214,7 @@ void MenuCommandHandler::NextWindow(const CommandContext &context)
|
||||
#endif
|
||||
}
|
||||
|
||||
void MenuCommandHandler::PrevWindow(const CommandContext &context)
|
||||
void MenuCommandHandler::OnPrevWindow(const CommandContext &context)
|
||||
{
|
||||
auto &project = context.project;
|
||||
auto isEnabled = project.IsEnabled();
|
||||
@ -4971,7 +4975,7 @@ void MenuCommandHandler::RebuildAllMenuBars()
|
||||
}
|
||||
}
|
||||
|
||||
void MenuCommandHandler::OnManagePluginsMenu
|
||||
void MenuCommandHandler::DoManagePluginsMenu
|
||||
(AudacityProject &project, EffectType type)
|
||||
{
|
||||
if (PluginManager::Get().ShowManager(&project, type))
|
||||
@ -4981,25 +4985,25 @@ void MenuCommandHandler::OnManagePluginsMenu
|
||||
void MenuCommandHandler::OnManageGenerators(const CommandContext &context)
|
||||
{
|
||||
auto &project = context.project;
|
||||
OnManagePluginsMenu(project, EffectTypeGenerate);
|
||||
DoManagePluginsMenu(project, EffectTypeGenerate);
|
||||
}
|
||||
|
||||
void MenuCommandHandler::OnManageEffects(const CommandContext &context)
|
||||
{
|
||||
auto &project = context.project;
|
||||
OnManagePluginsMenu(project, EffectTypeProcess);
|
||||
DoManagePluginsMenu(project, EffectTypeProcess);
|
||||
}
|
||||
|
||||
void MenuCommandHandler::OnManageAnalyzers(const CommandContext &context)
|
||||
{
|
||||
auto &project = context.project;
|
||||
OnManagePluginsMenu(project, EffectTypeAnalyze);
|
||||
DoManagePluginsMenu(project, EffectTypeAnalyze);
|
||||
}
|
||||
|
||||
void MenuCommandHandler::OnManageTools(const CommandContext &context )
|
||||
{
|
||||
auto &project = context.project;
|
||||
OnManagePluginsMenu(project, EffectTypeTool);
|
||||
DoManagePluginsMenu(project, EffectTypeTool);
|
||||
}
|
||||
|
||||
|
||||
@ -5234,7 +5238,7 @@ void MenuCommandHandler::OnExportMIDI(const CommandContext &context)
|
||||
#endif // USE_MIDI
|
||||
|
||||
|
||||
void MenuCommandHandler::OnExport
|
||||
void MenuCommandHandler::DoExport
|
||||
(AudacityProject &project, const wxString & Format )
|
||||
{
|
||||
auto tracks = project.GetTracks();
|
||||
@ -5306,25 +5310,25 @@ void MenuCommandHandler::OnExport
|
||||
void MenuCommandHandler::OnExportAudio(const CommandContext &context)
|
||||
{
|
||||
auto &project = context.project;
|
||||
OnExport(project, "");
|
||||
DoExport(project, "");
|
||||
}
|
||||
|
||||
void MenuCommandHandler::OnExportMp3(const CommandContext &context)
|
||||
{
|
||||
auto &project = context.project;
|
||||
OnExport(project, "MP3");
|
||||
DoExport(project, "MP3");
|
||||
}
|
||||
|
||||
void MenuCommandHandler::OnExportWav(const CommandContext &context)
|
||||
{
|
||||
auto &project = context.project;
|
||||
OnExport(project, "WAV");
|
||||
DoExport(project, "WAV");
|
||||
}
|
||||
|
||||
void MenuCommandHandler::OnExportOgg(const CommandContext &context)
|
||||
{
|
||||
auto &project = context.project;
|
||||
OnExport(project, "OGG");
|
||||
DoExport(project, "OGG");
|
||||
}
|
||||
|
||||
|
||||
@ -6846,17 +6850,17 @@ void MenuCommandHandler::OnSelectPrevClipBoundaryToCursor
|
||||
(const CommandContext &context)
|
||||
{
|
||||
auto &project = context.project;
|
||||
OnSelectClipBoundary(project, false);
|
||||
DoSelectClipBoundary(project, false);
|
||||
}
|
||||
|
||||
void MenuCommandHandler::OnSelectCursorToNextClipBoundary
|
||||
(const CommandContext &context)
|
||||
{
|
||||
auto &project = context.project;
|
||||
OnSelectClipBoundary(project, true);
|
||||
DoSelectClipBoundary(project, true);
|
||||
}
|
||||
|
||||
void MenuCommandHandler::OnSelectClipBoundary(AudacityProject &project, bool next)
|
||||
void MenuCommandHandler::DoSelectClipBoundary(AudacityProject &project, bool next)
|
||||
{
|
||||
auto &selectedRegion = project.GetViewInfo().selectedRegion;
|
||||
auto trackPanel = project.GetTrackPanel();
|
||||
@ -7073,16 +7077,16 @@ bool MenuCommandHandler::ChannelsHaveDifferentClipBoundaries(
|
||||
void MenuCommandHandler::OnSelectPrevClip(const CommandContext &context)
|
||||
{
|
||||
auto &project = context.project;
|
||||
OnSelectClip(project, false);
|
||||
DoSelectClip(project, false);
|
||||
}
|
||||
|
||||
void MenuCommandHandler::OnSelectNextClip(const CommandContext &context)
|
||||
{
|
||||
auto &project = context.project;
|
||||
OnSelectClip(project, true);
|
||||
DoSelectClip(project, true);
|
||||
}
|
||||
|
||||
void MenuCommandHandler::OnSelectClip(AudacityProject &project, bool next)
|
||||
void MenuCommandHandler::DoSelectClip(AudacityProject &project, bool next)
|
||||
{
|
||||
auto &selectedRegion = project.GetViewInfo().selectedRegion;
|
||||
auto trackPanel = project.GetTrackPanel();
|
||||
@ -8242,17 +8246,17 @@ void MenuCommandHandler::OnCursorNextClipBoundary(const CommandContext &context)
|
||||
{
|
||||
AudacityProject &project = context.project;
|
||||
|
||||
OnCursorClipBoundary(project, true);
|
||||
DoCursorClipBoundary(project, true);
|
||||
}
|
||||
|
||||
void MenuCommandHandler::OnCursorPrevClipBoundary(const CommandContext &context)
|
||||
{
|
||||
AudacityProject &project = context.project;
|
||||
|
||||
OnCursorClipBoundary(project, false);
|
||||
DoCursorClipBoundary(project, false);
|
||||
}
|
||||
|
||||
void MenuCommandHandler::OnCursorClipBoundary
|
||||
void MenuCommandHandler::DoCursorClipBoundary
|
||||
(AudacityProject &project, bool next)
|
||||
{
|
||||
auto &selectedRegion = project.GetViewInfo().selectedRegion;
|
||||
@ -9533,11 +9537,6 @@ void MenuCommandHandler::OnMidiDeviceInfo(const CommandContext &context)
|
||||
}
|
||||
#endif
|
||||
|
||||
void MenuCommandHandler::OnSeparator(const CommandContext &WXUNUSED(context) )
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void MenuCommandHandler::OnCollapseAllTracks(const CommandContext &context)
|
||||
{
|
||||
auto &project = context.project;
|
||||
@ -9562,7 +9561,7 @@ void MenuCommandHandler::OnExpandAllTracks(const CommandContext &context)
|
||||
project.RedrawProject();
|
||||
}
|
||||
|
||||
void MenuCommandHandler::OnPanTracks(AudacityProject &project, float PanValue)
|
||||
void MenuCommandHandler::DoPanTracks(AudacityProject &project, float PanValue)
|
||||
{
|
||||
auto tracks = project.GetTracks();
|
||||
auto mixerBoard = project.GetMixerBoard();
|
||||
@ -9589,19 +9588,19 @@ void MenuCommandHandler::OnPanTracks(AudacityProject &project, float PanValue)
|
||||
void MenuCommandHandler::OnPanLeft(const CommandContext &context)
|
||||
{
|
||||
auto &project = context.project;
|
||||
OnPanTracks( project, -1.0);
|
||||
DoPanTracks( project, -1.0);
|
||||
}
|
||||
|
||||
void MenuCommandHandler::OnPanRight(const CommandContext &context)
|
||||
{
|
||||
auto &project = context.project;
|
||||
OnPanTracks( project, 1.0);
|
||||
DoPanTracks( project, 1.0);
|
||||
}
|
||||
|
||||
void MenuCommandHandler::OnPanCenter(const CommandContext &context)
|
||||
{
|
||||
auto &project = context.project;
|
||||
OnPanTracks( project, 0.0);
|
||||
DoPanTracks( project, 0.0);
|
||||
}
|
||||
|
||||
void MenuCommandHandler::OnMuteAllTracks(const CommandContext &context)
|
||||
@ -9813,10 +9812,8 @@ void MenuCommandHandler::OnFullScreen(const CommandContext &context)
|
||||
|
||||
// Handle small cursor and play head movements
|
||||
void MenuCommandHandler::SeekLeftOrRight
|
||||
(const CommandContext &context, double direction, SelectionOperation operation)
|
||||
(AudacityProject &project, double direction, SelectionOperation operation)
|
||||
{
|
||||
auto &project = context.project;
|
||||
|
||||
// PRL: What I found and preserved, strange though it be:
|
||||
// During playback: jump depends on preferences and is independent of the zoom
|
||||
// and does not vary if the key is held
|
||||
@ -9844,7 +9841,7 @@ void MenuCommandHandler::SeekLeftOrRight
|
||||
enum { LARGER_MULTIPLIER = 4 };
|
||||
const double seekStep = (fast ? LARGER_MULTIPLIER : 1.0) * direction;
|
||||
|
||||
SeekWhenAudioInactive( context, seekStep, TIME_UNIT_PIXELS, operation);
|
||||
SeekWhenAudioInactive( project, seekStep, TIME_UNIT_PIXELS, operation);
|
||||
}
|
||||
|
||||
void MenuCommandHandler::SeekWhenAudioActive(double seekStep)
|
||||
@ -9863,9 +9860,8 @@ void MenuCommandHandler::SeekWhenAudioActive(double seekStep)
|
||||
}
|
||||
|
||||
|
||||
void MenuCommandHandler::OnBoundaryMove(const CommandContext &context, int step)
|
||||
void MenuCommandHandler::DoBoundaryMove(AudacityProject &project, int step)
|
||||
{
|
||||
auto &project = context.project;
|
||||
auto &viewInfo = project.GetViewInfo();
|
||||
auto trackPanel = project.GetTrackPanel();
|
||||
auto tracks = project.GetTracks();
|
||||
@ -9928,17 +9924,16 @@ void MenuCommandHandler::OnBoundaryMove(const CommandContext &context, int step)
|
||||
}
|
||||
|
||||
void MenuCommandHandler::SeekWhenAudioInactive
|
||||
(const CommandContext &context, double seekStep, TimeUnit timeUnit,
|
||||
(AudacityProject &project, double seekStep, TimeUnit timeUnit,
|
||||
SelectionOperation operation)
|
||||
{
|
||||
auto &project = context.project;
|
||||
auto &viewInfo = project.GetViewInfo();
|
||||
auto trackPanel = project.GetTrackPanel();
|
||||
auto tracks = project.GetTracks();
|
||||
|
||||
if( operation == CURSOR_MOVE )
|
||||
{
|
||||
MoveWhenAudioInactive( context, seekStep, timeUnit);
|
||||
MoveWhenAudioInactive( project, seekStep, timeUnit);
|
||||
return;
|
||||
}
|
||||
|
||||
@ -9953,7 +9948,7 @@ SelectionOperation operation)
|
||||
bool bMoveT0 = (operation == SELECTION_CONTRACT && seekStep > 0) ||
|
||||
(operation == SELECTION_EXTEND && seekStep < 0);
|
||||
// newT is where we want to move to
|
||||
double newT = OffsetTime( context,
|
||||
double newT = OffsetTime( project,
|
||||
bMoveT0 ? t0 : t1, seekStep, timeUnit, snapToTime);
|
||||
// constrain to be in the track/screen limits.
|
||||
newT = std::max( 0.0, newT );
|
||||
@ -9975,9 +9970,8 @@ SelectionOperation operation)
|
||||
|
||||
// Moving a cursor, and collapsed selection.
|
||||
void MenuCommandHandler::MoveWhenAudioInactive
|
||||
(const CommandContext &context, double seekStep, TimeUnit timeUnit)
|
||||
(AudacityProject &project, double seekStep, TimeUnit timeUnit)
|
||||
{
|
||||
auto &project = context.project;
|
||||
auto &viewInfo = project.GetViewInfo();
|
||||
auto trackPanel = project.GetTrackPanel();
|
||||
auto tracks = project.GetTracks();
|
||||
@ -9994,7 +9988,7 @@ void MenuCommandHandler::MoveWhenAudioInactive
|
||||
// Already in cursor mode?
|
||||
if( viewInfo.selectedRegion.isPoint() )
|
||||
{
|
||||
double newT = OffsetTime(context,
|
||||
double newT = OffsetTime(project,
|
||||
t0, seekStep, timeUnit, snapToTime);
|
||||
// constrain.
|
||||
newT = std::max(0.0, newT);
|
||||
@ -10027,10 +10021,9 @@ void MenuCommandHandler::MoveWhenAudioInactive
|
||||
}
|
||||
|
||||
double MenuCommandHandler::OffsetTime
|
||||
(const CommandContext &context,
|
||||
(AudacityProject &project,
|
||||
double t, double offset, TimeUnit timeUnit, int snapToTime)
|
||||
{
|
||||
auto &project = context.project;
|
||||
auto &viewInfo = project.GetViewInfo();
|
||||
|
||||
if (timeUnit == TIME_UNIT_SECONDS)
|
||||
@ -10073,19 +10066,17 @@ double MenuCommandHandler::GridMove
|
||||
|
||||
|
||||
// Move the cursor forward or backward, while paused or while playing.
|
||||
void MenuCommandHandler::OnCursorMove(
|
||||
const CommandContext &context, double seekStep)
|
||||
void MenuCommandHandler::DoCursorMove(
|
||||
AudacityProject &project, double seekStep)
|
||||
{
|
||||
auto &project = context.project;
|
||||
|
||||
if (project.IsAudioActive()) {
|
||||
SeekWhenAudioActive(seekStep);
|
||||
}
|
||||
else
|
||||
{
|
||||
mLastSelectionAdjustment = ::wxGetLocalTimeMillis();
|
||||
MoveWhenAudioInactive(context, seekStep, TIME_UNIT_SECONDS);
|
||||
}
|
||||
if (project.IsAudioActive()) {
|
||||
SeekWhenAudioActive(seekStep);
|
||||
}
|
||||
else
|
||||
{
|
||||
mLastSelectionAdjustment = ::wxGetLocalTimeMillis();
|
||||
MoveWhenAudioInactive(project, seekStep, TIME_UNIT_SECONDS);
|
||||
}
|
||||
|
||||
project.ModifyState(false);
|
||||
}
|
||||
|
||||
70
src/Menus.h
70
src/Menus.h
@ -10,17 +10,12 @@
|
||||
#ifndef __AUDACITY_MENUS__
|
||||
#define __AUDACITY_MENUS__
|
||||
|
||||
|
||||
#include "Experimental.h"
|
||||
|
||||
|
||||
|
||||
struct MenuCommandHandler : public wxEvtHandler {
|
||||
MenuCommandHandler();
|
||||
~MenuCommandHandler();
|
||||
|
||||
|
||||
|
||||
//Adds label and returns index of label in labeltrack.
|
||||
int DoAddLabel(
|
||||
AudacityProject &project,
|
||||
@ -28,7 +23,6 @@ int DoAddLabel(
|
||||
static int DialogForLabelName(
|
||||
AudacityProject &project, const wxString& initialValue, wxString& value);
|
||||
|
||||
|
||||
double NearestZeroCrossing(AudacityProject &project, double t0);
|
||||
|
||||
// Selecting a tool from the keyboard
|
||||
@ -123,8 +117,8 @@ void OnPlaySpeedDec(const CommandContext &context );
|
||||
|
||||
// Moving track focus commands
|
||||
|
||||
void OnPrevTrack( AudacityProject &project, bool shift );
|
||||
void OnNextTrack( AudacityProject &project, bool shift );
|
||||
void DoPrevTrack( AudacityProject &project, bool shift );
|
||||
void DoNextTrack( AudacityProject &project, bool shift );
|
||||
void OnCursorUp(const CommandContext &context );
|
||||
void OnCursorDown(const CommandContext &context );
|
||||
void OnFirstTrack(const CommandContext &context );
|
||||
@ -170,7 +164,7 @@ void OnSelToEnd(const CommandContext &context );
|
||||
|
||||
void OnMoveToNextLabel(const CommandContext &context );
|
||||
void OnMoveToPrevLabel(const CommandContext &context );
|
||||
void OnMoveToLabel(AudacityProject &project, bool next);
|
||||
void DoMoveToLabel(AudacityProject &project, bool next);
|
||||
|
||||
void OnZeroCrossing(const CommandContext &context );
|
||||
|
||||
@ -191,7 +185,7 @@ void OnMacMinimizeAll(const CommandContext &context );
|
||||
void OnMacZoom(const CommandContext &context );
|
||||
void OnMacBringAllToFront(const CommandContext &context );
|
||||
|
||||
// File Menu
|
||||
// File Menu
|
||||
|
||||
void OnNew(const CommandContext &context );
|
||||
void OnOpen(const CommandContext &context );
|
||||
@ -206,7 +200,7 @@ void OnSaveCopy(const CommandContext &context );
|
||||
|
||||
void OnCheckDependencies(const CommandContext &context );
|
||||
|
||||
void OnExport(AudacityProject &project, const wxString & Format);
|
||||
void DoExport(AudacityProject &project, const wxString & Format);
|
||||
void OnExportAudio(const CommandContext &context );
|
||||
void OnExportMp3(const CommandContext &context );
|
||||
void OnExportWav(const CommandContext &context );
|
||||
@ -224,8 +218,7 @@ void OnPrint(const CommandContext &context );
|
||||
|
||||
void OnExit(const CommandContext &context );
|
||||
|
||||
// Edit Menu
|
||||
|
||||
// Edit Menu
|
||||
|
||||
void OnUndo(const CommandContext &context );
|
||||
void OnRedo(const CommandContext &context );
|
||||
@ -292,7 +285,7 @@ void OnSelectStartCursor(const CommandContext &context );
|
||||
void OnSelectTrackStartToEnd(const CommandContext &context );
|
||||
void OnSelectPrevClipBoundaryToCursor(const CommandContext &context );
|
||||
void OnSelectCursorToNextClipBoundary(const CommandContext &context );
|
||||
void OnSelectClipBoundary(AudacityProject &project, bool next);
|
||||
void DoSelectClipBoundary(AudacityProject &project, bool next);
|
||||
struct FoundTrack {
|
||||
const WaveTrack* waveTrack{};
|
||||
int trackNum{};
|
||||
@ -317,7 +310,7 @@ int FindClips
|
||||
bool ChannelsHaveDifferentClipBoundaries(const WaveTrack* wt);
|
||||
void OnSelectPrevClip(const CommandContext &context );
|
||||
void OnSelectNextClip(const CommandContext &context );
|
||||
void OnSelectClip(AudacityProject &project, bool next);
|
||||
void DoSelectClip(AudacityProject &project, bool next);
|
||||
void OnSelectCursorStoredCursor(const CommandContext &context );
|
||||
void OnSelectSyncLockSel(const CommandContext &context );
|
||||
|
||||
@ -335,7 +328,7 @@ void OnGoSelEnd(const CommandContext &context );
|
||||
void OnExpandAllTracks(const CommandContext &context );
|
||||
void OnCollapseAllTracks(const CommandContext &context );
|
||||
|
||||
void OnPanTracks(AudacityProject &project, float PanValue);
|
||||
void DoPanTracks(AudacityProject &project, float PanValue);
|
||||
void OnPanLeft(const CommandContext &context );
|
||||
void OnPanRight(const CommandContext &context );
|
||||
void OnPanCenter(const CommandContext &context );
|
||||
@ -374,7 +367,7 @@ void OnResetToolBars(const CommandContext &context );
|
||||
void OnShowEffectsRack(const CommandContext &context );
|
||||
#endif
|
||||
|
||||
// Transport Menu
|
||||
// Transport Menu
|
||||
|
||||
void OnSoundActivated(const CommandContext &context );
|
||||
void OnToggleSoundActivated(const CommandContext &context );
|
||||
@ -441,7 +434,7 @@ int FindClipBoundaries(AudacityProject &project,
|
||||
double time, bool next, std::vector<FoundClipBoundary>& results);
|
||||
void OnCursorNextClipBoundary(const CommandContext &context );
|
||||
void OnCursorPrevClipBoundary(const CommandContext &context );
|
||||
void OnCursorClipBoundary(AudacityProject &project, bool next);
|
||||
void DoCursorClipBoundary(AudacityProject &project, bool next);
|
||||
static wxString ClipBoundaryMessage(const std::vector<FoundClipBoundary>& results);
|
||||
|
||||
void OnAlignNoSync(const CommandContext &context );
|
||||
@ -469,7 +462,7 @@ void DoEditLabels(AudacityProject &project,
|
||||
void OnEditLabels(const CommandContext &context );
|
||||
void OnToggleTypeToCreateLabel(const CommandContext &context );
|
||||
|
||||
// Effect Menu
|
||||
// Effect Menu
|
||||
|
||||
struct OnEffectFlags
|
||||
{
|
||||
@ -493,16 +486,14 @@ void OnApplyMacrosPalette(const CommandContext &context );
|
||||
void OnManageMacros(const CommandContext &context );
|
||||
void OnStereoToMono(const CommandContext &context );
|
||||
void OnAudacityCommand(const CommandContext &context );
|
||||
void OnManagePluginsMenu(AudacityProject &project, EffectType Type);
|
||||
void DoManagePluginsMenu(AudacityProject &project, EffectType Type);
|
||||
static void RebuildAllMenuBars();
|
||||
void OnManageGenerators(const CommandContext &context );
|
||||
void OnManageEffects(const CommandContext &context );
|
||||
void OnManageAnalyzers(const CommandContext &context );
|
||||
void OnManageTools(const CommandContext &context );
|
||||
|
||||
|
||||
|
||||
// Help Menu
|
||||
// Help Menu
|
||||
|
||||
void OnAbout(const CommandContext &context );
|
||||
void OnQuickHelp(const CommandContext &context );
|
||||
@ -523,18 +514,14 @@ void OnAudioDeviceInfo(const CommandContext &context );
|
||||
void OnMidiDeviceInfo(const CommandContext &context );
|
||||
#endif
|
||||
|
||||
//
|
||||
|
||||
void OnSeparator(const CommandContext &context );
|
||||
|
||||
// Keyboard navigation
|
||||
// Keyboard navigation
|
||||
|
||||
void NextOrPrevFrame(AudacityProject &project, bool next);
|
||||
void PrevFrame(const CommandContext &context );
|
||||
void NextFrame(const CommandContext &context );
|
||||
void OnPrevFrame(const CommandContext &context );
|
||||
void OnNextFrame(const CommandContext &context );
|
||||
|
||||
void PrevWindow(const CommandContext &context );
|
||||
void NextWindow(const CommandContext &context );
|
||||
void OnPrevWindow(const CommandContext &context );
|
||||
void OnNextWindow(const CommandContext &context );
|
||||
|
||||
void OnResample(const CommandContext &context );
|
||||
|
||||
@ -556,39 +543,32 @@ enum TimeUnit {
|
||||
};
|
||||
|
||||
bool OnlyHandleKeyUp( const CommandContext &context );
|
||||
void OnCursorMove(const CommandContext &context, double seekStep);
|
||||
void OnBoundaryMove(const CommandContext &context, int step);
|
||||
void DoCursorMove(AudacityProject &project, double seekStep);
|
||||
void DoBoundaryMove(AudacityProject &project, int step);
|
||||
|
||||
// Handle small cursor and play head movements
|
||||
void SeekLeftOrRight
|
||||
(const CommandContext &context, double direction, SelectionOperation operation);
|
||||
(AudacityProject &project, double direction, SelectionOperation operation);
|
||||
|
||||
void SeekWhenAudioActive(double seekStep);
|
||||
void SeekWhenAudioInactive
|
||||
(const CommandContext &context, double seekStep, TimeUnit timeUnit,
|
||||
(AudacityProject &project, double seekStep, TimeUnit timeUnit,
|
||||
SelectionOperation operation);
|
||||
void MoveWhenAudioInactive
|
||||
(const CommandContext &context, double seekStep, TimeUnit timeUnit);
|
||||
(AudacityProject &project, double seekStep, TimeUnit timeUnit);
|
||||
|
||||
|
||||
|
||||
double OffsetTime(const CommandContext &context,
|
||||
double OffsetTime(AudacityProject &project,
|
||||
double t, double offset, TimeUnit timeUnit, int snapToTime);
|
||||
|
||||
// Helper for moving by keyboard with snap-to-grid enabled
|
||||
double GridMove(AudacityProject &project, double t, int minPix);
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
public:
|
||||
double mSeekShort;
|
||||
double mSeekLong;
|
||||
bool mCircularTrackNavigation{};
|
||||
wxLongLong mLastSelectionAdjustment;
|
||||
|
||||
|
||||
void UpdatePrefs();
|
||||
};
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user