From 618b1338cc4b9a927de4b6c68c2dd378fcb9679e Mon Sep 17 00:00:00 2001 From: beveloper Date: Tue, 10 Dec 2002 18:24:15 +0000 Subject: [PATCH] cleanup git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2220 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/media/DormantNodeManager.cpp | 6 +++--- src/kits/media/MediaRoster.cpp | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/kits/media/DormantNodeManager.cpp b/src/kits/media/DormantNodeManager.cpp index 6c43748067..9f79813dd9 100644 --- a/src/kits/media/DormantNodeManager.cpp +++ b/src/kits/media/DormantNodeManager.cpp @@ -160,7 +160,7 @@ DormantNodeManager::PutAddon(media_addon_id id) UnloadAddon(addon, image); } - +// For use by media_addon_server only media_addon_id DormantNodeManager::RegisterAddon(const char *path) { @@ -203,7 +203,7 @@ DormantNodeManager::RegisterAddon(const char *path) return reply.addonid; } - +// For use by media_addon_server only void DormantNodeManager::UnregisterAddon(media_addon_id id) { @@ -284,7 +284,7 @@ DormantNodeManager::LoadAddon(BMediaAddOn **newaddon, image_id *newimage, const *newaddon = addon; *newimage = image; - // we are a friend class of BMediaAddOn and initilize these member variables + // we are a friend class of BMediaAddOn and initialize these member variables addon->fAddon = id; addon->fImage = image; diff --git a/src/kits/media/MediaRoster.cpp b/src/kits/media/MediaRoster.cpp index 1afb41bf24..4260738853 100644 --- a/src/kits/media/MediaRoster.cpp +++ b/src/kits/media/MediaRoster.cpp @@ -1524,7 +1524,7 @@ BMediaRoster::InstantiateDormantNode(const dormant_node_info & in_info, { CALLED(); if ((flags & (B_FLAVOR_IS_GLOBAL | B_FLAVOR_IS_LOCAL)) == 0) { - printf("Error: BMediaRoster::InstantiateDormantNode called without flags\n"); + FATAL("Error: BMediaRoster::InstantiateDormantNode called without valid flags\n"); return B_BAD_VALUE; } if (out_node == 0) @@ -1559,7 +1559,7 @@ BMediaRoster::InstantiateDormantNode(const dormant_node_info & in_info, } // XXX SOMETHING IS VERY WRONG HERE - printf("Error: BMediaRoster::InstantiateDormantNode addon_id %d, flavor_id %d, flags %#08lx\n", (int)in_info.addon, (int)in_info.flavor_id, flags); + FATAL("Error: BMediaRoster::InstantiateDormantNode addon_id %d, flavor_id %d, flags %#08lx\n", (int)in_info.addon, (int)in_info.flavor_id, flags); return B_ERROR; } @@ -1590,7 +1590,7 @@ BMediaRoster::InstantiateDormantNode(const dormant_node_info & in_info, status_t rv; addon = _DormantNodeManager->GetAddon(in_info.addon); if (!addon) { - printf("BMediaRoster::InstantiateDormantNode: GetAddon failed\n"); + FATAL("BMediaRoster::InstantiateDormantNode: GetAddon failed\n"); return B_ERROR; } flavor_info temp; // XXX fix this! @@ -1599,13 +1599,13 @@ BMediaRoster::InstantiateDormantNode(const dormant_node_info & in_info, temp.internal_id = in_info.flavor_id; node = addon->InstantiateNodeFor(&temp, &config, &out_error); if (!node) { - printf("BMediaRoster::InstantiateDormantNode: InstantiateNodeFor failed\n"); + FATAL("BMediaRoster::InstantiateDormantNode: InstantiateNodeFor failed\n"); _DormantNodeManager->PutAddon(in_info.addon); return B_ERROR; } rv = RegisterNode(node); if (rv != B_OK) { - printf("BMediaRoster::InstantiateDormantNode: RegisterNode failed\n"); + FATAL("BMediaRoster::InstantiateDormantNode: RegisterNode failed\n"); delete node; _DormantNodeManager->PutAddon(in_info.addon); return B_ERROR;