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

finally get libmedia.so building :-)

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@107 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
beveloper 2002-07-12 00:25:55 +00:00
parent c63f4a88da
commit e020762819
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/kits/media/MediaNode.cpp
View File

@ -3,6 +3,7 @@
* FILE: MediaNode.cpp * FILE: MediaNode.cpp
* DESCR: * DESCR:
***********************************************************************/ ***********************************************************************/
#include <MediaRoster.h>
#include <MediaNode.h> #include <MediaNode.h>
#include <TimeSource.h> #include <TimeSource.h>
#include <BufferConsumer.h> #include <BufferConsumer.h>

13
src/kits/media/MediaRoster.cpp
View File

@ -1045,11 +1045,16 @@ BMediaRoster::InstantiateDormantNode(const dormant_node_info & in_info,
// XXX we should not trust the values passed in by the user, // XXX we should not trust the values passed in by the user,
// XXX and ask the server to determine where to insta // XXX and ask the server to determine where to insta
if ((in_info.flavor_flags & B_FLAVOR_IS_GLOBAL) == 0 && (flags & B_FLAVOR_IS_LOCAL)) {
// XXX SOMETHING IS VERY WRONG HERE
// if ((in_info.flavor_flags & B_FLAVOR_IS_GLOBAL) == 0 && (flags & B_FLAVOR_IS_LOCAL)) {
if (flags & B_FLAVOR_IS_LOCAL) {
return InstantiateDormantNode(in_info,out_node); return InstantiateDormantNode(in_info,out_node);
} }
if ((in_info.flavor_flags & B_FLAVOR_IS_GLOBAL) || (flags & B_FLAVOR_IS_GLOBAL)) { // XXX SOMETHING IS VERY WRONG HERE
// if ((in_info.flavor_flags & B_FLAVOR_IS_GLOBAL) || (flags & B_FLAVOR_IS_GLOBAL)) {
if (flags & B_FLAVOR_IS_GLOBAL) {
// forward this request into the media_addon_server, // forward this request into the media_addon_server,
// which in turn will call InstantiateDormantNode() // which in turn will call InstantiateDormantNode()
// to create it there localy // to create it there localy
@ -1076,7 +1081,8 @@ BMediaRoster::InstantiateDormantNode(const dormant_node_info & in_info,
return reply.result; return reply.result;
} }
printf("Error: BMediaRoster::InstantiateDormantNode in_info.flavor_flags = %#08lx, flags = %#08lx\n", in_info.flavor_flags, flags); // XXX SOMETHING IS VERY WRONG HERE
// printf("Error: BMediaRoster::InstantiateDormantNode in_info.flavor_flags = %#08lx, flags = %#08lx\n", in_info.flavor_flags, flags);
return B_ERROR; return B_ERROR;
} }
@ -1087,7 +1093,6 @@ BMediaRoster::InstantiateDormantNode(const dormant_node_info & in_info,
media_node * out_node) media_node * out_node)
{ {
UNIMPLEMENTED(); UNIMPLEMENTED();
in_info
// to instantiate a dormant node in the current address space, we need to // to instantiate a dormant node in the current address space, we need to
// either load the add-on from file and create a new BMediaAddOn class, or // either load the add-on from file and create a new BMediaAddOn class, or