projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix possible ringbuffer overflow
[ardour.git]
/
gtk2_ardour
/
port_insert_ui.cc
diff --git
a/gtk2_ardour/port_insert_ui.cc
b/gtk2_ardour/port_insert_ui.cc
index 16beb75877d49ae9aed6440382a66a19ece73366..0bf86532995e0d4f15c205b51e29694cdb76bce7 100644
(file)
--- a/
gtk2_ardour/port_insert_ui.cc
+++ b/
gtk2_ardour/port_insert_ui.cc
@@
-28,9
+28,8
@@
#include "ardour/session.h"
#include "port_insert_ui.h"
#include "ardour/session.h"
#include "port_insert_ui.h"
-#include "utils.h"
#include "gui_thread.h"
#include "gui_thread.h"
-#include "i18n.h"
+#include "
pbd/
i18n.h"
using namespace ARDOUR;
using namespace Gtk;
using namespace ARDOUR;
using namespace Gtk;
@@
-66,7
+65,7
@@
PortInsertUI::PortInsertUI (Gtk::Window* parent, ARDOUR::Session* sess, boost::s
void
PortInsertUI::update_latency_display ()
{
void
PortInsertUI::update_latency_display ()
{
- framecnt_t const sample_rate =
input_selector.session()->engine().fram
e_rate();
+ framecnt_t const sample_rate =
AudioEngine::instance()->sampl
e_rate();
if (sample_rate == 0) {
latency_display.set_text (_("Disconnected from audio engine"));
} else {
if (sample_rate == 0) {
latency_display.set_text (_("Disconnected from audio engine"));
} else {
@@
-93,7
+92,7
@@
PortInsertUI::check_latency_measurement ()
}
char buf[128];
}
char buf[128];
- framecnt_t const sample_rate = AudioEngine::instance()->
fram
e_rate();
+ framecnt_t const sample_rate = AudioEngine::instance()->
sampl
e_rate();
if (sample_rate == 0) {
latency_display.set_text (_("Disconnected from audio engine"));
if (sample_rate == 0) {
latency_display.set_text (_("Disconnected from audio engine"));
@@
-176,24
+175,13
@@
PortInsertWindow::PortInsertWindow (ARDOUR::Session* sess, boost::shared_ptr<ARD
ok_but->signal_clicked().connect (sigc::mem_fun (*this, &PortInsertWindow::accept));
signal_delete_event().connect (sigc::mem_fun (*this, &PortInsertWindow::wm_delete), false);
ok_but->signal_clicked().connect (sigc::mem_fun (*this, &PortInsertWindow::accept));
signal_delete_event().connect (sigc::mem_fun (*this, &PortInsertWindow::wm_delete), false);
-
- pi->DropReferences.connect (going_away_connection, invalidator (*this), boost::bind (&PortInsertWindow::plugin_going_away, this), gui_context());
}
bool
PortInsertWindow::wm_delete (GdkEventAny* /*event*/)
{
accept ();
}
bool
PortInsertWindow::wm_delete (GdkEventAny* /*event*/)
{
accept ();
- return true;
-}
-
-void
-PortInsertWindow::plugin_going_away ()
-{
- ENSURE_GUI_THREAD (*this, &PortInsertWindow::plugin_going_away)
-
- going_away_connection.disconnect ();
- delete_when_idle (this);
+ return false;
}
void
}
void