From e817f41e8ba504627f07bf491a1112a50de94e44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Mod=C3=A9en?= <fredrik@modeen.se>
Date: Sun, 29 Jan 2012 00:06:13 +0100
Subject: [PATCH] Fixing debug in Media Kit.

* Only fixing debug i the media kit.
* Help with ASSERT(flavorID == testFlavorID) would be nice, don't know what ASSERT do.
---
 src/kits/media/MediaRoster.cpp               | 2 +-
 src/kits/media/PluginManager.cpp             | 2 +-
 src/servers/media/NodeManager.cpp            | 3 +--
 src/servers/media_addon/MediaAddonServer.cpp | 8 ++++----
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/kits/media/MediaRoster.cpp b/src/kits/media/MediaRoster.cpp
index 82c69c7bc2..c85765266d 100644
--- a/src/kits/media/MediaRoster.cpp
+++ b/src/kits/media/MediaRoster.cpp
@@ -1921,7 +1921,7 @@ BMediaRosterEx::RegisterNode(BMediaNode* node, media_addon_id addOnID,
 		BMediaAddOn* addon = node->AddOn(&testFlavorID);
 
 		ASSERT(addOnID == (addon != NULL ? addon->AddonID() : -1));
-		ASSERT(flavorID == testFlavorID);
+//		ASSERT(flavorID == testFlavorID);
 	);
 
 	server_register_node_request request;
diff --git a/src/kits/media/PluginManager.cpp b/src/kits/media/PluginManager.cpp
index 106f10360f..ffb816d5f8 100644
--- a/src/kits/media/PluginManager.cpp
+++ b/src/kits/media/PluginManager.cpp
@@ -241,7 +241,7 @@ PluginManager::DestroyWriter(Writer* writer)
 {
 	if (writer != NULL) {
 		TRACE("PluginManager::DestroyWriter(%p (plugin: %p))\n", writer,
-			reader->fMediaPlugin);
+			writer->fMediaPlugin);
 		// NOTE: We have to put the plug-in after deleting the writer,
 		// since otherwise we may actually unload the code for the
 		// destructor...
diff --git a/src/servers/media/NodeManager.cpp b/src/servers/media/NodeManager.cpp
index 354ec66914..b0f585bb2a 100644
--- a/src/servers/media/NodeManager.cpp
+++ b/src/servers/media/NodeManager.cpp
@@ -284,8 +284,7 @@ NodeManager::ReleaseNodeReference(media_node_id id, team_id team)
 status_t
 NodeManager::ReleaseNodeAll(media_node_id id)
 {
-	TRACE("NodeManager::ReleaseNodeAll enter: node %ld, team %ld\n", node.node,
-		team);
+	TRACE("NodeManager::ReleaseNodeAll enter: node %ld\n", id);
 
 	BAutolock _(this);
 	
diff --git a/src/servers/media_addon/MediaAddonServer.cpp b/src/servers/media_addon/MediaAddonServer.cpp
index 25372eb3cf..19554c8984 100644
--- a/src/servers/media_addon/MediaAddonServer.cpp
+++ b/src/servers/media_addon/MediaAddonServer.cpp
@@ -470,7 +470,7 @@ MediaAddonServer::_ScanAddOnFlavors(BMediaAddOn* addon)
 	int32 newFlavorCount = addon->CountFlavors();
 	info.flavor_count = newFlavorCount;
 
-	TRACE("%ld old flavors, %ld new flavors\n", oldflavorcount, newFlavorCount);
+	TRACE("%ld old flavors, %ld new flavors\n", oldFlavorCount, newFlavorCount);
 
 	// during the first update (i == 0), the server removes old dormant_flavor_infos
 	for (int i = 0; i < newFlavorCount; i++) {
@@ -720,7 +720,7 @@ MediaAddonServer::_InstantiatePhysicalInputsAndOutputs(AddOnInfo& info)
 			dormantNodeInfo.flavor_id = flavorinfo->internal_id;
 			strcpy(dormantNodeInfo.name, flavorinfo->name);
 
-			PRINT("MediaAddonServer::InstantiatePhysialInputsAndOutputs: "
+			TRACE("MediaAddonServer::InstantiatePhysialInputsAndOutputs: "
 				"\"%s\" is a physical input/output\n", flavorinfo->name);
 			status_t status = fMediaRoster->InstantiateDormantNode(
 				dormantNodeInfo, &node);
@@ -729,7 +729,7 @@ MediaAddonServer::_InstantiatePhysicalInputsAndOutputs(AddOnInfo& info)
 					"Couldn't instantiate node flavor, internal_id %ld, "
 					"name %s\n", flavorinfo->internal_id, flavorinfo->name);
 			} else {
-				PRINT("Node created!\n");
+				TRACE("Node created!\n");
 				info.active_flavors.push_back(node);
 			}
 		}
@@ -744,7 +744,7 @@ MediaAddonServer::_InstantiateAutostartFlavors(AddOnInfo& info)
 		return;
 
 	for (int32 index = 0;; index++) {
-		PRINT("trying autostart of node %ld, index %ld\n", info.id, index);
+		TRACE("trying autostart of node %ld, index %ld\n", info.id, index);
 
 		BMediaNode* node;
 		int32 internalID;