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

media_kit: Fix style as suggested in ml

Browse Source
This commit is contained in:
Dario Casalinuovo
2015-07-24 20:09:08 +02:00
parent 3108062744
commit d009f28613
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/media/MediaRoster.cpp
+5 -7
View File
@@ -118,9 +118,9 @@ BMediaRosterEx::BMediaRosterEx(status_t* _error)
InitRosterDataExchange(BMessenger(this, this)); InitRosterDataExchange(BMessenger(this, this));
if (be_roster->StartWatching(BMessenger(this, this), if (be_roster->StartWatching(BMessenger(this, this),
B_REQUEST_LAUNCHED | B_REQUEST_QUIT) != B_OK) B_REQUEST_LAUNCHED | B_REQUEST_QUIT) != B_OK) {
*_error = B_ERROR; *_error = B_ERROR;
}
sServerIsUp = BMediaRoster::IsRunning(); sServerIsUp = BMediaRoster::IsRunning();
} }
@@ -3262,10 +3262,8 @@ BMediaRoster::GetInstancesFor(media_addon_id addon, int32 flavor,
bool bool
BMediaRoster::IsRunning() BMediaRoster::IsRunning()
{ {
if (be_roster->IsRunning(B_MEDIA_SERVER_SIGNATURE) return be_roster->IsRunning(B_MEDIA_SERVER_SIGNATURE)
&& be_roster->IsRunning(B_MEDIA_ADDON_SERVER_SIGNATURE)) && be_roster->IsRunning(B_MEDIA_ADDON_SERVER_SIGNATURE);
return true;
return false;
} }
src/servers/media/media_server.cpp
+4 -4
View File
@@ -116,8 +116,8 @@ ServerApp::ServerApp()
BMediaRoster* roster = BMediaRoster::Roster(); BMediaRoster* roster = BMediaRoster::Roster();
if (roster->StartWatching(BMessenger(this, this), if (roster->StartWatching(BMessenger(this, this),
B_MEDIA_SERVER_QUIT) != B_OK) { B_MEDIA_SERVER_QUIT) != B_OK) {
TRACE("ServerApp: can't watch for B_MEDIA_SERVER_QUIT"); TRACE("ServerApp: can't watch for B_MEDIA_SERVER_QUIT");
} }
} }
@@ -138,8 +138,8 @@ ServerApp::~ServerApp()
BMediaRoster* roster = BMediaRoster::CurrentRoster(); BMediaRoster* roster = BMediaRoster::CurrentRoster();
if (roster->StopWatching(BMessenger(this, this), if (roster->StopWatching(BMessenger(this, this),
B_MEDIA_SERVER_QUIT) != B_OK) { B_MEDIA_SERVER_QUIT) != B_OK) {
TRACE("ServerApp: can't unwatch for B_MEDIA_SERVER_QUIT"); TRACE("ServerApp: can't unwatch for B_MEDIA_SERVER_QUIT");
} }
} }