ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Replace some Gtk:MessageDialog with Ardour's variant 

This fixes some issues with stuck splash screen early on.
This commit is contained in:
Robin Gareus 2020-01-15 22:01:30 +01:00
parent ef636d0274
commit a62df60760
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk2_ardour/ardour_ui_options.cc
View File

@ -40,6 +40,7 @@
#include "gtkmm2ext/utils.h"
#include "waveview/wave_view.h"
#include "ardour_message.h"
#include "audio_clock.h"
#include "ardour_ui.h"
#include "actions.h"
@ -60,7 +61,7 @@ ARDOUR_UI::toggle_external_sync()
{
if (_session) {
if (_session->config.get_video_pullup() != 0.0f && (TransportMasterManager::instance().current()->type() == Engine)) {
MessageDialog msg (_("It is not possible to use JACK as the the sync source\n when the pull up/down setting is non-zero."));
ArdourMessageDialog msg (_("It is not possible to use JACK as the the sync source\n when the pull up/down setting is non-zero."));
msg.run ();
return;
}

5
gtk2_ardour/editor.cc
View File

@ -102,6 +102,7 @@
#include "actions.h"
#include "analysis_window.h"
#include "ardour_message.h"
#include "audio_clock.h"
#include "audio_region_view.h"
#include "audio_streamview.h"
@ -5183,11 +5184,11 @@ Editor::show_rhythm_ferret ()
void
Editor::first_idle ()
{
MessageDialog* dialog = 0;
ArdourMessageDialog* dialog = 0;
if (track_views.size() > 1) {
Timers::TimerSuspender t;
dialog = new MessageDialog (
dialog = new ArdourMessageDialog (
string_compose (_("Please wait while %1 loads visual data."), PROGRAM_NAME),
true
);

2
gtk2_ardour/main.cc
View File

@ -160,7 +160,7 @@ Click OK to exit %1."), PROGRAM_NAME, AudioEngine::instance()->current_backend_n
/* engine has already run, so this is a mid-session backend death */
MessageDialog msg (string_compose (_("The audio backend (%1) has failed, or terminated"), AudioEngine::instance()->current_backend_name()), false);
ArdourMessageDialog msg (string_compose (_("The audio backend (%1) has failed, or terminated"), AudioEngine::instance()->current_backend_name()), false);
msg.set_secondary_text (string_compose (_("%2 exited unexpectedly, and without notifying %1."),
PROGRAM_NAME, AudioEngine::instance()->current_backend_name()));
msg.run ();