comparison data/osc/OSCQueue.cpp @ 1599:ce185d4dd408 bqaudiostream

Merge from default branch
author Chris Cannam
date Wed, 23 Jan 2019 14:43:43 +0000
parents 70e172e6cc59
children 813dadf7c086
comparison
equal deleted inserted replaced
1598:d2555df635ec 1599:ce185d4dd408
89 89
90 #endif 90 #endif
91 91
92 OSCQueue::OSCQueue() : 92 OSCQueue::OSCQueue() :
93 #ifdef HAVE_LIBLO 93 #ifdef HAVE_LIBLO
94 m_thread(0), 94 m_thread(nullptr),
95 #endif 95 #endif
96 m_buffer(OSC_MESSAGE_QUEUE_SIZE) 96 m_buffer(OSC_MESSAGE_QUEUE_SIZE)
97 { 97 {
98 Profiler profiler("OSCQueue::OSCQueue"); 98 Profiler profiler("OSCQueue::OSCQueue");
99 99
100 #ifdef HAVE_LIBLO 100 #ifdef HAVE_LIBLO
101 m_thread = lo_server_thread_new(NULL, oscError); 101 m_thread = lo_server_thread_new(nullptr, oscError);
102 102
103 lo_server_thread_add_method(m_thread, NULL, NULL, 103 lo_server_thread_add_method(m_thread, nullptr, nullptr,
104 oscMessageHandler, this); 104 oscMessageHandler, this);
105 105
106 lo_server_thread_start(m_thread); 106 lo_server_thread_start(m_thread);
107 107
108 cout << "OSCQueue::OSCQueue: Base OSC URL is " 108 cout << "OSCQueue::OSCQueue: Base OSC URL is "
125 125
126 bool 126 bool
127 OSCQueue::isOK() const 127 OSCQueue::isOK() const
128 { 128 {
129 #ifdef HAVE_LIBLO 129 #ifdef HAVE_LIBLO
130 return (m_thread != 0); 130 return (m_thread != nullptr);
131 #else 131 #else
132 return false; 132 return false;
133 #endif 133 #endif
134 } 134 }
135 135