mirror of
https://github.com/cookiengineer/audacity
synced 2025-11-21 08:27:13 +01:00
static ViewInfo::Get() and ZoomInfo::Get()...
... not member functions of AudacityProject
This commit is contained in:
@@ -8,6 +8,7 @@
|
||||
#include "../Prefs.h"
|
||||
#include "../Project.h"
|
||||
#include "../TrackPanel.h"
|
||||
#include "../ViewInfo.h"
|
||||
#include "../commands/CommandContext.h"
|
||||
#include "../commands/CommandManager.h"
|
||||
#include "../prefs/GUIPrefs.h"
|
||||
@@ -24,7 +25,7 @@ namespace {
|
||||
|
||||
double GetZoomOfSelection( const AudacityProject &project )
|
||||
{
|
||||
const auto &viewInfo = project.GetViewInfo();
|
||||
auto &viewInfo = ViewInfo::Get( project );
|
||||
const auto &trackPanel = *project.GetTrackPanel();
|
||||
|
||||
const double lowerBound =
|
||||
@@ -122,7 +123,7 @@ namespace ViewActions {
|
||||
double GetZoomOfToFit( const AudacityProject &project )
|
||||
{
|
||||
auto &tracks = TrackList::Get( project );
|
||||
const auto &viewInfo = project.GetViewInfo();
|
||||
auto &viewInfo = ViewInfo::Get( project );
|
||||
const auto &trackPanel = *project.GetTrackPanel();
|
||||
|
||||
const double end = tracks.GetEndTime();
|
||||
@@ -142,7 +143,7 @@ double GetZoomOfToFit( const AudacityProject &project )
|
||||
|
||||
void DoZoomFit(AudacityProject &project)
|
||||
{
|
||||
auto &viewInfo = project.GetViewInfo();
|
||||
auto &viewInfo = ViewInfo::Get( project );
|
||||
auto &tracks = TrackList::Get( project );
|
||||
|
||||
const double start = viewInfo.bScrollBeyondZero
|
||||
@@ -209,7 +210,7 @@ void OnZoomOut(const CommandContext &context)
|
||||
void OnZoomSel(const CommandContext &context)
|
||||
{
|
||||
auto &project = context.project;
|
||||
auto &selectedRegion = project.GetViewInfo().selectedRegion;
|
||||
auto &selectedRegion = ViewInfo::Get( project ).selectedRegion;
|
||||
|
||||
project.Zoom( GetZoomOfSelection( project ) );
|
||||
project.TP_ScrollWindow(selectedRegion.t0());
|
||||
@@ -218,7 +219,7 @@ void OnZoomSel(const CommandContext &context)
|
||||
void OnZoomToggle(const CommandContext &context)
|
||||
{
|
||||
auto &project = context.project;
|
||||
auto &viewInfo = project.GetViewInfo();
|
||||
auto &viewInfo = ViewInfo::Get( project );
|
||||
auto trackPanel = project.GetTrackPanel();
|
||||
|
||||
// const double origLeft = viewInfo.h;
|
||||
@@ -293,7 +294,7 @@ void OnExpandAllTracks(const CommandContext &context)
|
||||
void OnGoSelStart(const CommandContext &context)
|
||||
{
|
||||
auto &project = context.project;
|
||||
auto &viewInfo = project.GetViewInfo();
|
||||
auto &viewInfo = ViewInfo::Get( project );
|
||||
auto &selectedRegion = viewInfo.selectedRegion;
|
||||
auto &trackPanel = *project.GetTrackPanel();
|
||||
|
||||
@@ -307,7 +308,7 @@ void OnGoSelStart(const CommandContext &context)
|
||||
void OnGoSelEnd(const CommandContext &context)
|
||||
{
|
||||
auto &project = context.project;
|
||||
auto &viewInfo = project.GetViewInfo();
|
||||
auto &viewInfo = ViewInfo::Get( project );
|
||||
auto &selectedRegion = viewInfo.selectedRegion;
|
||||
auto &trackPanel = *project.GetTrackPanel();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user