summaryrefslogtreecommitdiff
path: root/libs/pbd
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2012-04-24 02:28:51 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2012-04-24 02:28:51 +0000
commit33140f32671576a285d62f529447f941f96313fc (patch)
tree44faee5b21e3181077d0c22180895fb072432a53 /libs/pbd
parent10d37fecc1b54487a5fb0f3652bfb45a5224ef8b (diff)
add support for IP MIDI (multicast MIDI over IP UDP sockets) to ardour and use it if requested inside MCP code. required renaming the pre-existing MIDI::Port as MIDI:JackMIDIPort - MIDI::Port becomes the base type for both JackMIDIPort and IPMIDIPort
git-svn-id: svn://localhost/ardour2/branches/3.0@12069 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/pbd')
-rw-r--r--libs/pbd/base_ui.cc4
-rw-r--r--libs/pbd/crossthread.cc1
2 files changed, 4 insertions, 1 deletions
diff --git a/libs/pbd/base_ui.cc b/libs/pbd/base_ui.cc
index d56e4a31a4..e3b34a6df2 100644
--- a/libs/pbd/base_ui.cc
+++ b/libs/pbd/base_ui.cc
@@ -74,7 +74,9 @@ BaseUI::main_thread ()
{
set_event_loop_for_thread (this);
thread_init ();
+ std::cerr << pthread_self() << ' ' << _name << " running event loop\n";
_main_loop->run ();
+ std::cerr << pthread_self() << ' ' << _name << " event loop finished\n";
}
void
@@ -104,7 +106,7 @@ BaseUI::quit ()
bool
BaseUI::request_handler (Glib::IOCondition ioc)
{
- /* check the transport request pipe */
+ /* check the request pipe */
if (ioc & ~IO_IN) {
_main_loop->quit ();
diff --git a/libs/pbd/crossthread.cc b/libs/pbd/crossthread.cc
index 553c8d52f3..07a732954b 100644
--- a/libs/pbd/crossthread.cc
+++ b/libs/pbd/crossthread.cc
@@ -81,6 +81,7 @@ RefPtr<IOSource>
CrossThreadChannel::ios ()
{
if (!_ios) {
+ std::cerr << "New x-channel fd " << fds[0] << std::endl;
_ios = new RefPtr<IOSource> (IOSource::create (fds[0], IOCondition(IO_IN|IO_PRI|IO_ERR|IO_HUP|IO_NVAL)));
}
return *_ios;