audacia
/
audacia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

"Error opening sound device" as Error dialog 

ShowErrorDialog could do with some polish, but it supports linking
a help button to the manual.
This commit is contained in:
Steve Daulton 2017-05-20 17:11:02 +01:00
parent bba5a8fef1
commit d6a9011960
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/effects/Effect.cpp
View File

@ -54,6 +54,9 @@ greater use in future.
#include "TimeWarper.h" #include "TimeWarper.h"
#include "nyquist/Nyquist.h" #include "nyquist/Nyquist.h"
#include "../widgets/HelpSystem.h" #include "../widgets/HelpSystem.h"
#include "../widgets/LinkingHtmlWindow.h"
#include "../widgets/ErrorDialog.h"
#include "../FileNames.h"
#if defined(__WXMAC__) #if defined(__WXMAC__)
#include <Cocoa/Cocoa.h> #include <Cocoa/Cocoa.h>
@ -2615,8 +2618,9 @@ void Effect::Preview(bool dryOnly)
} }
} }
else { else {
wxMessageBox(_("Error opening sound device. Try changing the audio host, playback device and the project sample rate."), ShowErrorDialog(FocusDialog, _("Error"),
_("Error"), wxOK | wxICON_EXCLAMATION, FocusDialog); _("Error opening sound device.\nTry changing the audio host, playback device and the project sample rate."),
wxT("http://manual.audacityteam.org/man/faq_errors.html#sound_device"), false);
} }
} }
} }

19
src/toolbars/ControlToolBar.cpp
View File

@ -67,6 +67,9 @@
#include "../WaveTrack.h" #include "../WaveTrack.h"
#include "../widgets/AButton.h" #include "../widgets/AButton.h"
#include "../widgets/Meter.h" #include "../widgets/Meter.h"
#include "../widgets/LinkingHtmlWindow.h"
#include "../widgets/ErrorDialog.h"
#include "../FileNames.h"
#include "../tracks/ui/Scrubbing.h" #include "../tracks/ui/Scrubbing.h"
#include "../prefs/TracksPrefs.h" #include "../prefs/TracksPrefs.h"
@ -697,11 +700,10 @@ int ControlToolBar::PlayPlayRegion(const SelectedRegion &selectedRegion,
#endif #endif
} }
else { else {
// msmeyer: Show error message if stream could not be opened // Show error message if stream could not be opened
wxMessageBox( ShowErrorDialog(this, _("Error"),
_("Error opening sound device. " _("Error opening sound device.\nTry changing the audio host, playback device and the project sample rate."),
"Try changing the audio host, playback device and the project sample rate."), wxT("http://manual.audacityteam.org/man/faq_errors.html#sound_device"), false);
_("Error"), wxOK | wxICON_EXCLAMATION, this);
} }
} }
@ -1173,9 +1175,10 @@ void ControlToolBar::OnRecord(wxCommandEvent &evt)
StartScrollingIfPreferred(); StartScrollingIfPreferred();
} }
else { else {
// msmeyer: Show error message if stream could not be opened // Show error message if stream could not be opened
wxMessageBox(_("Error opening sound device. Try changing the audio host, recording device and the project sample rate."), ShowErrorDialog(this, _("Error"),
_("Error"), wxOK | wxICON_EXCLAMATION, this); _("Error opening sound device.\nTry changing the audio host, recording device and the project sample rate."),
wxT("http://manual.audacityteam.org/man/faq_errors.html#sound_device"), false);
} }
} }
} }