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

* Rewrote header

Browse Source 
* Some coding style fixes.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32782 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2009-08-28 13:18:17 +00:00
parent e09d819b6c
commit 6abeda1091
2 changed files with 171 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/media/MediaFiles.h
+46 -53
View File
@@ -1,77 +1,70 @@
/* MediaFiles.h */ /*
/* Copyright 1998 Be Incorporated. All rights reserved. */ * Copyright 2009, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
#if !defined(_MEDIA_FILES_H) */
#ifndef _MEDIA_FILES_H
#define _MEDIA_FILES_H #define _MEDIA_FILES_H
#include <MediaDefs.h> #include <MediaDefs.h>
#include <List.h> #include <List.h>
#include <String.h>
struct entry_ref; struct entry_ref;
#include <String.h>
class BMediaFiles { class BMediaFiles {
public: public:
BMediaFiles(); BMediaFiles();
virtual ~BMediaFiles(); virtual ~BMediaFiles();
virtual status_t RewindTypes(); virtual status_t RewindTypes();
virtual status_t GetNextType( virtual status_t GetNextType(BString* _type);
BString * out_type);
virtual status_t RewindRefs( virtual status_t RewindRefs(const char* type);
const char * type); virtual status_t GetNextRef(BString* _type,
virtual status_t GetNextRef( entry_ref* _ref = NULL);
BString * out_type,
entry_ref * out_ref = NULL);
virtual status_t GetRefFor( virtual status_t GetRefFor(const char* type, const char* item,
const char * type, entry_ref* _ref);
const char * item, virtual status_t SetRefFor(const char* type, const char* item,
entry_ref * out_ref); const entry_ref& ref);
status_t GetAudioGainFor(
const char * type,
const char * item,
float * out_audio_gain);
virtual status_t SetRefFor(
const char * type,
const char * item,
const entry_ref & ref);
status_t SetAudioGainFor(
const char * type,
const char * item,
float audio_gain);
virtual status_t RemoveRefFor( // This might better be called "ClearRefFor"
const char * type, // but it's too late now...
const char * item,
const entry_ref & ref);
static const char B_SOUNDS[]; /* for "types" */ status_t GetAudioGainFor(const char* type,
const char* item, float* _gain);
status_t SetAudioGainFor(const char* type,
const char* item, float gain);
virtual status_t RemoveItem( // new in 4.1, removes the whole item. // TODO: Rename this to "ClearRefFor" when breaking BC.
const char * type, virtual status_t RemoveRefFor(const char* type,
const char * item); const char* item, const entry_ref& ref);
static const char B_SOUNDS[];
virtual status_t RemoveItem(const char* type, const char* item);
// TODO: Needs Perform() for FBC reasons!
private: private:
// FBC padding
status_t _Reserved_MediaFiles_0(void *, ...); status_t _Reserved_MediaFiles_0(void*, ...);
virtual status_t _Reserved_MediaFiles_1(void *, ...); virtual status_t _Reserved_MediaFiles_1(void*, ...);
virtual status_t _Reserved_MediaFiles_2(void *, ...); virtual status_t _Reserved_MediaFiles_2(void*, ...);
virtual status_t _Reserved_MediaFiles_3(void *, ...); virtual status_t _Reserved_MediaFiles_3(void*, ...);
virtual status_t _Reserved_MediaFiles_4(void *, ...); virtual status_t _Reserved_MediaFiles_4(void*, ...);
virtual status_t _Reserved_MediaFiles_5(void *, ...); virtual status_t _Reserved_MediaFiles_5(void*, ...);
virtual status_t _Reserved_MediaFiles_6(void *, ...); virtual status_t _Reserved_MediaFiles_6(void*, ...);
virtual status_t _Reserved_MediaFiles_7(void *, ...); virtual status_t _Reserved_MediaFiles_7(void*, ...);
BList m_types; private:
int m_type_index; BList fTypes;
BString m_cur_type; int fTypeIndex;
BList m_items; BString fCurrentType;
int m_item_index; BList fItems;
int fItemIndex;
}; };
#endif /* _MEDIA_FILES_H */ #endif // _MEDIA_FILES_H
src/kits/media/MediaFiles.cpp
+98 -83
View File
@@ -1,35 +1,38 @@
/*********************************************************************** /*
* AUTHOR: Marcus Overhagen, Jérôme Duval * Copyright 2002-2008, Haiku, Inc. All rights reserved.
* FILE: MediaFiles.cpp * Distributed under the terms of the MIT License.
* DESCR: *
***********************************************************************/ * Authors:
* Marcus Overhagen
* Jérôme Duval
*/
#include <MediaFiles.h> #include <MediaFiles.h>
#include "DataExchange.h" #include "DataExchange.h"
#include "debug.h" #include "debug.h"
/*************************************************************
* public BMediaFiles
*************************************************************/
const char BMediaFiles::B_SOUNDS[] = "Sounds"; /* for "types" */ const char BMediaFiles::B_SOUNDS[] = "Sounds";
BMediaFiles::BMediaFiles() BMediaFiles::BMediaFiles()
: m_type_index(-1), :
m_cur_type(""), fTypeIndex(-1),
m_item_index(-1) fCurrentType(""),
fItemIndex(-1)
{ {
} }
/* virtual */
BMediaFiles::~BMediaFiles() BMediaFiles::~BMediaFiles()
{ {
// TODO: Cleanup!
} }
/* virtual */ status_t status_t
BMediaFiles::RewindTypes() BMediaFiles::RewindTypes()
{ {
CALLED(); CALLED();
@@ -37,59 +40,61 @@ BMediaFiles::RewindTypes()
server_rewindtypes_request request; server_rewindtypes_request request;
server_rewindtypes_reply reply; server_rewindtypes_reply reply;
for (int32 i = 0; i < m_types.CountItems(); i++) for (int32 i = 0; i < fTypes.CountItems(); i++)
delete (BString*)m_types.ItemAt(i); delete (BString*)fTypes.ItemAt(i);
m_types.MakeEmpty(); fTypes.MakeEmpty();
TRACE("BMediaFiles::RewindTypes: sending SERVER_REWINDTYPES\n"); TRACE("BMediaFiles::RewindTypes: sending SERVER_REWINDTYPES\n");
rv = QueryServer(SERVER_REWINDTYPES, &request, sizeof(request), &reply, sizeof(reply)); rv = QueryServer(SERVER_REWINDTYPES, &request, sizeof(request), &reply,
sizeof(reply));
if (rv != B_OK) { if (rv != B_OK) {
ERROR("BMediaFiles::RewindTypes: failed to rewindtypes (error %#lx)\n", rv); ERROR("BMediaFiles::RewindTypes: failed to rewindtypes "
"(error %#lx)\n", rv);
return rv; return rv;
} }
char *types; char *types;
area_id clone; area_id clone;
clone = clone_area("rewind types clone", reinterpret_cast<void **>(&types), B_ANY_ADDRESS, B_READ_AREA | B_WRITE_AREA, reply.area); clone = clone_area("rewind types clone", reinterpret_cast<void **>(&types),
B_ANY_ADDRESS, B_READ_AREA | B_WRITE_AREA, reply.area);
if (clone < B_OK) { if (clone < B_OK) {
ERROR("BMediaFiles::RewindTypes failed to clone area, %#lx\n", clone); ERROR("BMediaFiles::RewindTypes failed to clone area, %#lx\n", clone);
delete_area(reply.area); delete_area(reply.area);
return B_ERROR; return B_ERROR;
} }
for (int32 i = 0; i < reply.count; i++) { for (int32 i = 0; i < reply.count; i++)
m_types.AddItem(new BString(types + i * B_MEDIA_NAME_LENGTH)); fTypes.AddItem(new BString(types + i * B_MEDIA_NAME_LENGTH));
}
delete_area(clone); delete_area(clone);
delete_area(reply.area); delete_area(reply.area);
m_type_index = 0; fTypeIndex = 0;
return B_OK; return B_OK;
} }
/* virtual */ status_t status_t
BMediaFiles::GetNextType(BString *out_type) BMediaFiles::GetNextType(BString *out_type)
{ {
CALLED(); CALLED();
if (m_type_index < 0 || m_type_index >= m_types.CountItems()) { if (fTypeIndex < 0 || fTypeIndex >= fTypes.CountItems()) {
m_type_index = -1; fTypeIndex = -1;
return B_BAD_INDEX; return B_BAD_INDEX;
} }
*out_type = *(BString*)m_types.ItemAt(m_type_index); *out_type = *(BString*)fTypes.ItemAt(fTypeIndex);
m_type_index++; fTypeIndex++;
return B_OK; return B_OK;
} }
/* virtual */ status_t status_t
BMediaFiles::RewindRefs(const char *type) BMediaFiles::RewindRefs(const char *type)
{ {
CALLED(); CALLED();
@@ -97,17 +102,20 @@ BMediaFiles::RewindRefs(const char *type)
server_rewindrefs_request request; server_rewindrefs_request request;
server_rewindrefs_reply reply; server_rewindrefs_reply reply;
for (int32 i = 0; i < m_items.CountItems(); i++) for (int32 i = 0; i < fItems.CountItems(); i++)
delete (BString*)m_items.ItemAt(i); delete (BString*)fItems.ItemAt(i);
m_items.MakeEmpty(); fItems.MakeEmpty();
TRACE("BMediaFiles::RewindRefs: sending SERVER_REWINDREFS for type %s\n", type); TRACE("BMediaFiles::RewindRefs: sending SERVER_REWINDREFS for type %s\n",
type);
strncpy(request.type, type, B_MEDIA_NAME_LENGTH); strncpy(request.type, type, B_MEDIA_NAME_LENGTH);
rv = QueryServer(SERVER_REWINDREFS, &request, sizeof(request), &reply, sizeof(reply)); rv = QueryServer(SERVER_REWINDREFS, &request, sizeof(request), &reply,
sizeof(reply));
if (rv != B_OK) { if (rv != B_OK) {
ERROR("BMediaFiles::RewindRefs: failed to rewindrefs (error %#lx)\n", rv); ERROR("BMediaFiles::RewindRefs: failed to rewindrefs (error %#lx)\n",
rv);
return rv; return rv;
} }
@@ -115,51 +123,51 @@ BMediaFiles::RewindRefs(const char *type)
char *items; char *items;
area_id clone; area_id clone;
clone = clone_area("rewind refs clone", reinterpret_cast<void **>(&items), B_ANY_ADDRESS, B_READ_AREA | B_WRITE_AREA, reply.area); clone = clone_area("rewind refs clone",
reinterpret_cast<void **>(&items), B_ANY_ADDRESS, B_READ_AREA
| B_WRITE_AREA, reply.area);
if (clone < B_OK) { if (clone < B_OK) {
ERROR("BMediaFiles::RewindRefs failed to clone area, %#lx\n", clone); ERROR("BMediaFiles::RewindRefs failed to clone area, %#lx\n",
clone);
delete_area(reply.area); delete_area(reply.area);
return B_ERROR; return B_ERROR;
} }
for (int32 i = 0; i < reply.count; i++) { for (int32 i = 0; i < reply.count; i++) {
m_items.AddItem(new BString(items + i * B_MEDIA_NAME_LENGTH)); fItems.AddItem(new BString(items + i * B_MEDIA_NAME_LENGTH));
} }
delete_area(clone); delete_area(clone);
delete_area(reply.area); delete_area(reply.area);
} }
m_cur_type = BString(type); fCurrentType = BString(type);
m_item_index = 0; fItemIndex = 0;
return B_OK; return B_OK;
} }
/* virtual */ status_t status_t
BMediaFiles::GetNextRef(BString *out_type, BMediaFiles::GetNextRef(BString *out_type, entry_ref *out_ref)
entry_ref *out_ref)
{ {
CALLED(); CALLED();
if (m_item_index < 0 || m_item_index >= m_items.CountItems()) { if (fItemIndex < 0 || fItemIndex >= fItems.CountItems()) {
m_item_index = -1; fItemIndex = -1;
return B_BAD_INDEX; return B_BAD_INDEX;
} }
*out_type = *(BString*)m_items.ItemAt(m_item_index); *out_type = *(BString*)fItems.ItemAt(fItemIndex);
m_item_index++; fItemIndex++;
GetRefFor(m_cur_type.String(), out_type->String(), out_ref); GetRefFor(fCurrentType.String(), out_type->String(), out_ref);
return B_OK; return B_OK;
} }
/* virtual */ status_t status_t
BMediaFiles::GetRefFor(const char *type, BMediaFiles::GetRefFor(const char *type, const char *item, entry_ref *out_ref)
const char *item,
entry_ref *out_ref)
{ {
CALLED(); CALLED();
status_t rv; status_t rv;
@@ -171,11 +179,13 @@ BMediaFiles::GetRefFor(const char *type,
TRACE("BMediaFiles::GetRefFor: sending SERVER_GETREFFOR\n"); TRACE("BMediaFiles::GetRefFor: sending SERVER_GETREFFOR\n");
rv = QueryServer(SERVER_GETREFFOR, &request, sizeof(request), &reply, sizeof(reply)); rv = QueryServer(SERVER_GETREFFOR, &request, sizeof(request), &reply,
sizeof(reply));
if (rv != B_OK) { if (rv != B_OK) {
entry_ref ref; entry_ref ref;
*out_ref = ref; *out_ref = ref;
ERROR("BMediaFiles::GetRefFor: failed to getreffor (error %#lx)\n", rv); ERROR("BMediaFiles::GetRefFor: failed to getreffor (error %#lx)\n",
rv);
return rv; return rv;
} }
@@ -186,9 +196,8 @@ BMediaFiles::GetRefFor(const char *type,
status_t status_t
BMediaFiles::GetAudioGainFor(const char * type, BMediaFiles::GetAudioGainFor(const char * type, const char * item,
const char * item, float * out_audio_gain)
float * out_audio_gain)
{ {
UNIMPLEMENTED(); UNIMPLEMENTED();
*out_audio_gain = 1.0f; *out_audio_gain = 1.0f;
@@ -196,10 +205,9 @@ BMediaFiles::GetAudioGainFor(const char * type,
} }
/* virtual */ status_t status_t
BMediaFiles::SetRefFor(const char *type, BMediaFiles::SetRefFor(const char *type, const char *item,
const char *item, const entry_ref &ref)
const entry_ref &ref)
{ {
CALLED(); CALLED();
status_t rv; status_t rv;
@@ -212,9 +220,11 @@ BMediaFiles::SetRefFor(const char *type,
TRACE("BMediaFiles::SetRefFor: sending SERVER_SETREFFOR\n"); TRACE("BMediaFiles::SetRefFor: sending SERVER_SETREFFOR\n");
rv = QueryServer(SERVER_SETREFFOR, &request, sizeof(request), &reply, sizeof(reply)); rv = QueryServer(SERVER_SETREFFOR, &request, sizeof(request), &reply,
sizeof(reply));
if (rv != B_OK) { if (rv != B_OK) {
ERROR("BMediaFiles::SetRefFor: failed to setreffor (error %#lx)\n", rv); ERROR("BMediaFiles::SetRefFor: failed to setreffor (error %#lx)\n",
rv);
return rv; return rv;
} }
@@ -223,19 +233,17 @@ BMediaFiles::SetRefFor(const char *type,
status_t status_t
BMediaFiles::SetAudioGainFor(const char * type, BMediaFiles::SetAudioGainFor(const char * type, const char * item,
const char * item, float audio_gain)
float audio_gain)
{ {
UNIMPLEMENTED(); UNIMPLEMENTED();
return B_OK; return B_OK;
} }
/* virtual */ status_t status_t
BMediaFiles::RemoveRefFor(const char *type, BMediaFiles::RemoveRefFor(const char *type, const char *item,
const char *item, const entry_ref &ref)
const entry_ref &ref)
{ {
status_t rv; status_t rv;
server_removereffor_request request; server_removereffor_request request;
@@ -247,9 +255,11 @@ BMediaFiles::RemoveRefFor(const char *type,
TRACE("BMediaFiles::RemoveRefFor: sending SERVER_REMOVEREFFOR\n"); TRACE("BMediaFiles::RemoveRefFor: sending SERVER_REMOVEREFFOR\n");
rv = QueryServer(SERVER_REMOVEREFFOR, &request, sizeof(request), &reply, sizeof(reply)); rv = QueryServer(SERVER_REMOVEREFFOR, &request, sizeof(request), &reply,
sizeof(reply));
if (rv != B_OK) { if (rv != B_OK) {
ERROR("BMediaFiles::RemoveRefFor: failed to removereffor (error %#lx)\n", rv); ERROR("BMediaFiles::RemoveRefFor: failed to removereffor "
"(error %#lx)\n", rv);
return rv; return rv;
} }
@@ -257,9 +267,8 @@ BMediaFiles::RemoveRefFor(const char *type,
} }
/* virtual */ status_t status_t
BMediaFiles::RemoveItem(const char *type, BMediaFiles::RemoveItem(const char *type, const char *item)
const char *item)
{ {
status_t rv; status_t rv;
server_removeitem_request request; server_removeitem_request request;
@@ -270,20 +279,26 @@ BMediaFiles::RemoveItem(const char *type,
TRACE("BMediaFiles::RemoveItem: sending SERVER_REMOVEITEM\n"); TRACE("BMediaFiles::RemoveItem: sending SERVER_REMOVEITEM\n");
rv = QueryServer(SERVER_REMOVEITEM, &request, sizeof(request), &reply, sizeof(reply)); rv = QueryServer(SERVER_REMOVEITEM, &request, sizeof(request), &reply,
sizeof(reply));
if (rv != B_OK) { if (rv != B_OK) {
ERROR("BMediaFiles::RemoveItem: failed to removeitem (error %#lx)\n", rv); ERROR("BMediaFiles::RemoveItem: failed to removeitem (error %#lx)\n",
rv);
return rv; return rv;
} }
return B_OK; return B_OK;
} }
/*************************************************************
* private BMediaFiles
*************************************************************/
status_t BMediaFiles::_Reserved_MediaFiles_0(void *,...) { return B_ERROR; } // #pragma mark - FBC padding
status_t BMediaFiles::_Reserved_MediaFiles_0(void *,...)
{
// TODO: Someone didn't understand FBC
return B_ERROR;
}
status_t BMediaFiles::_Reserved_MediaFiles_1(void *,...) { return B_ERROR; } status_t BMediaFiles::_Reserved_MediaFiles_1(void *,...) { return B_ERROR; }
status_t BMediaFiles::_Reserved_MediaFiles_2(void *,...) { return B_ERROR; } status_t BMediaFiles::_Reserved_MediaFiles_2(void *,...) { return B_ERROR; }
status_t BMediaFiles::_Reserved_MediaFiles_3(void *,...) { return B_ERROR; } status_t BMediaFiles::_Reserved_MediaFiles_3(void *,...) { return B_ERROR; }