projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hotfix for flying percussive hits while dragging.
[ardour.git]
/
gtk2_ardour
/
global_port_matrix.cc
diff --git
a/gtk2_ardour/global_port_matrix.cc
b/gtk2_ardour/global_port_matrix.cc
index 565def896e0618395b998a0286f942ecef8e7a4e..9a6db259dcb44f9f4ddfdcb95630ad3d13bea143 100644
(file)
--- a/
gtk2_ardour/global_port_matrix.cc
+++ b/
gtk2_ardour/global_port_matrix.cc
@@
-19,6
+19,7
@@
#include <gtkmm/image.h>
#include <gtkmm/stock.h>
#include <gtkmm/image.h>
#include <gtkmm/stock.h>
+
#include "global_port_matrix.h"
#include "utils.h"
#include "global_port_matrix.h"
#include "utils.h"
@@
-27,10
+28,11
@@
#include "ardour/audioengine.h"
#include "ardour/port.h"
#include "ardour/audioengine.h"
#include "ardour/port.h"
-#include "i18n.h"
+#include "
pbd/
i18n.h"
using namespace std;
using namespace ARDOUR;
using namespace std;
using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
GlobalPortMatrix::GlobalPortMatrix (Gtk::Window* p, Session* s, DataType t)
: PortMatrix (p, s, t)
GlobalPortMatrix::GlobalPortMatrix (Gtk::Window* p, Session* s, DataType t)
: PortMatrix (p, s, t)
@@
-42,22
+44,30
@@
GlobalPortMatrix::GlobalPortMatrix (Gtk::Window* p, Session* s, DataType t)
void
GlobalPortMatrix::setup_ports (int dim)
{
void
GlobalPortMatrix::setup_ports (int dim)
{
+ if (!_session) {
+ return;
+ }
+
_ports[dim].suspend_signals ();
_ports[dim].suspend_signals ();
- _ports[dim].gather (_session, type(), dim ==
IN, false
);
+ _ports[dim].gather (_session, type(), dim ==
FLOW_IN, false, show_only_bundles ()
);
_ports[dim].resume_signals ();
}
void
GlobalPortMatrix::set_state (BundleChannel c[2], bool s)
{
_ports[dim].resume_signals ();
}
void
GlobalPortMatrix::set_state (BundleChannel c[2], bool s)
{
- Bundle::PortList const & in_ports = c[IN].bundle->channel_ports (c[IN].channel);
- Bundle::PortList const & out_ports = c[OUT].bundle->channel_ports (c[OUT].channel);
+ if (!_session) {
+ return;
+ }
+
+ Bundle::PortList const & in_ports = c[FLOW_IN].bundle->channel_ports (c[FLOW_IN].channel);
+ Bundle::PortList const & out_ports = c[FLOW_OUT].bundle->channel_ports (c[FLOW_OUT].channel);
for (Bundle::PortList::const_iterator i = in_ports.begin(); i != in_ports.end(); ++i) {
for (Bundle::PortList::const_iterator j = out_ports.begin(); j != out_ports.end(); ++j) {
for (Bundle::PortList::const_iterator i = in_ports.begin(); i != in_ports.end(); ++i) {
for (Bundle::PortList::const_iterator j = out_ports.begin(); j != out_ports.end(); ++j) {
-
Port*
p = _session->engine().get_port_by_name (*i);
-
Port*
q = _session->engine().get_port_by_name (*j);
+
boost::shared_ptr<Port>
p = _session->engine().get_port_by_name (*i);
+
boost::shared_ptr<Port>
q = _session->engine().get_port_by_name (*j);
if (p) {
if (s) {
if (p) {
if (s) {
@@
-74,9
+84,9
@@
GlobalPortMatrix::set_state (BundleChannel c[2], bool s)
} else {
/* two non-Ardour ports */
if (s) {
} else {
/* two non-Ardour ports */
if (s) {
-
jack_connect (_session->engine().jack (), j->c_str(), i->c_str()
);
+
AudioEngine::instance()->connect (*j, *i
);
} else {
} else {
-
jack_disconnect (_session->engine().jack (), j->c_str(), i->c_str()
);
+
AudioEngine::instance()->disconnect (*j, *i
);
}
}
}
}
}
}
@@
-94,8
+104,8
@@
GlobalPortMatrix::get_state (BundleChannel c[2]) const
return PortMatrixNode::NOT_ASSOCIATED;
}
return PortMatrixNode::NOT_ASSOCIATED;
}
- Bundle::PortList const & in_ports = c[
IN].bundle->channel_ports (c[
IN].channel);
- Bundle::PortList const & out_ports = c[
OUT].bundle->channel_ports (c[
OUT].channel);
+ Bundle::PortList const & in_ports = c[
FLOW_IN].bundle->channel_ports (c[FLOW_
IN].channel);
+ Bundle::PortList const & out_ports = c[
FLOW_OUT].bundle->channel_ports (c[FLOW_
OUT].channel);
if (in_ports.empty() || out_ports.empty()) {
/* we're looking at a bundle with no parts associated with this channel,
so nothing to connect */
if (in_ports.empty() || out_ports.empty()) {
/* we're looking at a bundle with no parts associated with this channel,
so nothing to connect */
@@
-105,33
+115,25
@@
GlobalPortMatrix::get_state (BundleChannel c[2]) const
for (Bundle::PortList::const_iterator i = in_ports.begin(); i != in_ports.end(); ++i) {
for (Bundle::PortList::const_iterator j = out_ports.begin(); j != out_ports.end(); ++j) {
for (Bundle::PortList::const_iterator i = in_ports.begin(); i != in_ports.end(); ++i) {
for (Bundle::PortList::const_iterator j = out_ports.begin(); j != out_ports.end(); ++j) {
-
Port* p = _session->engine().
get_port_by_name (*i);
-
Port* q = _session->engine().
get_port_by_name (*j);
+
boost::shared_ptr<Port> p = AudioEngine::instance()->
get_port_by_name (*i);
+
boost::shared_ptr<Port> q = AudioEngine::instance()->
get_port_by_name (*j);
if (!p && !q) {
/* two non-Ardour ports; things are slightly more involved */
if (!p && !q) {
/* two non-Ardour ports; things are slightly more involved */
- /* XXX: is this the easiest way to do this? */
- /* XXX: isn't this very inefficient? */
- jack_client_t* jack = _session->engine().jack ();
- jack_port_t* jp = jack_port_by_name (jack, i->c_str());
- if (jp == 0) {
+ /* get a port handle for one of them .. */
+
+ PortEngine::PortHandle ph = AudioEngine::instance()->port_engine().get_port_by_name (*i);
+ if (!ph) {
return PortMatrixNode::NOT_ASSOCIATED;
}
return PortMatrixNode::NOT_ASSOCIATED;
}
- char const ** c = jack_port_get_all_connections (jack, jp);
+ /* see if it is connected to the other one ... */
- char const ** p = c;
-
- while (p && *p != 0) {
- if (strcmp (*p, j->c_str()) == 0) {
- free (c);
- return PortMatrixNode::ASSOCIATED;
- }
- ++p;
+ if (AudioEngine::instance()->port_engine().connected_to (ph, *j, false)) {
+ return PortMatrixNode::ASSOCIATED;
}
}
- free (c);
return PortMatrixNode::NOT_ASSOCIATED;
}
return PortMatrixNode::NOT_ASSOCIATED;
}
@@
-148,8
+150,8
@@
GlobalPortMatrix::get_state (BundleChannel c[2]) const
}
GlobalPortMatrixWindow::GlobalPortMatrixWindow (Session* s, DataType t)
}
GlobalPortMatrixWindow::GlobalPortMatrixWindow (Session* s, DataType t)
- : Ardour
Dialog
(X_("reset me soon"))
-
, _port_matrix (this, s, t)
+ : Ardour
Window
(X_("reset me soon"))
+ , _port_matrix (this, s, t)
{
switch (t) {
case DataType::AUDIO:
{
switch (t) {
case DataType::AUDIO:
@@
-160,7
+162,9
@@
GlobalPortMatrixWindow::GlobalPortMatrixWindow (Session* s, DataType t)
break;
}
break;
}
- get_vbox()->pack_start (_port_matrix, true, true);
+ signal_key_press_event().connect (sigc::mem_fun (_port_matrix, &PortMatrix::key_press));
+
+ add (_port_matrix);
_port_matrix.show ();
}
_port_matrix.show ();
}
@@
-176,6
+180,19
@@
void
GlobalPortMatrixWindow::set_session (Session* s)
{
_port_matrix.set_session (s);
GlobalPortMatrixWindow::set_session (Session* s)
{
_port_matrix.set_session (s);
+
+ if (!s) {
+ hide ();
+ }
+}
+
+void
+GlobalPortMatrix::set_session (Session *s)
+{
+ SessionHandlePtr::set_session (s);
+ if (!s) return;
+ setup_all_ports ();
+ init();
}
string
}
string