i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media_server: Add missing notifications for flavors/nodes changes

Browse Source
This commit is contained in:
Dario Casalinuovo
2015-07-09 23:45:16 +02:00
parent b7d5c81a95
commit d97447ba40
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/media/NodeManager.cpp
+18 -5
View File
@@ -41,6 +41,7 @@
#include <debug.h> #include <debug.h>
#include <MediaMisc.h> #include <MediaMisc.h>
#include <Notifications.h>
#include "AppManager.h" #include "AppManager.h"
#include "DefaultManager.h" #include "DefaultManager.h"
@@ -980,8 +981,17 @@ NodeManager::CleanupDormantFlavorInfos()
PRINT(1, "NodeManager::CleanupDormantFlavorInfos\n"); PRINT(1, "NodeManager::CleanupDormantFlavorInfos\n");
BAutolock _(this); BAutolock _(this);
for (DormantFlavorList::iterator iterator = fDormantFlavors.begin();
iterator != fDormantFlavors.end(); iterator++) {
dormant_add_on_flavor_info& info = *iterator;
// Current instance count is zero since the media_addon_server crashed.
BPrivate::media::notifications::FlavorsChanged(info.add_on_id,
0, info.instances_count);
}
fDormantFlavors.clear(); fDormantFlavors.clear();
// TODO: FlavorsChanged() notification
PRINT(1, "NodeManager::CleanupDormantFlavorInfos done\n"); PRINT(1, "NodeManager::CleanupDormantFlavorInfos done\n");
} }
@@ -1091,8 +1101,6 @@ NodeManager::CleanupTeam(team_id team)
PRINT(1, "NodeManager::CleanupTeam: team %" B_PRId32 "\n", team); PRINT(1, "NodeManager::CleanupTeam: team %" B_PRId32 "\n", team);
// TODO: send notifications after removing nodes
// Cleanup node references // Cleanup node references
for (NodeMap::iterator iterator = fNodeMap.begin(); for (NodeMap::iterator iterator = fNodeMap.begin();
@@ -1113,6 +1121,7 @@ NodeManager::CleanupTeam(team_id team)
PRINT(1, "NodeManager::CleanupTeam: removing node id %" B_PRId32 PRINT(1, "NodeManager::CleanupTeam: removing node id %" B_PRId32
", team %" B_PRId32 "\n", node.node_id, team); ", team %" B_PRId32 "\n", node.node_id, team);
fNodeMap.erase(remove); fNodeMap.erase(remove);
BPrivate::media::notifications::NodesDeleted(&node.node_id, 1);
continue; continue;
} }
@@ -1129,6 +1138,7 @@ NodeManager::CleanupTeam(team_id team)
B_PRId32 " that has no teams\n", node.node_id); B_PRId32 " that has no teams\n", node.node_id);
fNodeMap.erase(remove); fNodeMap.erase(remove);
BPrivate::media::notifications::NodesDeleted(&node.node_id, 1);
} else } else
node.team_ref_count.erase(teamRef); node.team_ref_count.erase(teamRef);
} }
@@ -1147,10 +1157,13 @@ NodeManager::CleanupTeam(team_id team)
instanceCount->second, flavorInfo.add_on_id, instanceCount->second, flavorInfo.add_on_id,
flavorInfo.flavor_id); flavorInfo.flavor_id);
int32 count = flavorInfo.instances_count;
flavorInfo.instances_count -= instanceCount->second; flavorInfo.instances_count -= instanceCount->second;
if (flavorInfo.instances_count <= 0) if (flavorInfo.instances_count <= 0) {
fDormantFlavors.erase(fDormantFlavors.begin() + index--); fDormantFlavors.erase(fDormantFlavors.begin() + index--);
else BPrivate::media::notifications::FlavorsChanged(
flavorInfo.add_on_id, 0, count);
} else
flavorInfo.team_instances_count.erase(team); flavorInfo.team_instances_count.erase(team);
} }
} }