Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Applied patch by Maurice to make Cortex behave nicer in case

Browse Source 
GetDormantFlavorInfoFor() fails. See bug #1763.
* Minor cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24205 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2008-03-02 16:18:08 +00:00
parent 3ba0ac742d
commit 66eea40b53
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/apps/cortex/support/MediaIcon.cpp
View File

@ -158,27 +158,35 @@ void MediaIcon::_findIconFor(
} }
} }
void MediaIcon::_findIconFor(
const dormant_node_info &nodeInfo) { void
MediaIcon::_findIconFor(const dormant_node_info &nodeInfo)
{
D_INTERNAL(("MediaIcon::_findIconFor(dormant_node_info)\n")); D_INTERNAL(("MediaIcon::_findIconFor(dormant_node_info)\n"));
dormant_flavor_info flavorInfo; dormant_flavor_info flavorInfo;
BMediaRoster *roster = BMediaRoster::CurrentRoster(); BMediaRoster *roster = BMediaRoster::CurrentRoster();
status_t error = roster->GetDormantFlavorInfoFor(nodeInfo, &flavorInfo); status_t error = roster->GetDormantFlavorInfoFor(nodeInfo, &flavorInfo);
if (!error) { if (error == B_OK) {
m_nodeKind = flavorInfo.kinds; m_nodeKind = flavorInfo.kinds;
bool audioIn = false, audioOut = false, videoIn = false, videoOut = false; bool audioIn = false, audioOut = false;
bool videoIn = false, videoOut = false;
_getMediaTypesFor(flavorInfo, &audioIn, &audioOut, &videoIn, &videoOut); _getMediaTypesFor(flavorInfo, &audioIn, &audioOut, &videoIn, &videoOut);
_findDefaultIconFor(audioIn, audioOut, videoIn, videoOut); _findDefaultIconFor(audioIn, audioOut, videoIn, videoOut);
} else {
// use generic icon in case we couldn't get any info
if (m_size == B_LARGE_ICON)
SetBits(M_GENERIC_ICON.large, 1024, 0, B_CMAP8);
else if (m_size == B_MINI_ICON)
SetBits(M_GENERIC_ICON.small, 256, 0, B_CMAP8);
} }
} }
void MediaIcon::_getMediaTypesFor(
const live_node_info &nodeInfo, void
bool *audioIn, MediaIcon::_getMediaTypesFor(const live_node_info &nodeInfo, bool *audioIn,
bool *audioOut, bool *audioOut, bool *videoIn, bool *videoOut)
bool *videoIn, {
bool *videoOut) {
D_INTERNAL(("MediaIcon::_getMediaTypeFor(live_node_info)\n")); D_INTERNAL(("MediaIcon::_getMediaTypeFor(live_node_info)\n"));
// get the media_types supported by this node // get the media_types supported by this node