some last minute changes...
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1348 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
8c6a6096e7
commit
63ffaa3ea4
|
@ -43,7 +43,7 @@ BBufferConsumer::ConsumerType()
|
||||||
BBufferConsumer::RegionToClipData(const BRegion *region,
|
BBufferConsumer::RegionToClipData(const BRegion *region,
|
||||||
int32 *format,
|
int32 *format,
|
||||||
int32 *ioSize,
|
int32 *ioSize,
|
||||||
void *request)
|
void *data)
|
||||||
{
|
{
|
||||||
CALLED();
|
CALLED();
|
||||||
|
|
||||||
|
@ -51,7 +51,7 @@ BBufferConsumer::RegionToClipData(const BRegion *region,
|
||||||
int count;
|
int count;
|
||||||
|
|
||||||
count = *ioSize / sizeof(int16);
|
count = *ioSize / sizeof(int16);
|
||||||
rv = BBufferProducer::clip_region_to_shorts(region, (int16 *)request, count, &count);
|
rv = BBufferProducer::clip_region_to_shorts(region, (int16 *)data, count, &count);
|
||||||
*ioSize = count * sizeof(int16);
|
*ioSize = count * sizeof(int16);
|
||||||
*format = BBufferProducer::B_CLIP_SHORT_RUNS;
|
*format = BBufferProducer::B_CLIP_SHORT_RUNS;
|
||||||
|
|
||||||
|
|
|
@ -27,7 +27,7 @@ BBufferProducer::~BBufferProducer()
|
||||||
/* static */ status_t
|
/* static */ status_t
|
||||||
BBufferProducer::ClipDataToRegion(int32 format,
|
BBufferProducer::ClipDataToRegion(int32 format,
|
||||||
int32 size,
|
int32 size,
|
||||||
const void *request,
|
const void *data,
|
||||||
BRegion *region)
|
BRegion *region)
|
||||||
{
|
{
|
||||||
CALLED();
|
CALLED();
|
||||||
|
@ -35,7 +35,7 @@ BBufferProducer::ClipDataToRegion(int32 format,
|
||||||
if (format != B_CLIP_SHORT_RUNS)
|
if (format != B_CLIP_SHORT_RUNS)
|
||||||
return B_MEDIA_BAD_CLIP_FORMAT;
|
return B_MEDIA_BAD_CLIP_FORMAT;
|
||||||
|
|
||||||
return clip_shorts_to_region((const int16 *)request, size / sizeof(int16), region);
|
return clip_shorts_to_region((const int16 *)data, size / sizeof(int16), region);
|
||||||
}
|
}
|
||||||
|
|
||||||
media_type
|
media_type
|
||||||
|
@ -540,7 +540,7 @@ status_t BBufferProducer::_Reserved_BufferProducer_15(void *) { return B_ERROR;
|
||||||
|
|
||||||
|
|
||||||
status_t
|
status_t
|
||||||
BBufferProducer::clip_shorts_to_region(const int16 *request,
|
BBufferProducer::clip_shorts_to_region(const int16 *data,
|
||||||
int count,
|
int count,
|
||||||
BRegion *output)
|
BRegion *output)
|
||||||
{
|
{
|
||||||
|
@ -552,7 +552,7 @@ BBufferProducer::clip_shorts_to_region(const int16 *request,
|
||||||
|
|
||||||
status_t
|
status_t
|
||||||
BBufferProducer::clip_region_to_shorts(const BRegion *input,
|
BBufferProducer::clip_region_to_shorts(const BRegion *input,
|
||||||
int16 *request,
|
int16 *data,
|
||||||
int max_count,
|
int max_count,
|
||||||
int *out_count)
|
int *out_count)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1047,7 +1047,7 @@ BMediaRoster::InstantiateDormantNode(const dormant_node_info & in_info,
|
||||||
}
|
}
|
||||||
|
|
||||||
// XXX SOMETHING IS VERY WRONG HERE
|
// XXX SOMETHING IS VERY WRONG HERE
|
||||||
// printf("Error: BMediaRoster::InstantiateDormantNode in_info.flavor_flags = %#08lx, flags = %#08lx\n", in_info.flavor_flags, flags);
|
printf("Error: BMediaRoster::InstantiateDormantNode addon_id %d, flavor_id %d, flags %#08lx\n", in_info.addon, in_info.flavor_id, flags);
|
||||||
|
|
||||||
return B_ERROR;
|
return B_ERROR;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue