Rewrote Sound.h and implemented most of BSound. Completely untested yet as the
BSoundPlayer functionality is yet missing. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29372 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz
parent
376b90d507
commit
1b921108a7
@ -1,114 +1,76 @@
|
||||
/* BSound.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(_SOUND_H)
|
||||
#ifndef _SOUND_H
|
||||
#define _SOUND_H
|
||||
|
||||
#include <MediaDefs.h>
|
||||
|
||||
class BMediaFile;
|
||||
class BSoundFile;
|
||||
class BFile;
|
||||
class BSoundPlayer;
|
||||
struct entry_ref;
|
||||
|
||||
namespace BPrivate {
|
||||
class BTrackReader;
|
||||
}
|
||||
};
|
||||
|
||||
class BSound {
|
||||
public:
|
||||
BSound(
|
||||
void * data,
|
||||
size_t size,
|
||||
const media_raw_audio_format & format,
|
||||
bool free_when_done = false);
|
||||
BSound(
|
||||
const entry_ref * sound_file,
|
||||
bool load_into_memory = false);
|
||||
BSound(void *data, size_t size,
|
||||
const media_raw_audio_format &format,
|
||||
bool freeWhenDone = false);
|
||||
BSound(const entry_ref *soundFile,
|
||||
bool loadIntoMemory = false);
|
||||
|
||||
status_t InitCheck();
|
||||
BSound * AcquireRef();
|
||||
bool ReleaseRef();
|
||||
int32 RefCount() const; // unreliable!
|
||||
status_t InitCheck();
|
||||
BSound * AcquireRef();
|
||||
bool ReleaseRef();
|
||||
int32 RefCount() const; // unreliable!
|
||||
|
||||
virtual bigtime_t Duration() const;
|
||||
virtual const media_raw_audio_format & Format() const;
|
||||
virtual const void * Data() const; /* returns NULL for files */
|
||||
virtual off_t Size() const;
|
||||
virtual bigtime_t Duration() const;
|
||||
virtual const media_raw_audio_format &Format() const;
|
||||
virtual const void * Data() const; // returns NULL for files
|
||||
virtual off_t Size() const;
|
||||
|
||||
virtual bool GetDataAt(
|
||||
off_t offset,
|
||||
void * into_buffer,
|
||||
size_t buffer_size,
|
||||
size_t * out_used);
|
||||
virtual bool GetDataAt(off_t offset,
|
||||
void *intoBuffer, size_t bufferSize,
|
||||
size_t *outUsed);
|
||||
|
||||
protected:
|
||||
|
||||
BSound(
|
||||
const media_raw_audio_format & format);
|
||||
|
||||
virtual status_t Perform(
|
||||
int32 code,
|
||||
...);
|
||||
BSound(const media_raw_audio_format &format);
|
||||
virtual status_t Perform(int32 code, ...);
|
||||
|
||||
private:
|
||||
|
||||
BSound(const BSound &); // unimplemented
|
||||
BSound & operator=(const BSound &); // unimplemented
|
||||
|
||||
friend class BSoundPlayer;
|
||||
friend class _HostApp;
|
||||
|
||||
void Reset();
|
||||
|
||||
virtual ~BSound();
|
||||
|
||||
void free_data();
|
||||
static status_t load_entry(void * arg);
|
||||
void loader_thread();
|
||||
bool check_stop();
|
||||
friend class DummyFriend;
|
||||
virtual ~BSound();
|
||||
|
||||
public:
|
||||
|
||||
virtual status_t BindTo(
|
||||
BSoundPlayer * player,
|
||||
const media_raw_audio_format & format);
|
||||
virtual status_t UnbindFrom(
|
||||
BSoundPlayer * player);
|
||||
virtual status_t BindTo(BSoundPlayer *player,
|
||||
const media_raw_audio_format &format);
|
||||
virtual status_t UnbindFrom(BSoundPlayer *player);
|
||||
|
||||
private:
|
||||
status_t _Reserved_Sound_0(void *); // BindTo
|
||||
status_t _Reserved_Sound_1(void *); // UnbindFrom
|
||||
virtual status_t _Reserved_Sound_2(void *);
|
||||
virtual status_t _Reserved_Sound_3(void *);
|
||||
virtual status_t _Reserved_Sound_4(void *);
|
||||
virtual status_t _Reserved_Sound_5(void *);
|
||||
status_t _Reserved_Sound_0(void *); // BindTo
|
||||
status_t _Reserved_Sound_1(void *); // UnbindFrom
|
||||
virtual status_t _Reserved_Sound_2(void *);
|
||||
virtual status_t _Reserved_Sound_3(void *);
|
||||
virtual status_t _Reserved_Sound_4(void *);
|
||||
virtual status_t _Reserved_Sound_5(void *);
|
||||
|
||||
void * _m_data;
|
||||
BMediaFile * _m_file;
|
||||
int32 _m_ref_count;
|
||||
status_t _m_error;
|
||||
size_t _m_size;
|
||||
media_raw_audio_format _m_format;
|
||||
bool _m_free_when_done;
|
||||
bool _m_checkStopped;
|
||||
bool _m_reserved[2];
|
||||
area_id _m_area;
|
||||
sem_id _m_avail_sem;
|
||||
sem_id _m_free_sem;
|
||||
thread_id _m_loader_thread;
|
||||
size_t _m_read_pos;
|
||||
sem_id _m_check_token;
|
||||
int32 _m_prev_sem_count;
|
||||
void * fData;
|
||||
size_t fDataSize;
|
||||
BFile * fFile;
|
||||
int32 fRefCount;
|
||||
status_t fStatus;
|
||||
media_raw_audio_format fFormat;
|
||||
|
||||
BSoundPlayer * _m_bound_player;
|
||||
int32 _m_bind_flags;
|
||||
|
||||
BPrivate::BTrackReader * _m_trackReader;
|
||||
char m_tname[32];
|
||||
uint32 _reserved_[1];
|
||||
bool fFreeWhenDone;
|
||||
bool fReserved[3];
|
||||
|
||||
BPrivate::BTrackReader *fTrackReader;
|
||||
uint32 fReserved2[18];
|
||||
};
|
||||
|
||||
|
||||
#endif /* _SOUND_H */
|
||||
#endif // _SOUND_H
|
||||
|
||||
@ -1,182 +1,252 @@
|
||||
/***********************************************************************
|
||||
* AUTHOR: Marcus Overhagen
|
||||
* FILE: Sound.cpp
|
||||
* DESCR:
|
||||
***********************************************************************/
|
||||
/*
|
||||
* Copyright 2009, Haiku Inc. All Rights Reserved.
|
||||
* Distributed under the terms of the MIT License.
|
||||
*
|
||||
* Authors:
|
||||
* Marcus Overhagen
|
||||
* Michael Lotz <mmlr@mlotz.ch>
|
||||
*/
|
||||
|
||||
#include <Sound.h>
|
||||
#include "debug.h"
|
||||
#include <File.h>
|
||||
|
||||
/*************************************************************
|
||||
* public BSound
|
||||
*************************************************************/
|
||||
#include "TrackReader.h"
|
||||
|
||||
BSound::BSound( void * data,
|
||||
size_t size,
|
||||
const media_raw_audio_format & format,
|
||||
bool free_when_done)
|
||||
#include <debug.h>
|
||||
#include <new>
|
||||
#include <string.h>
|
||||
|
||||
|
||||
BSound::BSound(void *data, size_t size, const media_raw_audio_format &format,
|
||||
bool freeWhenDone)
|
||||
: fData(data),
|
||||
fDataSize(size),
|
||||
fFile(NULL),
|
||||
fRefCount(1),
|
||||
fStatus(B_NO_INIT),
|
||||
fFormat(format),
|
||||
fFreeWhenDone(freeWhenDone),
|
||||
fTrackReader(NULL)
|
||||
{
|
||||
if (fData == NULL)
|
||||
return;
|
||||
|
||||
fStatus = B_OK;
|
||||
}
|
||||
|
||||
|
||||
BSound::BSound(const entry_ref *soundFile, bool loadIntoMemory)
|
||||
: fData(NULL),
|
||||
fDataSize(0),
|
||||
fFile(new(std::nothrow) BFile(soundFile, B_READ_ONLY)),
|
||||
fRefCount(1),
|
||||
fStatus(B_NO_INIT),
|
||||
fFreeWhenDone(false),
|
||||
fTrackReader(NULL)
|
||||
{
|
||||
if (fFile == NULL) {
|
||||
fStatus = B_NO_MEMORY;
|
||||
return;
|
||||
}
|
||||
|
||||
fStatus = fFile->InitCheck();
|
||||
if (fStatus != B_OK)
|
||||
return;
|
||||
|
||||
memset(&fFormat, 0, sizeof(fFormat));
|
||||
fTrackReader = new(std::nothrow) BPrivate::BTrackReader(fFile, fFormat);
|
||||
if (fTrackReader == NULL) {
|
||||
fStatus = B_NO_MEMORY;
|
||||
return;
|
||||
}
|
||||
|
||||
fStatus = fTrackReader->InitCheck();
|
||||
if (fStatus != B_OK)
|
||||
return;
|
||||
|
||||
fFormat = fTrackReader->Format();
|
||||
fStatus = B_OK;
|
||||
}
|
||||
|
||||
|
||||
BSound::BSound(const media_raw_audio_format &format)
|
||||
: fData(NULL),
|
||||
fDataSize(0),
|
||||
fFile(NULL),
|
||||
fRefCount(1),
|
||||
fStatus(B_ERROR),
|
||||
fFormat(format),
|
||||
fFreeWhenDone(false),
|
||||
fTrackReader(NULL)
|
||||
{
|
||||
// unimplemented protected constructor
|
||||
UNIMPLEMENTED();
|
||||
}
|
||||
|
||||
BSound::BSound( const entry_ref * sound_file,
|
||||
bool load_into_memory)
|
||||
|
||||
BSound::~BSound()
|
||||
{
|
||||
UNIMPLEMENTED();
|
||||
delete fTrackReader;
|
||||
delete fFile;
|
||||
|
||||
if (fFreeWhenDone)
|
||||
free(fData);
|
||||
}
|
||||
|
||||
status_t
|
||||
|
||||
status_t
|
||||
BSound::InitCheck()
|
||||
{
|
||||
UNIMPLEMENTED();
|
||||
|
||||
return B_ERROR;
|
||||
return fStatus;
|
||||
}
|
||||
|
||||
BSound *
|
||||
|
||||
BSound *
|
||||
BSound::AcquireRef()
|
||||
{
|
||||
UNIMPLEMENTED();
|
||||
return NULL;
|
||||
atomic_add(&fRefCount, 1);
|
||||
return this;
|
||||
}
|
||||
|
||||
bool
|
||||
bool
|
||||
BSound::ReleaseRef()
|
||||
{
|
||||
UNIMPLEMENTED();
|
||||
return false;
|
||||
if (atomic_add(&fRefCount, -1) == 1) {
|
||||
delete this;
|
||||
return false;
|
||||
}
|
||||
|
||||
// TODO: verify those returns
|
||||
return true;
|
||||
}
|
||||
|
||||
int32
|
||||
|
||||
int32
|
||||
BSound::RefCount() const
|
||||
{
|
||||
UNIMPLEMENTED();
|
||||
return 0;
|
||||
} // unreliable!
|
||||
return fRefCount;
|
||||
}
|
||||
|
||||
/* virtual */ bigtime_t
|
||||
|
||||
bigtime_t
|
||||
BSound::Duration() const
|
||||
{
|
||||
UNIMPLEMENTED();
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* virtual */ const media_raw_audio_format &
|
||||
|
||||
const media_raw_audio_format &
|
||||
BSound::Format() const
|
||||
{
|
||||
UNIMPLEMENTED();
|
||||
return _m_format;
|
||||
return fFormat;
|
||||
}
|
||||
|
||||
/* virtual */ const void *
|
||||
|
||||
const void *
|
||||
BSound::Data() const
|
||||
{
|
||||
UNIMPLEMENTED();
|
||||
return NULL;
|
||||
} /* returns NULL for files */
|
||||
return fData;
|
||||
}
|
||||
|
||||
/* virtual */ off_t
|
||||
|
||||
off_t
|
||||
BSound::Size() const
|
||||
{
|
||||
UNIMPLEMENTED();
|
||||
return 0;
|
||||
if (fFile != NULL) {
|
||||
off_t result = 0;
|
||||
fFile->GetSize(&result);
|
||||
return result;
|
||||
}
|
||||
|
||||
return fDataSize;
|
||||
}
|
||||
|
||||
/* virtual */ bool
|
||||
BSound::GetDataAt(off_t offset,
|
||||
void * into_buffer,
|
||||
size_t buffer_size,
|
||||
size_t * out_used)
|
||||
{
|
||||
UNIMPLEMENTED();
|
||||
return false;
|
||||
}
|
||||
|
||||
/*************************************************************
|
||||
* protected BSound
|
||||
*************************************************************/
|
||||
|
||||
BSound::BSound(const media_raw_audio_format & format)
|
||||
{
|
||||
UNIMPLEMENTED();
|
||||
}
|
||||
|
||||
/* virtual */ status_t
|
||||
BSound::Perform(int32 code,...)
|
||||
{
|
||||
UNIMPLEMENTED();
|
||||
return B_ERROR;
|
||||
}
|
||||
|
||||
/*************************************************************
|
||||
* private BSound
|
||||
*************************************************************/
|
||||
|
||||
/*
|
||||
BSound::BSound(const BSound &); // unimplemented
|
||||
BSound & BSound::operator=(const BSound &); // unimplemented
|
||||
*/
|
||||
|
||||
void
|
||||
BSound::Reset()
|
||||
{
|
||||
UNIMPLEMENTED();
|
||||
}
|
||||
|
||||
/* virtual */
|
||||
BSound::~BSound()
|
||||
{
|
||||
UNIMPLEMENTED();
|
||||
}
|
||||
|
||||
void
|
||||
BSound::free_data()
|
||||
{
|
||||
UNIMPLEMENTED();
|
||||
}
|
||||
|
||||
/* static */ status_t
|
||||
BSound::load_entry(void * arg)
|
||||
{
|
||||
UNIMPLEMENTED();
|
||||
return B_ERROR;
|
||||
}
|
||||
|
||||
void
|
||||
BSound::loader_thread()
|
||||
{
|
||||
UNIMPLEMENTED();
|
||||
}
|
||||
|
||||
bool
|
||||
BSound::check_stop()
|
||||
BSound::GetDataAt(off_t offset, void *intoBuffer, size_t bufferSize,
|
||||
size_t *outUsed)
|
||||
{
|
||||
UNIMPLEMENTED();
|
||||
if (intoBuffer == NULL)
|
||||
return false;
|
||||
|
||||
if (fData != NULL) {
|
||||
size_t copySize = MIN(bufferSize, fDataSize - offset);
|
||||
memcpy(intoBuffer, (uint8 *)fData + offset, copySize);
|
||||
if (outUsed != NULL)
|
||||
*outUsed = copySize;
|
||||
return true;
|
||||
}
|
||||
|
||||
if (fTrackReader != NULL) {
|
||||
int32 frameSize = fTrackReader->FrameSize();
|
||||
int64 frameCount = fTrackReader->CountFrames();
|
||||
int64 startFrame = offset / frameSize;
|
||||
if (startFrame > frameCount)
|
||||
return false;
|
||||
|
||||
if (fTrackReader->SeekToFrame(&startFrame) != B_OK)
|
||||
return false;
|
||||
|
||||
off_t bufferOffset = offset - startFrame * frameSize;
|
||||
int64 directStartFrame = (offset + frameSize - 1) / frameSize;
|
||||
int64 directFrameCount = (offset + bufferSize - directStartFrame
|
||||
* frameSize) / frameSize;
|
||||
|
||||
if (bufferOffset != 0) {
|
||||
int64 indirectFrameCount = directStartFrame - startFrame;
|
||||
size_t indirectSize = indirectFrameCount * frameSize;
|
||||
void *buffer = malloc(indirectSize);
|
||||
if (buffer == NULL)
|
||||
return false;
|
||||
|
||||
if (fTrackReader->ReadFrames(buffer, indirectFrameCount) != B_OK)
|
||||
return false;
|
||||
|
||||
memcpy(intoBuffer, (uint8 *)buffer + bufferOffset,
|
||||
indirectSize - bufferOffset);
|
||||
if (outUsed != NULL)
|
||||
*outUsed = indirectSize - bufferOffset;
|
||||
} else if (outUsed != NULL)
|
||||
*outUsed = 0;
|
||||
|
||||
if (fTrackReader->ReadFrames((uint8 *)intoBuffer + bufferOffset,
|
||||
directFrameCount) != B_OK)
|
||||
return false;
|
||||
|
||||
if (outUsed != NULL)
|
||||
*outUsed += directFrameCount * frameSize;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/*************************************************************
|
||||
* public BSound
|
||||
*************************************************************/
|
||||
|
||||
/* virtual */ status_t
|
||||
BSound::BindTo(BSoundPlayer * player,
|
||||
const media_raw_audio_format & format)
|
||||
status_t
|
||||
BSound::BindTo(BSoundPlayer *player, const media_raw_audio_format &format)
|
||||
{
|
||||
UNIMPLEMENTED();
|
||||
return B_ERROR;
|
||||
}
|
||||
|
||||
/* virtual */ status_t
|
||||
BSound::UnbindFrom(BSoundPlayer * player)
|
||||
|
||||
status_t
|
||||
BSound::UnbindFrom(BSoundPlayer *player)
|
||||
{
|
||||
UNIMPLEMENTED();
|
||||
return B_ERROR;
|
||||
}
|
||||
|
||||
|
||||
status_t
|
||||
BSound::Perform(int32 code, ...)
|
||||
{
|
||||
UNIMPLEMENTED();
|
||||
return B_ERROR;
|
||||
}
|
||||
|
||||
/*************************************************************
|
||||
* private BSound
|
||||
*************************************************************/
|
||||
|
||||
status_t BSound::_Reserved_Sound_0(void *) { return B_ERROR; }
|
||||
status_t BSound::_Reserved_Sound_1(void *) { return B_ERROR; }
|
||||
@ -184,4 +254,3 @@ status_t BSound::_Reserved_Sound_2(void *) { return B_ERROR; }
|
||||
status_t BSound::_Reserved_Sound_3(void *) { return B_ERROR; }
|
||||
status_t BSound::_Reserved_Sound_4(void *) { return B_ERROR; }
|
||||
status_t BSound::_Reserved_Sound_5(void *) { return B_ERROR; }
|
||||
|
||||
|
||||
@ -8,6 +8,8 @@
|
||||
#if !defined(_TRACK_READER_H_)
|
||||
#define _TRACK_READER_H_
|
||||
|
||||
#include <MediaTrack.h>
|
||||
|
||||
namespace BPrivate
|
||||
{
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user