From 3cd8138a419cb165f56070ace0b21a1e63ec5a43 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 25 Jul 2012 17:48:55 +0000 Subject: convert from Glib:: to Glib::Threads for all thread-related API git-svn-id: svn://localhost/ardour2/branches/3.0@13084 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/bundle.cc | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'libs/ardour/bundle.cc') diff --git a/libs/ardour/bundle.cc b/libs/ardour/bundle.cc index 5040882b7a..f38fe0c42f 100644 --- a/libs/ardour/bundle.cc +++ b/libs/ardour/bundle.cc @@ -67,7 +67,7 @@ Bundle::Bundle (boost::shared_ptr other) ChanCount Bundle::nchannels () const { - Glib::Mutex::Lock lm (_channel_mutex); + Glib::Threads::Mutex::Lock lm (_channel_mutex); ChanCount c; for (vector::const_iterator i = _channel.begin(); i != _channel.end(); ++i) { @@ -82,7 +82,7 @@ Bundle::channel_ports (uint32_t c) const { assert (c < nchannels().n_total()); - Glib::Mutex::Lock lm (_channel_mutex); + Glib::Threads::Mutex::Lock lm (_channel_mutex); return _channel[c].ports; } @@ -97,7 +97,7 @@ Bundle::add_port_to_channel (uint32_t ch, string portname) assert (portname.find_first_of (':') != string::npos); { - Glib::Mutex::Lock lm (_channel_mutex); + Glib::Threads::Mutex::Lock lm (_channel_mutex); _channel[ch].ports.push_back (portname); } @@ -116,7 +116,7 @@ Bundle::remove_port_from_channel (uint32_t ch, string portname) bool changed = false; { - Glib::Mutex::Lock lm (_channel_mutex); + Glib::Threads::Mutex::Lock lm (_channel_mutex); PortList& pl = _channel[ch].ports; PortList::iterator i = find (pl.begin(), pl.end(), portname); @@ -142,7 +142,7 @@ Bundle::set_port (uint32_t ch, string portname) assert (portname.find_first_of (':') != string::npos); { - Glib::Mutex::Lock lm (_channel_mutex); + Glib::Threads::Mutex::Lock lm (_channel_mutex); _channel[ch].ports.clear (); _channel[ch].ports.push_back (portname); } @@ -155,7 +155,7 @@ void Bundle::add_channel (std::string const & n, DataType t) { { - Glib::Mutex::Lock lm (_channel_mutex); + Glib::Threads::Mutex::Lock lm (_channel_mutex); _channel.push_back (Channel (n, t)); } @@ -167,7 +167,7 @@ void Bundle::add_channel (std::string const & n, DataType t, PortList p) { { - Glib::Mutex::Lock lm (_channel_mutex); + Glib::Threads::Mutex::Lock lm (_channel_mutex); _channel.push_back (Channel (n, t, p)); } @@ -179,7 +179,7 @@ void Bundle::add_channel (std::string const & n, DataType t, std::string const & p) { { - Glib::Mutex::Lock lm (_channel_mutex); + Glib::Threads::Mutex::Lock lm (_channel_mutex); _channel.push_back (Channel (n, t, p)); } @@ -191,7 +191,7 @@ Bundle::port_attached_to_channel (uint32_t ch, std::string portname) { assert (ch < nchannels().n_total()); - Glib::Mutex::Lock lm (_channel_mutex); + Glib::Threads::Mutex::Lock lm (_channel_mutex); return (std::find (_channel[ch].ports.begin (), _channel[ch].ports.end (), portname) != _channel[ch].ports.end ()); } @@ -203,7 +203,7 @@ Bundle::remove_channel (uint32_t ch) { assert (ch < nchannels().n_total()); - Glib::Mutex::Lock lm (_channel_mutex); + Glib::Threads::Mutex::Lock lm (_channel_mutex); _channel.erase (_channel.begin () + ch); } @@ -211,7 +211,7 @@ Bundle::remove_channel (uint32_t ch) void Bundle::remove_channels () { - Glib::Mutex::Lock lm (_channel_mutex); + Glib::Threads::Mutex::Lock lm (_channel_mutex); _channel.clear (); } @@ -222,7 +222,7 @@ Bundle::remove_channels () bool Bundle::offers_port (std::string p) const { - Glib::Mutex::Lock lm (_channel_mutex); + Glib::Threads::Mutex::Lock lm (_channel_mutex); for (std::vector::const_iterator i = _channel.begin(); i != _channel.end(); ++i) { for (PortList::const_iterator j = i->ports.begin(); j != i->ports.end(); ++j) { @@ -241,7 +241,7 @@ Bundle::offers_port (std::string p) const bool Bundle::offers_port_alone (std::string p) const { - Glib::Mutex::Lock lm (_channel_mutex); + Glib::Threads::Mutex::Lock lm (_channel_mutex); for (std::vector::const_iterator i = _channel.begin(); i != _channel.end(); ++i) { if (i->ports.size() == 1 && i->ports[0] == p) { @@ -261,7 +261,7 @@ Bundle::channel_name (uint32_t ch) const { assert (ch < nchannels().n_total()); - Glib::Mutex::Lock lm (_channel_mutex); + Glib::Threads::Mutex::Lock lm (_channel_mutex); return _channel[ch].name; } @@ -275,7 +275,7 @@ Bundle::set_channel_name (uint32_t ch, std::string const & n) assert (ch < nchannels().n_total()); { - Glib::Mutex::Lock lm (_channel_mutex); + Glib::Threads::Mutex::Lock lm (_channel_mutex); _channel[ch].name = n; } @@ -351,7 +351,7 @@ void Bundle::remove_ports_from_channels () { { - Glib::Mutex::Lock lm (_channel_mutex); + Glib::Threads::Mutex::Lock lm (_channel_mutex); for (uint32_t c = 0; c < _channel.size(); ++c) { _channel[c].ports.clear (); } @@ -370,7 +370,7 @@ Bundle::remove_ports_from_channel (uint32_t ch) assert (ch < nchannels().n_total()); { - Glib::Mutex::Lock lm (_channel_mutex); + Glib::Threads::Mutex::Lock lm (_channel_mutex); _channel[ch].ports.clear (); } @@ -517,7 +517,7 @@ Bundle::channel_type (uint32_t c) const { assert (c < nchannels().n_total()); - Glib::Mutex::Lock lm (_channel_mutex); + Glib::Threads::Mutex::Lock lm (_channel_mutex); return _channel[c].type; } @@ -564,7 +564,7 @@ Bundle::type_channel_to_overall (DataType t, uint32_t c) const return c; } - Glib::Mutex::Lock lm (_channel_mutex); + Glib::Threads::Mutex::Lock lm (_channel_mutex); vector::const_iterator i = _channel.begin (); @@ -598,7 +598,7 @@ Bundle::overall_channel_to_type (DataType t, uint32_t c) const return c; } - Glib::Mutex::Lock lm (_channel_mutex); + Glib::Threads::Mutex::Lock lm (_channel_mutex); uint32_t s = 0; -- cgit v1.2.3