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

Bug 2353 - Import RAW into empty project does not zoom to fit

Browse Source
This commit is contained in:
Leland Lucius 2021-02-12 18:56:41 -06:00
parent 7547de9f52
commit 598eb39484
1 changed files with 49 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
src/menus/FileMenus.cpp
View File

@ -108,6 +108,53 @@ void DoExport(AudacityProject &project, const FileExtension &format)
} }
} }
void DoImport(const CommandContext &context, bool isRaw)
{
auto &project = context.project;
auto &trackFactory = WaveTrackFactory::Get( project );
auto &window = ProjectWindow::Get( project );
auto selectedFiles = ProjectFileManager::ShowOpenDialog(FileNames::Operation::Import);
if (selectedFiles.size() == 0) {
Importer::SetLastOpenType({});
return;
}
// PRL: This affects FFmpegImportPlugin::Open which resets the preference
// to false. Should it also be set to true on other paths that reach
// AudacityProject::Import ?
gPrefs->Write(wxT("/NewImportingSession"), true);
selectedFiles.Sort(FileNames::CompareNoCase);
auto cleanup = finally( [&] {
Importer::SetLastOpenType({});
window.ZoomAfterImport(nullptr);
window.HandleResize(); // Adjust scrollers for NEW track sizes.
} );
for (size_t ff = 0; ff < selectedFiles.size(); ff++) {
wxString fileName = selectedFiles[ff];
FileNames::UpdateDefaultPath(FileNames::Operation::Import, ::wxPathOnly(fileName));
if (isRaw) {
TrackHolders newTracks;
::ImportRaw(project, &window, fileName, &trackFactory, newTracks);
if (newTracks.size() > 0) {
ProjectFileManager::Get( project )
.AddImportedTracks(fileName, std::move(newTracks));
}
}
else {
ProjectFileManager::Get( project ).Import(fileName);
}
}
}
} }
// Menu handler functions // Menu handler functions
@ -367,36 +414,7 @@ void OnExportMIDI(const CommandContext &context)
void OnImport(const CommandContext &context) void OnImport(const CommandContext &context)
{ {
auto &project = context.project; DoImport(context, false);
auto &window = ProjectWindow::Get( project );
auto selectedFiles = ProjectFileManager::ShowOpenDialog(FileNames::Operation::Import);
if (selectedFiles.size() == 0) {
Importer::SetLastOpenType({});
return;
}
// PRL: This affects FFmpegImportPlugin::Open which resets the preference
// to false. Should it also be set to true on other paths that reach
// AudacityProject::Import ?
gPrefs->Write(wxT("/NewImportingSession"), true);
selectedFiles.Sort(FileNames::CompareNoCase);
auto cleanup = finally( [&] {
Importer::SetLastOpenType({});
window.HandleResize(); // Adjust scrollers for NEW track sizes.
} );
for (size_t ff = 0; ff < selectedFiles.size(); ff++) {
wxString fileName = selectedFiles[ff];
FileNames::UpdateDefaultPath(FileNames::Operation::Import, ::wxPathOnly(fileName));
ProjectFileManager::Get( project ).Import(fileName);
}
window.ZoomAfterImport(nullptr);
} }
void OnImportLabels(const CommandContext &context) void OnImportLabels(const CommandContext &context)
@ -475,33 +493,7 @@ void OnImportMIDI(const CommandContext &context)
void OnImportRaw(const CommandContext &context) void OnImportRaw(const CommandContext &context)
{ {
auto &project = context.project; DoImport(context, true);
auto &trackFactory = WaveTrackFactory::Get( project );
auto &window = ProjectWindow::Get( project );
wxString fileName =
FileNames::SelectFile(FileNames::Operation::Open,
XO("Select any uncompressed audio file"),
wxEmptyString, // Path
wxT(""), // Name
wxT(""), // Extension
{ FileNames::AllFiles },
wxRESIZE_BORDER, // Flags
&window); // Parent
if (fileName.empty())
return;
TrackHolders newTracks;
::ImportRaw(project, &window, fileName, &trackFactory, newTracks);
if (newTracks.size() <= 0)
return;
ProjectFileManager::Get( project )
.AddImportedTracks(fileName, std::move(newTracks));
window.HandleResize(); // Adjust scrollers for NEW track sizes.
} }
void OnPageSetup(const CommandContext &context) void OnPageSetup(const CommandContext &context)