mirror of
https://gitea.wildfiregames.com/0ad/0ad.git
synced 2026-07-12 16:36:05 +00:00
trompetin17
586d02838a
Modernized COggData::FetchDataIntoBuffer and OggStream interface: - Replaced raw buffer pointer with std::vector<u8> in COggData - Updated GetNextChunk to use PS::span<u8> - Removed manual new/delete and memset usage - Replaced long with ALsizei for m_Frequency to match OpenAL API - Simplified type usage with size_t where appropriate - Eliminated unnecessary casting and improved code clarity These changes improve safety, readability, and bring the code closer to modern C++ standards.
71 lines
1.8 KiB
C++
71 lines
1.8 KiB
C++
/* Copyright (C) 2025 Wildfire Games.
|
|
* This file is part of 0 A.D.
|
|
*
|
|
* 0 A.D. is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* 0 A.D. is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with 0 A.D. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef INCLUDED_OGGDATA_H
|
|
#define INCLUDED_OGGDATA_H
|
|
|
|
#include "lib/config2.h"
|
|
|
|
#if CONFIG2_AUDIO
|
|
|
|
#include "ogg.h"
|
|
#include "SoundData.h"
|
|
|
|
#include "lib/file/vfs/vfs_path.h"
|
|
|
|
#include <AL/al.h>
|
|
#include <AL/alc.h>
|
|
#include <array>
|
|
|
|
/*
|
|
* 50 buffers of 98304 bytes each gives us 4.9 seconds of audio, which is a good amount to have buffered at once.
|
|
*/
|
|
constexpr int OGG_DEFAULT_BUFFER_COUNT = 50;
|
|
|
|
class COggData : public CSoundData
|
|
{
|
|
public:
|
|
COggData();
|
|
virtual ~COggData();
|
|
|
|
virtual bool InitOggFile(const VfsPath& itemPath);
|
|
virtual bool IsFileFinished();
|
|
virtual bool IsOneShot();
|
|
virtual bool IsStereo();
|
|
|
|
virtual int FetchDataIntoBuffer(int count, ALuint* buffers);
|
|
virtual void ResetFile();
|
|
|
|
private:
|
|
ALuint m_Format;
|
|
ALsizei m_Frequency;
|
|
protected:
|
|
OggStreamPtr m_Stream;
|
|
bool m_FileFinished;
|
|
bool m_OneShot;
|
|
std::array<ALuint, OGG_DEFAULT_BUFFER_COUNT> m_Buffer{};
|
|
int m_BuffersUsed;
|
|
|
|
void SetFormatAndFreq(int form, ALsizei freq);
|
|
int GetBufferCount();
|
|
unsigned int GetBuffer();
|
|
unsigned int* GetBufferPtr();
|
|
};
|
|
|
|
#endif // CONFIG2_AUDIO
|
|
#endif // INCLUDED_OGGDATA_H
|