Skip to content

Commit 9b4d525

Browse files
committed
Changed to use mutex from threading.h
1 parent 8c37f2f commit 9b4d525

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

examples/protonect/include/libfreenect2/usb/transfer_pool.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
#include <deque>
3131
#include <libusb.h>
32-
#include <mutex>
32+
#include <libfreenect2/threading.h>
3333

3434
#include <libfreenect2/data_callback.h>
3535

@@ -71,7 +71,8 @@ class TransferPool
7171
libusb_device_handle *device_handle_;
7272
unsigned char device_endpoint_;
7373

74-
std::mutex pending_transfers_lock_;
74+
mutex pending_transfers_lock_;
75+
mutex idle_transfers_lock_;
7576
TransferQueue idle_transfers_, pending_transfers_;
7677
unsigned char *buffer_;
7778
size_t buffer_size_;

examples/protonect/src/transfer_pool.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,13 @@ void TransferPool::disableSubmission()
6060

6161
void TransferPool::deallocate()
6262
{
63+
idle_transfers_lock_.lock();
6364
for(TransferQueue::iterator it = idle_transfers_.begin(); it != idle_transfers_.end(); ++it)
6465
{
6566
libusb_free_transfer(*it);
6667
}
68+
idle_transfers_lock_.unlock();
69+
6770
idle_transfers_.clear();
6871

6972
if(buffer_ != 0)

0 commit comments

Comments
 (0)