projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove unused variables
[ardour.git]
/
gtk2_ardour
/
io_selector.cc
diff --git
a/gtk2_ardour/io_selector.cc
b/gtk2_ardour/io_selector.cc
index db165b8b3c760375aab9091653be55d1ff3d9820..99050cc34ba0a5a75c728d2cf1da11cdd6004b1c 100644
(file)
--- a/
gtk2_ardour/io_selector.cc
+++ b/
gtk2_ardour/io_selector.cc
@@
-33,9
+33,10
@@
#include "io_selector.h"
#include "utils.h"
#include "gui_thread.h"
#include "io_selector.h"
#include "utils.h"
#include "gui_thread.h"
-#include "i18n.h"
+#include "
pbd/
i18n.h"
using namespace ARDOUR;
using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
using namespace Gtk;
IOSelector::IOSelector (Gtk::Window* p, ARDOUR::Session* session, boost::shared_ptr<ARDOUR::IO> io)
using namespace Gtk;
IOSelector::IOSelector (Gtk::Window* p, ARDOUR::Session* session, boost::shared_ptr<ARDOUR::IO> io)
@@
-140,15
+141,15
@@
IOSelector::set_state (ARDOUR::BundleChannel c[2], bool s)
return;
}
return;
}
-
if (s) {
+ if (s) {
if (!f->connected_to (*j)) {
_io->connect (f, *j, 0);
}
if (!f->connected_to (*j)) {
_io->connect (f, *j, 0);
}
-
} else {
+ } else {
if (f->connected_to (*j)) {
_io->disconnect (f, *j, 0);
}
if (f->connected_to (*j)) {
_io->disconnect (f, *j, 0);
}
-
}
+ }
}
}
}
}
}
}
@@
-224,8
+225,6
@@
IOSelectorWindow::IOSelectorWindow (ARDOUR::Session* session, boost::shared_ptr<
add (_selector);
add (_selector);
- set_position (Gtk::WIN_POS_MOUSE);
-
io_name_changed (this);
show_all ();
io_name_changed (this);
show_all ();
@@
-237,8
+236,7
@@
bool
IOSelectorWindow::wm_delete (GdkEventAny* /*event*/)
{
_selector.Finished (IOSelector::Accepted);
IOSelectorWindow::wm_delete (GdkEventAny* /*event*/)
{
_selector.Finished (IOSelector::Accepted);
- hide ();
- return true;
+ return false;
}
}
@@
-261,7
+259,7
@@
void
IOSelectorWindow::io_name_changed (void*)
{
ENSURE_GUI_THREAD (*this, &IOSelectorWindow::io_name_changed, src)
IOSelectorWindow::io_name_changed (void*)
{
ENSURE_GUI_THREAD (*this, &IOSelectorWindow::io_name_changed, src)
-
+
std::string title;
if (!_selector.find_inputs_for_io_outputs()) {
std::string title;
if (!_selector.find_inputs_for_io_outputs()) {