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

when a media add-on file is removed, the flavour update message is send.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2197 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
beveloper
2002-12-09 01:01:58 +00:00
parent 76669a292a
commit a93cd287ee
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/media_addon/main.cpp
+20 -7
View File
@@ -264,7 +264,7 @@ MediaAddonServer::AddOnAdded(const char *path, ino_t file_node)
return; return;
} }
TRACE("MediaAddonServer::AddOnAdded: loading finished, id %d\n",(int)id); TRACE("MediaAddonServer::AddOnAdded: loading finished, id %ld\n", id);
filemap->Insert(file_node, id); filemap->Insert(file_node, id);
flavorcountmap->Insert(id, 0); flavorcountmap->Insert(id, 0);
@@ -272,7 +272,7 @@ MediaAddonServer::AddOnAdded(const char *path, ino_t file_node)
ScanAddOnFlavors(addon); ScanAddOnFlavors(addon);
if (addon->WantsAutoStart()) if (addon->WantsAutoStart())
TRACE("#### WantsAutoStart!\n"); FATAL("#### add-on %ld WantsAutoStart!\n", id);
/* /*
* the mixer (which we can't load because of unresolved symbols) * the mixer (which we can't load because of unresolved symbols)
@@ -325,17 +325,30 @@ flavor 0:
void void
MediaAddonServer::AddOnRemoved(ino_t file_node) MediaAddonServer::AddOnRemoved(ino_t file_node)
{ {
media_addon_id *id; media_addon_id *tempid;
media_addon_id id;
int32 *tempflavorcount;
int32 oldflavorcount;
// XXX locking? // XXX locking?
if (!filemap->Get(file_node, &id)) { if (!filemap->Get(file_node, &tempid)) {
FATAL("MediaAddonServer::AddOnRemoved: inode %Ld removed, but no media add-on found\n", file_node); FATAL("MediaAddonServer::AddOnRemoved: inode %Ld removed, but no media add-on found\n", file_node);
return; return;
} }
id = *tempid; // tempid pointer is invalid after Removing() it from the map
filemap->Remove(file_node); filemap->Remove(file_node);
flavorcountmap->Remove(*id);
_DormantNodeManager->UnregisterAddon(*id); if (!flavorcountmap->Get(id, &tempflavorcount)) {
FATAL("MediaAddonServer::AddOnRemoved: couldn't get flavor count for add-on %ld\n", id);
oldflavorcount = 1000;
} else {
oldflavorcount = *tempflavorcount; //same reason as above
}
flavorcountmap->Remove(id);
_DormantNodeManager->UnregisterAddon(id);
BPrivate::media::notifications::FlavorsChanged(id, 0, oldflavorcount);
} }
void void