i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BMediaRoster::Roster Use BAutolock

Browse Source
This commit is contained in:
Dario Casalinuovo
2015-08-28 18:27:16 +02:00
parent be7d9d3f5d
commit d15321ff90
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/media/MediaRoster.cpp
+8 -3
View File
@@ -44,6 +44,7 @@ char __dont_remove_copyright_from_binary[] = "Copyright (c) 2002-2006 Marcus "
#include <new> #include <new>
#include <Autolock.h>
#include <BufferConsumer.h> #include <BufferConsumer.h>
#include <BufferProducer.h> #include <BufferProducer.h>
#include <Locker.h> #include <Locker.h>
@@ -83,6 +84,7 @@ struct RosterNotification {
static bool sServerIsUp = false; static bool sServerIsUp = false;
static List<RosterNotification> sNotificationList; static List<RosterNotification> sNotificationList;
static BLocker sInitLocker("BMediaRoster::Roster locker");
} // namespace media } // namespace media
} // namespace BPrivate } // namespace BPrivate
@@ -2188,10 +2190,14 @@ BMediaRoster::UnregisterNode(BMediaNode* node)
/*static*/ BMediaRoster* /*static*/ BMediaRoster*
BMediaRoster::Roster(status_t* out_error) BMediaRoster::Roster(status_t* out_error)
{ {
static BLocker locker("BMediaRoster::Roster locker"); BAutolock lock(sInitLocker);
locker.Lock();
if (!lock.IsLocked())
return NULL;
if (out_error) if (out_error)
*out_error = B_OK; *out_error = B_OK;
if (sDefaultInstance == NULL) { if (sDefaultInstance == NULL) {
status_t err; status_t err;
sDefaultInstance = new (std::nothrow) BMediaRosterEx(&err); sDefaultInstance = new (std::nothrow) BMediaRosterEx(&err);
@@ -2207,7 +2213,6 @@ BMediaRoster::Roster(status_t* out_error)
*out_error = err; *out_error = err;
} }
} }
locker.Unlock();
return sDefaultInstance; return sDefaultInstance;
} }