[haiku-commits] r34619 - haiku/trunk/src/kits/media

From: ingo_weinhold@xxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Thu, 10 Dec 2009 17:01:49 +0100 (CET)
Author: bonefish
Date: 2009-12-10 17:01:48 +0100 (Thu, 10 Dec 2009)
New Revision: 34619
Changeset: http://dev.haiku-os.org/changeset/34619/haiku

Modified:
   haiku/trunk/src/kits/media/MediaRoster.cpp
   haiku/trunk/src/kits/media/SoundPlayer.cpp
   haiku/trunk/src/kits/media/TimeSourceObject.cpp
   haiku/trunk/src/kits/media/TimeSourceObjectManager.cpp
Log:
Debug mode build fixes.


Modified: haiku/trunk/src/kits/media/MediaRoster.cpp
===================================================================
--- haiku/trunk/src/kits/media/MediaRoster.cpp  2009-12-10 16:00:42 UTC (rev 
34618)
+++ haiku/trunk/src/kits/media/MediaRoster.cpp  2009-12-10 16:01:48 UTC (rev 
34619)
@@ -1877,7 +1877,7 @@
                int32 testFlavorID;
                BMediaAddOn* addon = node->AddOn(&testFlavorID);
 
-               ASSERT(addOnID == addon != NULL ? addon->AddonID() : -1);
+               ASSERT(addOnID == (addon != NULL ? addon->AddonID() : -1));
                ASSERT(flavorID == testFlavorID);
        );
 

Modified: haiku/trunk/src/kits/media/SoundPlayer.cpp
===================================================================
--- haiku/trunk/src/kits/media/SoundPlayer.cpp  2009-12-10 16:00:42 UTC (rev 
34618)
+++ haiku/trunk/src/kits/media/SoundPlayer.cpp  2009-12-10 16:01:48 UTC (rev 
34619)
@@ -249,7 +249,7 @@
                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

Modified: haiku/trunk/src/kits/media/TimeSourceObject.cpp
===================================================================
--- haiku/trunk/src/kits/media/TimeSourceObject.cpp     2009-12-10 16:00:42 UTC 
(rev 34618)
+++ haiku/trunk/src/kits/media/TimeSourceObject.cpp     2009-12-10 16:01:48 UTC 
(rev 34619)
@@ -84,10 +84,10 @@
 //             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;
 }
 

Modified: haiku/trunk/src/kits/media/TimeSourceObjectManager.cpp
===================================================================
--- haiku/trunk/src/kits/media/TimeSourceObjectManager.cpp      2009-12-10 
16:00:42 UTC (rev 34618)
+++ haiku/trunk/src/kits/media/TimeSourceObjectManager.cpp      2009-12-10 
16:01:48 UTC (rev 34619)
@@ -67,7 +67,8 @@
        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 @@
        CALLED();
        BAutolock _(this);
 
-       PRINT("TimeSourceObjectManager::ObjectDeleted, node id %ld\n",
+       PRINT(1, "TimeSourceObjectManager::ObjectDeleted, node id %ld\n",
                timeSource->ID());
 
        fMap.erase(timeSource->ID());
[haiku-commits] r34619 - haiku/trunk/src/kits/media

Other related posts:
