Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-03-29 18:46:05 +02:00
Code Issues Releases Wiki Activity

Don't store default sample format in ProjectSettings...

Browse Source 
... it's a global preference.
This commit is contained in:
Paul Licameli
2019-07-20 15:48:29 -04:00
parent 7532677781
commit 314ede2137
5 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Dependencies.cpp
View File

@@ -55,11 +55,11 @@ AliasedFile s.
#include "FileFormats.h"
#include "Prefs.h"
#include "Project.h"
#include "ProjectSettings.h"
#include "Sequence.h"
#include "ShuttleGui.h"
#include "WaveTrack.h"
#include "WaveClip.h"
#include "prefs/QualityPrefs.h"
#include "widgets/AudacityMessageBox.h"
#include "widgets/ProgressDialog.h"
@@ -110,8 +110,7 @@ static void ReplaceBlockFiles(BlockPtrArray &blocks,
void FindDependencies(AudacityProject *project,
AliasedFileArray &outAliasedFiles)
{
const auto &settings = ProjectSettings::Get( *project );
sampleFormat format = settings.GetDefaultFormat();
sampleFormat format = QualityPrefs::SampleFormatChoice();
BlockPtrArray blocks;
GetAllSeqBlocks(project, &blocks);
@@ -168,7 +167,6 @@ static void RemoveDependencies(AudacityProject *project,
// STRONG-GUARANTEE
{
auto &dirManager = DirManager::Get( *project );
const auto &settings = ProjectSettings::Get( *project );
ProgressDialog progress(
XO("Removing Dependencies"),
@@ -188,7 +186,7 @@ static void RemoveDependencies(AudacityProject *project,
BlockPtrArray blocks;
GetAllSeqBlocks(project, &blocks);
const sampleFormat format = settings.GetDefaultFormat();
const sampleFormat format = QualityPrefs::SampleFormatChoice();
ReplacedBlockFileHash blockFileHash;
wxLongLong completedBytes = 0;
for (const auto blockFile : blocks) {