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

[Summary] Fixed MAC build

Browse source
This commit is contained in:
GZharun 2014-11-25 18:11:13 +02:00
parent bd7c257625
commit f40f680bcc
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libs/pbd/crossthread.cc
View file

@ -34,7 +34,6 @@ using namespace Glib;
CrossThreadChannel::CrossThreadChannel (bool non_blocking)
{
_ios = 0;
fds[0] = -1;
fds[1] = -1;
@ -83,7 +82,7 @@ RefPtr<IOSource>
CrossThreadChannel::ios ()
{
if (!_ios) {
_ios.reset (IOSource::create (fds[0], IOCondition(IO_IN|IO_PRI|IO_ERR|IO_HUP|IO_NVAL)));
_ios = IOSource::create (fds[0], IOCondition(IO_IN|IO_PRI|IO_ERR|IO_HUP|IO_NVAL));
}
return _ios;
}
@ -97,9 +96,8 @@ CrossThreadChannel::drop_ios ()
void
CrossThreadChannel::drain ()
{
/* drain selectable fd */
char buf[64];
while (::read (fd, buf, sizeof (buf)) > 0) {};
while (::read (fds[0], buf, sizeof (buf)) > 0) {};
}
int

2
libs/pbd/pbd/crossthread.h
View file

@ -88,8 +88,8 @@ class LIBPBD_API CrossThreadChannel {
*/
Glib::RefPtr<Glib::IOSource> ios();
void drop_ios ();
private:
void drop_ios ();
Glib::RefPtr<Glib::IOSource> _ios; // lazily constructed
#ifndef PLATFORM_WINDOWS