Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-04-02 04:24:51 +02:00
Code Issues Releases Wiki Activity

Move error dialog functions into the BasicUI facade...

Browse Source 
... now ErrorDialog.h is included only in ErrorDialog.cpp and
wxWidgetsBasicUI.cpp
This commit is contained in:
Paul Licameli
2021-02-09 12:50:27 -05:00
parent 3a3ff8ecbe
commit 189c6c1dbc
26 changed files with 251 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/ProjectAudioManager.cpp
View File

@@ -17,6 +17,7 @@ Paul Licameli split from ProjectManager.cpp
#include <wx/statusbr.h>
#include "AudioIO.h"
#include "BasicUI.h"
#include "CommonCommandFlags.h"
#include "LabelTrack.h"
#include "Menus.h"
@@ -35,7 +36,6 @@ Paul Licameli split from ProjectManager.cpp
#include "prefs/TracksPrefs.h"
#include "tracks/ui/Scrubbing.h"
#include "tracks/ui/TrackView.h"
#include "widgets/ErrorDialog.h"
#include "widgets/MeterPanelBase.h"
#include "widgets/Warning.h"
#include "widgets/AudacityMessageBox.h"
@@ -263,10 +263,13 @@ int ProjectAudioManager::PlayPlayRegion(const SelectedRegion &selectedRegion,
// handler! Easy fix, just delay the user alert instead.
auto &window = GetProjectFrame( mProject );
window.CallAfter( [&]{
// Show error message if stream could not be opened
ShowExceptionDialog(&window, XO("Error"),
XO("Error opening sound device.\nTry changing the audio host, playback device and the project sample rate."),
wxT("Error_opening_sound_device"));
using namespace BasicUI;
// Show error message if stream could not be opened
ShowErrorDialog( *ProjectFramePlacement(&mProject),
XO("Error"),
XO("Error opening sound device.\nTry changing the audio host, playback device and the project sample rate."),
wxT("Error_opening_sound_device"),
ErrorDialogOptions{ ErrorDialogType::ModalErrorReport } );
});
}
}
@@ -751,8 +754,10 @@ bool ProjectAudioManager::DoRecord(AudacityProject &project,
// Show error message if stream could not be opened
auto msg = XO("Error opening recording device.\nError code: %s")
.Format( gAudioIO->LastPaErrorString() );
ShowExceptionDialog(&GetProjectFrame( mProject ),
XO("Error"), msg, wxT("Error_opening_sound_device"));
using namespace BasicUI;
ShowErrorDialog( *ProjectFramePlacement(&mProject),
XO("Error"), msg, wxT("Error_opening_sound_device"),
ErrorDialogOptions{ ErrorDialogType::ModalErrorReport } );
}
}