From d009f2861397a85c95776afb615ff2c6f50723f8 Mon Sep 17 00:00:00 2001 From: Dario Casalinuovo Date: Fri, 24 Jul 2015 19:29:26 +0200 Subject: [PATCH] media_kit: Fix style as suggested in ml --- src/kits/media/MediaRoster.cpp | 12 +++++------- src/servers/media/media_server.cpp | 8 ++++---- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/kits/media/MediaRoster.cpp b/src/kits/media/MediaRoster.cpp index 42c3a32a33..012a218d82 100644 --- a/src/kits/media/MediaRoster.cpp +++ b/src/kits/media/MediaRoster.cpp @@ -118,9 +118,9 @@ BMediaRosterEx::BMediaRosterEx(status_t* _error) InitRosterDataExchange(BMessenger(this, this)); if (be_roster->StartWatching(BMessenger(this, this), - B_REQUEST_LAUNCHED | B_REQUEST_QUIT) != B_OK) - *_error = B_ERROR; - + B_REQUEST_LAUNCHED | B_REQUEST_QUIT) != B_OK) { + *_error = B_ERROR; + } sServerIsUp = BMediaRoster::IsRunning(); } @@ -3262,10 +3262,8 @@ BMediaRoster::GetInstancesFor(media_addon_id addon, int32 flavor, bool BMediaRoster::IsRunning() { - if (be_roster->IsRunning(B_MEDIA_SERVER_SIGNATURE) - && be_roster->IsRunning(B_MEDIA_ADDON_SERVER_SIGNATURE)) - return true; - return false; + return be_roster->IsRunning(B_MEDIA_SERVER_SIGNATURE) + && be_roster->IsRunning(B_MEDIA_ADDON_SERVER_SIGNATURE); } diff --git a/src/servers/media/media_server.cpp b/src/servers/media/media_server.cpp index c023bfc8cc..241c1148e5 100644 --- a/src/servers/media/media_server.cpp +++ b/src/servers/media/media_server.cpp @@ -116,8 +116,8 @@ ServerApp::ServerApp() BMediaRoster* roster = BMediaRoster::Roster(); if (roster->StartWatching(BMessenger(this, this), - B_MEDIA_SERVER_QUIT) != B_OK) { - TRACE("ServerApp: can't watch for B_MEDIA_SERVER_QUIT"); + B_MEDIA_SERVER_QUIT) != B_OK) { + TRACE("ServerApp: can't watch for B_MEDIA_SERVER_QUIT"); } } @@ -138,8 +138,8 @@ ServerApp::~ServerApp() BMediaRoster* roster = BMediaRoster::CurrentRoster(); if (roster->StopWatching(BMessenger(this, this), - B_MEDIA_SERVER_QUIT) != B_OK) { - TRACE("ServerApp: can't unwatch for B_MEDIA_SERVER_QUIT"); + B_MEDIA_SERVER_QUIT) != B_OK) { + TRACE("ServerApp: can't unwatch for B_MEDIA_SERVER_QUIT"); } }