smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-17 20:26:30 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'miscfix' of https://github.com/mojofunk/ardour

Browse source
This commit is contained in:
Paul Davis 2013-10-22 14:32:57 -04:00
commit ed42f3359b
3 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

20
gtk2_ardour/ardour_ui.cc
View file

@ -101,6 +101,7 @@ typedef uint64_t microseconds_t;
#include "missing_plugin_dialog.h" #include "missing_plugin_dialog.h"
#include "mixer_ui.h" #include "mixer_ui.h"
#include "mouse_cursors.h" #include "mouse_cursors.h"
#include "nsm.h"
#include "opts.h" #include "opts.h"
#include "pingback.h" #include "pingback.h"
#include "processor_box.h" #include "processor_box.h"
@ -827,13 +828,6 @@ ARDOUR_UI::starting ()
return 0; return 0;
} }
void
ARDOUR_UI::no_memory_warning ()
{
XMLNode node (X_("no-memory-warning"));
Config->add_instant_xml (node);
}
void void
ARDOUR_UI::check_memory_locking () ARDOUR_UI::check_memory_locking ()
{ {
@ -890,9 +884,6 @@ ARDOUR_UI::check_memory_locking ()
VBox* vbox = msg.get_vbox(); VBox* vbox = msg.get_vbox();
HBox hbox; HBox hbox;
CheckButton cb (_("Do not show this window again")); CheckButton cb (_("Do not show this window again"));
cb.signal_toggled().connect (sigc::mem_fun (*this, &ARDOUR_UI::no_memory_warning));
hbox.pack_start (cb, true, false); hbox.pack_start (cb, true, false);
vbox->pack_start (hbox); vbox->pack_start (hbox);
cb.show(); cb.show();
@ -903,6 +894,11 @@ ARDOUR_UI::check_memory_locking ()
editor->ensure_float (msg); editor->ensure_float (msg);
msg.run (); msg.run ();
if (cb.get_active()) {
XMLNode node (X_("no-memory-warning"));
Config->add_instant_xml (node);
}
} }
} }
} }
@ -3737,8 +3733,8 @@ ARDOUR_UI::session_dialog (std::string msg)
int int
ARDOUR_UI::pending_state_dialog () ARDOUR_UI::pending_state_dialog ()
{ {
HBox* hbox = new HBox(); HBox* hbox = manage (new HBox());
Image* image = new Image (Stock::DIALOG_QUESTION, ICON_SIZE_DIALOG); Image* image = manage (new Image (Stock::DIALOG_QUESTION, ICON_SIZE_DIALOG));
ArdourDialog dialog (_("Crash Recovery"), true); ArdourDialog dialog (_("Crash Recovery"), true);
Label message (string_compose (_("\ Label message (string_compose (_("\
This session appears to have been in the\n\ This session appears to have been in the\n\

3
gtk2_ardour/ardour_ui.h
View file

@ -72,7 +72,6 @@
#include "ardour_window.h" #include "ardour_window.h"
#include "editing.h" #include "editing.h"
#include "meterbridge.h" #include "meterbridge.h"
#include "nsm.h"
#include "ui_config.h" #include "ui_config.h"
#include "enums.h" #include "enums.h"
#include "visibility_group.h" #include "visibility_group.h"
@ -105,6 +104,7 @@ class SpeakerDialog;
class ThemeManager; class ThemeManager;
class TimeInfoBox; class TimeInfoBox;
class MidiTracer; class MidiTracer;
class NSM_Client;
class LevelMeterHBox; class LevelMeterHBox;
class GlobalPortMatrixWindow; class GlobalPortMatrixWindow;
class GUIObjectState; class GUIObjectState;
@ -692,7 +692,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
bool first_idle (); bool first_idle ();
void no_memory_warning ();
void check_memory_locking (); void check_memory_locking ();
bool check_audioengine(); bool check_audioengine();

2
libs/ardour/wscript
View file

@ -1,4 +1,4 @@
1#!/usr/bin/env python #!/usr/bin/env python
from waflib.extras import autowaf as autowaf from waflib.extras import autowaf as autowaf
from waflib import Options from waflib import Options
import os import os