osc: Removed timed_wait.

diff --git a/protocol/osc/client.cpp b/protocol/osc/client.cpp
index ef774052fe1916d377934b4d8ed7c2407a97c8fa..b9ac59dca82468b60704734e5e24493ddd60d99d 100644 (file)
--- a/protocol/osc/client.cpp
+++ b/protocol/osc/client.cpp
@@ -156,33 +156,25 @@ public:
 
                        boost::unique_lock<boost::mutex> cond_lock(cond_mutex_);
                                        
-                       if(cond_.timed_wait(cond_lock, boost::posix_time::milliseconds(500)))
-                       {                                       
-                               auto& updates = updates_[(++updates_counter_ - 1) % 1];
+                       cond_.wait(cond_lock);
+                               
+                       auto& updates = updates_[(++updates_counter_ - 1) % 1];
 
-                               BOOST_FOREACH(auto& slot, updates)              
-                               {
-                                       if(slot.second.empty())
-                                               continue;
+                       BOOST_FOREACH(auto& slot, updates)              
+                       {
+                               if(slot.second.empty())
+                                       continue;
 
-                                       auto it = state.lower_bound(slot.first);
-                                       if(it == std::end(state) || state.key_comp()(slot.first, it->first))
-                                               it = state.insert(it, std::make_pair(slot.first, slot.second));
-                                       else
-                                               std::swap(it->second, slot.second);
+                               auto it = state.lower_bound(slot.first);
+                               if(it == std::end(state) || state.key_comp()(slot.first, it->first))
+                                       it = state.insert(it, std::make_pair(slot.first, slot.second));
+                               else
+                                       std::swap(it->second, slot.second);
 
-                                       slot.second.clear();
+                               slot.second.clear();
 
-                                       buffers.push_back(boost::asio::buffer(it->second));
-                               }
+                               buffers.push_back(boost::asio::buffer(it->second));
                        }
-                       else
-                       {
-                               BOOST_FOREACH(auto& slot, state)                
-                               {
-                                       buffers.push_back(boost::asio::buffer(slot.second));
-                               }
-                       }               
 
                        if(!buffers.empty())
                                socket_.send_to(buffers, endpoint_);