diff --git a/src/kits/media/MediaRoster.cpp b/src/kits/media/MediaRoster.cpp index 542433c9bc..4bf4094819 100644 --- a/src/kits/media/MediaRoster.cpp +++ b/src/kits/media/MediaRoster.cpp @@ -1877,7 +1877,7 @@ BMediaRosterEx::RegisterNode(BMediaNode* node, media_addon_id addOnID, int32 testFlavorID; BMediaAddOn* addon = node->AddOn(&testFlavorID); - ASSERT(addOnID == addon != NULL ? addon->AddonID() : -1); + ASSERT(addOnID == (addon != NULL ? addon->AddonID() : -1)); ASSERT(flavorID == testFlavorID); ); diff --git a/src/kits/media/SoundPlayer.cpp b/src/kits/media/SoundPlayer.cpp index 904c334bec..541bf17abc 100644 --- a/src/kits/media/SoundPlayer.cpp +++ b/src/kits/media/SoundPlayer.cpp @@ -249,7 +249,7 @@ BSoundPlayer::Stop(bool block, bool flush) for (tries = 250; fPlayerNode->IsPlaying() && tries != 0; tries--) snooze(2000); - DEBUG_ONLY(if (maxtrys == 0) + DEBUG_ONLY(if (tries == 0) TRACE("BSoundPlayer::Stop: waiting for node stop failed\n")); // Wait until all buffers on the way to the physical output have been diff --git a/src/kits/media/TimeSourceObject.cpp b/src/kits/media/TimeSourceObject.cpp index 3401d80904..791a366b4a 100644 --- a/src/kits/media/TimeSourceObject.cpp +++ b/src/kits/media/TimeSourceObject.cpp @@ -84,10 +84,10 @@ TimeSourceObject::DeleteHook(BMediaNode* node) // ERROR("TimeSourceObject::DeleteHook: system time source clone delete hook called\n"); // return B_ERROR; // } - PRINT("TimeSourceObject::DeleteHook enter\n"); + PRINT(1, "TimeSourceObject::DeleteHook enter\n"); gTimeSourceObjectManager->ObjectDeleted(this); status_t status = BTimeSource::DeleteHook(node); - PRINT("TimeSourceObject::DeleteHook leave\n"); + PRINT(1, "TimeSourceObject::DeleteHook leave\n"); return status; } diff --git a/src/kits/media/TimeSourceObjectManager.cpp b/src/kits/media/TimeSourceObjectManager.cpp index c50a6ee887..e934eb7cb3 100644 --- a/src/kits/media/TimeSourceObjectManager.cpp +++ b/src/kits/media/TimeSourceObjectManager.cpp @@ -67,7 +67,8 @@ TimeSourceObjectManager::GetTimeSource(const media_node& node) CALLED(); BAutolock _(this); - PRINT("TimeSourceObjectManager::GetTimeSource, node id %ld\n", node.node); + PRINT(1, "TimeSourceObjectManager::GetTimeSource, node id %ld\n", + node.node); NodeMap::iterator found = fMap.find(node.node); if (found != fMap.end()) @@ -91,7 +92,7 @@ TimeSourceObjectManager::ObjectDeleted(BTimeSource* timeSource) CALLED(); BAutolock _(this); - PRINT("TimeSourceObjectManager::ObjectDeleted, node id %ld\n", + PRINT(1, "TimeSourceObjectManager::ObjectDeleted, node id %ld\n", timeSource->ID()); fMap.erase(timeSource->ID());